Part cFS/Documents#11, Merge Internal Updates

config/default_hs_internal_cfg_values.h

@@ -16,7 +16,7 @@
  * limitations under the License.
  ************************************************************************/
 
- /**
+/**
  * @file
  *   CFS Health and Safety (HS) Application Private Config Definitions
  *

fsw/inc/hs_interface_cfg.h

@@ -79,8 +79,8 @@
  *       cFE size limit for a single buffered table set by the
  *       #CFE_PLATFORM_TBL_MAX_SNGL_TABLE_SIZE parameter
  */
- #define HS_MAX_MSG_ACT_TYPES         HS_INTERFACE_CFGVAL(MAX_MSG_ACT_TYPES)
- #define DEFAULT_HS_MAX_MSG_ACT_TYPES 8
+#define HS_MAX_MSG_ACT_TYPES         HS_INTERFACE_CFGVAL(MAX_MSG_ACT_TYPES)
+#define DEFAULT_HS_MAX_MSG_ACT_TYPES 8
 
 /**
  * \brief Maximum message action size (in bytes)
@@ -103,8 +103,8 @@
  *       cFE size limit for a single buffered table set by the
  *       #CFE_PLATFORM_TBL_MAX_SNGL_TABLE_SIZE parameter
  */
- #define HS_MAX_MSG_ACT_SIZE         HS_INTERFACE_CFGVAL(MAX_MSG_ACT_SIZE)
- #define DEFAULT_HS_MAX_MSG_ACT_SIZE 16
+#define HS_MAX_MSG_ACT_SIZE         HS_INTERFACE_CFGVAL(MAX_MSG_ACT_SIZE)
+#define DEFAULT_HS_MAX_MSG_ACT_SIZE 16
 
 /**
  * \brief Maximum number of monitored applications
@@ -128,8 +128,8 @@
  *       cFE size limit for a single buffered table set by the
  *       #CFE_PLATFORM_TBL_MAX_SNGL_TABLE_SIZE parameter
  */
- #define HS_MAX_MONITORED_APPS         HS_INTERFACE_CFGVAL(MAX_MONITORED_APPS)
- #define DEFAULT_HS_MAX_MONITORED_APPS 32
+#define HS_MAX_MONITORED_APPS         HS_INTERFACE_CFGVAL(MAX_MONITORED_APPS)
+#define DEFAULT_HS_MAX_MONITORED_APPS 32
 
 /**
  * \brief Maximum number of monitored events
@@ -153,8 +153,8 @@
  *       cFE size limit for a single buffered table set by the
  *       #CFE_PLATFORM_TBL_MAX_SNGL_TABLE_SIZE parameter
  */
- #define HS_MAX_MONITORED_EVENTS         HS_INTERFACE_CFGVAL(MAX_MONITORED_EVENTS)
- #define DEFAULT_HS_MAX_MONITORED_EVENTS 16
+#define HS_MAX_MONITORED_EVENTS         HS_INTERFACE_CFGVAL(MAX_MONITORED_EVENTS)
+#define DEFAULT_HS_MAX_MONITORED_EVENTS 16
 
 /**\}*/
 

fsw/inc/hs_internal_cfg.h

@@ -47,8 +47,8 @@
  *
  *       This parameter must be greater than 0.
  */
- #define HS_WATCHDOG_TIMEOUT_VALUE         HS_INTERNAL_CFGVAL(WATCHDOG_TIMEOUT_VALUE)
- #define DEFAULT_HS_WATCHDOG_TIMEOUT_VALUE 10000
+#define HS_WATCHDOG_TIMEOUT_VALUE         HS_INTERNAL_CFGVAL(WATCHDOG_TIMEOUT_VALUE)
+#define DEFAULT_HS_WATCHDOG_TIMEOUT_VALUE 10000
 
 /**
  *  \brief Time to wait after performing processing (in milliseconds)
@@ -63,8 +63,8 @@
  *       This parameter can't be larger than an unsigned 32 bit
  *       integer (4294967295).
  */
- #define HS_POST_PROCESSING_DELAY         HS_INTERNAL_CFGVAL(POST_PROCESSING_DELAY)
- #define DEFAULT_HS_POST_PROCESSING_DELAY 0
+#define HS_POST_PROCESSING_DELAY         HS_INTERNAL_CFGVAL(POST_PROCESSING_DELAY)
+#define DEFAULT_HS_POST_PROCESSING_DELAY 0
 
 /**
  *  \brief Wakeup Message Software Bus Timeout
@@ -82,8 +82,8 @@
  *       (#HS_WATCHDOG_TIMEOUT_VALUE * 1000) - HS runtime in ms
  *       otherwise HS may not be able to service the watchdog in time.
  */
