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.

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

Fix #1261, Remove redundant checks in CFE_EVS_EarlyInit #1263

Merged
Merged
Changes from all commits
Commits
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
10 changes: 1 addition & 9 deletions modules/evs/fsw/src/cfe_evs_task.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,6 @@ int32 CFE_EVS_EarlyInit(void)
CFE_PSP_Panic(CFE_PSP_PANIC_MEMORY_ALLOC);
}
else
{
Status = CFE_SUCCESS;
}

if (Status == CFE_SUCCESS)
{
CFE_EVS_ResetDataPtr = (CFE_ES_ResetData_t *)resetAreaAddr;
/* Save pointer to the EVS portion of the CFE reset area */
Expand All @@ -134,12 +129,9 @@ int32 CFE_EVS_EarlyInit(void)
}
else
{
/* Convert to CFE success type */
jphickey marked this conversation as resolved.
Show resolved Hide resolved
Status = CFE_SUCCESS;
}
}

if (Status == CFE_SUCCESS)
{

/* Report log as enabled */
CFE_EVS_Global.EVS_TlmPkt.Payload.LogEnabled = true;
Expand Down