Merge pull request #442 from nasa/integration-candidate

PSP Integration candidate: Equuleus-rc1+dev21

Author: dzbaker

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: equuleus-rc1+dev55
+- rename parameter in CFE_PSP_MemSet handler to align with stub and actual code
+- See <https://github.com/nasa/PSP/pull/441>
+
 ## Development Build: equuleus-rc1+dev49
 - buffer error in the VxWorks sysmon module
 - add coverage tests for PSP modules

fsw/mcp750-vxworks/inc/psp_version.h

@@ -27,7 +27,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define CFE_PSP_IMPL_BUILD_NUMBER   49
+#define CFE_PSP_IMPL_BUILD_NUMBER   55
 #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 */

fsw/pc-linux/inc/psp_version.h

@@ -27,7 +27,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define CFE_PSP_IMPL_BUILD_NUMBER   49
+#define CFE_PSP_IMPL_BUILD_NUMBER   55
 #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 */

fsw/pc-rtems/inc/psp_version.h

@@ -27,7 +27,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define CFE_PSP_IMPL_BUILD_NUMBER   49
+#define CFE_PSP_IMPL_BUILD_NUMBER   55
 #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 */

ut-stubs/src/cfe_psp_memaccess_api_handlers.c

@@ -45,13 +45,13 @@ void UT_DefaultHandler_CFE_PSP_MemCpy(void *UserObj, UT_EntryKey_t FuncKey, cons
     /* CFE_PSP_MemCpy(void *dest, const void *src, uint32 size) */
     void *      dest = UT_Hook_GetArgValueByName(Context, "dest", void *);
     const void *src  = UT_Hook_GetArgValueByName(Context, "src", const void *);
-    uint32      size = UT_Hook_GetArgValueByName(Context, "size", uint32);
+    uint32      n    = UT_Hook_GetArgValueByName(Context, "n", uint32);
     int32       Status;
 
     UT_Stub_GetInt32StatusCode(Context, &Status);
     if (Status >= 0)
     {
-        memcpy(dest, src, size);
+        memcpy(dest, src, n);
     }
 }
 
@@ -65,13 +65,13 @@ void UT_DefaultHandler_CFE_PSP_MemSet(void *UserObj, UT_EntryKey_t FuncKey, cons
     /* int32 CFE_PSP_MemSet(void *dest, uint8 value, uint32 size) */
     void * dest  = UT_Hook_GetArgValueByName(Context, "dest", void *);
     uint8  value = UT_Hook_GetArgValueByName(Context, "value", uint8);
-    uint32 size  = UT_Hook_GetArgValueByName(Context, "size", uint32);
+    uint32 n     = UT_Hook_GetArgValueByName(Context, "n", uint32);
     int32  Status;
 
     UT_Stub_GetInt32StatusCode(Context, &Status);
     if (Status >= 0)
     {
-        memset(dest, value, size);
+        memset(dest, value, n);
     }
 }