- #define HS_WAKEUP_TIMEOUT         HS_INTERNAL_CFGVAL(WAKEUP_TIMEOUT)
- #define DEFAULT_HS_WAKEUP_TIMEOUT 1200
+#define HS_WAKEUP_TIMEOUT         HS_INTERNAL_CFGVAL(WAKEUP_TIMEOUT)
+#define DEFAULT_HS_WAKEUP_TIMEOUT 1200
 
 /**
  * \brief CPU aliveness output string
@@ -96,8 +96,8 @@
  *       None.
  *
  */
- #define HS_CPU_ALIVE_STRING         HS_INTERNAL_CFGVAL(CPU_ALIVE_STRING)
- #define DEFAULT_HS_CPU_ALIVE_STRING "."
+#define HS_CPU_ALIVE_STRING         HS_INTERNAL_CFGVAL(CPU_ALIVE_STRING)
+#define DEFAULT_HS_CPU_ALIVE_STRING "."
 
 /**
  * \brief CPU aliveness output period
@@ -111,8 +111,8 @@
  *       integer (4294967295).
  *
  */
- #define HS_CPU_ALIVE_PERIOD         HS_INTERNAL_CFGVAL(CPU_ALIVE_PERIOD)
- #define DEFAULT_HS_CPU_ALIVE_PERIOD 5
+#define HS_CPU_ALIVE_PERIOD         HS_INTERNAL_CFGVAL(CPU_ALIVE_PERIOD)
+#define DEFAULT_HS_CPU_ALIVE_PERIOD 5
 
 /**
  * \brief Max Number of Processor Resets that may be performed by HS
@@ -132,8 +132,8 @@
  *       actions to the value set here.
  *
  */
- #define HS_MAX_RESTART_ACTIONS         HS_INTERNAL_CFGVAL(MAX_RESTART_ACTIONS)
- #define DEFAULT_HS_MAX_RESTART_ACTIONS 3
+#define HS_MAX_RESTART_ACTIONS         HS_INTERNAL_CFGVAL(MAX_RESTART_ACTIONS)
+#define DEFAULT_HS_MAX_RESTART_ACTIONS 3
 
 /**
  * \brief Software bus command pipe depth
@@ -145,8 +145,8 @@
  *  \par Limits:
  *       This parameter must be greater than 0.
  */
- #define HS_CMD_PIPE_DEPTH         HS_INTERNAL_CFGVAL(CMD_PIPE_DEPTH)
- #define DEFAULT_HS_CMD_PIPE_DEPTH 12
+#define HS_CMD_PIPE_DEPTH         HS_INTERNAL_CFGVAL(CMD_PIPE_DEPTH)
+#define DEFAULT_HS_CMD_PIPE_DEPTH 12
 
 /**
  * \brief Software bus event pipe depth
@@ -160,8 +160,8 @@
  *  \par Limits:
  *       This parameter must be greater than 0.
  */
- #define HS_EVENT_PIPE_DEPTH         HS_INTERNAL_CFGVAL(EVENT_PIPE_DEPTH)
- #define DEFAULT_HS_EVENT_PIPE_DEPTH 32
+#define HS_EVENT_PIPE_DEPTH         HS_INTERNAL_CFGVAL(EVENT_PIPE_DEPTH)
+#define DEFAULT_HS_EVENT_PIPE_DEPTH 32
 
 /**
  * \brief Software bus wakeup pipe depth
@@ -173,8 +173,8 @@
  *  \par Limits:
  *       This parameter must be greater than 0.
  */
- #define HS_WAKEUP_PIPE_DEPTH         HS_INTERNAL_CFGVAL(WAKEUP_PIPE_DEPTH)
- #define DEFAULT_HS_WAKEUP_PIPE_DEPTH 1
+#define HS_WAKEUP_PIPE_DEPTH         HS_INTERNAL_CFGVAL(WAKEUP_PIPE_DEPTH)
+#define DEFAULT_HS_WAKEUP_PIPE_DEPTH 1
 
 /**
  *  \brief Time to wait before a processor reset (in milliseconds)
@@ -187,8 +187,8 @@
  *       This parameter can't be larger than an unsigned 32 bit
  *       integer (4294967295).
  */
