Skip to content

Commit

Permalink
Fix #777, Use MSG APIs - Core software
Browse files Browse the repository at this point in the history
Update the core software from the deprecated SB
APIs to the MSG APIs.

Fix Merge conflicts
  • Loading branch information
skliper authored and astrogeco committed Nov 23, 2020
1 parent 752dc0b commit 5c7dce4
Show file tree
Hide file tree
Showing 33 changed files with 522 additions and 560 deletions.
162 changes: 81 additions & 81 deletions fsw/cfe-core/src/es/cfe_es_task.c

Large diffs are not rendered by default.

11 changes: 5 additions & 6 deletions fsw/cfe-core/src/es/cfe_es_task.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ typedef struct
/*
** ES Task operational data (not reported in housekeeping)
*/
CFE_SB_MsgPtr_t MsgPtr;
CFE_SB_PipeId_t CmdPipe;
CFE_MSG_Message_t *MsgPtr;
CFE_SB_PipeId_t CmdPipe;

/*
** ES Task initialization data (not reported in housekeeping)
Expand Down Expand Up @@ -160,7 +160,7 @@ extern CFE_ES_TaskData_t CFE_ES_TaskData;
*/
void CFE_ES_TaskMain(void);
int32 CFE_ES_TaskInit(void);
void CFE_ES_TaskPipe(CFE_SB_MsgPtr_t Msg);
void CFE_ES_TaskPipe(CFE_MSG_Message_t *MsgPtr);


/*
Expand Down Expand Up @@ -204,8 +204,8 @@ int32 CFE_ES_DumpCDSRegistryCmd(const CFE_ES_DumpCDSRegistry_t *data);
** Message Handler Helper Functions
*/
bool CFE_ES_ValidateHandle(CFE_ES_MemHandle_t Handle);
bool CFE_ES_VerifyCmdLength(CFE_SB_MsgPtr_t msg, size_t ExpectedLength);
void CFE_ES_FileWriteByteCntErr(const char *Filename,size_t Requested,size_t Actual);
bool CFE_ES_VerifyCmdLength(CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength);
void CFE_ES_FileWriteByteCntErr(const char *Filename, size_t Requested, size_t Actual);

/*************************************************************************/

Expand All @@ -214,4 +214,3 @@ void CFE_ES_FileWriteByteCntErr(const char *Filename,size_t Requested,size_t Act
/************************/
/* End of File Comment */
/************************/

Loading

0 comments on commit 5c7dce4

Please sign in to comment.