nasa · dzbaker · Apr 22, 2025 · Dec 11, 2024 · Dec 11, 2024 · Apr 17, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Development Build: equuleus-rc1+dev73
+- 'Fix #443, Correct minor bugs + typos in the VxWorks layer'
+- See: <https://github.com/nasa/psp/pull/444>
+
+
 ## Development Build: equuleus-rc1+dev67
 - 'Fix #452, rtems sysmom overflow buffer'
 - See: <https://github.com/nasa/psp/pull/453>

diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h
@@ -27,7 +27,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define CFE_PSP_IMPL_BUILD_NUMBER   67
+#define CFE_PSP_IMPL_BUILD_NUMBER   73
 #define CFE_PSP_IMPL_BUILD_BASELINE "equuleus-rc1"
 #define CFE_PSP_BUILD_DEV_CYCLE     "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
 #define CFE_PSP_BUILD_CODENAME      "Equuleus" /**< @brief: Development: Code name for the current build */

diff --git a/fsw/mcp750-vxworks/src/cfe_psp_memory.c b/fsw/mcp750-vxworks/src/cfe_psp_memory.c
@@ -186,7 +186,7 @@ int32 CFE_PSP_ReadFromCDS(void *PtrToDataToRead, uint32 CDSOffset, uint32 NumByt
             return_code = CFE_PSP_ERROR;
         }
 
-    } /* end if PtrToDataToWrite == NULL */
+    } /* end if PtrToDataToRead == NULL */
 
     return return_code;
 }
@@ -319,9 +319,7 @@ int32 CFE_PSP_GetVolatileDiskMem(cpuaddr *PtrToVolDisk, uint32 *SizeOfVolDisk)
 */
 int32 CFE_PSP_InitProcessorReservedMemory(uint32 RestartType)
 {
-    int32 return_code;
-
-    if (RestartType != CFE_PSP_RST_TYPE_PROCESSOR)
+    if (RestartType == CFE_PSP_RST_TYPE_POWERON)
     {
         OS_printf("CFE_PSP: Clearing Processor Reserved Memory.\n");
         memset(MCP750_ReservedMemBlock.BlockPtr, 0, MCP750_ReservedMemBlock.BlockSize);
@@ -331,8 +329,8 @@ int32 CFE_PSP_InitProcessorReservedMemory(uint32 RestartType)
         */
         CFE_PSP_ReservedMemoryMap.BootPtr->bsp_reset_type = CFE_PSP_RST_TYPE_PROCESSOR;
     }
-    return_code = CFE_PSP_SUCCESS;
-    return return_code;
+
+    return CFE_PSP_SUCCESS;
 }
 
 /******************************************************************************
@@ -478,7 +476,7 @@ int32 CFE_PSP_GetCFETextSegmentInfo(cpuaddr *PtrToCFESegment, uint32 *SizeOfCFES
     MODULE_ID   cFEModuleId;
     MODULE_INFO cFEModuleInfo;
     cpuaddr     GetModuleIdAddr;
-    MODULE_ID (*GetModuldIdFunc)(void);
+    MODULE_ID (*GetModuleIdFunc)(void);
 
     if (PtrToCFESegment == NULL || SizeOfCFESegment == NULL)
     {
@@ -503,8 +501,8 @@ int32 CFE_PSP_GetCFETextSegmentInfo(cpuaddr *PtrToCFESegment, uint32 *SizeOfCFES
         return_code     = OS_SymbolLookup(&GetModuleIdAddr, "GetCfeCoreModuleID");
         if (return_code == OS_SUCCESS && GetModuleIdAddr != 0)
         {
-            GetModuldIdFunc = (MODULE_ID(*)(void))GetModuleIdAddr;
-            cFEModuleId     = GetModuldIdFunc();
+            GetModuleIdFunc = (MODULE_ID(*)(void))GetModuleIdAddr;
+            cFEModuleId     = GetModuleIdFunc();
         }
 
         /*
@@ -538,4 +536,4 @@ int32 CFE_PSP_GetCFETextSegmentInfo(cpuaddr *PtrToCFESegment, uint32 *SizeOfCFES
     }
 
     return return_code;
-}
+}
diff --git a/fsw/mcp750-vxworks/src/cfe_psp_start.c b/fsw/mcp750-vxworks/src/cfe_psp_start.c
@@ -169,8 +169,8 @@ void OS_Application_Startup(void)
     else if (reset_register & SYS_REG_BLRR_FBTN)
     {
         OS_printf("CFE_PSP: POWERON Reset: Front Panel Push Button Reset.\n");
-        reset_type    = CFE_PSP_RST_SUBTYPE_PUSH_BUTTON;
-        reset_subtype = 3;
+        reset_type    = CFE_PSP_RST_TYPE_POWERON;
+        reset_subtype = CFE_PSP_RST_SUBTYPE_PUSH_BUTTON;
     }
     else if (reset_register & SYS_REG_BLRR_WDT2)
     {

diff --git a/fsw/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h
@@ -27,7 +27,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define CFE_PSP_IMPL_BUILD_NUMBER   67
+#define CFE_PSP_IMPL_BUILD_NUMBER   73
 #define CFE_PSP_IMPL_BUILD_BASELINE "equuleus-rc1"
 #define CFE_PSP_BUILD_DEV_CYCLE     "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
 #define CFE_PSP_BUILD_CODENAME      "Equuleus" /**< @brief: Development: Code name for the current build */

