diff --git a/fsw/cfe-core/src/es/cfe_es_syslog.c b/fsw/cfe-core/src/es/cfe_es_syslog.c index 5bb929348..b93645479 100644 --- a/fsw/cfe-core/src/es/cfe_es_syslog.c +++ b/fsw/cfe-core/src/es/cfe_es_syslog.c @@ -559,7 +559,7 @@ int32 CFE_ES_SysLogDump(const char *Filename) CFE_EVS_SendEvent(CFE_ES_SYSLOG2_EID, CFE_EVS_EventType_DEBUG, "%s written:Size=%lu,Entries=%u",Filename, (unsigned long)TotalSize, - (unsigned int)CFE_ES_TaskData.HkPacket.Payload.SysLogEntries); + (unsigned int)CFE_ES_TaskData.HkBuffer.HkTlm.Payload.SysLogEntries); Status = CFE_SUCCESS; } diff --git a/fsw/cfe-core/src/es/cfe_es_task.c b/fsw/cfe-core/src/es/cfe_es_task.c index 49198cef2..bc8faba9e 100644 --- a/fsw/cfe-core/src/es/cfe_es_task.c +++ b/fsw/cfe-core/src/es/cfe_es_task.c @@ -57,9 +57,9 @@ ** Defines */ #define CFE_ES_PERF_TRIGGERMASK_INT_SIZE (sizeof(CFE_ES_ResetDataPtr->Perf.MetaData.TriggerMask) / sizeof(uint32)) -#define CFE_ES_PERF_TRIGGERMASK_EXT_SIZE (sizeof(CFE_ES_TaskData.HkPacket.Payload.PerfTriggerMask) / sizeof(uint32)) +#define CFE_ES_PERF_TRIGGERMASK_EXT_SIZE (sizeof(CFE_ES_TaskData.HkBuffer.HkTlm.Payload.PerfTriggerMask) / sizeof(uint32)) #define CFE_ES_PERF_FILTERMASK_INT_SIZE (sizeof(CFE_ES_ResetDataPtr->Perf.MetaData.FilterMask) / sizeof(uint32)) -#define CFE_ES_PERF_FILTERMASK_EXT_SIZE (sizeof(CFE_ES_TaskData.HkPacket.Payload.PerfFilterMask) / sizeof(uint32)) +#define CFE_ES_PERF_FILTERMASK_EXT_SIZE (sizeof(CFE_ES_TaskData.HkBuffer.HkTlm.Payload.PerfFilterMask) / sizeof(uint32)) /* ** This define should be put in the OS API headers -- Right now it matches what the OS API uses @@ -79,9 +79,9 @@ CFE_ES_TaskData_t CFE_ES_TaskData; void CFE_ES_TaskMain(void) { - int32 Status; - uint32 AppRunStatus = CFE_ES_RunStatus_APP_RUN; - + int32 Status; + uint32 AppRunStatus = CFE_ES_RunStatus_APP_RUN; + CFE_SB_Msg_t *SBMsgPtr; /* ** Performance Time Stamp Entry @@ -136,9 +136,7 @@ void CFE_ES_TaskMain(void) /* ** Wait for the next Software Bus message. */ - Status = CFE_SB_RcvMsg(&CFE_ES_TaskData.MsgPtr, - CFE_ES_TaskData.CmdPipe, - CFE_SB_PEND_FOREVER); + Status = CFE_SB_RcvMsg(&SBMsgPtr, CFE_ES_TaskData.CmdPipe, CFE_SB_PEND_FOREVER); /* ** Performance Time Stamp Entry @@ -148,9 +146,9 @@ void CFE_ES_TaskMain(void) if (Status == CFE_SUCCESS) { /* - ** Process Software Bus message. + ** Process message. */ - CFE_ES_TaskPipe(CFE_ES_TaskData.MsgPtr); + CFE_ES_TaskPipe(SBMsgPtr); /* * Wake up the background task, which includes the @@ -252,23 +250,23 @@ int32 CFE_ES_TaskInit(void) /* ** Initialize housekeeping packet (clear user data area) */ - CFE_MSG_Init(&CFE_ES_TaskData.HkPacket.TlmHeader.BaseMsg, + CFE_MSG_Init(&CFE_ES_TaskData.HkBuffer.HkTlm.TlmHeader.Msg, CFE_SB_ValueToMsgId(CFE_ES_HK_TLM_MID), - sizeof(CFE_ES_TaskData.HkPacket)); + sizeof(CFE_ES_TaskData.HkBuffer.HkTlm)); /* ** Initialize single application telemetry packet */ - CFE_MSG_Init(&CFE_ES_TaskData.OneAppPacket.TlmHeader.BaseMsg, + CFE_MSG_Init(&CFE_ES_TaskData.OneAppBuffer.OneAppTlm.TlmHeader.Msg, CFE_SB_ValueToMsgId(CFE_ES_APP_TLM_MID), - sizeof(CFE_ES_TaskData.OneAppPacket)); + sizeof(CFE_ES_TaskData.OneAppBuffer.OneAppTlm)); /* ** Initialize memory pool statistics telemetry packet */ - CFE_MSG_Init(&CFE_ES_TaskData.MemStatsPacket.TlmHeader.BaseMsg, + CFE_MSG_Init(&CFE_ES_TaskData.MemStatsBuffer.MemStatsTlm.TlmHeader.Msg, CFE_SB_ValueToMsgId(CFE_ES_MEMSTATS_TLM_MID), - sizeof(CFE_ES_TaskData.MemStatsPacket)); + sizeof(CFE_ES_TaskData.MemStatsBuffer.MemStatsTlm)); /* ** Create Software Bus message pipe @@ -310,25 +308,25 @@ int32 CFE_ES_TaskInit(void) if ( Status == CFE_PSP_SUCCESS ) { - CFE_ES_TaskData.HkPacket.Payload.CFECoreChecksum = CFE_ES_CalculateCRC( + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.CFECoreChecksum = CFE_ES_CalculateCRC( (void *)(CfeSegmentAddr), SizeofCfeSegment, 0, CFE_MISSION_ES_DEFAULT_CRC); } else { - CFE_ES_TaskData.HkPacket.Payload.CFECoreChecksum = 0xFFFF; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.CFECoreChecksum = 0xFFFF; } /* ** Initialize the version numbers in the ES Housekeeping pkt */ - CFE_ES_TaskData.HkPacket.Payload.CFEMajorVersion = CFE_MAJOR_VERSION; - CFE_ES_TaskData.HkPacket.Payload.CFEMinorVersion = CFE_MINOR_VERSION; - CFE_ES_TaskData.HkPacket.Payload.CFERevision = CFE_REVISION; - CFE_ES_TaskData.HkPacket.Payload.CFEMissionRevision = CFE_MISSION_REV; - CFE_ES_TaskData.HkPacket.Payload.OSALMajorVersion = OS_MAJOR_VERSION; - CFE_ES_TaskData.HkPacket.Payload.OSALMinorVersion = OS_MINOR_VERSION; - CFE_ES_TaskData.HkPacket.Payload.OSALRevision = OS_REVISION; - CFE_ES_TaskData.HkPacket.Payload.OSALMissionRevision = OS_MISSION_REV; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.CFEMajorVersion = CFE_MAJOR_VERSION; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.CFEMinorVersion = CFE_MINOR_VERSION; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.CFERevision = CFE_REVISION; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.CFEMissionRevision = CFE_MISSION_REV; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.OSALMajorVersion = OS_MAJOR_VERSION; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.OSALMinorVersion = OS_MINOR_VERSION; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.OSALRevision = OS_REVISION; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.OSALMissionRevision = OS_MISSION_REV; /* ** Task startup event message. @@ -346,14 +344,14 @@ int32 CFE_ES_TaskInit(void) Status = CFE_EVS_SendEvent(CFE_ES_INITSTATS_INF_EID, CFE_EVS_EventType_INFORMATION, "%s%s. cFE chksm %d", - CFS_VERSIONS, CFE_PSP_VERSION, (int)CFE_ES_TaskData.HkPacket.Payload.CFECoreChecksum); + CFS_VERSIONS, CFE_PSP_VERSION, (int)CFE_ES_TaskData.HkBuffer.HkTlm.Payload.CFECoreChecksum); #else /* if CFE_PSP_VERSION not defined use integer version macros*/ Status = CFE_EVS_SendEvent(CFE_ES_INITSTATS_INF_EID, CFE_EVS_EventType_INFORMATION, "\n%sv%d.%d.%d.%d\n cFE chksm %d", CFS_VERSIONS, CFE_PSP_MAJOR_VERSION, CFE_PSP_MINOR_VERSION, CFE_PSP_REVISION, CFE_PSP_MISSION_REV, - (int)CFE_ES_TaskData.HkPacket.Payload.CFECoreChecksum); + (int)CFE_ES_TaskData.HkBuffer.HkTlm.Payload.CFECoreChecksum); #endif /* CFE_PSP_VERSION */ @@ -434,19 +432,19 @@ int32 CFE_ES_TaskInit(void) /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void CFE_ES_TaskPipe(CFE_MSG_Message_t *MsgPtr) +void CFE_ES_TaskPipe(CFE_SB_Msg_t *SBMsgPtr) { CFE_SB_MsgId_t MessageID = CFE_SB_INVALID_MSG_ID; CFE_MSG_FcnCode_t CommandCode = 0; - CFE_MSG_GetMsgId(MsgPtr, &MessageID); + CFE_MSG_GetMsgId(&SBMsgPtr->Msg, &MessageID); switch (CFE_SB_MsgIdToValue(MessageID)) { /* ** Housekeeping telemetry request */ case CFE_ES_SEND_HK_MID: - CFE_ES_HousekeepingCmd((CFE_SB_CmdHdr_t*)MsgPtr); + CFE_ES_HousekeepingCmd((CFE_MSG_CommandHeader_t *)SBMsgPtr); break; /* @@ -454,174 +452,174 @@ void CFE_ES_TaskPipe(CFE_MSG_Message_t *MsgPtr) */ case CFE_ES_CMD_MID: - CFE_MSG_GetFcnCode(MsgPtr, &CommandCode); + CFE_MSG_GetFcnCode(&SBMsgPtr->Msg, &CommandCode); switch (CommandCode) { case CFE_ES_NOOP_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_Noop_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_Noop_t))) { - CFE_ES_NoopCmd((CFE_ES_Noop_t*)MsgPtr); + CFE_ES_NoopCmd((CFE_ES_Noop_t*)SBMsgPtr); } break; case CFE_ES_RESET_COUNTERS_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_ResetCounters_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_ResetCounters_t))) { - CFE_ES_ResetCountersCmd((CFE_ES_ResetCounters_t*)MsgPtr); + CFE_ES_ResetCountersCmd((CFE_ES_ResetCounters_t*)SBMsgPtr); } break; case CFE_ES_RESTART_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_Restart_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_Restart_t))) { - CFE_ES_RestartCmd((CFE_ES_Restart_t*)MsgPtr); + CFE_ES_RestartCmd((CFE_ES_Restart_t*)SBMsgPtr); } break; case CFE_ES_START_APP_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_StartApp_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_StartApp_t))) { - CFE_ES_StartAppCmd((CFE_ES_StartApp_t*)MsgPtr); + CFE_ES_StartAppCmd((CFE_ES_StartApp_t*)SBMsgPtr); } break; case CFE_ES_STOP_APP_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_StopApp_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_StopApp_t))) { - CFE_ES_StopAppCmd((CFE_ES_StopApp_t*)MsgPtr); + CFE_ES_StopAppCmd((CFE_ES_StopApp_t*)SBMsgPtr); } break; case CFE_ES_RESTART_APP_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_RestartApp_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_RestartApp_t))) { - CFE_ES_RestartAppCmd((CFE_ES_RestartApp_t*)MsgPtr); + CFE_ES_RestartAppCmd((CFE_ES_RestartApp_t*)SBMsgPtr); } break; case CFE_ES_RELOAD_APP_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_ReloadApp_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_ReloadApp_t))) { - CFE_ES_ReloadAppCmd((CFE_ES_ReloadApp_t*)MsgPtr); + CFE_ES_ReloadAppCmd((CFE_ES_ReloadApp_t*)SBMsgPtr); } break; case CFE_ES_QUERY_ONE_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_QueryOne_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_QueryOne_t))) { - CFE_ES_QueryOneCmd((CFE_ES_QueryOne_t*)MsgPtr); + CFE_ES_QueryOneCmd((CFE_ES_QueryOne_t*)SBMsgPtr); } break; case CFE_ES_QUERY_ALL_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_QueryAll_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_QueryAll_t))) { - CFE_ES_QueryAllCmd((CFE_ES_QueryAll_t*)MsgPtr); + CFE_ES_QueryAllCmd((CFE_ES_QueryAll_t*)SBMsgPtr); } break; case CFE_ES_QUERY_ALL_TASKS_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_QueryAllTasks_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_QueryAllTasks_t))) { - CFE_ES_QueryAllTasksCmd((CFE_ES_QueryAllTasks_t*)MsgPtr); + CFE_ES_QueryAllTasksCmd((CFE_ES_QueryAllTasks_t*)SBMsgPtr); } break; case CFE_ES_CLEAR_SYSLOG_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_ClearSyslog_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_ClearSyslog_t))) { - CFE_ES_ClearSyslogCmd((CFE_ES_ClearSyslog_t*)MsgPtr); + CFE_ES_ClearSyslogCmd((CFE_ES_ClearSyslog_t*)SBMsgPtr); } break; case CFE_ES_WRITE_SYSLOG_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_WriteSyslog_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_WriteSyslog_t))) { - CFE_ES_WriteSyslogCmd((CFE_ES_WriteSyslog_t*)MsgPtr); + CFE_ES_WriteSyslogCmd((CFE_ES_WriteSyslog_t*)SBMsgPtr); } break; case CFE_ES_OVER_WRITE_SYSLOG_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_OverWriteSyslog_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_OverWriteSyslog_t))) { - CFE_ES_OverWriteSyslogCmd((CFE_ES_OverWriteSyslog_t*)MsgPtr); + CFE_ES_OverWriteSyslogCmd((CFE_ES_OverWriteSyslog_t*)SBMsgPtr); } break; case CFE_ES_CLEAR_ER_LOG_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_ClearERLog_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_ClearERLog_t))) { - CFE_ES_ClearERLogCmd((CFE_ES_ClearERLog_t*)MsgPtr); + CFE_ES_ClearERLogCmd((CFE_ES_ClearERLog_t*)SBMsgPtr); } break; case CFE_ES_WRITE_ER_LOG_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_WriteERLog_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_WriteERLog_t))) { - CFE_ES_WriteERLogCmd((CFE_ES_WriteERLog_t*)MsgPtr); + CFE_ES_WriteERLogCmd((CFE_ES_WriteERLog_t*)SBMsgPtr); } break; case CFE_ES_START_PERF_DATA_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_StartPerfData_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_StartPerfData_t))) { - CFE_ES_StartPerfDataCmd((CFE_ES_StartPerfData_t*)MsgPtr); + CFE_ES_StartPerfDataCmd((CFE_ES_StartPerfData_t*)SBMsgPtr); } break; case CFE_ES_STOP_PERF_DATA_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_StopPerfData_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_StopPerfData_t))) { - CFE_ES_StopPerfDataCmd((CFE_ES_StopPerfData_t*)MsgPtr); + CFE_ES_StopPerfDataCmd((CFE_ES_StopPerfData_t*)SBMsgPtr); } break; case CFE_ES_SET_PERF_FILTER_MASK_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_SetPerfFilterMask_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_SetPerfFilterMask_t))) { - CFE_ES_SetPerfFilterMaskCmd((CFE_ES_SetPerfFilterMask_t*)MsgPtr); + CFE_ES_SetPerfFilterMaskCmd((CFE_ES_SetPerfFilterMask_t*)SBMsgPtr); } break; case CFE_ES_SET_PERF_TRIGGER_MASK_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_SetPerfTriggerMask_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_SetPerfTriggerMask_t))) { - CFE_ES_SetPerfTriggerMaskCmd((CFE_ES_SetPerfTriggerMask_t*)MsgPtr); + CFE_ES_SetPerfTriggerMaskCmd((CFE_ES_SetPerfTriggerMask_t*)SBMsgPtr); } break; case CFE_ES_RESET_PR_COUNT_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_ResetPRCount_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_ResetPRCount_t))) { - CFE_ES_ResetPRCountCmd((CFE_ES_ResetPRCount_t*)MsgPtr); + CFE_ES_ResetPRCountCmd((CFE_ES_ResetPRCount_t*)SBMsgPtr); } break; case CFE_ES_SET_MAX_PR_COUNT_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_SetMaxPRCount_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_SetMaxPRCount_t))) { - CFE_ES_SetMaxPRCountCmd((CFE_ES_SetMaxPRCount_t*)MsgPtr); + CFE_ES_SetMaxPRCountCmd((CFE_ES_SetMaxPRCount_t*)SBMsgPtr); } break; case CFE_ES_DELETE_CDS_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_DeleteCDS_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_DeleteCDS_t))) { - CFE_ES_DeleteCDSCmd((CFE_ES_DeleteCDS_t*)MsgPtr); + CFE_ES_DeleteCDSCmd((CFE_ES_DeleteCDS_t*)SBMsgPtr); } break; case CFE_ES_SEND_MEM_POOL_STATS_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_SendMemPoolStats_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_SendMemPoolStats_t))) { - CFE_ES_SendMemPoolStatsCmd((CFE_ES_SendMemPoolStats_t*)MsgPtr); + CFE_ES_SendMemPoolStatsCmd((CFE_ES_SendMemPoolStats_t*)SBMsgPtr); } break; case CFE_ES_DUMP_CDS_REGISTRY_CC: - if (CFE_ES_VerifyCmdLength(MsgPtr, sizeof(CFE_ES_DumpCDSRegistry_t))) + if (CFE_ES_VerifyCmdLength(&SBMsgPtr->Msg, sizeof(CFE_ES_DumpCDSRegistry_t))) { - CFE_ES_DumpCDSRegistryCmd((CFE_ES_DumpCDSRegistry_t*)MsgPtr); + CFE_ES_DumpCDSRegistryCmd((CFE_ES_DumpCDSRegistry_t*)SBMsgPtr); } break; @@ -652,7 +650,7 @@ void CFE_ES_TaskPipe(CFE_MSG_Message_t *MsgPtr) /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -int32 CFE_ES_HousekeepingCmd(const CFE_SB_CmdHdr_t *data) +int32 CFE_ES_HousekeepingCmd(const CFE_MSG_CommandHeader_t *data) { OS_heap_prop_t HeapProp; int32 stat; @@ -661,35 +659,35 @@ int32 CFE_ES_HousekeepingCmd(const CFE_SB_CmdHdr_t *data) /* ** Get command execution counters, system log entry count & bytes used. */ - CFE_ES_TaskData.HkPacket.Payload.CommandCounter = CFE_ES_TaskData.CommandCounter; - CFE_ES_TaskData.HkPacket.Payload.CommandErrorCounter = CFE_ES_TaskData.CommandErrorCounter; - - CFE_ES_TaskData.HkPacket.Payload.SysLogBytesUsed = CFE_ES_ResetDataPtr->SystemLogEndIdx; - CFE_ES_TaskData.HkPacket.Payload.SysLogSize = CFE_PLATFORM_ES_SYSTEM_LOG_SIZE; - CFE_ES_TaskData.HkPacket.Payload.SysLogEntries = CFE_ES_ResetDataPtr->SystemLogEntryNum; - CFE_ES_TaskData.HkPacket.Payload.SysLogMode = CFE_ES_ResetDataPtr->SystemLogMode; - - CFE_ES_TaskData.HkPacket.Payload.ERLogIndex = CFE_ES_ResetDataPtr->ERLogIndex; - CFE_ES_TaskData.HkPacket.Payload.ERLogEntries = CFE_ES_ResetDataPtr->ERLogEntries; - - CFE_ES_TaskData.HkPacket.Payload.RegisteredCoreApps = CFE_ES_Global.RegisteredCoreApps; - CFE_ES_TaskData.HkPacket.Payload.RegisteredExternalApps = CFE_ES_Global.RegisteredExternalApps; - CFE_ES_TaskData.HkPacket.Payload.RegisteredTasks = CFE_ES_Global.RegisteredTasks; - CFE_ES_TaskData.HkPacket.Payload.RegisteredLibs = CFE_ES_Global.RegisteredLibs; - - CFE_ES_TaskData.HkPacket.Payload.ResetType = CFE_ES_ResetDataPtr->ResetVars.ResetType; - CFE_ES_TaskData.HkPacket.Payload.ResetSubtype = CFE_ES_ResetDataPtr->ResetVars.ResetSubtype; - CFE_ES_TaskData.HkPacket.Payload.ProcessorResets = CFE_ES_ResetDataPtr->ResetVars.ProcessorResetCount; - CFE_ES_TaskData.HkPacket.Payload.MaxProcessorResets = CFE_ES_ResetDataPtr->ResetVars.MaxProcessorResetCount; - CFE_ES_TaskData.HkPacket.Payload.BootSource = CFE_ES_ResetDataPtr->ResetVars.BootSource; - - CFE_ES_TaskData.HkPacket.Payload.PerfState = CFE_ES_ResetDataPtr->Perf.MetaData.State; - CFE_ES_TaskData.HkPacket.Payload.PerfMode = CFE_ES_ResetDataPtr->Perf.MetaData.Mode; - CFE_ES_TaskData.HkPacket.Payload.PerfTriggerCount = CFE_ES_ResetDataPtr->Perf.MetaData.TriggerCount; - CFE_ES_TaskData.HkPacket.Payload.PerfDataStart = CFE_ES_ResetDataPtr->Perf.MetaData.DataStart; - CFE_ES_TaskData.HkPacket.Payload.PerfDataEnd = CFE_ES_ResetDataPtr->Perf.MetaData.DataEnd; - CFE_ES_TaskData.HkPacket.Payload.PerfDataCount = CFE_ES_ResetDataPtr->Perf.MetaData.DataCount; - CFE_ES_TaskData.HkPacket.Payload.PerfDataToWrite = CFE_ES_GetPerfLogDumpRemaining(); + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.CommandCounter = CFE_ES_TaskData.CommandCounter; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.CommandErrorCounter = CFE_ES_TaskData.CommandErrorCounter; + + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.SysLogBytesUsed = CFE_ES_ResetDataPtr->SystemLogEndIdx; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.SysLogSize = CFE_PLATFORM_ES_SYSTEM_LOG_SIZE; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.SysLogEntries = CFE_ES_ResetDataPtr->SystemLogEntryNum; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.SysLogMode = CFE_ES_ResetDataPtr->SystemLogMode; + + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.ERLogIndex = CFE_ES_ResetDataPtr->ERLogIndex; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.ERLogEntries = CFE_ES_ResetDataPtr->ERLogEntries; + + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.RegisteredCoreApps = CFE_ES_Global.RegisteredCoreApps; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.RegisteredExternalApps = CFE_ES_Global.RegisteredExternalApps; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.RegisteredTasks = CFE_ES_Global.RegisteredTasks; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.RegisteredLibs = CFE_ES_Global.RegisteredLibs; + + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.ResetType = CFE_ES_ResetDataPtr->ResetVars.ResetType; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.ResetSubtype = CFE_ES_ResetDataPtr->ResetVars.ResetSubtype; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.ProcessorResets = CFE_ES_ResetDataPtr->ResetVars.ProcessorResetCount; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.MaxProcessorResets = CFE_ES_ResetDataPtr->ResetVars.MaxProcessorResetCount; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.BootSource = CFE_ES_ResetDataPtr->ResetVars.BootSource; + + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.PerfState = CFE_ES_ResetDataPtr->Perf.MetaData.State; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.PerfMode = CFE_ES_ResetDataPtr->Perf.MetaData.Mode; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.PerfTriggerCount = CFE_ES_ResetDataPtr->Perf.MetaData.TriggerCount; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.PerfDataStart = CFE_ES_ResetDataPtr->Perf.MetaData.DataStart; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.PerfDataEnd = CFE_ES_ResetDataPtr->Perf.MetaData.DataEnd; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.PerfDataCount = CFE_ES_ResetDataPtr->Perf.MetaData.DataCount; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.PerfDataToWrite = CFE_ES_GetPerfLogDumpRemaining(); /* * Fill out the perf trigger/filter mask objects @@ -705,12 +703,12 @@ int32 CFE_ES_HousekeepingCmd(const CFE_SB_CmdHdr_t *data) { if (PerfIdx < CFE_ES_PERF_TRIGGERMASK_INT_SIZE) { - CFE_ES_TaskData.HkPacket.Payload.PerfTriggerMask[PerfIdx] = + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.PerfTriggerMask[PerfIdx] = CFE_ES_ResetDataPtr->Perf.MetaData.TriggerMask[PerfIdx]; } else { - CFE_ES_TaskData.HkPacket.Payload.PerfTriggerMask[PerfIdx] = 0; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.PerfTriggerMask[PerfIdx] = 0; } } @@ -718,12 +716,12 @@ int32 CFE_ES_HousekeepingCmd(const CFE_SB_CmdHdr_t *data) { if (PerfIdx < CFE_ES_PERF_FILTERMASK_INT_SIZE) { - CFE_ES_TaskData.HkPacket.Payload.PerfFilterMask[PerfIdx] = + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.PerfFilterMask[PerfIdx] = CFE_ES_ResetDataPtr->Perf.MetaData.FilterMask[PerfIdx]; } else { - CFE_ES_TaskData.HkPacket.Payload.PerfFilterMask[PerfIdx] = 0; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.PerfFilterMask[PerfIdx] = 0; } } @@ -731,22 +729,22 @@ int32 CFE_ES_HousekeepingCmd(const CFE_SB_CmdHdr_t *data) if(stat == OS_SUCCESS) { - CFE_ES_TaskData.HkPacket.Payload.HeapBytesFree = HeapProp.free_bytes; - CFE_ES_TaskData.HkPacket.Payload.HeapBlocksFree = HeapProp.free_blocks; - CFE_ES_TaskData.HkPacket.Payload.HeapMaxBlockSize = HeapProp.largest_free_block; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.HeapBytesFree = HeapProp.free_bytes; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.HeapBlocksFree = HeapProp.free_blocks; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.HeapMaxBlockSize = HeapProp.largest_free_block; } else { - CFE_ES_TaskData.HkPacket.Payload.HeapBytesFree = 0; - CFE_ES_TaskData.HkPacket.Payload.HeapBlocksFree = 0; - CFE_ES_TaskData.HkPacket.Payload.HeapMaxBlockSize = 0; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.HeapBytesFree = 0; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.HeapBlocksFree = 0; + CFE_ES_TaskData.HkBuffer.HkTlm.Payload.HeapMaxBlockSize = 0; } /* ** Send housekeeping telemetry packet. */ - CFE_SB_TimeStampMsg((CFE_MSG_Message_t *) &CFE_ES_TaskData.HkPacket); - CFE_SB_SendMsg((CFE_MSG_Message_t *) &CFE_ES_TaskData.HkPacket); + CFE_SB_TimeStampMsg(&CFE_ES_TaskData.HkBuffer.HkTlm.TlmHeader.Msg); + CFE_SB_SendMsg(&CFE_ES_TaskData.HkBuffer.SBMsg); /* ** This command does not affect the command execution counter. @@ -1133,7 +1131,7 @@ int32 CFE_ES_QueryOneCmd(const CFE_ES_QueryOne_t *data) if (Result == CFE_SUCCESS) { - Result = CFE_ES_GetModuleInfo(&(CFE_ES_TaskData.OneAppPacket.Payload.AppInfo), ResourceID); + Result = CFE_ES_GetModuleInfo(&(CFE_ES_TaskData.OneAppBuffer.OneAppTlm.Payload.AppInfo), ResourceID); } /* @@ -1144,8 +1142,8 @@ int32 CFE_ES_QueryOneCmd(const CFE_ES_QueryOne_t *data) /* ** Send application status telemetry packet. */ - CFE_SB_TimeStampMsg((CFE_MSG_Message_t *) &CFE_ES_TaskData.OneAppPacket); - Result = CFE_SB_SendMsg((CFE_MSG_Message_t *) &CFE_ES_TaskData.OneAppPacket); + CFE_SB_TimeStampMsg(&CFE_ES_TaskData.OneAppBuffer.OneAppTlm.TlmHeader.Msg); + Result = CFE_SB_SendMsg(&CFE_ES_TaskData.OneAppBuffer.SBMsg); if ( Result == CFE_SUCCESS ) { CFE_ES_TaskData.CommandCounter++; @@ -1804,16 +1802,16 @@ int32 CFE_ES_SendMemPoolStatsCmd(const CFE_ES_SendMemPoolStats_t *data) if (ValidHandle) { /* Extract the memory statistics from the memory pool */ - CFE_ES_GetMemPoolStats(&CFE_ES_TaskData.MemStatsPacket.Payload.PoolStats, MemHandle); + CFE_ES_GetMemPoolStats(&CFE_ES_TaskData.MemStatsBuffer.MemStatsTlm.Payload.PoolStats, MemHandle); /* Echo the specified pool handle in the telemetry packet */ - CFE_ES_TaskData.MemStatsPacket.Payload.PoolHandle = MemHandle; + CFE_ES_TaskData.MemStatsBuffer.MemStatsTlm.Payload.PoolHandle = MemHandle; /* ** Send memory statistics telemetry packet. */ - CFE_SB_TimeStampMsg((CFE_MSG_Message_t *) &CFE_ES_TaskData.MemStatsPacket); - CFE_SB_SendMsg((CFE_MSG_Message_t *) &CFE_ES_TaskData.MemStatsPacket); + CFE_SB_TimeStampMsg(&CFE_ES_TaskData.MemStatsBuffer.MemStatsTlm.TlmHeader.Msg); + CFE_SB_SendMsg(&CFE_ES_TaskData.MemStatsBuffer.SBMsg); CFE_ES_TaskData.CommandCounter++; CFE_EVS_SendEvent(CFE_ES_TLM_POOL_STATS_INFO_EID, CFE_EVS_EventType_DEBUG, diff --git a/fsw/cfe-core/src/es/cfe_es_task.h b/fsw/cfe-core/src/es/cfe_es_task.h index e687db466..7d87de06c 100644 --- a/fsw/cfe-core/src/es/cfe_es_task.h +++ b/fsw/cfe-core/src/es/cfe_es_task.h @@ -89,7 +89,32 @@ typedef struct char DataFileName[OS_MAX_PATH_LEN]; } CFE_ES_BackgroundLogDumpGlobal_t; +/* + * Housekeeping software bus message buffer + */ +typedef struct +{ + CFE_SB_Msg_t SBMsg; + CFE_ES_HousekeepingTlm_t HkTlm; +} CFE_ES_HousekeepingBuffer_t; +/* + * Single application software bus message buffer + */ +typedef struct +{ + CFE_SB_Msg_t SBMsg; + CFE_ES_OneAppTlm_t OneAppTlm; +} CFE_ES_OneAppBuffer_t; + +/* + * Memory stats software bus message buffer + */ +typedef struct +{ + CFE_SB_Msg_t SBMsg; + CFE_ES_MemStatsTlm_t MemStatsTlm; +} CFE_ES_MemStatsBuffer_t; /* ** Type definition (ES task global data) @@ -103,24 +128,23 @@ typedef struct uint8 CommandErrorCounter; /* - ** ES Task housekeeping telemetry packet + ** ES Task housekeeping telemetry buffer */ - CFE_ES_HousekeepingTlm_t HkPacket; + CFE_ES_HousekeepingBuffer_t HkBuffer; /* - ** Single application telemetry packet + ** Single application telemetry buffer */ - CFE_ES_OneAppTlm_t OneAppPacket; + CFE_ES_OneAppBuffer_t OneAppBuffer; /* - ** Single application telemetry packet + ** Single application telemetry buffer */ - CFE_ES_MemStatsTlm_t MemStatsPacket; + CFE_ES_MemStatsBuffer_t MemStatsBuffer; /* ** ES Task operational data (not reported in housekeeping) */ - CFE_MSG_Message_t *MsgPtr; CFE_SB_PipeId_t CmdPipe; /* @@ -160,7 +184,7 @@ extern CFE_ES_TaskData_t CFE_ES_TaskData; */ void CFE_ES_TaskMain(void); int32 CFE_ES_TaskInit(void); -void CFE_ES_TaskPipe(CFE_MSG_Message_t *MsgPtr); +void CFE_ES_TaskPipe(CFE_SB_Msg_t *SBMsgPtr); /* @@ -174,7 +198,7 @@ void CFE_ES_BackgroundCleanup(void); /* ** ES Task message dispatch functions */ -int32 CFE_ES_HousekeepingCmd(const CFE_SB_CmdHdr_t *data); +int32 CFE_ES_HousekeepingCmd(const CFE_MSG_CommandHeader_t *data); int32 CFE_ES_NoopCmd(const CFE_ES_Noop_t *Cmd); int32 CFE_ES_ResetCountersCmd(const CFE_ES_ResetCounters_t *data); int32 CFE_ES_RestartCmd(const CFE_ES_Restart_t *data); diff --git a/fsw/cfe-core/src/evs/cfe_evs_task.c b/fsw/cfe-core/src/evs/cfe_evs_task.c index d9cd5f31b..f03addf4d 100644 --- a/fsw/cfe-core/src/evs/cfe_evs_task.c +++ b/fsw/cfe-core/src/evs/cfe_evs_task.c @@ -368,7 +368,7 @@ void CFE_EVS_ProcessCommandPacket(CFE_MSG_Message_t *MsgPtr) case CFE_EVS_SEND_HK_MID: /* Housekeeping request */ - CFE_EVS_ReportHousekeepingCmd((CFE_SB_CmdHdr_t*)MsgPtr); + CFE_EVS_ReportHousekeepingCmd((CFE_MSG_CommandHeader_t *)MsgPtr); break; default: @@ -694,7 +694,7 @@ int32 CFE_EVS_ClearLogCmd(const CFE_EVS_ClearLog_t *data) ** Assumptions and Notes: ** */ -int32 CFE_EVS_ReportHousekeepingCmd (const CFE_SB_CmdHdr_t *data) +int32 CFE_EVS_ReportHousekeepingCmd (const CFE_MSG_CommandHeader_t *data) { uint32 i, j; EVS_AppData_t *AppDataPtr; diff --git a/fsw/cfe-core/src/evs/cfe_evs_task.h b/fsw/cfe-core/src/evs/cfe_evs_task.h index bf6007f3b..73ddee403 100644 --- a/fsw/cfe-core/src/evs/cfe_evs_task.h +++ b/fsw/cfe-core/src/evs/cfe_evs_task.h @@ -145,7 +145,7 @@ extern void CFE_EVS_ProcessCommandPacket(CFE_MSG_Message_t *MsgPtr); /* * EVS Message Handler Functions */ -int32 CFE_EVS_ReportHousekeepingCmd (const CFE_SB_CmdHdr_t *data); +int32 CFE_EVS_ReportHousekeepingCmd(const CFE_MSG_CommandHeader_t *data); int32 CFE_EVS_NoopCmd(const CFE_EVS_Noop_t *data); int32 CFE_EVS_ClearLogCmd(const CFE_EVS_ClearLog_t *data); int32 CFE_EVS_ResetCountersCmd(const CFE_EVS_ResetCounters_t *data); diff --git a/fsw/cfe-core/src/inc/cfe_es_msg.h b/fsw/cfe-core/src/inc/cfe_es_msg.h index 2f370a55f..1457e4e9a 100644 --- a/fsw/cfe-core/src/inc/cfe_es_msg.h +++ b/fsw/cfe-core/src/inc/cfe_es_msg.h @@ -1531,8 +1531,8 @@ typedef struct CFE_ES_OneAppTlm_Payload typedef struct CFE_ES_OneAppTlm { - CFE_SB_TlmHdr_t TlmHeader; /**< \brief cFE Software Bus Telemetry Message Header */ - CFE_ES_OneAppTlm_Payload_t Payload; + CFE_MSG_TelemetryHeader_t TlmHeader; /**< \brief Telemetry header */ + CFE_ES_OneAppTlm_Payload_t Payload; /**< \brief Telemetry payload */ } CFE_ES_OneAppTlm_t; /** @@ -1547,8 +1547,8 @@ typedef struct CFE_ES_PoolStatsTlm_Payload typedef struct CFE_ES_MemStatsTlm { - CFE_SB_TlmHdr_t TlmHeader; /**< \brief cFE Software Bus Telemetry Message Header */ - CFE_ES_PoolStatsTlm_Payload_t Payload; + CFE_MSG_TelemetryHeader_t TlmHeader; /**< \brief Telemetry header */ + CFE_ES_PoolStatsTlm_Payload_t Payload; /**< \brief Telemetry payload */ } CFE_ES_MemStatsTlm_t; /*************************************************************************/ @@ -1644,8 +1644,8 @@ typedef struct CFE_ES_HousekeepingTlm_Payload typedef struct CFE_ES_HousekeepingTlm { - CFE_SB_TlmHdr_t TlmHeader; /**< \brief cFE Software Bus Telemetry Message Header */ - CFE_ES_HousekeepingTlm_Payload_t Payload; + CFE_MSG_TelemetryHeader_t TlmHeader; /**< \brief Telemetry header */ + CFE_ES_HousekeepingTlm_Payload_t Payload; /**< \brief Telemetry payload */ } CFE_ES_HousekeepingTlm_t; diff --git a/fsw/cfe-core/src/inc/cfe_evs_msg.h b/fsw/cfe-core/src/inc/cfe_evs_msg.h index 63c9496ef..cd8b51945 100644 --- a/fsw/cfe-core/src/inc/cfe_evs_msg.h +++ b/fsw/cfe-core/src/inc/cfe_evs_msg.h @@ -1181,8 +1181,8 @@ typedef struct CFE_EVS_HousekeepingTlm_Payload { } CFE_EVS_HousekeepingTlm_Payload_t; typedef struct CFE_EVS_HousekeepingTlm { - CFE_SB_TlmHdr_t TlmHeader; - CFE_EVS_HousekeepingTlm_Payload_t Payload; + CFE_MSG_TelemetryHeader_t TlmHeader; /**< \brief Telemetry header */ + CFE_EVS_HousekeepingTlm_Payload_t Payload; /**< \brief Telemetry payload */ } CFE_EVS_HousekeepingTlm_t; /** Telemetry packet structures */ @@ -1224,14 +1224,14 @@ typedef struct CFE_EVS_ShortEventTlm_Payload { } CFE_EVS_ShortEventTlm_Payload_t; typedef struct CFE_EVS_LongEventTlm { - CFE_SB_TlmHdr_t TlmHeader; - CFE_EVS_LongEventTlm_Payload_t Payload; + CFE_MSG_TelemetryHeader_t TlmHeader; /**< \brief Telemetry header */ + CFE_EVS_LongEventTlm_Payload_t Payload; /**< \brief Telemetry payload */ } CFE_EVS_LongEventTlm_t; typedef struct CFE_EVS_ShortEventTlm { - CFE_SB_TlmHdr_t TlmHeader; - CFE_EVS_ShortEventTlm_Payload_t Payload; + CFE_MSG_TelemetryHeader_t TlmHeader; /**< \brief Telemetry header */ + CFE_EVS_ShortEventTlm_Payload_t Payload; /**< \brief Telemetry payload */ } CFE_EVS_ShortEventTlm_t; diff --git a/fsw/cfe-core/src/inc/cfe_sb.h b/fsw/cfe-core/src/inc/cfe_sb.h index e4bb24a49..0ddbb5b5d 100644 --- a/fsw/cfe-core/src/inc/cfe_sb.h +++ b/fsw/cfe-core/src/inc/cfe_sb.h @@ -149,11 +149,14 @@ ** Type Definitions */ -#ifndef CFE_OMIT_DEPRECATED_6_8 /** \brief Software Bus generic message */ -typedef CFE_MSG_Message_t CFE_SB_Msg_t; -#endif /* CFE_OMIT_DEPRECATED_6_8 */ +typedef union CFE_SB_Msg { + CFE_MSG_Message_t Msg; /**< \brief Base message type without enforced alignment */ + long long int LongInt; /**< \brief Align to support Long Integer */ + long double LongDouble; /**< \brief Align to support Long Double */ +} CFE_SB_Msg_t; +#if 0 /* TODO deprecate */ /** \brief Aligned Software Bus command header */ typedef union CFE_SB_CmdHdr { CFE_MSG_CommandHeader_t Cmd; @@ -165,9 +168,10 @@ typedef union CFE_SB_TlmHdr { CFE_MSG_TelemetryHeader_t Tlm; CFE_MSG_Message_t BaseMsg; } CFE_SB_TlmHdr_t; +#endif -#define CFE_SB_CMD_HDR_SIZE (sizeof(CFE_SB_CmdHdr_t))/**< \brief Size of #CFE_SB_CmdHdr_t in bytes */ -#define CFE_SB_TLM_HDR_SIZE (sizeof(CFE_SB_TlmHdr_t))/**< \brief Size of #CFE_SB_TlmHdr_t in bytes */ +#define CFE_SB_CMD_HDR_SIZE (sizeof(CFE_MSG_CommandHeader_t))/**< \brief Size of command header */ +#define CFE_SB_TLM_HDR_SIZE (sizeof(CFE_MSG_TelemetryHeader_t))/**< \brief Size of telemetry header */ /** \brief CFE_SB_TimeOut_t to primitive type definition ** @@ -548,8 +552,7 @@ CFE_Status_t CFE_SB_UnsubscribeLocal(CFE_SB_MsgId_t MsgId, CFE_SB_PipeId_t PipeI ** of a telemetry message. ** ** \param[in] MsgPtr A pointer to the message to be sent. This must point -** to the first byte of the message header -** (#CFE_MSG_Message_t). +** to the first byte of the message header. ** ** \return Execution status, see \ref CFEReturnCodes ** \retval #CFE_SUCCESS \copybrief CFE_SUCCESS @@ -559,7 +562,7 @@ CFE_Status_t CFE_SB_UnsubscribeLocal(CFE_SB_MsgId_t MsgId, CFE_SB_PipeId_t PipeI ** ** \sa #CFE_SB_RcvMsg, #CFE_SB_ZeroCopySend, #CFE_SB_PassMsg **/ -CFE_Status_t CFE_SB_SendMsg(CFE_MSG_Message_t *MsgPtr); +CFE_Status_t CFE_SB_SendMsg(CFE_SB_Msg_t *MsgPtr); /*****************************************************************************/ /** @@ -581,8 +584,7 @@ CFE_Status_t CFE_SB_SendMsg(CFE_MSG_Message_t *MsgPtr); ** sequence counter in a telemetry message. ** ** \param[in] MsgPtr A pointer to the message to be sent. This must point -** to the first byte of the message header -** (#CFE_MSG_Message_t). +** to the first byte of the message header. ** ** \return Execution status, see \ref CFEReturnCodes ** \retval #CFE_SUCCESS \copybrief CFE_SUCCESS @@ -592,7 +594,7 @@ CFE_Status_t CFE_SB_SendMsg(CFE_MSG_Message_t *MsgPtr); ** ** \sa #CFE_SB_RcvMsg, #CFE_SB_ZeroCopySend, #CFE_SB_SendMsg **/ -CFE_Status_t CFE_SB_PassMsg(CFE_MSG_Message_t *MsgPtr); +CFE_Status_t CFE_SB_PassMsg(CFE_SB_Msg_t *MsgPtr); /*****************************************************************************/ /** @@ -609,8 +611,8 @@ CFE_Status_t CFE_SB_PassMsg(CFE_MSG_Message_t *MsgPtr); ** for CFE_SUCCESS before processing the message. ** ** \param[in, out] BufPtr A pointer to a message pointer. -** Typically a caller declares a ptr of type CFE_MSG_Message_t -** (i.e. CFE_MSG_Message_t *Ptr) then gives the address of that +** Typically a caller declares a ptr of type CFE_SB_Msg_t +** (i.e. CFE_SB_Msg_t *Ptr) then gives the address of that ** pointer (&Ptr) as this parmeter. After a successful ** receipt of a message, *BufPtr will point to the first ** byte of the software bus message header. This should be @@ -637,7 +639,7 @@ CFE_Status_t CFE_SB_PassMsg(CFE_MSG_Message_t *MsgPtr); ** ** \sa #CFE_SB_SendMsg, #CFE_SB_ZeroCopySend **/ -CFE_Status_t CFE_SB_RcvMsg(CFE_MSG_Message_t **BufPtr, CFE_SB_PipeId_t PipeId, int32 TimeOut); +CFE_Status_t CFE_SB_RcvMsg(CFE_SB_Msg_t **BufPtr, CFE_SB_PipeId_t PipeId, int32 TimeOut); /**@}*/ /** @defgroup CFEAPISBZeroCopy cFE Zero Copy Message APIs @@ -678,7 +680,7 @@ CFE_Status_t CFE_SB_RcvMsg(CFE_MSG_Message_t **BufPtr, CFE_SB_PipeId_t PipeId, ** ** \sa #CFE_SB_ZeroCopyReleasePtr, #CFE_SB_ZeroCopySend **/ -CFE_MSG_Message_t *CFE_SB_ZeroCopyGetPtr(uint16 MsgSize, +CFE_SB_Msg_t *CFE_SB_ZeroCopyGetPtr(uint16 MsgSize, CFE_SB_ZeroCopyHandle_t *BufferHandle); /*****************************************************************************/ @@ -708,7 +710,7 @@ CFE_MSG_Message_t *CFE_SB_ZeroCopyGetPtr(uint16 MsgSize, ** ** \sa #CFE_SB_ZeroCopyGetPtr, #CFE_SB_ZeroCopySend **/ -CFE_Status_t CFE_SB_ZeroCopyReleasePtr(CFE_MSG_Message_t *Ptr2Release, CFE_SB_ZeroCopyHandle_t BufferHandle); +CFE_Status_t CFE_SB_ZeroCopyReleasePtr(CFE_SB_Msg_t *Ptr2Release, CFE_SB_ZeroCopyHandle_t BufferHandle); /*****************************************************************************/ /** @@ -748,7 +750,7 @@ CFE_Status_t CFE_SB_ZeroCopyReleasePtr(CFE_MSG_Message_t *Ptr2Release, CFE_SB_Ze ** ** \sa #CFE_SB_SendMsg, #CFE_SB_RcvMsg, #CFE_SB_ZeroCopyReleasePtr, #CFE_SB_ZeroCopyGetPtr **/ -CFE_Status_t CFE_SB_ZeroCopySend(CFE_MSG_Message_t *MsgPtr, CFE_SB_ZeroCopyHandle_t BufferHandle); +CFE_Status_t CFE_SB_ZeroCopySend(CFE_SB_Msg_t *MsgPtr, CFE_SB_ZeroCopyHandle_t BufferHandle); /*****************************************************************************/ /** @@ -790,7 +792,7 @@ CFE_Status_t CFE_SB_ZeroCopySend(CFE_MSG_Message_t *MsgPtr, CFE_SB_ZeroCopyHandl ** ** \sa #CFE_SB_PassMsg, #CFE_SB_ZeroCopySend, #CFE_SB_ZeroCopyReleasePtr, #CFE_SB_ZeroCopyGetPtr **/ -CFE_Status_t CFE_SB_ZeroCopyPass(CFE_MSG_Message_t *MsgPtr, CFE_SB_ZeroCopyHandle_t BufferHandle); +CFE_Status_t CFE_SB_ZeroCopyPass(CFE_SB_Msg_t *MsgPtr, CFE_SB_ZeroCopyHandle_t BufferHandle); /**@}*/ /** @defgroup CFEAPISBSetMessage cFE Setting Message Characteristics APIs diff --git a/fsw/cfe-core/src/inc/cfe_sb_msg.h b/fsw/cfe-core/src/inc/cfe_sb_msg.h index 03407b0c9..4e7f82698 100644 --- a/fsw/cfe-core/src/inc/cfe_sb_msg.h +++ b/fsw/cfe-core/src/inc/cfe_sb_msg.h @@ -54,7 +54,7 @@ ** \cfecmdmnemonic \SB_NOOP ** ** \par Command Structure -** #CFE_SB_CmdHdr_t +** #CFE_MSG_CommandHeader_t ** ** \par Command Verification ** Successful execution of this command may be verified with the @@ -88,7 +88,7 @@ ** \cfecmdmnemonic \SB_RESETCTRS ** ** \par Command Structure -** #CFE_SB_CmdHdr_t +** #CFE_MSG_CommandHeader_t ** ** \par Command Verification ** Successful execution of this command may be verified with the @@ -125,7 +125,7 @@ ** \cfecmdmnemonic \SB_DUMPSTATS ** ** \par Command Structure -** #CFE_SB_CmdHdr_t +** #CFE_MSG_CommandHeader_t ** ** \par Command Verification ** Successful execution of this command may be verified with the @@ -380,7 +380,7 @@ ** \cfecmdmnemonic \SB_ENASUBRPTG ** ** \par Command Structure -** #CFE_SB_CmdHdr_t +** #CFE_MSG_CommandHeader_t ** ** \par Command Verification ** Successful execution of this command will result in the sending @@ -413,7 +413,7 @@ ** \cfecmdmnemonic \SB_DISSUBRPTG ** ** \par Command Structure -** #CFE_SB_CmdHdr_t +** #CFE_MSG_CommandHeader_t ** ** \par Command Verification ** Successful execution of this command will result in the suppression @@ -445,7 +445,7 @@ ** \cfecmdmnemonic \SB_SENDPREVSUBS ** ** \par Command Structure -** #CFE_SB_CmdHdr_t +** #CFE_MSG_CommandHeader_t ** ** \par Command Verification ** Successful execution of this command will result in a series @@ -472,19 +472,19 @@ * SB Messages which have no payload are each * given unique typedefs to follow the command handler convention * - * For the SB application these is mapped to the CFE_SB_CmdHdr_t type, + * For the SB application these is mapped to the CFE_MSG_CommandHeader_t type, * as they contain only a primary + command header. */ -typedef CFE_SB_CmdHdr_t CFE_SB_Noop_t; -typedef CFE_SB_CmdHdr_t CFE_SB_ResetCounters_t; -typedef CFE_SB_CmdHdr_t CFE_SB_EnableSubReporting_t; -typedef CFE_SB_CmdHdr_t CFE_SB_DisableSubReporting_t; -typedef CFE_SB_CmdHdr_t CFE_SB_SendSbStats_t; -typedef CFE_SB_CmdHdr_t CFE_SB_SendPrevSubs_t; +typedef CFE_MSG_CommandHeader_t CFE_SB_Noop_t; +typedef CFE_MSG_CommandHeader_t CFE_SB_ResetCounters_t; +typedef CFE_MSG_CommandHeader_t CFE_SB_EnableSubReporting_t; +typedef CFE_MSG_CommandHeader_t CFE_SB_DisableSubReporting_t; +typedef CFE_MSG_CommandHeader_t CFE_SB_SendSbStats_t; +typedef CFE_MSG_CommandHeader_t CFE_SB_SendPrevSubs_t; /** -** \brief Write File Info Commands +** \brief Write File Info Command Payload ** ** This structure contains a generic definition used by three SB commands, ** 'Write Routing Info to File' #CFE_SB_SEND_ROUTING_INFO_CC, @@ -495,9 +495,12 @@ typedef struct CFE_SB_WriteFileInfoCmd_Payload { char Filename[CFE_MISSION_MAX_PATH_LEN];/**< \brief Path and Filename of data to be loaded */ } CFE_SB_WriteFileInfoCmd_Payload_t; +/** + * \brief Write File Info Command + */ typedef struct CFE_SB_WriteFileInfoCmd { - CFE_SB_CmdHdr_t Hdr;/**< \brief cFE Software Bus Command Message Header #CFE_SB_CmdHdr_t */ - CFE_SB_WriteFileInfoCmd_Payload_t Payload; + CFE_MSG_CommandHeader_t Hdr; /**< \brief Command header */ + CFE_SB_WriteFileInfoCmd_Payload_t Payload; /**< \brief Command payload */ }CFE_SB_WriteFileInfoCmd_t; /* @@ -508,7 +511,7 @@ typedef CFE_SB_WriteFileInfoCmd_t CFE_SB_SendPipeInfo_t; typedef CFE_SB_WriteFileInfoCmd_t CFE_SB_SendMapInfo_t; /** -** \brief Enable/Disable Route Commands +** \brief Enable/Disable Route Command Payload ** ** This structure contains a definition used by two SB commands, ** 'Enable Route' #CFE_SB_ENABLE_ROUTE_CC and 'Disable Route' #CFE_SB_DISABLE_ROUTE_CC. @@ -522,9 +525,12 @@ typedef struct CFE_SB_RouteCmd_Payload { uint8 Spare;/**<\brief Spare byte to make command even number of bytes */ } CFE_SB_RouteCmd_Payload_t; +/** + * \brief Enable/Disable Route Command + */ typedef struct CFE_SB_RouteCmd { - CFE_SB_CmdHdr_t Hdr;/**< \brief cFE Software Bus Command Message Header #CFE_SB_CmdHdr_t */ - CFE_SB_RouteCmd_Payload_t Payload; + CFE_MSG_CommandHeader_t Hdr; /**< \brief Command header */ + CFE_SB_RouteCmd_Payload_t Payload; /**< \brief Command payload */ } CFE_SB_RouteCmd_t; /* @@ -584,8 +590,8 @@ typedef struct CFE_SB_HousekeepingTlm_Payload { } CFE_SB_HousekeepingTlm_Payload_t; typedef struct CFE_SB_HousekeepingTlm { - CFE_SB_TlmHdr_t Hdr;/**< \brief cFE Software Bus Telemetry Message Header */ - CFE_SB_HousekeepingTlm_Payload_t Payload; + CFE_MSG_TelemetryHeader_t Hdr; /**< \brief Telemetry header */ + CFE_SB_HousekeepingTlm_Payload_t Payload; /**< \brief Telemetry payload */ } CFE_SB_HousekeepingTlm_t; @@ -657,8 +663,8 @@ typedef struct CFE_SB_StatsTlm_Payload { } CFE_SB_StatsTlm_Payload_t; typedef struct CFE_SB_StatsTlm { - CFE_SB_TlmHdr_t Hdr;/**< \brief cFE Software Bus Telemetry Message Header */ - CFE_SB_StatsTlm_Payload_t Payload; + CFE_MSG_TelemetryHeader_t Hdr; /**< \brief Telemetry header */ + CFE_SB_StatsTlm_Payload_t Payload; /**< \brief Telemetry payload */ } CFE_SB_StatsTlm_t; @@ -708,8 +714,8 @@ typedef struct CFE_SB_SingleSubscriptionTlm_Payload { } CFE_SB_SingleSubscriptionTlm_Payload_t; typedef struct CFE_SB_SingleSubscriptionTlm { - CFE_SB_TlmHdr_t Hdr;/**< \brief cFE Software Bus Telemetry Message Header */ - CFE_SB_SingleSubscriptionTlm_Payload_t Payload; + CFE_MSG_TelemetryHeader_t Hdr; /**< \brief Telemetry header */ + CFE_SB_SingleSubscriptionTlm_Payload_t Payload; /**< \brief Telemetry payload */ } CFE_SB_SingleSubscriptionTlm_t; @@ -748,8 +754,8 @@ typedef struct CFE_SB_AllSubscriptionsTlm_Payload { } CFE_SB_AllSubscriptionsTlm_Payload_t; typedef struct CFE_SB_AllSubscriptionsTlm { - CFE_SB_TlmHdr_t Hdr;/**< \brief cFE Software Bus Telemetry Message Header */ - CFE_SB_AllSubscriptionsTlm_Payload_t Payload; + CFE_MSG_TelemetryHeader_t Hdr; /**< \brief Telemetry header */ + CFE_SB_AllSubscriptionsTlm_Payload_t Payload; /**< \brief Telemetry payload */ } CFE_SB_AllSubscriptionsTlm_t; diff --git a/fsw/cfe-core/src/inc/cfe_tbl_msg.h b/fsw/cfe-core/src/inc/cfe_tbl_msg.h index 8a758ebb6..ce279cc45 100644 --- a/fsw/cfe-core/src/inc/cfe_tbl_msg.h +++ b/fsw/cfe-core/src/inc/cfe_tbl_msg.h @@ -762,8 +762,8 @@ typedef struct CFE_TBL_HousekeepingTlm_Payload typedef struct CFE_TBL_HousekeepingTlm { - CFE_SB_TlmHdr_t TlmHeader; /**< \brief cFE Software Bus Telemetry Message Header */ - CFE_TBL_HousekeepingTlm_Payload_t Payload; + CFE_MSG_TelemetryHeader_t TlmHeader; /**< \brief Telemetry header */ + CFE_TBL_HousekeepingTlm_Payload_t Payload; /**< \brief Telemetry payload */ } CFE_TBL_HousekeepingTlm_t; @@ -810,8 +810,8 @@ typedef struct CFE_TBL_TblRegPacket_Payload typedef struct CFE_TBL_TableRegistryTlm { - CFE_SB_TlmHdr_t TlmHeader; /**< \brief cFE Software Bus Telemetry Message Header */ - CFE_TBL_TblRegPacket_Payload_t Payload; + CFE_MSG_TelemetryHeader_t TlmHeader; /**< \brief Telemetry header */ + CFE_TBL_TblRegPacket_Payload_t Payload; /**< \brief Telemetry payload */ } CFE_TBL_TableRegistryTlm_t; diff --git a/fsw/cfe-core/src/inc/cfe_time_msg.h b/fsw/cfe-core/src/inc/cfe_time_msg.h index e0f2b7b12..33b06dfcf 100644 --- a/fsw/cfe-core/src/inc/cfe_time_msg.h +++ b/fsw/cfe-core/src/inc/cfe_time_msg.h @@ -740,6 +740,9 @@ typedef struct CFE_TIME_NoArgsCmd typedef CFE_TIME_NoArgsCmd_t CFE_TIME_Noop_t; typedef CFE_TIME_NoArgsCmd_t CFE_TIME_ResetCounters_t; typedef CFE_TIME_NoArgsCmd_t CFE_TIME_SendDiagnosticTlm_t; +typedef CFE_TIME_NoArgsCmd_t CFE_TIME_1HzCmd_t; +typedef CFE_TIME_NoArgsCmd_t CFE_TIME_ToneSignalCmd_t; +typedef CFE_TIME_NoArgsCmd_t CFE_TIME_FakeToneCmd_t; /* ** Type definition (leap seconds command)... @@ -863,36 +866,6 @@ typedef struct CFE_TIME_OneHzAdjustmentCmd typedef CFE_TIME_OneHzAdjustmentCmd_t CFE_TIME_Add1HZAdjustment_t; typedef CFE_TIME_OneHzAdjustmentCmd_t CFE_TIME_Sub1HZAdjustment_t; -/* -** Type definition (local 1Hz wake-up command)... -*/ -typedef struct CFE_TIME_1HzCmd -{ - uint8 CmdHeader[CFE_SB_CMD_HDR_SIZE]; - -} CFE_TIME_1HzCmd_t; - - -/* -** Type definition (time at the tone signal command)... -*/ -typedef struct CFE_TIME_ToneSignalCmd -{ - CFE_SB_CmdHdr_t CmdHeader; - -} CFE_TIME_ToneSignalCmd_t; - - -/* -** Type definition ("fake" time at the tone signal command)... -*/ -typedef struct CFE_TIME_FakeToneCmd -{ - CFE_SB_CmdHdr_t CmdHeader; - -} CFE_TIME_FakeToneCmd_t; - - /* ** Type definition (time at the tone data command)... */ @@ -977,8 +950,8 @@ typedef struct CFE_TIME_HousekeepingTlm_Payload typedef struct CFE_TIME_HousekeepingTlm { - CFE_SB_TlmHdr_t TlmHeader; - CFE_TIME_HousekeepingTlm_Payload_t Payload; + CFE_MSG_TelemetryHeader_t TlmHeader; /**< \brief Telemetry header */ + CFE_TIME_HousekeepingTlm_Payload_t Payload; /**< \brief Telemetry payload */ } CFE_TIME_HousekeepingTlm_t; @@ -1135,8 +1108,8 @@ typedef struct CFE_TIME_DiagnosticTlm_Payload typedef struct CFE_TIME_DiagnosticTlm { - CFE_SB_TlmHdr_t TlmHeader; - CFE_TIME_DiagnosticTlm_Payload_t Payload; + CFE_MSG_TelemetryHeader_t TlmHeader; /**< \brief Telemetry header */ + CFE_TIME_DiagnosticTlm_Payload_t Payload; /**< \brief Telemetry payload */ } CFE_TIME_DiagnosticTlm_t; diff --git a/fsw/cfe-core/src/sb/cfe_sb_api.c b/fsw/cfe-core/src/sb/cfe_sb_api.c index c233c2b81..2fdaeeba1 100644 --- a/fsw/cfe-core/src/sb/cfe_sb_api.c +++ b/fsw/cfe-core/src/sb/cfe_sb_api.c @@ -293,7 +293,7 @@ int32 CFE_SB_DeletePipeFull(CFE_SB_PipeId_t PipeId,CFE_ES_ResourceID_t AppId) int32 Stat; CFE_ES_ResourceID_t Owner; CFE_ES_ResourceID_t TskId; - CFE_MSG_Message_t *PipeMsgPtr; + CFE_SB_Msg_t *SBMsgPtr; char FullName[(OS_MAX_API_NAME * 2)]; CFE_SB_RemovePipeCallback_t Args; @@ -346,7 +346,7 @@ int32 CFE_SB_DeletePipeFull(CFE_SB_PipeId_t PipeId,CFE_ES_ResourceID_t AppId) /* this step will free the memory used to store the message */ do{ CFE_SB_UnlockSharedData(__func__,__LINE__); - Stat = CFE_SB_RcvMsg(&PipeMsgPtr,PipeId,CFE_SB_POLL); + Stat = CFE_SB_RcvMsg(&SBMsgPtr,PipeId,CFE_SB_POLL); CFE_SB_LockSharedData(__func__,__LINE__); }while(Stat == CFE_SUCCESS); diff --git a/fsw/cfe-core/src/sb/cfe_sb_priv.h b/fsw/cfe-core/src/sb/cfe_sb_priv.h index a74eaf8cc..5fb0058db 100644 --- a/fsw/cfe-core/src/sb/cfe_sb_priv.h +++ b/fsw/cfe-core/src/sb/cfe_sb_priv.h @@ -367,7 +367,7 @@ int32 CFE_SB_NoopCmd(const CFE_SB_Noop_t *data); int32 CFE_SB_ResetCountersCmd(const CFE_SB_ResetCounters_t *data); int32 CFE_SB_EnableSubReportingCmd(const CFE_SB_EnableSubReporting_t *data); int32 CFE_SB_DisableSubReportingCmd(const CFE_SB_DisableSubReporting_t *data); -int32 CFE_SB_SendHKTlmCmd(const CFE_SB_CmdHdr_t *data); +int32 CFE_SB_SendHKTlmCmd(const CFE_MSG_CommandHeader_t *data); int32 CFE_SB_EnableRouteCmd(const CFE_SB_EnableRoute_t *data); int32 CFE_SB_DisableRouteCmd(const CFE_SB_DisableRoute_t *data); int32 CFE_SB_SendStatsCmd(const CFE_SB_SendSbStats_t *data); diff --git a/fsw/cfe-core/src/sb/cfe_sb_task.c b/fsw/cfe-core/src/sb/cfe_sb_task.c index 6991b7fab..0c7df9c0e 100644 --- a/fsw/cfe-core/src/sb/cfe_sb_task.c +++ b/fsw/cfe-core/src/sb/cfe_sb_task.c @@ -373,7 +373,7 @@ void CFE_SB_ProcessCmdPipePkt(void) { case CFE_SB_SEND_HK_MID: /* Note: Command counter not incremented for this command */ - CFE_SB_SendHKTlmCmd((CFE_SB_CmdHdr_t *)CFE_SB.CmdPipePktPtr); + CFE_SB_SendHKTlmCmd((CFE_MSG_CommandHeader_t *)CFE_SB.CmdPipePktPtr); break; case CFE_SB_SUB_RPT_CTRL_MID: @@ -565,7 +565,7 @@ int32 CFE_SB_DisableSubReportingCmd(const CFE_SB_DisableSubReporting_t *data) ** Return: ** none */ -int32 CFE_SB_SendHKTlmCmd(const CFE_SB_CmdHdr_t *data) +int32 CFE_SB_SendHKTlmCmd(const CFE_MSG_CommandHeader_t *data) { CFE_SB.HKTlmMsg.Payload.MemInUse = CFE_SB.StatTlmMsg.Payload.MemInUse; CFE_SB.HKTlmMsg.Payload.UnmarkedMem = CFE_PLATFORM_SB_BUF_MEMORY_BYTES - CFE_SB.StatTlmMsg.Payload.PeakMemInUse; diff --git a/fsw/cfe-core/src/sb/cfe_sb_util.c b/fsw/cfe-core/src/sb/cfe_sb_util.c index cee644719..b372755b5 100644 --- a/fsw/cfe-core/src/sb/cfe_sb_util.c +++ b/fsw/cfe-core/src/sb/cfe_sb_util.c @@ -87,11 +87,11 @@ uint16 CFE_SB_MsgHdrSize(const CFE_MSG_Message_t *MsgPtr) } else if(type == CFE_MSG_Type_Cmd) { - size = sizeof(CFE_SB_CmdHdr_t); + size = sizeof(CFE_MSG_CommandHeader_t); } else if(type == CFE_MSG_Type_Tlm) { - size = sizeof(CFE_SB_TlmHdr_t); + size = sizeof(CFE_MSG_TelemetryHeader_t); } return size; diff --git a/fsw/cfe-core/src/tbl/cfe_tbl_task.c b/fsw/cfe-core/src/tbl/cfe_tbl_task.c index 828796f95..b168bf8ac 100644 --- a/fsw/cfe-core/src/tbl/cfe_tbl_task.c +++ b/fsw/cfe-core/src/tbl/cfe_tbl_task.c @@ -54,7 +54,7 @@ CFE_TBL_TaskData_t CFE_TBL_TaskData; * For generic message entries, which only have a MID and a handler function (no command payload) */ #define CFE_TBL_MESSAGE_ENTRY(mid,handlerfunc) \ - { CFE_SB_MSGID_WRAP_VALUE(mid), 0, sizeof(CFE_SB_CmdHdr_t), (CFE_TBL_MsgProcFuncPtr_t)handlerfunc, CFE_TBL_MSG_MSGTYPE } + { CFE_SB_MSGID_WRAP_VALUE(mid), 0, sizeof(CFE_MSG_CommandHeader_t), (CFE_TBL_MsgProcFuncPtr_t)handlerfunc, CFE_TBL_MSG_MSGTYPE } /* * Macros to assist in building the CFE_TBL_CmdHandlerTbl - diff --git a/fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.c b/fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.c index 68ab370c8..7f5be7d9b 100644 --- a/fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.c +++ b/fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.c @@ -53,7 +53,7 @@ ** NOTE: For complete prolog information, see 'cfe_tbl_task_cmds.h' ********************************************************************/ -int32 CFE_TBL_HousekeepingCmd(const CFE_SB_CmdHdr_t *data) +int32 CFE_TBL_HousekeepingCmd(const CFE_MSG_CommandHeader_t *data) { int32 Status; uint32 i; diff --git a/fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.h b/fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.h index dbbcb7c8d..f62d7386a 100644 --- a/fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.h +++ b/fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.h @@ -126,7 +126,7 @@ extern void CFE_TBL_GetTblRegData(void); ** ** \retval #CFE_TBL_DONT_INC_CTR \copydoc CFE_TBL_DONT_INC_CTR ******************************************************************************/ -int32 CFE_TBL_HousekeepingCmd(const CFE_SB_CmdHdr_t *data); +int32 CFE_TBL_HousekeepingCmd(const CFE_MSG_CommandHeader_t *data); /*****************************************************************************/ /** diff --git a/fsw/cfe-core/src/time/cfe_time_task.c b/fsw/cfe-core/src/time/cfe_time_task.c index 7fbc7fa9d..564d2879f 100644 --- a/fsw/cfe-core/src/time/cfe_time_task.c +++ b/fsw/cfe-core/src/time/cfe_time_task.c @@ -46,12 +46,12 @@ CFE_TIME_TaskData_t CFE_TIME_TaskData; /* ** Command handler for "HK request"... */ -int32 CFE_TIME_HousekeepingCmd(const CFE_SB_CmdHdr_t *data); +int32 CFE_TIME_HousekeepingCmd(const CFE_MSG_CommandHeader_t *data); /* ** Command handler for "tone signal detected"... */ -int32 CFE_TIME_ToneSignalCmd(const CFE_SB_CmdHdr_t *data); +int32 CFE_TIME_ToneSignalCmd(const CFE_TIME_ToneSignalCmd_t *data); /* ** Command handler for "time at the tone"... @@ -61,7 +61,7 @@ int32 CFE_TIME_ToneDataCmd(const CFE_TIME_ToneDataCmd_t *data); /* ** Command handler for 1Hz signal... */ -int32 CFE_TIME_OneHzCmd(const CFE_SB_CmdHdr_t *data); +int32 CFE_TIME_OneHzCmd(const CFE_TIME_1HzCmd_t *data); /* ** Command handler for "request time at the tone"... @@ -79,7 +79,7 @@ int32 CFE_TIME_OneHzCmd(const CFE_SB_CmdHdr_t *data); ** non-fake tone mode. */ #if (CFE_PLATFORM_TIME_CFG_SERVER == true) -int32 CFE_TIME_ToneSendCmd(const CFE_SB_CmdHdr_t *data); +int32 CFE_TIME_ToneSendCmd(const CFE_TIME_FakeToneCmd_t *data); #endif /* @@ -476,14 +476,14 @@ void CFE_TIME_TaskPipe(CFE_MSG_Message_t *MsgPtr) ** Housekeeping telemetry request... */ case CFE_TIME_SEND_HK_MID: - CFE_TIME_HousekeepingCmd((CFE_SB_CmdHdr_t *)MsgPtr); + CFE_TIME_HousekeepingCmd((CFE_MSG_CommandHeader_t *)MsgPtr); break; /* ** Time at the tone "signal"... */ case CFE_TIME_TONE_CMD_MID: - CFE_TIME_ToneSignalCmd((CFE_SB_CmdHdr_t *)MsgPtr); + CFE_TIME_ToneSignalCmd((CFE_MSG_ToneSignalCmd_t *)MsgPtr); break; /* @@ -497,7 +497,7 @@ void CFE_TIME_TaskPipe(CFE_MSG_Message_t *MsgPtr) ** Run time state machine at 1Hz... */ case CFE_TIME_1HZ_CMD_MID: - CFE_TIME_OneHzCmd((CFE_SB_CmdHdr_t *)MsgPtr); + CFE_TIME_OneHzCmd((CFE_TIME_1HzCmd_t *)MsgPtr); break; /* @@ -505,7 +505,7 @@ void CFE_TIME_TaskPipe(CFE_MSG_Message_t *MsgPtr) */ #if (CFE_PLATFORM_TIME_CFG_SERVER == true) case CFE_TIME_SEND_CMD_MID: - CFE_TIME_ToneSendCmd((CFE_SB_CmdHdr_t *)MsgPtr); + CFE_TIME_ToneSendCmd((CFE_TIME_FakeToneCmd_t *)MsgPtr); break; #endif @@ -670,7 +670,7 @@ void CFE_TIME_TaskPipe(CFE_MSG_Message_t *MsgPtr) /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -int32 CFE_TIME_HousekeepingCmd(const CFE_SB_CmdHdr_t *data) +int32 CFE_TIME_HousekeepingCmd(const CFE_MSG_CommandHeader_t *data) { CFE_TIME_Reference_t Reference; @@ -710,7 +710,7 @@ int32 CFE_TIME_HousekeepingCmd(const CFE_SB_CmdHdr_t *data) /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -int32 CFE_TIME_ToneSignalCmd(const CFE_SB_CmdHdr_t *data) +int32 CFE_TIME_ToneSignalCmd(const CFE_TIME_ToneSignalCmd_t *data) { /* ** Indication that tone signal occurred recently... @@ -759,7 +759,7 @@ int32 CFE_TIME_ToneDataCmd(const CFE_TIME_ToneDataCmd_t *data) * as we do not need a separate MID for this job. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -int32 CFE_TIME_OneHzCmd(const CFE_SB_CmdHdr_t *data) +int32 CFE_TIME_OneHzCmd(const CFE_TIME_1HzCmd_t *data) { /* * Run the state machine updates required at 1Hz. @@ -792,7 +792,7 @@ int32 CFE_TIME_OneHzCmd(const CFE_SB_CmdHdr_t *data) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #if (CFE_PLATFORM_TIME_CFG_SERVER == true) -int32 CFE_TIME_ToneSendCmd(const CFE_SB_CmdHdr_t *data) +int32 CFE_TIME_ToneSendCmd(const CFE_TIME_FakeToneCmd_t *data) { /* ** Request for "time at tone" data packet (probably scheduler)... diff --git a/fsw/cfe-core/src/time/cfe_time_utils.h b/fsw/cfe-core/src/time/cfe_time_utils.h index facd2d773..360367347 100644 --- a/fsw/cfe-core/src/time/cfe_time_utils.h +++ b/fsw/cfe-core/src/time/cfe_time_utils.h @@ -277,7 +277,7 @@ typedef struct /* ** Local 1Hz wake-up command packet (not related to time at tone)... */ - CFE_SB_CmdHdr_t Local1HzCmd; + CFE_TIME_1HzCmd_t Local1HzCmd; /* ** Time at the tone command packets (sent by time servers)... @@ -294,7 +294,7 @@ typedef struct * "tone signal" message above. */ #if (CFE_MISSION_TIME_CFG_FAKE_TONE == true) - CFE_SB_CmdHdr_t ToneSendCmd; + CFE_TIME_FakeToneCmd_t ToneSendCmd; #endif /* diff --git a/fsw/cfe-core/unit-test/sb_UT.c b/fsw/cfe-core/unit-test/sb_UT.c index f979edb23..40dea289b 100644 --- a/fsw/cfe-core/unit-test/sb_UT.c +++ b/fsw/cfe-core/unit-test/sb_UT.c @@ -415,15 +415,15 @@ void Test_SB_Cmds(void) */ void Test_SB_Cmds_Noop(void) { - CFE_SB_CmdHdr_t NoParamCmd; + CFE_SB_Noop_t NoopCmd; CFE_MSG_FcnCode_t FcnCode = CFE_SB_NOOP_CC; CFE_SB_MsgId_t MsgId = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(NoParamCmd); + CFE_MSG_Size_t Size = sizeof(NoopCmd); 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_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &NoParamCmd; + CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &NoopCmd; CFE_SB_ProcessCmdPipePkt(); EVTCNT(1); @@ -437,15 +437,15 @@ void Test_SB_Cmds_Noop(void) */ void Test_SB_Cmds_RstCtrs(void) { - CFE_SB_CmdHdr_t NoParamCmd; - CFE_MSG_FcnCode_t FcnCode = CFE_SB_RESET_COUNTERS_CC; - CFE_SB_MsgId_t MsgId = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(NoParamCmd); + CFE_SB_ResetCounters_t ResetCountersCmd; + CFE_MSG_FcnCode_t FcnCode = CFE_SB_RESET_COUNTERS_CC; + CFE_SB_MsgId_t MsgId = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); + CFE_MSG_Size_t Size = sizeof(ResetCountersCmd); 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_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &NoParamCmd; + CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &ResetCountersCmd; CFE_SB_ProcessCmdPipePkt(); EVTCNT(1); @@ -459,10 +459,10 @@ void Test_SB_Cmds_RstCtrs(void) */ void Test_SB_Cmds_Stats(void) { - CFE_SB_CmdHdr_t NoParamCmd; - CFE_MSG_FcnCode_t FcnCode; - CFE_SB_MsgId_t MsgId; - CFE_MSG_Size_t Size; + CFE_SB_SendSbStats_t SendSbStatsCmd; + CFE_MSG_FcnCode_t FcnCode; + CFE_SB_MsgId_t MsgId; + CFE_MSG_Size_t Size; /* For internal SendMsg call */ MsgId = CFE_SB_ValueToMsgId(CFE_SB_STATS_TLM_MID); @@ -472,13 +472,13 @@ void Test_SB_Cmds_Stats(void) /* For Generic command processing */ MsgId = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - Size = sizeof(NoParamCmd); + Size = sizeof(SendSbStatsCmd); FcnCode = CFE_SB_SEND_SB_STATS_CC; 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_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &NoParamCmd; + CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &SendSbStatsCmd; CFE_SB_ProcessCmdPipePkt(); /* No subs event and command processing event */ @@ -1201,9 +1201,9 @@ void Test_SB_Cmds_DisRouteInvParam3(void) */ void Test_SB_Cmds_SendHK(void) { - CFE_SB_CmdHdr_t NoParamCmd; - CFE_SB_MsgId_t MsgIdCmd; - CFE_MSG_Size_t Size; + CFE_MSG_CommandHeader_t NoParamCmd; + CFE_SB_MsgId_t MsgIdCmd; + CFE_MSG_Size_t Size; /* For internal SendMsg call */ MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_HK_TLM_MID); @@ -1230,7 +1230,7 @@ void Test_SB_Cmds_SendHK(void) */ void Test_SB_Cmds_SendPrevSubs(void) { - CFE_SB_SendPrevSubs_t NoParamCmd; + CFE_SB_SendPrevSubs_t SendPrevSubsCmd; CFE_SB_PipeId_t PipeId1; CFE_SB_PipeId_t PipeId2; CFE_SB_MsgId_t MsgId = SB_UT_BARE_TLM_MID3; @@ -1242,7 +1242,7 @@ void Test_SB_Cmds_SendPrevSubs(void) CFE_SB_MsgId_t MsgIdCmd; CFE_MSG_Size_t Size; - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &NoParamCmd; + CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &SendPrevSubsCmd; SETUP(CFE_SB_CreatePipe(&PipeId1, PipeDepth, "TestPipe1")); SETUP(CFE_SB_CreatePipe(&PipeId2, PipeDepth, "TestPipe2")); NumEvts = 2; /* one for each pipe create */ @@ -1355,16 +1355,16 @@ void Test_SB_Cmds_SendPrevSubs(void) */ void Test_SB_Cmds_SubRptOn(void) { - CFE_SB_CmdHdr_t NoParamCmd; - CFE_MSG_FcnCode_t FcnCode = CFE_SB_ENABLE_SUB_REPORTING_CC; - CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_SUB_RPT_CTRL_MID); - CFE_MSG_Size_t Size = sizeof(NoParamCmd); + CFE_SB_EnableSubReporting_t EnableSubReportingCmd; + CFE_MSG_FcnCode_t FcnCode = CFE_SB_ENABLE_SUB_REPORTING_CC; + CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_SUB_RPT_CTRL_MID); + CFE_MSG_Size_t Size = sizeof(EnableSubReportingCmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &NoParamCmd; + CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &EnableSubReportingCmd; CFE_SB_ProcessCmdPipePkt(); EVTCNT(0); @@ -1376,16 +1376,16 @@ void Test_SB_Cmds_SubRptOn(void) */ void Test_SB_Cmds_SubRptOff(void) { - CFE_SB_CmdHdr_t NoParamCmd; - CFE_MSG_FcnCode_t FcnCode = CFE_SB_DISABLE_SUB_REPORTING_CC; - CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_SUB_RPT_CTRL_MID); - CFE_MSG_Size_t Size = sizeof(NoParamCmd); + CFE_SB_DisableSubReporting_t DisableSubReportingCmd; + CFE_MSG_FcnCode_t FcnCode = CFE_SB_DISABLE_SUB_REPORTING_CC; + CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_SUB_RPT_CTRL_MID); + CFE_MSG_Size_t Size = sizeof(DisableSubReportingCmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &NoParamCmd; + CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &DisableSubReportingCmd; CFE_SB_ProcessCmdPipePkt(); EVTCNT(0); @@ -1397,7 +1397,6 @@ void Test_SB_Cmds_SubRptOff(void) */ void Test_SB_Cmds_CmdUnexpCmdCode(void) { - CFE_SB_CmdHdr_t NoParamCmd; CFE_MSG_FcnCode_t FcnCode = 99; CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); @@ -1406,7 +1405,6 @@ void Test_SB_Cmds_CmdUnexpCmdCode(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); /* Use a command code known to be invalid */ - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &NoParamCmd; CFE_SB_ProcessCmdPipePkt(); EVTCNT(1); EVTSENT(CFE_SB_BAD_CMD_CODE_EID); @@ -1418,7 +1416,6 @@ void Test_SB_Cmds_CmdUnexpCmdCode(void) */ void Test_SB_Cmds_SubRptUnexpCmdCode(void) { - CFE_SB_CmdHdr_t NoParamCmd; CFE_MSG_FcnCode_t FcnCode = 99; CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_SUB_RPT_CTRL_MID); @@ -1428,7 +1425,6 @@ void Test_SB_Cmds_SubRptUnexpCmdCode(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); /* Use a command code known to be invalid */ - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &NoParamCmd; CFE_SB_ProcessCmdPipePkt(); EVTCNT(1); @@ -1472,11 +1468,9 @@ void Test_SB_Cmds_BadCmdLength(void) void Test_SB_Cmds_UnexpMsgId(void) { CFE_SB_MsgId_t MsgIdCmd = SB_UT_TLM_MID; - CFE_SB_CmdHdr_t NoParamCmd; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &NoParamCmd; CFE_SB_ProcessCmdPipePkt(); EVTCNT(1); @@ -3605,20 +3599,20 @@ void Test_CFE_SB_MsgHdrSize(void) type = CFE_MSG_Type_Invalid; 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_MsgHdrSize(&msg), sizeof(CCSDS_SpacePacket_t)); + ASSERT_EQ(CFE_SB_MsgHdrSize(&msg), sizeof(CFE_MSG_Message_t)); /* 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_MsgHdrSize(&msg), sizeof(CFE_SB_TlmHdr_t)); + ASSERT_EQ(CFE_SB_MsgHdrSize(&msg), sizeof(CFE_MSG_TelemetryHeader_t)); /* Has secondary, cmd type */ 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_MsgHdrSize(&msg), sizeof(CFE_SB_CmdHdr_t)); + ASSERT_EQ(CFE_SB_MsgHdrSize(&msg), sizeof(CFE_MSG_CommandHeader_t)); /* Has secondary, invalid type */ type = CFE_MSG_Type_Invalid; @@ -3860,14 +3854,14 @@ void Test_CFE_SB_BadPipeInfo(void) */ void Test_SB_SendMsgPaths_Nominal(void) { - CFE_SB_CmdHdr_t NoParamCmd; - CFE_SB_MsgId_t MsgId; - CFE_SB_PipeId_t PipeId; - SB_UT_Test_Tlm_t TlmPkt; - CFE_MSG_Message_t *TlmPktPtr = (CFE_MSG_Message_t *) &TlmPkt; - int32 PipeDepth = 2; - CFE_MSG_Size_t Size; - CFE_MSG_Type_t Type; + CFE_MSG_CommandHeader_t NoParamCmd; + CFE_SB_MsgId_t MsgId; + CFE_SB_PipeId_t PipeId; + SB_UT_Test_Tlm_t TlmPkt; + CFE_MSG_Message_t *TlmPktPtr = (CFE_MSG_Message_t *) &TlmPkt; + int32 PipeDepth = 2; + CFE_MSG_Size_t Size; + CFE_MSG_Type_t Type; /* For internal SendMsg call */ MsgId = CFE_SB_ValueToMsgId(CFE_SB_HK_TLM_MID); diff --git a/fsw/cfe-core/unit-test/sb_UT.h b/fsw/cfe-core/unit-test/sb_UT.h index ffb126684..37ad35523 100644 --- a/fsw/cfe-core/unit-test/sb_UT.h +++ b/fsw/cfe-core/unit-test/sb_UT.h @@ -52,34 +52,34 @@ ** Structures */ typedef struct { - CFE_SB_CmdHdr_t Hdr; - uint32 Cmd32Param1; - uint16 Cmd16Param1; - uint16 Cmd16Param2; - uint8 Cmd8Param1; - uint8 Cmd8Param2; - uint8 Cmd8Param3; - uint8 Cmd8Param4; + CFE_MSG_CommandHeader_t Hdr; + uint32 Cmd32Param1; + uint16 Cmd16Param1; + uint16 Cmd16Param2; + uint8 Cmd8Param1; + uint8 Cmd8Param2; + uint8 Cmd8Param3; + uint8 Cmd8Param4; } SB_UT_Test_Cmd_t; typedef struct { - CFE_SB_TlmHdr_t Hdr; - uint32 Tlm32Param1; - uint16 Tlm16Param1; - uint16 Tlm16Param2; - uint8 Tlm8Param1; - uint8 Tlm8Param2; - uint8 Tlm8Param3; - uint8 Tlm8Param4; + CFE_MSG_TelemetryHeader_t Hdr; + uint32 Tlm32Param1; + uint16 Tlm16Param1; + uint16 Tlm16Param2; + uint8 Tlm8Param1; + uint8 Tlm8Param2; + uint8 Tlm8Param3; + uint8 Tlm8Param4; } SB_UT_Test_Tlm_t; typedef struct { - CFE_MSG_Message_t Pri; /* 6 bytes */ - uint8 Tlm8Param1; - uint8 Tlm8Param2; - uint32 Tlm32Param1; - uint16 Tlm16Param1; - uint16 Tlm16Param2; + CFE_MSG_Message_t Pri; + uint8 Tlm8Param1; + uint8 Tlm8Param2; + uint32 Tlm32Param1; + uint16 Tlm16Param1; + uint16 Tlm16Param2; } SB_UT_TstPktWoSecHdr_t; #define SB_UT_CMD_MID_VALUE_BASE CFE_PLATFORM_CMD_MID_BASE + 1 diff --git a/fsw/cfe-core/unit-test/time_UT.c b/fsw/cfe-core/unit-test/time_UT.c index 211999e51..ea75733a6 100644 --- a/fsw/cfe-core/unit-test/time_UT.c +++ b/fsw/cfe-core/unit-test/time_UT.c @@ -1741,7 +1741,7 @@ void Test_PipeCmds(void) union { CFE_MSG_Message_t message; - CFE_SB_CmdHdr_t cmd; + CFE_MSG_CommandHeader_t cmd; CFE_TIME_ToneDataCmd_t tonedatacmd; CFE_TIME_Noop_t noopcmd; CFE_TIME_ResetCounters_t resetcountercmd; diff --git a/modules/msg/mission_inc/default_cfe_msg_hdr_pri.h b/modules/msg/mission_inc/default_cfe_msg_hdr_pri.h index d422106db..0e8558d5d 100644 --- a/modules/msg/mission_inc/default_cfe_msg_hdr_pri.h +++ b/modules/msg/mission_inc/default_cfe_msg_hdr_pri.h @@ -54,14 +54,23 @@ typedef struct CCSDS_PrimaryHeader_t Pri; /**< \brief CCSDS Primary Header */ } CCSDS_SpacePacket_t; +/** + * \brief cFS generic base message + */ +typedef union +{ + CCSDS_SpacePacket_t CCSDS; /**< \brief CCSDS Header (Pri or Pri + Ext) */ + uint8 Byte[sizeof(CCSDS_SpacePacket_t)]; /**< \brief Byte level access */ +} CFE_MSG_Message_t; + /** * \brief cFS command header */ typedef struct { - CCSDS_SpacePacket_t CCSDS; /**< \brief CCSDS header */ - CFE_MSG_CommandSecondaryHeader_t Sec; /**< \brief Secondary header */ + CFE_MSG_Message_t Msg; /**< \brief Base message */ + CFE_MSG_CommandSecondaryHeader_t Sec; /**< \brief Secondary header */ } CFE_MSG_CommandHeader_t; @@ -71,19 +80,9 @@ typedef struct typedef struct { - CCSDS_SpacePacket_t CCSDS; /**< \brief CCSDS header */ - CFE_MSG_TelemetrySecondaryHeader_t Sec; /**< \brief Secondary header */ + CFE_MSG_Message_t Msg; /**< \brief Base message */ + CFE_MSG_TelemetrySecondaryHeader_t Sec; /**< \brief Secondary header */ } CFE_MSG_TelemetryHeader_t; -/** - * \brief cFS Generic packet header - */ -typedef union -{ - CCSDS_SpacePacket_t CCSDS; /**< \brief CCSDS Header (Pri or Pri + Ext) */ - uint32 Align; /**< \brief Force 32-bit alignment */ - uint8 Byte[sizeof(CCSDS_SpacePacket_t)]; /**< \brief Byte level access */ -} CFE_MSG_Message_t; - #endif /* _cfe_msg_hdr_ */ diff --git a/modules/msg/mission_inc/default_cfe_msg_hdr_priext.h b/modules/msg/mission_inc/default_cfe_msg_hdr_priext.h index 652925269..aa401bd8b 100644 --- a/modules/msg/mission_inc/default_cfe_msg_hdr_priext.h +++ b/modules/msg/mission_inc/default_cfe_msg_hdr_priext.h @@ -55,14 +55,23 @@ typedef struct CCSDS_ExtendedHeader_t Ext; /**< \brief CCSDS Extended Header */ } CCSDS_SpacePacket_t; +/** + * \brief cFS generic base message + */ +typedef union +{ + CCSDS_SpacePacket_t CCSDS; /**< \brief CCSDS Header (Pri or Pri + Ext) */ + uint8 Byte[sizeof(CCSDS_SpacePacket_t)]; /**< \brief Byte level access */ +} CFE_MSG_Message_t; + /** * \brief cFS command header */ typedef struct { - CCSDS_SpacePacket_t CCSDS; /**< \brief CCSDS header */ - CFE_MSG_CommandSecondaryHeader_t Sec; /**< \brief Secondary header */ + CFE_MSG_Message_t Msg; /**< \brief Base message */ + CFE_MSG_CommandSecondaryHeader_t Sec; /**< \brief Secondary header */ } CFE_MSG_CommandHeader_t; @@ -72,19 +81,9 @@ typedef struct typedef struct { - CCSDS_SpacePacket_t CCSDS; /**< \brief CCSDS header */ - CFE_MSG_TelemetrySecondaryHeader_t Sec; /**< \brief Secondary header */ + CFE_MSG_Message_t Msg; /**< \brief Base message */ + CFE_MSG_TelemetrySecondaryHeader_t Sec; /**< \brief Secondary header */ } CFE_MSG_TelemetryHeader_t; -/** - * \brief cFS Generic packet header - */ -typedef union -{ - CCSDS_SpacePacket_t CCSDS; /**< \brief CCSDS Header (Pri or Pri + Ext) */ - uint32 Align; /**< \brief Force 32-bit alignment */ - uint8 Byte[sizeof(CCSDS_SpacePacket_t)]; /**< \brief Byte level access */ -} CFE_MSG_Message_t; - #endif /* _cfe_msg_hdr_ */ diff --git a/modules/msg/unit-test-coverage/test_cfe_msg_checksum.c b/modules/msg/unit-test-coverage/test_cfe_msg_checksum.c index b4bdfe7f0..304b171df 100644 --- a/modules/msg/unit-test-coverage/test_cfe_msg_checksum.c +++ b/modules/msg/unit-test-coverage/test_cfe_msg_checksum.c @@ -36,9 +36,9 @@ void Test_MSG_Checksum(void) { - CFE_SB_CmdHdr_t cmd; - CFE_MSG_Message_t *msgptr = (CFE_MSG_Message_t *)&cmd; - bool actual; + CFE_MSG_CommandHeader_t cmd; + CFE_MSG_Message_t *msgptr = &cmd.Msg; + bool actual; UtPrintf("Bad parameter tests, Null pointers"); memset(&cmd, 0, sizeof(cmd)); diff --git a/modules/msg/unit-test-coverage/test_cfe_msg_fc.c b/modules/msg/unit-test-coverage/test_cfe_msg_fc.c index 56f6c851d..664fa4b1e 100644 --- a/modules/msg/unit-test-coverage/test_cfe_msg_fc.c +++ b/modules/msg/unit-test-coverage/test_cfe_msg_fc.c @@ -41,11 +41,11 @@ void Test_MSG_FcnCode(void) { - CFE_SB_CmdHdr_t cmd; - CFE_MSG_Message_t *msgptr = (CFE_MSG_Message_t *)&cmd; - CFE_MSG_FcnCode_t input[] = {0, TEST_FCNCODE_MAX / 2, TEST_FCNCODE_MAX}; - CFE_MSG_FcnCode_t actual = TEST_FCNCODE_MAX; - int i; + CFE_MSG_CommandHeader_t cmd; + CFE_MSG_Message_t *msgptr = &cmd.Msg; + CFE_MSG_FcnCode_t input[] = {0, TEST_FCNCODE_MAX / 2, TEST_FCNCODE_MAX}; + CFE_MSG_FcnCode_t actual = TEST_FCNCODE_MAX; + int i; UtPrintf("Bad parameter tests, Null pointers, invalid (max valid + 1, max)"); memset(&cmd, 0, sizeof(cmd)); diff --git a/modules/msg/unit-test-coverage/test_cfe_msg_time.c b/modules/msg/unit-test-coverage/test_cfe_msg_time.c index c3ca7e312..cb57d372f 100644 --- a/modules/msg/unit-test-coverage/test_cfe_msg_time.c +++ b/modules/msg/unit-test-coverage/test_cfe_msg_time.c @@ -36,11 +36,11 @@ void Test_MSG_Time(void) { - CFE_SB_TlmHdr_t tlm; - CFE_MSG_Message_t *msgptr = (CFE_MSG_Message_t *)&tlm; - CFE_TIME_SysTime_t input[] = {{0, 0}, {0x12345678, 0xABCDEF12}, {0xFFFFFFFF, 0xFFFFFFFF}}; - CFE_TIME_SysTime_t actual = {0xFFFFFFFF, 0xFFFFFFFF}; - int i; + CFE_MSG_TelemetryHeader_t tlm; + CFE_MSG_Message_t *msgptr = &tlm.Msg; + CFE_TIME_SysTime_t input[] = {{0, 0}, {0x12345678, 0xABCDEF12}, {0xFFFFFFFF, 0xFFFFFFFF}}; + CFE_TIME_SysTime_t actual = {0xFFFFFFFF, 0xFFFFFFFF}; + int i; UtPrintf("Bad parameter tests, Null pointers, no secondary header"); memset(&tlm, 0, sizeof(tlm));