Skip to content

Commit 34e5510

Browse files
author
Jacob Hageman
committed
Fix #777, Use MSG APIs - Core software
Update the core software from the deprecated SB APIs to the MSG APIs.
1 parent 1da6b3c commit 34e5510

30 files changed

+511
-499
lines changed

‎fsw/cfe-core/src/es/cfe_es_task.c‎

Lines changed: 81 additions & 76 deletions
Large diffs are not rendered by default.

‎fsw/cfe-core/src/es/cfe_es_task.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ typedef struct
120120
/*
121121
** ES Task operational data (not reported in housekeeping)
122122
*/
123-
CFE_SB_MsgPtr_t MsgPtr;
124-
CFE_SB_PipeId_t CmdPipe;
123+
CFE_MSG_Message_t *MsgPtr;
124+
CFE_SB_PipeId_t CmdPipe;
125125

126126
/*
127127
** ES Task initialization data (not reported in housekeeping)
@@ -160,7 +160,7 @@ extern CFE_ES_TaskData_t CFE_ES_TaskData;
160160
*/
161161
void CFE_ES_TaskMain(void);
162162
int32 CFE_ES_TaskInit(void);
163-
void CFE_ES_TaskPipe(CFE_SB_MsgPtr_t Msg);
163+
void CFE_ES_TaskPipe(CFE_MSG_Message_t *MsgPtr);
164164

165165

166166
/*
@@ -204,7 +204,7 @@ int32 CFE_ES_DumpCDSRegistryCmd(const CFE_ES_DumpCDSRegistry_t *data);
204204
** Message Handler Helper Functions
205205
*/
206206
bool CFE_ES_ValidateHandle(CFE_ES_MemHandle_t Handle);
207-
bool CFE_ES_VerifyCmdLength(CFE_SB_MsgPtr_t msg, uint16 ExpectedLength);
207+
bool CFE_ES_VerifyCmdLength(CFE_MSG_Message_t *MsgPtr, CFE_MSG_Size_t ExpectedLength);
208208
void CFE_ES_FileWriteByteCntErr(const char *Filename,uint32 Requested,uint32 Actual);
209209

210210
/*************************************************************************/

‎fsw/cfe-core/src/evs/cfe_evs_task.c‎

Lines changed: 78 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ CFE_EVS_GlobalData_t CFE_EVS_GlobalData;
5353
/*
5454
** Local function prototypes.
5555
*/
56-
void CFE_EVS_ProcessGroundCommand ( CFE_SB_MsgPtr_t EVS_MsgPtr );
57-
bool CFE_EVS_VerifyCmdLength(CFE_SB_MsgPtr_t Msg, uint16 ExpectedLength);
56+
void CFE_EVS_ProcessGroundCommand(CFE_MSG_Message_t *MsgPtr, CFE_SB_MsgId_t MsgId);
57+
bool CFE_EVS_VerifyCmdLength(CFE_MSG_Message_t *MsgPtr, CFE_MSG_Size_t ExpectedLength);
5858

5959
/* Function Definitions */
6060

@@ -86,8 +86,8 @@ int32 CFE_EVS_EarlyInit ( void )
8686
memset(&CFE_EVS_GlobalData, 0, sizeof(CFE_EVS_GlobalData_t));
8787

8888
/* Initialize housekeeping packet */
89-
CFE_SB_InitMsg(&CFE_EVS_GlobalData.EVS_TlmPkt, CFE_SB_ValueToMsgId(CFE_EVS_HK_TLM_MID),
90-
sizeof(CFE_EVS_GlobalData.EVS_TlmPkt), false);
89+
CFE_MSG_Init(&CFE_EVS_GlobalData.EVS_TlmPkt.TlmHeader.BaseMsg, CFE_SB_ValueToMsgId(CFE_EVS_HK_TLM_MID),
90+
sizeof(CFE_EVS_GlobalData.EVS_TlmPkt));
9191