diff --git a/fsw/pc-rtems/inc/psp_version.h b/fsw/pc-rtems/inc/psp_version.h
@@ -27,7 +27,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define CFE_PSP_IMPL_BUILD_NUMBER   67
+#define CFE_PSP_IMPL_BUILD_NUMBER   73
 #define CFE_PSP_IMPL_BUILD_BASELINE "equuleus-rc1"
 #define CFE_PSP_BUILD_DEV_CYCLE     "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
 #define CFE_PSP_BUILD_CODENAME      "Equuleus" /**< @brief: Development: Code name for the current build */

diff --git a/fsw/pc-rtems/src/cfe_psp_memory.c b/fsw/pc-rtems/src/cfe_psp_memory.c
@@ -182,7 +182,7 @@ int32 CFE_PSP_ReadFromCDS(void *PtrToDataToRead, uint32 CDSOffset, uint32 NumByt
             return_code = OS_ERROR;
         }
 
-    } /* end if PtrToDataToWrite == NULL */
+    } /* end if PtrToDataToRead == NULL */
 
     return return_code;
 }

diff --git a/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c b/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c
@@ -120,8 +120,8 @@ void Test_OS_Application_Startup(void)
     *PCS_SYS_REG_BLRR = PCS_SYS_REG_BLRR_FBTN;
     UT_OS_Application_Startup();
     UtAssert_INT32_EQ(UT_GetStubCount(UT_KEY(PCS_SystemMain)), 5);
-    UtAssert_INT32_EQ(StartType.StartType, CFE_PSP_RST_SUBTYPE_PUSH_BUTTON);
-    UtAssert_INT32_EQ(StartType.StartSubtype, 3);
+    UtAssert_INT32_EQ(StartType.StartType, CFE_PSP_RST_TYPE_POWERON);
+    UtAssert_INT32_EQ(StartType.StartSubtype, CFE_PSP_RST_SUBTYPE_PUSH_BUTTON);
 
     *PCS_SYS_REG_BLRR = PCS_SYS_REG_BLRR_WDT2;
     UT_OS_Application_Startup();

diff --git a/unit-test-coverage/modules/port_direct/coveragetest-port_direct.c b/unit-test-coverage/modules/port_direct/coveragetest-port_direct.c
@@ -176,7 +176,7 @@ void Test_CFE_PSP_PortRead32(void)
     UtAddress2 = (cpuaddr)&UT_RAM_BLOCK.u32[4];
 
     UT_RAM_BLOCK.u32[3] = 0xAABBCCDD;
-    UT_RAM_BLOCK.u32[3] = 0x44556677;
+    UT_RAM_BLOCK.u32[4] = 0x44556677;
 
     UtAssert_INT32_EQ(CFE_PSP_PortRead32(UtAddress1, NULL), CFE_PSP_INVALID_POINTER);
     UtAssert_INT32_EQ(CFE_PSP_PortRead32(UtAddress1, &Value1), CFE_PSP_SUCCESS);

