Fix nasa#2175, Rename Initialization Event IDs

thnkslprpt · Oct 21, 2022 · 6b9ff97 · 6b9ff97
1 parent 8a87314
commit 6b9ff97
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/modules/evs/fsw/inc/cfe_evs_events.h b/modules/evs/fsw/inc/cfe_evs_events.h
@@ -50,7 +50,7 @@
  *
  *  Event Services Task initialization complete.
  */
-#define CFE_EVS_STARTUP_EID 1
+#define CFE_EVS_INIT_INF_EID 1
 
 /**
  * \brief EVS Write Event Log Command File Write Entry Failed Event ID

diff --git a/modules/evs/fsw/src/cfe_evs_task.c b/modules/evs/fsw/src/cfe_evs_task.c
@@ -302,7 +302,7 @@ int32 CFE_EVS_TaskInit(void)
 
     /* Write the AppID to the global location, now that the rest of initialization is done */
     CFE_EVS_Global.EVS_AppID = AppID;
-    EVS_SendEvent(CFE_EVS_STARTUP_EID, CFE_EVS_EventType_INFORMATION, "cFE EVS Initialized: %s", CFE_VERSION_STRING);
+    EVS_SendEvent(CFE_EVS_INIT_INF_EID, CFE_EVS_EventType_INFORMATION, "cFE EVS Initialized: %s", CFE_VERSION_STRING);
 
     return CFE_SUCCESS;
 }

diff --git a/modules/sb/fsw/inc/cfe_sb_events.h b/modules/sb/fsw/inc/cfe_sb_events.h
@@ -39,7 +39,7 @@
  *
  *  Software Bus Services Task initialization complete.
  */
-#define CFE_SB_INIT_EID 1
+#define CFE_SB_INIT_INF_EID 1
 
 /**
  * \brief SB Create Pipe API Bad Argument Event ID

diff --git a/modules/sb/fsw/src/cfe_sb_task.c b/modules/sb/fsw/src/cfe_sb_task.c
@@ -266,8 +266,8 @@ int32 CFE_SB_AppInit(void)
         return Status;
     }
 
-    Status =
-        CFE_EVS_SendEvent(CFE_SB_INIT_EID, CFE_EVS_EventType_INFORMATION, "cFE SB Initialized: %s", CFE_VERSION_STRING);
+    Status = CFE_EVS_SendEvent(CFE_SB_INIT_INF_EID, CFE_EVS_EventType_INFORMATION, "cFE SB Initialized: %s",
+                               CFE_VERSION_STRING);
     if (Status != CFE_SUCCESS)
     {
         CFE_ES_WriteToSysLog("%s: Error sending init event:RC=0x%08X\n", __func__, (unsigned int)Status);

diff --git a/modules/sb/ut-coverage/sb_UT.c b/modules/sb/ut-coverage/sb_UT.c
@@ -392,7 +392,7 @@ void Test_SB_Main_RcvErr(void)
 
     CFE_UtAssert_EVENTCOUNT(6);
 
-    CFE_UtAssert_EVENTSENT(CFE_SB_INIT_EID);
+    CFE_UtAssert_EVENTSENT(CFE_SB_INIT_INF_EID);
 
     CFE_UtAssert_EVENTSENT(CFE_SB_Q_RD_ERR_EID);
 
@@ -443,7 +443,7 @@ void Test_SB_Main_Nominal(void)
 
     CFE_UtAssert_EVENTCOUNT(6);
 
-    CFE_UtAssert_EVENTSENT(CFE_SB_INIT_EID);
+    CFE_UtAssert_EVENTSENT(CFE_SB_INIT_INF_EID);
     CFE_UtAssert_EVENTSENT(CFE_SB_CMD0_RCVD_EID);
 
     /* remove the handler so the pipe can be deleted */
@@ -616,7 +616,7 @@ void Test_SB_Cmds_RoutingInfoDef(void)
 
     CFE_UtAssert_EVENTCOUNT(5);
 
-    CFE_UtAssert_EVENTSENT(CFE_SB_INIT_EID);
+    CFE_UtAssert_EVENTSENT(CFE_SB_INIT_INF_EID);
 
     CFE_UtAssert_EVENTSENT(CFE_SB_SUBSCRIPTION_RCVD_EID);
 

diff --git a/modules/time/fsw/inc/cfe_time_events.h b/modules/time/fsw/inc/cfe_time_events.h
@@ -39,7 +39,7 @@
  *
  *  Time Services Task Initialization complete.
  */
-#define CFE_TIME_INIT_EID 1
+#define CFE_TIME_INIT_INF_EID 1
 
 /**
  * \brief TIME No-op Command Success Event ID

diff --git a/modules/time/fsw/src/cfe_time_task.c b/modules/time/fsw/src/cfe_time_task.c
@@ -259,7 +259,7 @@ int32 CFE_TIME_TaskInit(void)
         return Status;
     }
 
-    Status = CFE_EVS_SendEvent(CFE_TIME_INIT_EID, CFE_EVS_EventType_INFORMATION, "cFE TIME Initialized: %s",
+    Status = CFE_EVS_SendEvent(CFE_TIME_INIT_INF_EID, CFE_EVS_EventType_INFORMATION, "cFE TIME Initialized: %s",
                                CFE_VERSION_STRING);
     if (Status != CFE_SUCCESS)
     {