From 637d1fa9938dc0dd51943dec60ad945effbed362 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Tue, 16 Jun 2020 13:36:55 -0400 Subject: [PATCH 1/2] Fix #170, set exception context size Store the size of the stored data into the exception record on mcp750-vxworks platform. --- fsw/mcp750-vxworks/src/cfe_psp_exception.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fsw/mcp750-vxworks/src/cfe_psp_exception.c b/fsw/mcp750-vxworks/src/cfe_psp_exception.c index 7fbee892..d56bb3fc 100644 --- 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(); } From 340825026a16d55f58250c1958056a930c325526 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Wed, 17 Jun 2020 15:09:33 -0400 Subject: [PATCH 2/2] Increase version to 1.4.14 and update ReadMe --- README.md | 5 +++++ fsw/mcp750-vxworks/inc/psp_version.h | 2 +- fsw/pc-linux/inc/psp_version.h | 2 +- fsw/pc-rtems/inc/psp_version.h | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c3dc9f74..287485aa 100644 --- 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 + ### 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 index aa48b206..7c9233bf 100644 --- 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/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h index aa48b206..7c9233bf 100644 --- 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 index aa48b206..7c9233bf 100644 --- 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_ */