Skip to content

Fix #32, Remove CFE_PSP_MemSet and CFE_PSP_MemCpy use #33

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

Merged
merged 1 commit into from
Jun 1, 2022
+8 −8
Merged

Fix #32, Remove CFE_PSP_MemSet and CFE_PSP_MemCpy use #33

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/src/cs_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ int32 CS_AppInit(void)
if (Result == CFE_SUCCESS)
{
/* Zero out all data in CS_AppData, including the housekeeping data*/
CFE_PSP_MemSet(&CS_AppData, 0, (unsigned)sizeof(CS_AppData));
memset(&CS_AppData, 0, sizeof(CS_AppData));

CS_AppData.RunStatus = CFE_ES_RunStatus_APP_RUN;

Expand Down
12 changes: 6 additions & 6 deletions fsw/src/cs_table_processing.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,8 +453,8 @@ void CS_ProcessNewEepromMemoryDefinitionTable(const CS_Def_EepromMemory_Table_En
uint16 PreviousState = CS_STATE_EMPTY;
char TableType[CS_TABLETYPE_NAME_SIZE];

CFE_PSP_MemCpy(&StartOfResultsTable, ResultsTblPtr, sizeof(StartOfResultsTable));
CFE_PSP_MemCpy(&StartOfDefTable, DefinitionTblPtr, sizeof(StartOfDefTable));
memcpy(&StartOfResultsTable, ResultsTblPtr, sizeof(StartOfResultsTable));
memcpy(&StartOfDefTable, DefinitionTblPtr, sizeof(StartOfDefTable));

strncpy(&TableType[0], "Undef Tbl", CS_TABLETYPE_NAME_SIZE); /* Init the table type string */

Expand Down Expand Up @@ -556,8 +556,8 @@ void CS_ProcessNewTablesDefinitionTable(const CS_Def_Tables_Table_Entry_t *Defin
char TableAppName[OS_MAX_API_NAME];
char TableTableName[CFE_MISSION_TBL_MAX_NAME_LENGTH];

CFE_PSP_MemCpy(&StartOfResultsTable, ResultsTblPtr, sizeof(StartOfResultsTable));
CFE_PSP_MemCpy(&StartOfDefTable, DefinitionTblPtr, sizeof(StartOfDefTable));
memcpy(&StartOfResultsTable, ResultsTblPtr, sizeof(StartOfResultsTable));
memcpy(&StartOfDefTable, DefinitionTblPtr, sizeof(StartOfDefTable));

CFE_ES_GetAppID(&AppID);
CFE_ES_GetAppName(AppName, AppID, OS_MAX_API_NAME);
Expand Down Expand Up @@ -740,8 +740,8 @@ void CS_ProcessNewAppDefinitionTable(const CS_Def_App_Table_Entry_t *DefinitionT
uint16 NumRegionsInTable = 0;
uint16 PreviousState = CS_STATE_EMPTY;

CFE_PSP_MemCpy(&StartOfResultsTable, ResultsTblPtr, sizeof(StartOfResultsTable));
CFE_PSP_MemCpy(&StartOfDefTable, DefinitionTblPtr, sizeof(StartOfDefTable));
memcpy(&StartOfResultsTable, ResultsTblPtr, sizeof(StartOfResultsTable));
memcpy(&StartOfDefTable, DefinitionTblPtr, sizeof(StartOfDefTable));

/* We don't want to be doing chekcksums while changing the table out */

Expand Down
2 changes: 1 addition & 1 deletion unit-test/utilities/cs_test_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ void CS_Test_Setup(void)
/* initialize test environment to default state for every test */
UT_ResetState(0);

memset(&CS_AppData, 0, sizeof(CS_AppData_t));
memset(&CS_AppData, 0, sizeof(CS_AppData));
memset(context_CFE_EVS_SendEvent, 0, sizeof(context_CFE_EVS_SendEvent));
memset(&context_CFE_ES_WriteToSysLog, 0, sizeof(context_CFE_ES_WriteToSysLog));

Expand Down