Fix nasa#165, Add CFE_PSP_GetProcessorName

skliper · Aug 24, 2020 · dc9e208 · dc9e208
1 parent 3f63a42
commit dc9e208
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 0 deletions.
diff --git a/fsw/inc/cfe_psp.h b/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);
 /*

diff --git a/fsw/mcp750-vxworks/src/cfe_psp_support.c b/fsw/mcp750-vxworks/src/cfe_psp_support.c
@@ -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;
+}
+
diff --git a/fsw/pc-linux/src/cfe_psp_support.c b/fsw/pc-linux/src/cfe_psp_support.c
@@ -52,6 +52,7 @@
 */
 extern uint32  CFE_PSP_SpacecraftId;
 extern uint32  CFE_PSP_CpuId;
+extern char    CFE_PSP_CpuName[];
 
 
 /******************************************************************************
@@ -200,3 +201,24 @@ uint32 CFE_PSP_GetSpacecraftId   (void)
 {
    return(CFE_PSP_SpacecraftId);
 }
+
+/*
+** 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_CpuName);
+}
+
diff --git a/fsw/pc-rtems/src/cfe_psp_support.c b/fsw/pc-rtems/src/cfe_psp_support.c
@@ -179,3 +179,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);
+}
+