Merge pull request #352 from nasa/integration-candidate

PSP Integration Candidate: Caelum-rc4+dev13
nasa · Jul 14, 2022 · 15c2ced · 15c2ced
2 parents a8ae3bc + a814145
commit 15c2ced
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -9,6 +9,11 @@ This is a collection of APIs abstracting platform specific functionality to be l
 
 ## Changelog
 
+### Development Build: v1.6.0-rc4+dev43
+
+- remove commented out code
+- See <https://github.com/nasa/PSP/pull/351>
+
 ### Development Build: v1.6.0-rc4+dev41
 
 - Add CFE_PSP_StatusToString and CFE_PSP_STATUS_C

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   41
+#define CFE_PSP_IMPL_BUILD_NUMBER   43
 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"
 
 /*

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   41
+#define CFE_PSP_IMPL_BUILD_NUMBER   43
 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"
 
 /*

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   41
+#define CFE_PSP_IMPL_BUILD_NUMBER   43
 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"
 
 /*

diff --git a/unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c b/unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c
@@ -42,13 +42,6 @@
 #include "cfe_psp.h"
 #include "cfe_psp_exceptionstorage_api.h"
 
-#ifdef jphfix
-#include "PCS_stdlib.h"
-#include "PCS_rebootLib.h"
-#include "PCS_cacheLib.h"
-#include "PCS_cfe_configdata.h"
-#endif
-
 void Test_CFE_PSP_Exception_GetBuffer(void)
 {
     /*