Fix nasa#711, Minor cleanup

Moved CFE_MSG_InitDefaultHdr to cfe_msg_priv.h Added missing TODO in ccsds.h
skliper · Jun 10, 2020 · 47aa6a7 · 47aa6a7
1 parent 57aeb8f
commit 47aa6a7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/fsw/cfe-core/src/inc/ccsds.h b/fsw/cfe-core/src/inc/ccsds.h
@@ -76,6 +76,7 @@ typedef CFE_MSG_TelemetryHeader_t CCSDS_TelemetryPacket_t;  /* Element names cha
 #endif
 
 #if 0 /* all the way to the end... */
+/* TODO deprecate */
 
 /*----- CCSDS Endian Flag in the APID Qualifier Field. -----*/
 #define CCSDS_BIG_ENDIAN 0

diff --git a/fsw/cfe-core/src/msg/inc_private/cfe_msg_defaults.h b/fsw/cfe-core/src/msg/inc_private/cfe_msg_defaults.h
@@ -81,16 +81,4 @@ void CFE_MSG_SetDefaultCCSDSPri(CFE_MSG_Message_t *MsgPtr);
  */
 void CFE_MSG_SetDefaultCCSDSExt(CFE_MSG_Message_t *MsgPtr);
 
-/*****************************************************************************/
-/**
- * \brief Initialize default header - implemented based on selected header format
- *
- * \par DESCRIPTION
- *     Sets the constant defaults for the entire header. Internal function
- *     assumes pointer is valid.
- *
- * \param[out]     MsgPtr  Message to set
- */
-void CFE_MSG_InitDefaultHdr(CFE_MSG_Message_t *MsgPtr);
-
 #endif /* _cfe_msg_default_ */
diff --git a/fsw/cfe-core/src/msg/inc_private/cfe_msg_priv.h b/fsw/cfe-core/src/msg/inc_private/cfe_msg_priv.h
@@ -79,4 +79,16 @@ static inline void CFE_MSG_SetHeaderField(uint8 *Word, uint16 Val, uint16 Mask)
     Word[1] = ((Word[1] & ~Mask) | (Val & Mask)) & 0xFF;
 }
 
+/*****************************************************************************/
+/**
+ * \brief Initialize default header - implemented based on selected header format
+ *
+ * \par DESCRIPTION
+ *     Sets the constant defaults for the entire header. Internal function
+ *     assumes pointer is valid.
+ *
+ * \param[out]     MsgPtr  Message to set
+ */
+void CFE_MSG_InitDefaultHdr(CFE_MSG_Message_t *MsgPtr);
+
 #endif /* _cfe_msg_priv_ */