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

Fix #69, Simplify CS_AttemptTableReshare #70

Merged
merged 1 commit into from
Apr 13, 2023
Merged

Fix #69, Simplify CS_AttemptTableReshare #70

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
18 changes: 5 additions & 13 deletions fsw/src/cs_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,36 +1004,28 @@ int32 CS_HandleRoutineTableUpdates(void)
int32 CS_AttemptTableReshare(CS_Res_Tables_Table_Entry_t *ResultsEntry, CFE_TBL_Handle_t *LocalTblHandle,
CFE_TBL_Info_t *TblInfo, cpuaddr *LocalAddress, int32 *ResultGetInfo)
{
int32 Result = CS_SUCCESS;
int32 ResultShare = 0;
int32 ResultGetAddress = 0;
int32 Result;

/* Maybe the table came back, try and reshare it */
ResultShare = CFE_TBL_Share(LocalTblHandle, ResultsEntry->Name);
Result = CFE_TBL_Share(LocalTblHandle, ResultsEntry->Name);

if (ResultShare == CFE_SUCCESS)
if (Result == CFE_SUCCESS)
{
ResultsEntry->TblHandle = *LocalTblHandle;

*ResultGetInfo = CFE_TBL_GetInfo(TblInfo, ResultsEntry->Name);

/* need to try to get the address again */
ResultGetAddress = CFE_TBL_GetAddress((void *)LocalAddress, *LocalTblHandle);
Result = ResultGetAddress;
Result = CFE_TBL_GetAddress((void *)LocalAddress, *LocalTblHandle);

/* if the table was never loaded, release the address to prevent the table from being
locked by CS, which would prevent the owner app from updating it*/
if (ResultGetAddress == CFE_TBL_ERR_NEVER_LOADED)
if (Result == CFE_TBL_ERR_NEVER_LOADED)
{
CFE_TBL_ReleaseAddress(*LocalTblHandle);
}
}

else /* table was not there on the new share */
{
Result = ResultShare;
}

return Result;
}

Expand Down