Fix nasa#711, Clean TODOs and no longer deprecating

skliper · Aug 7, 2020 · 9627ce0 · 9627ce0
1 parent 49851ec
commit 9627ce0
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 34 deletions.
diff --git a/fsw/cfe-core/src/sb/cfe_sb_msg_id_util.c b/fsw/cfe-core/src/sb/cfe_sb_msg_id_util.c
@@ -90,7 +90,6 @@
 #include "osapi.h"
 #include "cfe_error.h"
 #include "cfe_sb_priv.h"
-#include "cfe_sb_msg_id_util.h"
 #include "cfe_msg_api.h"
 
 
@@ -118,7 +117,6 @@ CFE_SB_MsgKey_t CFE_SB_ConvertMsgIdtoMsgKey( CFE_SB_MsgId_t MsgId)
 
 /*
  * Function: CFE_SB_GetMsgId - See API and header file for details
- * TODO deprecate
  */
 CFE_SB_MsgId_t CFE_SB_GetMsgId(const CFE_SB_Msg_t *MsgPtr)
 {
@@ -134,7 +132,6 @@ CFE_SB_MsgId_t CFE_SB_GetMsgId(const CFE_SB_Msg_t *MsgPtr)
 
 /*
  * Function: CFE_SB_SetMsgId - See API and header file for details
- * TODO deprecate
  */
 void CFE_SB_SetMsgId(CFE_SB_MsgPtr_t MsgPtr,
                      CFE_SB_MsgId_t MsgId)
@@ -143,33 +140,6 @@ void CFE_SB_SetMsgId(CFE_SB_MsgPtr_t MsgPtr,
   /* Ignore return, no alternate action */
   CFE_MSG_SetMsgId(MsgPtr, MsgId);
 
-#ifdef MESSAGE_FORMAT_IS_CCSDS_VER_2
-  /* TODO Side effects likely undesireable from a mission perspective since
-   * they may be used for other purposes. Just because they aren't 
-   * used in MsgId doesn't mean they aren't used
-   *
-   * If this behavior is a requirement, then will fix these
-   */
-
-#if 0
-  CCSDS_WR_VERS(MsgPtr->SpacePacket.Hdr, 1);
-
-  CCSDS_WR_APID(MsgPtr->SpacePacket.Hdr, CFE_SB_RD_APID_FROM_MSGID(MsgIdVal) );
-
-  CCSDS_CLR_SEC_APIDQ(MsgPtr->SpacePacket.ApidQ);
-
-  CCSDS_WR_EDS_VER(MsgPtr->SpacePacket.ApidQ, 1);
-
-  CCSDS_WR_ENDIAN(MsgPtr->SpacePacket.ApidQ, CFE_PLATFORM_ENDIAN);
-
-  CCSDS_WR_PLAYBACK(MsgPtr->SpacePacket.ApidQ, false);
-
-  CCSDS_WR_SUBSYSTEM_ID(MsgPtr->SpacePacket.ApidQ, CFE_SB_RD_SUBSYS_ID_FROM_MSGID(MsgIdVal));
-
-  CCSDS_WR_SYSTEM_ID(MsgPtr->SpacePacket.ApidQ, CFE_MISSION_SPACECRAFT_ID);
-#endif
-
-#endif 
 }/* end CFE_SB_SetMsgId */
 
 /*

diff --git a/fsw/cfe-core/src/sb/cfe_sb_priv.c b/fsw/cfe-core/src/sb/cfe_sb_priv.c
@@ -80,12 +80,10 @@
 #include "osapi.h"
 #include "private/cfe_private.h"
 #include "cfe_sb_priv.h"
-#include "cfe_sb_msg_id_util.h"
 #include "cfe_sb.h"
 #include "ccsds.h"
 #include "cfe_error.h"
 #include "cfe_es.h"
-#include "cfe_sb_msg_id_util.h"
 #include "cfe_msg_api.h"
 #include <string.h>
 
@@ -552,7 +550,6 @@ int32 CFE_SB_DuplicateSubscribeCheck(CFE_SB_MsgKey_t MsgKey,
 */
 void CFE_SB_SetMsgSeqCnt(CFE_SB_MsgPtr_t MsgPtr,uint32 Count){
 
-    /* TODO deprecate */
     CFE_MSG_SetSequenceCount(MsgPtr, Count);
 
 }/* end CFE_SB_SetMsgSeqCnt */

diff --git a/fsw/cfe-core/src/sb/cfe_sb_task.c b/fsw/cfe-core/src/sb/cfe_sb_task.c
@@ -42,7 +42,6 @@
 #include "cfe_psp.h"
 #include "cfe_es_msg.h"
 #include "cfe_sb_verify.h"
-#include "cfe_sb_msg_id_util.h"
 #include <string.h>
 
 /*  Task Globals */