Fix nasa#1447, Derive event type bitmasks directly from enum definitions

thnkslprpt · Oct 13, 2024 · 2b3d6be · 2b3d6be
1 parent 78b8fd7
commit 2b3d6be
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/modules/evs/config/default_cfe_evs_msgdefs.h b/modules/evs/config/default_cfe_evs_msgdefs.h
@@ -33,16 +33,16 @@
 #include "cfe_evs_fcncodes.h"
 
 /* Event Type bit masks */
-#define CFE_EVS_DEBUG_BIT       0x0001
-#define CFE_EVS_INFORMATION_BIT 0x0002
-#define CFE_EVS_ERROR_BIT       0x0004
-#define CFE_EVS_CRITICAL_BIT    0x0008
+#define CFE_EVS_DEBUG_BIT       (1 << (CFE_EVS_EventType_DEBUG - 1))       // 0x0001
+#define CFE_EVS_INFORMATION_BIT (1 << (CFE_EVS_EventType_INFORMATION - 1)) // 0x0002
+#define CFE_EVS_ERROR_BIT       (1 << (CFE_EVS_EventType_ERROR - 1))       // 0x0004
+#define CFE_EVS_CRITICAL_BIT    (1 << (CFE_EVS_EventType_CRITICAL - 1))    // 0x0008
 
 /* Output Port bit masks */
-#define CFE_EVS_PORT1_BIT 0x0001
-#define CFE_EVS_PORT2_BIT 0x0002
-#define CFE_EVS_PORT3_BIT 0x0004
-#define CFE_EVS_PORT4_BIT 0x0008
+#define CFE_EVS_PORT1_BIT (1 << (CFE_EVS_EventOutput_PORT1 - 1)) // 0x0001
+#define CFE_EVS_PORT2_BIT (1 << (CFE_EVS_EventOutput_PORT2 - 1)) // 0x0002
+#define CFE_EVS_PORT3_BIT (1 << (CFE_EVS_EventOutput_PORT3 - 1)) // 0x0004
+#define CFE_EVS_PORT4_BIT (1 << (CFE_EVS_EventOutput_PORT4 - 1)) // 0x0008
 
 /***********************************/
 /*  Command Message Data Payloads  */