9292
/* Elements stored in the hk packet that have non-zero default values */
9393
CFE_EVS_GlobalData.EVS_TlmPkt.Payload.MessageFormatMode = CFE_PLATFORM_EVS_DEFAULT_MSG_FORMAT_MODE;
@@ -212,8 +212,8 @@ int32 CFE_EVS_CleanUpApp(CFE_ES_ResourceID_t AppID)
212212
*/
213213
void CFE_EVS_TaskMain(void)
214214
{
215-
int32 Status;
216-
CFE_SB_MsgPtr_t EVS_MsgPtr; /* Pointer to SB message */
215+
int32 Status;
216+
CFE_MSG_Message_t *MsgPtr; /* Pointer to SB message */
217217

218218
CFE_ES_PerfLogEntry(CFE_MISSION_EVS_MAIN_PERF_ID);
219219

@@ -244,7 +244,7 @@ void CFE_EVS_TaskMain(void)
244244
CFE_ES_PerfLogExit(CFE_MISSION_EVS_MAIN_PERF_ID);
245245

246246
/* Pend on receipt of packet */
247-
Status = CFE_SB_RcvMsg(&EVS_MsgPtr,
247+
Status = CFE_SB_RcvMsg(&MsgPtr,
248248
CFE_EVS_GlobalData.EVS_CommandPipe,
249249
CFE_SB_PEND_FOREVER);
250250

@@ -253,7 +253,7 @@ void CFE_EVS_TaskMain(void)
253253
if (Status == CFE_SUCCESS)
254254
{
255255
/* Process cmd pipe msg */
256-
CFE_EVS_ProcessCommandPacket(EVS_MsgPtr);
256+
CFE_EVS_ProcessCommandPacket(MsgPtr);
257257
}else{
258258
CFE_ES_WriteToSysLog("EVS:Error reading cmd pipe,RC=0x%08X\n",(unsigned int)Status);
259259
}/* end if */
@@ -352,23 +352,23 @@ int32 CFE_EVS_TaskInit ( void )
352352
** Assumptions and Notes:
353353
**
354354
*/
355-
void CFE_EVS_ProcessCommandPacket ( CFE_SB_MsgPtr_t EVS_MsgPtr )
355+
void CFE_EVS_ProcessCommandPacket(CFE_MSG_Message_t *MsgPtr)
356356
{
357-
CFE_SB_MsgId_t MessageID;
357+
CFE_SB_MsgId_t MessageID = CFE_SB_INVALID_MSG_ID;
358358

359-
MessageID = CFE_SB_GetMsgId(EVS_MsgPtr);
359+
CFE_MSG_GetMsgId(MsgPtr, &MessageID);
360360

361361
/* Process all SB messages */
362362
switch (CFE_SB_MsgIdToValue(MessageID))
363363
{
364364
case CFE_EVS_CMD_MID:
365365
/* EVS task specific command */
366-
CFE_EVS_ProcessGroundCommand(EVS_MsgPtr);
366+
CFE_EVS_ProcessGroundCommand(MsgPtr, MessageID);
367367
break;
368368

369369
case CFE_EVS_SEND_HK_MID:
370370
/* Housekeeping request */
371-
CFE_EVS_ReportHousekeepingCmd((CFE_SB_CmdHdr_t*)EVS_MsgPtr);
371+
CFE_EVS_ReportHousekeepingCmd((CFE_SB_CmdHdr_t*)MsgPtr);
372372
break;
373373

374374
default:
@@ -396,189 +396,192 @@ void CFE_EVS_ProcessCommandPacket ( CFE_SB_MsgPtr_t EVS_MsgPtr )
396396
** Assumptions and Notes:
397397
**
398398
*/
399-
void CFE_EVS_ProcessGroundCommand ( CFE_SB_MsgPtr_t EVS_MsgPtr )
399+
void CFE_EVS_ProcessGroundCommand(CFE_MSG_Message_t *MsgPtr, CFE_SB_MsgId_t MsgId)
400400
{
401401
/* status will get reset if it passes length check */
402-
int32 Status = CFE_STATUS_WRONG_MSG_LENGTH;
402+
int32 Status = CFE_STATUS_WRONG_MSG_LENGTH;
403+
CFE_MSG_FcnCode_t FcnCode = 0;
404+
405+
CFE_MSG_GetFcnCode(MsgPtr, &FcnCode);
403406

404407
/* Process "known" EVS task ground commands */
405-
switch (CFE_SB_GetCmdCode(EVS_MsgPtr))
408+
switch (FcnCode)
406409
{
407410
case CFE_EVS_NOOP_CC:
408411

409-
if (CFE_EVS_VerifyCmdLength(EVS_MsgPtr, sizeof(CFE_EVS_Noop_t)))
412+
if (CFE_EVS_VerifyCmdLength(MsgPtr, sizeof(CFE_EVS_Noop_t)))
410413
{
411-
Status = CFE_EVS_NoopCmd((CFE_EVS_Noop_t*)EVS_MsgPtr);
414+
Status = CFE_EVS_NoopCmd((CFE_EVS_Noop_t*)MsgPtr);
412415
}
413416
break;
414417

415418
case CFE_EVS_RESET_COUNTERS_CC:
416419

417-
if (CFE_EVS_VerifyCmdLength(EVS_MsgPtr, sizeof(CFE_EVS_ResetCounters_t)))
420+
if (CFE_EVS_VerifyCmdLength(MsgPtr, sizeof(CFE_EVS_ResetCounters_t)))
418421
{
419-
Status = CFE_EVS_ResetCountersCmd((CFE_EVS_ResetCounters_t*)EVS_MsgPtr);
422+
Status = CFE_EVS_ResetCountersCmd((CFE_EVS_ResetCounters_t*)MsgPtr);
420423
}
421424
break;
422425

423426
case CFE_EVS_ENABLE_EVENT_TYPE_CC:
424427

425-
if (CFE_EVS_VerifyCmdLength(EVS_MsgPtr, sizeof(CFE_EVS_EnableEventType_t)))
428+
if (CFE_EVS_VerifyCmdLength(MsgPtr, sizeof(CFE_EVS_EnableEventType_t)))
426429
{
427-
Status = CFE_EVS_EnableEventTypeCmd((CFE_EVS_EnableEventType_t*)EVS_MsgPtr);
430+
Status = CFE_EVS_EnableEventTypeCmd((CFE_EVS_EnableEventType_t*)MsgPtr);
428431
}
429432
break;
430433

431434
case CFE_EVS_DISABLE_EVENT_TYPE_CC:
432435

433-
if (CFE_EVS_VerifyCmdLength(EVS_MsgPtr, sizeof(CFE_EVS_DisableEventType_t)))
436+
if (CFE_EVS_VerifyCmdLength(MsgPtr, sizeof(CFE_EVS_DisableEventType_t)))
434437
{
435-
Status = CFE_EVS_DisableEventTypeCmd((CFE_EVS_DisableEventType_t*)EVS_MsgPtr);
438+
Status = CFE_EVS_DisableEventTypeCmd((CFE_EVS_DisableEventType_t*)MsgPtr);
436439
}
437440
break;
438441

439442
case CFE_EVS_SET_EVENT_FORMAT_MODE_CC:
440443

441-
if (CFE_EVS_VerifyCmdLength(EVS_MsgPtr, sizeof(CFE_EVS_SetEventFormatMode_t)))
444+
if (CFE_EVS_VerifyCmdLength(MsgPtr, sizeof(CFE_EVS_SetEventFormatMode_t)))
442445
{
443-
Status = CFE_EVS_SetEventFormatModeCmd((CFE_EVS_SetEventFormatMode_t*)EVS_MsgPtr);
446+
Status = CFE_EVS_SetEventFormatModeCmd((CFE_EVS_SetEventFormatMode_t*)MsgPtr);
444447
}
445448
break;
446449

447450
case CFE_EVS_ENABLE_APP_EVENT_TYPE_CC:
448451

449-
if (CFE_EVS_VerifyCmdLength(EVS_MsgPtr, sizeof(CFE_EVS_EnableAppEventType_t)))
452+
if (CFE_EVS_VerifyCmdLength(MsgPtr, sizeof(CFE_EVS_EnableAppEventType_t)))
450453
{
451-
Status = CFE_EVS_EnableAppEventTypeCmd((CFE_EVS_EnableAppEventType_t*)EVS_MsgPtr);
454+
Status = CFE_EVS_EnableAppEventTypeCmd((CFE_EVS_EnableAppEventType_t*)MsgPtr);
452455
}
453456
break;
454457

455458
case CFE_EVS_DISABLE_APP_EVENT_TYPE_CC:
456459

457-
if (CFE_EVS_VerifyCmdLength(EVS_MsgPtr, sizeof(CFE_EVS_DisableAppEventType_t)))
460+
if (CFE_EVS_VerifyCmdLength(MsgPtr, sizeof(CFE_EVS_DisableAppEventType_t)))
458461
{
459-
Status = CFE_EVS_DisableAppEventTypeCmd((CFE_EVS_DisableAppEventType_t*)EVS_MsgPtr);
462+
Status = CFE_EVS_DisableAppEventTypeCmd((CFE_EVS_DisableAppEventType_t*)MsgPtr);
460463
}
461464
break;
462465

463466
case CFE_EVS_ENABLE_APP_EVENTS_CC:
464467

465-
if (CFE_EVS_VerifyCmdLength(EVS_MsgPtr, sizeof(CFE_EVS_EnableAppEvents_t)))
468+
if (CFE_EVS_VerifyCmdLength(MsgPtr, sizeof(CFE_EVS_EnableAppEvents_t)))
466469
{
467-
Status = CFE_EVS_EnableAppEventsCmd((CFE_EVS_EnableAppEvents_t*)EVS_MsgPtr);
470+
Status = CFE_EVS_EnableAppEventsCmd((CFE_EVS_EnableAppEvents_t*)MsgPtr);
468471
}
469472
break;
470473

471474
case CFE_EVS_DISABLE_APP_EVENTS_CC:
472475

473-
if (CFE_EVS_VerifyCmdLength(EVS_MsgPtr, sizeof(CFE_EVS_DisableAppEvents_t)))
476+
if (CFE_EVS_VerifyCmdLength(MsgPtr, sizeof(CFE_EVS_DisableAppEvents_t)))
474477
{
475-
Status = CFE_EVS_DisableAppEventsCmd((CFE_EVS_DisableAppEvents_t*)EVS_MsgPtr);
478+
Status = CFE_EVS_DisableAppEventsCmd((CFE_EVS_DisableAppEvents_t*)MsgPtr);
476479
}
477480
break;
478481

479482
case CFE_EVS_RESET_APP_COUNTER_CC:
480483

481-
if (CFE_EVS_VerifyCmdLength(EVS_MsgPtr, sizeof(CFE_EVS_ResetAppCounter_t)))
484+
if (CFE_EVS_VerifyCmdLength(MsgPtr, sizeof(CFE_EVS_ResetAppCounter_t)))
482485
{
483-
Status = CFE_EVS_ResetAppCounterCmd((CFE_EVS_ResetAppCounter_t*)EVS_MsgPtr);
486+
Status = CFE_EVS_ResetAppCounterCmd((CFE_EVS_ResetAppCounter_t*)MsgPtr);
484487
}
485488
break;
486489

487490
case CFE_EVS_SET_FILTER_CC:
488491

489-
if (CFE_EVS_VerifyCmdLength(EVS_MsgPtr, (uint16) sizeof(CFE_EVS_SetFilter_t)))
492+
if (CFE_EVS_VerifyCmdLength(MsgPtr, (uint16) sizeof(CFE_EVS_SetFilter_t)))
490493
{
491-
Status = CFE_EVS_SetFilterCmd((CFE_EVS_SetFilter_t*)EVS_MsgPtr);
494+
Status = CFE_EVS_SetFilterCmd((CFE_EVS_SetFilter_t*)MsgPtr);
492495
}
493496
break;
494497

495498
case CFE_EVS_ENABLE_PORTS_CC:
496499

497-
if (CFE_EVS_VerifyCmdLength(EVS_MsgPtr, sizeof(CFE_EVS_EnablePorts_t)))
500+
if (CFE_EVS_VerifyCmdLength(MsgPtr, sizeof(CFE_EVS_EnablePorts_t)))
498501
{
499-
Status = CFE_EVS_EnablePortsCmd((CFE_EVS_EnablePorts_t*)EVS_MsgPtr);
502+
Status = CFE_EVS_EnablePortsCmd((CFE_EVS_EnablePorts_t*)MsgPtr);
500503
}
501504
break;
502505

503506
case CFE_EVS_DISABLE_PORTS_CC:
504507

505-
if (CFE_EVS_VerifyCmdLength(EVS_MsgPtr, sizeof(CFE_EVS_DisablePorts_t)))
508+
if (CFE_EVS_VerifyCmdLength(MsgPtr, sizeof(CFE_EVS_DisablePorts_t)))
506509
{
507-
Status = CFE_EVS_DisablePortsCmd((CFE_EVS_DisablePorts_t*)EVS_MsgPtr);
510+
Status = CFE_EVS_DisablePortsCmd((CFE_EVS_DisablePorts_t*)MsgPtr);
508511
}
509512
break;
510513

511514
case CFE_EVS_RESET_FILTER_CC:
512515

513-
if (CFE_EVS_VerifyCmdLength(EVS_MsgPtr, sizeof(CFE_EVS_ResetFilter_t)))
516+
if (CFE_EVS_VerifyCmdLength(MsgPtr, sizeof(CFE_EVS_ResetFilter_t)))
514517
{
515-
Status = CFE_EVS_ResetFilterCmd((CFE_EVS_ResetFilter_t*)EVS_MsgPtr);
518+
Status = CFE_EVS_ResetFilterCmd((CFE_EVS_ResetFilter_t*)MsgPtr);
516519
}
517520
break;
518521

519522
case CFE_EVS_RESET_ALL_FILTERS_CC:
520523

521-
if (CFE_EVS_VerifyCmdLength(EVS_MsgPtr, sizeof(CFE_EVS_ResetAllFilters_t)))
524+
if (CFE_EVS_VerifyCmdLength(MsgPtr, sizeof(CFE_EVS_ResetAllFilters_t)))
522525
{
523-
Status = CFE_EVS_ResetAllFiltersCmd((CFE_EVS_ResetAllFilters_t*)EVS_MsgPtr);
526+
Status = CFE_EVS_ResetAllFiltersCmd((CFE_EVS_ResetAllFilters_t*)MsgPtr);
524527
}
525528
break;
526529

527530
case CFE_EVS_ADD_EVENT_FILTER_CC:
528531

529-
if (CFE_EVS_VerifyCmdLength(EVS_MsgPtr, sizeof(CFE_EVS_AddEventFilter_t)))
532+
if (CFE_EVS_VerifyCmdLength(MsgPtr, sizeof(CFE_EVS_AddEventFilter_t)))
530533
{
531-
Status = CFE_EVS_AddEventFilterCmd((CFE_EVS_AddEventFilter_t*)EVS_MsgPtr);
534+
Status = CFE_EVS_AddEventFilterCmd((CFE_EVS_AddEventFilter_t*)MsgPtr);
532535
}
533536
break;
534537

535538
case CFE_EVS_DELETE_EVENT_FILTER_CC:
536539

537-
if (CFE_EVS_VerifyCmdLength(EVS_MsgPtr, sizeof(CFE_EVS_DeleteEventFilter_t)))
540+
if (CFE_EVS_VerifyCmdLength(MsgPtr, sizeof(CFE_EVS_DeleteEventFilter_t)))
538541
{
539-
Status = CFE_EVS_DeleteEventFilterCmd((CFE_EVS_DeleteEventFilter_t*)EVS_MsgPtr);
542+
Status = CFE_EVS_DeleteEventFilterCmd((CFE_EVS_DeleteEventFilter_t*)MsgPtr);
540543
}
541544
break;
542545

543546
case CFE_EVS_WRITE_APP_DATA_FILE_CC:
544547

545-
if (CFE_EVS_VerifyCmdLength(EVS_MsgPtr, sizeof(CFE_EVS_WriteAppDataFile_t)))
548+
if (CFE_EVS_VerifyCmdLength(MsgPtr, sizeof(CFE_EVS_WriteAppDataFile_t)))
546549
{
547-
Status = CFE_EVS_WriteAppDataFileCmd((CFE_EVS_WriteAppDataFile_t*)EVS_MsgPtr);
550+
Status = CFE_EVS_WriteAppDataFileCmd((CFE_EVS_WriteAppDataFile_t*)MsgPtr);
548551
}
549552
break;
550553

551554
case CFE_EVS_SET_LOG_MODE_CC:
552555

553-
if (CFE_EVS_VerifyCmdLength(EVS_MsgPtr, sizeof(CFE_EVS_SetLogMode_t)))
556+
if (CFE_EVS_VerifyCmdLength(MsgPtr, sizeof(CFE_EVS_SetLogMode_t)))
554557
{
555-
Status = CFE_EVS_SetLogModeCmd((CFE_EVS_SetLogMode_t*)EVS_MsgPtr);
558+
Status = CFE_EVS_SetLogModeCmd((CFE_EVS_SetLogMode_t*)MsgPtr);
556559
}
557560
break;
558561

559562
case CFE_EVS_CLEAR_LOG_CC:
560563

561-
if (CFE_EVS_VerifyCmdLength(EVS_MsgPtr, sizeof(CFE_EVS_ClearLog_t)))
564+
if (CFE_EVS_VerifyCmdLength(MsgPtr, sizeof(CFE_EVS_ClearLog_t)))
562565
{
563-
Status = CFE_EVS_ClearLogCmd((CFE_EVS_ClearLog_t *)EVS_MsgPtr);
566+
Status = CFE_EVS_ClearLogCmd((CFE_EVS_ClearLog_t *)MsgPtr);
564567
}
565568
break;
566569

567570
case CFE_EVS_WRITE_LOG_DATA_FILE_CC:
568571

569-
if (CFE_EVS_VerifyCmdLength(EVS_MsgPtr, sizeof(CFE_EVS_WriteLogDataFile_t)))
572+
if (CFE_EVS_VerifyCmdLength(MsgPtr, sizeof(CFE_EVS_WriteLogDataFile_t)))
570573
{
571-
Status = CFE_EVS_WriteLogDataFileCmd((CFE_EVS_WriteLogDataFile_t*)EVS_MsgPtr);
574+
Status = CFE_EVS_WriteLogDataFileCmd((CFE_EVS_WriteLogDataFile_t*)MsgPtr);
572575
}
573576
break;
574577

575578
/* default is a bad command code as it was not found above */
576579
default:
577580

578581
EVS_SendEvent(CFE_EVS_ERR_CC_EID, CFE_EVS_EventType_ERROR,
579-
"Invalid command code -- ID = 0x%08x, CC = %d",
580-
(unsigned int)CFE_SB_MsgIdToValue(CFE_SB_GetMsgId(EVS_MsgPtr)),
581-
(int)CFE_SB_GetCmdCode(EVS_MsgPtr));
582+
"Invalid command code -- ID = 0x%08x, CC = %u",
583+
(unsigned int)CFE_SB_MsgIdToValue(MsgId),
584+
(unsigned int)FcnCode);
582585
Status = CFE_STATUS_BAD_COMMAND_CODE;
583586

584587
break;
@@ -608,23 +611,27 @@ void CFE_EVS_ProcessGroundCommand ( CFE_SB_MsgPtr_t EVS_MsgPtr )
608611
** Assumptions and Notes:
609612
**
610613
*/
611-
bool CFE_EVS_VerifyCmdLength(CFE_SB_MsgPtr_t Msg, uint16 ExpectedLength)
614+
bool CFE_EVS_VerifyCmdLength(CFE_MSG_Message_t *MsgPtr, CFE_MSG_Size_t ExpectedLength)
612615
{
613-
bool result = true;
614-
uint16 ActualLength = CFE_SB_GetTotalMsgLength(Msg);
616+
bool result = true;
617+
CFE_MSG_Size_t ActualLength = 0;
618+
CFE_MSG_FcnCode_t FcnCode = 0;
619+
CFE_SB_MsgId_t MsgId = CFE_SB_INVALID_MSG_ID;
620+
621+
CFE_MSG_GetSize(MsgPtr, &ActualLength);
615622

616623
/*
617624
** Verify the command packet length
618625
*/
619626
if (ExpectedLength != ActualLength)
620627
{
621-
CFE_SB_MsgId_t MessageID = CFE_SB_GetMsgId(Msg);
622-
uint16 CommandCode = CFE_SB_GetCmdCode(Msg);
628+
CFE_MSG_GetMsgId(MsgPtr, &MsgId);
629+
CFE_MSG_GetFcnCode(MsgPtr, &FcnCode);
623630

624631
EVS_SendEvent(CFE_EVS_LEN_ERR_EID, CFE_EVS_EventType_ERROR,
625-
"Invalid cmd length: ID = 0x%X, CC = %d, Exp Len = %d, Len = %d",
626-
(unsigned int)CFE_SB_MsgIdToValue(MessageID),
627-
(int)CommandCode, (int)ExpectedLength, (int)ActualLength);
632+
"Invalid msg length: ID = 0x%X, CC = %u, Len = %u, Expected = %u",
633+
(unsigned int)CFE_SB_MsgIdToValue(MsgId), (unsigned int)FcnCode,
634+
(unsigned int)ActualLength, (unsigned int)ExpectedLength);
628635
result = false;
629636
}
630637

@@ -725,9 +732,9 @@ int32 CFE_EVS_ReportHousekeepingCmd (const CFE_SB_CmdHdr_t *data)
725732
AppTlmDataPtr->AppMessageSentCounter = 0;
726733
}
727734

728-
CFE_SB_TimeStampMsg((CFE_SB_Msg_t *) &CFE_EVS_GlobalData.EVS_TlmPkt);
735+
CFE_SB_TimeStampMsg((CFE_MSG_Message_t *) &CFE_EVS_GlobalData.EVS_TlmPkt);
729736

730-
CFE_SB_SendMsg((CFE_SB_Msg_t *) &CFE_EVS_GlobalData.EVS_TlmPkt);
737+
CFE_SB_SendMsg((CFE_MSG_Message_t *) &CFE_EVS_GlobalData.EVS_TlmPkt);
731738

732739
return CFE_STATUS_NO_COUNTER_INCREMENT;
733740
} /* End of CFE_EVS_ReportHousekeepingCmd() */

0 commit comments

Comments
 (0)