Merge pull request #175 from nasa/integration-candidate

Integration Candidate: 2020-06-10
nasa · Jun 17, 2020 · 2445076 · 2445076
2 parents 4703df2 + 3408250
commit 2445076
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -8,6 +8,11 @@ This is a collection of APIs abstracting platform specific functionality to be l
 
 ## Version History
 
+### Development Build: 1.4.14
+
+- Changes the PSP reference to be compatible with the change in nasa/osal#449 making the BSP modules more generic and changes the name.
+- See <https://github.com/nasa/PSP/pull/175>
+
 ### Development Build: 1.4.13
 
 - Changes the PSP reference to be compatible with the change in nasa/osal#449 making the BSP modules more generic and changes the name.

diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h
@@ -35,7 +35,7 @@
 */
 #define CFE_PSP_IMPL_MAJOR_VERSION          1
 #define CFE_PSP_IMPL_MINOR_VERSION          4
-#define CFE_PSP_IMPL_REVISION               13
+#define CFE_PSP_IMPL_REVISION               14
 #define CFE_PSP_IMPL_MISSION_REV            0
 
 #endif  /* _psp_version_ */
diff --git a/fsw/mcp750-vxworks/src/cfe_psp_exception.c b/fsw/mcp750-vxworks/src/cfe_psp_exception.c
@@ -141,6 +141,12 @@ void CFE_PSP_ExceptionHook (TASK_ID task_id, int vector, void* vpEsf )
          */
         fppSave(&Buffer->context_info.fp);
 
+        /*
+         * Save total size of context info.
+         * (This PSP always fills the entire structure)
+         */
+        Buffer->context_size = sizeof(Buffer->context_info);
+
         CFE_PSP_Exception_WriteComplete();
     }
 

diff --git a/fsw/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h
@@ -35,7 +35,7 @@
 */
 #define CFE_PSP_IMPL_MAJOR_VERSION          1
 #define CFE_PSP_IMPL_MINOR_VERSION          4
-#define CFE_PSP_IMPL_REVISION               13
+#define CFE_PSP_IMPL_REVISION               14
 #define CFE_PSP_IMPL_MISSION_REV            0
 
 #endif  /* _psp_version_ */
diff --git a/fsw/pc-rtems/inc/psp_version.h b/fsw/pc-rtems/inc/psp_version.h
@@ -35,7 +35,7 @@
 */
 #define CFE_PSP_IMPL_MAJOR_VERSION          1
 #define CFE_PSP_IMPL_MINOR_VERSION          4
-#define CFE_PSP_IMPL_REVISION               13
+#define CFE_PSP_IMPL_REVISION               14
 #define CFE_PSP_IMPL_MISSION_REV            0
 
 #endif  /* _psp_version_ */