Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #1062 - remove CFE_SB_TimeOut_t typedef #1063

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions fsw/cfe-core/src/inc/cfe_sb.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,6 @@ typedef CFE_MSG_TelemetryHeader_t CFE_SB_TlmHdr_t;
#define CFE_SB_TLM_HDR_SIZE (sizeof(CFE_MSG_TelemetryHeader_t))/**< \brief Size of telemetry header */
#endif /* CFE_OMIT_DEPRECATED_6_8 */

/** \brief CFE_SB_TimeOut_t to primitive type definition
**
** Internally used by SB in the #CFE_SB_ReceiveBuffer API. Translated from the
** input parmater named TimeOut which specifies the maximum time in
** milliseconds that the caller wants to wait for a message.
*/
typedef uint32 CFE_SB_TimeOut_t;

/** \brief CFE_SB_PipeId_t to primitive type definition
**
** Software Bus pipe identifier used in many SB APIs
Expand Down
2 changes: 1 addition & 1 deletion fsw/cfe-core/src/sb/cfe_sb_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -1891,7 +1891,7 @@ int32 CFE_SB_ZeroCopyPass(CFE_SB_Buffer_t *BufPtr,

int32 CFE_SB_ReadQueue (CFE_SB_PipeD_t *PipeDscPtr,
CFE_ES_ResourceID_t TskId,
CFE_SB_TimeOut_t Time_Out,
uint32 Time_Out,
CFE_SB_BufferD_t **Message)
{
int32 Status,TimeOut;
Expand Down
2 changes: 1 addition & 1 deletion fsw/cfe-core/src/sb/cfe_sb_priv.h
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ void CFE_SB_LockSharedData(const char *FuncName, int32 LineNumber);
void CFE_SB_UnlockSharedData(const char *FuncName, int32 LineNumber);
void CFE_SB_ReleaseBuffer (CFE_SB_BufferD_t *bd, CFE_SB_DestinationD_t *dest);
int32 CFE_SB_ReadQueue(CFE_SB_PipeD_t *PipeDscPtr,CFE_ES_ResourceID_t TskId,
CFE_SB_TimeOut_t Time_Out,CFE_SB_BufferD_t **Message );
uint32 Time_Out,CFE_SB_BufferD_t **Message );
int32 CFE_SB_WriteQueue(CFE_SB_PipeD_t *pd,uint32 TskId,
const CFE_SB_BufferD_t *bd,CFE_SB_MsgId_t MsgId );
uint8 CFE_SB_GetPipeIdx(CFE_SB_PipeId_t PipeId);
Expand Down