Merge pull request #1567 from skliper/fix1423-remove_deprecated

Fix #1423, Remove deprecated elements
nasa · May 27, 2021 · 7f08fc3 · 7f08fc3
2 parents 2a93eaf + 4652c0d
commit 7f08fc3
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 37 deletions.
diff --git a/modules/core_api/fsw/inc/cfe_error.h b/modules/core_api/fsw/inc/cfe_error.h
@@ -1338,14 +1338,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 /* CFE_OMIT_DEPRECATED_6_8 */
-
 #endif /* CFE_ERROR_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
@@ -130,31 +130,4 @@ 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;
-
-#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 */