Skip to content

Commit

Permalink
Fix nasa#139, compiler warnings on mcp750 PSP
Browse files Browse the repository at this point in the history
Patches for the MCP750 PSP to avoid some compiler warnings
that show up when building with strict flags
  • Loading branch information
jphickey committed Feb 27, 2020
1 parent 0704c59 commit 4f0d349
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
4 changes: 3 additions & 1 deletion fsw/mcp750-vxworks/src/cfe_psp_memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;


/*
Expand Down
9 changes: 8 additions & 1 deletion fsw/mcp750-vxworks/src/cfe_psp_start.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ void CFE_PSP_Main( void )
uint32 reset_type;
uint32 reset_subtype;
char reset_register;
cpuaddr memaddr;
int32 Status;


Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 4f0d349

Please sign in to comment.