From e0b9fc1d216290fab11f882f255b30c599437c76 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Tue, 3 Jan 2023 14:03:56 +0000 Subject: [PATCH 1/3] Fix #371, Remove obsolete _USING_RTEMS_INCLUDES_ --- fsw/pc-rtems/src/cfe_psp_start.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fsw/pc-rtems/src/cfe_psp_start.c b/fsw/pc-rtems/src/cfe_psp_start.c index cbb9fc5c..369cb671 100644 --- a/fsw/pc-rtems/src/cfe_psp_start.c +++ b/fsw/pc-rtems/src/cfe_psp_start.c @@ -24,7 +24,6 @@ ** ** ******************************************************************************/ -#define _USING_RTEMS_INCLUDES_ /* ** Include Files From f5bdede3777390fbab72383cd809d2c5ad4dcd77 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Tue, 3 Jan 2023 14:19:02 +0000 Subject: [PATCH 2/3] Fix #373, Squash constParameter warning in linux cfe_psp_memory.c --- fsw/pc-linux/src/cfe_psp_memory.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fsw/pc-linux/src/cfe_psp_memory.c b/fsw/pc-linux/src/cfe_psp_memory.c index 6715a637..11168fcb 100644 --- a/fsw/pc-linux/src/cfe_psp_memory.c +++ b/fsw/pc-linux/src/cfe_psp_memory.c @@ -757,14 +757,16 @@ void CFE_PSP_DeleteProcessorReservedMemory(void) */ int32 CFE_PSP_GetKernelTextSegmentInfo(cpuaddr *PtrToKernelSegment, uint32 *SizeOfKernelSegment) { - /* - ** Prevent warnings by referencing parameters - */ + /* Check pointers */ if (PtrToKernelSegment == NULL || SizeOfKernelSegment == NULL) { return CFE_PSP_ERROR; } + /* Set to known values */ + *PtrToKernelSegment = (cpuaddr)0x0; + *SizeOfKernelSegment = 0; + return CFE_PSP_ERROR_NOT_IMPLEMENTED; } From 24464aedb69e653c9ff05b7c0d8c2f2d6d830806 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 5 Jan 2023 16:38:30 -0500 Subject: [PATCH 3/3] Bump to v1.6.0-rc4+dev67 --- CHANGELOG.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/CHANGELOG.md b/CHANGELOG.md index 37716189..80fe1993 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## Development Build: v1.6.0-rc4+dev67 +- Squash constParameter warning in linux cfe_psp_memory.c +- Remove obsolete _USING_RTEMS_INCLUDES_ +- See and + ## Development Build: v1.6.0-rc4+dev61 - Stop empty function catching CI workflow format checks - Remove redundant/inconsistent comments (/* end of function */, /* end if */ etc.) and clean up empty lines. diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h index a90287ae..cf5b950f 100644 --- a/fsw/mcp750-vxworks/inc/psp_version.h +++ b/fsw/mcp750-vxworks/inc/psp_version.h @@ -27,7 +27,7 @@ /* * Development Build Macro Definitions */ -#define CFE_PSP_IMPL_BUILD_NUMBER 61 +#define CFE_PSP_IMPL_BUILD_NUMBER 67 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4" /* diff --git a/fsw/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h index a90287ae..cf5b950f 100644 --- a/fsw/pc-linux/inc/psp_version.h +++ b/fsw/pc-linux/inc/psp_version.h @@ -27,7 +27,7 @@ /* * Development Build Macro Definitions */ -#define CFE_PSP_IMPL_BUILD_NUMBER 61 +#define CFE_PSP_IMPL_BUILD_NUMBER 67 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4" /* diff --git a/fsw/pc-rtems/inc/psp_version.h b/fsw/pc-rtems/inc/psp_version.h index a90287ae..cf5b950f 100644 --- a/fsw/pc-rtems/inc/psp_version.h +++ b/fsw/pc-rtems/inc/psp_version.h @@ -27,7 +27,7 @@ /* * Development Build Macro Definitions */ -#define CFE_PSP_IMPL_BUILD_NUMBER 61 +#define CFE_PSP_IMPL_BUILD_NUMBER 67 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4" /*