Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integration Candidate: 2020-06-10 #175

Merged
merged 3 commits into from
Jun 17, 2020
Merged

Integration Candidate: 2020-06-10 #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
637d1fa
Fix #170, set exception context size
jphickey Jun 16, 2020
3611e81
Merge pull request #173 from jphickey/fix-170-fix-exception-size
astrogeco Jun 17, 2020
3408250
Increase version to 1.4.14 and update ReadMe
Jun 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion fsw/mcp750-vxworks/inc/psp_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */
6 changes: 6 additions & 0 deletions fsw/mcp750-vxworks/src/cfe_psp_exception.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
2 changes: 1 addition & 1 deletion fsw/pc-linux/inc/psp_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */
2 changes: 1 addition & 1 deletion fsw/pc-rtems/inc/psp_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */