From 146fa012b6155fe0acdd5eb8a03f1513315a3943 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 4 Nov 2020 11:53:45 -0500 Subject: [PATCH] WIP #777, last round --- docs/cFE Application Developers Guide.md | 81 ++- fsw/cfe-core/src/evs/cfe_evs_utils.c | 4 +- fsw/cfe-core/src/inc/cfe_error.h | 2 +- fsw/cfe-core/src/inc/cfe_sb.h | 99 +-- fsw/cfe-core/src/inc/cfe_tbl.h | 3 +- fsw/cfe-core/src/sb/cfe_sb_api.c | 10 +- fsw/cfe-core/src/sb/cfe_sb_msg_id_util.c | 2 + fsw/cfe-core/src/sb/cfe_sb_priv.c | 3 +- fsw/cfe-core/src/sb/cfe_sb_priv.h | 3 - fsw/cfe-core/src/sb/cfe_sb_task.c | 4 +- fsw/cfe-core/src/sb/cfe_sb_util.c | 10 +- fsw/cfe-core/src/tbl/cfe_tbl_api.c | 2 +- fsw/cfe-core/src/tbl/cfe_tbl_internal.c | 2 +- fsw/cfe-core/src/tbl/cfe_tbl_task.h | 2 +- fsw/cfe-core/src/time/cfe_time_task.c | 9 +- fsw/cfe-core/unit-test/evs_UT.c | 4 - fsw/cfe-core/unit-test/sb_UT.c | 152 +--- fsw/cfe-core/unit-test/sb_UT.h | 845 ----------------------- fsw/cfe-core/unit-test/tbl_UT.c | 4 + fsw/cfe-core/unit-test/tbl_UT.h | 146 ---- fsw/cfe-core/unit-test/time_UT.c | 10 +- fsw/cfe-core/unit-test/ut_support.h | 3 - fsw/cfe-core/ut-stubs/ut_sb_stubs.c | 11 +- 23 files changed, 154 insertions(+), 1257 deletions(-) diff --git a/docs/cFE Application Developers Guide.md b/docs/cFE Application Developers Guide.md index 188ab473c..9b8c177af 100644 --- a/docs/cFE Application Developers Guide.md +++ b/docs/cFE Application Developers Guide.md @@ -1319,18 +1319,18 @@ SB Messages by allocating sufficient memory, calling the SB API to initialize the contents of the SB Message and then storing any appropriate data into the structure. -The Software Bus API hides the details of the message structure, -providing routines such as CFE_SB_GetMsgTime and CFE_SB_SetMsgTime +The Message API hides the details of the message structure, +providing routines such as CFE_MSG_GetMsgTime and CFE_MSG_SetMsgTime in order to get and set a message time. The current version of the cFE supports only CCSDS, however, the implementation of the message structure can be changed without affecting cFS Applications. -In the CCSDS implementation of the Software Bus, the upper 3 most -significant bits of the 16 bit Message ID Number **shall be zero -(b'000').** The Software Bus ignores the upper 3 most significant bits -defined by CCSDS as the Version Number. A non-zero value in the Version -Number (3 bits) could result in duplicate Message IDs being defined. For -example, x01FF and x81FF are the same Message ID to the Software Bus. +See the implementation documentation for specific formats, +fields, and bit values. The message ID (MsgId) is an abstract +concept that is implementation depended, used for routing messages +on the Software Bus. Depending on the implementation, different +ranges and values are supported, and the values effect the message +header differently. ##### 6.1.2 Pipes @@ -1705,54 +1705,59 @@ It is important to note that some SB API calls assume the presence of a particular header type and will not work properly if the other header type is present instead. The following section provides more detail. -##### 6.5.2 Modifying Software Bus Message Header Information +##### 6.5.2 Setting Message Header Information -Before sending an SB Message to the SB, the Application can update the -SB Message Header. The following table summarizes the functions that -can be used to modify SB Message Header fields. Note that some of these +Before sending a Message to the SB, the Application can set fields in the +Message Header. The following table summarizes the functions that +can be used to modify Message Header fields. Note that some of these functions are only applicable to a specific header type. Additional information on modifying specific header types is provided in the following subsections. -| **SB Message Header Field** | **SB API for Modifying the Header Field** | **Applicability** | -| ---------------------------:| -----------------------------------------:| -------------------:| -| Message ID | CFE_SB_SetMsgId | Command & Telemetry | -| Total Message Length | CFE_SB_SetTotalMsgLength | Command & Telemetry | -| User Data Message Length | CFE_SB_SetUserDataLength | Command & Telemetry | -| Command Code | CFE_SB_SetCmdCode | Command Only | -| Checksum | CFE_SB_GenerateChecksum | Command Only | -| Time | CFE_SB_TimeStampMsg | Telemetry Only | -| Time | CFE_SB_SetMsgTime | Telemetry Only | - -Applications shall always use these functions to manipulate the SB -Message Header. The structure of the SB Message Header may change from +| **SB Message Header Field** | **API for Modifying the Header Field** | **Applicability** | +| ---------------------------:| --------------------------------------:| -------------------:| +| Message ID | CFE_MSG_SetMsgId | Command & Telemetry | +| Total Message Length | CFE_MSG_SetSize | Command & Telemetry | +| Command Code | CFE_MSG_SetFcnCode | Command Only | +| Checksum | CFE_MSG_GenerateChecksum | Command Only | +| Time | CFE_SB_TimeStampMsg | Telemetry Only | +| Time | CFE_MSG_SetMsgTime | Telemetry Only | + +Applications shall always use these functions to manipulate the +Message Header. The structure of the Message Header may change from one deployment to the next. By using these functions, Applications are -guaranteed to work regardless of the structure of the SB Message Header. +guaranteed to work regardless of the structure of the Message Header. -##### 6.5.2.1 Modifying SB Command Message Header Information +Although CFE_SB_SetUserDataLength APIs is available, +it is based on assumptions about the defintion of "User Data" and is +really just a best guess since the packet structure is dependent on implementation. +The preference is to use CFE_MSG_SetSize and actual packet structure +information when available. + +##### 6.5.2.1 Modifying Command Message Header Information The most common update for command messages is to set the command code. -This is done through the CFE_SB_SetCmdCode() API call. This code is used +This is done through the CFE_MSG_SetFcnCode() API call. This code is used to distinguish between multiple commands that share a Message ID. It is common practice for an application to have a single "CMD_MID" to capture all commands and then to differentiate those commands using a command code. -##### 6.5.2.2 Modifying SB Telemetry Message Header Information +##### 6.5.2.2 Modifying Telemetry Message Header Information The most common update for telemetry messages is to put the current time in -the SB Message. This is accomplished with one of two SB API functions. The +the Message. This is accomplished with one of two API functions. The most commonly used function would be CFE_SB_TimeStampMsg(). This API would insert the current time, in the mission defined format with the mission -defined epoch, into the SB Message Header. The other SB API that can modify -the SB Message Header time is CFE_SB_SetMsgTime(). This API call sets the -time in the SB Message Header to the time specified during the call. This is -useful when the Application wishes to time tag a series of SB Messages with +defined epoch, into the Message Header. The other API that can modify +the Message Header time is CFE_MSG_SetMsgTime(). This API call sets the +time in the Message Header to the time specified during the call. This is +useful when the Application wishes to time tag a series of Messages with the same time. -##### 6.5.3 Reading Software Bus Message Header Information +##### 6.5.3 Reading Message Header Information -There are several SB APIs available for extracting the SB Message Header +There are several APIs available for extracting the Message Header Fields. These APIs shall always be used by Applications to ensure the Applications are portable to future missions. The following table -identifies the fields of the SB Message Header and the appropriate API +identifies the fields of the Message Header and the appropriate API for extracting that field from the header: | **SB Message Header Field** | **API for Reading the Header Field** | **Applicability** | @@ -1762,12 +1767,12 @@ for extracting that field from the header: | Total Message Length | CFE_MSG_GetSize | Command & Telemetry | | Command Code | CFE_MSG_GetFcnCode | Command Only | -There are other APIs based on selected implementation, and the full list is +There are other APIs based on selected implementation. The full list is available in the user's guide. There is another API that automatically calculates the checksum for the packet and compares it to the checksum in the header. The API is called -CFE_SB_ValidateChecksum() and it simply returns a success or failure +CFE_MSG_ValidateChecksum() and it simply returns a success or failure indication. Although CFE_SB_GetUserDataLength and CFE_SB_GetUserData APIs are available, diff --git a/fsw/cfe-core/src/evs/cfe_evs_utils.c b/fsw/cfe-core/src/evs/cfe_evs_utils.c index c0090a85a..41c12a961 100644 --- a/fsw/cfe-core/src/evs/cfe_evs_utils.c +++ b/fsw/cfe-core/src/evs/cfe_evs_utils.c @@ -428,7 +428,7 @@ void EVS_GenerateEventTelemetry(EVS_AppData_t *AppDataPtr, uint16 EventID, uint1 LongEventTlm.Payload.PacketID.ProcessorID = CFE_PSP_GetProcessorId(); /* Set the packet timestamp */ - CFE_SB_SetMsgTime((CFE_MSG_Message_t *) &LongEventTlm, *TimeStamp); + CFE_MSG_SetMsgTime((CFE_MSG_Message_t *) &LongEventTlm, *TimeStamp); /* Write event to the event log */ EVS_AddLog(&LongEventTlm); @@ -451,7 +451,7 @@ void EVS_GenerateEventTelemetry(EVS_AppData_t *AppDataPtr, uint16 EventID, uint1 */ CFE_MSG_Init(&ShortEventTlm.TlmHeader.BaseMsg, CFE_SB_ValueToMsgId(CFE_EVS_SHORT_EVENT_MSG_MID), sizeof(ShortEventTlm)); - CFE_SB_SetMsgTime((CFE_MSG_Message_t *) &ShortEventTlm, *TimeStamp); + CFE_MSG_SetMsgTime((CFE_MSG_Message_t *) &ShortEventTlm, *TimeStamp); ShortEventTlm.Payload.PacketID = LongEventTlm.Payload.PacketID; CFE_SB_SendMsg((CFE_MSG_Message_t *) &ShortEventTlm); } diff --git a/fsw/cfe-core/src/inc/cfe_error.h b/fsw/cfe-core/src/inc/cfe_error.h index 4a62d6ac0..b561c2bfa 100644 --- a/fsw/cfe-core/src/inc/cfe_error.h +++ b/fsw/cfe-core/src/inc/cfe_error.h @@ -856,7 +856,7 @@ typedef int32 CFE_Status_t; /** * @brief Wrong Message Type * - * This error code will be returned when a request such as #CFE_SB_SetMsgTime + * This error code will be returned when a request such as #CFE_MSG_SetMsgTime * is made on a packet that does not include a field for msg time. * */ diff --git a/fsw/cfe-core/src/inc/cfe_sb.h b/fsw/cfe-core/src/inc/cfe_sb.h index e28dc443b..e4bb24a49 100644 --- a/fsw/cfe-core/src/inc/cfe_sb.h +++ b/fsw/cfe-core/src/inc/cfe_sb.h @@ -802,7 +802,7 @@ CFE_Status_t CFE_SB_ZeroCopyPass(CFE_MSG_Message_t *MsgPtr, CFE_SB_ZeroCopyHandl /*****************************************************************************/ /** ** \brief DEPRECATED - Initialize a buffer for a software bus message. -** \deprecated +** \deprecated Use CFE_MSG_Init ** ** \par Description ** This routine fills in the header information needed to create a @@ -824,21 +824,16 @@ CFE_Status_t CFE_SB_ZeroCopyPass(CFE_MSG_Message_t *MsgPtr, CFE_SB_ZeroCopyHandl ** \param[in] Clear A flag indicating whether to clear the rest of the message: ** \arg true - fill sequence count and packet data with zeroes. ** \arg false - leave sequence count and packet data unchanged. -** -** \sa #CFE_SB_SetMsgId, #CFE_SB_SetUserDataLength, #CFE_SB_SetTotalMsgLength, -** #CFE_SB_SetMsgTime, #CFE_SB_TimeStampMsg, #CFE_SB_SetCmdCode **/ void CFE_SB_InitMsg(void *MsgPtr, CFE_SB_MsgId_t MsgId, uint16 Length, bool Clear ); -#endif /* CFE_OMIT_DEPRECATED_6_8 */ - /*****************************************************************************/ /** ** \brief DEPRECATED - Sets the message ID of a software bus message. -** \deprecated +** \deprecated Use CFE_MSG_SetMsgId ** ** \par Description ** This routine sets the Message ID in a software bus message header. @@ -850,13 +845,10 @@ void CFE_SB_InitMsg(void *MsgPtr, ** This must point to the first byte of the message header. ** ** \param[in] MsgId The message ID to put into the message header. -** -** -** \sa #CFE_SB_GetMsgId, #CFE_SB_SetUserDataLength, #CFE_SB_SetTotalMsgLength, -** #CFE_SB_SetMsgTime, #CFE_SB_TimeStampMsg, #CFE_SB_SetCmdCode, **/ void CFE_SB_SetMsgId(CFE_MSG_Message_t *MsgPtr, CFE_SB_MsgId_t MsgId); +#endif /* CFE_OMIT_DEPRECATED_6_8 */ /*****************************************************************************/ /** @@ -877,15 +869,14 @@ void CFE_SB_SetMsgId(CFE_MSG_Message_t *MsgPtr, ** This must point to the first byte of the message header. ** ** \param[in] DataLength The length to set (size of the user data, in bytes). -** -** \sa #CFE_SB_SetMsgId, #CFE_SB_GetUserDataLength, #CFE_SB_SetTotalMsgLength, -** #CFE_SB_SetMsgTime, #CFE_SB_TimeStampMsg, #CFE_SB_SetCmdCode, **/ void CFE_SB_SetUserDataLength(CFE_MSG_Message_t *MsgPtr,uint16 DataLength); +#ifndef CFE_OMIT_DEPRECATED_6_8 /*****************************************************************************/ /** -** \brief Sets the total length of a software bus message. +** \brief DEPRECATED: Sets the total length of a software bus message. +** \deprecated Use CFE_MSG_SetSize ** ** \par Description ** This routine sets the field in the SB message header that determines @@ -902,20 +893,18 @@ void CFE_SB_SetUserDataLength(CFE_MSG_Message_t *MsgPtr,uint16 DataLength); ** ** \param[in] TotalLength The length to set (total size of the message, in bytes, ** including headers). -** -** \sa #CFE_SB_SetMsgId, #CFE_SB_SetUserDataLength, -** #CFE_SB_SetMsgTime, #CFE_SB_TimeStampMsg, #CFE_SB_SetCmdCode, **/ void CFE_SB_SetTotalMsgLength(CFE_MSG_Message_t *MsgPtr,uint16 TotalLength); /*****************************************************************************/ /** ** \brief Sets the time field in a software bus message. +** \deprecated Use CFE_MSG_SetMsgTime ** ** \par Description ** This routine sets the time of a software bus message. Most applications ** will want to use #CFE_SB_TimeStampMsg instead of this function. But, -** when needed, #CFE_SB_SetMsgTime can be used to send a group of SB messages +** when needed, this API can be used to send a group of SB messages ** with identical time stamps. ** ** \par Assumptions, External Events, and Notes: @@ -934,11 +923,10 @@ void CFE_SB_SetTotalMsgLength(CFE_MSG_Message_t *MsgPtr,uint16 TotalLength); ** \return Execution status, see \ref CFEReturnCodes ** \retval #CFE_SUCCESS \copybrief CFE_SUCCESS ** \retval #CFE_SB_WRONG_MSG_TYPE \copybrief CFE_SB_WRONG_MSG_TYPE -** -** \sa #CFE_SB_SetMsgId, #CFE_SB_SetUserDataLength, #CFE_SB_SetTotalMsgLength, -** #CFE_SB_GetMsgTime, #CFE_SB_TimeStampMsg, #CFE_SB_SetCmdCode, **/ CFE_Status_t CFE_SB_SetMsgTime(CFE_MSG_Message_t *MsgPtr, CFE_TIME_SysTime_t Time); +#endif /* CFE_OMIT_DEPRECATED_6_8 */ + /*****************************************************************************/ /** @@ -955,15 +943,14 @@ CFE_Status_t CFE_SB_SetMsgTime(CFE_MSG_Message_t *MsgPtr, CFE_TIME_SysTime_t Tim ** ** \param[in] MsgPtr A pointer to the buffer that contains the software bus message. ** This must point to the first byte of the message header. -** -** \sa #CFE_SB_SetMsgId, #CFE_SB_SetUserDataLength, #CFE_SB_SetTotalMsgLength, -** #CFE_SB_SetMsgTime, #CFE_SB_SetCmdCode, **/ void CFE_SB_TimeStampMsg(CFE_MSG_Message_t *MsgPtr); +#ifndef CFE_OMIT_DEPRECATED_6_8 /*****************************************************************************/ /** -** \brief Sets the command code field in a software bus message. +** \brief DEPRECATED:Sets the command code field in a software bus message. +** \deprecated Use CFE_MSG_SetFcnCode ** ** \par Description ** This routine sets the command code of a software bus message (if SB @@ -982,11 +969,9 @@ void CFE_SB_TimeStampMsg(CFE_MSG_Message_t *MsgPtr); ** \return Execution status, see \ref CFEReturnCodes ** \retval #CFE_SUCCESS \copybrief CFE_SUCCESS ** \retval #CFE_SB_WRONG_MSG_TYPE \copybrief CFE_SB_WRONG_MSG_TYPE -** -** \sa #CFE_SB_SetMsgId, #CFE_SB_SetUserDataLength, #CFE_SB_SetTotalMsgLength, -** #CFE_SB_SetMsgTime, #CFE_SB_TimeStampMsg, #CFE_SB_GetCmdCode, **/ CFE_Status_t CFE_SB_SetCmdCode(CFE_MSG_Message_t *MsgPtr, uint16 CmdCode); +#endif /* CFE_OMIT_DEPRECATED_6_8 */ /******************************************************************************/ /** @@ -1043,15 +1028,15 @@ int32 CFE_SB_MessageStringSet(char *DestStringPtr, const char *SourceStringPtr, ** \param[in] MsgPtr A pointer to the buffer that contains the software bus message. ** ** \return A pointer to the first byte of user data within the software bus message. -** -** \sa #CFE_SB_GetMsgId, #CFE_SB_GetUserDataLength, -** #CFE_SB_GetMsgTime, #CFE_SB_GetCmdCode, #CFE_SB_GetChecksum **/ void *CFE_SB_GetUserData(CFE_MSG_Message_t *MsgPtr); +#ifndef CFE_OMIT_DEPRECATED_6_8 + /*****************************************************************************/ /** -** \brief Get the message ID of a software bus message. +** \brief DEPRECATED:Get the message ID of a software bus message. +** \deprecated Use CFE_MSG_GetMsgId ** ** \par Description ** This routine returns the message ID from a software bus message. @@ -1062,11 +1047,9 @@ void *CFE_SB_GetUserData(CFE_MSG_Message_t *MsgPtr); ** \param[in] MsgPtr A pointer to the buffer that contains the software bus message. ** ** \return The software bus Message ID from the message header. -** -** \sa #CFE_SB_GetUserData, #CFE_SB_SetMsgId, #CFE_SB_GetUserDataLength, -** #CFE_SB_GetMsgTime, #CFE_SB_GetCmdCode, #CFE_SB_GetChecksum **/ CFE_SB_MsgId_t CFE_SB_GetMsgId(const CFE_MSG_Message_t *MsgPtr); +#endif /* CFE_OMIT_DEPRECATED_6_8 */ /*****************************************************************************/ /** @@ -1082,9 +1065,6 @@ CFE_SB_MsgId_t CFE_SB_GetMsgId(const CFE_MSG_Message_t *MsgPtr); ** This must point to the first byte of the message header. ** ** \return The size (in bytes) of the user data in the software bus message. -** -** \sa #CFE_SB_GetUserData, #CFE_SB_GetMsgId, #CFE_SB_SetUserDataLength, -** #CFE_SB_GetMsgTime, #CFE_SB_GetCmdCode, #CFE_SB_GetChecksum **/ uint16 CFE_SB_GetUserDataLength(const CFE_MSG_Message_t *MsgPtr); @@ -1093,7 +1073,7 @@ uint16 CFE_SB_GetUserDataLength(const CFE_MSG_Message_t *MsgPtr); /*****************************************************************************/ /** ** \brief DEPRECATED: Gets the total length of a software bus message. -** \deprecated +** \deprecated Use CFE_MSG_GetSize ** ** \par Description ** This routine returns the total size of the software bus message. @@ -1106,17 +1086,13 @@ uint16 CFE_SB_GetUserDataLength(const CFE_MSG_Message_t *MsgPtr); ** This must point to the first byte of the message header. ** ** \return The total size (in bytes) of the software bus message, including headers. -** -** \sa #CFE_SB_GetUserData, #CFE_SB_GetMsgId, #CFE_SB_GetUserDataLength, #CFE_SB_SetTotalMsgLength, -** #CFE_SB_GetMsgTime, #CFE_SB_GetCmdCode, #CFE_SB_GetChecksum **/ uint16 CFE_SB_GetTotalMsgLength(const CFE_MSG_Message_t *MsgPtr); -#endif /* CFE_OMIT_DEPRECATED_6_8 */ - /*****************************************************************************/ /** -** \brief Gets the command code field from a software bus message. +** \brief DEPRECATED: Gets the command code field from a software bus message. +** \deprecated Use CFE_MSG_GetFcnCode ** ** \par Description ** This routine gets the command code from a software bus message (if @@ -1132,15 +1108,13 @@ uint16 CFE_SB_GetTotalMsgLength(const CFE_MSG_Message_t *MsgPtr); ** ** \return The command code included in the software bus message header (if present). ** Otherwise, returns a command code value of zero. -** -** \sa #CFE_SB_GetUserData, #CFE_SB_GetMsgId, #CFE_SB_GetUserDataLength, -** #CFE_SB_GetMsgTime, #CFE_SB_SetCmdCode, #CFE_SB_GetChecksum **/ uint16 CFE_SB_GetCmdCode(CFE_MSG_Message_t *MsgPtr); /*****************************************************************************/ /** -** \brief Gets the time field from a software bus message. +** \brief DEPRECATED: Gets the time field from a software bus message. +** \deprecated Use CFE_MSG_GetMsgTime ** ** \par Description ** This routine gets the time from a software bus message. @@ -1155,11 +1129,9 @@ uint16 CFE_SB_GetCmdCode(CFE_MSG_Message_t *MsgPtr); ** ** \return The system time included in the software bus message header (if present), ** otherwise, returns a time value of zero. -** -** \sa #CFE_SB_GetUserData, #CFE_SB_GetMsgId, #CFE_SB_GetUserDataLength, -** #CFE_SB_SetMsgTime, #CFE_SB_GetCmdCode, #CFE_SB_GetChecksum **/ CFE_TIME_SysTime_t CFE_SB_GetMsgTime(CFE_MSG_Message_t *MsgPtr); +#endif /* CFE_OMIT_DEPRECATED_6_8 */ /******************************************************************************/ /** @@ -1203,13 +1175,15 @@ CFE_TIME_SysTime_t CFE_SB_GetMsgTime(CFE_MSG_Message_t *MsgPtr); int32 CFE_SB_MessageStringGet(char *DestStringPtr, const char *SourceStringPtr, const char *DefaultString, uint32 DestMaxSize, uint32 SourceMaxSize); /**@}*/ +#ifndef CFE_OMIT_DEPRECATED_6_8 /** @defgroup CFEAPISBChecksum cFE Checksum Control APIs * @{ */ /*****************************************************************************/ /** -** \brief Gets the checksum field from a software bus message. +** \brief DEPRECATED:Gets the checksum field from a software bus message. +** \deprecated No use case ** ** \par Description ** This routine gets the checksum (or other message integrity check @@ -1228,16 +1202,13 @@ int32 CFE_SB_MessageStringGet(char *DestStringPtr, const char *SourceStringPtr, ** ** \return The checksum included in the software bus message header (if present), otherwise, ** returns a checksum value of zero. -** -** \sa #CFE_SB_GetUserData, #CFE_SB_GetMsgId, #CFE_SB_GetUserDataLength, -** #CFE_SB_GetMsgTime, #CFE_SB_GetCmdCode, #CFE_SB_GetChecksum -** #CFE_SB_ValidateChecksum, #CFE_SB_GenerateChecksum **/ uint16 CFE_SB_GetChecksum(CFE_MSG_Message_t *MsgPtr); /*****************************************************************************/ /** -** \brief Calculates and sets the checksum of a software bus message +** \brief DEPRECATED:Calculates and sets the checksum of a software bus message +** \deprecated Use CFE_MSG_GenerateChecksum ** ** \par Description ** This routine calculates the checksum of a software bus message according @@ -1252,14 +1223,13 @@ uint16 CFE_SB_GetChecksum(CFE_MSG_Message_t *MsgPtr); ** ** \param[in] MsgPtr A pointer to the buffer that contains the software bus message. ** This must point to the first byte of the message header. -** -** \sa #CFE_SB_ValidateChecksum, #CFE_SB_GetChecksum **/ void CFE_SB_GenerateChecksum(CFE_MSG_Message_t *MsgPtr); /*****************************************************************************/ /** -** \brief Validates the checksum of a software bus message. +** \brief DEPRECATED:Validates the checksum of a software bus message. +** \deprecated Use CFE_MSG_ValidateChecksum ** ** \par Description ** This routine calculates the expected checksum of a software bus message @@ -1278,11 +1248,10 @@ void CFE_SB_GenerateChecksum(CFE_MSG_Message_t *MsgPtr); ** \return Boolean checksum result ** \retval true The checksum field in the packet is valid. ** \retval false The checksum field in the packet is not valid or the message type is wrong. -** -** \sa #CFE_SB_GenerateChecksum, #CFE_SB_GetChecksum **/ bool CFE_SB_ValidateChecksum(CFE_MSG_Message_t *MsgPtr); /**@}*/ +#endif /* CFE_OMIT_DEPRECATED_6_8 */ /** @defgroup CFEAPISBMessageID cFE Message ID APIs * @{ @@ -1386,6 +1355,7 @@ static inline CFE_SB_MsgId_t CFE_SB_ValueToMsgId(CFE_SB_MsgId_Atom_t MsgIdValue) return Result; } +#ifndef CFE_OMIT_DEPRECATED_6_8 /*****************************************************************************/ /** * \brief Identifies packet type given message ID @@ -1399,6 +1369,7 @@ static inline CFE_SB_MsgId_t CFE_SB_ValueToMsgId(CFE_SB_MsgId_Atom_t MsgIdValue) * \retval #CFE_MSG_Type_Invalid Invalid/unknown packet type */ uint32 CFE_SB_GetPktType(CFE_SB_MsgId_t MsgId); +#endif /* CFE_OMIT_DEPRECATED_6_8 */ /**@}*/ diff --git a/fsw/cfe-core/src/inc/cfe_tbl.h b/fsw/cfe-core/src/inc/cfe_tbl.h index 4e29481d2..057a74173 100644 --- a/fsw/cfe-core/src/inc/cfe_tbl.h +++ b/fsw/cfe-core/src/inc/cfe_tbl.h @@ -45,6 +45,7 @@ #include "common_types.h" /* Basic Data Types */ #include "cfe_time.h" #include "osconfig.h" +#include "cfe_msg_typedefs.h" /******************* Macro Definitions ***********************/ @@ -812,7 +813,7 @@ CFE_Status_t CFE_TBL_GetInfo(CFE_TBL_Info_t *TblInfoPtr, const char *TblName); ** \sa #CFE_TBL_Register ** ******************************************************************************/ -CFE_Status_t CFE_TBL_NotifyByMessage(CFE_TBL_Handle_t TblHandle, CFE_SB_MsgId_t MsgId, uint16 CommandCode, uint32 Parameter); +CFE_Status_t CFE_TBL_NotifyByMessage(CFE_TBL_Handle_t TblHandle, CFE_SB_MsgId_t MsgId, CFE_MSG_FcnCode_t CommandCode, uint32 Parameter); /**@}*/ #endif /* _cfe_tbl_ */ diff --git a/fsw/cfe-core/src/sb/cfe_sb_api.c b/fsw/cfe-core/src/sb/cfe_sb_api.c index 9c5f0c70c..ab2e37391 100644 --- a/fsw/cfe-core/src/sb/cfe_sb_api.c +++ b/fsw/cfe-core/src/sb/cfe_sb_api.c @@ -1158,7 +1158,7 @@ int32 CFE_SB_SendMsgFull(CFE_MSG_Message_t *MsgPtr, uint32 TlmCntIncrements, uint32 CopyMode) { - CFE_SB_MsgId_t MsgId; + CFE_SB_MsgId_t MsgId = CFE_SB_INVALID_MSG_ID; int32 Status; CFE_SB_DestinationD_t *DestPtr = NULL; CFE_SB_PipeD_t *PipeDscPtr; @@ -1172,6 +1172,7 @@ int32 CFE_SB_SendMsgFull(CFE_MSG_Message_t *MsgPtr, CFE_SB_EventBuf_t SBSndErr; char PipeName[OS_MAX_API_NAME] = {'\0'}; CFE_SB_PipeDepthStats_t *StatObj; + CFE_MSG_Type_t MsgType = CFE_MSG_Type_Invalid; SBSndErr.EvtsToSnd = 0; @@ -1192,7 +1193,7 @@ int32 CFE_SB_SendMsgFull(CFE_MSG_Message_t *MsgPtr, return CFE_SB_BAD_ARGUMENT; }/* end if */ - MsgId = CFE_SB_GetMsgId(MsgPtr); + CFE_MSG_GetMsgId(MsgPtr, &MsgId); /* validate the msgid in the message */ if(!CFE_SB_IsValidMsgId(MsgId)) @@ -1298,10 +1299,11 @@ int32 CFE_SB_SendMsgFull(CFE_MSG_Message_t *MsgPtr, } /* For Tlm packets, increment the seq count if requested */ - if((CFE_SB_GetPktType(MsgId)==CFE_MSG_Type_Tlm) && + CFE_MSG_GetType(MsgPtr, &MsgType); + if((MsgType == CFE_MSG_Type_Tlm) && (TlmCntIncrements==CFE_SB_INCREMENT_TLM)){ CFE_SBR_IncrementSequenceCounter(RouteId); - CFE_SB_SetMsgSeqCnt((CFE_MSG_Message_t *)BufDscPtr->Buffer, CFE_SBR_GetSequenceCounter(RouteId)); + CFE_MSG_SetSequenceCount((CFE_MSG_Message_t *)BufDscPtr->Buffer, CFE_SBR_GetSequenceCounter(RouteId)); }/* end if */ /* Send the packet to all destinations */ 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 index 7d7be23b2..299dc931e 100644 --- a/fsw/cfe-core/src/sb/cfe_sb_msg_id_util.c +++ b/fsw/cfe-core/src/sb/cfe_sb_msg_id_util.c @@ -34,6 +34,7 @@ #include "cfe_sb_priv.h" #include "cfe_msg_api.h" +#ifndef CFE_OMIT_DEPRECATED_6_8 /* * Function: CFE_SB_GetMsgId - See API and header file for details */ @@ -75,6 +76,7 @@ uint32 CFE_SB_GetPktType(CFE_SB_MsgId_t MsgId) return type; }/* end CFE_SB_GetPktType */ +#endif /* CFE_OMIT_DEPRECATED_6_8 */ /* * Function: CFE_SB_IsValidMsgId - See API and header file for details diff --git a/fsw/cfe-core/src/sb/cfe_sb_priv.c b/fsw/cfe-core/src/sb/cfe_sb_priv.c index d36890c60..f6eeb5623 100644 --- a/fsw/cfe-core/src/sb/cfe_sb_priv.c +++ b/fsw/cfe-core/src/sb/cfe_sb_priv.c @@ -302,6 +302,7 @@ CFE_SB_DestinationD_t *CFE_SB_GetDestPtr(CFE_SBR_RouteId_t RouteId, CFE_SB_PipeI return destptr; } +#ifndef CFE_OMIT_DEPRECATED_6_8 /****************************************************************************** ** Function: CFE_SB_SetMsgSeqCnt() ** @@ -321,7 +322,7 @@ void CFE_SB_SetMsgSeqCnt(CFE_MSG_Message_t *MsgPtr,uint32 Count){ CFE_MSG_SetSequenceCount(MsgPtr, Count); }/* end CFE_SB_SetMsgSeqCnt */ - +#endif /* CFE_OMIT_DEPRECATED_6_8 */ /****************************************************************************** ** Function: CFE_SB_ValidateMsgId() diff --git a/fsw/cfe-core/src/sb/cfe_sb_priv.h b/fsw/cfe-core/src/sb/cfe_sb_priv.h index e3a2faefc..a74eaf8cc 100644 --- a/fsw/cfe-core/src/sb/cfe_sb_priv.h +++ b/fsw/cfe-core/src/sb/cfe_sb_priv.h @@ -356,9 +356,6 @@ CFE_SB_DestinationD_t *CFE_SB_GetDestPtr(CFE_SBR_RouteId_t RouteId, CFE_SB_PipeI ** ** \returns The number of bytes in the software bus message header for ** messages with the given \c MsgId. -** -** \sa #CFE_SB_GetUserData, #CFE_SB_GetMsgId, #CFE_SB_GetUserDataLength, -** #CFE_SB_GetMsgTime, #CFE_SB_GetCmdCode, #CFE_SB_GetChecksum **/ uint16 CFE_SB_MsgHdrSize(const CFE_MSG_Message_t *MsgPtr); diff --git a/fsw/cfe-core/src/sb/cfe_sb_task.c b/fsw/cfe-core/src/sb/cfe_sb_task.c index 4e421dbcc..6991b7fab 100644 --- a/fsw/cfe-core/src/sb/cfe_sb_task.c +++ b/fsw/cfe-core/src/sb/cfe_sb_task.c @@ -364,10 +364,10 @@ bool CFE_SB_VerifyCmdLength(CFE_MSG_Message_t *MsgPtr, CFE_MSG_Size_t ExpectedLe ** none */ void CFE_SB_ProcessCmdPipePkt(void) { - CFE_SB_MsgId_t MessageID; + CFE_SB_MsgId_t MessageID = CFE_SB_INVALID_MSG_ID; CFE_MSG_FcnCode_t FcnCode = 0; - MessageID = CFE_SB_GetMsgId(CFE_SB.CmdPipePktPtr); + CFE_MSG_GetMsgId(CFE_SB.CmdPipePktPtr, &MessageID); switch(CFE_SB_MsgIdToValue(MessageID)){ diff --git a/fsw/cfe-core/src/sb/cfe_sb_util.c b/fsw/cfe-core/src/sb/cfe_sb_util.c index 582dc4b8b..cee644719 100644 --- a/fsw/cfe-core/src/sb/cfe_sb_util.c +++ b/fsw/cfe-core/src/sb/cfe_sb_util.c @@ -158,7 +158,6 @@ uint16 CFE_SB_GetTotalMsgLength(const CFE_MSG_Message_t *MsgPtr) return (uint16)size; }/* end CFE_SB_GetTotalMsgLength */ -#endif /* CFE_OMIT_DEPRECATED_6_8 */ /* * Function: CFE_SB_SetTotalMsgLength - See API and header file for details @@ -170,7 +169,6 @@ void CFE_SB_SetTotalMsgLength(CFE_MSG_Message_t *MsgPtr,uint16 TotalLength) }/* end CFE_SB_SetTotalMsgLength */ - /* * Function: CFE_SB_GetMsgTime - See API and header file for details */ @@ -184,7 +182,6 @@ CFE_TIME_SysTime_t CFE_SB_GetMsgTime(CFE_MSG_Message_t *MsgPtr) }/* end CFE_SB_GetMsgTime */ - /* * Function: CFE_SB_SetMsgTime - See API and header file for details */ @@ -194,18 +191,18 @@ int32 CFE_SB_SetMsgTime(CFE_MSG_Message_t *MsgPtr, CFE_TIME_SysTime_t NewTime) return CFE_MSG_SetMsgTime(MsgPtr, NewTime); }/* end CFE_SB_SetMsgTime */ - +#endif /* CFE_OMIT_DEPRECATED_6_8 */ /* * Function: CFE_SB_TimeStampMsg - See API and header file for details */ void CFE_SB_TimeStampMsg(CFE_MSG_Message_t *MsgPtr) { - CFE_SB_SetMsgTime(MsgPtr,CFE_TIME_GetTime()); + CFE_MSG_SetMsgTime(MsgPtr,CFE_TIME_GetTime()); }/* end CFE_SB_TimeStampMsg */ - +#ifndef CFE_OMIT_DEPRECATED_6_8 /* * Function: CFE_SB_GetCmdCode - See API and header file for details */ @@ -278,6 +275,7 @@ bool CFE_SB_ValidateChecksum(CFE_MSG_Message_t *MsgPtr) return isvalid; }/* end CFE_SB_ValidateChecksum */ +#endif /* CFE_OMIT_DEPRECATED_6_8 */ /* * Function: CFE_SB_MessageStringGet - See API and header file for details diff --git a/fsw/cfe-core/src/tbl/cfe_tbl_api.c b/fsw/cfe-core/src/tbl/cfe_tbl_api.c index b28e72232..7eb9e2003 100644 --- a/fsw/cfe-core/src/tbl/cfe_tbl_api.c +++ b/fsw/cfe-core/src/tbl/cfe_tbl_api.c @@ -1539,7 +1539,7 @@ int32 CFE_TBL_Modified( CFE_TBL_Handle_t TblHandle ) /* * Function: CFE_TBL_NotifyByMessage - See API and header file for details */ -int32 CFE_TBL_NotifyByMessage(CFE_TBL_Handle_t TblHandle, CFE_SB_MsgId_t MsgId, uint16 CommandCode, uint32 Parameter) +int32 CFE_TBL_NotifyByMessage(CFE_TBL_Handle_t TblHandle, CFE_SB_MsgId_t MsgId, CFE_MSG_FcnCode_t CommandCode, uint32 Parameter) { int32 Status; CFE_TBL_AccessDescriptor_t *AccessDescPtr = NULL; diff --git a/fsw/cfe-core/src/tbl/cfe_tbl_internal.c b/fsw/cfe-core/src/tbl/cfe_tbl_internal.c index f9f49b13a..1aca77d6c 100644 --- a/fsw/cfe-core/src/tbl/cfe_tbl_internal.c +++ b/fsw/cfe-core/src/tbl/cfe_tbl_internal.c @@ -1516,7 +1516,7 @@ int32 CFE_TBL_SendNotificationMsg(CFE_TBL_RegistryRec_t *RegRecPtr) sizeof(CFE_TBL_NotifyCmd_t)); /* Set the command code */ - CFE_SB_SetCmdCode((CFE_MSG_Message_t *) &CFE_TBL_TaskData.NotifyMsg, RegRecPtr->NotificationCC); + CFE_MSG_SetFcnCode((CFE_MSG_Message_t *) &CFE_TBL_TaskData.NotifyMsg, RegRecPtr->NotificationCC); /* Set the command parameter */ CFE_TBL_TaskData.NotifyMsg.Payload.Parameter = RegRecPtr->NotificationParam; diff --git a/fsw/cfe-core/src/tbl/cfe_tbl_task.h b/fsw/cfe-core/src/tbl/cfe_tbl_task.h index bc3825ac8..3a27b6a5b 100644 --- a/fsw/cfe-core/src/tbl/cfe_tbl_task.h +++ b/fsw/cfe-core/src/tbl/cfe_tbl_task.h @@ -197,7 +197,7 @@ typedef struct int32 ValidateInactiveIndex; /**< \brief Index to Validation Request on Inactive Table Result data */ int32 DumpControlIndex; /**< \brief Index to Dump Control Block */ CFE_ES_CDSHandle_t CDSHandle; /**< \brief Handle to Critical Data Store for Critical Tables */ - uint16 NotificationCC; /**< \brief Command Code of an associated management notification message */ + CFE_MSG_FcnCode_t NotificationCC; /**< \brief Command Code of an associated management notification message */ bool CriticalTable; /**< \brief Flag indicating whether table is a Critical Table */ bool TableLoadedOnce; /**< \brief Flag indicating whether table has been loaded once or not */ bool LoadPending; /**< \brief Flag indicating an inactive buffer is ready to be copied */ diff --git a/fsw/cfe-core/src/time/cfe_time_task.c b/fsw/cfe-core/src/time/cfe_time_task.c index bc047dce4..7fbc7fa9d 100644 --- a/fsw/cfe-core/src/time/cfe_time_task.c +++ b/fsw/cfe-core/src/time/cfe_time_task.c @@ -465,10 +465,11 @@ bool CFE_TIME_VerifyCmdLength(CFE_MSG_Message_t *MsgPtr, CFE_MSG_Size_t Expected void CFE_TIME_TaskPipe(CFE_MSG_Message_t *MsgPtr) { - CFE_SB_MsgId_t MessageID; - uint16 CommandCode; + CFE_SB_MsgId_t MessageID = CFE_SB_INVALID_MSG_ID; + CFE_MSG_FcnCode_t CommandCode = 0; + + CFE_MSG_GetMsgId(MsgPtr, &MessageID); - MessageID = CFE_SB_GetMsgId(MsgPtr); switch (CFE_SB_MsgIdToValue(MessageID)) { /* @@ -513,7 +514,7 @@ void CFE_TIME_TaskPipe(CFE_MSG_Message_t *MsgPtr) */ case CFE_TIME_CMD_MID: - CommandCode = CFE_SB_GetCmdCode(MsgPtr); + CFE_MSG_GetFcnCode(MsgPtr, &CommandCode); switch (CommandCode) { case CFE_TIME_NOOP_CC: diff --git a/fsw/cfe-core/unit-test/evs_UT.c b/fsw/cfe-core/unit-test/evs_UT.c index ba8e5a167..3290158e4 100644 --- a/fsw/cfe-core/unit-test/evs_UT.c +++ b/fsw/cfe-core/unit-test/evs_UT.c @@ -2709,8 +2709,6 @@ void Test_Misc(void) /* Test housekeeping report with log enabled */ UT_InitData(); - CFE_MSG_Init((CFE_MSG_Message_t *) &CFE_EVS_GlobalData.EVS_TlmPkt, HK_SnapshotData.MsgId, - sizeof(CFE_EVS_GlobalData.EVS_TlmPkt)); CFE_EVS_GlobalData.EVS_TlmPkt.Payload.LogEnabled = true; HK_SnapshotData.Count = 0; UT_SetHookFunction(UT_KEY(CFE_SB_SendMsg), UT_SoftwareBusSnapshotHook, &HK_SnapshotData); @@ -2737,8 +2735,6 @@ void Test_Misc(void) /* Test housekeeping report with log disabled */ UT_InitData(); - CFE_MSG_Init((CFE_MSG_Message_t *) &CFE_EVS_GlobalData.EVS_TlmPkt, HK_SnapshotData.MsgId, - sizeof(CFE_EVS_GlobalData.EVS_TlmPkt)); CFE_EVS_GlobalData.EVS_TlmPkt.Payload.LogEnabled = false; HK_SnapshotData.Count = 0; UT_SetHookFunction(UT_KEY(CFE_SB_SendMsg), UT_SoftwareBusSnapshotHook, &HK_SnapshotData); diff --git a/fsw/cfe-core/unit-test/sb_UT.c b/fsw/cfe-core/unit-test/sb_UT.c index 11bca67a3..f979edb23 100644 --- a/fsw/cfe-core/unit-test/sb_UT.c +++ b/fsw/cfe-core/unit-test/sb_UT.c @@ -2775,7 +2775,7 @@ void Test_SendMsg_BasicSend(void) SETUP(CFE_SB_Subscribe(MsgId, PipeId)); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); ASSERT(CFE_SB_SendMsg(TlmPktPtr)); @@ -2817,14 +2817,14 @@ void Test_SendMsg_SequenceCount(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); SETUP(CFE_SB_SendMsg(TlmPktPtr)); ASSERT_EQ(UT_GetStubCount(UT_KEY(CFE_MSG_SetSequenceCount)), 1); ASSERT_EQ(SeqCnt, 1); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); ASSERT(CFE_SB_PassMsg(TlmPktPtr)); /* Assert sequence count wasn't set */ @@ -2832,7 +2832,7 @@ void Test_SendMsg_SequenceCount(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); ASSERT(CFE_SB_SendMsg(TlmPktPtr)); ASSERT_EQ(SeqCnt, 2); ASSERT_EQ(UT_GetStubCount(UT_KEY(CFE_MSG_SetSequenceCount)), 2); @@ -2844,7 +2844,7 @@ void Test_SendMsg_SequenceCount(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); SETUP(CFE_SB_SendMsg(TlmPktPtr)); /* increment to 3 */ ASSERT_EQ(UT_GetStubCount(UT_KEY(CFE_MSG_SetSequenceCount)), 3); @@ -2852,7 +2852,7 @@ void Test_SendMsg_SequenceCount(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); SETUP(CFE_SB_SendMsg(TlmPktPtr)); /* increment to 4 */ ASSERT_EQ(SeqCnt, 4); ASSERT_EQ(UT_GetStubCount(UT_KEY(CFE_MSG_SetSequenceCount)), 4); @@ -2879,7 +2879,7 @@ void Test_SendMsg_QueuePutError(void) UT_SetDeferredRetcode(UT_KEY(OS_QueuePut), 1, OS_ERROR); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); ASSERT(CFE_SB_SendMsg(TlmPktPtr)); @@ -2908,7 +2908,7 @@ void Test_SendMsg_PipeFull(void) SETUP(CFE_SB_Subscribe(MsgId, PipeId)); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); /* This send should pass */ ASSERT(CFE_SB_SendMsg(TlmPktPtr)); @@ -2918,7 +2918,7 @@ void Test_SendMsg_PipeFull(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); /* Pipe overflow causes SendMsg to return CFE_SUCCESS */ ASSERT(CFE_SB_SendMsg(TlmPktPtr)); @@ -2951,14 +2951,14 @@ void Test_SendMsg_MsgLimitExceeded(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); /* First send should pass */ ASSERT(CFE_SB_SendMsg(TlmPktPtr)); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); /* This send should produce a MsgId to Pipe Limit Exceeded message, but * return success @@ -3091,7 +3091,7 @@ void Test_SendMsg_ZeroCopySend(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); /* Test a successful zero copy send */ ASSERT(CFE_SB_ZeroCopySend(ZeroCpyMsgPtr, ZeroCpyBufHndl)); @@ -3146,7 +3146,7 @@ void Test_SendMsg_ZeroCopyPass(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); /* Test a successful zero copy pass */ ASSERT(CFE_SB_ZeroCopyPass(ZeroCpyMsgPtr, ZeroCpyBufHndl)); @@ -3240,7 +3240,7 @@ void Test_SendMsg_DisabledDestination(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); ASSERT(CFE_SB_SendMsg(TlmPktPtr)); @@ -3282,7 +3282,7 @@ void Test_SendMsg_SendWithMetadata(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); ASSERT(CFE_SB_SendMsgFull(TlmPktPtr, CFE_SB_DO_NOT_INCREMENT, CFE_SB_SEND_ZEROCOPY)); @@ -3315,7 +3315,7 @@ void Test_SendMsg_MaxMsgSizePlusOne_ZeroCopy(void) { UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); ASSERT_EQ(CFE_SB_SendMsgFull(TlmPktPtr, CFE_SB_INCREMENT_TLM, CFE_SB_SEND_ZEROCOPY), CFE_SB_MSG_TOO_BIG); @@ -3350,7 +3350,7 @@ void Test_SendMsg_NoSubscribers_ZeroCopy(void) { UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); ASSERT(CFE_SB_SendMsgFull(TlmPktPtr, CFE_SB_INCREMENT_TLM, CFE_SB_SEND_ZEROCOPY)); @@ -3500,7 +3500,7 @@ void Test_RcvMsg_PendForever(void) SETUP(CFE_SB_CreatePipe(&PipeId, PipeDepth, "RcvMsgTestPipe")); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); SETUP(CFE_SB_Subscribe(MsgId, PipeId)); SETUP(CFE_SB_SendMsg(TlmPktPtr)); @@ -3587,11 +3587,7 @@ void Test_SB_Utils(void) { SB_UT_ADD_SUBTEST(Test_CFE_SB_MsgHdrSize); SB_UT_ADD_SUBTEST(Test_CFE_SB_GetUserData); - SB_UT_ADD_SUBTEST(Test_CFE_SB_SetGetMsgId); SB_UT_ADD_SUBTEST(Test_CFE_SB_SetGetUserDataLength); - SB_UT_ADD_SUBTEST(Test_CFE_SB_SetGetMsgTime); - SB_UT_ADD_SUBTEST(Test_CFE_SB_SetGetCmdCode); - SB_UT_ADD_SUBTEST(Test_CFE_SB_ChecksumUtils); SB_UT_ADD_SUBTEST(Test_CFE_SB_ValidateMsgId); } /* end Test_SB_Utils */ @@ -3654,22 +3650,6 @@ void Test_CFE_SB_GetUserData(void) } /* end Test_CFE_SB_GetUserData */ -/* -** Test setting and getting the message ID of a message -*/ -void Test_CFE_SB_SetGetMsgId(void) -{ - CFE_MSG_Message_t msg; - CFE_SB_MsgId_t msgid = 5; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &msgid, sizeof(msgid), false); - - /* Pass through functions */ - ASSERT_EQ(CFE_SB_GetMsgId(&msg), msgid); - CFE_SB_SetMsgId(&msg, CFE_SB_ValueToMsgId(0)); - -} /* end Test_CFE_SB_SetGetMsgId */ - /* ** Test setting and getting the user data length of a message */ @@ -3692,84 +3672,6 @@ void Test_CFE_SB_SetGetUserDataLength(void) } /* end Util_CFE_SB_SetGetUserDataLength */ -void Test_CFE_SB_SetGetMsgTime(void) -{ - CFE_MSG_Message_t msg; - CFE_TIME_SysTime_t time = {0xb, 0xa0000}; - CFE_TIME_SysTime_t actual; - - /* Set up buffer */ - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgTime), &time, sizeof(time), false); - - /* Pass through functions */ - actual = CFE_SB_GetMsgTime(&msg); - ASSERT_TRUE(actual.Seconds == time.Seconds); - ASSERT_TRUE(actual.Subseconds == time.Subseconds); - CFE_SB_SetMsgTime(&msg, time); - CFE_SB_TimeStampMsg(&msg); - -} /* end Test_CFE_SB_SetGetMsgTime */ - -void Test_CFE_SB_SetGetCmdCode(void) -{ - CFE_MSG_Message_t msg; - CFE_MSG_FcnCode_t fcncode = 7; - - /* Set up buffer */ - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &fcncode, sizeof(fcncode), false); - - /* Pass through functions */ - ASSERT_EQ(CFE_SB_GetCmdCode(&msg), fcncode); - CFE_SB_SetCmdCode(&msg, 0); - -} /* end Test_CFE_SB_SetGetCmdCode */ - -/* -** Test checksum utils -*/ -void Test_CFE_SB_ChecksumUtils(void) -{ - CFE_SB_CmdHdr_t SBCmd; - CFE_MSG_Message_t *SBCmdPtr = (CFE_MSG_Message_t *) &SBCmd; - bool hassec; - CFE_MSG_Type_t type; - bool validcksum; - - /* Has secondary, tlm type */ - hassec = true; - type = CFE_MSG_Type_Tlm; - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetHasSecondaryHeader), &hassec, sizeof(hassec), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &type, sizeof(type), false); - ASSERT_EQ(CFE_SB_GetChecksum(SBCmdPtr), 0); - - /* No secondary, cmd type */ - hassec = false; - type = CFE_MSG_Type_Cmd; - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetHasSecondaryHeader), &hassec, sizeof(hassec), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &type, sizeof(type), false); - ASSERT_EQ(CFE_SB_GetChecksum(SBCmdPtr), 0); - - /* Valid, 0 */ - hassec = true; - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetHasSecondaryHeader), &hassec, sizeof(hassec), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &type, sizeof(type), false); - memset(&SBCmd, 1, sizeof(SBCmd)); - ASSERT_EQ(CFE_SB_GetChecksum(SBCmdPtr), 1); - - /* Valid, 0xFF */ - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetHasSecondaryHeader), &hassec, sizeof(hassec), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &type, sizeof(type), false); - memset(&SBCmd, 0xFF, sizeof(SBCmd)); - ASSERT_EQ(CFE_SB_GetChecksum(SBCmdPtr), 0xFF); - - /* Execute passthrough functions */ - validcksum = true; - CFE_SB_GenerateChecksum(SBCmdPtr); - UT_SetDataBuffer(UT_KEY(CFE_MSG_ValidateChecksum), &validcksum, sizeof(validcksum), false); - ASSERT_EQ(CFE_SB_ValidateChecksum(SBCmdPtr), validcksum); - -} /* end Test_CFE_SB_ChecksumUtils */ - /* ** Test validating a msg id */ @@ -4023,7 +3925,7 @@ void Test_SB_SendMsgPaths_Nominal(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); ASSERT(CFE_SB_SendMsg(TlmPktPtr)); @@ -4051,14 +3953,14 @@ void Test_SB_SendMsgPaths_LimitErr(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); /* First send should pass */ ASSERT(CFE_SB_SendMsg(TlmPktPtr)); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); CFE_SB.StopRecurseFlags[1] |= CFE_BIT(CFE_SB_MSGID_LIM_ERR_EID_BIT); ASSERT(CFE_SB_SendMsg(TlmPktPtr)); @@ -4088,14 +3990,14 @@ void Test_SB_SendMsgPaths_FullErr(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); /* This send should pass */ ASSERT(CFE_SB_SendMsg(TlmPktPtr)); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); /* Tell the QueuePut stub to return OS_QUEUE_FULL on its next call */ UT_SetDeferredRetcode(UT_KEY(OS_QueuePut), 1, OS_QUEUE_FULL); @@ -4128,7 +4030,7 @@ void Test_SB_SendMsgPaths_WriteErr(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); CFE_SB.StopRecurseFlags[1] |= CFE_BIT(CFE_SB_Q_WR_ERR_EID_BIT); ASSERT(CFE_SB_SendMsg(TlmPktPtr)); @@ -4136,7 +4038,7 @@ void Test_SB_SendMsgPaths_WriteErr(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); ASSERT(CFE_SB_SendMsg(TlmPktPtr)); @@ -4166,7 +4068,7 @@ void Test_SB_SendMsgPaths_IgnoreOpt(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); /* Test skipping this pipe and the send should pass */ ASSERT(CFE_SB_SendMsg(TlmPktPtr)); @@ -4196,7 +4098,7 @@ void Test_RcvMsg_UnsubResubPath(void) SETUP(CFE_SB_Subscribe(MsgId, PipeId)); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetTypeFromMsgId), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); SETUP(CFE_SB_SendMsg(TlmPktPtr)); SETUP(CFE_SB_Unsubscribe(MsgId, PipeId)); diff --git a/fsw/cfe-core/unit-test/sb_UT.h b/fsw/cfe-core/unit-test/sb_UT.h index 50b272a7f..ffb126684 100644 --- a/fsw/cfe-core/unit-test/sb_UT.h +++ b/fsw/cfe-core/unit-test/sb_UT.h @@ -99,9 +99,6 @@ typedef struct { ** ** \returns ** This function does not return a value. -** -** \sa #UT_CheckForOpenSockets, #UT_InitData, #CFE_SB_EarlyInit -** ******************************************************************************/ void SB_ResetUnitTest(void); @@ -117,9 +114,6 @@ void SB_ResetUnitTest(void); ** ** \returns ** This function does not return a value. -** -** \sa #Test_SB_AppInit, #Test_SB_MainRoutine, #Test_SB_Cmds -** ******************************************************************************/ void Test_SB_App(void); @@ -137,12 +131,6 @@ void Test_SB_App(void); ** ** \returns ** This function does not return a value. -** -** \sa #Test_SB_AppInit_ESRegFail(), #Test_SB_AppInit_EVSRegFail(), -** \sa #Test_SB_AppInit_EVSSendEvtFail(), #Test_SB_AppInit_CrPipeFail(), -** \sa #Test_SB_AppInit_Sub1Fail(), #Test_SB_AppInit_Sub2Fail(), -** \sa #Test_SB_AppInit_GetPoolFail(), #Test_SB_AppInit_PutPoolFail() -** ******************************************************************************/ void Test_SB_AppInit(void); @@ -158,10 +146,6 @@ void Test_SB_AppInit(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #CFE_SB_AppInit, -** \sa #UT_GetNumEventsSent, #UT_Report -** ******************************************************************************/ void Test_SB_AppInit_ESRegFail(void); @@ -177,10 +161,6 @@ void Test_SB_AppInit_ESRegFail(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #CFE_SB_AppInit, -** \sa #UT_GetNumEventsSent, #UT_Report -** ******************************************************************************/ void Test_SB_AppInit_EVSRegFail(void); @@ -197,10 +177,6 @@ void Test_SB_AppInit_EVSRegFail(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #CFE_SB_AppInit, -** \sa #UT_GetNumEventsSent, #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_SB_AppInit_EVSSendEvtFail(void); @@ -216,10 +192,6 @@ void Test_SB_AppInit_EVSSendEvtFail(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_AppInit, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_SB_AppInit_CrPipeFail(void); @@ -236,11 +208,6 @@ void Test_SB_AppInit_CrPipeFail(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #CFE_SB_AppInit, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_AppInit_Sub1Fail(void); @@ -257,11 +224,6 @@ void Test_SB_AppInit_Sub1Fail(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #CFE_SB_AppInit, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_AppInit_Sub2Fail(void); @@ -277,10 +239,6 @@ void Test_SB_AppInit_Sub2Fail(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #CFE_SB_AppInit, -** \sa #UT_GetNumEventsSent, #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_SB_AppInit_GetPoolFail(void); @@ -296,10 +254,6 @@ void Test_SB_AppInit_GetPoolFail(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #CFE_SB_AppInit, -** \sa #UT_GetNumEventsSent, #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_SB_AppInit_PutPoolFail(void); @@ -315,9 +269,6 @@ void Test_SB_AppInit_PutPoolFail(void); ** ** \returns ** This function does not return a value. -** -** \sa #Test_SB_Main_RcvErr, #Test_SB_Main_InitErr -** ******************************************************************************/ void Test_SB_MainRoutine(void); @@ -333,11 +284,6 @@ void Test_SB_MainRoutine(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #CFE_SB_TaskMain, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_Main_RcvErr(void); @@ -354,10 +300,6 @@ void Test_SB_Main_RcvErr(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #CFE_SB_TaskMain, -** \sa #UT_GetNumEventsSent, #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_SB_Main_InitErr(void); @@ -373,29 +315,6 @@ void Test_SB_Main_InitErr(void); ** ** \returns ** This function does not return a value. -** -** \sa #Test_SB_Cmds_Noop(), #Test_SB_Cmds_RstCtrs(), -** \sa #Test_SB_Cmds_Stats(), #Test_SB_Cmds_RoutingInfoDef(), -** \sa #Test_SB_Cmds_RoutingInfoSpec(), #Test_SB_Cmds_RoutingInfoCreateFail(), -** \sa #Test_SB_Cmds_PipeOpts(), -** \sa #Test_SB_Cmds_GetPipeName(), -** \sa #Test_SB_Cmds_GetPipeIdByName(), -** \sa #Test_SB_Cmds_RoutingInfoHdrFail(), -** \sa #Test_SB_Cmds_RoutingInfoWriteFail(), #Test_SB_Cmds_PipeInfoDef(), -** \sa #Test_SB_Cmds_PipeInfoSpec(), #Test_SB_Cmds_PipeInfoCreateFail(), -** \sa #Test_SB_Cmds_PipeInfoHdrFail(), #Test_SB_Cmds_PipeInfoWriteFail(), -** \sa #Test_SB_Cmds_MapInfoDef(), #Test_SB_Cmds_MapInfoSpec(), -** \sa #Test_SB_Cmds_MapInfoCreateFail(), #Test_SB_Cmds_MapInfoHdrFail(), -** \sa #Test_SB_Cmds_MapInfoWriteFail(), #Test_SB_Cmds_EnRouteValParam(), -** \sa #Test_SB_Cmds_EnRouteNonExist(), #Test_SB_Cmds_EnRouteInvParam(), -** \sa #Test_SB_Cmds_EnRouteInvParam2(), #Test_SB_Cmds_EnRouteInvParam3(), -** \sa #Test_SB_Cmds_DisRouteValParam(), #Test_SB_Cmds_DisRouteNonExist(), -** \sa #Test_SB_Cmds_DisRouteInvParam(), #Test_SB_Cmds_DisRouteInvParam2(), -** \sa #Test_SB_Cmds_DisRouteInvParam3(), #Test_SB_Cmds_SendHK(), -** \sa #Test_SB_Cmds_SendPrevSubs(), #Test_SB_Cmds_SubRptOn(), -** \sa #Test_SB_Cmds_SubRptOff(), #Test_SB_Cmds_UnexpCmdCode(), -** \sa #Test_SB_Cmds_UnexpMsgId() -** ******************************************************************************/ void Test_SB_Cmds(void); @@ -411,11 +330,6 @@ void Test_SB_Cmds(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_Noop(void); @@ -431,11 +345,6 @@ void Test_SB_Cmds_Noop(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_RstCtrs(void); @@ -451,11 +360,6 @@ void Test_SB_Cmds_RstCtrs(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_Stats(void); @@ -472,11 +376,6 @@ void Test_SB_Cmds_Stats(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_AppInit, #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_RoutingInfoDef(void); @@ -493,11 +392,6 @@ void Test_SB_Cmds_RoutingInfoDef(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_RoutingInfoSpec(void); @@ -514,11 +408,6 @@ void Test_SB_Cmds_RoutingInfoSpec(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #UT_SetOSFail, #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_RoutingInfoCreateFail(void); @@ -534,12 +423,6 @@ void Test_SB_Cmds_RoutingInfoCreateFail(void); ** ** \returns ** This function does not return a value. -** -** \sa #Test_SetPipeOpts_BadID, #Test_SetPipeOpts_NotOwner, -** \sa #Test_SetPipeOpts, -** \sa #Test_GetPipeOpts_BadID, #Test_GetPipeOpts_BadPtr, -** \sa #Test_GetPipeOpts -** ******************************************************************************/ void Test_PipeOpts_API(void); @@ -556,11 +439,6 @@ void Test_PipeOpts_API(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #UT_SetOSFail, #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_SetPipeOpts_BadID(void); @@ -577,11 +455,6 @@ void Test_SetPipeOpts_BadID(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #UT_SetOSFail, #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_SetPipeOpts_NotOwner(void); @@ -598,11 +471,6 @@ void Test_SetPipeOpts_NotOwner(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #UT_SetOSFail, #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_SetPipeOpts(void); @@ -619,11 +487,6 @@ void Test_SetPipeOpts(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #UT_SetOSFail, #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_GetPipeOpts_BadID(void); @@ -640,11 +503,6 @@ void Test_GetPipeOpts_BadID(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #UT_SetOSFail, #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_GetPipeOpts_BadPtr(void); @@ -661,11 +519,6 @@ void Test_GetPipeOpts_BadPtr(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #UT_SetOSFail, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_GetPipeOpts(void); @@ -681,9 +534,6 @@ void Test_GetPipeOpts(void); ** ** \returns ** This function does not return a value. -** -** \sa #Test_GetPipeName -** ******************************************************************************/ void Test_GetPipeName_API(void); @@ -700,10 +550,6 @@ void Test_GetPipeName_API(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #CFE_SB_CreatePipe, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_GetPipeName_NullPtr(void); @@ -720,10 +566,6 @@ void Test_GetPipeName_NullPtr(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #CFE_SB_CreatePipe, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_GetPipeName_InvalidId(void); @@ -740,11 +582,6 @@ void Test_GetPipeName_InvalidId(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #UT_SetOSFail, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_GetPipeName(void); @@ -760,9 +597,6 @@ void Test_GetPipeName(void); ** ** \returns ** This function does not return a value. -** -** \sa #Test_GetPipeIdByName -** ******************************************************************************/ void Test_GetPipeIdByName_API(void); @@ -779,10 +613,6 @@ void Test_GetPipeIdByName_API(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #CFE_SB_CreatePipe, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_GetPipeIdByName_NullPtrs(void); @@ -799,10 +629,6 @@ void Test_GetPipeIdByName_NullPtrs(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #CFE_SB_CreatePipe, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_GetPipeIdByName_InvalidName(void); @@ -819,11 +645,6 @@ void Test_GetPipeIdByName_InvalidName(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #UT_SetOSFail, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_GetPipeIdByName(void); @@ -841,10 +662,6 @@ void Test_GetPipeIdByName(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #CFE_SB_SendRtgInfo, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_RoutingInfoHdrFail(void); @@ -862,11 +679,6 @@ void Test_SB_Cmds_RoutingInfoHdrFail(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_AppInit, #UT_SetRtnCode, -** \sa #CFE_SB_SendRtgInfo, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_RoutingInfoWriteFail(void); @@ -883,11 +695,6 @@ void Test_SB_Cmds_RoutingInfoWriteFail(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_CreatePipe, #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_PipeInfoDef(void); @@ -904,11 +711,6 @@ void Test_SB_Cmds_PipeInfoDef(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_PipeInfoSpec(void); @@ -925,10 +727,6 @@ void Test_SB_Cmds_PipeInfoSpec(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetOSFail, #CFE_SB_SendPipeInfo, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_PipeInfoCreateFail(void); @@ -946,10 +744,6 @@ void Test_SB_Cmds_PipeInfoCreateFail(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #CFE_SB_SendPipeInfo, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_PipeInfoHdrFail(void); @@ -967,11 +761,6 @@ void Test_SB_Cmds_PipeInfoHdrFail(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #UT_SetRtnCode, -** \sa #CFE_SB_SendPipeInfo, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_PipeInfoWriteFail(void); @@ -988,12 +777,6 @@ void Test_SB_Cmds_PipeInfoWriteFail(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_CreatePipe, #CFE_SB_Subscribe, #CFE_SB_ProcessCmdPipePkt, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_MapInfoDef(void); @@ -1010,11 +793,6 @@ void Test_SB_Cmds_MapInfoDef(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_MapInfoSpec(void); @@ -1031,10 +809,6 @@ void Test_SB_Cmds_MapInfoSpec(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetOSFail, #CFE_SB_SendMapInfo, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_MapInfoCreateFail(void); @@ -1051,10 +825,6 @@ void Test_SB_Cmds_MapInfoCreateFail(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #CFE_SB_SendMapInfo, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_MapInfoHdrFail(void); @@ -1072,11 +842,6 @@ void Test_SB_Cmds_MapInfoHdrFail(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #UT_SetRtnCode, #CFE_SB_SendMapInfo, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_MapInfoWriteFail(void); @@ -1093,12 +858,6 @@ void Test_SB_Cmds_MapInfoWriteFail(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_SetCmdCode, #CFE_SB_ProcessCmdPipePkt, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_EnRouteValParam(void); @@ -1116,12 +875,6 @@ void Test_SB_Cmds_EnRouteValParam(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_SetCmdCode, #CFE_SB_ProcessCmdPipePkt, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_EnRouteNonExist(void); @@ -1138,11 +891,6 @@ void Test_SB_Cmds_EnRouteNonExist(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_EnRouteInvParam(void); @@ -1159,11 +907,6 @@ void Test_SB_Cmds_EnRouteInvParam(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_EnRouteInvParam2(void); @@ -1182,11 +925,6 @@ void Test_SB_Cmds_EnRouteInvParam2(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_EnRouteInvParam3(void); @@ -1203,12 +941,6 @@ void Test_SB_Cmds_EnRouteInvParam3(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_SetCmdCode, #CFE_SB_ProcessCmdPipePkt, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_DisRouteValParam(void); @@ -1225,12 +957,6 @@ void Test_SB_Cmds_DisRouteValParam(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_SetCmdCode, #CFE_SB_ProcessCmdPipePkt, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_DisRouteNonExist(void); @@ -1247,11 +973,6 @@ void Test_SB_Cmds_DisRouteNonExist(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_DisRouteInvParam(void); @@ -1268,11 +989,6 @@ void Test_SB_Cmds_DisRouteInvParam(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_DisRouteInvParam2(void); @@ -1291,11 +1007,6 @@ void Test_SB_Cmds_DisRouteInvParam2(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_DisRouteInvParam3(void); @@ -1311,10 +1022,6 @@ void Test_SB_Cmds_DisRouteInvParam3(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_ProcessCmdPipePkt, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_SendHK(void); @@ -1332,12 +1039,6 @@ void Test_SB_Cmds_SendHK(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_CreatePipe, #CFE_SB_Subscribe, #CFE_SB_SubscribeLocal, -** \sa #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_SendPrevSubs(void); @@ -1353,10 +1054,6 @@ void Test_SB_Cmds_SendPrevSubs(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_SubRptOn(void); @@ -1372,10 +1069,6 @@ void Test_SB_Cmds_SubRptOn(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_SubRptOff(void); @@ -1392,11 +1085,6 @@ void Test_SB_Cmds_SubRptOff(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_CmdUnexpCmdCode(void); @@ -1413,11 +1101,6 @@ void Test_SB_Cmds_CmdUnexpCmdCode(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_SubRptUnexpCmdCode(void); @@ -1434,11 +1117,6 @@ void Test_SB_Cmds_SubRptUnexpCmdCode(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_ProcessCmdPipePkt, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_BadCmdLength(void); @@ -1455,10 +1133,6 @@ void Test_SB_Cmds_BadCmdLength(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_ProcessCmdPipePkt, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_SB_Cmds_UnexpMsgId(void); @@ -1476,9 +1150,6 @@ void Test_SB_Cmds_UnexpMsgId(void); ** ** \returns ** This function does not return a value. -** -** \sa #Test_SB_EarlyInit, #Test_SB_APIs, #Test_SB_Utils -** ******************************************************************************/ void Test_SB_Lib(void); @@ -1494,10 +1165,6 @@ void Test_SB_Lib(void); ** ** \returns ** This function does not return a value. -** -** \sa #Test_SB_EarlyInit_SemCreateError, -** \sa #Test_SB_EarlyInit_PoolCreateError, #Test_SB_EarlyInit_NoErrors -** ******************************************************************************/ void Test_SB_EarlyInit(void); @@ -1514,9 +1181,6 @@ void Test_SB_EarlyInit(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #UT_Report -** ******************************************************************************/ void Test_SB_EarlyInit_SemCreateError(void); @@ -1533,9 +1197,6 @@ void Test_SB_EarlyInit_SemCreateError(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #UT_Report -** ******************************************************************************/ void Test_SB_EarlyInit_PoolCreateError(void); @@ -1551,9 +1212,6 @@ void Test_SB_EarlyInit_PoolCreateError(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_EarlyInit, #UT_Report -** ******************************************************************************/ void Test_SB_EarlyInit_NoErrors(void); @@ -1569,11 +1227,6 @@ void Test_SB_EarlyInit_NoErrors(void); ** ** \returns ** This function does not return a value. -** -** \sa #Test_CreatePipe_API, #Test_DeletePipe_API, #Test_Subscribe_API, -** \sa #Test_Unsubscribe_API, #Test_SendMsg_API, #Test_RcvMsg_API, -** \sa #Test_CleanupApp_API -** ******************************************************************************/ void Test_SB_APIs(void); @@ -1589,12 +1242,6 @@ void Test_SB_APIs(void); ** ** \returns ** This function does not return a value. -** -** \sa #Test_CreatePipe_NullPtr, #Test_CreatePipe_ValPipeDepth, -** \sa #Test_CreatePipe_InvalPipeDepth, #Test_CreatePipe_EmptyPipeName, -** \sa #Test_CreatePipe_LongPipeName, #Test_CreatePipe_SamePipeName, -** \sa #Test_CreatePipe_MaxPipes -** ******************************************************************************/ void Test_CreatePipe_API(void); @@ -1611,10 +1258,6 @@ void Test_CreatePipe_API(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #CFE_SB_CreatePipe, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_CreatePipe_NullPtr(void); @@ -1630,10 +1273,6 @@ void Test_CreatePipe_NullPtr(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #CFE_SB_CreatePipe, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_CreatePipe_ValPipeDepth(void); @@ -1649,10 +1288,6 @@ void Test_CreatePipe_ValPipeDepth(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #CFE_SB_CreatePipe, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_CreatePipe_InvalPipeDepth(void); @@ -1668,10 +1303,6 @@ void Test_CreatePipe_InvalPipeDepth(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_CreatePipe_EmptyPipeName(void); @@ -1688,10 +1319,6 @@ void Test_CreatePipe_EmptyPipeName(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_CreatePipe_LongPipeName(void); @@ -1707,10 +1334,6 @@ void Test_CreatePipe_LongPipeName(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_CreatePipe_SamePipeName(void); @@ -1726,10 +1349,6 @@ void Test_CreatePipe_SamePipeName(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #UT_GetNumEventsSent, -** \sa #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_CreatePipe_MaxPipes(void); @@ -1745,11 +1364,6 @@ void Test_CreatePipe_MaxPipes(void); ** ** \returns ** This function does not return a value. -** -** \sa #Test_DeletePipe_NoSubs, #Test_DeletePipe_WithSubs, -** \sa #Test_DeletePipe_InvalidPipeId, #Test_DeletePipe_InvalidPipeOwner, -** \sa #Test_DeletePipe_WithAppid -** ******************************************************************************/ void Test_DeletePipe_API(void); @@ -1766,10 +1380,6 @@ void Test_DeletePipe_API(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_DeletePipe, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_DeletePipe_NoSubs(void); @@ -1786,10 +1396,6 @@ void Test_DeletePipe_NoSubs(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_DeletePipe, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_DeletePipe_WithSubs(void); @@ -1805,10 +1411,6 @@ void Test_DeletePipe_WithSubs(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_DeletePipe, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_DeletePipe_InvalidPipeId(void); @@ -1825,10 +1427,6 @@ void Test_DeletePipe_InvalidPipeId(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, CFE_SB_CreatePipe, #CFE_SB_DeletePipe, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_DeletePipe_InvalidPipeOwner(void); @@ -1844,10 +1442,6 @@ void Test_DeletePipe_InvalidPipeOwner(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_DeletePipeWithAppId, #UT_GetNumEventsSent, #UT_Report -** ******************************************************************************/ void Test_DeletePipe_WithAppid(void); @@ -1863,15 +1457,6 @@ void Test_DeletePipe_WithAppid(void); ** ** \returns ** This function does not return a value. -** -** \sa #Test_Subscribe_SubscribeEx, #Test_Subscribe_InvalidPipeId, -** \sa #Test_Subscribe_InvalidMsgId, #Test_Subscribe_MaxMsgLim, -** \sa #Test_Subscribe_DuplicateSubscription, -** \sa #Test_Subscribe_LocalSubscription, #Test_Subscribe_MaxDestCount, -** \sa #Test_Subscribe_MaxMsgIdCount, #Test_Subscribe_SendPrevSubs, -** \sa #Test_Subscribe_FindGlobalMsgIdCnt, #Test_Subscribe_PipeNonexistent, -** \sa #Test_Subscribe_SubscriptionReporting, #Test_Subscribe_InvalidPipeOwner -** ******************************************************************************/ void Test_Subscribe_API(void); @@ -1887,11 +1472,6 @@ void Test_Subscribe_API(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_SubscribeEx, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_Subscribe_SubscribeEx(void); @@ -1908,10 +1488,6 @@ void Test_Subscribe_SubscribeEx(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_Subscribe, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_Subscribe_InvalidPipeId(void); @@ -1928,11 +1504,6 @@ void Test_Subscribe_InvalidPipeId(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_Subscribe_InvalidMsgId(void); @@ -1949,11 +1520,6 @@ void Test_Subscribe_InvalidMsgId(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_SubscribeEx, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_Subscribe_MaxMsgLim(void); @@ -1970,11 +1536,6 @@ void Test_Subscribe_MaxMsgLim(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_Subscribe_DuplicateSubscription(void); @@ -1990,11 +1551,6 @@ void Test_Subscribe_DuplicateSubscription(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_SubscribeLocal, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_Subscribe_LocalSubscription(void); @@ -2012,11 +1568,6 @@ void Test_Subscribe_LocalSubscription(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_Subscribe_MaxDestCount(void); @@ -2034,10 +1585,6 @@ void Test_Subscribe_MaxDestCount(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #UT_EventIsInHistory, #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_Subscribe_MaxMsgIdCount(void); @@ -2054,11 +1601,6 @@ void Test_Subscribe_MaxMsgIdCount(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_SendPrevSubs, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_Subscribe_SendPrevSubs(void); @@ -2075,12 +1617,6 @@ void Test_Subscribe_SendPrevSubs(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_SubscribeLocal, #CFE_SB_FindGlobalMsgIdCnt, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_Subscribe_FindGlobalMsgIdCnt(void); @@ -2097,10 +1633,6 @@ void Test_Subscribe_FindGlobalMsgIdCnt(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_Subscribe, UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_Subscribe_PipeNonexistent(void); @@ -2116,12 +1648,6 @@ void Test_Subscribe_PipeNonexistent(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, -** \sa #CFE_SB_SetSubscriptionReporting, #CFE_SB_Subscribe, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa UT_Report -** ******************************************************************************/ void Test_Subscribe_SubscriptionReporting(void); @@ -2138,10 +1664,6 @@ void Test_Subscribe_SubscriptionReporting(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #UT_EventIsInHistory, #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_Subscribe_InvalidPipeOwner(void); @@ -2157,13 +1679,6 @@ void Test_Subscribe_InvalidPipeOwner(void); ** ** \returns ** This function does not return a value. -** -** \sa #Test_Unsubscribe_Basic, #Test_Unsubscribe_Local, -** \sa #Test_Unsubscribe_InvalParam, #Test_Unsubscribe_NoMatch, -** \sa #Test_Unsubscribe_SubscriptionReporting, #Test_Unsubscribe_InvalidPipe, -** \sa #Test_Unsubscribe_InvalidPipeOwner, #Test_Unsubscribe_FirstDestWithMany, -** \sa #Test_Unsubscribe_MiddleDestWithMany, #Test_Unsubscribe_GetDestPtr -** ******************************************************************************/ void Test_Unsubscribe_API(void); @@ -2179,11 +1694,6 @@ void Test_Unsubscribe_API(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_Unsubscribe, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_Unsubscribe_Basic(void); @@ -2201,11 +1711,6 @@ void Test_Unsubscribe_Basic(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_UnsubscribeLocal, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_Unsubscribe_Local(void); @@ -2222,11 +1727,6 @@ void Test_Unsubscribe_Local(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_UnSubscribe, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_Unsubscribe_InvalParam(void); @@ -2244,11 +1744,6 @@ void Test_Unsubscribe_InvalParam(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_Unsubscribe, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_Unsubscribe_NoMatch(void); @@ -2266,12 +1761,6 @@ void Test_Unsubscribe_NoMatch(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_SetSubscriptionReporting, #CFE_SB_Unsubscribe, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_Unsubscribe_SubscriptionReporting(void); @@ -2288,11 +1777,6 @@ void Test_Unsubscribe_SubscriptionReporting(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_Unsubscribe, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_Unsubscribe_InvalidPipe(void); @@ -2309,11 +1793,6 @@ void Test_Unsubscribe_InvalidPipe(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_Unsubscribe, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_Unsubscribe_InvalidPipeOwner(void); @@ -2331,11 +1810,6 @@ void Test_Unsubscribe_InvalidPipeOwner(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_Unsubscribe, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_Unsubscribe_FirstDestWithMany(void); @@ -2353,11 +1827,6 @@ void Test_Unsubscribe_FirstDestWithMany(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_Unsubscribe, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_Unsubscribe_MiddleDestWithMany(void); @@ -2375,11 +1844,6 @@ void Test_Unsubscribe_MiddleDestWithMany(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_Unsubscribe, #CFE_SB_GetDestPtr, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_Unsubscribe_GetDestPtr(void); @@ -2395,16 +1859,6 @@ void Test_Unsubscribe_GetDestPtr(void); ** ** \returns ** This function does not return a value. -** -** \sa #Test_SendMsg_NullPtr, #Test_SendMsg_InvalidMsgId, -** \sa #Test_SendMsg_NoSubscribers, #Test_SendMsg_MaxMsgSizePlusOne, -** \sa #Test_SendMsg_BasicSend, #Test_SendMsg_SequenceCount, -** \sa #Test_SendMsg_QueuePutError, #Test_SendMsg_PipeFull, -** \sa #Test_SendMsg_MsgLimitExceeded, #Test_SendMsg_GetPoolBufErr, -** \sa #Test_SendMsg_ZeroCopyGetPtr, #Test_SendMsg_ZeroCopySend, -** \sa #Test_SendMsg_ZeroCopyPass, #Test_SendMsg_ZeroCopyReleasePtr, -** \sa #Test_SendMsg_DisabledDestination, #Test_SendMsg_SendWithMetadata -** ******************************************************************************/ void Test_SendMsg_API(void); @@ -2421,10 +1875,6 @@ void Test_SendMsg_API(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SendMsg, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_SendMsg_NullPtr(void); @@ -2441,10 +1891,6 @@ void Test_SendMsg_NullPtr(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SendMsg, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_SendMsg_InvalidMsgId(void); @@ -2461,10 +1907,6 @@ void Test_SendMsg_InvalidMsgId(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SendMsg, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_SendMsg_NoSubscribers(void); @@ -2482,10 +1924,6 @@ void Test_SendMsg_NoSubscribers(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SendMsg, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_SendMsg_MaxMsgSizePlusOne(void); @@ -2502,11 +1940,6 @@ void Test_SendMsg_MaxMsgSizePlusOne(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_SendMsg, #UT_GetNumEventsSent, -** \sa #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_SendMsg_BasicSend(void); @@ -2523,12 +1956,6 @@ void Test_SendMsg_BasicSend(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, -** \sa #CFE_SB_Subscribe, #CCSDS_WR_SEQ, #CFE_SB_SendMsg, #CFE_SB_RcvMsg, -** \sa #CCSDS_RD_SEQ, #CFE_SB_PassMsg, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_SendMsg_SequenceCount(void); @@ -2545,11 +1972,6 @@ void Test_SendMsg_SequenceCount(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_SendMsg, #UT_GetNumEventsSent, -** \sa #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_SendMsg_QueuePutError(void); @@ -2566,11 +1988,6 @@ void Test_SendMsg_QueuePutError(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, -** \sa #CFE_SB_Subscribe, #CFE_SB_SendMsg, #UT_GetNumEventsSent, -** \sa #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_SendMsg_PipeFull(void); @@ -2587,11 +2004,6 @@ void Test_SendMsg_PipeFull(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, -** \sa #CFE_SB_SubscribeEx, #CFE_SB_SendMsg, #UT_GetNumEventsSent, -** \sa #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_SendMsg_MsgLimitExceeded(void); @@ -2608,11 +2020,6 @@ void Test_SendMsg_MsgLimitExceeded(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, -** \sa #CFE_SB_Subscribe, #UT_SetRtnCode, #CFE_SB_SendMsg, -** \sa #UT_GetNumEventsSent, #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_SendMsg_GetPoolBufErr(void); @@ -2630,10 +2037,6 @@ void Test_SendMsg_GetPoolBufErr(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #CFE_SB_ZeroCopyGetPtr, -** \sa #UT_GetNumEventsSent, #UT_Report -** ******************************************************************************/ void Test_SendMsg_ZeroCopyGetPtr(void); @@ -2651,13 +2054,6 @@ void Test_SendMsg_ZeroCopyGetPtr(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_ZeroCopyGetPtr, #CCSDS_WR_SEQ, -** \sa #CFE_SB_ZeroCopySend, #CFE_SB_RcvMsg, #CCSDS_RD_SEQ, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_SendMsg_ZeroCopySend(void); @@ -2675,13 +2071,6 @@ void Test_SendMsg_ZeroCopySend(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_ZeroCopyGetPtr, #CCSDS_WR_SEQ, -** \sa #CFE_SB_ZeroCopyPass, #CFE_SB_RcvMsg, #CCSDS_RD_SEQ, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_SendMsg_ZeroCopyPass(void); @@ -2698,11 +2087,6 @@ void Test_SendMsg_ZeroCopyPass(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_ZeroCopyGetPtr, -** \sa #CFE_SB_ZeroCopyReleasePtr, #UT_SetRtnCode, #UT_GetNumEventsSent, -** \sa #UT_Report -** ******************************************************************************/ void Test_SendMsg_ZeroCopyReleasePtr(void); @@ -2719,12 +2103,6 @@ void Test_SendMsg_ZeroCopyReleasePtr(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_GetDestPtr, #CFE_SB_SendMsg, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_SendMsg_DisabledDestination(void); @@ -2740,11 +2118,6 @@ void Test_SendMsg_DisabledDestination(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_SendMsgFull, #UT_GetNumEventsSent, -** \sa #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_SendMsg_SendWithMetadata(void); @@ -2762,10 +2135,6 @@ void Test_SendMsg_SendWithMetadata(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SendMsg, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_SendMsg_InvalidMsgId_ZeroCopy(void); @@ -2783,10 +2152,6 @@ void Test_SendMsg_InvalidMsgId_ZeroCopy(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SendMsg, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_SendMsg_NoSubscribers_ZeroCopy(void); @@ -2804,10 +2169,6 @@ void Test_SendMsg_NoSubscribers_ZeroCopy(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SendMsg, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_SendMsg_MaxMsgSizePlusOne_ZeroCopy(void); @@ -2823,11 +2184,6 @@ void Test_SendMsg_MaxMsgSizePlusOne_ZeroCopy(void); ** ** \returns ** This function does not return a value. -** -** \sa #Test_RcvMsg_InvalidPipeId, #Test_RcvMsg_InvalidTimeout, -** \sa #Test_RcvMsg_Poll, #Test_RcvMsg_Timeout, -** \sa #Test_RcvMsg_PipeReadError, #Test_RcvMsg_PendForever -** ******************************************************************************/ void Test_RcvMsg_API(void); @@ -2845,10 +2201,6 @@ void Test_RcvMsg_API(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_RcvMsg, #UT_GetNumEventsSent, -** \sa #UT_EventIsInHistory, #UT_Report -** ******************************************************************************/ void Test_RcvMsg_InvalidPipeId(void); @@ -2865,11 +2217,6 @@ void Test_RcvMsg_InvalidPipeId(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_RcvMsg, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_RcvMsg_InvalidTimeout(void); @@ -2887,11 +2234,6 @@ void Test_RcvMsg_InvalidTimeout(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_RcvMsg, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_RcvMsg_Poll(void); @@ -2907,11 +2249,6 @@ void Test_RcvMsg_Poll(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #UT_SetRtnCode, -** \sa #CFE_SB_RcvMsg, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_RcvMsg_Timeout(void); @@ -2928,11 +2265,6 @@ void Test_RcvMsg_Timeout(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_RcvMsg, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_RcvMsg_PipeReadError(void); @@ -2949,12 +2281,6 @@ void Test_RcvMsg_PipeReadError(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, -** \sa #CFE_SB_Subscribe, #CFE_SB_SendMsg, #CFE_SB_RcvMsg, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_RcvMsg_PendForever(void); @@ -2971,11 +2297,6 @@ void Test_RcvMsg_PendForever(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_RcvMsg, -** \sa #UT_GetNumEventsSent, #UT_EventIsInHistory, #CFE_SB_DeletePipe, -** \sa #UT_Report -** ******************************************************************************/ void Test_RcvMsg_InvalidBufferPtr(void); @@ -2993,11 +2314,6 @@ void Test_RcvMsg_InvalidBufferPtr(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_ZeroCopyGetPtr, -** \sa #CFE_SB_CleanUpApp, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #UT_Report -** ******************************************************************************/ void Test_CleanupApp_API(void); @@ -3013,13 +2329,6 @@ void Test_CleanupApp_API(void); ** ** \returns ** This function does not return a value. -** -** \sa #Test_CFE_SB_MsgHdrSize, -** \sa #Test_CFE_SB_GetUserData, #Test_CFE_SB_SetGetMsgId, -** \sa #Test_CFE_SB_SetGetUserDataLength, -** \sa #Test_CFE_SB_SetGetMsgTime, -** \sa #Test_CFE_SB_SetGetCmdCode, #Test_CFE_SB_ChecksumUtils -** ******************************************************************************/ void Test_SB_Utils(void); @@ -3036,9 +2345,6 @@ void Test_SB_Utils(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_MsgHdrSize, #UT_Report -** ******************************************************************************/ void Test_CFE_SB_MsgHdrSize(void); @@ -3055,32 +2361,9 @@ void Test_CFE_SB_MsgHdrSize(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetMsgId, #CFE_SB_GetUserData, -** \sa #UT_Report -** ******************************************************************************/ void Test_CFE_SB_GetUserData(void); -/*****************************************************************************/ -/** -** \brief Test setting and getting the message ID of a message -** -** \par Description -** This function tests setting and getting the message ID of a message. -** -** \par Assumptions, External Events, and Notes: -** None -** -** \returns -** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetMsgId, #CFE_SB_GetMsgId, -** \sa #UT_Report -** -******************************************************************************/ -void Test_CFE_SB_SetGetMsgId(void); - /*****************************************************************************/ /** ** \brief Test setting and getting the user data size of a message @@ -3094,88 +2377,9 @@ void Test_CFE_SB_SetGetMsgId(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetMsgId, -** \sa #CFE_SB_SetUserDataLength, #CFE_SB_GetUserDataLength, -** ******************************************************************************/ void Test_CFE_SB_SetGetUserDataLength(void); -/*****************************************************************************/ -/** -** \brief Test setting and getting the total message size -** -** \par Description -** This function tests setting and getting the total message size. -** -** \par Assumptions, External Events, and Notes: -** None -** -** \returns -** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetMsgId, -** \sa #CFE_SB_SetTotalMsgLength, #CFE_SB_GetTotalMsgLength, -** -******************************************************************************/ -void Test_CFE_SB_SetGetTotalMsgLength(void); - -/*****************************************************************************/ -/** -** \brief Test setting and getting the message time field -** -** \par Description -** This function tests setting and getting the message time field. -** -** \par Assumptions, External Events, and Notes: -** None -** -** \returns -** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetMsgId, #CFE_SB_SetMsgTime, -** \sa #CFE_SB_GetMsgTime, #UT_DisplayPkt, #UT_Report -** -******************************************************************************/ -void Test_CFE_SB_SetGetMsgTime(void); - -/*****************************************************************************/ -/** -** \brief Test setting and getting the opcode field of message -** -** \par Description -** This function tests setting and getting the opcode field of message. -** -** \par Assumptions, External Events, and Notes: -** None -** -** \returns -** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_SetMsgId, #CFE_SB_SetCmdCode, -** \sa #CFE_SB_GetCmdCode, #UT_DisplayPkt -** -******************************************************************************/ -void Test_CFE_SB_SetGetCmdCode(void); - -/*****************************************************************************/ -/** -** \brief Test generating, setting, getting, and validating a checksum field -** for a message -** -** \par Description -** This function tests generating, setting, getting, and validating a -** checksum field for a message. -** -** \par Assumptions, External Events, and Notes: -** None -** -** \returns -** This function does not return a value. -** -******************************************************************************/ -void Test_CFE_SB_ChecksumUtils(void); - /*****************************************************************************/ /** ** \brief Test validating a valid and invalid msg id @@ -3188,11 +2392,6 @@ void Test_CFE_SB_ChecksumUtils(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, -** \sa #CFE_SB_ValidateMsgId, #UT_DisplayPkt, -** \sa #UT_Report -** ******************************************************************************/ void Test_CFE_SB_ValidateMsgId(void); @@ -3208,10 +2407,6 @@ void Test_CFE_SB_ValidateMsgId(void); ** ** \returns ** This function does not return a value. -** -** \sa #Test_OS_MutSem_ErrLogic, -** \sa #Test_ReqToSendEvent_ErrLogic, #Test_PutDestBlk_ErrLogic -** ******************************************************************************/ void Test_SB_SpecialCases(void); @@ -3228,11 +2423,6 @@ void Test_SB_SpecialCases(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #UT_SetRtnCode, #CFE_SB_CreatePipe, -** \sa #CFE_SB_Subscribe, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_OS_MutSem_ErrLogic(void); @@ -3248,10 +2438,6 @@ void Test_OS_MutSem_ErrLogic(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_RequestToSendEvent, -** \sa #UT_GetNumEventsSent, #UT_Report -** ******************************************************************************/ void Test_ReqToSendEvent_ErrLogic(void); @@ -3269,10 +2455,6 @@ void Test_ReqToSendEvent_ErrLogic(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_PutDestinationBlk, -** \sa #UT_GetNumEventsSent, #UT_Report -** ******************************************************************************/ void Test_PutDestBlk_ErrLogic(void); @@ -3290,10 +2472,6 @@ void Test_PutDestBlk_ErrLogic(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_GetPipeIdx, #UT_GetNumEventsSent, -** \sa #UT_Report -** ******************************************************************************/ void Test_CFE_SB_GetPipeIdx(void); @@ -3310,11 +2488,6 @@ void Test_CFE_SB_GetPipeIdx(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_GetBufferFromPool, -** \sa #CFE_SB_ReturnBufferToPool, #CFE_SB_DecrBufUseCnt, -** \sa #CFE_SB_PutDestinationBlk, #UT_GetNumEventsSent, #UT_Report -** ******************************************************************************/ void Test_CFE_SB_Buffers(void); @@ -3330,10 +2503,6 @@ void Test_CFE_SB_Buffers(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, #CFE_SB_DeletePipeFull, -** \sa #CFE_SB_SubscribeFull, #UT_GetNumEventsSent, #UT_Report -** ******************************************************************************/ void Test_CFE_SB_BadPipeInfo(void); @@ -3349,11 +2518,6 @@ void Test_CFE_SB_BadPipeInfo(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_EventIsInHistory, #CFE_SB_GetMsgId, #UT_SetRtnCode, -** \sa #UT_GetNumEventsSent, #CFE_SB_CreatePipe, #CFE_SB_Subscribe, -** \sa #CFE_SB_SendMsg, #CFE_SB_DeletePipe, #CFE_SB_SubscribeEx, #UT_Report -** ******************************************************************************/ void Test_SB_SendMsgPaths_Nominal(void); void Test_SB_SendMsgPaths_LimitErr(void); @@ -3374,12 +2538,6 @@ void Test_SB_SendMsgPaths_IgnoreOpt(void); ** ** \returns ** This function does not return a value. -** -** \sa #SB_ResetUnitTest, #CFE_SB_CreatePipe, -** \sa #CFE_SB_Subscribe, #CFE_SB_SendMsg, #CFE_SB_Unsubscribe, -** \sa #CFE_SB_RcvMsg, #UT_GetNumEventsSent, #UT_EventIsInHistory, -** \sa #CFE_SB_DeletePipe, #UT_Report -** ******************************************************************************/ void Test_RcvMsg_UnsubResubPath(void); @@ -3396,9 +2554,6 @@ void Test_RcvMsg_UnsubResubPath(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_Report -** ******************************************************************************/ void Test_MessageString(void); diff --git a/fsw/cfe-core/unit-test/tbl_UT.c b/fsw/cfe-core/unit-test/tbl_UT.c index 280916caa..2b68d0719 100644 --- a/fsw/cfe-core/unit-test/tbl_UT.c +++ b/fsw/cfe-core/unit-test/tbl_UT.c @@ -221,6 +221,8 @@ void Test_CFE_TBL_TaskInit(void) CFE_TBL_NoArgsCmd_t NoArgsCmd; CFE_MSG_Message_t Msg; } CmdBuf; + CFE_SB_MsgId_t MsgId = CFE_SB_INVALID_MSG_ID; + CFE_MSG_FcnCode_t FcnCode = 0; UtPrintf("Begin Test Task Init"); @@ -230,6 +232,8 @@ void Test_CFE_TBL_TaskInit(void) UT_InitData(); ExitCode = 0; UT_SetDataBuffer(UT_KEY(CFE_ES_ExitApp), &ExitCode, sizeof(ExitCode), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); CFE_TBL_TaskMain(); UT_Report(__FILE__, __LINE__, ExitCode == CFE_ES_RunStatus_CORE_APP_RUNTIME_ERROR && diff --git a/fsw/cfe-core/unit-test/tbl_UT.h b/fsw/cfe-core/unit-test/tbl_UT.h index b22822ed5..b8044c0da 100644 --- a/fsw/cfe-core/unit-test/tbl_UT.h +++ b/fsw/cfe-core/unit-test/tbl_UT.h @@ -105,9 +105,6 @@ void UT_InitializeTableRegistryNames(void); ** ** \returns ** This function does not return a value. -** -** \sa #CFE_TBL_InitRegistryRecord -** ******************************************************************************/ void UT_ResetTableRegistry(void); @@ -123,11 +120,6 @@ void UT_ResetTableRegistry(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #CFE_TBL_TaskMain, #UT_Report, #UT_SetRtnCode, -** \sa #CFE_TBL_TaskInit, #UT_SetSBTotalMsgLen, #CFE_SB_SetMsgId, -** \sa #CFE_SB_SetCmdCode, #CFE_TBL_TaskPipe -** ******************************************************************************/ void Test_CFE_TBL_TaskInit(void); @@ -143,9 +135,6 @@ void Test_CFE_TBL_TaskInit(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #CFE_TBL_InitData, #UT_Report -** ******************************************************************************/ void Test_CFE_TBL_InitData(void); @@ -163,9 +152,6 @@ void Test_CFE_TBL_InitData(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_Report, #CFE_TBL_SearchCmdHndlrTbl, -** ******************************************************************************/ void Test_CFE_TBL_SearchCmdHndlrTbl(void); @@ -182,10 +168,6 @@ void Test_CFE_TBL_SearchCmdHndlrTbl(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_Report, #CFE_TBL_DeleteCDSCmd, -** \sa #UT_SetRtnCode -** ******************************************************************************/ void Test_CFE_TBL_DeleteCDSCmd(void); @@ -202,9 +184,6 @@ void Test_CFE_TBL_DeleteCDSCmd(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_Report, #CFE_TBL_SendRegistryCmd -** ******************************************************************************/ void Test_CFE_TBL_TlmRegCmd(void); @@ -221,9 +200,6 @@ void Test_CFE_TBL_TlmRegCmd(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_Report, #CFE_TBL_AbortLoadCmd -** ******************************************************************************/ void Test_CFE_TBL_AbortLoadCmd(void); @@ -239,9 +215,6 @@ void Test_CFE_TBL_AbortLoadCmd(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_Report, #CFE_TBL_ActivateCmd -** ******************************************************************************/ void Test_CFE_TBL_ActivateCmd(void); @@ -257,10 +230,6 @@ void Test_CFE_TBL_ActivateCmd(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetOSFail, #UT_Report, #CFE_TBL_DumpToFile, -** \sa #UT_SetRtnCode -** ******************************************************************************/ void Test_CFE_TBL_DumpToFile(void); @@ -277,9 +246,6 @@ void Test_CFE_TBL_DumpToFile(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_Report, #CFE_TBL_ResetCountersCmd -** ******************************************************************************/ void Test_CFE_TBL_ResetCmd(void); @@ -295,9 +261,6 @@ void Test_CFE_TBL_ResetCmd(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_Report, #CFE_TBL_ValidateCmd -** ******************************************************************************/ void Test_CFE_TBL_ValidateCmd(void); @@ -314,9 +277,6 @@ void Test_CFE_TBL_ValidateCmd(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_Report, #CFE_TBL_NoopCmd -** ******************************************************************************/ void Test_CFE_TBL_NoopCmd(void); @@ -334,9 +294,6 @@ void Test_CFE_TBL_NoopCmd(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #CFE_TBL_GetTblRegData, #UT_Report -** ******************************************************************************/ void Test_CFE_TBL_GetTblRegData(void); @@ -354,9 +311,6 @@ void Test_CFE_TBL_GetTblRegData(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #CFE_TBL_GetHkData, #UT_Report -** ******************************************************************************/ void Test_CFE_TBL_GetHkData(void); @@ -374,10 +328,6 @@ void Test_CFE_TBL_GetHkData(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetOSFail, #UT_Report, #CFE_TBL_DumpRegistryCmd, -** \sa #UT_SetRtnCode -** ******************************************************************************/ void Test_CFE_TBL_DumpRegCmd(void); @@ -394,9 +344,6 @@ void Test_CFE_TBL_DumpRegCmd(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_Report, #CFE_TBL_DumpCmd, #UT_SetRtnCode -** ******************************************************************************/ void Test_CFE_TBL_DumpCmd(void); @@ -414,11 +361,6 @@ void Test_CFE_TBL_DumpCmd(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetOSFail, #UT_Report, #CFE_TBL_LoadCmd, -** \sa #UT_SetReadBuffer, #UT_SetReadHeader, #CFE_TBL_ByteSwapUint32, -** \sa #UT_SetRtnCode -** ******************************************************************************/ void Test_CFE_TBL_LoadCmd(void); @@ -435,10 +377,6 @@ void Test_CFE_TBL_LoadCmd(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetRtnCode, #UT_Report, -** \sa #CFE_TBL_HousekeepingCmd, #UT_SetOSFail -** ******************************************************************************/ void Test_CFE_TBL_HousekeepingCmd(void); @@ -454,9 +392,6 @@ void Test_CFE_TBL_HousekeepingCmd(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_SetAppID, #UT_ResetCDS, #CFE_TBL_EarlyInit -** ******************************************************************************/ void Test_CFE_TBL_ApiInit(void); @@ -474,11 +409,6 @@ void Test_CFE_TBL_ApiInit(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetRtnCode, #CFE_TBL_Register, -** \sa #UT_EventIsInHistory, #UT_GetNumEventsSent, #UT_Report, #UT_SetAppID, -** \sa #UT_ResetTableRegistry -** ******************************************************************************/ void Test_CFE_TBL_Register(void); @@ -496,12 +426,6 @@ void Test_CFE_TBL_Register(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetRtnCode, #CFE_TBL_Share, -** \sa #UT_EventIsInHistory, #UT_GetNumEventsSent, #UT_Report, #UT_SetAppID, -** \sa #CFE_TBL_Unregister, #UT_SetOSFail, #CFE_TBL_ByteSwapUint32, -** \sa #UT_SetReadBuffer, #UT_SetReadHeader -** ******************************************************************************/ void Test_CFE_TBL_Share(void); @@ -519,10 +443,6 @@ void Test_CFE_TBL_Share(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetAppID, #CFE_TBL_Unregister, -** \sa #UT_EventIsInHistory, #UT_GetNumEventsSent, #UT_Report -** ******************************************************************************/ void Test_CFE_TBL_Unregister(void); @@ -541,11 +461,6 @@ void Test_CFE_TBL_Unregister(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetAppID, #UT_ResetCDS, #CFE_TBL_EarlyInit, -** \sa #UT_ResetPoolBufferIndex, #CFE_TBL_Register, #UT_GetNumEventsSent, -** \sa #UT_Report, #CFE_TBL_NotifyByMessage -** ******************************************************************************/ void Test_CFE_TBL_NotifyByMessage(void); @@ -563,13 +478,6 @@ void Test_CFE_TBL_NotifyByMessage(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetAppID, #UT_ResetTableRegistry, -** \sa #CFE_TBL_Register, #UT_EventIsInHistory, #UT_GetNumEventsSent, -** \sa #UT_Report, #UT_SetOSFail, #CFE_TBL_ByteSwapUint32, #UT_SetReadBuffer, -** \sa #UT_SetReadHeader, #UT_SetRtnCode, #CFE_TBL_Load, #CFE_TBL_Share, -** \sa #CFE_TBL_GetAddress, #CFE_TBL_ReleaseAddress -** ******************************************************************************/ void Test_CFE_TBL_Load(void); @@ -587,10 +495,6 @@ void Test_CFE_TBL_Load(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetAppID, #CFE_TBL_GetAddress, -** \sa #UT_GetNumEventsSent, #UT_Report, #UT_SetRtnCode, #CFE_TBL_Unregister -** ******************************************************************************/ void Test_CFE_TBL_GetAddress(void); @@ -608,11 +512,6 @@ void Test_CFE_TBL_GetAddress(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetAppID, #UT_ResetTableRegistry, -** \sa #CFE_TBL_Register, #UT_EventIsInHistory, #UT_GetNumEventsSent, -** \sa #UT_Report, #CFE_TBL_ReleaseAddress -** ******************************************************************************/ void Test_CFE_TBL_ReleaseAddress(void); @@ -630,11 +529,6 @@ void Test_CFE_TBL_ReleaseAddress(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetAppID, #CFE_TBL_Register, -** \sa #UT_EventIsInHistory, #UT_GetNumEventsSent, #UT_Report, -** #CFE_TBL_GetAddresses -** ******************************************************************************/ void Test_CFE_TBL_GetAddresses(void); @@ -652,10 +546,6 @@ void Test_CFE_TBL_GetAddresses(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetAppID, #CFE_TBL_ReleaseAddresses, -** \sa #UT_GetNumEventsSent, #UT_Report -** ******************************************************************************/ void Test_CFE_TBL_ReleaseAddresses(void); @@ -672,10 +562,6 @@ void Test_CFE_TBL_ReleaseAddresses(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetAppID, #CFE_TBL_Validate, -** \sa #UT_GetNumEventsSent, #UT_Report -** ******************************************************************************/ void Test_CFE_TBL_Validate(void); @@ -693,11 +579,6 @@ void Test_CFE_TBL_Validate(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #CFE_TBL_Manage, #UT_GetNumEventsSent, -** \sa #UT_Report, #CFE_TBL_FindTableInRegistry, #CFE_TBL_GetWorkingBuffer, -** \sa #UT_SetAppID, #CFE_TBL_Load, #UT_EventIsInHistory, #UT_SetRtnCode, -** ******************************************************************************/ void Test_CFE_TBL_Manage(void); @@ -715,10 +596,6 @@ void Test_CFE_TBL_Manage(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetAppID, #CFE_TBL_Update, -** \sa #UT_EventIsInHistory, #UT_GetNumEventsSent, #UT_Report -** ******************************************************************************/ void Test_CFE_TBL_Update(void); @@ -736,10 +613,6 @@ void Test_CFE_TBL_Update(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetAppID, #CFE_TBL_GetStatus, -** \sa #UT_GetNumEventsSent, #UT_Report -** ******************************************************************************/ void Test_CFE_TBL_GetStatus(void); @@ -757,9 +630,6 @@ void Test_CFE_TBL_GetStatus(void); ** ** \returns ** This function does not return a value. -** -** \sa # -** ******************************************************************************/ void Test_CFE_TBL_GetInfo(void); @@ -777,13 +647,6 @@ void Test_CFE_TBL_GetInfo(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetAppID, #UT_ResetCDS, #CFE_TBL_EarlyInit, -** \sa #UT_ResetPoolBufferIndex, #CFE_TBL_Register, #UT_GetNumEventsSent, -** \sa #UT_Report, #CFE_TBL_ByteSwapUint32, #UT_SetReadBuffer, -** \sa #UT_SetReadHeader, #CFE_TBL_Load, #UT_EventIsInHistory, -** \sa #CFE_TBL_GetAddress, #CFE_TBL_Modified, #CFE_TBL_GetInfo, #UT_SetRtnCode -** ******************************************************************************/ void Test_CFE_TBL_TblMod(void); @@ -799,15 +662,6 @@ void Test_CFE_TBL_TblMod(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #CFE_TBL_GetWorkingBuffer, #UT_GetNumEventsSent, -** \sa #UT_Report, #UT_SetRtnCode, #CFE_TBL_LoadFromFile, -** \sa #CFE_TBL_ByteSwapUint32, #UT_SetReadBuffer, #UT_SetReadHeader, -** \sa #UT_EventIsInHistory, #CFE_TBL_ReadHeaders, #CFE_TBL_Unregister, -** \sa #UT_ResetCDS, #CFE_TBL_EarlyInit, #CFE_TBL_Register, #CFE_TBL_Load, -** \sa #CFE_TBL_GetAddress, #UT_ClearEventHistory, #CFE_TBL_ReleaseAddress, -** \sa #CFE_TBL_Share, #UT_SetPutPoolFail, #CFE_TBL_CleanUpApp -** ******************************************************************************/ void Test_CFE_TBL_Internal(void); diff --git a/fsw/cfe-core/unit-test/time_UT.c b/fsw/cfe-core/unit-test/time_UT.c index 17941c06e..211999e51 100644 --- a/fsw/cfe-core/unit-test/time_UT.c +++ b/fsw/cfe-core/unit-test/time_UT.c @@ -227,10 +227,16 @@ void UtTest_Setup(void) */ void Test_Main(void) { + CFE_SB_MsgId_t MsgId = CFE_SB_INVALID_MSG_ID; + UtPrintf("Begin Test Main"); /* Test successful run through (a pipe read error is expected) */ UT_InitData(); + + /* Set up buffer for first cycle, pipe failure is on 2nd */ + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); + CFE_TIME_TaskMain(); UT_Report(__FILE__, __LINE__, UT_SyslogIsInHistory(TIME_SYSLOG_MSGS[1]), @@ -1770,8 +1776,6 @@ void Test_PipeCmds(void) /* Test sending the housekeeping telemetry request command */ UT_InitData(); - CFE_MSG_Init((CFE_MSG_Message_t *) &CFE_TIME_TaskData.HkPacket, LocalSnapshotData.MsgId, - sizeof(CFE_TIME_TaskData.HkPacket)); UT_SetHookFunction(UT_KEY(CFE_SB_SendMsg), UT_SoftwareBusSnapshotHook, &LocalSnapshotData); UT_CallTaskPipe(CFE_TIME_TaskPipe, &CmdBuf.message, sizeof(CmdBuf.cmd), UT_TPID_CFE_TIME_SEND_HK); @@ -2348,7 +2352,7 @@ void Test_PipeCmds(void) /* Test response to sending a command with a bad length */ UT_InitData(); - UT_CallTaskPipe(CFE_TIME_TaskPipe, &CmdBuf.message, sizeof(CmdBuf.cmd), + UT_CallTaskPipe(CFE_TIME_TaskPipe, &CmdBuf.message, 0, UT_TPID_CFE_TIME_CMD_SET_LEAP_SECONDS_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_TIME_LEN_ERR_EID), diff --git a/fsw/cfe-core/unit-test/ut_support.h b/fsw/cfe-core/unit-test/ut_support.h index 176adf767..5b4dd5343 100644 --- a/fsw/cfe-core/unit-test/ut_support.h +++ b/fsw/cfe-core/unit-test/ut_support.h @@ -279,9 +279,6 @@ void UT_ReportFailures(void); ** ** \returns ** This function does not return a value. -** -** \sa #CFE_SB_SetMsgId, #CFE_SB_SetCmdCode, #CFE_SB_SendMsg -** ******************************************************************************/ void UT_CallTaskPipe(void (*TaskPipeFunc)(CFE_MSG_Message_t*), CFE_MSG_Message_t *MsgPtr, uint32 MsgSize, UT_TaskPipeDispatchId_t DispatchId); diff --git a/fsw/cfe-core/ut-stubs/ut_sb_stubs.c b/fsw/cfe-core/ut-stubs/ut_sb_stubs.c index 41870c883..546f3dd59 100644 --- a/fsw/cfe-core/ut-stubs/ut_sb_stubs.c +++ b/fsw/cfe-core/ut-stubs/ut_sb_stubs.c @@ -295,6 +295,8 @@ int32 CFE_SB_GetPipeIdByName(CFE_SB_PipeId_t *PipeIdPtr, const char *PipeName) return status; } + +#ifndef CFE_OMIT_DEPRECATED_6_8 /*****************************************************************************/ /** ** \brief CFE_SB_GetCmdCode stub function @@ -362,7 +364,6 @@ CFE_SB_MsgId_t CFE_SB_GetMsgId(const CFE_MSG_Message_t *MsgPtr) return Result; } -#ifndef CFE_OMIT_DEPRECATED_6_8 /*****************************************************************************/ /** ** \brief DEPRECATED - CFE_SB_InitMsg stub function @@ -495,6 +496,8 @@ int32 CFE_SB_SendMsg(CFE_MSG_Message_t *MsgPtr) return status; } +#ifndef CFE_OMIT_DEPRECATED_6_8 + /*****************************************************************************/ /** ** \brief CFE_SB_SetCmdCode stub function @@ -558,7 +561,6 @@ void CFE_SB_SetMsgId(CFE_MSG_Message_t *MsgPtr, CFE_SB_MsgId_t MsgId) } } - /*****************************************************************************/ /** ** \brief CFE_SB_SetMsgTime stub function @@ -590,6 +592,7 @@ int32 CFE_SB_SetMsgTime(CFE_MSG_Message_t *MsgPtr, CFE_TIME_SysTime_t Time) return status; } +#endif /* CFE_OMIT_DEPRECATED_6_8 */ /*****************************************************************************/ /** @@ -878,6 +881,7 @@ int32 CFE_SB_Unsubscribe(CFE_SB_MsgId_t MsgId, CFE_SB_PipeId_t PipeId) return status; } +#ifndef CFE_OMIT_DEPRECATED_6_8 /****************************************************************************** ** Function: CFE_SB_GetMsgTime() ** @@ -918,6 +922,7 @@ bool CFE_SB_ValidateChecksum(CFE_MSG_Message_t *MsgPtr) return (bool) status; } +#endif /* CFE_OMIT_DEPRECATED_6_8 */ void *CFE_SB_GetUserData(CFE_MSG_Message_t *MsgPtr) { @@ -947,6 +952,7 @@ void *CFE_SB_GetUserData(CFE_MSG_Message_t *MsgPtr) return Result; } +#ifndef CFE_OMIT_DEPRECATED_6_8 void CFE_SB_SetTotalMsgLength (CFE_MSG_Message_t *MsgPtr,uint16 TotalLength) { UT_Stub_RegisterContextGenericArg(UT_KEY(CFE_SB_SetTotalMsgLength), MsgPtr); @@ -991,6 +997,7 @@ uint16 CFE_SB_GetChecksum(CFE_MSG_Message_t *MsgPtr) return status; } +#endif /* CFE_OMIT_DEPRECATED_6_8 */ int32 CFE_SB_GetPipeOpts(CFE_SB_PipeId_t PipeId, uint8 *OptPtr) {