From 2225fbfa977fcfee2bd8f3935356d443df7fc7ce Mon Sep 17 00:00:00 2001 From: zufishanali Date: Wed, 27 Nov 2019 22:32:25 -0500 Subject: [PATCH 1/2] Fix #66, Simplify address-of element 0 --- fsw/mcp750-vxworks/src/cfe_psp_memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fsw/mcp750-vxworks/src/cfe_psp_memory.c b/fsw/mcp750-vxworks/src/cfe_psp_memory.c index 17c903ca..ad3fb2ce 100644 --- a/fsw/mcp750-vxworks/src/cfe_psp_memory.c +++ b/fsw/mcp750-vxworks/src/cfe_psp_memory.c @@ -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; } @@ -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; } @@ -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; From fe4adcfb57308f9a65fb8c0da20525398f1610d4 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Fri, 28 Feb 2020 16:14:03 -0500 Subject: [PATCH 2/2] Increase version to 1.4.5, fix typos and update README --- README.md | 9 +++++---- fsw/mcp750-vxworks/inc/psp_version.h | 2 +- fsw/pc-linux/inc/psp_version.h | 3 +-- fsw/pc-rtems/inc/psp_version.h | 3 +-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 6e76119d..24a7e823 100644 --- a/README.md +++ b/README.md @@ -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) @@ -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 - diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h index 280241ee..ea0d2bd8 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 4 +#define CFE_PSP_IMPL_REVISION 5 #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 280241ee..1baf01f8 100644 --- a/fsw/pc-linux/inc/psp_version.h +++ b/fsw/pc-linux/inc/psp_version.h @@ -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_ */ - diff --git a/fsw/pc-rtems/inc/psp_version.h b/fsw/pc-rtems/inc/psp_version.h index 280241ee..1baf01f8 100644 --- a/fsw/pc-rtems/inc/psp_version.h +++ b/fsw/pc-rtems/inc/psp_version.h @@ -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_ */ -