- #define HS_RESET_TASK_DELAY         HS_INTERNAL_CFGVAL(RESET_TASK_DELAY)
- #define DEFAULT_HS_RESET_TASK_DELAY 50
+#define HS_RESET_TASK_DELAY         HS_INTERNAL_CFGVAL(RESET_TASK_DELAY)
+#define DEFAULT_HS_RESET_TASK_DELAY 50
 
 /**
  *  \brief Time to wait for all apps to be started (in milliseconds)
@@ -207,8 +207,8 @@
  *       This should be greater than or equal to the Startup Sync timeout for
  *       any application in the Application Monitor Table.
  */
- #define HS_STARTUP_SYNC_TIMEOUT         HS_INTERNAL_CFGVAL(STARTUP_SYNC_TIMEOUT)
- #define DEFAULT_HS_STARTUP_SYNC_TIMEOUT 65000
+#define HS_STARTUP_SYNC_TIMEOUT         HS_INTERNAL_CFGVAL(STARTUP_SYNC_TIMEOUT)
+#define DEFAULT_HS_STARTUP_SYNC_TIMEOUT 65000
 
 /**
  * \brief Default State of the Application Monitor
@@ -220,8 +220,8 @@
  *  \par Limits:
  *       Must be HS_State_ENABLED or HS_State_DISABLED
  */
- #define HS_APPMON_DEFAULT_STATE         HS_INTERNAL_CFGVAL(APPMON_DEFAULT_STATE)
- #define DEFAULT_HS_APPMON_DEFAULT_STATE HS_State_ENABLED
+#define HS_APPMON_DEFAULT_STATE         HS_INTERNAL_CFGVAL(APPMON_DEFAULT_STATE)
+#define DEFAULT_HS_APPMON_DEFAULT_STATE HS_State_ENABLED
 
 /**
  * \brief Default State of the Event Monitor
@@ -233,8 +233,8 @@
  *  \par Limits:
  *       Must be HS_State_ENABLED or HS_State_DISABLED
  */
- #define HS_EVENTMON_DEFAULT_STATE         HS_INTERNAL_CFGVAL(EVENTMON_DEFAULT_STATE)
- #define DEFAULT_HS_EVENTMON_DEFAULT_STATE HS_State_DISABLED
+#define HS_EVENTMON_DEFAULT_STATE         HS_INTERNAL_CFGVAL(EVENTMON_DEFAULT_STATE)
+#define DEFAULT_HS_EVENTMON_DEFAULT_STATE HS_State_DISABLED
 
 /**
  * \brief Default State of the Aliveness Indicator
@@ -246,8 +246,8 @@
  *  \par Limits:
  *       Must be HS_State_ENABLED or HS_State_DISABLED
  */
- #define HS_ALIVENESS_DEFAULT_STATE         HS_INTERNAL_CFGVAL(ALIVENESS_DEFAULT_STATE)
- #define DEFAULT_HS_ALIVENESS_DEFAULT_STATE HS_State_ENABLED
+#define HS_ALIVENESS_DEFAULT_STATE         HS_INTERNAL_CFGVAL(ALIVENESS_DEFAULT_STATE)
+#define DEFAULT_HS_ALIVENESS_DEFAULT_STATE HS_State_ENABLED
 
 /**
  * \brief Default State of the CPU Hogging Indicator
@@ -259,8 +259,8 @@
  *  \par Limits:
  *       Must be HS_State_ENABLED or HS_State_DISABLED
  */
- #define HS_CPUHOG_DEFAULT_STATE         HS_INTERNAL_CFGVAL(CPUHOG_DEFAULT_STATE)
- #define DEFAULT_HS_CPUHOG_DEFAULT_STATE HS_State_ENABLED
+#define HS_CPUHOG_DEFAULT_STATE         HS_INTERNAL_CFGVAL(CPUHOG_DEFAULT_STATE)
+#define DEFAULT_HS_CPUHOG_DEFAULT_STATE HS_State_ENABLED
 
 /**
  * \brief Application Monitor Table (AMT) filename
@@ -273,8 +273,8 @@
  *       This string shouldn't be longer than #OS_MAX_PATH_LEN for the
  *       target platform in question
  */
- #define HS_AMT_FILENAME         HS_INTERNAL_CFGVAL(AMT_FILENAME)
- #define DEFAULT_HS_AMT_FILENAME "/cf/hs_amt.tbl"
+#define HS_AMT_FILENAME         HS_INTERNAL_CFGVAL(AMT_FILENAME)
+#define DEFAULT_HS_AMT_FILENAME "/cf/hs_amt.tbl"
 
 /**
  * \brief Event Monitor Table (EMT) filename
@@ -287,8 +287,8 @@
  *       This string shouldn't be longer than #OS_MAX_PATH_LEN for the
  *       target platform in question
  */
