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

Fix #1273, remove PspConfig global object #1274

Merged
merged 1 commit into from
Apr 2, 2021
Merged

Fix #1273, remove PspConfig global object #1274

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: 0 additions & 2 deletions cmake/target/inc/target_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#define TARGET_CONFIG_H

#include "common_types.h"
#include "cfe_psp_configdata.h"

/**
* Prototype for the main system entry function implemented in CFE ES
Expand Down Expand Up @@ -191,7 +190,6 @@ typedef const struct
const char *Default_CoreFilename; /**< Default file name for CFE core executable/library */

Target_CfeConfigData *CfeConfig; /**< CFE configuration sub-structure */
Target_PspConfigData *PspConfig; /**< PSP configuration sub-structure */
CFE_StaticModuleLoadEntry_t
*PspModuleList; /**< List of PSP modules (API structures) statically linked into the core EXE */

Expand Down
1 change: 0 additions & 1 deletion cmake/target/src/target_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ Target_ConfigData GLOBAL_CONFIGDATA = {
.Default_ModuleExtension = CFE_DEFAULT_MODULE_EXTENSION,
.Default_CoreFilename = CFE_DEFAULT_CORE_FILENAME,
.CfeConfig = &GLOBAL_CFE_CONFIGDATA,
.PspConfig = &GLOBAL_PSP_CONFIGDATA,
.PspModuleList = CFE_PSP_MODULE_LIST,
.BuildEnvironment = CFE_BUILD_ENV_TABLE,
.ModuleVersionList = CFE_MODULE_VERSION_TABLE,
Expand Down
12 changes: 6 additions & 6 deletions modules/es/fsw/src/cfe_es_task.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,10 +465,10 @@ int32 CFE_ES_TaskInit(void)
return (Status);
}

Status = CFE_EVS_SendEvent(CFE_ES_INITSTATS_INF_EID, CFE_EVS_EventType_INFORMATION,
"cFS Versions: cfe %s, osal %s, psp %s. cFE chksm %d", GLOBAL_CONFIGDATA.CfeVersion,
GLOBAL_CONFIGDATA.OsalVersion, CFE_PSP_VERSION,
(int)CFE_ES_Global.TaskData.HkPacket.Payload.CFECoreChecksum);
Status =
CFE_EVS_SendEvent(CFE_ES_INITSTATS_INF_EID, CFE_EVS_EventType_INFORMATION,
"cFS Versions: cfe %s, osal %s, psp %s. cFE chksm %d", CFE_SRC_VERSION, OS_GetVersionString(),
CFE_PSP_GetVersionString(), (int)CFE_ES_Global.TaskData.HkPacket.Payload.CFECoreChecksum);

if (Status != CFE_SUCCESS)
{
Expand Down Expand Up @@ -847,8 +847,8 @@ int32 CFE_ES_NoopCmd(const CFE_ES_NoopCmd_t *Cmd)
CFE_ES_Global.TaskData.CommandCounter++;

CFE_EVS_SendEvent(CFE_ES_NOOP_INF_EID, CFE_EVS_EventType_INFORMATION,
"No-op command:\n cFS Versions: cfe %s, osal %s, psp %s", GLOBAL_CONFIGDATA.CfeVersion,
GLOBAL_CONFIGDATA.OsalVersion, CFE_PSP_VERSION);
"No-op command:\n cFS Versions: cfe %s, osal %s, psp %s", CFE_SRC_VERSION, OS_GetVersionString(),
CFE_PSP_GetVersionString());

return CFE_SUCCESS;
} /* End of CFE_ES_NoopCmd() */
Expand Down