diff --git a/unit-test-coverage/modules/ram_direct/coveragetest-ram_direct.c b/unit-test-coverage/modules/ram_direct/coveragetest-ram_direct.c
@@ -164,7 +164,7 @@ void Test_CFE_PSP_MemRead32(void)
     UtAddress2 = (cpuaddr)&UT_RAM_BLOCK.u32[4];
 
     UT_RAM_BLOCK.u32[3] = 0xAABBCCDD;
-    UT_RAM_BLOCK.u32[3] = 0x44556677;
+    UT_RAM_BLOCK.u32[4] = 0x44556677;
 
     UtAssert_INT32_EQ(CFE_PSP_MemRead32(UtAddress1, &Value1), CFE_PSP_SUCCESS);
     UtAssert_INT32_EQ(CFE_PSP_MemRead32(UtAddress2, &Value2), CFE_PSP_SUCCESS);

diff --git a/unit-test-coverage/modules/vxworks_sysmon/src/coveragetest-vxworks_sysmon.c b/unit-test-coverage/modules/vxworks_sysmon/src/coveragetest-vxworks_sysmon.c
@@ -98,10 +98,10 @@ void Test_Aggregate_Nominal(void)
 {
     int32 StatusCode;
     int32 IsRunningStatus;
-    ;
+
     CFE_PSP_IODriver_AdcCode_t    Sample;
     CFE_PSP_IODriver_AnalogRdWr_t RdWr = {.NumChannels = 1, .Samples = &Sample};
-    ;
+
     CFE_PSP_IODriver_Direction_t QueryDirArg;
     CFE_PSP_IODriver_API_t *     EntryAPI = TgtAPI->ExtendedApi;
 
@@ -181,7 +181,7 @@ void Test_Aggregate_Error(void)
     int32                         IsRunningStatus;
     CFE_PSP_IODriver_AdcCode_t    Sample;
     CFE_PSP_IODriver_AnalogRdWr_t RdWr = {.NumChannels = 1, .Samples = &Sample};
-    ;
+
 
     /* Error Case: Look Up Subsystem Not Found */
     StatusCode = EntryAPI->DeviceCommand(CFE_PSP_IODriver_LOOKUP_SUBSYSTEM, 0, 0, CFE_PSP_IODriver_CONST_STR("Empty"));

diff --git a/unit-test-coverage/shared/src/coveragetest-cfe-psp-memrange.c b/unit-test-coverage/shared/src/coveragetest-cfe-psp-memrange.c
@@ -84,7 +84,6 @@ void Test_CFE_PSP_MemRangeSet(void)
     UtAssert_INT32_EQ(CFE_PSP_MemRangeSet(UINT32_MAX, CFE_PSP_MEM_RAM, 0, 32, 1, 0), CFE_PSP_INVALID_MEM_RANGE);
     UtAssert_INT32_EQ(CFE_PSP_MemRangeSet(0, 0, 0, 32, 1, 0), CFE_PSP_INVALID_MEM_TYPE);
     UtAssert_INT32_EQ(CFE_PSP_MemRangeSet(0, CFE_PSP_MEM_RAM, 0, 32, 1, 0), CFE_PSP_INVALID_MEM_ATTR);
-    UtAssert_INT32_EQ(CFE_PSP_MemRangeSet(0, CFE_PSP_MEM_RAM, 0, 32, 1, 0), CFE_PSP_INVALID_MEM_ATTR);
     UtAssert_INT32_EQ(CFE_PSP_MemRangeSet(0, CFE_PSP_MEM_RAM, 0, 32, 2, CFE_PSP_MEM_ATTR_READWRITE), CFE_PSP_SUCCESS);
     UtAssert_INT32_EQ(CFE_PSP_MemRangeSet(0, CFE_PSP_MEM_RAM, 0, 32, 4, CFE_PSP_MEM_ATTR_READWRITE), CFE_PSP_SUCCESS);
     UtAssert_INT32_EQ(CFE_PSP_MemRangeSet(0, CFE_PSP_MEM_RAM, 0, 32, 8, CFE_PSP_MEM_ATTR_READWRITE),