- #define HS_EMT_FILENAME         HS_INTERNAL_CFGVAL(EMT_FILENAME)
- #define DEFAULT_HS_EMT_FILENAME "/cf/hs_emt.tbl"
+#define HS_EMT_FILENAME         HS_INTERNAL_CFGVAL(EMT_FILENAME)
+#define DEFAULT_HS_EMT_FILENAME "/cf/hs_emt.tbl"
 
 /**
  * \brief Execution Counter Table (XCT) filename
@@ -301,8 +301,8 @@
  *       This string shouldn't be longer than #OS_MAX_PATH_LEN for the
  *       target platform in question
  */
- #define HS_XCT_FILENAME         HS_INTERNAL_CFGVAL(XCT_FILENAME)
- #define DEFAULT_HS_XCT_FILENAME "/cf/hs_xct.tbl"
+#define HS_XCT_FILENAME         HS_INTERNAL_CFGVAL(XCT_FILENAME)
+#define DEFAULT_HS_XCT_FILENAME "/cf/hs_xct.tbl"
 
 /**
  * \brief Message Actions Table (MAT) filename
@@ -315,8 +315,8 @@
  *       This string shouldn't be longer than #OS_MAX_PATH_LEN for the
  *       target platform in question
  */
- #define HS_MAT_FILENAME         HS_INTERNAL_CFGVAL(MAT_FILENAME)
- #define DEFAULT_HS_MAT_FILENAME "/cf/hs_mat.tbl"
+#define HS_MAT_FILENAME         HS_INTERNAL_CFGVAL(MAT_FILENAME)
+#define DEFAULT_HS_MAT_FILENAME "/cf/hs_mat.tbl"
 
 /**
  * \brief System monitor PSP
@@ -329,8 +329,8 @@
  *  \par Limits:
  *       Must be a name of a module that is implemented by the PSP
  */
- #define HS_SYSTEM_MONITOR_DEVICE         HS_INTERNAL_CFGVAL(SYSTEM_MONITOR_DEVICE)
- #define DEFAULT_HS_SYSTEM_MONITOR_DEVICE "linux_sysmon"
+#define HS_SYSTEM_MONITOR_DEVICE         HS_INTERNAL_CFGVAL(SYSTEM_MONITOR_DEVICE)
+#define DEFAULT_HS_SYSTEM_MONITOR_DEVICE "linux_sysmon"
 
 /**
  * \brief CPU Utilization subsystem name
@@ -340,8 +340,8 @@
  *       Reverts to 0 if the name is not found.
  *
  */
- #define HS_SYSTEM_MONITOR_SUBSYSTEM_NAME         HS_INTERNAL_CFGVAL(SYSTEM_MONITOR_SUBSYSTEM_NAME)
- #define DEFAULT_HS_SYSTEM_MONITOR_SUBSYSTEM_NAME "aggregate"
+#define HS_SYSTEM_MONITOR_SUBSYSTEM_NAME         HS_INTERNAL_CFGVAL(SYSTEM_MONITOR_SUBSYSTEM_NAME)
+#define DEFAULT_HS_SYSTEM_MONITOR_SUBSYSTEM_NAME "aggregate"
 
 /**
  * \brief CPU Utilization subchannel name
@@ -351,8 +351,8 @@
  *       Reverts to 0 if the name is not found.
  *
  */
- #define HS_SYSTEM_MONITOR_SUBCHANNEL_NAME         HS_INTERNAL_CFGVAL(SYSTEM_MONITOR_SUBCHANNEL_NAME)
- #define DEFAULT_HS_SYSTEM_MONITOR_SUBCHANNEL_NAME "cpu-load"
+#define HS_SYSTEM_MONITOR_SUBCHANNEL_NAME         HS_INTERNAL_CFGVAL(SYSTEM_MONITOR_SUBCHANNEL_NAME)
+#define DEFAULT_HS_SYSTEM_MONITOR_SUBCHANNEL_NAME "cpu-load"
 
 /**
  * \brief CPU Utilization Cycles per Interval
@@ -369,8 +369,8 @@
  *       underlying PSP module, otherwise the same data will be reported.
  *
  */
- #define HS_CPU_UTILIZATION_CYCLES_PER_INTERVAL         HS_INTERNAL_CFGVAL(CPU_UTILIZATION_CYCLES_PER_INTERVAL)
- #define DEFAULT_HS_CPU_UTILIZATION_CYCLES_PER_INTERVAL 30
+#define HS_CPU_UTILIZATION_CYCLES_PER_INTERVAL         HS_INTERNAL_CFGVAL(CPU_UTILIZATION_CYCLES_PER_INTERVAL)
+#define DEFAULT_HS_CPU_UTILIZATION_CYCLES_PER_INTERVAL 30
 
 /**
  * \brief CPU Utilization Maximum Range
@@ -383,8 +383,8 @@
  *       This parameter can't be larger than an unsigned 32 bit
  *       integer (4294967295).
  */
