Skip to content

Commit 2f0e1a2

Browse files
dzbakerdzbaker
authored
Merge pull request #2617 from nasa/integration-candidate
cFE Integration candidate: Equuleus-rc1+dev21
2 parents f87ab0e + bf05cc8 commit 2f0e1a2

File tree

11 files changed

+76
-79
lines changed

11 files changed

+76
-79
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## Development Build: equuleus-rc1+dev219
4+
- Consistent use of CFE_EVS_EventType_Enum_t for EventType
5+
- Combine redundant switch blocks to simplify CFE_ES_CleanupObjectCallback
6+
- Unloading module after failed app start
7+
- Simplify and clarify EVS_AddLog logic
8+
- See <https://github.com/nasa/cFE/pull/2308>, <https://github.com/nasa/cFE/pull/2612>, <https://github.com/nasa/cFE/pull/2616>, and <https://github.com/nasa/cFE/pull/2309>
9+
310
## Development Build: equuleus-rc1+dev209
411
- Remove redundant status check in CFE_ES_RegisterCDSEx()
512
- See <https://github.com/nasa/cFE/pull/2329>

‎modules/cfe_assert/src/cfe_assert_runner.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ bool CFE_Assert_Status_DeferredCheck(CFE_Status_t Status, UtAssert_CaseType_t Ca
154154

155155
void CFE_Assert_StatusReport(uint8 MessageType, const char *Prefix, const char *OutputMessage)
156156
{
157-
uint16 EventType;
157+
CFE_EVS_EventType_Enum_t EventType;
158158

159159
switch (MessageType)
160160
{

‎modules/core_api/fsw/inc/cfe_evs.h‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@ CFE_Status_t CFE_EVS_Register(const void *Filters, uint16 NumEventFilters, uint1
152152
** \sa #CFE_EVS_SendEventWithAppID, #CFE_EVS_SendTimedEvent
153153
**
154154
**/
155-
CFE_Status_t CFE_EVS_SendEvent(uint16 EventID, uint16 EventType, const char *Spec, ...) OS_PRINTF(3, 4);
155+
CFE_Status_t CFE_EVS_SendEvent(uint16 EventID, CFE_EVS_EventType_Enum_t EventType, const char *Spec, ...)
156+
OS_PRINTF(3, 4);
156157

157158
/**
158159
** \brief Generate a software event given the specified Application ID.
@@ -201,8 +202,8 @@ CFE_Status_t CFE_EVS_SendEvent(uint16 EventID, uint16 EventType, const char *Spe
201202
** \sa #CFE_EVS_SendEvent, #CFE_EVS_SendTimedEvent
202203
**
203204
**/
204-
CFE_Status_t CFE_EVS_SendEventWithAppID(uint16 EventID, uint16 EventType, CFE_ES_AppId_t AppID, const char *Spec, ...)
205-
OS_PRINTF(4, 5);
205+
CFE_Status_t CFE_EVS_SendEventWithAppID(uint16 EventID, CFE_EVS_EventType_Enum_t EventType, CFE_ES_AppId_t AppID,
206+
const char *Spec, ...) OS_PRINTF(4, 5);
206207

207208
/**
208209
** \brief Generate a software event with a specific time tag.
@@ -251,8 +252,8 @@ CFE_Status_t CFE_EVS_SendEventWithAppID(uint16 EventID, uint16 EventType, CFE_ES
251252
** \sa #CFE_EVS_SendEvent, #CFE_EVS_SendEventWithAppID
252253
**
253254
**/
254-
CFE_Status_t CFE_EVS_SendTimedEvent(CFE_TIME_SysTime_t Time, uint16 EventID, uint16 EventType, const char *Spec, ...)
255-
OS_PRINTF(4, 5);
255+
CFE_Status_t CFE_EVS_SendTimedEvent(CFE_TIME_SysTime_t Time, uint16 EventID, CFE_EVS_EventType_Enum_t EventType,
256+
const char *Spec, ...) OS_PRINTF(4, 5);
256257
/**@}*/
257258

258259
/** @defgroup CFEAPIEVSResetFilter cFE Reset Event Filter APIs

‎modules/core_api/fsw/inc/cfe_version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#define CFE_VERSION_H
2727

2828
/* Development Build Macro Definitions */
29-
#define CFE_BUILD_NUMBER 209 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
29+
#define CFE_BUILD_NUMBER 219 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
3030
#define CFE_BUILD_BASELINE "equuleus-rc1" /**< @brief Development: Reference git tag for build number */
3131
#define CFE_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
3232
#define CFE_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */

‎modules/core_api/ut-stubs/src/cfe_evs_stubs.c‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@ CFE_Status_t CFE_EVS_ResetFilter(uint16 EventID)
8484
* Generated stub function for CFE_EVS_SendEvent()
8585
* ----------------------------------------------------
8686
*/
87-
CFE_Status_t CFE_EVS_SendEvent(uint16 EventID, uint16 EventType, const char *Spec, ...)
87+
CFE_Status_t CFE_EVS_SendEvent(uint16 EventID, CFE_EVS_EventType_Enum_t EventType, const char *Spec, ...)
8888
{
8989
va_list UtStub_ArgList;
9090

9191
UT_GenStub_SetupReturnBuffer(CFE_EVS_SendEvent, CFE_Status_t);
9292

9393
UT_GenStub_AddParam(CFE_EVS_SendEvent, uint16, EventID);
94-
UT_GenStub_AddParam(CFE_EVS_SendEvent, uint16, EventType);
94+
UT_GenStub_AddParam(CFE_EVS_SendEvent, CFE_EVS_EventType_Enum_t, EventType);
9595
UT_GenStub_AddParam(CFE_EVS_SendEvent, const char *, Spec);
9696

9797
va_start(UtStub_ArgList, Spec);
@@ -106,14 +106,15 @@ CFE_Status_t CFE_EVS_SendEvent(uint16 EventID, uint16 EventType, const char *Spe
106106
* Generated stub function for CFE_EVS_SendEventWithAppID()
107107
* ----------------------------------------------------
108108
*/
109-
CFE_Status_t CFE_EVS_SendEventWithAppID(uint16 EventID, uint16 EventType, CFE_ES_AppId_t AppID, const char *Spec, ...)
109+
CFE_Status_t CFE_EVS_SendEventWithAppID(uint16 EventID, CFE_EVS_EventType_Enum_t EventType, CFE_ES_AppId_t AppID,
110+
const char *Spec, ...)
110111
{
111112
va_list UtStub_ArgList;
112113

113114
UT_GenStub_SetupReturnBuffer(CFE_EVS_SendEventWithAppID, CFE_Status_t);
114115

115116
UT_GenStub_AddParam(CFE_EVS_SendEventWithAppID, uint16, EventID);
116-
UT_GenStub_AddParam(CFE_EVS_SendEventWithAppID, uint16, EventType);
117+
UT_GenStub_AddParam(CFE_EVS_SendEventWithAppID, CFE_EVS_EventType_Enum_t, EventType);
117118
UT_GenStub_AddParam(CFE_EVS_SendEventWithAppID, CFE_ES_AppId_t, AppID);
118119
UT_GenStub_AddParam(CFE_EVS_SendEventWithAppID, const char *, Spec);
119120

@@ -129,15 +130,16 @@ CFE_Status_t CFE_EVS_SendEventWithAppID(uint16 EventID, uint16 EventType, CFE_ES
129130
* Generated stub function for CFE_EVS_SendTimedEvent()
130131
* ----------------------------------------------------
131132
*/
132-
CFE_Status_t CFE_EVS_SendTimedEvent(CFE_TIME_SysTime_t Time, uint16 EventID, uint16 EventType, const char *Spec, ...)
133+
CFE_Status_t CFE_EVS_SendTimedEvent(CFE_TIME_SysTime_t Time, uint16 EventID, CFE_EVS_EventType_Enum_t EventType,
134+
const char *Spec, ...)
133135
{
134136
va_list UtStub_ArgList;
135137

136138
UT_GenStub_SetupReturnBuffer(CFE_EVS_SendTimedEvent, CFE_Status_t);
137139

138140
UT_GenStub_AddParam(CFE_EVS_SendTimedEvent, CFE_TIME_SysTime_t, Time);
139141
UT_GenStub_AddParam(CFE_EVS_SendTimedEvent, uint16, EventID);
140-
UT_GenStub_AddParam(CFE_EVS_SendTimedEvent, uint16, EventType);
142+
UT_GenStub_AddParam(CFE_EVS_SendTimedEvent, CFE_EVS_EventType_Enum_t, EventType);
141143
UT_GenStub_AddParam(CFE_EVS_SendTimedEvent, const char *, Spec);
142144

143145
va_start(UtStub_ArgList, Spec);

‎modules/es/fsw/src/cfe_es_apps.c‎

Lines changed: 35 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,8 @@ void CFE_ES_StartApplications(uint32 ResetType, const char *StartFilePath)
284284
*-----------------------------------------------------------------*/
285285
int32 CFE_ES_ParseFileEntry(const char **TokenList, uint32 NumTokens)
286286
{
287-
const char * ModuleName;
288-
const char * EntryType;
287+
const char *ModuleName;
288+
const char *EntryType;
289289
unsigned long ParsedValue;
290290
union
291291
{
@@ -495,7 +495,7 @@ int32 CFE_ES_LoadModule(CFE_ResourceId_t ParentResourceId, const char *ModuleNam
495495
*-----------------------------------------------------------------*/
496496
int32 CFE_ES_GetTaskFunction(CFE_ES_TaskEntryFuncPtr_t *FuncPtr)
497497
{
498-
CFE_ES_TaskRecord_t * TaskRecPtr;
498+
CFE_ES_TaskRecord_t *TaskRecPtr;
499499
CFE_ES_TaskEntryFuncPtr_t EntryFunc;
500500
int32 ReturnCode;
501501
int32 Timeout;
@@ -656,6 +656,7 @@ int32 CFE_ES_StartAppTask(CFE_ES_TaskId_t *TaskIdPtr, const char *TaskName, CFE_
656656
int32 CFE_ES_AppCreate(CFE_ES_AppId_t *ApplicationIdPtr, const char *AppName, const CFE_ES_AppStartParams_t *Params)
657657
{
658658
CFE_Status_t Status;
659+
CFE_Status_t CleanupStatus;
659660
CFE_ES_AppRecord_t *AppRecPtr;
660661
CFE_ResourceId_t PendingResourceId = CFE_RESOURCEID_UNDEFINED;
661662

@@ -799,6 +800,16 @@ int32 CFE_ES_AppCreate(CFE_ES_AppId_t *ApplicationIdPtr, const char *AppName, co
799800
/*
800801
* Set the table entry back to free
801802
*/
803+
if (OS_ObjectIdDefined(AppRecPtr->LoadStatus.ModuleId))
804+
{
805+
CleanupStatus = OS_ModuleUnload(AppRecPtr->LoadStatus.ModuleId);
806+
if (CleanupStatus != OS_SUCCESS)
807+
{
808+
CFE_ES_WriteToSysLog("%s: Module (ID:0x%08lX) Unload failed. RC=%ld\n", __func__,
809+
OS_ObjectIdToInteger(AppRecPtr->LoadStatus.ModuleId), (long)CleanupStatus);
810+
}
811+
}
812+
802813
CFE_ES_AppRecordSetFree(AppRecPtr);
803814
PendingResourceId = CFE_RESOURCEID_UNDEFINED;
804815
}
@@ -819,7 +830,7 @@ int32 CFE_ES_AppCreate(CFE_ES_AppId_t *ApplicationIdPtr, const char *AppName, co
819830
int32 CFE_ES_LoadLibrary(CFE_ES_LibId_t *LibraryIdPtr, const char *LibName, const CFE_ES_ModuleLoadParams_t *Params)
820831
{
821832
CFE_ES_LibraryEntryFuncPtr_t FunctionPointer;
822-
CFE_ES_LibRecord_t * LibSlotPtr;
833+
CFE_ES_LibRecord_t *LibSlotPtr;
823834
int32 Status;
824835
CFE_ResourceId_t PendingResourceId;
825836

@@ -974,7 +985,7 @@ bool CFE_ES_RunAppTableScan(uint32 ElapsedTime, void *Arg)
974985
{
975986
CFE_ES_AppTableScanState_t *State = (CFE_ES_AppTableScanState_t *)Arg;
976987
uint32 i;
977-
CFE_ES_AppRecord_t * AppPtr;
988+
CFE_ES_AppRecord_t *AppPtr;
978989
CFE_ES_AppId_t AppTimeoutList[CFE_PLATFORM_ES_MAX_APPLICATIONS];
979990
uint32 NumAppTimeouts;
980991

@@ -1092,14 +1103,14 @@ bool CFE_ES_RunAppTableScan(uint32 ElapsedTime, void *Arg)
10921103
*-----------------------------------------------------------------*/
10931104
void CFE_ES_ProcessControlRequest(CFE_ES_AppId_t AppId)
10941105
{
1095-
CFE_ES_AppRecord_t * AppRecPtr;
1106+
CFE_ES_AppRecord_t *AppRecPtr;
10961107
uint32 PendingControlReq;
10971108
CFE_ES_AppStartParams_t RestartParams;
10981109
char OrigAppName[OS_MAX_API_NAME];
10991110
CFE_Status_t CleanupStatus;
11001111
CFE_Status_t StartupStatus;
11011112
CFE_ES_AppId_t NewAppId;
1102-
const char * ReqName;
1113+
const char *ReqName;
11031114
char MessageDetail[48];
11041115
uint16 EventID;
11051116
CFE_EVS_EventType_Enum_t EventType;
@@ -1325,8 +1336,8 @@ int32 CFE_ES_CleanUpApp(CFE_ES_AppId_t AppId)
13251336
osal_id_t ModuleId;
13261337
uint32 NumTasks;
13271338
uint32 NumPools;
1328-
CFE_ES_AppRecord_t * AppRecPtr;
1329-
CFE_ES_TaskRecord_t * TaskRecPtr;
1339+
CFE_ES_AppRecord_t *AppRecPtr;
1340+
CFE_ES_TaskRecord_t *TaskRecPtr;
13301341
CFE_ES_MemPoolRecord_t *MemPoolRecPtr;
13311342

13321343
NumTasks = 0;
@@ -1565,6 +1576,7 @@ void CFE_ES_CleanupObjectCallback(osal_id_t ObjectId, void *arg)
15651576
int32 OsStatus;
15661577
osal_objtype_t ObjType;
15671578
bool ObjIsValid;
1579+
CFE_Status_t ErrorStatus = CFE_ES_APP_CLEANUP_ERR; // Set default cFE error status
15681580

15691581
CleanState = (CFE_ES_CleanupState_t *)arg;
15701582
ObjIsValid = true;
@@ -1573,22 +1585,28 @@ void CFE_ES_CleanupObjectCallback(osal_id_t ObjectId, void *arg)
15731585
switch (ObjType)
15741586
{
15751587
case OS_OBJECT_TYPE_OS_TASK:
1576-
OsStatus = OS_TaskDelete(ObjectId);
1588+
OsStatus = OS_TaskDelete(ObjectId);
1589+
ErrorStatus = CFE_ES_ERR_CHILD_TASK_DELETE;
15771590
break;
15781591
case OS_OBJECT_TYPE_OS_QUEUE:
1579-
OsStatus = OS_QueueDelete(ObjectId);
1592+
OsStatus = OS_QueueDelete(ObjectId);
1593+
ErrorStatus = CFE_ES_QUEUE_DELETE_ERR;
15801594
break;
15811595
case OS_OBJECT_TYPE_OS_BINSEM:
1582-
OsStatus = OS_BinSemDelete(ObjectId);
1596+
OsStatus = OS_BinSemDelete(ObjectId);
1597+
ErrorStatus = CFE_ES_BIN_SEM_DELETE_ERR;
15831598
break;
15841599
case OS_OBJECT_TYPE_OS_COUNTSEM:
1585-
OsStatus = OS_CountSemDelete(ObjectId);
1600+
OsStatus = OS_CountSemDelete(ObjectId);
1601+
ErrorStatus = CFE_ES_COUNT_SEM_DELETE_ERR;
15861602
break;
15871603
case OS_OBJECT_TYPE_OS_MUTEX:
1588-
OsStatus = OS_MutSemDelete(ObjectId);
1604+
OsStatus = OS_MutSemDelete(ObjectId);
1605+
ErrorStatus = CFE_ES_MUT_SEM_DELETE_ERR;
15891606
break;
15901607
case OS_OBJECT_TYPE_OS_TIMECB:
1591-
OsStatus = OS_TimerDelete(ObjectId);
1608+
OsStatus = OS_TimerDelete(ObjectId);
1609+
ErrorStatus = CFE_ES_TIMER_DELETE_ERR;
15921610
break;
15931611
case OS_OBJECT_TYPE_OS_STREAM:
15941612
OsStatus = OS_close(ObjectId);
@@ -1615,36 +1633,8 @@ void CFE_ES_CleanupObjectCallback(osal_id_t ObjectId, void *arg)
16151633
OS_ObjectIdToInteger(ObjectId), (long)OsStatus);
16161634
if (CleanState->OverallStatus == CFE_SUCCESS)
16171635
{
1618-
/*
1619-
* Translate any OS failures into the appropriate CFE_ES return codes
1620-
* (Some object types have special return codes, depending on what type
1621-
* of object failed to delete)
1622-
*/
1623-
switch (ObjType)
1624-
{
1625-
case OS_OBJECT_TYPE_OS_TASK:
1626-
CleanState->OverallStatus = CFE_ES_ERR_CHILD_TASK_DELETE;
1627-
break;
1628-
case OS_OBJECT_TYPE_OS_QUEUE:
1629-
CleanState->OverallStatus = CFE_ES_QUEUE_DELETE_ERR;
1630-
break;
1631-
case OS_OBJECT_TYPE_OS_BINSEM:
1632-
CleanState->OverallStatus = CFE_ES_BIN_SEM_DELETE_ERR;
1633-
break;
1634-
case OS_OBJECT_TYPE_OS_COUNTSEM:
1635-
CleanState->OverallStatus = CFE_ES_COUNT_SEM_DELETE_ERR;
1636-
break;
1637-
case OS_OBJECT_TYPE_OS_MUTEX:
1638-
CleanState->OverallStatus = CFE_ES_MUT_SEM_DELETE_ERR;
1639-
break;
1640-
case OS_OBJECT_TYPE_OS_TIMECB:
1641-
CleanState->OverallStatus = CFE_ES_TIMER_DELETE_ERR;
1642-
break;
1643-
default:
1644-
/* generic failure */
1645-
CleanState->OverallStatus = CFE_ES_APP_CLEANUP_ERR;
1646-
break;
1647-
}
1636+
// Save the object-type-specific error status that was set earlier in the switch statement
1637+
CleanState->OverallStatus = ErrorStatus;
16481638
}
16491639
}
16501640
}

‎modules/evs/config/default_cfe_evs_msgdefs.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,10 @@ typedef struct CFE_EVS_HousekeepingTlm_Payload
222222
typedef struct CFE_EVS_PacketID
223223
{
224224
char AppName[CFE_MISSION_MAX_API_LEN]; /**< \cfetlmmnemonic \EVS_APPNAME
225-
\brief Application name */
225+
\brief Application name */
226226
uint16 EventID; /**< \cfetlmmnemonic \EVS_EVENTID
227227
\brief Numerical event identifier */
228-
uint16 EventType; /**< \cfetlmmnemonic \EVS_EVENTTYPE
228+
CFE_EVS_EventType_Enum_t EventType; /**< \cfetlmmnemonic \EVS_EVENTTYPE
229229
\brief Numerical event type identifier */
230230
uint32 SpacecraftID; /**< \cfetlmmnemonic \EVS_SCID
231231
\brief Spacecraft identifier */

‎modules/evs/fsw/src/cfe_evs.c‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ CFE_Status_t CFE_EVS_Register(const void *Filters, uint16 NumEventFilters, uint1
116116
* See description in header file for argument/return detail
117117
*
118118
*-----------------------------------------------------------------*/
119-
CFE_Status_t CFE_EVS_SendEvent(uint16 EventID, uint16 EventType, const char *Spec, ...)
119+
CFE_Status_t CFE_EVS_SendEvent(uint16 EventID, CFE_EVS_EventType_Enum_t EventType, const char *Spec, ...)
120120
{
121121
int32 Status;
122122
CFE_ES_AppId_t AppID;
@@ -166,7 +166,8 @@ CFE_Status_t CFE_EVS_SendEvent(uint16 EventID, uint16 EventType, const char *Spe
166166
* See description in header file for argument/return detail
167167
*
168168
*-----------------------------------------------------------------*/
169-
CFE_Status_t CFE_EVS_SendEventWithAppID(uint16 EventID, uint16 EventType, CFE_ES_AppId_t AppID, const char *Spec, ...)
169+
CFE_Status_t CFE_EVS_SendEventWithAppID(uint16 EventID, CFE_EVS_EventType_Enum_t EventType, CFE_ES_AppId_t AppID,
170+
const char *Spec, ...)
170171
{
171172
int32 Status = CFE_SUCCESS;
172173
CFE_TIME_SysTime_t Time;
@@ -215,7 +216,8 @@ CFE_Status_t CFE_EVS_SendEventWithAppID(uint16 EventID, uint16 EventType, CFE_ES
215216
* See description in header file for argument/return detail
216217
*
217218
*-----------------------------------------------------------------*/
218-
CFE_Status_t CFE_EVS_SendTimedEvent(CFE_TIME_SysTime_t Time, uint16 EventID, uint16 EventType, const char *Spec, ...)
219+
CFE_Status_t CFE_EVS_SendTimedEvent(CFE_TIME_SysTime_t Time, uint16 EventID, CFE_EVS_EventType_Enum_t EventType,
220+
const char *Spec, ...)
219221
{
220222
int32 Status;
221223
CFE_ES_AppId_t AppID;

‎modules/evs/fsw/src/cfe_evs_log.c‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,15 @@ void EVS_AddLog(CFE_EVS_LongEventTlm_t *EVS_PktPtr)
4242
/* Serialize access to event log control variables */
4343
OS_MutSemTake(CFE_EVS_Global.EVS_SharedDataMutexID);
4444

45-
if ((CFE_EVS_Global.EVS_LogPtr->LogFullFlag == true) &&
46-
(CFE_EVS_Global.EVS_LogPtr->LogMode == CFE_EVS_LogMode_DISCARD))
45+
if (CFE_EVS_Global.EVS_LogPtr->LogFullFlag == true)
4746
{
48-
/* If log is full and in discard mode, just count the event */
4947
CFE_EVS_Global.EVS_LogPtr->LogOverflowCounter++;
5048
}
51-
else
52-
{
53-
if (CFE_EVS_Global.EVS_LogPtr->LogFullFlag == true)
54-
{
55-
/* If log is full and in wrap mode, count it and store it */
56-
CFE_EVS_Global.EVS_LogPtr->LogOverflowCounter++;
57-
}
5849

50+
/* If the log is not full, _or_ if it is in OVERWRITE mode, add the event to the log */
51+
if ((CFE_EVS_Global.EVS_LogPtr->LogFullFlag == false) ||
52+
(CFE_EVS_Global.EVS_LogPtr->LogMode == CFE_EVS_LogMode_OVERWRITE))
53+
{
5954
/* Copy the event data to the next available entry in the log */
6055
memcpy(&CFE_EVS_Global.EVS_LogPtr->LogEntry[CFE_EVS_Global.EVS_LogPtr->Next], EVS_PktPtr, sizeof(*EVS_PktPtr));
6156

‎modules/evs/fsw/src/cfe_evs_utils.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ int32 EVS_NotRegistered(EVS_AppData_t *AppDataPtr, CFE_ES_AppId_t CallerID)
184184
* See description in header file for argument/return detail
185185
*
186186
*-----------------------------------------------------------------*/
187-
bool EVS_IsFiltered(EVS_AppData_t *AppDataPtr, uint16 EventID, uint16 EventType)
187+
bool EVS_IsFiltered(EVS_AppData_t *AppDataPtr, uint16 EventID, CFE_EVS_EventType_Enum_t EventType)
188188
{
189189
EVS_BinFilter_t *FilterPtr;
190190
bool Filtered = false;
@@ -449,7 +449,7 @@ void EVS_DisableTypes(EVS_AppData_t *AppDataPtr, uint8 BitMask)
449449
* See description in header file for argument/return detail
450450
*
451451
*-----------------------------------------------------------------*/
452-
void EVS_GenerateEventTelemetry(EVS_AppData_t *AppDataPtr, uint16 EventID, uint16 EventType,
452+
void EVS_GenerateEventTelemetry(EVS_AppData_t *AppDataPtr, uint16 EventID, CFE_EVS_EventType_Enum_t EventType,
453453
const CFE_TIME_SysTime_t *TimeStamp, const char *MsgSpec, va_list ArgPtr)
454454
{
455455
CFE_EVS_LongEventTlm_t LongEventTlm; /* The "long" flavor is always generated, as this is what is logged */
@@ -592,7 +592,7 @@ void EVS_OutputPort(uint8 PortNum, char *Message)
592592
* See description in header file for argument/return detail
593593
*
594594
*-----------------------------------------------------------------*/
595-
int32 EVS_SendEvent(uint16 EventID, uint16 EventType, const char *Spec, ...)
595+
int32 EVS_SendEvent(uint16 EventID, CFE_EVS_EventType_Enum_t EventType, const char *Spec, ...)
596596
{
597597
CFE_TIME_SysTime_t Time;
598598
va_list Ptr;

0 commit comments

Comments
 (0)