Merge pull request #190 from nasa/integration-candidate

Integration Candidate: 2020-08-26

Author: yammajamma

README.md

@@ -8,6 +8,12 @@ This is a collection of APIs abstracting platform specific functionality to be l
 
 ## Version History
 
+### Development Build: 1.5.0-rc1+dev6
+
+- Adds CFE_PSP_GetProcessorName
+- Removes classic make artifacts
+- See <https://github.com/nasa/PSP/pull/190>
+
 ### Development Build: 1.4.0+dev76
 
 - Provide a new framework and perform PSP coverage tests. New coverage test executable is built and several files within PSP are targeted.

fsw/inc/cfe_psp.h

@@ -216,6 +216,10 @@ extern uint32        CFE_PSP_GetSpacecraftId ( void );
 ** CFE_PSP_GetSpacecraftId retuns the Spacecraft ID (if any )
 */
 
+extern const char *  CFE_PSP_GetProcessorName(void);
+/*
+** CFE_PSP_GetProcessorName returns the processor name
+*/
 
 extern uint32 CFE_PSP_Get_Timer_Tick(void);
 /*

fsw/mcp750-vxworks/make/compiler-opts.mak

@@ -66,6 +66,7 @@
 #include <target_config.h>
 
 #define CFE_PSP_CPU_ID               (GLOBAL_CONFIGDATA.Default_CpuId)
+#define CFE_PSP_CPU_NAME             (GLOBAL_CONFIGDATA.Default_CpuName)
 #define CFE_PSP_SPACECRAFT_ID        (GLOBAL_CONFIGDATA.Default_SpacecraftId)
 
 /*
@@ -192,3 +193,23 @@ uint32 CFE_PSP_GetSpacecraftId   (void)
    return CFE_PSP_SPACECRAFT_ID;
 }
 
+/*
+** Name: CFE_PSP_GetProcessorName
+**
+** Purpose:
+**         return the processor name.
+**
+** Parameters:
+**
+** Global Inputs: None
+**
+** Global Outputs: None
+**
+**
+** Return Values: Processor name
+*/
+const char *CFE_PSP_GetProcessorName   (void)
+{
+   return CFE_PSP_CPU_NAME;
+}
+