- #define HS_CPU_UTILIZATION_MAX         HS_INTERNAL_CFGVAL(CPU_UTILIZATION_MAX)
- #define DEFAULT_HS_CPU_UTILIZATION_MAX 10000
+#define HS_CPU_UTILIZATION_MAX         HS_INTERNAL_CFGVAL(CPU_UTILIZATION_MAX)
+#define DEFAULT_HS_CPU_UTILIZATION_MAX 10000
 
 /**
  * \brief CPU Utilization Hogging Utils Per Interval
@@ -396,8 +396,8 @@
  *  \par Limits:
  *       This parameter can't be larger than #HS_CPU_UTILIZATION_MAX.
  */
- #define HS_UTIL_PER_INTERVAL_HOGGING         HS_INTERNAL_CFGVAL(UTIL_PER_INTERVAL_HOGGING)
- #define DEFAULT_HS_UTIL_PER_INTERVAL_HOGGING 7500
+#define HS_UTIL_PER_INTERVAL_HOGGING         HS_INTERNAL_CFGVAL(UTIL_PER_INTERVAL_HOGGING)
+#define DEFAULT_HS_UTIL_PER_INTERVAL_HOGGING 7500
 
 /**
  * \brief CPU Utilization Hogging Timeout
@@ -410,8 +410,8 @@
  *       This parameter can't be larger than an unsigned 32 bit
  *       integer (4294967295).
  */
- #define HS_UTIL_HOGGING_TIMEOUT         HS_INTERNAL_CFGVAL(UTIL_HOGGING_TIMEOUT)
- #define DEFAULT_HS_UTIL_HOGGING_TIMEOUT 5
+#define HS_UTIL_HOGGING_TIMEOUT         HS_INTERNAL_CFGVAL(UTIL_HOGGING_TIMEOUT)
+#define DEFAULT_HS_UTIL_HOGGING_TIMEOUT 5
 
 /**
  * \brief CPU Peak Utilization Number of Intervals
@@ -426,8 +426,8 @@
  *       This parameter controls the size of the array which stores
  *       previously measured utilization values.
  */
- #define HS_UTIL_PEAK_NUM_INTERVAL         HS_INTERNAL_CFGVAL(UTIL_PEAK_NUM_INTERVAL)
- #define DEFAULT_HS_UTIL_PEAK_NUM_INTERVAL 64
+#define HS_UTIL_PEAK_NUM_INTERVAL         HS_INTERNAL_CFGVAL(UTIL_PEAK_NUM_INTERVAL)
+#define DEFAULT_HS_UTIL_PEAK_NUM_INTERVAL 64
 
 /**
  * \brief CPU Average Utilization Number of Intervals
@@ -438,8 +438,8 @@
  *  \par Limits:
  *       This parameter can't be larger than #HS_UTIL_PEAK_NUM_INTERVAL .
  */
- #define HS_UTIL_AVERAGE_NUM_INTERVAL         HS_INTERNAL_CFGVAL(UTIL_AVERAGE_NUM_INTERVAL)
- #define DEFAULT_HS_UTIL_AVERAGE_NUM_INTERVAL 4
+#define HS_UTIL_AVERAGE_NUM_INTERVAL         HS_INTERNAL_CFGVAL(UTIL_AVERAGE_NUM_INTERVAL)
+#define DEFAULT_HS_UTIL_AVERAGE_NUM_INTERVAL 4
 
 /**
  * \brief Mission specific version number for HS application
@@ -455,8 +455,8 @@
  *       Must be defined as a numeric value that is greater than
  *       or equal to zero.
  */
- #define HS_MISSION_REV         HS_INTERNAL_CFGVAL(MISSION_REV)
- #define DEFAULT_HS_MISSION_REV 0
+#define HS_MISSION_REV         HS_INTERNAL_CFGVAL(MISSION_REV)
+#define DEFAULT_HS_MISSION_REV 0
 
 /**\}*/
 

fsw/inc/hs_perfids.h

@@ -28,7 +28,7 @@
  * \{
  */
 
-#define HS_APPMAIN_PERF_ID  40 /**< \brief Main task performance ID */
+#define HS_APPMAIN_PERF_ID 40 /**< \brief Main task performance ID */
 
 /**\}*/