From 993d26e4d403630d4804d6164f8f409379e55b67 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Mon, 13 Feb 2023 16:48:53 -0500 Subject: [PATCH] Fix #69, simplify table defs Remove use of compiler extension flag, simplify definition --- fsw/tables/lc_def_adt.c | 7 +++---- fsw/tables/lc_def_wdt.c | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/fsw/tables/lc_def_adt.c b/fsw/tables/lc_def_adt.c index 1314dc8..8851a3b 100644 --- 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 index f56676b..9c40901 100644 --- 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,