From e56d5e0bbb94ffa8fc43fa6ad8541bf4c54f0f0d Mon Sep 17 00:00:00 2001
From: Joseph Hickey <joseph.p.hickey@nasa.gov>
Date: Thu, 7 Dec 2023 13:52:01 -0500
Subject: [PATCH] HotFix #2411, move perf enum definition

The API documentation should not refer to internal headers, only
public headers.  The fact that the message payload was based on
this enum meant that the enum definition is in the wrong place.
---
 modules/es/config/default_cfe_es_msgdefs.h | 16 +++++++++++++++-
 modules/es/fsw/src/cfe_es_perf.h           | 16 ++--------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/modules/es/config/default_cfe_es_msgdefs.h b/modules/es/config/default_cfe_es_msgdefs.h
index aae254ff0..f0da2e3d5 100644
--- a/modules/es/config/default_cfe_es_msgdefs.h
+++ b/modules/es/config/default_cfe_es_msgdefs.h
@@ -143,6 +143,20 @@ typedef struct CFE_ES_DeleteCDSCmd_Payload
         CdsName[CFE_MISSION_ES_CDS_MAX_FULL_NAME_LEN]; /**< \brief ASCII text string containing name of CDS to delete */
 } CFE_ES_DeleteCDSCmd_Payload_t;
 
+/**
+ * @brief Labels for values to use in #CFE_ES_StartPerfCmd_Payload.TriggerMode
+ * @sa CFE_ES_StartPerfCmd_Payload
+*/
+enum CFE_ES_PerfMode
+{
+    CFE_ES_PERF_TRIGGER_START = 0,
+    CFE_ES_PERF_TRIGGER_CENTER,
+    CFE_ES_PERF_TRIGGER_END,
+    CFE_ES_PERF_MAX_MODES
+};
+
+typedef uint32 CFE_ES_PerfMode_Enum_t;
+
 /**
 ** \brief Start Performance Analyzer Command Payload
 **
@@ -151,7 +165,7 @@ typedef struct CFE_ES_DeleteCDSCmd_Payload
 **/
 typedef struct CFE_ES_StartPerfCmd_Payload
 {
-    uint32 TriggerMode; /**< \brief Desired trigger position (Start, Center, End). Values defined by #CFE_ES_PerfMode. */
+    CFE_ES_PerfMode_Enum_t TriggerMode; /**< \brief Desired trigger position (Start, Center, End). Values defined by #CFE_ES_PerfMode. */
 } CFE_ES_StartPerfCmd_Payload_t;
 
 /**
diff --git a/modules/es/fsw/src/cfe_es_perf.h b/modules/es/fsw/src/cfe_es_perf.h
index f0244ff98..26c3c719f 100644
--- a/modules/es/fsw/src/cfe_es_perf.h
+++ b/modules/es/fsw/src/cfe_es_perf.h
@@ -49,25 +49,13 @@
 /**
  * @brief Internal states for Performance Analyzer
  */
-enum CFE_ES_PerfState
+typedef enum CFE_ES_PerfState
 {
     CFE_ES_PERF_IDLE = 0,
     CFE_ES_PERF_WAITING_FOR_TRIGGER,
     CFE_ES_PERF_TRIGGERED,
     CFE_ES_PERF_MAX_STATES
-};
-
-/**
- * @brief Labels for values to use in #CFE_ES_StartPerfCmd_Payload.TriggerMode
- * @sa CFE_ES_StartPerfCmd_Payload
-*/
-enum CFE_ES_PerfMode
-{
-    CFE_ES_PERF_TRIGGER_START = 0,
-    CFE_ES_PERF_TRIGGER_CENTER,
-    CFE_ES_PERF_TRIGGER_END,
-    CFE_ES_PERF_MAX_MODES
-};
+} CFE_ES_PerfState_t;
 
 /**
  * @brief Perflog Dump Background Job states