Skip to content

Fix #144, remove overwritten checksum variable assignments #145

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

Closed
sylvesterkaczmarek wants to merge 2 commits into from
Closed

Fix #144, remove overwritten checksum variable assignments #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e68b7f
Fix #144, remove overwritten checksum variable assignments
sylvesterkaczmarek Sep 10, 2026
d4165a9
Fix #144, match CI declaration formatting
sylvesterkaczmarek Sep 10, 2026
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
4 changes: 2 additions & 2 deletions fsw/src/cs_cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ CFE_Status_t CS_ResetCountersCmd(const CS_ResetCountersCmd_t *CmdPtr)
CFE_Status_t CS_BackgroundCheckCycleCmd(const CS_BackgroundCheckCycleCmd_t *CmdPtr)
{
/* command verification variables */
bool DoneWithCycle = false;
bool EndOfList = false;
bool DoneWithCycle;
bool EndOfList;

if (CS_AppData.HkPacket.Payload.ChecksumState == CS_ChecksumState_ENABLED)
{
Expand Down
10 changes: 3 additions & 7 deletions fsw/src/cs_compute.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,8 +363,6 @@ CS_ComputeEepromMemory(CS_Res_EepromMemory_Table_Entry_t *ResultsEntry, uint32 *
CFE_Status_t Status;
CS_LocalChecksumState_t State;

Status = CFE_SUCCESS;

memset(&State, 0, sizeof(State));

State.BufferAddr = CFE_ES_MEMADDRESS_TO_PTR(ResultsEntry->StartAddress);
Expand Down Expand Up @@ -476,8 +474,6 @@ CFE_Status_t CS_ComputeApp(CS_Res_App_Table_Entry_t *ResultsEntry, uint32 *Compu
CFE_Status_t Status;
CS_LocalChecksumState_t State;

Status = CFE_SUCCESS;

memset(&State, 0, sizeof(State));

State.BufferAddr = CFE_ES_MEMADDRESS_TO_PTR(ResultsEntry->StartAddress);
Expand Down Expand Up @@ -780,9 +776,9 @@ void CS_OneShotChildTask(void)
{
uint32 NewChecksumValue = 0;
size_t NumBytesRemainingCycles = 0;
size_t NumBytesThisCycle = 0;
cpuaddr FirstAddrThisCycle = 0;
size_t MaxBytesPerCycle = 0;
size_t NumBytesThisCycle;
cpuaddr FirstAddrThisCycle = 0;
size_t MaxBytesPerCycle = 0;

NewChecksumValue = 0;
NumBytesRemainingCycles = CS_AppData.HkPacket.Payload.LastOneShotSize;
Expand Down
18 changes: 9 additions & 9 deletions fsw/src/cs_eeprom_cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ CFE_Status_t CS_EnableEepromCmd(const CS_EnableEepromCmd_t *CmdPtr)
CFE_Status_t CS_ReportBaselineEntryIDEepromCmd(const CS_ReportBaselineEntryIDEepromCmd_t *CmdPtr)
{
/* command verification variables */
uint32 Baseline = 0;
uint32 Baseline;
uint16 EntryID = 0;
CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY;
CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL;
Expand Down Expand Up @@ -159,10 +159,10 @@ CFE_Status_t CS_ReportBaselineEntryIDEepromCmd(const CS_ReportBaselineEntryIDEep
CFE_Status_t CS_RecomputeBaselineEepromCmd(const CS_RecomputeBaselineEepromCmd_t *CmdPtr)
{
/* command verification variables */
CFE_ES_TaskId_t ChildTaskID = CFE_ES_TASKID_UNDEFINED;
CFE_Status_t Status = CS_ERROR;
uint16 EntryID = 0;
CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY;
CFE_ES_TaskId_t ChildTaskID = CFE_ES_TASKID_UNDEFINED;
CFE_Status_t Status;
uint16 EntryID = 0;
CS_ChecksumState_Enum_t State;
CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL;

if (CS_AppData.HkPacket.Payload.RecomputeInProgress == false
Expand Down Expand Up @@ -254,8 +254,8 @@ CFE_Status_t CS_EnableEntryIDEepromCmd(const CS_EnableEntryIDEepromCmd_t *CmdPtr
CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL;
CS_Def_EepromMemory_Table_Entry_t *DefEntry = NULL;
CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE];
uint16 EntryID = 0;
CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY;
uint16 EntryID;
CS_ChecksumState_Enum_t State;

if (CS_CheckRecomputeOneshot() == false)
{
Expand Down Expand Up @@ -320,8 +320,8 @@ CFE_Status_t CS_DisableEntryIDEepromCmd(const CS_DisableEntryIDEepromCmd_t *CmdP
CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL;
CS_Def_EepromMemory_Table_Entry_t *DefEntry = NULL;
CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE];
uint16 EntryID = 0;
CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY;
uint16 EntryID;
CS_ChecksumState_Enum_t State;

if (CS_CheckRecomputeOneshot() == false)
{
Expand Down
20 changes: 10 additions & 10 deletions fsw/src/cs_memory_cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ CFE_Status_t CS_ReportBaselineEntryIDMemoryCmd(const CS_ReportBaselineEntryIDMem
{
/* command verification variables */
CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL;
uint32 Baseline = 0;
uint16 EntryID = 0;
CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY;
uint32 Baseline;
uint16 EntryID = 0;
CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY;

EntryID = CmdPtr->Payload.EntryID;
ResultsEntry = CS_GetMemoryResEntry(EntryID);
Expand Down Expand Up @@ -159,9 +159,9 @@ CFE_Status_t CS_RecomputeBaselineMemoryCmd(const CS_RecomputeBaselineMemoryCmd_t
/* command verification variables */
CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL;
CFE_ES_TaskId_t ChildTaskID = CFE_ES_TASKID_UNDEFINED;
CFE_Status_t Status = CS_ERROR;
uint16 EntryID = 0;
CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY;
CFE_Status_t Status;
uint16 EntryID = 0;
CS_ChecksumState_Enum_t State;

EntryID = CmdPtr->Payload.EntryID;

Expand Down Expand Up @@ -253,8 +253,8 @@ CFE_Status_t CS_EnableEntryIDMemoryCmd(const CS_EnableEntryIDMemoryCmd_t *CmdPtr
CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL;
CS_Def_EepromMemory_Table_Entry_t *DefEntry = NULL;
CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE];
uint16 EntryID = 0;
CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY;
uint16 EntryID;
CS_ChecksumState_Enum_t State;

if (CS_CheckRecomputeOneshot() == false)
{
Expand Down Expand Up @@ -318,8 +318,8 @@ CFE_Status_t CS_DisableEntryIDMemoryCmd(const CS_DisableEntryIDMemoryCmd_t *CmdP
CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL;
CS_Def_EepromMemory_Table_Entry_t *DefEntry = NULL;
CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE];
uint16 EntryID = 0;
CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY;
uint16 EntryID;
CS_ChecksumState_Enum_t State;

if (CS_CheckRecomputeOneshot() == false)
{
Expand Down
6 changes: 3 additions & 3 deletions fsw/src/cs_table_processing.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,8 +616,8 @@ void CS_ProcessNewTablesDefinitionTable(CS_TableWrapper_t *tw)
uint16 NumRegionsInTable = 0;
CS_ChecksumState_Enum_t PreviousState = CS_ChecksumState_EMPTY;
CFE_ES_AppId_t AppID = CFE_ES_APPID_UNDEFINED;
CFE_TBL_Handle_t TableHandle = CFE_TBL_BAD_TABLE_HANDLE;
bool Owned = false;
CFE_TBL_Handle_t TableHandle;
bool Owned;
char AppName[OS_MAX_API_NAME];
char TableAppName[OS_MAX_API_NAME];
char TableTableName[CFE_MISSION_TBL_MAX_NAME_LENGTH];
Expand Down Expand Up @@ -905,7 +905,7 @@ CFE_Status_t CS_HandleTableUpdate(CS_TableWrapper_t *tw)
CFE_Status_t ManageResult2 = CFE_SUCCESS;
CFE_Status_t GetResult2 = CFE_SUCCESS;
CFE_Status_t Result = CFE_SUCCESS;
int32 Loop = 0;
int32 Loop;

CFE_TBL_Handle_t LocalHandle;
CS_Res_Tables_Table_Entry_t *ResTablesTblPtr;
Expand Down
4 changes: 2 additions & 2 deletions fsw/src/cs_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ bool CS_CheckResTableNameMatch(const char *Name, uint16 TableId)
*-----------------------------------------------------------------*/
void *CS_GetDefEntryAddr(CS_TableWrapper_t *tw, uint16 EntryId)
{
uint8 *EntryAddr = tw->DefAddr;
uint8 *EntryAddr;

if (tw->DefAddr != NULL && EntryId < tw->NumEntries)
{
Expand Down Expand Up @@ -1085,7 +1085,7 @@ void CS_ResetTablesTblResultEntry(CS_Res_Tables_Table_Entry_t *TablesTblResultEn
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
CFE_Status_t CS_HandleRoutineTableUpdates(void)
{
CFE_Status_t Result = CFE_SUCCESS;
CFE_Status_t Result;
uint16 TableId;
CS_TableWrapper_t *tw;
bool ShouldProcess;
Expand Down