Merge pull request #1240 from skliper/fix1002-rm_deprecated

Fix #1002, Remove deprecated elements
nasa · Mar 24, 2021 · 5665ccd · 5665ccd
2 parents 3585701 + 2d1cf8b
commit 5665ccd
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 1,222 deletions.
diff --git a/modules/core_api/fsw/inc/cfe_error.h b/modules/core_api/fsw/inc/cfe_error.h
@@ -1371,14 +1371,4 @@ typedef int32 CFE_Status_t;
 #define CFE_TIME_BAD_ARGUMENT ((CFE_Status_t)0xce000005)
 /**@}*/
 
-/* Compatibility for error names which have been updated */
-#ifndef CFE_OMIT_DEPRECATED_6_8
-#define CFE_ES_ERR_TASKID        CFE_ES_ERR_RESOURCEID_NOT_VALID
-#define CFE_ES_ERR_APPID         CFE_ES_ERR_RESOURCEID_NOT_VALID
-#define CFE_ES_ERR_MEM_HANDLE    CFE_ES_ERR_RESOURCEID_NOT_VALID
-#define CFE_ES_ERR_APPNAME       CFE_ES_ERR_NAME_NOT_FOUND
-#define CFE_ES_CDS_NOT_FOUND_ERR CFE_ES_ERR_NAME_NOT_FOUND
-#define CFE_ES_CDS_REGISTRY_FULL CFE_ES_NO_RESOURCE_IDS_AVAILABLE
-#endif
-
 #endif /* _cfe_error_ */
diff --git a/modules/core_api/fsw/inc/cfe_sb.h b/modules/core_api/fsw/inc/cfe_sb.h
diff --git a/modules/core_api/fsw/inc/cfe_sb_api_typedefs.h b/modules/core_api/fsw/inc/cfe_sb_api_typedefs.h
@@ -98,18 +98,6 @@
  */
 #define CFE_SB_INVALID_MSG_ID CFE_SB_MSGID_RESERVED
 
-#ifndef CFE_OMIT_DEPRECATED_6_8
-/**
- * \defgroup CFESBPktTypeDefs cFE SB Packet Type Defines
- * \{
- */
-#define CFE_SB_PKTTYPE_INVALID \
-    CFE_MSG_Type_Invalid /**< \brief #CFE_SB_GetPktType response if message type can not be determined */
-#define CFE_SB_PKTTYPE_CMD CFE_MSG_Type_Cmd /**< \brief #CFE_SB_GetPktType response for command packets */
-#define CFE_SB_PKTTYPE_TLM CFE_MSG_Type_Tlm /**< \brief #CFE_SB_GetPktType response for telemetry packets */
-/** \} */
-#endif /* CFE_OMIT_DEPRECATED_6_8 */
-
 /**
  * \brief Cast/Convert a generic CFE_ResourceId_t to a CFE_SB_PipeId_t
  */
@@ -142,28 +130,6 @@ typedef union CFE_SB_Msg
     long double       LongDouble; /**< \brief Align to support Long Double */
 } CFE_SB_Buffer_t;
 
-#ifndef CFE_OMIT_DEPRECATED_6_8
-
-/** \brief Deperecated type to minimize required changes */
-typedef CFE_SB_Buffer_t CFE_SB_Msg_t;
-
-/** \brief Deperecated type to minimize required changes */
-typedef CFE_MSG_CommandHeader_t CFE_SB_CmdHdr_t;
-
-/** \brief Deperecated type to minimize required changes */
-typedef CFE_MSG_TelemetryHeader_t CFE_SB_TlmHdr_t;
-
-#define CFE_SB_CMD_HDR_SIZE (sizeof(CFE_MSG_CommandHeader_t))   /**< \brief Size of command header */
-#define CFE_SB_TLM_HDR_SIZE (sizeof(CFE_MSG_TelemetryHeader_t)) /**< \brief Size of telemetry header */
-
-/** \brief  Pointer to an SB Message */
-typedef CFE_MSG_Message_t *CFE_SB_MsgPtr_t;
-
-/** \brief  CFE_SB_MsgPayloadPtr_t defined as an opaque pointer to a message Payload portion */
-typedef uint8 *CFE_SB_MsgPayloadPtr_t;
-
-#endif /* CFE_OMIT_DEPRECATED_6_8 */
-
 /** \brief  CFE_SB_ZeroCopyHandle_t to primitive type definition
 **
 ** Software Zero Copy handle used in many SB APIs
@@ -173,14 +139,5 @@ typedef struct
     struct CFE_SB_BufferD *BufDscPtr; /* abstract descriptor reference (internal use) */
 } CFE_SB_ZeroCopyHandle_t;
 
-#ifndef CFE_OMIT_DEPRECATED_6_8
-
-#define CFE_SB_Default_Qos CFE_SB_DEFAULT_QOS /**< \deprecated use CFE_SB_DEFAULT_QOS */
-
-#define CFE_SB_CMD_HDR_SIZE (sizeof(CFE_MSG_CommandHeader_t))   /**< \brief Size of command header */
-#define CFE_SB_TLM_HDR_SIZE (sizeof(CFE_MSG_TelemetryHeader_t)) /**< \brief Size of telemetry header */
-
-#endif /* CFE_OMIT_DEPRECATED_6_8 */
-
 #endif /* CFE_SB_API_TYPEDEFS_H */
 /*****************************************************************************/