Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

issue #117, Resolved cppcheck warning #118

Merged
merged 1 commit into from
Dec 30, 2019
Merged

issue #117, Resolved cppcheck warning #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fsw/mcp750-vxworks/src/cfe_psp_exception.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ char CFE_PSP_ExceptionReasonString[256];
**
*/

void CFE_PSP_ExceptionHook ( TASK_ID task_id, int vector, void* pEsf );
void CFE_PSP_ExceptionHook ( TASK_ID task_id, int vector, void* vpEsf );


/***************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion fsw/modules/eeprom_mmap_file/cfe_psp_eeprom_mmap_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ void eeprom_mmap_file_Init(uint32 PspModuleId)
*/
Status = CFE_PSP_MemRangeSet (1, CFE_PSP_MEM_EEPROM, eeprom_address,
eeprom_size, CFE_PSP_MEM_SIZE_DWORD, 0 );
OS_printf("CFE_PSP: EEPROM Range (2) created: Start Address = %08lX, Size = %08X\n", (unsigned long)eeprom_address, (unsigned int)eeprom_size);
OS_printf("CFE_PSP: EEPROM Range (2) created: Start Address = %08lX, Size = %08X Status = %d\n", (unsigned long)eeprom_address, (unsigned int)eeprom_size, Status);

}
else
Expand Down
38 changes: 28 additions & 10 deletions fsw/pc-linux/src/cfe_psp_memory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,19 +674,37 @@ int32 CFE_PSP_InitProcessorReservedMemory( uint32 RestartType )
tempFd = open(CFE_PSP_RESERVED_KEY_FILE, O_RDONLY | O_CREAT, S_IRWXU );
close(tempFd);

if ( RestartType == CFE_PSP_RST_TYPE_PROCESSOR )

return_code = CFE_PSP_InitCDS( RestartType );
if (return_code != CFE_PSP_SUCCESS)
{
OS_printf("CFE_PSP_InitCDS didn't return success (%d)\n", return_code);

return(return_code);
}

return_code = CFE_PSP_InitResetArea( RestartType );
if (return_code != CFE_PSP_SUCCESS)
{
OS_printf("CFE_PSP_InitResetArea didn't return success (%d)\n", return_code);

return(return_code);
}

return_code = CFE_PSP_InitVolatileDiskMem( RestartType );
if (return_code != CFE_PSP_SUCCESS)
{
return_code = CFE_PSP_InitCDS( CFE_PSP_RST_TYPE_PROCESSOR );
return_code = CFE_PSP_InitResetArea( CFE_PSP_RST_TYPE_PROCESSOR );
return_code = CFE_PSP_InitVolatileDiskMem( CFE_PSP_RST_TYPE_PROCESSOR );
return_code = CFE_PSP_InitUserReservedArea( CFE_PSP_RST_TYPE_PROCESSOR );
OS_printf("CFE_PSP_InitVolatileDiskMem didn't return success (%d)\n", return_code);

return(return_code);
}
else

return_code = CFE_PSP_InitUserReservedArea( RestartType );
if (return_code != CFE_PSP_SUCCESS)
{
return_code = CFE_PSP_InitCDS( CFE_PSP_RST_TYPE_POWERON );
return_code = CFE_PSP_InitResetArea( CFE_PSP_RST_TYPE_POWERON );
return_code = CFE_PSP_InitVolatileDiskMem( CFE_PSP_RST_TYPE_POWERON );
return_code = CFE_PSP_InitUserReservedArea( CFE_PSP_RST_TYPE_POWERON );
OS_printf("CFE_PSP_InitVolatileDiskMem didn't return success (%d)\n", return_code);

return(return_code);
}

return(return_code);
Expand Down
8 changes: 6 additions & 2 deletions fsw/pc-linux/src/cfe_psp_start.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,12 @@ int main(int argc, char *argv[])
/*
** Initialize the reserved memory
*/
CFE_PSP_InitProcessorReservedMemory(reset_type);

Status = CFE_PSP_InitProcessorReservedMemory(reset_type);
if (Status != CFE_PSP_SUCCESS)
{
OS_printf("CFE_PSP: CFE_PSP_InitProcessorReservedMemory() Failure");
CFE_PSP_Panic(Status);
skliper marked this conversation as resolved.
Show resolved Hide resolved
}

/*
** Call cFE entry point.
Expand Down
18 changes: 1 addition & 17 deletions fsw/pc-rtems/src/cfe_psp_exception.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,23 +130,7 @@ void CFE_PSP_AttachExceptions(void)
void CFE_PSP_ExceptionHook (int task_id, int vector, int32 *pEsf )
{

char TaskName[16];

/*
** Get the task name
*/
strncpy(TaskName, "TBD", 16);

if ( TaskName == NULL )
{
sprintf(CFE_PSP_ExceptionReasonString, "Exception: Vector=0x%06X, vxWorks Task Name=NULL, Task ID=0x%08X",
vector,task_id);
}
else
{
sprintf(CFE_PSP_ExceptionReasonString, "Exception: Vector=0x%06X, vxWorks Task Name=%s, Task ID=0x%08X",
vector, TaskName, task_id);
}
sprintf(CFE_PSP_ExceptionReasonString, "Not Implemented");

/*
** Save Exception Stack frame
Expand Down
4 changes: 2 additions & 2 deletions fsw/shared/cfe_psp_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ int32 CFE_PSP_Module_GetAPIEntry(uint32 PspModuleId, CFE_PSP_ModuleApi_t **API)
*
* See prototype for full description
*/
int32 CFE_PSP_Module_FindByName(const char *DriverName, uint32 *PspModuleId)
int32 CFE_PSP_Module_FindByName(const char *ModuleName, uint32 *PspModuleId)
{
uint32 i;
int32 Result;
Expand All @@ -119,7 +119,7 @@ int32 CFE_PSP_Module_FindByName(const char *DriverName, uint32 *PspModuleId)
i = 0;
while (i < CFE_PSP_ModuleCount)
{
if (strcmp(Entry->Name, DriverName) == 0)
if (strcmp(Entry->Name, ModuleName) == 0)
{
*PspModuleId = CFE_PSP_MODULE_BASE | (i & CFE_PSP_MODULE_INDEX_MASK);
Result = CFE_PSP_SUCCESS;
Expand Down