Merge pull request #75 from jphickey/fix-69-tbldefs

Fix #69, simplify table defs
nasa · Feb 16, 2023 · 14e7b85 · 14e7b85
2 parents c8a97fb + 993d26e
commit 14e7b85
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/fsw/tables/lc_def_adt.c b/fsw/tables/lc_def_adt.c
@@ -169,14 +169,13 @@
 /*
 ** Table file header
 */
-static CFE_TBL_FileDef_t CFE_TBL_FileDef
- __attribute__((__used__)) = {"LC_DefaultADT", LC_APP_NAME "." LC_ADT_TABLENAME, "LC actionpoint definition table",
- "lc_def_adt.tbl", (sizeof(LC_ADTEntry_t) * LC_MAX_ACTIONPOINTS)};
+CFE_TBL_FileDef_t CFE_TBL_FileDef = {"LC_ADT", LC_APP_NAME "." LC_ADT_TABLENAME, "LC actionpoint definition table",
+ "lc_def_adt.tbl", (sizeof(LC_ADTEntry_t) * LC_MAX_ACTIONPOINTS)};
 
 /*
 ** Default actionpoint definition table (ADT) data
 */
-LC_ADTEntry_t LC_DefaultADT[LC_MAX_ACTIONPOINTS] = {
+LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = {
  /* #0 (unused) */
  {.DefaultState = LC_ACTION_NOT_USED,
  .MaxPassiveEvents = 0,

diff --git a/fsw/tables/lc_def_wdt.c b/fsw/tables/lc_def_wdt.c
@@ -90,14 +90,13 @@
 /*
 ** Table file header
 */
-static CFE_TBL_FileDef_t CFE_TBL_FileDef
- __attribute__((__used__)) = {"LC_DefaultWDT", LC_APP_NAME "." LC_WDT_TABLENAME, "LC watchpoint definition table",
- "lc_def_wdt.tbl", (sizeof(LC_WDTEntry_t) * LC_MAX_WATCHPOINTS)};
+CFE_TBL_FileDef_t CFE_TBL_FileDef = {"LC_WDT", LC_APP_NAME "." LC_WDT_TABLENAME, "LC watchpoint definition table",
+ "lc_def_wdt.tbl", (sizeof(LC_WDTEntry_t) * LC_MAX_WATCHPOINTS)};
 
 /*
 ** Default watchpoint definition table (WDT) data
 */
-LC_WDTEntry_t LC_DefaultWDT[LC_MAX_WATCHPOINTS] = {
+LC_WDTEntry_t LC_WDT[LC_MAX_WATCHPOINTS] = {
  /* #0 (unused) */
  {
  .DataType = LC_WATCH_NOT_USED,