Fix #95, Update command handler function message pointers and return

types
nasa · Apr 5, 2023 · a0fcee1 · a0fcee1
1 parent 7611550
commit a0fcee1
Show file tree

Hide file tree

Showing 24 changed files with 599 additions and 549 deletions.
diff --git a/fsw/src/fm_app.c b/fsw/src/fm_app.c
@@ -165,10 +165,10 @@ void FM_AppMain(void)
 /*                                                                 */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-int32 FM_AppInit(void)
+CFE_Status_t FM_AppInit(void)
 {
-    const char *ErrText = "Initialization error:";
-    int32       Result  = CFE_SUCCESS;
+    const char * ErrText = "Initialization error:";
+    CFE_Status_t Result  = CFE_SUCCESS;
 
     /* Initialize global data  */
     memset(&FM_GlobalData, 0, sizeof(FM_GlobalData));
@@ -246,7 +246,7 @@ int32 FM_AppInit(void)
 /* FM application -- housekeeping request packet processor         */
 /*                                                                 */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-void FM_SendHkCmd(const CFE_SB_Buffer_t *BufPtr)
+void FM_SendHkCmd(const FM_SendHkCmd_t *BufPtr)
 {
     FM_HousekeepingPkt_Payload_t *PayloadPtr;
 

diff --git a/fsw/src/fm_app.h b/fsw/src/fm_app.h
@@ -30,7 +30,7 @@
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /*                                                                 */
-/* FM -- application global constants                              */
+/* FM -- Macro Definitions                                         */
 /*                                                                 */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
@@ -43,6 +43,11 @@
  */
 #define FM_SB_TIMEOUT 1000
 
+/**
+ *  \brief FM Error Codes
+ */
+#define FM_ERROR -1 /**< \brief Generic FM error return code */
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /*                                                                 */
 /* FM -- application global data structure                         */
@@ -159,7 +164,7 @@ void FM_AppMain(void);
  *
  *  \sa #CFE_EVS_Register, #CFE_SB_CreatePipe, #CFE_SB_Subscribe
  */
-int32 FM_AppInit(void);
+CFE_Status_t FM_AppInit(void);
 
 /**
  *  \brief Housekeeping Request Command Handler
@@ -178,7 +183,7 @@ int32 FM_AppInit(void);
  *
  *  \sa #FM_SendHkCmd_t, #FM_HousekeepingPkt_t
  */
-void FM_SendHkCmd(const CFE_SB_Buffer_t *BufPtr);
+void FM_SendHkCmd(const FM_SendHkCmd_t *BufPtr);
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /*                                                                 */

diff --git a/fsw/src/fm_child.c b/fsw/src/fm_child.c
@@ -54,12 +54,12 @@
 /*                                                                 */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-int32 FM_ChildInit(void)
+CFE_Status_t FM_ChildInit(void)
 {
-    int32  TaskTextLen               = OS_MAX_PATH_LEN;
-    char   TaskText[OS_MAX_PATH_LEN] = "\0";
-    int32  Result                    = CFE_SUCCESS;
-    uint32 TaskEID                   = 0;
+    int32        TaskTextLen               = OS_MAX_PATH_LEN;
+    char         TaskText[OS_MAX_PATH_LEN] = "\0";
+    CFE_Status_t Result                    = CFE_SUCCESS;
+    uint32       TaskEID                   = 0;
 
     /* Create counting semaphore (given by parent to wake-up child) */
     Result = OS_CountSemCreate(&FM_GlobalData.ChildSemaphore, FM_CHILD_SEM_NAME, 0, 0);

diff --git a/fsw/src/fm_child.h b/fsw/src/fm_child.h
@@ -49,7 +49,7 @@
  *
  *  \sa #FM_AppInit
  */
-int32 FM_ChildInit(void);
+CFE_Status_t FM_ChildInit(void);
 
 /**
  *  \brief Child Task Entry Point Function

diff --git a/fsw/src/fm_cmd_utils.c b/fsw/src/fm_cmd_utils.c
@@ -563,13 +563,13 @@ int32 FM_GetVolumeFreeSpace(const char *FileSys, uint64 *BlockCount, uint64 *Byt
 /*                                                                 */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-int32 FM_GetDirectorySpaceEstimate(const char *Directory, uint64 *BlockCount, uint64 *ByteCount)
+CFE_Status_t FM_GetDirectorySpaceEstimate(const char *Directory, uint64 *BlockCount, uint64 *ByteCount)
 {
     osal_id_t     DirId;
     os_dirent_t   DirEntry;
     os_fstat_t    FileStat;
     osal_status_t OS_Status;
-    int32         Result;
+    CFE_Status_t  Result;
     char          FullPath[OS_MAX_PATH_LEN];
     uint64        TotalBytes;
     size_t        DirLen;

diff --git a/fsw/src/fm_cmd_utils.h b/fsw/src/fm_cmd_utils.h
@@ -398,6 +398,6 @@ int32 FM_GetVolumeFreeSpace(const char *FileSys, uint64 *BlockCount, uint64 *Byt
  *  \returns Status code
  *  \retval CFE_SUCCESS if successful
  */
-int32 FM_GetDirectorySpaceEstimate(const char *Directory, uint64 *BlockCount, uint64 *ByteCount);
+CFE_Status_t FM_GetDirectorySpaceEstimate(const char *Directory, uint64 *BlockCount, uint64 *ByteCount);
 
 #endif