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

IC - 20200226 #138

Merged
merged 2 commits into from
Feb 28, 2020
Merged

IC - 20200226 #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2225fbf
Fix #66, Simplify address-of element 0
zufishanali Nov 28, 2019
fe4adcf
Increase version to 1.4.5, fix typos and update README
astrogeco Feb 28, 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
9 changes: 5 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ This repository contains NASA's Platform Support Package (PSP), which is a frame
This is a collection of APIs abstracting platform specific functionality to be located in the `psp` subdirectory of a cFS Mission Tree. The Core Flight System is bundled at https://github.com/nasa/cFS, which includes build and execution instructions.

## Version Notes

- 1.4.2 DEVELOPMENT
- 1.4.5 DEVELOPMENT
- Simplifies array handling in VxWorks
- Minor updates (see https://github.com/nasa/PSP/pull/138)
- 1.4.4 DEVELOPMENT
- Minor updates (see https://github.com/nasa/PSP/pull/132)
- 1.4.2 DEVELOPMENT
- 1.4.3 DEVELOPMENT
- Minor updates (see https://github.com/nasa/PSP/pull/130)
- 1.4.2 DEVELOPMENT
- Minor updates (see https://github.com/nasa/PSP/pull/127)
Expand All @@ -36,4 +38,3 @@ See all open issues and closed to milestones later than this version.
For best results, submit issues:questions or issues:help wanted requests at https://github.com/nasa/cFS.

Official cFS page: http://cfs.gsfc.nasa.gov

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 4
#define CFE_PSP_IMPL_REVISION 5
#define CFE_PSP_IMPL_MISSION_REV 0

#endif /* _psp_version_ */
Expand Down
6 changes: 3 additions & 3 deletions fsw/mcp750-vxworks/src/cfe_psp_memory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ int32 CFE_PSP_GetResetArea (cpuaddr *PtrToResetArea, uint32 *SizeOfResetArea)
}
else
{
*PtrToResetArea = (cpuaddr)&(CFE_PSP_ReservedMemoryPtr->ResetMemory[0]);
*PtrToResetArea = (cpuaddr)(CFE_PSP_ReservedMemoryPtr->ResetMemory);
*SizeOfResetArea = CFE_PSP_RESET_AREA_SIZE;
return_code = CFE_PSP_SUCCESS;
}
Expand Down Expand Up @@ -263,7 +263,7 @@ int32 CFE_PSP_GetUserReservedArea(cpuaddr *PtrToUserArea, uint32 *SizeOfUserArea
}
else
{
*PtrToUserArea = (cpuaddr)&(CFE_PSP_ReservedMemoryPtr->UserReservedMemory[0]);
*PtrToUserArea = (cpuaddr)(CFE_PSP_ReservedMemoryPtr->UserReservedMemory);
*SizeOfUserArea = CFE_PSP_USER_RESERVED_SIZE;
return_code = CFE_PSP_SUCCESS;
}
Expand Down Expand Up @@ -300,7 +300,7 @@ int32 CFE_PSP_GetVolatileDiskMem(cpuaddr *PtrToVolDisk, uint32 *SizeOfVolDisk )
}
else
{
*PtrToVolDisk = (cpuaddr)&(CFE_PSP_ReservedMemoryPtr->VolatileDiskMemory[0]);
*PtrToVolDisk = (cpuaddr)(CFE_PSP_ReservedMemoryPtr->VolatileDiskMemory);
*SizeOfVolDisk = CFE_PSP_VOLATILE_DISK_SIZE;
return_code = CFE_PSP_SUCCESS;

Expand Down
3 changes: 1 addition & 2 deletions 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,8 +35,7 @@
*/
#define CFE_PSP_IMPL_MAJOR_VERSION 1
#define CFE_PSP_IMPL_MINOR_VERSION 4
#define CFE_PSP_IMPL_REVISION 4
#define CFE_PSP_IMPL_REVISION 5
#define CFE_PSP_IMPL_MISSION_REV 0

#endif /* _psp_version_ */

3 changes: 1 addition & 2 deletions 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,8 +35,7 @@
*/
#define CFE_PSP_IMPL_MAJOR_VERSION 1
#define CFE_PSP_IMPL_MINOR_VERSION 4
#define CFE_PSP_IMPL_REVISION 4
#define CFE_PSP_IMPL_REVISION 5
#define CFE_PSP_IMPL_MISSION_REV 0

#endif /* _psp_version_ */