Fix #126, Refactor CFE_PSP_ModuleType_t enum

Avoids irregular enum warning
nasa · Jan 6, 2021 · 97284ee · 97284ee
1 parent 3178920
commit 97284ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/fsw/shared/inc/cfe_psp_module.h b/fsw/shared/inc/cfe_psp_module.h
@@ -35,8 +35,7 @@
 
 typedef enum
 {
-    CFE_PSP_MODULE_TYPE_INVALID = 0,
-    CFE_PSP_MODULE_TYPE_VALID_RANGE  = 1000,
+    CFE_PSP_MODULE_TYPE_INVALID = 1000,
     CFE_PSP_MODULE_TYPE_SIMPLE,
     /* May be extended in the future */
     CFE_PSP_MODULE_TYPE_MAX

diff --git a/fsw/shared/src/cfe_psp_module.c b/fsw/shared/src/cfe_psp_module.c
@@ -65,7 +65,7 @@ void CFE_PSP_ModuleInit(void)
         while(Entry->Name != NULL)
         {
             ApiPtr = (CFE_PSP_ModuleApi_t *)Entry->Api;
-            if ((uint32)ApiPtr->ModuleType > CFE_PSP_MODULE_TYPE_VALID_RANGE &&
+            if ((uint32)ApiPtr->ModuleType > CFE_PSP_MODULE_TYPE_INVALID &&
                     (uint32)ApiPtr->ModuleType < CFE_PSP_MODULE_TYPE_MAX &&
                     ApiPtr->Init != NULL)
             {