From 4652c0d8ed1e5ad34380e345b5e0eb9e94fff68f Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Fri, 21 May 2021 23:03:15 +0000 Subject: [PATCH] Fix #1423, Remove deprecated elements --- modules/core_api/fsw/inc/cfe_error.h | 10 ------- .../core_api/fsw/inc/cfe_sb_api_typedefs.h | 27 ------------------- 2 files changed, 37 deletions(-) diff --git a/modules/core_api/fsw/inc/cfe_error.h b/modules/core_api/fsw/inc/cfe_error.h index 47259cc1a..eff79c50e 100644 --- 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 index 5cc2e9366..e3a91d604 100644 --- 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 */