diff --git a/README.md b/README.md index 49210ffa..1200837a 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,9 @@ 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.7 DEVELOPMENT + - Fixed some build warnings for MCP750 + - Minor updates (see https://github.com/nasa/PSP/pull/142) - 1.4.6 DEVELOPMENT - Minor updates (see https://github.com/nasa/PSP/pull/141) - 1.4.5 DEVELOPMENT diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h index bec540d2..c6b4cc63 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 6 +#define CFE_PSP_IMPL_REVISION 7 #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 index ad3fb2ce..2cbac0e3 100644 --- a/fsw/mcp750-vxworks/src/cfe_psp_memory.c +++ b/fsw/mcp750-vxworks/src/cfe_psp_memory.c @@ -59,7 +59,9 @@ /* ** Define the cFE Core loadable module name */ -#define CFE_MODULE_NAME "cfe-core.o" +#define CFE_MODULE_NAME_DEFAULT "cfe-core.o" + +static char CFE_MODULE_NAME[] = CFE_MODULE_NAME_DEFAULT; /* diff --git a/fsw/mcp750-vxworks/src/cfe_psp_start.c b/fsw/mcp750-vxworks/src/cfe_psp_start.c index e70e9cb8..cbd6675c 100644 --- a/fsw/mcp750-vxworks/src/cfe_psp_start.c +++ b/fsw/mcp750-vxworks/src/cfe_psp_start.c @@ -98,6 +98,7 @@ void CFE_PSP_Main( void ) uint32 reset_type; uint32 reset_subtype; char reset_register; + cpuaddr memaddr; int32 Status; @@ -128,8 +129,14 @@ void CFE_PSP_Main( void ) /* ** Setup the pointer to the reserved area in vxWorks. ** This must be done before any of the reset variables are used. + ** + ** Note: this uses a "cpuaddr" (integer address) as an intermediate + ** to avoid a warning about alignment. The output of sysMemTop() + ** should be aligned to hold any data type, being the very start + ** of the memory space. */ - CFE_PSP_ReservedMemoryPtr = (CFE_PSP_ReservedMemory_t *)sysMemTop(); + memaddr = (cpuaddr) sysMemTop(); + CFE_PSP_ReservedMemoryPtr = (CFE_PSP_ReservedMemory_t *) memaddr; /* ** Determine Reset type by reading the hardware reset register. diff --git a/fsw/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h index bec540d2..c6b4cc63 100644 --- a/fsw/pc-linux/inc/psp_version.h +++ b/fsw/pc-linux/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 6 +#define CFE_PSP_IMPL_REVISION 7 #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 bec540d2..c6b4cc63 100644 --- a/fsw/pc-rtems/inc/psp_version.h +++ b/fsw/pc-rtems/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 6 +#define CFE_PSP_IMPL_REVISION 7 #define CFE_PSP_IMPL_MISSION_REV 0 #endif /* _psp_version_ */