Merge pull request #67 from jphickey/fix-66-tabledefs

Fix #66, remove compiler extensions from tbldefs
nasa · Feb 16, 2023 · 53bf044 · 53bf044
2 parents a99b890 + cbea300
commit 53bf044
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/fsw/tables/hs_amt.c b/fsw/tables/hs_amt.c
@@ -30,11 +30,10 @@
 #include "hs_tbldefs.h"
 #include "cfe_tbl_filedef.h"
 
-static CFE_TBL_FileDef_t CFE_TBL_FileDef
-    __attribute__((__used__)) = {"HS_Default_AppMon_Tbl", HS_APP_NAME ".AppMon_Tbl", "HS AppMon Table", "hs_amt.tbl",
-                                 (sizeof(HS_AMTEntry_t) * HS_MAX_MONITORED_APPS)};
+CFE_TBL_FileDef_t CFE_TBL_FileDef = {"HS_AppMon_Tbl", HS_APP_NAME ".AppMon_Tbl", "HS AppMon Table", "hs_amt.tbl",
+                                     (sizeof(HS_AMTEntry_t) * HS_MAX_MONITORED_APPS)};
 
-HS_AMTEntry_t HS_Default_AppMon_Tbl[HS_MAX_MONITORED_APPS] = {
+HS_AMTEntry_t HS_AppMon_Tbl[HS_MAX_MONITORED_APPS] = {
     /*          AppName                    NullTerm CycleCount     ActionType */
 
     /*   0 */ {"CFE_ES", 0, 10, HS_AMT_ACT_NOACT},

diff --git a/fsw/tables/hs_emt.c b/fsw/tables/hs_emt.c
@@ -30,11 +30,10 @@
 #include "hs_tbldefs.h"
 #include "cfe_tbl_filedef.h"
 
-static CFE_TBL_FileDef_t CFE_TBL_FileDef
-    __attribute__((__used__)) = {"HS_Default_EventMon_Tbl", HS_APP_NAME ".EventMon_Tbl", "HS EventMon Table",
-                                 "hs_emt.tbl", (sizeof(HS_EMTEntry_t) * HS_MAX_MONITORED_EVENTS)};
+CFE_TBL_FileDef_t CFE_TBL_FileDef = {"HS_EventMon_Tbl", HS_APP_NAME ".EventMon_Tbl", "HS EventMon Table", "hs_emt.tbl",
+                                     (sizeof(HS_EMTEntry_t) * HS_MAX_MONITORED_EVENTS)};
 
-HS_EMTEntry_t HS_Default_EventMon_Tbl[HS_MAX_MONITORED_EVENTS] = {
+HS_EMTEntry_t HS_EventMon_Tbl[HS_MAX_MONITORED_EVENTS] = {
     /*          AppName                    NullTerm EventID        ActionType */
 
     /*   0 */ {"CFE_ES", 0, 10, HS_EMT_ACT_NOACT},

diff --git a/fsw/tables/hs_mat.c b/fsw/tables/hs_mat.c
@@ -30,11 +30,10 @@
 #include "hs_tbldefs.h"
 #include "cfe_tbl_filedef.h"
 
-static CFE_TBL_FileDef_t CFE_TBL_FileDef
-    __attribute__((__used__)) = {"HS_Default_MsgActs_Tbl", HS_APP_NAME ".MsgActs_Tbl", "HS MsgActs Table", "hs_mat.tbl",
-                                 (sizeof(HS_MATEntry_t) * HS_MAX_MSG_ACT_TYPES)};
+CFE_TBL_FileDef_t CFE_TBL_FileDef = {"HS_MsgActs_Tbl", HS_APP_NAME ".MsgActs_Tbl", "HS MsgActs Table", "hs_mat.tbl",
+                                     (sizeof(HS_MATEntry_t) * HS_MAX_MSG_ACT_TYPES)};
 
-HS_MATEntry_t HS_Default_MsgActs_Tbl[HS_MAX_MSG_ACT_TYPES] = {
+HS_MATEntry_t HS_MsgActs_Tbl[HS_MAX_MSG_ACT_TYPES] = {
     /*          EnableState               Cooldown   Message */
 
     /*   0 */ {HS_MAT_STATE_DISABLED,

diff --git a/fsw/tables/hs_xct.c b/fsw/tables/hs_xct.c
@@ -30,11 +30,10 @@
 #include "hs_tbldefs.h"
 #include "cfe_tbl_filedef.h"
 
-static CFE_TBL_FileDef_t CFE_TBL_FileDef
-    __attribute__((__used__)) = {"HS_Default_ExeCount_Tbl", HS_APP_NAME ".ExeCount_Tbl", "HS ExeCount Table",
-                                 "hs_xct.tbl", (sizeof(HS_XCTEntry_t) * HS_MAX_EXEC_CNT_SLOTS)};
+CFE_TBL_FileDef_t CFE_TBL_FileDef = {"HS_ExeCount_Tbl", HS_APP_NAME ".ExeCount_Tbl", "HS ExeCount Table",
+                                     "hs_xct.tbl", (sizeof(HS_XCTEntry_t) * HS_MAX_EXEC_CNT_SLOTS)};
 
-HS_XCTEntry_t HS_Default_ExeCount_Tbl[HS_MAX_EXEC_CNT_SLOTS] = {
+HS_XCTEntry_t HS_ExeCount_Tbl[HS_MAX_EXEC_CNT_SLOTS] = {
     /*          ResourceName               NullTerm ResourceType              */
 
     /*   0 */ {"CFE_ES", 0, HS_XCT_TYPE_APP_MAIN},