Fix #121, Unify CFE PSP with OSAL BSP

Instead of redefining the basic entry point symbols, use the
OSAL BSP and its abstractions.  The CFE PSP just becomes an
extension to the OSAL BSP, and only needs to define the
OS_Application_Startup symbol like any other OSAL application.

fsw/mcp750-vxworks/make/build_options.cmake

@@ -1,11 +1,16 @@
+##########################################################################
+#
+# Build options for "mcp750-vxworks" PSP
+# This file specifies any global-scope compiler options when using this PSP
+#
+##########################################################################
+
 # This indicates where to install target binaries created during the build
+# Note - this should be phased out in favor of the staging dir from OSAL BSP
 set(INSTALL_SUBDIR "cf")
 
-# Additional preprocessor macro definitions to identify this platform
+# Some upper-level code may be gated on _VXWORKS_OS_ being defined
+# This is for compatibility with older build scripts which defined this symbol,
+# but no CFE/OSAL framework code depends on this symbol.
 add_definitions("-D_VXWORKS_OS_")
-add_definitions("-D__PPC__")
-add_definitions("-DMCP750")
 
-include_directories($ENV{WIND_BASE}/target/h)
-include_directories($ENV{WIND_BASE}/target/h/wrn/coreip)
-include_directories($ENV{WIND_BASE}/target/config/mcp750)

fsw/mcp750-vxworks/src/cfe_psp_start.c

@@ -80,19 +80,18 @@ IMPORT void sysPciWrite32 (UINT32, UINT32);
 
 
 /******************************************************************************
-**  Function:  CFE_PSP_Main()
+**  Function:  OS_Application_Startup()
 **
 **  Purpose:
-**    vxWorks/BSP Application entry point.
+**    Application startup entry point from OSAL BSP.
 **
 **  Arguments:
 **    (none)
 **
 **  Return:
 **    (none)
 */
-
-void CFE_PSP_Main( void )
+void OS_Application_Startup(void)
 {
    int    TicksPerSecond;
    uint32 reset_type;
@@ -216,6 +215,24 @@ void CFE_PSP_Main( void )
    */
    CFE_PSP_MAIN_FUNCTION(reset_type,reset_subtype, 1, CFE_PSP_NONVOL_STARTUP_FILE);
 
+}
+
+/******************************************************************************
+**  Function:  OS_Application_Run()
+**
+**  Purpose:
+**    Idle Loop entry point from OSAL BSP.
+**
+**  Arguments:
+**    (none)
+**
+**  Return:
+**    (none)
+*/
+void OS_Application_Run(void)
+{
+   int    TicksPerSecond;
+
    /*
    ** Main loop for default task and simulated 1hz 
    */

fsw/pc-linux/make/build_options.cmake

@@ -1,6 +1,16 @@
+##########################################################################
+#
+# Build options for "pc-linux" PSP
+# This file specifies any global-scope compiler options when using this PSP
+#
+##########################################################################
+
 # This indicates where to install target binaries created during the build
+# Note - this should be phased out in favor of the staging dir from OSAL BSP
 set(INSTALL_SUBDIR "cf")
 
 # Some upper-level code may be gated on _LINUX_OS_ being defined
+# This is for compatibility with older build scripts which defined this symbol,
+# but no CFE/OSAL framework code depends on this symbol.
 add_definitions("-D_LINUX_OS_")
 

fsw/pc-linux/src/cfe_psp_start.c

@@ -157,7 +157,7 @@ static const struct option longOpts[] = {
 **  Return:
 **    (none)
 */
-int main(int argc, char *argv[])
+void OS_Application_Startup(void)
 {
    uint32             reset_type;
    uint32             reset_subtype;
@@ -166,6 +166,8 @@ int main(int argc, char *argv[])
    int                opt = 0;
    int                longIndex = 0;
    int32              Status;
+   char * const *     argv;
+   int                argc;
 
    /*
    ** Initialize the CommandData struct 
@@ -176,6 +178,8 @@ int main(int argc, char *argv[])
    ** Process the arguments with getopt_long(), then 
    ** start the cFE
    */
+   argc = OS_BSP_GetArgC();
+   argv = OS_BSP_GetArgV();
    opt = getopt_long( argc, argv, optString, longOpts, &longIndex );
    while( opt != -1 ) 
    {
@@ -356,6 +360,10 @@ int main(int argc, char *argv[])
        CFE_PSP_SetupLocal1Hz();
    }
 
+}
+
+void OS_Application_Run(void)
+{
    /*
    ** Let the main thread sleep.
    **
@@ -377,9 +385,6 @@ int main(int argc, char *argv[])
    OS_printf("     with a Poweron Reset ( --reset PO ). \n");
 
    OS_DeleteAllObjects();
-
-
-   return(0);
 }
 
 /******************************************************************************

fsw/pc-rtems/make/build_options.cmake

@@ -1,3 +1,17 @@
+##########################################################################
+#
+# Build options for "pc-rtems" PSP
+# This file specifies any global-scope compiler options when using this PSP
+#
+##########################################################################
+
 # This indicates where to install target binaries created during the build
+# Note - this should be phased out in favor of the staging dir from OSAL BSP
 set(INSTALL_SUBDIR "eeprom")
 
+# Some upper-level code may be gated on _RTEMS_OS_ being defined
+# This is for compatibility with older build scripts which defined this symbol,
+# but no CFE/OSAL framework code depends on this symbol.
+add_definitions("-D_RTEMS_OS_")
+
+