Fix #126, Refactor CFE_PSP_ModuleType_t enum

skliper · skliper · commit 97284ee3633d · 2021-01-06T15:17:21.000-05:00
Avoids irregular enum warning
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)
             {

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,7 @@`
`35`	`35`
`36`	`36`	`typedef enum`
`37`	`37`	`{`
`38`		`- CFE_PSP_MODULE_TYPE_INVALID = 0,`
`39`		`- CFE_PSP_MODULE_TYPE_VALID_RANGE = 1000,`
	`38`	`+ CFE_PSP_MODULE_TYPE_INVALID = 1000,`
`40`	`39`	`CFE_PSP_MODULE_TYPE_SIMPLE,`
`41`	`40`	`/* May be extended in the future */`
`42`	`41`	`CFE_PSP_MODULE_TYPE_MAX`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ void CFE_PSP_ModuleInit(void)`
`65`	`65`	`while(Entry->Name != NULL)`
`66`	`66`	`{`
`67`	`67`	`ApiPtr = (CFE_PSP_ModuleApi_t *)Entry->Api;`
`68`		`- if ((uint32)ApiPtr->ModuleType > CFE_PSP_MODULE_TYPE_VALID_RANGE &&`
	`68`	`+ if ((uint32)ApiPtr->ModuleType > CFE_PSP_MODULE_TYPE_INVALID &&`
`69`	`69`	`(uint32)ApiPtr->ModuleType < CFE_PSP_MODULE_TYPE_MAX &&`
`70`	`70`	`ApiPtr->Init != NULL)`
`71`	`71`	`{`