Merge pull request #138 from nasa/ic-20200226

Integration Candidate 20200226
nasa · Feb 28, 2020 · 440e31a · 440e31a
2 parents 0704c59 + fe4adcf
commit 440e31a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git 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
@@ -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/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;
 

diff --git 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
@@ -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_ */
-