diff --git a/fsw/platform_inc/sch_platform_cfg.h b/fsw/platform_inc/sch_platform_cfg.h index 9ac2fc6..0f686cc 100644 --- a/fsw/platform_inc/sch_platform_cfg.h +++ b/fsw/platform_inc/sch_platform_cfg.h @@ -94,9 +94,9 @@ ** Dictates the maximum message ID that can be used in the Message Definition Table. ** ** \par Limits -** Must be less than or equal to #CFE_SB_HIGHEST_VALID_MSGID and greater than SCH_MDT_MIN_MSG_ID +** Must be less than or equal to #CFE_PLATFORM_SB_HIGHEST_VALID_MSGID and greater than SCH_MDT_MIN_MSG_ID */ -#define SCH_MDT_MAX_MSG_ID CFE_SB_HIGHEST_VALID_MSGID +#define SCH_MDT_MAX_MSG_ID CFE_PLATFORM_SB_HIGHEST_VALID_MSGID /** @@ -260,7 +260,7 @@ ** the #OS_MAX_PATH_LEN value. */ -#define SCH_SCHEDULE_FILENAME "/cf/apps/sch_def_schtbl.tbl" +#define SCH_SCHEDULE_FILENAME "/cf/sch_def_schtbl.tbl" /** @@ -275,7 +275,7 @@ ** the #OS_MAX_PATH_LEN value. */ -#define SCH_MESSAGE_FILENAME "/cf/apps/sch_def_msgtbl.tbl" +#define SCH_MESSAGE_FILENAME "/cf/sch_def_msgtbl.tbl" /** \schcfg Mission specific version number for SCH application diff --git a/fsw/public_inc/sch_api.h b/fsw/public_inc/sch_api.h index 4e07f80..8eaac3a 100644 --- a/fsw/public_inc/sch_api.h +++ b/fsw/public_inc/sch_api.h @@ -69,20 +69,20 @@ void SCH_DisableProcessing(void); ** \brief Obtains SCH Application processing state ** ** \par Description -** This API returns a TRUE/FALSE indication as to whether the SCH Application +** This API returns a true/false indication as to whether the SCH Application ** is allowed to process the contents of the Schedule table. ** ** \par Assumptions, External Events, and Notes: ** None ** ** \returns -** \retcode #TRUE \retdesc Schedule Table Processing is Enabled \endcode -** \retcode #FALSE \retdesc Schedule Table Processing is Disabled \endcode +** \retcode #true \retdesc Schedule Table Processing is Enabled \endcode +** \retcode #false \retdesc Schedule Table Processing is Disabled \endcode ** \endreturns ** ** ******************************************************************************/ -boolean SCH_GetProcessingState(void); +bool SCH_GetProcessingState(void); #endif /* _sch_api_ */ diff --git a/fsw/src/sch_api.c b/fsw/src/sch_api.c index 7235761..8697157 100644 --- a/fsw/src/sch_api.c +++ b/fsw/src/sch_api.c @@ -79,7 +79,7 @@ void SCH_DisableProcessing(void) ** ** NOTE: For complete prolog information, see 'sch_api.h'. ********************************************************************/ -boolean SCH_GetProcessingState(void) +bool SCH_GetProcessingState(void) { return (SCH_LibData.ProcessingDisabledCtr == 0); } diff --git a/fsw/src/sch_apipriv.h b/fsw/src/sch_apipriv.h index efc367f..a765f0f 100644 --- a/fsw/src/sch_apipriv.h +++ b/fsw/src/sch_apipriv.h @@ -102,7 +102,7 @@ void SCH_DisableProcessing(void); ** None ** *************************************************************************/ -boolean SCH_GetProcessingState(void); +bool SCH_GetProcessingState(void); #endif /* _sch_apipriv_ */ diff --git a/fsw/src/sch_app.c b/fsw/src/sch_app.c index 3b3b6e4..6ab1421 100644 --- a/fsw/src/sch_app.c +++ b/fsw/src/sch_app.c @@ -43,7 +43,7 @@ #include "cfe_time_msg.h" #include "sch_verify.h" -#include "cfe_platform_cfg.h" /* for CFE_SB_HIGHEST_VALID_MSGID */ +#include "cfe_platform_cfg.h" /* for CFE_PLATFORM_SB_HIGHEST_VALID_MSGID */ /************************************************************************* ** @@ -122,7 +122,7 @@ SCH_AppData_t SCH_AppData; void SCH_AppMain(void) { int32 Status = CFE_SUCCESS; - uint32 RunStatus = CFE_ES_APP_RUN; + uint32 RunStatus = CFE_ES_RunStatus_APP_RUN; /* ** Performance Log (start time counter) @@ -148,7 +148,7 @@ void SCH_AppMain(void) Status = SCH_CustomLateInit(); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(SCH_MAJOR_FRAME_SUB_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_MAJOR_FRAME_SUB_ERR_EID, CFE_EVS_ERROR_BIT, "Error initializing Timers (RC=0x%08X)", (unsigned int)Status); } @@ -162,7 +162,7 @@ void SCH_AppMain(void) /* ** Set request to terminate main loop */ - RunStatus = CFE_ES_APP_ERROR; + RunStatus = CFE_ES_RunStatus_APP_ERROR; } /* @@ -188,19 +188,19 @@ void SCH_AppMain(void) /* ** Report if during the previous frame the major has determined to be unstable */ - if (SCH_AppData.IgnoreMajorFrame == TRUE) + if (SCH_AppData.IgnoreMajorFrame == true) { - if (SCH_AppData.IgnoreMajorFrameMsgSent == FALSE) + if (SCH_AppData.IgnoreMajorFrameMsgSent == false) { - CFE_EVS_SendEvent(SCH_NOISY_MAJOR_FRAME_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_NOISY_MAJOR_FRAME_ERR_EID, CFE_EVS_ERROR_BIT, "Major Frame Sync too noisy (Slot %d). Disabling synchronization.", SCH_AppData.MinorFramesSinceTone); - SCH_AppData.IgnoreMajorFrameMsgSent = TRUE; + SCH_AppData.IgnoreMajorFrameMsgSent = true; } } else { - SCH_AppData.IgnoreMajorFrameMsgSent = FALSE; + SCH_AppData.IgnoreMajorFrameMsgSent = false; } /* @@ -208,7 +208,7 @@ void SCH_AppMain(void) */ #if SCH_LIB_PRESENCE == 1 if ((Status == OS_SUCCESS) && - (SCH_GetProcessingState() == TRUE)) + (SCH_GetProcessingState() == true)) { Status = SCH_ProcessScheduleTable(); } @@ -229,7 +229,7 @@ void SCH_AppMain(void) /* ** Set request to terminate main loop */ - RunStatus = CFE_ES_APP_ERROR; + RunStatus = CFE_ES_RunStatus_APP_ERROR; } } /* End of while */ @@ -242,7 +242,7 @@ void SCH_AppMain(void) /* ** Send an event describing the reason for the termination */ - CFE_EVS_SendEvent(SCH_APP_EXIT_EID, CFE_EVS_CRITICAL, + CFE_EVS_SendEvent(SCH_APP_EXIT_EID, CFE_EVS_CRITICAL_BIT, "SCH App: terminating, err = 0x%08X", (unsigned int)Status); /* @@ -343,7 +343,7 @@ int32 SCH_AppInit(void) ** Application startup event message */ Status = CFE_EVS_SendEvent(SCH_INITSTATS_INF_EID, - CFE_EVS_INFORMATION, + CFE_EVS_INFORMATION_BIT, "SCH Initialized. Version %d.%d.%d.%d", SCH_MAJOR_VERSION, SCH_MINOR_VERSION, @@ -384,7 +384,7 @@ int32 SCH_EvsInit(void) /* ** Register for event services */ - Status = CFE_EVS_Register(SCH_AppData.EventFilters, SCH_FILTER_COUNT, CFE_EVS_BINARY_FILTER); + Status = CFE_EVS_Register(SCH_AppData.EventFilters, SCH_FILTER_COUNT, CFE_EVS_NO_FILTER); if (Status != CFE_SUCCESS) { CFE_ES_WriteToSysLog("SCH App: Error Registering For Event Services, RC=0x%08X\n", (unsigned int)Status); @@ -406,18 +406,18 @@ int32 SCH_SbInit(void) { int32 Status = CFE_SUCCESS; - SCH_AppData.MsgPtr = (CFE_SB_MsgPtr_t) NULL; + SCH_AppData.MsgPtr = NULL; SCH_AppData.CmdPipe = 0; /* ** Initialize housekeeping packet (clear user data area) */ - CFE_SB_InitMsg(&SCH_AppData.HkPacket, SCH_HK_TLM_MID, sizeof(SCH_HkPacket_t), TRUE); + CFE_SB_InitMsg(&SCH_AppData.HkPacket, SCH_HK_TLM_MID, sizeof(SCH_HkPacket_t), true); /* ** Initialize diagnostic packet (clear user data area) */ - CFE_SB_InitMsg(&SCH_AppData.DiagPacket, SCH_DIAG_TLM_MID, sizeof(SCH_DiagPacket_t), TRUE); + CFE_SB_InitMsg(&SCH_AppData.DiagPacket, SCH_DIAG_TLM_MID, sizeof(SCH_DiagPacket_t), true); /* ** Create Software Bus message pipe @@ -425,7 +425,7 @@ int32 SCH_SbInit(void) Status = CFE_SB_CreatePipe(&SCH_AppData.CmdPipe, SCH_PIPE_DEPTH, SCH_PIPE_NAME); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(SCH_CR_PIPE_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_CR_PIPE_ERR_EID, CFE_EVS_ERROR_BIT, "Error Creating SB Pipe, RC=0x%08X", (unsigned int)Status); return(Status); } @@ -436,7 +436,7 @@ int32 SCH_SbInit(void) Status = CFE_SB_Subscribe(SCH_SEND_HK_MID, SCH_AppData.CmdPipe); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(SCH_SUB_HK_REQ_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_SUB_HK_REQ_ERR_EID, CFE_EVS_ERROR_BIT, "Error Subscribing to HK Request(MID=0x%04X), RC=0x%08X", SCH_SEND_HK_MID, (unsigned int)Status); return(Status); @@ -448,7 +448,7 @@ int32 SCH_SbInit(void) Status = CFE_SB_Subscribe(SCH_CMD_MID, SCH_AppData.CmdPipe); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(SCH_SUB_GND_CMD_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_SUB_GND_CMD_ERR_EID, CFE_EVS_ERROR_BIT, "Error Subscribing to GND CMD(MID=0x%04X), RC=0x%08X", SCH_CMD_MID, (unsigned int)Status); return(Status); @@ -498,7 +498,7 @@ int32 SCH_TblInit(void) if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(SCH_SDT_REG_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_SDT_REG_ERR_EID, CFE_EVS_ERROR_BIT, "Error Registering SDT, RC=0x%08X", (unsigned int)Status); return(Status); @@ -517,7 +517,7 @@ int32 SCH_TblInit(void) if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(SCH_MDT_REG_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_MDT_REG_ERR_EID, CFE_EVS_ERROR_BIT, "Error Registering MDT, RC=0x%08X", (unsigned int)Status); return(Status); @@ -532,7 +532,7 @@ int32 SCH_TblInit(void) if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(SCH_SDT_LOAD_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_SDT_LOAD_ERR_EID, CFE_EVS_ERROR_BIT, "Error (RC=0x%08X) Loading SDT with %s", (unsigned int)Status, SCH_SCHEDULE_FILENAME); return(Status); @@ -547,7 +547,7 @@ int32 SCH_TblInit(void) if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(SCH_MDT_LOAD_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_MDT_LOAD_ERR_EID, CFE_EVS_ERROR_BIT, "Error (RC=0x%08X) Loading MDT with %s", (unsigned int)Status, SCH_MESSAGE_FILENAME); return(Status); @@ -561,7 +561,7 @@ int32 SCH_TblInit(void) if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(SCH_ACQ_PTR_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_ACQ_PTR_ERR_EID, CFE_EVS_ERROR_BIT, "Error Acquiring Tbl Ptrs (RC=0x%08X)", (unsigned int)Status); return(Status); @@ -587,9 +587,9 @@ int32 SCH_TimerInit(void) ** Start off assuming Major Frame synch is normal ** and should be coming at any moment */ - SCH_AppData.IgnoreMajorFrame = FALSE; - SCH_AppData.IgnoreMajorFrameMsgSent = FALSE; - SCH_AppData.UnexpectedMajorFrame = FALSE; + SCH_AppData.IgnoreMajorFrame = false; + SCH_AppData.IgnoreMajorFrameMsgSent = false; + SCH_AppData.UnexpectedMajorFrame = false; SCH_AppData.SyncToMET = SCH_NOT_SYNCHRONIZED; SCH_AppData.MajorFrameSource = SCH_MAJOR_FS_NONE; SCH_AppData.NextSlotNumber = 0; @@ -613,7 +613,7 @@ int32 SCH_TimerInit(void) if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(SCH_MINOR_FRAME_TIMER_CREATE_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_MINOR_FRAME_TIMER_CREATE_ERR_EID, CFE_EVS_ERROR_BIT, "Error creating Timer (RC=0x%08X)", (unsigned int)Status); return(Status); @@ -624,7 +624,7 @@ int32 SCH_TimerInit(void) */ if (SCH_AppData.ClockAccuracy > SCH_WORST_CLOCK_ACCURACY) { - CFE_EVS_SendEvent(SCH_MINOR_FRAME_TIMER_ACC_WARN_EID, CFE_EVS_INFORMATION, + CFE_EVS_SendEvent(SCH_MINOR_FRAME_TIMER_ACC_WARN_EID, CFE_EVS_INFORMATION_BIT, "OS Timer Accuracy (%d > reqd %d usec) requires Minor Frame MET sync", (int)SCH_AppData.ClockAccuracy, SCH_WORST_CLOCK_ACCURACY); @@ -641,7 +641,7 @@ int32 SCH_TimerInit(void) Status = OS_BinSemCreate(&SCH_AppData.TimeSemaphore, SCH_SEM_NAME, SCH_SEM_VALUE, SCH_SEM_OPTIONS); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(SCH_SEM_CREATE_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_SEM_CREATE_ERR_EID, CFE_EVS_ERROR_BIT, "Error creating Main Loop Timing Semaphore (RC=0x%08X)", (unsigned int)Status); return(Status); @@ -732,7 +732,7 @@ int32 SCH_ProcessScheduleTable(void) { SCH_AppData.SameSlotCount++; - CFE_EVS_SendEvent(SCH_SAME_SLOT_EID, CFE_EVS_DEBUG, + CFE_EVS_SendEvent(SCH_SAME_SLOT_EID, CFE_EVS_DEBUG_BIT, "Slot did not increment: slot = %d", (int)CurrentSlot); ProcessCount = 0; @@ -745,7 +745,7 @@ int32 SCH_ProcessScheduleTable(void) { SCH_AppData.SkippedSlotsCount++; - CFE_EVS_SendEvent(SCH_SKIPPED_SLOTS_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_SKIPPED_SLOTS_EID, CFE_EVS_ERROR_BIT, "Slots skipped: slot = %d, count = %d", SCH_AppData.NextSlotNumber, (int)(ProcessCount - 1)); @@ -792,7 +792,7 @@ int32 SCH_ProcessScheduleTable(void) /* Generate an event message if not syncing to MET or when there is more than two being processed */ if ((ProcessCount > SCH_AppData.WorstCaseSlotsPerMinorFrame) || (SCH_AppData.SyncToMET == SCH_NOT_SYNCHRONIZED)) { - CFE_EVS_SendEvent(SCH_MULTI_SLOTS_EID, CFE_EVS_INFORMATION, + CFE_EVS_SendEvent(SCH_MULTI_SLOTS_EID, CFE_EVS_INFORMATION_BIT, "Multiple slots processed: slot = %d, count = %d", SCH_AppData.NextSlotNumber, (int)ProcessCount); } @@ -903,11 +903,11 @@ void SCH_ProcessNextEntry(SCH_ScheduleEntry_t *NextEntry, int32 EntryNumber) /* ** Too much data for just one event */ - CFE_EVS_SendEvent(SCH_CORRUPTION_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_CORRUPTION_EID, CFE_EVS_ERROR_BIT, "Corrupt data error (1): slot = %d, entry = %d", SCH_AppData.NextSlotNumber, (int)EntryNumber); - CFE_EVS_SendEvent(SCH_CORRUPTION_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_CORRUPTION_EID, CFE_EVS_ERROR_BIT, "Corrupt data error (2): msg = %d, freq = %d, type = %d, rem = %d", NextEntry->MessageIndex, NextEntry->Frequency, @@ -930,7 +930,7 @@ void SCH_ProcessNextEntry(SCH_ScheduleEntry_t *NextEntry, int32 EntryNumber) if (Remainder == NextEntry->Remainder) { Message = SCH_AppData.MessageTable[NextEntry->MessageIndex].MessageBuffer; - Status = CFE_SB_SendMsg((CFE_SB_Msg_t *) Message); + Status = CFE_SB_SendMsg((CFE_MSG_Message_t *) Message); /* If additional activity types are added in the future, a switch statement */ /* would be useful, as shown below: */ @@ -941,7 +941,7 @@ void SCH_ProcessNextEntry(SCH_ScheduleEntry_t *NextEntry, int32 EntryNumber) * { * case SCH_ACTIVITY_SEND_MSG: * Message = SCH_AppData.MessageTable[NextEntry->MessageIndex].MessageBuffer; - * Status = CFE_SB_SendMsg((CFE_SB_Msg_t *) Message); + * Status = CFE_SB_SendMsg((CFE_MSG_Message_t *) Message); * break; * * default: @@ -957,7 +957,7 @@ void SCH_ProcessNextEntry(SCH_ScheduleEntry_t *NextEntry, int32 EntryNumber) { SCH_AppData.ScheduleActivityFailureCount++; - CFE_EVS_SendEvent(SCH_PACKET_SEND_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_PACKET_SEND_EID, CFE_EVS_ERROR_BIT, "Activity error: slot = %d, entry = %d, err = 0x%08X", SCH_AppData.NextSlotNumber, (int)EntryNumber, (unsigned int)Status); } @@ -989,7 +989,7 @@ int32 SCH_ProcessCommands(void) if (Status == CFE_SUCCESS) { - Status = SCH_AppPipe(SCH_AppData.MsgPtr); + Status = SCH_AppPipe(&SCH_AppData.MsgPtr->Msg); } } @@ -1118,7 +1118,7 @@ int32 SCH_ValidateScheduleData(void *TableData) { TableResult = EntryResult; - CFE_EVS_SendEvent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR_BIT, "Schedule tbl verify error - idx[%d] ena[%d] typ[%d] fre[%d] rem[%d] msg[%d] grp[0x%08X]", (int)TableIndex, EnableState, Type, Frequency, Remainder, MessageIndex, (unsigned int)GroupData); } @@ -1127,7 +1127,7 @@ int32 SCH_ValidateScheduleData(void *TableData) /* ** Send event describing results */ - CFE_EVS_SendEvent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG, + CFE_EVS_SendEvent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Schedule table verify results -- good[%d] bad[%d] unused[%d]", (int)GoodCount, (int)BadCount, (int)UnusedCount); /* @@ -1237,7 +1237,7 @@ int32 SCH_ValidateMessageData(void *TableData) { TableResult = EntryResult; - CFE_EVS_SendEvent(SCH_MESSAGE_TBL_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_MESSAGE_TBL_ERR_EID, CFE_EVS_ERROR_BIT, "Message tbl verify err - idx[%d] mid[0x%X] len[%d] buf[%d]", (int)TableIndex, MessageID, MessageLength, (int)BufferIndex); } @@ -1246,7 +1246,7 @@ int32 SCH_ValidateMessageData(void *TableData) /* ** Send event describing results */ - CFE_EVS_SendEvent(SCH_MESSAGE_TABLE_EID, CFE_EVS_DEBUG, + CFE_EVS_SendEvent(SCH_MESSAGE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Message tbl verify results - good[%d] bad[%d] unused[%d]", (int)GoodCount, (int)BadCount, (int)UnusedCount); /* diff --git a/fsw/src/sch_app.h b/fsw/src/sch_app.h index ed509e6..51e0095 100644 --- a/fsw/src/sch_app.h +++ b/fsw/src/sch_app.h @@ -137,7 +137,7 @@ typedef struct /* ** Operational data */ - CFE_SB_MsgPtr_t MsgPtr; /**< \brief Ptr to most recently received cmd message */ + CFE_SB_Buffer_t *MsgPtr; /**< \brief Ptr to most recently received cmd message */ CFE_SB_PipeId_t CmdPipe; /**< \brief Pipe ID for SCH Command Pipe */ SCH_MessageEntry_t *MessageTable; /**< \brief Ptr to Message Table contents */ @@ -227,9 +227,9 @@ typedef struct uint16 LastSyncMETSlot; /**< \brief MET Slot # where Time Sync last occurred */ uint16 SyncAttemptsLeft; /**< \brief Timeout counter used when syncing Major Frame to MET */ - boolean IgnoreMajorFrame; /**< \brief Major Frame too noisy to trust */ - boolean IgnoreMajorFrameMsgSent; /**< \brief Major Frame Event Message has been sent */ - boolean UnexpectedMajorFrame; /**< \brief Major Frame signal was unexpected */ + bool IgnoreMajorFrame; /**< \brief Major Frame too noisy to trust */ + bool IgnoreMajorFrameMsgSent; /**< \brief Major Frame Event Message has been sent */ + bool UnexpectedMajorFrame; /**< \brief Major Frame signal was unexpected */ } SCH_AppData_t; diff --git a/fsw/src/sch_cmds.c b/fsw/src/sch_cmds.c index bcc641b..bd72145 100644 --- a/fsw/src/sch_cmds.c +++ b/fsw/src/sch_cmds.c @@ -63,7 +63,7 @@ extern SCH_AppData_t SCH_AppData; ** NOTE: For complete prolog information, see 'sch_cmds.h' ********************************************************************/ -int32 SCH_AppPipe(CFE_SB_MsgPtr_t MessagePtr) +int32 SCH_AppPipe(CFE_MSG_Message_t* MessagePtr) { int32 Result = CFE_SUCCESS; CFE_SB_MsgId_t MessageID = 0; @@ -123,7 +123,7 @@ int32 SCH_AppPipe(CFE_SB_MsgPtr_t MessagePtr) ** SCH ground commands with unknown command codes... */ default: - CFE_EVS_SendEvent(SCH_CC_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_CC_ERR_EID, CFE_EVS_ERROR_BIT, "Invalid command code: ID = 0x%04X, CC = %d", MessageID, CommandCode); @@ -136,7 +136,7 @@ int32 SCH_AppPipe(CFE_SB_MsgPtr_t MessagePtr) ** Unknown message ID's */ default: - CFE_EVS_SendEvent(SCH_MD_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_MD_ERR_EID, CFE_EVS_ERROR_BIT, "Msg with Invalid message ID Rcvd -- ID = 0x%04X", MessageID); break; @@ -189,8 +189,8 @@ int32 SCH_HousekeepingCmd(CFE_SB_MsgPtr_t MessagePtr) /* ** Timestamps and send housekeeping packet */ - CFE_SB_TimeStampMsg((CFE_SB_Msg_t *) &SCH_AppData.HkPacket); - CFE_SB_SendMsg((CFE_SB_Msg_t *) &SCH_AppData.HkPacket); + CFE_SB_TimeStampMsg((CFE_MSG_Message_t *) &SCH_AppData.HkPacket); + CFE_SB_SendMsg((CFE_MSG_Message_t *) &SCH_AppData.HkPacket); /* ** Reset "high rate" event filters @@ -239,7 +239,7 @@ void SCH_NoopCmd(CFE_SB_MsgPtr_t MessagePtr) */ SCH_AppData.CmdCounter++; - CFE_EVS_SendEvent(SCH_NOOP_CMD_EID, CFE_EVS_INFORMATION, + CFE_EVS_SendEvent(SCH_NOOP_CMD_EID, CFE_EVS_INFORMATION_BIT, "NO-op command. Version %d.%d.%d.%d", SCH_MAJOR_VERSION, SCH_MINOR_VERSION, @@ -289,7 +289,7 @@ void SCH_ResetCmd(CFE_SB_MsgPtr_t MessagePtr) SCH_AppData.MissedMajorFrameCount = 0; SCH_AppData.UnexpectedMajorFrameCount = 0; - CFE_EVS_SendEvent(SCH_RESET_CMD_EID, CFE_EVS_DEBUG, + CFE_EVS_SendEvent(SCH_RESET_CMD_EID, CFE_EVS_DEBUG_BIT, "RESET command"); } @@ -307,7 +307,7 @@ void SCH_ResetCmd(CFE_SB_MsgPtr_t MessagePtr) void SCH_EnableCmd(CFE_SB_MsgPtr_t MessagePtr) { - boolean GoodCommand = FALSE; + bool GoodCommand = false; SCH_EntryCmd_t *EnableCmd = NULL; uint16 SlotNumber = 0; uint16 EntryNumber = 0; @@ -329,7 +329,7 @@ void SCH_EnableCmd(CFE_SB_MsgPtr_t MessagePtr) /* ** Invalid command packet argument */ - CFE_EVS_SendEvent(SCH_ENABLE_CMD_ARG_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_ENABLE_CMD_ARG_ERR_EID, CFE_EVS_ERROR_BIT, "ENABLE cmd: invalid argument, slot=%d (<%d), entry=%d (<%d)", SlotNumber, SCH_TOTAL_SLOTS, EntryNumber, SCH_ENTRIES_PER_SLOT); @@ -340,7 +340,7 @@ void SCH_EnableCmd(CFE_SB_MsgPtr_t MessagePtr) /* ** Invalid schedule table enable state (unused or corrupt) */ - CFE_EVS_SendEvent(SCH_ENABLE_CMD_ENTRY_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_ENABLE_CMD_ENTRY_ERR_EID, CFE_EVS_ERROR_BIT, "ENABLE command: invalid state = %d, slot = %d, entry = %d", SCH_AppData.ScheduleTable[TableIndex].EnableState, SlotNumber, EntryNumber); @@ -350,12 +350,12 @@ void SCH_EnableCmd(CFE_SB_MsgPtr_t MessagePtr) /* ** Success */ - GoodCommand = TRUE; + GoodCommand = true; SCH_AppData.ScheduleTable[TableIndex].EnableState = SCH_ENABLED; CFE_TBL_Modified(SCH_AppData.ScheduleTableHandle); - CFE_EVS_SendEvent(SCH_ENABLE_CMD_EID, CFE_EVS_DEBUG, + CFE_EVS_SendEvent(SCH_ENABLE_CMD_EID, CFE_EVS_DEBUG_BIT, "ENABLE command: slot = %d, entry = %d", SlotNumber, EntryNumber ); } @@ -377,7 +377,7 @@ void SCH_EnableCmd(CFE_SB_MsgPtr_t MessagePtr) void SCH_DisableCmd(CFE_SB_MsgPtr_t MessagePtr) { - boolean GoodCommand = FALSE; + bool GoodCommand = false; SCH_EntryCmd_t *DisableCmd = NULL; uint16 SlotNumber = 0; uint16 EntryNumber = 0; @@ -399,7 +399,7 @@ void SCH_DisableCmd(CFE_SB_MsgPtr_t MessagePtr) /* ** Invalid command packet argument */ - CFE_EVS_SendEvent(SCH_DISABLE_CMD_ARG_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_DISABLE_CMD_ARG_ERR_EID, CFE_EVS_ERROR_BIT, "DISABLE cmd: invalid argument, slot=%d (<%d), entry=%d (<%d)", SlotNumber, SCH_TOTAL_SLOTS, EntryNumber, SCH_ENTRIES_PER_SLOT); @@ -410,7 +410,7 @@ void SCH_DisableCmd(CFE_SB_MsgPtr_t MessagePtr) /* ** Invalid schedule table enable state (unused or corrupt) */ - CFE_EVS_SendEvent(SCH_DISABLE_CMD_ENTRY_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_DISABLE_CMD_ENTRY_ERR_EID, CFE_EVS_ERROR_BIT, "DISABLE command: invalid state = %d, slot = %d, entry = %d", SCH_AppData.ScheduleTable[TableIndex].EnableState, SlotNumber, EntryNumber); @@ -420,12 +420,12 @@ void SCH_DisableCmd(CFE_SB_MsgPtr_t MessagePtr) /* ** Success */ - GoodCommand = TRUE; + GoodCommand = true; SCH_AppData.ScheduleTable[TableIndex].EnableState = SCH_DISABLED; CFE_TBL_Modified(SCH_AppData.ScheduleTableHandle); - CFE_EVS_SendEvent(SCH_DISABLE_CMD_EID, CFE_EVS_DEBUG, + CFE_EVS_SendEvent(SCH_DISABLE_CMD_EID, CFE_EVS_DEBUG_BIT, "DISABLE command: slot = %d, entry = %d", SlotNumber, EntryNumber); } @@ -447,7 +447,7 @@ void SCH_DisableCmd(CFE_SB_MsgPtr_t MessagePtr) void SCH_EnableGroupCmd(CFE_SB_MsgPtr_t MessagePtr) { - boolean GoodCommand = FALSE; + bool GoodCommand = false; uint32 TblGroupNumber = 0; uint32 TblMultiGroup = 0; int32 LoopCount = 0; @@ -473,7 +473,7 @@ void SCH_EnableGroupCmd(CFE_SB_MsgPtr_t MessagePtr) /* ** No groups selected */ - CFE_EVS_SendEvent(SCH_ENA_GRP_CMD_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_ENA_GRP_CMD_ERR_EID, CFE_EVS_ERROR_BIT, "ENABLE GROUP command: invalid argument, no groups selected"); } else @@ -508,14 +508,14 @@ void SCH_EnableGroupCmd(CFE_SB_MsgPtr_t MessagePtr) if (MatchCount > 0) { CFE_TBL_Modified(SCH_AppData.ScheduleTableHandle); - CFE_EVS_SendEvent(SCH_ENA_GRP_CMD_EID, CFE_EVS_DEBUG, + CFE_EVS_SendEvent(SCH_ENA_GRP_CMD_EID, CFE_EVS_DEBUG_BIT, "ENABLE GROUP command: match count = %d", (int)MatchCount); - GoodCommand = TRUE; + GoodCommand = true; } else { - CFE_EVS_SendEvent(SCH_ENA_GRP_NOT_FOUND_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_ENA_GRP_NOT_FOUND_ERR_EID, CFE_EVS_ERROR_BIT, "ENABLE GROUP command: Neither Group %d nor Multi-Group 0x%06X found", (int)(CmdGroupNumber>>24), (unsigned int)CmdMultiGroup); } @@ -538,7 +538,7 @@ void SCH_EnableGroupCmd(CFE_SB_MsgPtr_t MessagePtr) void SCH_DisableGroupCmd(CFE_SB_MsgPtr_t MessagePtr) { - boolean GoodCommand = FALSE; + bool GoodCommand = false; uint32 TblGroupNumber = 0; uint32 TblMultiGroup = 0; int32 LoopCount = 0; @@ -564,7 +564,7 @@ void SCH_DisableGroupCmd(CFE_SB_MsgPtr_t MessagePtr) /* ** No groups selected */ - CFE_EVS_SendEvent(SCH_DIS_GRP_CMD_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_DIS_GRP_CMD_ERR_EID, CFE_EVS_ERROR_BIT, "DISABLE GROUP command: invalid argument, no groups selected"); } else @@ -599,14 +599,14 @@ void SCH_DisableGroupCmd(CFE_SB_MsgPtr_t MessagePtr) if (MatchCount > 0) { CFE_TBL_Modified(SCH_AppData.ScheduleTableHandle); - CFE_EVS_SendEvent(SCH_DIS_GRP_CMD_EID, CFE_EVS_DEBUG, + CFE_EVS_SendEvent(SCH_DIS_GRP_CMD_EID, CFE_EVS_DEBUG_BIT, "DISABLE GROUP command: match count = %d", (int)MatchCount); - GoodCommand = TRUE; + GoodCommand = true; } else { - CFE_EVS_SendEvent(SCH_DIS_GRP_NOT_FOUND_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_DIS_GRP_NOT_FOUND_ERR_EID, CFE_EVS_ERROR_BIT, "DISABLE GROUP command: Neither Group %d nor Multi-Group 0x%06X found", (int)(CmdGroupNumber>>24), (unsigned int)CmdMultiGroup); } @@ -629,17 +629,17 @@ void SCH_DisableGroupCmd(CFE_SB_MsgPtr_t MessagePtr) void SCH_EnableSyncCmd(CFE_SB_MsgPtr_t MessagePtr) { - boolean GoodCommand = FALSE; + bool GoodCommand = false; if(SCH_VerifyCmdLength(MessagePtr, sizeof(SCH_NoArgsCmd_t)) == SCH_SUCCESS) { - GoodCommand = TRUE; + GoodCommand = true; - SCH_AppData.IgnoreMajorFrame = FALSE; - SCH_AppData.UnexpectedMajorFrame = FALSE; + SCH_AppData.IgnoreMajorFrame = false; + SCH_AppData.UnexpectedMajorFrame = false; SCH_AppData.ConsecutiveNoisyFrameCounter = 0; - CFE_EVS_SendEvent(SCH_ENA_SYNC_CMD_EID, CFE_EVS_DEBUG, + CFE_EVS_SendEvent(SCH_ENA_SYNC_CMD_EID, CFE_EVS_DEBUG_BIT, "Major Frame Synchronization Enabled"); } @@ -661,7 +661,7 @@ void SCH_EnableSyncCmd(CFE_SB_MsgPtr_t MessagePtr) void SCH_SendDiagTlmCmd(CFE_SB_MsgPtr_t MessagePtr) { - boolean GoodCommand = FALSE; + bool GoodCommand = false; uint32 TblIndex = 0; uint32 WordIndex = 0; uint32 BitIndex = 0; @@ -669,7 +669,7 @@ void SCH_SendDiagTlmCmd(CFE_SB_MsgPtr_t MessagePtr) if(SCH_VerifyCmdLength(MessagePtr, sizeof(SCH_NoArgsCmd_t)) == SCH_SUCCESS) { - GoodCommand = TRUE; + GoodCommand = true; /* Zero out the previous entry states */ CFE_PSP_MemSet(&SCH_AppData.DiagPacket.EntryStates[0], 0x0, SCH_NUM_STATUS_BYTES_REQD); @@ -700,10 +700,10 @@ void SCH_SendDiagTlmCmd(CFE_SB_MsgPtr_t MessagePtr) /* ** Timestamp and send diagnostic packet */ - CFE_SB_TimeStampMsg((CFE_SB_Msg_t *) &SCH_AppData.DiagPacket); - CFE_SB_SendMsg((CFE_SB_Msg_t *) &SCH_AppData.DiagPacket); + CFE_SB_TimeStampMsg((CFE_MSG_Message_t *) &SCH_AppData.DiagPacket); + CFE_SB_SendMsg((CFE_MSG_Message_t *) &SCH_AppData.DiagPacket); - CFE_EVS_SendEvent(SCH_SEND_DIAG_CMD_EID, CFE_EVS_DEBUG, + CFE_EVS_SendEvent(SCH_SEND_DIAG_CMD_EID, CFE_EVS_DEBUG_BIT, "Transmitting Diagnostic Message"); } @@ -784,7 +784,7 @@ int32 SCH_VerifyCmdLength (CFE_SB_MsgPtr_t MessagePtr, uint32 ExpectedLength) MessageID = CFE_SB_GetMsgId(MessagePtr); CommandCode = CFE_SB_GetCmdCode(MessagePtr); - CFE_EVS_SendEvent(SCH_CMD_LEN_ERR_EID, CFE_EVS_ERROR, + CFE_EVS_SendEvent(SCH_CMD_LEN_ERR_EID, CFE_EVS_ERROR_BIT, "Cmd Msg with Bad length Rcvd: ID = 0x%04X, CC = %d, Exp Len = %d, Len = %d", MessageID, CommandCode, (int)ExpectedLength, ActualLength); @@ -803,7 +803,7 @@ int32 SCH_VerifyCmdLength (CFE_SB_MsgPtr_t MessagePtr, uint32 ExpectedLength) ** NOTE: For complete prolog information, see above ********************************************************************/ -void SCH_PostCommandResult(boolean GoodCommand) +void SCH_PostCommandResult(bool GoodCommand) { if (GoodCommand) { diff --git a/fsw/src/sch_cmds.h b/fsw/src/sch_cmds.h index e0efdc2..9226351 100644 --- a/fsw/src/sch_cmds.h +++ b/fsw/src/sch_cmds.h @@ -76,7 +76,7 @@ ** \sa #CFE_SB_RcvMsg ** *************************************************************************/ -int32 SCH_AppPipe(CFE_SB_MsgPtr_t MessagePtr); +int32 SCH_AppPipe(CFE_MSG_Message_t *MessagePtr); /************************************************************************/ /** \brief Manages Scheduler's Schedule and Message Definition Tables @@ -277,11 +277,11 @@ void SCH_SendDiagTlmCmd(CFE_SB_MsgPtr_t MessagePtr); ** None ** ** \param [in] GoodCommand Indicates the command was successfully -** performed (=TRUE) or contained an error -** (=FALSE). +** performed (=true) or contained an error +** (=false). ** *************************************************************************/ -void SCH_PostCommandResult(boolean GoodCommand); +void SCH_PostCommandResult(bool GoodCommand); /************************************************************************/ /** \brief Verifies the length of the specified message diff --git a/fsw/src/sch_custom.c b/fsw/src/sch_custom.c index ab8d72c..662cb52 100644 --- a/fsw/src/sch_custom.c +++ b/fsw/src/sch_custom.c @@ -265,7 +265,7 @@ void SCH_MajorFrameCallback(void) ** of noisy major frames. Also, indicate in telemetry that this particular ** Major Frame signal is considered noisy. */ - SCH_AppData.UnexpectedMajorFrame = TRUE; + SCH_AppData.UnexpectedMajorFrame = true; SCH_AppData.UnexpectedMajorFrameCount++; /* @@ -281,20 +281,20 @@ void SCH_MajorFrameCallback(void) */ if (SCH_AppData.ConsecutiveNoisyFrameCounter >= SCH_MAX_NOISY_MAJORF) { - SCH_AppData.IgnoreMajorFrame = TRUE; + SCH_AppData.IgnoreMajorFrame = true; } } } else /* Major Frame occurred when expected */ { - SCH_AppData.UnexpectedMajorFrame = FALSE; + SCH_AppData.UnexpectedMajorFrame = false; SCH_AppData.ConsecutiveNoisyFrameCounter = 0; } /* ** Ignore this callback if SCH has detected a noisy Major Frame Synch signal */ - if (SCH_AppData.IgnoreMajorFrame == FALSE) + if (SCH_AppData.IgnoreMajorFrame == false) { /* ** Stop Minor Frame Timer (which should be waiting for an unusually long diff --git a/fsw/src/sch_msg.h b/fsw/src/sch_msg.h index 8f5fb25..3d2a134 100644 --- a/fsw/src/sch_msg.h +++ b/fsw/src/sch_msg.h @@ -208,10 +208,10 @@ typedef struct uint16 LastSyncMETSlot; /**< \schtlmmnemonic \SCH_LASTSYNCMETSLOT \brief Slot number where Time Sync last occurred \details \ref SCHHK_LastSyncMETSlot "Click for more" */ - boolean IgnoreMajorFrame; /**< \schtlmmnemonic \SCH_IGNOREMF + bool IgnoreMajorFrame; /**< \schtlmmnemonic \SCH_IGNOREMF \brief Major Frame too noisy to trust \details \ref SCHHK_IgnoreMajorFrame "Click for more" */ - boolean UnexpectedMajorFrame; /**< \schtlmmnemonic \SCH_UNEXPCTDMAJORFRAME + bool UnexpectedMajorFrame; /**< \schtlmmnemonic \SCH_UNEXPCTDMAJORFRAME \brief Most Recent Major Frame signal was unexpected \details \ref SCHHK_UnexpectedMajorFrame "Click for more" */ } SCH_HkPacket_t; diff --git a/fsw/src/sch_verify.h b/fsw/src/sch_verify.h index 1b66a51..d449339 100644 --- a/fsw/src/sch_verify.h +++ b/fsw/src/sch_verify.h @@ -45,8 +45,8 @@ #error SCH_MDT_MAX_MSG_ID must be at least SCH_MDT_MIN_MSG_ID. #endif -#if SCH_MDT_MAX_MSG_ID > CFE_SB_HIGHEST_VALID_MSGID - #error SCH_MDT_MAX_MSG_ID must be less than or equal to CFE_SB_HIGHEST_VALID_MSGID. +#if SCH_MDT_MAX_MSG_ID > CFE_PLATFORM_SB_HIGHEST_VALID_MSGID + #error SCH_MDT_MAX_MSG_ID must be less than or equal to CFE_PLATFORM_SB_HIGHEST_VALID_MSGID. #endif #if SCH_MAX_LAG_COUNT < 1 diff --git a/fsw/unit_test/makefile b/fsw/unit_test/makefile index 00c362b..cd63d17 100644 --- a/fsw/unit_test/makefile +++ b/fsw/unit_test/makefile @@ -17,7 +17,7 @@ # # GCOV is disabled by default. If you are using the source level debugger you will want to # disable GCOV. To enable GCOV you can override the ENABLE_GCOV variable on the command line -# by setting it to TRUE. For example "make ENABLE_GCOV=TRUE". +# by setting it to true. For example "make ENABLE_GCOV=true". # # diff --git a/fsw/unit_test/sch_api.c.gcov b/fsw/unit_test/sch_api.c.gcov index 8575f1a..bbfca86 100644 --- a/fsw/unit_test/sch_api.c.gcov +++ b/fsw/unit_test/sch_api.c.gcov @@ -81,7 +81,7 @@ -: 79:** -: 80:** NOTE: For complete prolog information, see 'sch_api.h'. -: 81:********************************************************************/ - 6: 82:boolean SCH_GetProcessingState(void) + 6: 82:bool SCH_GetProcessingState(void) -: 83:{ 6: 84: return (SCH_LibData.ProcessingDisabledCtr == 0); -: 85:} diff --git a/fsw/unit_test/sch_api_test.c b/fsw/unit_test/sch_api_test.c index a01c012..45acfcc 100644 --- a/fsw/unit_test/sch_api_test.c +++ b/fsw/unit_test/sch_api_test.c @@ -88,7 +88,7 @@ void SCH_DisableProcessing_Test(void) void SCH_GetProcessingState_Test_True(void) { - boolean Result; + bool Result; SCH_LibData.ProcessingDisabledCtr = 0; @@ -96,7 +96,7 @@ void SCH_GetProcessingState_Test_True(void) Result = SCH_GetProcessingState(); /* Verify results */ - UtAssert_True (Result == TRUE, "Result == TRUE"); + UtAssert_True (Result == true, "Result == true"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); @@ -104,7 +104,7 @@ void SCH_GetProcessingState_Test_True(void) void SCH_GetProcessingState_Test_False(void) { - boolean Result; + bool Result; SCH_LibData.ProcessingDisabledCtr = 1; @@ -112,7 +112,7 @@ void SCH_GetProcessingState_Test_False(void) Result = SCH_GetProcessingState(); /* Verify results */ - UtAssert_True (Result == FALSE, "Result == FALSE"); + UtAssert_True (Result == false, "Result == false"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); diff --git a/fsw/unit_test/sch_app.c.gcov b/fsw/unit_test/sch_app.c.gcov index b7a4fcd..4719452 100644 --- a/fsw/unit_test/sch_app.c.gcov +++ b/fsw/unit_test/sch_app.c.gcov @@ -149,7 +149,7 @@ 5: 147: Status = SCH_CustomLateInit(); 5: 148: if (Status != CFE_SUCCESS) -: 149: { - 1: 150: CFE_EVS_SendEvent(SCH_MAJOR_FRAME_SUB_ERR_EID, CFE_EVS_ERROR, + 1: 150: CFE_EVS_SendEvent(SCH_MAJOR_FRAME_SUB_ERR_EID, CFE_EVS_ERROR_BIT, -: 151: "Error initializing Timers (RC=0x%08X)", -: 152: (unsigned int)Status); -: 153: } @@ -163,7 +163,7 @@ -: 161: /* -: 162: ** Set request to terminate main loop -: 163: */ - 3: 164: RunStatus = CFE_ES_APP_ERROR; + 3: 164: RunStatus = CFE_ES_RunStatus_APP_ERROR; -: 165: } -: 166: -: 167: /* @@ -189,19 +189,19 @@ -: 187: /* -: 188: ** Report if during the previous frame the major has determined to be unstable -: 189: */ - 4: 190: if (SCH_AppData.IgnoreMajorFrame == TRUE) + 4: 190: if (SCH_AppData.IgnoreMajorFrame == true) -: 191: { - 1: 192: if (SCH_AppData.IgnoreMajorFrameMsgSent == FALSE) + 1: 192: if (SCH_AppData.IgnoreMajorFrameMsgSent == false) -: 193: { - 1: 194: CFE_EVS_SendEvent(SCH_NOISY_MAJOR_FRAME_ERR_EID, CFE_EVS_ERROR, + 1: 194: CFE_EVS_SendEvent(SCH_NOISY_MAJOR_FRAME_ERR_EID, CFE_EVS_ERROR_BIT, -: 195: "Major Frame Sync too noisy (Slot %d). Disabling synchronization.", 1: 196: SCH_AppData.MinorFramesSinceTone); - 1: 197: SCH_AppData.IgnoreMajorFrameMsgSent = TRUE; + 1: 197: SCH_AppData.IgnoreMajorFrameMsgSent = true; -: 198: } -: 199: } -: 200: else -: 201: { - 3: 202: SCH_AppData.IgnoreMajorFrameMsgSent = FALSE; + 3: 202: SCH_AppData.IgnoreMajorFrameMsgSent = false; -: 203: } -: 204: -: 205: /* @@ -209,7 +209,7 @@ -: 207: */ -: 208:#if SCH_LIB_PRESENCE == 1 8: 209: if ((Status == OS_SUCCESS) && - 4: 210: (SCH_GetProcessingState() == TRUE)) + 4: 210: (SCH_GetProcessingState() == true)) -: 211: { 2: 212: Status = SCH_ProcessScheduleTable(); -: 213: } @@ -230,7 +230,7 @@ -: 228: /* -: 229: ** Set request to terminate main loop -: 230: */ - 1: 231: RunStatus = CFE_ES_APP_ERROR; + 1: 231: RunStatus = CFE_ES_RunStatus_APP_ERROR; -: 232: } -: 233: -: 234: } /* End of while */ @@ -243,7 +243,7 @@ -: 241: /* -: 242: ** Send an event describing the reason for the termination -: 243: */ - 4: 244: CFE_EVS_SendEvent(SCH_APP_EXIT_EID, CFE_EVS_CRITICAL, + 4: 244: CFE_EVS_SendEvent(SCH_APP_EXIT_EID, CFE_EVS_CRITICAL_BIT, -: 245: "SCH App: terminating, err = 0x%08X", (unsigned int)Status); -: 246: -: 247: /* @@ -344,7 +344,7 @@ -: 342: ** Application startup event message -: 343: */ 6: 344: Status = CFE_EVS_SendEvent(SCH_INITSTATS_INF_EID, - -: 345: CFE_EVS_INFORMATION, + -: 345: CFE_EVS_INFORMATION_BIT, -: 346: "SCH Initialized. Version %d.%d.%d.%d", -: 347: SCH_MAJOR_VERSION, -: 348: SCH_MINOR_VERSION, @@ -385,7 +385,7 @@ -: 383: /* -: 384: ** Register for event services -: 385: */ - 12: 386: Status = CFE_EVS_Register(SCH_AppData.EventFilters, SCH_FILTER_COUNT, CFE_EVS_BINARY_FILTER); + 12: 386: Status = CFE_EVS_Register(SCH_AppData.EventFilters, SCH_FILTER_COUNT, CFE_EVS_EVERY_OTHER_ONE); 12: 387: if (Status != CFE_SUCCESS) -: 388: { 2: 389: CFE_ES_WriteToSysLog("SCH App: Error Registering For Event Services, RC=0x%08X\n", (unsigned int)Status); @@ -413,12 +413,12 @@ -: 411: /* -: 412: ** Initialize housekeeping packet (clear user data area) -: 413: */ - 13: 414: CFE_SB_InitMsg(&SCH_AppData.HkPacket, SCH_HK_TLM_MID, sizeof(SCH_HkPacket_t), TRUE); + 13: 414: CFE_SB_InitMsg(&SCH_AppData.HkPacket, SCH_HK_TLM_MID, sizeof(SCH_HkPacket_t), true); -: 415: -: 416: /* -: 417: ** Initialize diagnostic packet (clear user data area) -: 418: */ - 13: 419: CFE_SB_InitMsg(&SCH_AppData.DiagPacket, SCH_DIAG_TLM_MID, sizeof(SCH_DiagPacket_t), TRUE); + 13: 419: CFE_SB_InitMsg(&SCH_AppData.DiagPacket, SCH_DIAG_TLM_MID, sizeof(SCH_DiagPacket_t), true); -: 420: -: 421: /* -: 422: ** Create Software Bus message pipe @@ -426,7 +426,7 @@ 13: 424: Status = CFE_SB_CreatePipe(&SCH_AppData.CmdPipe, SCH_PIPE_DEPTH, SCH_PIPE_NAME); 13: 425: if (Status != CFE_SUCCESS) -: 426: { - 2: 427: CFE_EVS_SendEvent(SCH_CR_PIPE_ERR_EID, CFE_EVS_ERROR, + 2: 427: CFE_EVS_SendEvent(SCH_CR_PIPE_ERR_EID, CFE_EVS_ERROR_BIT, -: 428: "Error Creating SB Pipe, RC=0x%08X", (unsigned int)Status); 2: 429: return(Status); -: 430: } @@ -437,7 +437,7 @@ 11: 435: Status = CFE_SB_Subscribe(SCH_SEND_HK_MID, SCH_AppData.CmdPipe); 11: 436: if (Status != CFE_SUCCESS) -: 437: { - 1: 438: CFE_EVS_SendEvent(SCH_SUB_HK_REQ_ERR_EID, CFE_EVS_ERROR, + 1: 438: CFE_EVS_SendEvent(SCH_SUB_HK_REQ_ERR_EID, CFE_EVS_ERROR_BIT, -: 439: "Error Subscribing to HK Request(MID=0x%04X), RC=0x%08X", -: 440: SCH_SEND_HK_MID, (unsigned int)Status); 1: 441: return(Status); @@ -449,7 +449,7 @@ 10: 447: Status = CFE_SB_Subscribe(SCH_CMD_MID, SCH_AppData.CmdPipe); 10: 448: if (Status != CFE_SUCCESS) -: 449: { - 1: 450: CFE_EVS_SendEvent(SCH_SUB_GND_CMD_ERR_EID, CFE_EVS_ERROR, + 1: 450: CFE_EVS_SendEvent(SCH_SUB_GND_CMD_ERR_EID, CFE_EVS_ERROR_BIT, -: 451: "Error Subscribing to GND CMD(MID=0x%04X), RC=0x%08X", -: 452: SCH_CMD_MID, (unsigned int)Status); 1: 453: return(Status); @@ -499,7 +499,7 @@ -: 497: 14: 498: if (Status != CFE_SUCCESS) -: 499: { - 2: 500: CFE_EVS_SendEvent(SCH_SDT_REG_ERR_EID, CFE_EVS_ERROR, + 2: 500: CFE_EVS_SendEvent(SCH_SDT_REG_ERR_EID, CFE_EVS_ERROR_BIT, -: 501: "Error Registering SDT, RC=0x%08X", -: 502: (unsigned int)Status); 2: 503: return(Status); @@ -518,7 +518,7 @@ -: 516: 12: 517: if (Status != CFE_SUCCESS) -: 518: { - 1: 519: CFE_EVS_SendEvent(SCH_MDT_REG_ERR_EID, CFE_EVS_ERROR, + 1: 519: CFE_EVS_SendEvent(SCH_MDT_REG_ERR_EID, CFE_EVS_ERROR_BIT, -: 520: "Error Registering MDT, RC=0x%08X", -: 521: (unsigned int)Status); 1: 522: return(Status); @@ -533,7 +533,7 @@ -: 531: 11: 532: if (Status != CFE_SUCCESS) -: 533: { - 1: 534: CFE_EVS_SendEvent(SCH_SDT_LOAD_ERR_EID, CFE_EVS_ERROR, + 1: 534: CFE_EVS_SendEvent(SCH_SDT_LOAD_ERR_EID, CFE_EVS_ERROR_BIT, -: 535: "Error (RC=0x%08X) Loading SDT with %s", -: 536: (unsigned int)Status, SCH_SCHEDULE_FILENAME); 1: 537: return(Status); @@ -548,7 +548,7 @@ -: 546: 10: 547: if (Status != CFE_SUCCESS) -: 548: { - 1: 549: CFE_EVS_SendEvent(SCH_MDT_LOAD_ERR_EID, CFE_EVS_ERROR, + 1: 549: CFE_EVS_SendEvent(SCH_MDT_LOAD_ERR_EID, CFE_EVS_ERROR_BIT, -: 550: "Error (RC=0x%08X) Loading MDT with %s", -: 551: (unsigned int)Status, SCH_MESSAGE_FILENAME); 1: 552: return(Status); @@ -562,7 +562,7 @@ -: 560: 9: 561: if (Status != CFE_SUCCESS) -: 562: { - 1: 563: CFE_EVS_SendEvent(SCH_ACQ_PTR_ERR_EID, CFE_EVS_ERROR, + 1: 563: CFE_EVS_SendEvent(SCH_ACQ_PTR_ERR_EID, CFE_EVS_ERROR_BIT, -: 564: "Error Acquiring Tbl Ptrs (RC=0x%08X)", -: 565: (unsigned int)Status); 1: 566: return(Status); @@ -588,9 +588,9 @@ -: 586: ** Start off assuming Major Frame synch is normal -: 587: ** and should be coming at any moment -: 588: */ - 11: 589: SCH_AppData.IgnoreMajorFrame = FALSE; - 11: 590: SCH_AppData.IgnoreMajorFrameMsgSent = FALSE; - 11: 591: SCH_AppData.UnexpectedMajorFrame = FALSE; + 11: 589: SCH_AppData.IgnoreMajorFrame = false; + 11: 590: SCH_AppData.IgnoreMajorFrameMsgSent = false; + 11: 591: SCH_AppData.UnexpectedMajorFrame = false; 11: 592: SCH_AppData.SyncToMET = SCH_NOT_SYNCHRONIZED; 11: 593: SCH_AppData.MajorFrameSource = SCH_MAJOR_FS_NONE; 11: 594: SCH_AppData.NextSlotNumber = 0; @@ -614,7 +614,7 @@ -: 612: 11: 613: if (Status != CFE_SUCCESS) -: 614: { - 1: 615: CFE_EVS_SendEvent(SCH_MINOR_FRAME_TIMER_CREATE_ERR_EID, CFE_EVS_ERROR, + 1: 615: CFE_EVS_SendEvent(SCH_MINOR_FRAME_TIMER_CREATE_ERR_EID, CFE_EVS_ERROR_BIT, -: 616: "Error creating Timer (RC=0x%08X)", -: 617: (unsigned int)Status); 1: 618: return(Status); @@ -625,7 +625,7 @@ -: 623: */ 10: 624: if (SCH_AppData.ClockAccuracy > SCH_WORST_CLOCK_ACCURACY) -: 625: { - 1: 626: CFE_EVS_SendEvent(SCH_MINOR_FRAME_TIMER_ACC_WARN_EID, CFE_EVS_INFORMATION, + 1: 626: CFE_EVS_SendEvent(SCH_MINOR_FRAME_TIMER_ACC_WARN_EID, CFE_EVS_INFORMATION_BIT, -: 627: "OS Timer Accuracy (%d > reqd %d usec) requires Minor Frame MET sync", -: 628: (int)SCH_AppData.ClockAccuracy, SCH_WORST_CLOCK_ACCURACY); -: 629: @@ -642,7 +642,7 @@ 10: 640: Status = OS_BinSemCreate(&SCH_AppData.TimeSemaphore, SCH_SEM_NAME, SCH_SEM_VALUE, SCH_SEM_OPTIONS); 10: 641: if (Status != CFE_SUCCESS) -: 642: { - 2: 643: CFE_EVS_SendEvent(SCH_SEM_CREATE_ERR_EID, CFE_EVS_ERROR, + 2: 643: CFE_EVS_SendEvent(SCH_SEM_CREATE_ERR_EID, CFE_EVS_ERROR_BIT, -: 644: "Error creating Main Loop Timing Semaphore (RC=0x%08X)", -: 645: (unsigned int)Status); 2: 646: return(Status); @@ -733,7 +733,7 @@ -: 731: { 1: 732: SCH_AppData.SameSlotCount++; -: 733: - 1: 734: CFE_EVS_SendEvent(SCH_SAME_SLOT_EID, CFE_EVS_DEBUG, + 1: 734: CFE_EVS_SendEvent(SCH_SAME_SLOT_EID, CFE_EVS_DEBUG_BIT, -: 735: "Slot did not increment: slot = %d", -: 736: (int)CurrentSlot); 1: 737: ProcessCount = 0; @@ -746,7 +746,7 @@ -: 744: { 2: 745: SCH_AppData.SkippedSlotsCount++; -: 746: - 4: 747: CFE_EVS_SendEvent(SCH_SKIPPED_SLOTS_EID, CFE_EVS_ERROR, + 4: 747: CFE_EVS_SendEvent(SCH_SKIPPED_SLOTS_EID, CFE_EVS_ERROR_BIT, -: 748: "Slots skipped: slot = %d, count = %d", 4: 749: SCH_AppData.NextSlotNumber, (int)(ProcessCount - 1)); -: 750: @@ -793,7 +793,7 @@ -: 791: /* Generate an event message if not syncing to MET or when there is more than two being processed */ 2: 792: if ((ProcessCount > SCH_AppData.WorstCaseSlotsPerMinorFrame) || (SCH_AppData.SyncToMET == SCH_NOT_SYNCHRONIZED)) -: 793: { - 4: 794: CFE_EVS_SendEvent(SCH_MULTI_SLOTS_EID, CFE_EVS_INFORMATION, + 4: 794: CFE_EVS_SendEvent(SCH_MULTI_SLOTS_EID, CFE_EVS_INFORMATION_BIT, -: 795: "Multiple slots processed: slot = %d, count = %d", 2: 796: SCH_AppData.NextSlotNumber, (int)ProcessCount); -: 797: } @@ -904,11 +904,11 @@ -: 902: /* -: 903: ** Too much data for just one event -: 904: */ - 6: 905: CFE_EVS_SendEvent(SCH_CORRUPTION_EID, CFE_EVS_ERROR, + 6: 905: CFE_EVS_SendEvent(SCH_CORRUPTION_EID, CFE_EVS_ERROR_BIT, -: 906: "Corrupt data error (1): slot = %d, entry = %d", 6: 907: SCH_AppData.NextSlotNumber, (int)EntryNumber); -: 908: - 24: 909: CFE_EVS_SendEvent(SCH_CORRUPTION_EID, CFE_EVS_ERROR, + 24: 909: CFE_EVS_SendEvent(SCH_CORRUPTION_EID, CFE_EVS_ERROR_BIT, -: 910: "Corrupt data error (2): msg = %d, freq = %d, type = %d, rem = %d", 6: 911: NextEntry->MessageIndex, 6: 912: NextEntry->Frequency, @@ -931,7 +931,7 @@ 2: 929: if (Remainder == NextEntry->Remainder) -: 930: { 2: 931: Message = SCH_AppData.MessageTable[NextEntry->MessageIndex].MessageBuffer; - 2: 932: Status = CFE_SB_SendMsg((CFE_SB_Msg_t *) Message); + 2: 932: Status = CFE_SB_SendMsg((CFE_MSG_Message_t *) Message); -: 933: -: 934: /* If additional activity types are added in the future, a switch statement */ -: 935: /* would be useful, as shown below: */ @@ -942,7 +942,7 @@ -: 940: * { -: 941: * case SCH_ACTIVITY_SEND_MSG: -: 942: * Message = SCH_AppData.MessageTable[NextEntry->MessageIndex].MessageBuffer; - -: 943: * Status = CFE_SB_SendMsg((CFE_SB_Msg_t *) Message); + -: 943: * Status = CFE_SB_SendMsg((CFE_MSG_Message_t *) Message); -: 944: * break; -: 945: * -: 946: * default: @@ -958,7 +958,7 @@ -: 956: { 1: 957: SCH_AppData.ScheduleActivityFailureCount++; -: 958: - 2: 959: CFE_EVS_SendEvent(SCH_PACKET_SEND_EID, CFE_EVS_ERROR, + 2: 959: CFE_EVS_SendEvent(SCH_PACKET_SEND_EID, CFE_EVS_ERROR_BIT, -: 960: "Activity error: slot = %d, entry = %d, err = 0x%08X", 1: 961: SCH_AppData.NextSlotNumber, (int)EntryNumber, (unsigned int)Status); -: 962: } @@ -1119,7 +1119,7 @@ -: 1117: { 12: 1118: TableResult = EntryResult; -: 1119: - 12: 1120: CFE_EVS_SendEvent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR, + 12: 1120: CFE_EVS_SendEvent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR_BIT, -: 1121: "Schedule tbl verify error - idx[%d] ena[%d] typ[%d] fre[%d] rem[%d] msg[%d] grp[0x%08X]", -: 1122: (int)TableIndex, EnableState, Type, Frequency, Remainder, MessageIndex, (unsigned int)GroupData); -: 1123: } @@ -1128,7 +1128,7 @@ -: 1126: /* -: 1127: ** Send event describing results -: 1128: */ - 14: 1129: CFE_EVS_SendEvent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG, + 14: 1129: CFE_EVS_SendEvent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG_BIT, -: 1130: "Schedule table verify results -- good[%d] bad[%d] unused[%d]", -: 1131: (int)GoodCount, (int)BadCount, (int)UnusedCount); -: 1132: /* @@ -1238,7 +1238,7 @@ -: 1236: { 5: 1237: TableResult = EntryResult; -: 1238: - 5: 1239: CFE_EVS_SendEvent(SCH_MESSAGE_TBL_ERR_EID, CFE_EVS_ERROR, + 5: 1239: CFE_EVS_SendEvent(SCH_MESSAGE_TBL_ERR_EID, CFE_EVS_ERROR_BIT, -: 1240: "Message tbl verify err - idx[%d] mid[0x%X] len[%d] buf[%d]", -: 1241: (int)TableIndex, MessageID, MessageLength, (int)BufferIndex); -: 1242: } @@ -1247,7 +1247,7 @@ -: 1245: /* -: 1246: ** Send event describing results -: 1247: */ - 7: 1248: CFE_EVS_SendEvent(SCH_MESSAGE_TABLE_EID, CFE_EVS_DEBUG, + 7: 1248: CFE_EVS_SendEvent(SCH_MESSAGE_TABLE_EID, CFE_EVS_DEBUG_BIT, -: 1249: "Message tbl verify results - good[%d] bad[%d] unused[%d]", -: 1250: (int)GoodCount, (int)BadCount, (int)UnusedCount); -: 1251: /* diff --git a/fsw/unit_test/sch_app_test.c b/fsw/unit_test/sch_app_test.c index 1e4c229..a603e4c 100644 --- a/fsw/unit_test/sch_app_test.c +++ b/fsw/unit_test/sch_app_test.c @@ -48,7 +48,7 @@ int32 SCH_APP_TEST_CFE_TIME_RegisterSynchCallbackHook(CFE_TIME_SynchCallbackPtr_t CallbackFuncPtr) { - SCH_AppData.IgnoreMajorFrame = TRUE; + SCH_AppData.IgnoreMajorFrame = true; SCH_AppData.MinorFramesSinceTone = 1; return CFE_SUCCESS; @@ -93,7 +93,7 @@ void SCH_AppMain_Test_RegisterAppError(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_APP_EXIT_EID, CFE_EVS_CRITICAL, "SCH App: terminating, err = 0xFFFFFFFF"), + (Ut_CFE_EVS_EventSent(SCH_APP_EXIT_EID, CFE_EVS_CRITICAL_BIT, "SCH App: terminating, err = 0xFFFFFFFF"), "SCH App: terminating, err = 0xFFFFFFFF"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -121,7 +121,7 @@ void SCH_AppMain_Test_AppInitError(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_APP_EXIT_EID, CFE_EVS_CRITICAL, "SCH App: terminating, err = 0xFFFFFFFF"), + (Ut_CFE_EVS_EventSent(SCH_APP_EXIT_EID, CFE_EVS_CRITICAL_BIT, "SCH App: terminating, err = 0xFFFFFFFF"), "SCH App: terminating, err = 0xFFFFFFFF"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -154,11 +154,11 @@ void SCH_AppMain_Test_CustomLateInitError(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_MAJOR_FRAME_SUB_ERR_EID, CFE_EVS_ERROR, "Error initializing Timers (RC=0xFFFFFFFF)"), + (Ut_CFE_EVS_EventSent(SCH_MAJOR_FRAME_SUB_ERR_EID, CFE_EVS_ERROR_BIT, "Error initializing Timers (RC=0xFFFFFFFF)"), "Error initializing Timers (RC=0xFFFFFFFF)"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_APP_EXIT_EID, CFE_EVS_CRITICAL, "SCH App: terminating, err = 0xFFFFFFFF"), + (Ut_CFE_EVS_EventSent(SCH_APP_EXIT_EID, CFE_EVS_CRITICAL_BIT, "SCH App: terminating, err = 0xFFFFFFFF"), "SCH App: terminating, err = 0xFFFFFFFF"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 3, "Ut_CFE_EVS_GetEventQueueDepth() == 3"); @@ -177,9 +177,9 @@ void SCH_AppMain_Test_CustomLateInitError(void) void SCH_AppMain_Test_NoisyMajorFrameError(void) { - SCH_AppData.IgnoreMajorFrameMsgSent = FALSE; + SCH_AppData.IgnoreMajorFrameMsgSent = false; - /* Causes SCH_CustomLateInit to set SCH_AppData.IgnoreMajorFrame = TRUE, which it would normally do if CFE_TIME_RegisterSynchCallback weren't stubbed out. + /* Causes SCH_CustomLateInit to set SCH_AppData.IgnoreMajorFrame = true, which it would normally do if CFE_TIME_RegisterSynchCallback weren't stubbed out. Also sets SCH_AppData.MinorFramesSinceTone = 1. Setting these manually in the test setup doesn't work, because they get reset at a certain point */ Ut_CFE_TIME_SetFunctionHook(UT_CFE_TIME_REGISTERSYNCHCALLBACK_INDEX, &SCH_APP_TEST_CFE_TIME_RegisterSynchCallbackHook); @@ -188,7 +188,7 @@ void SCH_AppMain_Test_NoisyMajorFrameError(void) Ut_CFE_TBL_ContinueReturnCodeAfterCountZero(UT_CFE_TBL_LOAD_INDEX); /* Set to exit loop after first run */ - Ut_CFE_ES_SetReturnCode(UT_CFE_ES_RUNLOOP_INDEX, FALSE, 2); + Ut_CFE_ES_SetReturnCode(UT_CFE_ES_RUNLOOP_INDEX, false, 2); /* Sets SCH_AppData.AppID to 99, to allow verification that the end of the function under test has been reached */ Ut_CFE_TIME_SetFunctionHook(UT_CFE_TIME_UNREGISTERSYNCHCALLBACK_INDEX, &SCH_APP_TEST_CFE_TIME_UnregisterSynchCallbackHook); @@ -198,10 +198,10 @@ void SCH_AppMain_Test_NoisyMajorFrameError(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_NOISY_MAJOR_FRAME_ERR_EID, CFE_EVS_ERROR, "Major Frame Sync too noisy (Slot 1). Disabling synchronization."), + (Ut_CFE_EVS_EventSent(SCH_NOISY_MAJOR_FRAME_ERR_EID, CFE_EVS_ERROR_BIT, "Major Frame Sync too noisy (Slot 1). Disabling synchronization."), "Major Frame Sync too noisy (Slot 1). Disabling synchronization."); - UtAssert_True (SCH_AppData.IgnoreMajorFrameMsgSent == TRUE, "SCH_AppData.IgnoreMajorFrameMsgSent == TRUE"); + UtAssert_True (SCH_AppData.IgnoreMajorFrameMsgSent == true, "SCH_AppData.IgnoreMajorFrameMsgSent == true"); UtAssert_True (SCH_AppData.AppID == 99, "SCH_AppData.AppID == 99"); @@ -222,9 +222,9 @@ void SCH_AppMain_Test_NominalIgnoreMajorFrameFalse(void) Ut_CFE_TBL_ContinueReturnCodeAfterCountZero(UT_CFE_TBL_LOAD_INDEX); /* Set to exit loop after first run */ - Ut_CFE_ES_SetReturnCode(UT_CFE_ES_RUNLOOP_INDEX, FALSE, 2); + Ut_CFE_ES_SetReturnCode(UT_CFE_ES_RUNLOOP_INDEX, false, 2); - /* SCH_AppData.IgnoreMajorFrameMsgSent = FALSE by default */ + /* SCH_AppData.IgnoreMajorFrameMsgSent = false by default */ /* Sets SCH_AppData.AppID to 99, to allow verification that the end of the function under test has been reached */ Ut_CFE_TIME_SetFunctionHook(UT_CFE_TIME_UNREGISTERSYNCHCALLBACK_INDEX, &SCH_APP_TEST_CFE_TIME_UnregisterSynchCallbackHook); @@ -233,7 +233,7 @@ void SCH_AppMain_Test_NominalIgnoreMajorFrameFalse(void) SCH_AppMain(); /* Verify results */ - UtAssert_True (SCH_AppData.IgnoreMajorFrameMsgSent == FALSE, "SCH_AppData.IgnoreMajorFrameMsgSent == FALSE"); + UtAssert_True (SCH_AppData.IgnoreMajorFrameMsgSent == false, "SCH_AppData.IgnoreMajorFrameMsgSent == false"); UtAssert_True (SCH_AppData.AppID == 99, "SCH_AppData.AppID == 99"); @@ -249,12 +249,12 @@ void SCH_AppMain_Test_ProcessScheduleTableError(void) Ut_CFE_TBL_ContinueReturnCodeAfterCountZero(UT_CFE_TBL_LOAD_INDEX); /* Set to exit loop after first run */ - Ut_CFE_ES_SetReturnCode(UT_CFE_ES_RUNLOOP_INDEX, FALSE, 2); + Ut_CFE_ES_SetReturnCode(UT_CFE_ES_RUNLOOP_INDEX, false, 2); - /* SCH_AppData.IgnoreMajorFrameMsgSent = FALSE by default */ + /* SCH_AppData.IgnoreMajorFrameMsgSent = false by default */ #if SCH_LIB_PRESENCE == 1 - /* Set to pass condition "SCH_GetProcessingState() == TRUE" */ + /* Set to pass condition "SCH_GetProcessingState() == true" */ SCH_LibData.ProcessingDisabledCtr = 0; #endif @@ -297,9 +297,9 @@ void SCH_AppMain_Test_Nominal(void) Ut_CFE_TBL_ContinueReturnCodeAfterCountZero(UT_CFE_TBL_LOAD_INDEX); /* Set to exit loop after first run */ - Ut_CFE_ES_SetReturnCode(UT_CFE_ES_RUNLOOP_INDEX, FALSE, 2); + Ut_CFE_ES_SetReturnCode(UT_CFE_ES_RUNLOOP_INDEX, false, 2); - /* SCH_AppData.IgnoreMajorFrameMsgSent = FALSE by default */ + /* SCH_AppData.IgnoreMajorFrameMsgSent = false by default */ /* Sets SCH_AppData.AppID to 99, to allow verification that the end of the function under test has been reached */ Ut_CFE_TIME_SetFunctionHook(UT_CFE_TIME_UNREGISTERSYNCHCALLBACK_INDEX, &SCH_APP_TEST_CFE_TIME_UnregisterSynchCallbackHook); @@ -535,7 +535,7 @@ void SCH_AppInit_Test_Nominal(void) UtAssert_True(SCH_AppData.ErrCounter == 0, "SCH_AppData.ErrCounter == 0"); sprintf(Message, "SCH Initialized. Version %d.%d.%d.%d", SCH_MAJOR_VERSION, SCH_MINOR_VERSION, SCH_REVISION, SCH_MISSION_REV); - UtAssert_True (Ut_CFE_EVS_EventSent(SCH_INITSTATS_INF_EID, CFE_EVS_INFORMATION, Message), Message); + UtAssert_True (Ut_CFE_EVS_EventSent(SCH_INITSTATS_INF_EID, CFE_EVS_INFORMATION_BIT, Message), Message); UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); @@ -650,7 +650,7 @@ void SCH_SbInit_Test_CreatePipeError(void) UtAssert_True (SCH_AppData.CmdPipe == 0, "SCH_AppData.CmdPipe == 0"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_CR_PIPE_ERR_EID, CFE_EVS_ERROR, "Error Creating SB Pipe, RC=0xFFFFFFFF"), + (Ut_CFE_EVS_EventSent(SCH_CR_PIPE_ERR_EID, CFE_EVS_ERROR_BIT, "Error Creating SB Pipe, RC=0xFFFFFFFF"), "Error Creating SB Pipe, RC=0xFFFFFFFF"); UtAssert_True (Result == -1, "Result == -1"); @@ -677,7 +677,7 @@ void SCH_SbInit_Test_SubscribeHKError(void) UtAssert_True (SCH_AppData.CmdPipe == 0, "SCH_AppData.CmdPipe == 0"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SUB_HK_REQ_ERR_EID, CFE_EVS_ERROR, "Error Subscribing to HK Request(MID=0x1896), RC=0xFFFFFFFF"), + (Ut_CFE_EVS_EventSent(SCH_SUB_HK_REQ_ERR_EID, CFE_EVS_ERROR_BIT, "Error Subscribing to HK Request(MID=0x1896), RC=0xFFFFFFFF"), "Error Subscribing to HK Request(MID=0x1896), RC=0xFFFFFFFF"); UtAssert_True (Result == -1, "Result == -1"); @@ -704,7 +704,7 @@ void SCH_SbInit_Test_SubscribeGNDError(void) UtAssert_True (SCH_AppData.CmdPipe == 0, "SCH_AppData.CmdPipe == 0"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SUB_GND_CMD_ERR_EID, CFE_EVS_ERROR, "Error Subscribing to GND CMD(MID=0x1895), RC=0xFFFFFFFF"), + (Ut_CFE_EVS_EventSent(SCH_SUB_GND_CMD_ERR_EID, CFE_EVS_ERROR_BIT, "Error Subscribing to GND CMD(MID=0x1895), RC=0xFFFFFFFF"), "Error Subscribing to GND CMD(MID=0x1895), RC=0xFFFFFFFF"); UtAssert_True (Result == -1, "Result == -1"); @@ -765,7 +765,7 @@ void SCH_TblInit_Test_RegisterSdtError(void) UtAssert_True(SCH_AppData.TablePassCount == 0, "SCH_AppData.TablePassCount == 0"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SDT_REG_ERR_EID, CFE_EVS_ERROR, "Error Registering SDT, RC=0xFFFFFFFF"), + (Ut_CFE_EVS_EventSent(SCH_SDT_REG_ERR_EID, CFE_EVS_ERROR_BIT, "Error Registering SDT, RC=0xFFFFFFFF"), "Error Registering SDT, RC=0xFFFFFFFF"); UtAssert_True (Result == -1, "Result == -1"); @@ -806,7 +806,7 @@ void SCH_TblInit_Test_RegisterMdtError(void) UtAssert_True(SCH_AppData.TablePassCount == 0, "SCH_AppData.TablePassCount == 0"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_MDT_REG_ERR_EID, CFE_EVS_ERROR, "Error Registering MDT, RC=0xFFFFFFFF"), + (Ut_CFE_EVS_EventSent(SCH_MDT_REG_ERR_EID, CFE_EVS_ERROR_BIT, "Error Registering MDT, RC=0xFFFFFFFF"), "Error Registering MDT, RC=0xFFFFFFFF"); UtAssert_True (Result == -1, "Result == -1"); @@ -847,7 +847,7 @@ void SCH_TblInit_Test_LoadSdtError(void) UtAssert_True(SCH_AppData.TablePassCount == 0, "SCH_AppData.TablePassCount == 0"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SDT_LOAD_ERR_EID, CFE_EVS_ERROR, "Error (RC=0xFFFFFFFF) Loading SDT with /cf/apps/sch_def_schtbl.tbl"), + (Ut_CFE_EVS_EventSent(SCH_SDT_LOAD_ERR_EID, CFE_EVS_ERROR_BIT, "Error (RC=0xFFFFFFFF) Loading SDT with /cf/apps/sch_def_schtbl.tbl"), "Error (RC=0xFFFFFFFF) Loading SDT with /cf/apps/sch_def_schtbl.tbl"); UtAssert_True (Result == -1, "Result == -1"); @@ -888,7 +888,7 @@ void SCH_TblInit_Test_LoadMdtError(void) UtAssert_True(SCH_AppData.TablePassCount == 0, "SCH_AppData.TablePassCount == 0"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_MDT_LOAD_ERR_EID, CFE_EVS_ERROR, "Error (RC=0xCC000013) Loading MDT with /cf/apps/sch_def_msgtbl.tbl"), + (Ut_CFE_EVS_EventSent(SCH_MDT_LOAD_ERR_EID, CFE_EVS_ERROR_BIT, "Error (RC=0xCC000013) Loading MDT with /cf/apps/sch_def_msgtbl.tbl"), "Error (RC=0xCC000013) Loading MDT with /cf/apps/sch_def_msgtbl.tbl"); UtAssert_True (Result == 0xCC000013, "Result == 0xCC000013"); @@ -933,7 +933,7 @@ void SCH_TblInit_Test_AcquirePointersError(void) UtAssert_True(SCH_AppData.TablePassCount == 0, "SCH_AppData.TablePassCount == 0"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_ACQ_PTR_ERR_EID, CFE_EVS_ERROR, "Error Acquiring Tbl Ptrs (RC=0xFFFFFFFF)"), + (Ut_CFE_EVS_EventSent(SCH_ACQ_PTR_ERR_EID, CFE_EVS_ERROR_BIT, "Error Acquiring Tbl Ptrs (RC=0xFFFFFFFF)"), "Error Acquiring Tbl Ptrs (RC=0xFFFFFFFF)"); UtAssert_True (Result == -1, "Result == -1"); @@ -1007,9 +1007,9 @@ void SCH_TimerInit_Test_CustomEarlyInitError(void) Result = SCH_TimerInit(); /* Verify results */ - UtAssert_True(SCH_AppData.IgnoreMajorFrame == FALSE, "SCH_AppData.IgnoreMajorFrame == FALSE"); - UtAssert_True(SCH_AppData.IgnoreMajorFrameMsgSent == FALSE, "SCH_AppData.IgnoreMajorFrameMsgSent == FALSE"); - UtAssert_True(SCH_AppData.UnexpectedMajorFrame == FALSE, "SCH_AppData.UnexpectedMajorFrame == FALSE"); + UtAssert_True(SCH_AppData.IgnoreMajorFrame == false, "SCH_AppData.IgnoreMajorFrame == false"); + UtAssert_True(SCH_AppData.IgnoreMajorFrameMsgSent == false, "SCH_AppData.IgnoreMajorFrameMsgSent == false"); + UtAssert_True(SCH_AppData.UnexpectedMajorFrame == false, "SCH_AppData.UnexpectedMajorFrame == false"); UtAssert_True(SCH_AppData.SyncToMET == SCH_NOT_SYNCHRONIZED, "SCH_AppData.SyncToMET == SCH_NOT_SYNCHRONIZED"); UtAssert_True(SCH_AppData.MajorFrameSource == SCH_MAJOR_FS_NONE, "SCH_AppData.MajorFrameSource == SCH_MAJOR_FS_NONE"); UtAssert_True(SCH_AppData.NextSlotNumber == 0, "SCH_AppData.NextSlotNumber == 0"); @@ -1023,7 +1023,7 @@ void SCH_TimerInit_Test_CustomEarlyInitError(void) UtAssert_True(SCH_AppData.ClockAccuracy = SCH_WORST_CLOCK_ACCURACY, "SCH_AppData.ClockAccuracy = SCH_WORST_CLOCK_ACCURACY"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_MINOR_FRAME_TIMER_CREATE_ERR_EID, CFE_EVS_ERROR, "Error creating Timer (RC=0xFFFFFFFF)"), + (Ut_CFE_EVS_EventSent(SCH_MINOR_FRAME_TIMER_CREATE_ERR_EID, CFE_EVS_ERROR_BIT, "Error creating Timer (RC=0xFFFFFFFF)"), "Error creating Timer (RC=0xFFFFFFFF)"); UtAssert_True (Result == -1, "Result == -1"); @@ -1058,9 +1058,9 @@ void SCH_TimerInit_Test_TimerAccuracyWarning(void) Result = SCH_TimerInit(); /* Verify results */ - UtAssert_True(SCH_AppData.IgnoreMajorFrame == FALSE, "SCH_AppData.IgnoreMajorFrame == FALSE"); - UtAssert_True(SCH_AppData.IgnoreMajorFrameMsgSent == FALSE, "SCH_AppData.IgnoreMajorFrameMsgSent == FALSE"); - UtAssert_True(SCH_AppData.UnexpectedMajorFrame == FALSE, "SCH_AppData.UnexpectedMajorFrame == FALSE"); + UtAssert_True(SCH_AppData.IgnoreMajorFrame == false, "SCH_AppData.IgnoreMajorFrame == false"); + UtAssert_True(SCH_AppData.IgnoreMajorFrameMsgSent == false, "SCH_AppData.IgnoreMajorFrameMsgSent == false"); + UtAssert_True(SCH_AppData.UnexpectedMajorFrame == false, "SCH_AppData.UnexpectedMajorFrame == false"); UtAssert_True(SCH_AppData.MajorFrameSource == SCH_MAJOR_FS_NONE, "SCH_AppData.MajorFrameSource == SCH_MAJOR_FS_NONE"); UtAssert_True(SCH_AppData.NextSlotNumber == 0, "SCH_AppData.NextSlotNumber == 0"); UtAssert_True(SCH_AppData.MinorFramesSinceTone == SCH_TIME_SYNC_SLOT, "SCH_AppData.MinorFramesSinceTone == SCH_TIME_SYNC_SLOT"); @@ -1072,7 +1072,7 @@ void SCH_TimerInit_Test_TimerAccuracyWarning(void) UtAssert_True(SCH_AppData.ClockAccuracy = SCH_WORST_CLOCK_ACCURACY, "SCH_AppData.ClockAccuracy = SCH_WORST_CLOCK_ACCURACY"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_MINOR_FRAME_TIMER_ACC_WARN_EID, CFE_EVS_INFORMATION, "OS Timer Accuracy (102 > reqd 101 usec) requires Minor Frame MET sync"), + (Ut_CFE_EVS_EventSent(SCH_MINOR_FRAME_TIMER_ACC_WARN_EID, CFE_EVS_INFORMATION_BIT, "OS Timer Accuracy (102 > reqd 101 usec) requires Minor Frame MET sync"), "OS Timer Accuracy (102 > reqd 101 usec) requires Minor Frame MET sync"); UtAssert_True(SCH_AppData.SyncToMET == SCH_MINOR_SYNCHRONIZED, "SCH_AppData.SyncToMET == SCH_MINOR_SYNCHRONIZED"); @@ -1113,9 +1113,9 @@ void SCH_TimerInit_Test_BinSemCreateError(void) Result = SCH_TimerInit(); /* Verify results */ - UtAssert_True(SCH_AppData.IgnoreMajorFrame == FALSE, "SCH_AppData.IgnoreMajorFrame == FALSE"); - UtAssert_True(SCH_AppData.IgnoreMajorFrameMsgSent == FALSE, "SCH_AppData.IgnoreMajorFrameMsgSent == FALSE"); - UtAssert_True(SCH_AppData.UnexpectedMajorFrame == FALSE, "SCH_AppData.UnexpectedMajorFrame == FALSE"); + UtAssert_True(SCH_AppData.IgnoreMajorFrame == false, "SCH_AppData.IgnoreMajorFrame == false"); + UtAssert_True(SCH_AppData.IgnoreMajorFrameMsgSent == false, "SCH_AppData.IgnoreMajorFrameMsgSent == false"); + UtAssert_True(SCH_AppData.UnexpectedMajorFrame == false, "SCH_AppData.UnexpectedMajorFrame == false"); UtAssert_True(SCH_AppData.SyncToMET == SCH_NOT_SYNCHRONIZED, "SCH_AppData.SyncToMET == SCH_NOT_SYNCHRONIZED"); UtAssert_True(SCH_AppData.MajorFrameSource == SCH_MAJOR_FS_NONE, "SCH_AppData.MajorFrameSource == SCH_MAJOR_FS_NONE"); UtAssert_True(SCH_AppData.NextSlotNumber == 0, "SCH_AppData.NextSlotNumber == 0"); @@ -1129,7 +1129,7 @@ void SCH_TimerInit_Test_BinSemCreateError(void) UtAssert_True(SCH_AppData.ClockAccuracy = SCH_WORST_CLOCK_ACCURACY, "SCH_AppData.ClockAccuracy = SCH_WORST_CLOCK_ACCURACY"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SEM_CREATE_ERR_EID, CFE_EVS_ERROR, "Error creating Main Loop Timing Semaphore (RC=0xFFFFFFFF)"), + (Ut_CFE_EVS_EventSent(SCH_SEM_CREATE_ERR_EID, CFE_EVS_ERROR_BIT, "Error creating Main Loop Timing Semaphore (RC=0xFFFFFFFF)"), "Error creating Main Loop Timing Semaphore (RC=0xFFFFFFFF)"); UtAssert_True (Result == -1, "Result == -1"); @@ -1161,9 +1161,9 @@ void SCH_TimerInit_Test_Nominal(void) Result = SCH_TimerInit(); /* Verify results */ - UtAssert_True(SCH_AppData.IgnoreMajorFrame == FALSE, "SCH_AppData.IgnoreMajorFrame == FALSE"); - UtAssert_True(SCH_AppData.IgnoreMajorFrameMsgSent == FALSE, "SCH_AppData.IgnoreMajorFrameMsgSent == FALSE"); - UtAssert_True(SCH_AppData.UnexpectedMajorFrame == FALSE, "SCH_AppData.UnexpectedMajorFrame == FALSE"); + UtAssert_True(SCH_AppData.IgnoreMajorFrame == false, "SCH_AppData.IgnoreMajorFrame == false"); + UtAssert_True(SCH_AppData.IgnoreMajorFrameMsgSent == false, "SCH_AppData.IgnoreMajorFrameMsgSent == false"); + UtAssert_True(SCH_AppData.UnexpectedMajorFrame == false, "SCH_AppData.UnexpectedMajorFrame == false"); UtAssert_True(SCH_AppData.SyncToMET == SCH_NOT_SYNCHRONIZED, "SCH_AppData.SyncToMET == SCH_NOT_SYNCHRONIZED"); UtAssert_True(SCH_AppData.MajorFrameSource == SCH_MAJOR_FS_NONE, "SCH_AppData.MajorFrameSource == SCH_MAJOR_FS_NONE"); UtAssert_True(SCH_AppData.NextSlotNumber == 0, "SCH_AppData.NextSlotNumber == 0"); @@ -1248,7 +1248,7 @@ void SCH_ProcessScheduleTable_Test_ProcessCountTotalSlotsLastProcessCountSame(vo UtAssert_True(SCH_AppData.SameSlotCount == 1, "SCH_AppData.SameSlotCount == 1"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SAME_SLOT_EID, CFE_EVS_DEBUG, "Slot did not increment: slot = 99"), + (Ut_CFE_EVS_EventSent(SCH_SAME_SLOT_EID, CFE_EVS_DEBUG_BIT, "Slot did not increment: slot = 99"), "Slot did not increment: slot = 99"); UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); @@ -1302,7 +1302,7 @@ void SCH_ProcessScheduleTable_Test_SkippedSlotsErrorIncrementTablePassCountAndCa UtAssert_True(SCH_AppData.SkippedSlotsCount == 1, "SCH_AppData.SkippedSlotsCount == 1"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SKIPPED_SLOTS_EID, CFE_EVS_ERROR, "Slots skipped: slot = 53, count = 98"), + (Ut_CFE_EVS_EventSent(SCH_SKIPPED_SLOTS_EID, CFE_EVS_ERROR_BIT, "Slots skipped: slot = 53, count = 98"), "Slots skipped: slot = 53, count = 98"); UtAssert_True(SCH_AppData.TablePassCount == 1, "SCH_AppData.TablePassCount == 1"); @@ -1338,7 +1338,7 @@ void SCH_ProcessScheduleTable_Test_MultiSlotsProcessCountTooLargeSynchronizedPro UtAssert_True(SCH_AppData.MultipleSlotsCount == 1, "SCH_AppData.MultipleSlotsCount == 1"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_MULTI_SLOTS_EID, CFE_EVS_INFORMATION, "Multiple slots processed: slot = 51, count = 5"), + (Ut_CFE_EVS_EventSent(SCH_MULTI_SLOTS_EID, CFE_EVS_INFORMATION_BIT, "Multiple slots processed: slot = 51, count = 5"), "Multiple slots processed: slot = 51, count = 5"); UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); @@ -1371,7 +1371,7 @@ void SCH_ProcessScheduleTable_Test_MultiSlotsNotSynchronizedProcessCountGreaterT UtAssert_True(SCH_AppData.MultipleSlotsCount == 1, "SCH_AppData.MultipleSlotsCount == 1"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_MULTI_SLOTS_EID, CFE_EVS_INFORMATION, "Multiple slots processed: slot = 100, count = 5"), + (Ut_CFE_EVS_EventSent(SCH_MULTI_SLOTS_EID, CFE_EVS_INFORMATION_BIT, "Multiple slots processed: slot = 100, count = 5"), "Multiple slots processed: slot = 100, count = 5"); UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); @@ -1451,11 +1451,11 @@ void SCH_ProcessNextEntry_Test_CorruptMessageIndex(void) UtAssert_True (SCH_AppData.BadTableDataCount == 1, "SCH_AppData.BadTableDataCount == 1"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_CORRUPTION_EID, CFE_EVS_ERROR, "Corrupt data error (1): slot = 2, entry = 1"), + (Ut_CFE_EVS_EventSent(SCH_CORRUPTION_EID, CFE_EVS_ERROR_BIT, "Corrupt data error (1): slot = 2, entry = 1"), "Corrupt data error (1): slot = 2, entry = 1"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_CORRUPTION_EID, CFE_EVS_ERROR, "Corrupt data error (2): msg = 128, freq = 99, type = 1, rem = 1"), + (Ut_CFE_EVS_EventSent(SCH_CORRUPTION_EID, CFE_EVS_ERROR_BIT, "Corrupt data error (2): msg = 128, freq = 99, type = 1, rem = 1"), "Corrupt data error (2): msg = 128, freq = 99, type = 1, rem = 1"); UtAssert_True (SCH_AppData.ScheduleTable[EntryNumber].EnableState == SCH_DISABLED, "SCH_AppData.ScheduleTable[EntryNumber].EnableState == SCH_DISABLED"); @@ -1482,11 +1482,11 @@ void SCH_ProcessNextEntry_Test_CorruptFrequency(void) UtAssert_True (SCH_AppData.BadTableDataCount == 1, "SCH_AppData.BadTableDataCount == 1"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_CORRUPTION_EID, CFE_EVS_ERROR, "Corrupt data error (1): slot = 2, entry = 1"), + (Ut_CFE_EVS_EventSent(SCH_CORRUPTION_EID, CFE_EVS_ERROR_BIT, "Corrupt data error (1): slot = 2, entry = 1"), "Corrupt data error (1): slot = 2, entry = 1"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_CORRUPTION_EID, CFE_EVS_ERROR, "Corrupt data error (2): msg = 127, freq = 0, type = 1, rem = 1"), + (Ut_CFE_EVS_EventSent(SCH_CORRUPTION_EID, CFE_EVS_ERROR_BIT, "Corrupt data error (2): msg = 127, freq = 0, type = 1, rem = 1"), "Corrupt data error (2): msg = 127, freq = 0, type = 1, rem = 1"); UtAssert_True (SCH_AppData.ScheduleTable[EntryNumber].EnableState == SCH_DISABLED, "SCH_AppData.ScheduleTable[EntryNumber].EnableState == SCH_DISABLED"); @@ -1513,11 +1513,11 @@ void SCH_ProcessNextEntry_Test_CorruptType(void) UtAssert_True (SCH_AppData.BadTableDataCount == 1, "SCH_AppData.BadTableDataCount == 1"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_CORRUPTION_EID, CFE_EVS_ERROR, "Corrupt data error (1): slot = 2, entry = 1"), + (Ut_CFE_EVS_EventSent(SCH_CORRUPTION_EID, CFE_EVS_ERROR_BIT, "Corrupt data error (1): slot = 2, entry = 1"), "Corrupt data error (1): slot = 2, entry = 1"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_CORRUPTION_EID, CFE_EVS_ERROR, "Corrupt data error (2): msg = 127, freq = 99, type = 99, rem = 1"), + (Ut_CFE_EVS_EventSent(SCH_CORRUPTION_EID, CFE_EVS_ERROR_BIT, "Corrupt data error (2): msg = 127, freq = 99, type = 99, rem = 1"), "Corrupt data error (2): msg = 127, freq = 99, type = 99, rem = 1"); UtAssert_True (SCH_AppData.ScheduleTable[EntryNumber].EnableState == SCH_DISABLED, "SCH_AppData.ScheduleTable[EntryNumber].EnableState == SCH_DISABLED"); @@ -1544,11 +1544,11 @@ void SCH_ProcessNextEntry_Test_CorruptRemainder(void) UtAssert_True (SCH_AppData.BadTableDataCount == 1, "SCH_AppData.BadTableDataCount == 1"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_CORRUPTION_EID, CFE_EVS_ERROR, "Corrupt data error (1): slot = 2, entry = 1"), + (Ut_CFE_EVS_EventSent(SCH_CORRUPTION_EID, CFE_EVS_ERROR_BIT, "Corrupt data error (1): slot = 2, entry = 1"), "Corrupt data error (1): slot = 2, entry = 1"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_CORRUPTION_EID, CFE_EVS_ERROR, "Corrupt data error (2): msg = 127, freq = 99, type = 1, rem = 99"), + (Ut_CFE_EVS_EventSent(SCH_CORRUPTION_EID, CFE_EVS_ERROR_BIT, "Corrupt data error (2): msg = 127, freq = 99, type = 1, rem = 99"), "Corrupt data error (2): msg = 127, freq = 99, type = 1, rem = 99"); UtAssert_True (SCH_AppData.ScheduleTable[EntryNumber].EnableState == SCH_DISABLED, "SCH_AppData.ScheduleTable[EntryNumber].EnableState == SCH_DISABLED"); @@ -1604,7 +1604,7 @@ void SCH_ProcessNextEntry_Test_PacketSendError(void) UtAssert_True (SCH_AppData.ScheduleActivityFailureCount == 1, "SCH_AppData.ScheduleActivityFailureCount == 1"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_PACKET_SEND_EID, CFE_EVS_ERROR, "Activity error: slot = 2, entry = 1, err = 0xFFFFFFFF"), + (Ut_CFE_EVS_EventSent(SCH_PACKET_SEND_EID, CFE_EVS_ERROR_BIT, "Activity error: slot = 2, entry = 1, err = 0xFFFFFFFF"), "Activity error: slot = 2, entry = 1, err = 0xFFFFFFFF"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -1616,7 +1616,7 @@ void SCH_ProcessCommands_Test_OneMessage(void) int32 Result; SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_SEND_HK_MID, sizeof(SCH_NoArgsCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_SEND_HK_MID, sizeof(SCH_NoArgsCmd_t), true); SCH_AppData.MsgPtr = (CFE_SB_MsgPtr_t)(&CmdPacket); @@ -1643,7 +1643,7 @@ void SCH_ProcessCommands_Test_NoMessage(void) int32 Result; SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_SEND_HK_MID, sizeof(SCH_NoArgsCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_SEND_HK_MID, sizeof(SCH_NoArgsCmd_t), true); SCH_AppData.MsgPtr = (CFE_SB_MsgPtr_t)(&CmdPacket); @@ -1665,7 +1665,7 @@ void SCH_ProcessCommands_Test_RcvMsgError(void) int32 Result; SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_SEND_HK_MID, sizeof(SCH_NoArgsCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_SEND_HK_MID, sizeof(SCH_NoArgsCmd_t), true); SCH_AppData.MsgPtr = (CFE_SB_MsgPtr_t)(&CmdPacket); @@ -1687,7 +1687,7 @@ void SCH_ProcessCommands_Test_AppPipeError(void) int32 Result; SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_SEND_HK_MID, sizeof(SCH_NoArgsCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_SEND_HK_MID, sizeof(SCH_NoArgsCmd_t), true); SCH_AppData.MsgPtr = (CFE_SB_MsgPtr_t)(&CmdPacket); @@ -1727,11 +1727,11 @@ void SCH_ValidateScheduleData_Test_GarbageFrequency(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR, "Schedule tbl verify error - idx[0] ena[0] typ[0] fre[99] rem[0] msg[0] grp[0x00000000]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR_BIT, "Schedule tbl verify error - idx[0] ena[0] typ[0] fre[99] rem[0] msg[0] grp[0x00000000]"), "Schedule tbl verify error - idx[0] ena[0] typ[0] fre[99] rem[0] msg[0] grp[0x00000000]"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG, "Schedule table verify results -- good[0] bad[500] unused[0]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Schedule table verify results -- good[0] bad[500] unused[0]"), "Schedule table verify results -- good[0] bad[500] unused[0]"); UtAssert_True (SCH_AppData.TableVerifyFailureCount == 1, "SCH_AppData.TableVerifyFailureCount == 1"); @@ -1762,11 +1762,11 @@ void SCH_ValidateScheduleData_Test_GarbageRemainder(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR, "Schedule tbl verify error - idx[0] ena[0] typ[0] fre[0] rem[99] msg[0] grp[0x00000000]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR_BIT, "Schedule tbl verify error - idx[0] ena[0] typ[0] fre[0] rem[99] msg[0] grp[0x00000000]"), "Schedule tbl verify error - idx[0] ena[0] typ[0] fre[0] rem[99] msg[0] grp[0x00000000]"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG, "Schedule table verify results -- good[0] bad[500] unused[0]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Schedule table verify results -- good[0] bad[500] unused[0]"), "Schedule table verify results -- good[0] bad[500] unused[0]"); UtAssert_True (SCH_AppData.TableVerifyFailureCount == 1, "SCH_AppData.TableVerifyFailureCount == 1"); @@ -1797,11 +1797,11 @@ void SCH_ValidateScheduleData_Test_GarbageGroupData(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR, "Schedule tbl verify error - idx[0] ena[0] typ[0] fre[0] rem[0] msg[0] grp[0x0000000F]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR_BIT, "Schedule tbl verify error - idx[0] ena[0] typ[0] fre[0] rem[0] msg[0] grp[0x0000000F]"), "Schedule tbl verify error - idx[0] ena[0] typ[0] fre[0] rem[0] msg[0] grp[0x0000000F]"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG, "Schedule table verify results -- good[0] bad[500] unused[0]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Schedule table verify results -- good[0] bad[500] unused[0]"), "Schedule table verify results -- good[0] bad[500] unused[0]"); UtAssert_True (SCH_AppData.TableVerifyFailureCount == 1, "SCH_AppData.TableVerifyFailureCount == 1"); @@ -1832,11 +1832,11 @@ void SCH_ValidateScheduleData_Test_GarbageType(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR, "Schedule tbl verify error - idx[0] ena[0] typ[99] fre[0] rem[0] msg[0] grp[0x00000000]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR_BIT, "Schedule tbl verify error - idx[0] ena[0] typ[99] fre[0] rem[0] msg[0] grp[0x00000000]"), "Schedule tbl verify error - idx[0] ena[0] typ[99] fre[0] rem[0] msg[0] grp[0x00000000]"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG, "Schedule table verify results -- good[0] bad[500] unused[0]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Schedule table verify results -- good[0] bad[500] unused[0]"), "Schedule table verify results -- good[0] bad[500] unused[0]"); UtAssert_True (SCH_AppData.TableVerifyFailureCount == 1, "SCH_AppData.TableVerifyFailureCount == 1"); @@ -1867,11 +1867,11 @@ void SCH_ValidateScheduleData_Test_GarbageMessageIndex(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR, "Schedule tbl verify error - idx[0] ena[0] typ[0] fre[0] rem[0] msg[99] grp[0x00000000]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR_BIT, "Schedule tbl verify error - idx[0] ena[0] typ[0] fre[0] rem[0] msg[99] grp[0x00000000]"), "Schedule tbl verify error - idx[0] ena[0] typ[0] fre[0] rem[0] msg[99] grp[0x00000000]"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG, "Schedule table verify results -- good[0] bad[500] unused[0]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Schedule table verify results -- good[0] bad[500] unused[0]"), "Schedule table verify results -- good[0] bad[500] unused[0]"); UtAssert_True (SCH_AppData.TableVerifyFailureCount == 1, "SCH_AppData.TableVerifyFailureCount == 1"); @@ -1902,7 +1902,7 @@ void SCH_ValidateScheduleData_Test_EnableStateUnusedAllFieldsUnused(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG, "Schedule table verify results -- good[0] bad[0] unused[500]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Schedule table verify results -- good[0] bad[0] unused[500]"), "Schedule table verify results -- good[0] bad[0] unused[500]"); UtAssert_True (SCH_AppData.TableVerifySuccessCount == 1, "SCH_AppData.TableVerifySuccessCount == 1"); @@ -1933,11 +1933,11 @@ void SCH_ValidateScheduleData_Test_EnableStateEnabledFrequencyUnused(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR, "Schedule tbl verify error - idx[0] ena[1] typ[0] fre[0] rem[0] msg[0] grp[0x00000000]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR_BIT, "Schedule tbl verify error - idx[0] ena[1] typ[0] fre[0] rem[0] msg[0] grp[0x00000000]"), "Schedule tbl verify error - idx[0] ena[1] typ[0] fre[0] rem[0] msg[0] grp[0x00000000]"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG, "Schedule table verify results -- good[0] bad[500] unused[0]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Schedule table verify results -- good[0] bad[500] unused[0]"), "Schedule table verify results -- good[0] bad[500] unused[0]"); UtAssert_True (SCH_AppData.TableVerifyFailureCount == 1, "SCH_AppData.TableVerifyFailureCount == 1"); @@ -1968,11 +1968,11 @@ void SCH_ValidateScheduleData_Test_EnableStateDisabledFrequencyUnused(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR, "Schedule tbl verify error - idx[0] ena[2] typ[0] fre[0] rem[0] msg[0] grp[0x00000000]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR_BIT, "Schedule tbl verify error - idx[0] ena[2] typ[0] fre[0] rem[0] msg[0] grp[0x00000000]"), "Schedule tbl verify error - idx[0] ena[2] typ[0] fre[0] rem[0] msg[0] grp[0x00000000]"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG, "Schedule table verify results -- good[0] bad[500] unused[0]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Schedule table verify results -- good[0] bad[500] unused[0]"), "Schedule table verify results -- good[0] bad[500] unused[0]"); UtAssert_True (SCH_AppData.TableVerifyFailureCount == 1, "SCH_AppData.TableVerifyFailureCount == 1"); @@ -2003,11 +2003,11 @@ void SCH_ValidateScheduleData_Test_BadRemainder(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR, "Schedule tbl verify error - idx[0] ena[2] typ[0] fre[99] rem[100] msg[0] grp[0x00000000]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR_BIT, "Schedule tbl verify error - idx[0] ena[2] typ[0] fre[99] rem[100] msg[0] grp[0x00000000]"), "Schedule tbl verify error - idx[0] ena[2] typ[0] fre[99] rem[100] msg[0] grp[0x00000000]"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG, "Schedule table verify results -- good[0] bad[500] unused[0]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Schedule table verify results -- good[0] bad[500] unused[0]"), "Schedule table verify results -- good[0] bad[500] unused[0]"); UtAssert_True (SCH_AppData.TableVerifyFailureCount == 1, "SCH_AppData.TableVerifyFailureCount == 1"); @@ -2038,11 +2038,11 @@ void SCH_ValidateScheduleData_Test_BadActivity(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR, "Schedule tbl verify error - idx[0] ena[2] typ[99] fre[99] rem[1] msg[0] grp[0x00000000]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR_BIT, "Schedule tbl verify error - idx[0] ena[2] typ[99] fre[99] rem[1] msg[0] grp[0x00000000]"), "Schedule tbl verify error - idx[0] ena[2] typ[99] fre[99] rem[1] msg[0] grp[0x00000000]"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG, "Schedule table verify results -- good[0] bad[500] unused[0]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Schedule table verify results -- good[0] bad[500] unused[0]"), "Schedule table verify results -- good[0] bad[500] unused[0]"); UtAssert_True (SCH_AppData.TableVerifyFailureCount == 1, "SCH_AppData.TableVerifyFailureCount == 1"); @@ -2073,11 +2073,11 @@ void SCH_ValidateScheduleData_Test_MsgIndexZero(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR, "Schedule tbl verify error - idx[0] ena[2] typ[1] fre[99] rem[1] msg[0] grp[0x00000000]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR_BIT, "Schedule tbl verify error - idx[0] ena[2] typ[1] fre[99] rem[1] msg[0] grp[0x00000000]"), "Schedule tbl verify error - idx[0] ena[2] typ[1] fre[99] rem[1] msg[0] grp[0x00000000]"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG, "Schedule table verify results -- good[0] bad[500] unused[0]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Schedule table verify results -- good[0] bad[500] unused[0]"), "Schedule table verify results -- good[0] bad[500] unused[0]"); UtAssert_True (SCH_AppData.TableVerifyFailureCount == 1, "SCH_AppData.TableVerifyFailureCount == 1"); @@ -2108,11 +2108,11 @@ void SCH_ValidateScheduleData_Test_MsgIndexTooHigh(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR, "Schedule tbl verify error - idx[0] ena[2] typ[1] fre[99] rem[1] msg[128] grp[0x00000000]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR_BIT, "Schedule tbl verify error - idx[0] ena[2] typ[1] fre[99] rem[1] msg[128] grp[0x00000000]"), "Schedule tbl verify error - idx[0] ena[2] typ[1] fre[99] rem[1] msg[128] grp[0x00000000]"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG, "Schedule table verify results -- good[0] bad[500] unused[0]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Schedule table verify results -- good[0] bad[500] unused[0]"), "Schedule table verify results -- good[0] bad[500] unused[0]"); UtAssert_True (SCH_AppData.TableVerifyFailureCount == 1, "SCH_AppData.TableVerifyFailureCount == 1"); @@ -2144,7 +2144,7 @@ void SCH_ValidateScheduleData_Test_ValidEntryResult(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG, "Schedule table verify results -- good[500] bad[0] unused[0]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Schedule table verify results -- good[500] bad[0] unused[0]"), "Schedule table verify results -- good[500] bad[0] unused[0]"); UtAssert_True (SCH_AppData.TableVerifySuccessCount == 1, "SCH_AppData.TableVerifySuccessCount == 1"); @@ -2175,11 +2175,11 @@ void SCH_ValidateScheduleData_Test_EnableStateOther(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR, "Schedule tbl verify error - idx[0] ena[99] typ[1] fre[99] rem[1] msg[0] grp[0x00000000]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TBL_ERR_EID, CFE_EVS_ERROR_BIT, "Schedule tbl verify error - idx[0] ena[99] typ[1] fre[99] rem[1] msg[0] grp[0x00000000]"), "Schedule tbl verify error - idx[0] ena[99] typ[1] fre[99] rem[1] msg[0] grp[0x00000000]"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG, "Schedule table verify results -- good[0] bad[500] unused[0]"), + (Ut_CFE_EVS_EventSent(SCH_SCHEDULE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Schedule table verify results -- good[0] bad[500] unused[0]"), "Schedule table verify results -- good[0] bad[500] unused[0]"); UtAssert_True (SCH_AppData.TableVerifyFailureCount == 1, "SCH_AppData.TableVerifyFailureCount == 1"); @@ -2212,11 +2212,11 @@ void SCH_ValidateMessageData_Test_MessageIdUnusedGarbageEntry(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TBL_ERR_EID, CFE_EVS_ERROR, "Message tbl verify err - idx[0] mid[0x1897] len[10] buf[0]"), + (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TBL_ERR_EID, CFE_EVS_ERROR_BIT, "Message tbl verify err - idx[0] mid[0x1897] len[10] buf[0]"), "Message tbl verify err - idx[0] mid[0x1897] len[10] buf[0]"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TABLE_EID, CFE_EVS_DEBUG, "Message tbl verify results - good[0] bad[1] unused[127]"), + (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Message tbl verify results - good[0] bad[1] unused[127]"), "Message tbl verify results - good[0] bad[1] unused[127]"); UtAssert_True (SCH_AppData.TableVerifyFailureCount == 1, "SCH_AppData.TableVerifyFailureCount == 1"); @@ -2244,7 +2244,7 @@ void SCH_ValidateMessageData_Test_MessageIdUnusedValid(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TABLE_EID, CFE_EVS_DEBUG, "Message tbl verify results - good[0] bad[0] unused[128]"), + (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Message tbl verify results - good[0] bad[0] unused[128]"), "Message tbl verify results - good[0] bad[0] unused[128]"); UtAssert_True (SCH_AppData.TableVerifySuccessCount == 1, "SCH_AppData.TableVerifySuccessCount == 1"); @@ -2272,11 +2272,11 @@ void SCH_ValidateMessageData_Test_MessageIdValidRangeLengthTooHigh(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TBL_ERR_EID, CFE_EVS_ERROR, "Message tbl verify err - idx[0] mid[0x1FFF] len[130] buf[0]"), + (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TBL_ERR_EID, CFE_EVS_ERROR_BIT, "Message tbl verify err - idx[0] mid[0x1FFF] len[130] buf[0]"), "Message tbl verify err - idx[0] mid[0x1FFF] len[130] buf[0]"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TABLE_EID, CFE_EVS_DEBUG, "Message tbl verify results - good[0] bad[128] unused[0]"), + (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Message tbl verify results - good[0] bad[128] unused[0]"), "Message tbl verify results - good[0] bad[128] unused[0]"); UtAssert_True (SCH_AppData.TableVerifyFailureCount == 1, "SCH_AppData.TableVerifyFailureCount == 1"); @@ -2304,11 +2304,11 @@ void SCH_ValidateMessageData_Test_MessageIdValidRangeLengthTooLow(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TBL_ERR_EID, CFE_EVS_ERROR, "Message tbl verify err - idx[0] mid[0x1FFF] len[6] buf[0]"), + (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TBL_ERR_EID, CFE_EVS_ERROR_BIT, "Message tbl verify err - idx[0] mid[0x1FFF] len[6] buf[0]"), "Message tbl verify err - idx[0] mid[0x1FFF] len[6] buf[0]"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TABLE_EID, CFE_EVS_DEBUG, "Message tbl verify results - good[0] bad[128] unused[0]"), + (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Message tbl verify results - good[0] bad[128] unused[0]"), "Message tbl verify results - good[0] bad[128] unused[0]"); UtAssert_True (SCH_AppData.TableVerifyFailureCount == 1, "SCH_AppData.TableVerifyFailureCount == 1"); @@ -2336,11 +2336,11 @@ void SCH_ValidateMessageData_Test_MessageIdValidRangeLengthOdd(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TBL_ERR_EID, CFE_EVS_ERROR, "Message tbl verify err - idx[0] mid[0x1FFF] len[19] buf[0]"), + (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TBL_ERR_EID, CFE_EVS_ERROR_BIT, "Message tbl verify err - idx[0] mid[0x1FFF] len[19] buf[0]"), "Message tbl verify err - idx[0] mid[0x1FFF] len[19] buf[0]"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TABLE_EID, CFE_EVS_DEBUG, "Message tbl verify results - good[0] bad[128] unused[0]"), + (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Message tbl verify results - good[0] bad[128] unused[0]"), "Message tbl verify results - good[0] bad[128] unused[0]"); UtAssert_True (SCH_AppData.TableVerifyFailureCount == 1, "SCH_AppData.TableVerifyFailureCount == 1"); @@ -2368,7 +2368,7 @@ void SCH_ValidateMessageData_Test_MessageIdValidRangeLengthValid(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TABLE_EID, CFE_EVS_DEBUG, "Message tbl verify results - good[128] bad[0] unused[0]"), + (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Message tbl verify results - good[128] bad[0] unused[0]"), "Message tbl verify results - good[128] bad[0] unused[0]"); UtAssert_True (SCH_AppData.TableVerifySuccessCount == 1, "SCH_AppData.TableVerifySuccessCount == 1"); @@ -2396,11 +2396,11 @@ void SCH_ValidateMessageData_Test_MessageIdOther(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TBL_ERR_EID, CFE_EVS_ERROR, "Message tbl verify err - idx[0] mid[0x2000] len[18] buf[0]"), + (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TBL_ERR_EID, CFE_EVS_ERROR_BIT, "Message tbl verify err - idx[0] mid[0x2000] len[18] buf[0]"), "Message tbl verify err - idx[0] mid[0x2000] len[18] buf[0]"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TABLE_EID, CFE_EVS_DEBUG, "Message tbl verify results - good[0] bad[128] unused[0]"), + (Ut_CFE_EVS_EventSent(SCH_MESSAGE_TABLE_EID, CFE_EVS_DEBUG_BIT, "Message tbl verify results - good[0] bad[128] unused[0]"), "Message tbl verify results - good[0] bad[128] unused[0]"); UtAssert_True (SCH_AppData.TableVerifyFailureCount == 1, "SCH_AppData.TableVerifyFailureCount == 1"); diff --git a/fsw/unit_test/sch_cmds.c.gcov b/fsw/unit_test/sch_cmds.c.gcov index d82ab50..7555874 100644 --- a/fsw/unit_test/sch_cmds.c.gcov +++ b/fsw/unit_test/sch_cmds.c.gcov @@ -125,7 +125,7 @@ -: 123: ** SCH ground commands with unknown command codes... -: 124: */ -: 125: default: - 1: 126: CFE_EVS_SendEvent(SCH_CC_ERR_EID, CFE_EVS_ERROR, + 1: 126: CFE_EVS_SendEvent(SCH_CC_ERR_EID, CFE_EVS_ERROR_BIT, -: 127: "Invalid command code: ID = 0x%04X, CC = %d", -: 128: MessageID, CommandCode); -: 129: @@ -138,7 +138,7 @@ -: 136: ** Unknown message ID's -: 137: */ -: 138: default: - 1: 139: CFE_EVS_SendEvent(SCH_MD_ERR_EID, CFE_EVS_ERROR, + 1: 139: CFE_EVS_SendEvent(SCH_MD_ERR_EID, CFE_EVS_ERROR_BIT, -: 140: "Msg with Invalid message ID Rcvd -- ID = 0x%04X", -: 141: MessageID); -: 142: break; @@ -191,8 +191,8 @@ -: 189: /* -: 190: ** Timestamps and send housekeeping packet -: 191: */ - 4: 192: CFE_SB_TimeStampMsg((CFE_SB_Msg_t *) &SCH_AppData.HkPacket); - 4: 193: CFE_SB_SendMsg((CFE_SB_Msg_t *) &SCH_AppData.HkPacket); + 4: 192: CFE_SB_TimeStampMsg((CFE_MSG_Message_t *) &SCH_AppData.HkPacket); + 4: 193: CFE_SB_SendMsg((CFE_MSG_Message_t *) &SCH_AppData.HkPacket); -: 194: -: 195: /* -: 196: ** Reset "high rate" event filters @@ -241,7 +241,7 @@ -: 239: */ 3: 240: SCH_AppData.CmdCounter++; -: 241: - 3: 242: CFE_EVS_SendEvent(SCH_NOOP_CMD_EID, CFE_EVS_INFORMATION, + 3: 242: CFE_EVS_SendEvent(SCH_NOOP_CMD_EID, CFE_EVS_INFORMATION_BIT, -: 243: "NO-op command. Version %d.%d.%d.%d", -: 244: SCH_MAJOR_VERSION, -: 245: SCH_MINOR_VERSION, @@ -291,7 +291,7 @@ 1: 289: SCH_AppData.MissedMajorFrameCount = 0; 1: 290: SCH_AppData.UnexpectedMajorFrameCount = 0; -: 291: - 1: 292: CFE_EVS_SendEvent(SCH_RESET_CMD_EID, CFE_EVS_DEBUG, + 1: 292: CFE_EVS_SendEvent(SCH_RESET_CMD_EID, CFE_EVS_DEBUG_BIT, -: 293: "RESET command"); -: 294: } -: 295: @@ -309,7 +309,7 @@ -: 307: 6: 308:void SCH_EnableCmd(CFE_SB_MsgPtr_t MessagePtr) -: 309:{ - 6: 310: boolean GoodCommand = FALSE; + 6: 310: bool GoodCommand = false; 6: 311: SCH_EntryCmd_t *EnableCmd = NULL; 6: 312: uint16 SlotNumber = 0; 6: 313: uint16 EntryNumber = 0; @@ -331,7 +331,7 @@ -: 329: /* -: 330: ** Invalid command packet argument -: 331: */ - 3: 332: CFE_EVS_SendEvent(SCH_ENABLE_CMD_ARG_ERR_EID, CFE_EVS_ERROR, + 3: 332: CFE_EVS_SendEvent(SCH_ENABLE_CMD_ARG_ERR_EID, CFE_EVS_ERROR_BIT, -: 333: "ENABLE cmd: invalid argument, slot=%d (<%d), entry=%d (<%d)", -: 334: SlotNumber, SCH_TOTAL_SLOTS, -: 335: EntryNumber, SCH_ENTRIES_PER_SLOT); @@ -342,7 +342,7 @@ -: 340: /* -: 341: ** Invalid schedule table enable state (unused or corrupt) -: 342: */ - 2: 343: CFE_EVS_SendEvent(SCH_ENABLE_CMD_ENTRY_ERR_EID, CFE_EVS_ERROR, + 2: 343: CFE_EVS_SendEvent(SCH_ENABLE_CMD_ENTRY_ERR_EID, CFE_EVS_ERROR_BIT, -: 344: "ENABLE command: invalid state = %d, slot = %d, entry = %d", 1: 345: SCH_AppData.ScheduleTable[TableIndex].EnableState, -: 346: SlotNumber, EntryNumber); @@ -352,12 +352,12 @@ -: 350: /* -: 351: ** Success -: 352: */ - 1: 353: GoodCommand = TRUE; + 1: 353: GoodCommand = true; -: 354: 1: 355: SCH_AppData.ScheduleTable[TableIndex].EnableState = SCH_ENABLED; 1: 356: CFE_TBL_Modified(SCH_AppData.ScheduleTableHandle); -: 357: - 1: 358: CFE_EVS_SendEvent(SCH_ENABLE_CMD_EID, CFE_EVS_DEBUG, + 1: 358: CFE_EVS_SendEvent(SCH_ENABLE_CMD_EID, CFE_EVS_DEBUG_BIT, -: 359: "ENABLE command: slot = %d, entry = %d", -: 360: SlotNumber, EntryNumber ); -: 361: } @@ -379,7 +379,7 @@ -: 377: 6: 378:void SCH_DisableCmd(CFE_SB_MsgPtr_t MessagePtr) -: 379:{ - 6: 380: boolean GoodCommand = FALSE; + 6: 380: bool GoodCommand = false; 6: 381: SCH_EntryCmd_t *DisableCmd = NULL; 6: 382: uint16 SlotNumber = 0; 6: 383: uint16 EntryNumber = 0; @@ -401,7 +401,7 @@ -: 399: /* -: 400: ** Invalid command packet argument -: 401: */ - 3: 402: CFE_EVS_SendEvent(SCH_DISABLE_CMD_ARG_ERR_EID, CFE_EVS_ERROR, + 3: 402: CFE_EVS_SendEvent(SCH_DISABLE_CMD_ARG_ERR_EID, CFE_EVS_ERROR_BIT, -: 403: "DISABLE cmd: invalid argument, slot=%d (<%d), entry=%d (<%d)", -: 404: SlotNumber, SCH_TOTAL_SLOTS, -: 405: EntryNumber, SCH_ENTRIES_PER_SLOT); @@ -412,7 +412,7 @@ -: 410: /* -: 411: ** Invalid schedule table enable state (unused or corrupt) -: 412: */ - 2: 413: CFE_EVS_SendEvent(SCH_DISABLE_CMD_ENTRY_ERR_EID, CFE_EVS_ERROR, + 2: 413: CFE_EVS_SendEvent(SCH_DISABLE_CMD_ENTRY_ERR_EID, CFE_EVS_ERROR_BIT, -: 414: "DISABLE command: invalid state = %d, slot = %d, entry = %d", 1: 415: SCH_AppData.ScheduleTable[TableIndex].EnableState, -: 416: SlotNumber, EntryNumber); @@ -422,12 +422,12 @@ -: 420: /* -: 421: ** Success -: 422: */ - 1: 423: GoodCommand = TRUE; + 1: 423: GoodCommand = true; -: 424: 1: 425: SCH_AppData.ScheduleTable[TableIndex].EnableState = SCH_DISABLED; 1: 426: CFE_TBL_Modified(SCH_AppData.ScheduleTableHandle); -: 427: - 1: 428: CFE_EVS_SendEvent(SCH_DISABLE_CMD_EID, CFE_EVS_DEBUG, + 1: 428: CFE_EVS_SendEvent(SCH_DISABLE_CMD_EID, CFE_EVS_DEBUG_BIT, -: 429: "DISABLE command: slot = %d, entry = %d", -: 430: SlotNumber, EntryNumber); -: 431: } @@ -449,7 +449,7 @@ -: 447: 6: 448:void SCH_EnableGroupCmd(CFE_SB_MsgPtr_t MessagePtr) -: 449:{ - 6: 450: boolean GoodCommand = FALSE; + 6: 450: bool GoodCommand = false; 6: 451: uint32 TblGroupNumber = 0; 6: 452: uint32 TblMultiGroup = 0; 6: 453: int32 LoopCount = 0; @@ -475,7 +475,7 @@ -: 473: /* -: 474: ** No groups selected -: 475: */ - 2: 476: CFE_EVS_SendEvent(SCH_ENA_GRP_CMD_ERR_EID, CFE_EVS_ERROR, + 2: 476: CFE_EVS_SendEvent(SCH_ENA_GRP_CMD_ERR_EID, CFE_EVS_ERROR_BIT, -: 477: "ENABLE GROUP command: invalid argument, no groups selected"); -: 478: } -: 479: else @@ -510,14 +510,14 @@ 3: 508: if (MatchCount > 0) -: 509: { 2: 510: CFE_TBL_Modified(SCH_AppData.ScheduleTableHandle); - 2: 511: CFE_EVS_SendEvent(SCH_ENA_GRP_CMD_EID, CFE_EVS_DEBUG, + 2: 511: CFE_EVS_SendEvent(SCH_ENA_GRP_CMD_EID, CFE_EVS_DEBUG_BIT, -: 512: "ENABLE GROUP command: match count = %d", -: 513: (int)MatchCount); - 2: 514: GoodCommand = TRUE; + 2: 514: GoodCommand = true; -: 515: } -: 516: else -: 517: { - 1: 518: CFE_EVS_SendEvent(SCH_ENA_GRP_NOT_FOUND_ERR_EID, CFE_EVS_ERROR, + 1: 518: CFE_EVS_SendEvent(SCH_ENA_GRP_NOT_FOUND_ERR_EID, CFE_EVS_ERROR_BIT, -: 519: "ENABLE GROUP command: Neither Group %d nor Multi-Group 0x%06X found", 1: 520: (int)(CmdGroupNumber>>24), (unsigned int)CmdMultiGroup); -: 521: } @@ -540,7 +540,7 @@ -: 538: 6: 539:void SCH_DisableGroupCmd(CFE_SB_MsgPtr_t MessagePtr) -: 540:{ - 6: 541: boolean GoodCommand = FALSE; + 6: 541: bool GoodCommand = false; 6: 542: uint32 TblGroupNumber = 0; 6: 543: uint32 TblMultiGroup = 0; 6: 544: int32 LoopCount = 0; @@ -566,7 +566,7 @@ -: 564: /* -: 565: ** No groups selected -: 566: */ - 2: 567: CFE_EVS_SendEvent(SCH_DIS_GRP_CMD_ERR_EID, CFE_EVS_ERROR, + 2: 567: CFE_EVS_SendEvent(SCH_DIS_GRP_CMD_ERR_EID, CFE_EVS_ERROR_BIT, -: 568: "DISABLE GROUP command: invalid argument, no groups selected"); -: 569: } -: 570: else @@ -601,14 +601,14 @@ 3: 599: if (MatchCount > 0) -: 600: { 2: 601: CFE_TBL_Modified(SCH_AppData.ScheduleTableHandle); - 2: 602: CFE_EVS_SendEvent(SCH_DIS_GRP_CMD_EID, CFE_EVS_DEBUG, + 2: 602: CFE_EVS_SendEvent(SCH_DIS_GRP_CMD_EID, CFE_EVS_DEBUG_BIT, -: 603: "DISABLE GROUP command: match count = %d", -: 604: (int)MatchCount); - 2: 605: GoodCommand = TRUE; + 2: 605: GoodCommand = true; -: 606: } -: 607: else -: 608: { - 1: 609: CFE_EVS_SendEvent(SCH_DIS_GRP_NOT_FOUND_ERR_EID, CFE_EVS_ERROR, + 1: 609: CFE_EVS_SendEvent(SCH_DIS_GRP_NOT_FOUND_ERR_EID, CFE_EVS_ERROR_BIT, -: 610: "DISABLE GROUP command: Neither Group %d nor Multi-Group 0x%06X found", 1: 611: (int)(CmdGroupNumber>>24), (unsigned int)CmdMultiGroup); -: 612: } @@ -631,17 +631,17 @@ -: 629: 3: 630:void SCH_EnableSyncCmd(CFE_SB_MsgPtr_t MessagePtr) -: 631:{ - 3: 632: boolean GoodCommand = FALSE; + 3: 632: bool GoodCommand = false; -: 633: 3: 634: if(SCH_VerifyCmdLength(MessagePtr, sizeof(SCH_NoArgsCmd_t)) == SCH_SUCCESS) -: 635: { - 2: 636: GoodCommand = TRUE; + 2: 636: GoodCommand = true; -: 637: - 2: 638: SCH_AppData.IgnoreMajorFrame = FALSE; - 2: 639: SCH_AppData.UnexpectedMajorFrame = FALSE; + 2: 638: SCH_AppData.IgnoreMajorFrame = false; + 2: 639: SCH_AppData.UnexpectedMajorFrame = false; 2: 640: SCH_AppData.ConsecutiveNoisyFrameCounter = 0; -: 641: - 2: 642: CFE_EVS_SendEvent(SCH_ENA_SYNC_CMD_EID, CFE_EVS_DEBUG, + 2: 642: CFE_EVS_SendEvent(SCH_ENA_SYNC_CMD_EID, CFE_EVS_DEBUG_BIT, -: 643: "Major Frame Synchronization Enabled"); -: 644: } -: 645: @@ -663,7 +663,7 @@ -: 661: 5: 662:void SCH_SendDiagTlmCmd(CFE_SB_MsgPtr_t MessagePtr) -: 663:{ - 5: 664: boolean GoodCommand = FALSE; + 5: 664: bool GoodCommand = false; 5: 665: uint32 TblIndex = 0; 5: 666: uint32 WordIndex = 0; 5: 667: uint32 BitIndex = 0; @@ -671,7 +671,7 @@ -: 669: 5: 670: if(SCH_VerifyCmdLength(MessagePtr, sizeof(SCH_NoArgsCmd_t)) == SCH_SUCCESS) -: 671: { - 3: 672: GoodCommand = TRUE; + 3: 672: GoodCommand = true; -: 673: -: 674: /* Zero out the previous entry states */ 3: 675: CFE_PSP_MemSet(&SCH_AppData.DiagPacket.EntryStates[0], 0x0, SCH_NUM_STATUS_BYTES_REQD); @@ -702,10 +702,10 @@ -: 700: /* -: 701: ** Timestamp and send diagnostic packet -: 702: */ - 3: 703: CFE_SB_TimeStampMsg((CFE_SB_Msg_t *) &SCH_AppData.DiagPacket); - 3: 704: CFE_SB_SendMsg((CFE_SB_Msg_t *) &SCH_AppData.DiagPacket); + 3: 703: CFE_SB_TimeStampMsg((CFE_MSG_Message_t *) &SCH_AppData.DiagPacket); + 3: 704: CFE_SB_SendMsg((CFE_MSG_Message_t *) &SCH_AppData.DiagPacket); -: 705: - 3: 706: CFE_EVS_SendEvent(SCH_SEND_DIAG_CMD_EID, CFE_EVS_DEBUG, + 3: 706: CFE_EVS_SendEvent(SCH_SEND_DIAG_CMD_EID, CFE_EVS_DEBUG_BIT, -: 707: "Transmitting Diagnostic Message"); -: 708: } -: 709: @@ -786,7 +786,7 @@ 10: 784: MessageID = CFE_SB_GetMsgId(MessagePtr); 10: 785: CommandCode = CFE_SB_GetCmdCode(MessagePtr); -: 786: - 10: 787: CFE_EVS_SendEvent(SCH_CMD_LEN_ERR_EID, CFE_EVS_ERROR, + 10: 787: CFE_EVS_SendEvent(SCH_CMD_LEN_ERR_EID, CFE_EVS_ERROR_BIT, -: 788: "Cmd Msg with Bad length Rcvd: ID = 0x%04X, CC = %d, Exp Len = %d, Len = %d", -: 789: MessageID, CommandCode, (int)ExpectedLength, ActualLength); -: 790: @@ -805,7 +805,7 @@ -: 803:** NOTE: For complete prolog information, see above -: 804:********************************************************************/ -: 805: - 34: 806:void SCH_PostCommandResult(boolean GoodCommand) + 34: 806:void SCH_PostCommandResult(bool GoodCommand) -: 807:{ 34: 808: if (GoodCommand) -: 809: { diff --git a/fsw/unit_test/sch_cmds_test.c b/fsw/unit_test/sch_cmds_test.c index 0d35978..1627043 100644 --- a/fsw/unit_test/sch_cmds_test.c +++ b/fsw/unit_test/sch_cmds_test.c @@ -51,7 +51,7 @@ void SCH_AppPipe_Test_SendHK(void) int32 Result; SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_SEND_HK_MID, sizeof(SCH_NoArgsCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_SEND_HK_MID, sizeof(SCH_NoArgsCmd_t), true); /* Set to make SCH_HousekeepingCmd return CFE_SUCCESS */ Ut_CFE_TBL_SetReturnCode(UT_CFE_TBL_GETADDRESS_INDEX, CFE_SUCCESS, 1); @@ -72,7 +72,7 @@ void SCH_AppPipe_Test_Noop(void) int32 Result; SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), true); CFE_SB_SetCmdCode ((CFE_SB_MsgPtr_t)(&CmdPacket), SCH_NOOP_CC); /* Execute the function being tested */ @@ -91,7 +91,7 @@ void SCH_AppPipe_Test_Reset(void) int32 Result; SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), true); CFE_SB_SetCmdCode ((CFE_SB_MsgPtr_t)(&CmdPacket), SCH_RESET_CC); /* Execute the function being tested */ @@ -110,7 +110,7 @@ void SCH_AppPipe_Test_Enable(void) int32 Result; SCH_EntryCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_EntryCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_EntryCmd_t), true); CFE_SB_SetCmdCode ((CFE_SB_MsgPtr_t)(&CmdPacket), SCH_ENABLE_CC); /* Setting these 2 values just to prevent a segmentation fault */ @@ -133,7 +133,7 @@ void SCH_AppPipe_Test_Disable(void) int32 Result; SCH_EntryCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_EntryCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_EntryCmd_t), true); CFE_SB_SetCmdCode ((CFE_SB_MsgPtr_t)(&CmdPacket), SCH_DISABLE_CC); /* Setting these 2 values just to prevent a segmentation fault */ @@ -156,7 +156,7 @@ void SCH_AppPipe_Test_EnableGroupCmd(void) int32 Result; SCH_GroupCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_GroupCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_GroupCmd_t), true); CFE_SB_SetCmdCode ((CFE_SB_MsgPtr_t)(&CmdPacket), SCH_ENABLE_GROUP_CC); /* Execute the function being tested */ @@ -175,7 +175,7 @@ void SCH_AppPipe_Test_DisableGroupCmd(void) int32 Result; SCH_GroupCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_GroupCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_GroupCmd_t), true); CFE_SB_SetCmdCode ((CFE_SB_MsgPtr_t)(&CmdPacket), SCH_DISABLE_GROUP_CC); /* Execute the function being tested */ @@ -194,7 +194,7 @@ void SCH_AppPipe_Test_EnableSyncCmd(void) int32 Result; SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), true); CFE_SB_SetCmdCode ((CFE_SB_MsgPtr_t)(&CmdPacket), SCH_ENABLE_SYNC_CC); /* Execute the function being tested */ @@ -213,7 +213,7 @@ void SCH_AppPipe_Test_SendDiagTlmCmd(void) int32 Result; SCH_ScheduleEntry_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_ScheduleEntry_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_ScheduleEntry_t), true); CFE_SB_SetCmdCode ((CFE_SB_MsgPtr_t)(&CmdPacket), SCH_SEND_DIAG_TLM_CC); /* Execute the function being tested */ @@ -232,7 +232,7 @@ void SCH_AppPipe_Test_InvalidCommandCode(void) int32 Result; SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), true); CFE_SB_SetCmdCode ((CFE_SB_MsgPtr_t)(&CmdPacket), 99); /* Execute the function being tested */ @@ -240,7 +240,7 @@ void SCH_AppPipe_Test_InvalidCommandCode(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_CC_ERR_EID, CFE_EVS_ERROR, "Invalid command code: ID = 0x1895, CC = 99"), + (Ut_CFE_EVS_EventSent(SCH_CC_ERR_EID, CFE_EVS_ERROR_BIT, "Invalid command code: ID = 0x1895, CC = 99"), "Invalid command code: ID = 0x1895, CC = 99"); UtAssert_True (SCH_AppData.ErrCounter == 1, "SCH_AppData.ErrCounter == 1"); @@ -255,14 +255,14 @@ void SCH_AppPipe_Test_InvalidMessageID(void) int32 Result; SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, 0x0099, sizeof(SCH_NoArgsCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, 0x0099, sizeof(SCH_NoArgsCmd_t), true); /* Execute the function being tested */ Result = SCH_AppPipe((CFE_SB_MsgPtr_t)(&CmdPacket)); /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_MD_ERR_EID, CFE_EVS_ERROR, "Msg with Invalid message ID Rcvd -- ID = 0x0099"), + (Ut_CFE_EVS_EventSent(SCH_MD_ERR_EID, CFE_EVS_ERROR_BIT, "Msg with Invalid message ID Rcvd -- ID = 0x0099"), "Msg with Invalid message ID Rcvd -- ID = 0x0099"); UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); @@ -276,7 +276,7 @@ void SCH_HousekeepingCmd_Test(void) int32 Result; SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_SEND_HK_MID, sizeof(SCH_NoArgsCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_SEND_HK_MID, sizeof(SCH_NoArgsCmd_t), true); /* Set to make SCH_AcquirePointers return CFE_SUCCESS */ Ut_CFE_TBL_SetReturnCode(UT_CFE_TBL_GETADDRESS_INDEX, CFE_SUCCESS, 1); @@ -342,7 +342,7 @@ void SCH_NoopCmd_Test_Error(void) { SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, 1, TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, 1, true); /* Execute the function being tested */ SCH_NoopCmd((CFE_SB_MsgPtr_t)(&CmdPacket)); @@ -360,14 +360,14 @@ void SCH_NoopCmd_Test_Nominal(void) SCH_NoArgsCmd_t CmdPacket; char Message[125]; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), true); /* Execute the function being tested */ SCH_NoopCmd((CFE_SB_MsgPtr_t)(&CmdPacket)); /* Verify results */ sprintf(Message, "NO-op command. Version %d.%d.%d.%d", SCH_MAJOR_VERSION, SCH_MINOR_VERSION, SCH_REVISION, SCH_MISSION_REV); - UtAssert_True (Ut_CFE_EVS_EventSent(SCH_NOOP_CMD_EID, CFE_EVS_INFORMATION, Message), Message); + UtAssert_True (Ut_CFE_EVS_EventSent(SCH_NOOP_CMD_EID, CFE_EVS_INFORMATION_BIT, Message), Message); UtAssert_True (SCH_AppData.CmdCounter == 1, "SCH_AppData.CmdCounter == 1"); @@ -379,7 +379,7 @@ void SCH_ResetCmd_Test_Error(void) { SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, 1, TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, 1, true); /* Execute the function being tested */ SCH_ResetCmd((CFE_SB_MsgPtr_t)(&CmdPacket)); @@ -396,7 +396,7 @@ void SCH_ResetCmd_Test_Nominal(void) { SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, 1, TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, 1, true); /* Execute the function being tested */ SCH_ResetCmd((CFE_SB_MsgPtr_t)(&CmdPacket)); @@ -419,7 +419,7 @@ void SCH_ResetCmd_Test_Nominal(void) UtAssert_True(SCH_AppData.UnexpectedMajorFrameCount = 0, "SCH_AppData.UnexpectedMajorFrameCount = 0"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_RESET_CMD_EID, CFE_EVS_DEBUG, "RESET command"), + (Ut_CFE_EVS_EventSent(SCH_RESET_CMD_EID, CFE_EVS_DEBUG_BIT, "RESET command"), "RESET command"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -431,7 +431,7 @@ void SCH_EnableCmd_Test_InvalidCmdLength(void) { SCH_EntryCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, 1, TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, 1, true); /* Execute the function being tested */ SCH_EnableCmd((CFE_SB_MsgPtr_t)(&CmdPacket)); @@ -446,7 +446,7 @@ void SCH_EnableCmd_Test_InvalidArgumentSlotNumber(void) { SCH_EntryCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_EntryCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_EntryCmd_t), true); CmdPacket.SlotNumber = SCH_TOTAL_SLOTS; CmdPacket.EntryNumber = 1; @@ -456,7 +456,7 @@ void SCH_EnableCmd_Test_InvalidArgumentSlotNumber(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_ENABLE_CMD_ARG_ERR_EID, CFE_EVS_ERROR, "ENABLE cmd: invalid argument, slot=100 (<100), entry=1 (<5)"), + (Ut_CFE_EVS_EventSent(SCH_ENABLE_CMD_ARG_ERR_EID, CFE_EVS_ERROR_BIT, "ENABLE cmd: invalid argument, slot=100 (<100), entry=1 (<5)"), "ENABLE cmd: invalid argument, slot=100 (<100), entry=1 (<5)"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -467,7 +467,7 @@ void SCH_EnableCmd_Test_InvalidArgumentEntryNumber(void) { SCH_EntryCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_EntryCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_EntryCmd_t), true); CmdPacket.SlotNumber = 1; CmdPacket.EntryNumber = SCH_ENTRIES_PER_SLOT; @@ -477,7 +477,7 @@ void SCH_EnableCmd_Test_InvalidArgumentEntryNumber(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_ENABLE_CMD_ARG_ERR_EID, CFE_EVS_ERROR, "ENABLE cmd: invalid argument, slot=1 (<100), entry=5 (<5)"), + (Ut_CFE_EVS_EventSent(SCH_ENABLE_CMD_ARG_ERR_EID, CFE_EVS_ERROR_BIT, "ENABLE cmd: invalid argument, slot=1 (<100), entry=5 (<5)"), "ENABLE cmd: invalid argument, slot=1 (<100), entry=5 (<5)"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -488,7 +488,7 @@ void SCH_EnableCmd_Test_InvalidState(void) { SCH_EntryCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_EntryCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_EntryCmd_t), true); CmdPacket.SlotNumber = 0; CmdPacket.EntryNumber = 0; @@ -500,7 +500,7 @@ void SCH_EnableCmd_Test_InvalidState(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_ENABLE_CMD_ENTRY_ERR_EID, CFE_EVS_ERROR, "ENABLE command: invalid state = 99, slot = 0, entry = 0"), + (Ut_CFE_EVS_EventSent(SCH_ENABLE_CMD_ENTRY_ERR_EID, CFE_EVS_ERROR_BIT, "ENABLE command: invalid state = 99, slot = 0, entry = 0"), "ENABLE command: invalid state = 99, slot = 0, entry = 0"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -511,7 +511,7 @@ void SCH_EnableCmd_Test_Nominal(void) { SCH_EntryCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_EntryCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_EntryCmd_t), true); CmdPacket.SlotNumber = 0; CmdPacket.EntryNumber = 0; @@ -525,7 +525,7 @@ void SCH_EnableCmd_Test_Nominal(void) UtAssert_True (SCH_AppData.ScheduleTable[0].EnableState == SCH_ENABLED, "SCH_AppData.ScheduleTable[0].EnableState == SCH_ENABLED"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_ENABLE_CMD_EID, CFE_EVS_DEBUG, "ENABLE command: slot = 0, entry = 0"), + (Ut_CFE_EVS_EventSent(SCH_ENABLE_CMD_EID, CFE_EVS_DEBUG_BIT, "ENABLE command: slot = 0, entry = 0"), "ENABLE command: invalid state = 99, slot = 0, entry = 0"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -536,7 +536,7 @@ void SCH_DisableCmd_Test_InvalidCmdLength(void) { SCH_EntryCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, 1, TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, 1, true); /* Execute the function being tested */ SCH_DisableCmd((CFE_SB_MsgPtr_t)(&CmdPacket)); @@ -551,7 +551,7 @@ void SCH_DisableCmd_Test_InvalidArgumentSlotNumber(void) { SCH_EntryCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_EntryCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_EntryCmd_t), true); CmdPacket.SlotNumber = SCH_TOTAL_SLOTS; CmdPacket.EntryNumber = 1; @@ -561,7 +561,7 @@ void SCH_DisableCmd_Test_InvalidArgumentSlotNumber(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_DISABLE_CMD_ARG_ERR_EID, CFE_EVS_ERROR, "DISABLE cmd: invalid argument, slot=100 (<100), entry=1 (<5)"), + (Ut_CFE_EVS_EventSent(SCH_DISABLE_CMD_ARG_ERR_EID, CFE_EVS_ERROR_BIT, "DISABLE cmd: invalid argument, slot=100 (<100), entry=1 (<5)"), "DISABLE cmd: invalid argument, slot=100 (<100), entry=1 (<5)"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -572,7 +572,7 @@ void SCH_DisableCmd_Test_InvalidArgumentEntryNumber(void) { SCH_EntryCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_EntryCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_EntryCmd_t), true); CmdPacket.SlotNumber = 1; CmdPacket.EntryNumber = SCH_ENTRIES_PER_SLOT; @@ -582,7 +582,7 @@ void SCH_DisableCmd_Test_InvalidArgumentEntryNumber(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_DISABLE_CMD_ARG_ERR_EID, CFE_EVS_ERROR, "DISABLE cmd: invalid argument, slot=1 (<100), entry=5 (<5)"), + (Ut_CFE_EVS_EventSent(SCH_DISABLE_CMD_ARG_ERR_EID, CFE_EVS_ERROR_BIT, "DISABLE cmd: invalid argument, slot=1 (<100), entry=5 (<5)"), "DISABLE cmd: invalid argument, slot=1 (<100), entry=5 (<5)"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -593,7 +593,7 @@ void SCH_DisableCmd_Test_InvalidState(void) { SCH_EntryCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_EntryCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_EntryCmd_t), true); CmdPacket.SlotNumber = 0; CmdPacket.EntryNumber = 0; @@ -605,7 +605,7 @@ void SCH_DisableCmd_Test_InvalidState(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_DISABLE_CMD_ENTRY_ERR_EID, CFE_EVS_ERROR, "DISABLE command: invalid state = 99, slot = 0, entry = 0"), + (Ut_CFE_EVS_EventSent(SCH_DISABLE_CMD_ENTRY_ERR_EID, CFE_EVS_ERROR_BIT, "DISABLE command: invalid state = 99, slot = 0, entry = 0"), "DISABLE command: invalid state = 99, slot = 0, entry = 0"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -616,7 +616,7 @@ void SCH_DisableCmd_Test_Nominal(void) { SCH_EntryCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_EntryCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_EntryCmd_t), true); CmdPacket.SlotNumber = 0; CmdPacket.EntryNumber = 0; @@ -630,7 +630,7 @@ void SCH_DisableCmd_Test_Nominal(void) UtAssert_True (SCH_AppData.ScheduleTable[0].EnableState == SCH_DISABLED, "SCH_AppData.ScheduleTable[0].EnableState == SCH_DISABLED"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_DISABLE_CMD_EID, CFE_EVS_DEBUG, "DISABLE command: slot = 0, entry = 0"), + (Ut_CFE_EVS_EventSent(SCH_DISABLE_CMD_EID, CFE_EVS_DEBUG_BIT, "DISABLE command: slot = 0, entry = 0"), "DISABLE command: invalid state = 99, slot = 0, entry = 0"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -641,7 +641,7 @@ void SCH_EnableGroupCmd_Test_InvalidCmdLength(void) { SCH_GroupCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, 1, TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, 1, true); /* Execute the function being tested */ SCH_EnableGroupCmd((CFE_SB_MsgPtr_t)(&CmdPacket)); @@ -656,14 +656,14 @@ void SCH_EnableGroupCmd_Test_InvalidArgument(void) { SCH_GroupCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_GroupCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_GroupCmd_t), true); /* Execute the function being tested */ SCH_EnableGroupCmd((CFE_SB_MsgPtr_t)(&CmdPacket)); /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_ENA_GRP_CMD_ERR_EID, CFE_EVS_ERROR, "ENABLE GROUP command: invalid argument, no groups selected"), + (Ut_CFE_EVS_EventSent(SCH_ENA_GRP_CMD_ERR_EID, CFE_EVS_ERROR_BIT, "ENABLE GROUP command: invalid argument, no groups selected"), "ENABLE GROUP command: invalid argument, no groups selected"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -674,7 +674,7 @@ void SCH_EnableGroupCmd_Test_NominalCmdGroupNumberNotUnused(void) { SCH_GroupCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_GroupCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_GroupCmd_t), true); CmdPacket.GroupData = SCH_GROUP_NUMBER_BIT_MASK; SCH_AppData.ScheduleTable[0].GroupData = SCH_GROUP_NUMBER_BIT_MASK; @@ -688,7 +688,7 @@ void SCH_EnableGroupCmd_Test_NominalCmdGroupNumberNotUnused(void) UtAssert_True(SCH_AppData.ScheduleTable[0].EnableState == SCH_ENABLED, "SCH_AppData.ScheduleTable[0].EnableState == SCH_ENABLED"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_ENA_GRP_CMD_EID, CFE_EVS_DEBUG, "ENABLE GROUP command: match count = 1"), + (Ut_CFE_EVS_EventSent(SCH_ENA_GRP_CMD_EID, CFE_EVS_DEBUG_BIT, "ENABLE GROUP command: match count = 1"), "ENABLE GROUP command: match count = 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -699,7 +699,7 @@ void SCH_EnableGroupCmd_Test_NominalCmdMultiGroupBitwiseAndTblMultiGroupNotUnuse { SCH_GroupCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_GroupCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_GroupCmd_t), true); CmdPacket.GroupData = SCH_MULTI_GROUP_BIT_MASK; SCH_AppData.ScheduleTable[0].GroupData = SCH_MULTI_GROUP_BIT_MASK; @@ -713,7 +713,7 @@ void SCH_EnableGroupCmd_Test_NominalCmdMultiGroupBitwiseAndTblMultiGroupNotUnuse UtAssert_True(SCH_AppData.ScheduleTable[0].EnableState == SCH_ENABLED, "SCH_AppData.ScheduleTable[0].EnableState == SCH_ENABLED"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_ENA_GRP_CMD_EID, CFE_EVS_DEBUG, "ENABLE GROUP command: match count = 1"), + (Ut_CFE_EVS_EventSent(SCH_ENA_GRP_CMD_EID, CFE_EVS_DEBUG_BIT, "ENABLE GROUP command: match count = 1"), "ENABLE GROUP command: match count = 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -724,7 +724,7 @@ void SCH_EnableGroupCmd_Test_GroupNotFound(void) { SCH_GroupCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_GroupCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_GroupCmd_t), true); CmdPacket.GroupData = 0xFFFFFFFF; SCH_AppData.ScheduleTable[0].GroupData = 0x00000000; @@ -734,7 +734,7 @@ void SCH_EnableGroupCmd_Test_GroupNotFound(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_ENA_GRP_NOT_FOUND_ERR_EID, CFE_EVS_ERROR, "ENABLE GROUP command: Neither Group 255 nor Multi-Group 0xFFFFFF found"), + (Ut_CFE_EVS_EventSent(SCH_ENA_GRP_NOT_FOUND_ERR_EID, CFE_EVS_ERROR_BIT, "ENABLE GROUP command: Neither Group 255 nor Multi-Group 0xFFFFFF found"), "ENABLE GROUP command: Neither Group 255 nor Multi-Group 0xFFFFFF found"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -745,7 +745,7 @@ void SCH_DisableGroupCmd_Test_InvalidCmdLength(void) { SCH_GroupCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, 1, TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, 1, true); /* Execute the function being tested */ SCH_DisableGroupCmd((CFE_SB_MsgPtr_t)(&CmdPacket)); @@ -760,14 +760,14 @@ void SCH_DisableGroupCmd_Test_InvalidArgument(void) { SCH_GroupCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_GroupCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_GroupCmd_t), true); /* Execute the function being tested */ SCH_DisableGroupCmd((CFE_SB_MsgPtr_t)(&CmdPacket)); /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_DIS_GRP_CMD_ERR_EID, CFE_EVS_ERROR, "DISABLE GROUP command: invalid argument, no groups selected"), + (Ut_CFE_EVS_EventSent(SCH_DIS_GRP_CMD_ERR_EID, CFE_EVS_ERROR_BIT, "DISABLE GROUP command: invalid argument, no groups selected"), "DISABLE GROUP command: invalid argument, no groups selected"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -778,7 +778,7 @@ void SCH_DisableGroupCmd_Test_NominalCmdGroupNumberNotUnused(void) { SCH_GroupCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_GroupCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_GroupCmd_t), true); CmdPacket.GroupData = SCH_GROUP_NUMBER_BIT_MASK; SCH_AppData.ScheduleTable[0].GroupData = SCH_GROUP_NUMBER_BIT_MASK; @@ -792,7 +792,7 @@ void SCH_DisableGroupCmd_Test_NominalCmdGroupNumberNotUnused(void) UtAssert_True(SCH_AppData.ScheduleTable[0].EnableState == SCH_DISABLED, "SCH_AppData.ScheduleTable[0].EnableState == SCH_DISABLED"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_DIS_GRP_CMD_EID, CFE_EVS_DEBUG, "DISABLE GROUP command: match count = 1"), + (Ut_CFE_EVS_EventSent(SCH_DIS_GRP_CMD_EID, CFE_EVS_DEBUG_BIT, "DISABLE GROUP command: match count = 1"), "DISABLE GROUP command: match count = 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -803,7 +803,7 @@ void SCH_DisableGroupCmd_Test_NominalCmdMultiGroupBitwiseAndTblMultiGroupNotUnus { SCH_GroupCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_GroupCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_GroupCmd_t), true); CmdPacket.GroupData = SCH_MULTI_GROUP_BIT_MASK; SCH_AppData.ScheduleTable[0].GroupData = SCH_MULTI_GROUP_BIT_MASK; @@ -817,7 +817,7 @@ void SCH_DisableGroupCmd_Test_NominalCmdMultiGroupBitwiseAndTblMultiGroupNotUnus UtAssert_True(SCH_AppData.ScheduleTable[0].EnableState == SCH_DISABLED, "SCH_AppData.ScheduleTable[0].EnableState == SCH_DISABLED"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_DIS_GRP_CMD_EID, CFE_EVS_DEBUG, "DISABLE GROUP command: match count = 1"), + (Ut_CFE_EVS_EventSent(SCH_DIS_GRP_CMD_EID, CFE_EVS_DEBUG_BIT, "DISABLE GROUP command: match count = 1"), "DISABLE GROUP command: match count = 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -828,7 +828,7 @@ void SCH_DisableGroupCmd_Test_GroupNotFound(void) { SCH_GroupCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_GroupCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_GroupCmd_t), true); CmdPacket.GroupData = 0xFFFFFFFF; SCH_AppData.ScheduleTable[0].GroupData = 0x00000000; @@ -838,7 +838,7 @@ void SCH_DisableGroupCmd_Test_GroupNotFound(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_DIS_GRP_NOT_FOUND_ERR_EID, CFE_EVS_ERROR, "DISABLE GROUP command: Neither Group 255 nor Multi-Group 0xFFFFFF found"), + (Ut_CFE_EVS_EventSent(SCH_DIS_GRP_NOT_FOUND_ERR_EID, CFE_EVS_ERROR_BIT, "DISABLE GROUP command: Neither Group 255 nor Multi-Group 0xFFFFFF found"), "DISABLE GROUP command: Neither Group 255 nor Multi-Group 0xFFFFFF found"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -849,7 +849,7 @@ void SCH_EnableSyncCmd_Test_InvalidCmdLength(void) { SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, 1, TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, 1, true); /* Execute the function being tested */ SCH_EnableSyncCmd((CFE_SB_MsgPtr_t)(&CmdPacket)); @@ -864,18 +864,18 @@ void SCH_EnableSyncCmd_Test_Nominal(void) { SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), true); /* Execute the function being tested */ SCH_EnableSyncCmd((CFE_SB_MsgPtr_t)(&CmdPacket)); /* Verify results */ - UtAssert_True(SCH_AppData.IgnoreMajorFrame == FALSE, "SCH_AppData.IgnoreMajorFrame == FALSE"); - UtAssert_True(SCH_AppData.UnexpectedMajorFrame == FALSE, "SCH_AppData.UnexpectedMajorFrame == FALSE"); + UtAssert_True(SCH_AppData.IgnoreMajorFrame == false, "SCH_AppData.IgnoreMajorFrame == false"); + UtAssert_True(SCH_AppData.UnexpectedMajorFrame == false, "SCH_AppData.UnexpectedMajorFrame == false"); UtAssert_True(SCH_AppData.ConsecutiveNoisyFrameCounter == 0, "SCH_AppData.ConsecutiveNoisyFrameCounter == 0"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_ENA_SYNC_CMD_EID, CFE_EVS_DEBUG, "Major Frame Synchronization Enabled"), + (Ut_CFE_EVS_EventSent(SCH_ENA_SYNC_CMD_EID, CFE_EVS_DEBUG_BIT, "Major Frame Synchronization Enabled"), "Major Frame Synchronization Enabled"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -886,7 +886,7 @@ void SCH_SendDiagTlmCmd_Test_InvalidCmdLength(void) { SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, 1, TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, 1, true); /* Execute the function being tested */ SCH_SendDiagTlmCmd((CFE_SB_MsgPtr_t)(&CmdPacket)); @@ -901,7 +901,7 @@ void SCH_SendDiagTlmCmd_Test_Enabled(void) { SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), true); SCH_AppData.ScheduleTable[0].EnableState = SCH_ENABLED; @@ -912,7 +912,7 @@ void SCH_SendDiagTlmCmd_Test_Enabled(void) UtAssert_True(SCH_AppData.DiagPacket.EntryStates[0] == (1 << 14), "SCH_AppData.DiagPacket.EntryStates[0] == (1 << 14)"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SEND_DIAG_CMD_EID, CFE_EVS_DEBUG, "Transmitting Diagnostic Message"), + (Ut_CFE_EVS_EventSent(SCH_SEND_DIAG_CMD_EID, CFE_EVS_DEBUG_BIT, "Transmitting Diagnostic Message"), "Transmitting Diagnostic Message"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -923,7 +923,7 @@ void SCH_SendDiagTlmCmd_Test_Disabled(void) { SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), true); SCH_AppData.ScheduleTable[0].EnableState = SCH_DISABLED; @@ -934,7 +934,7 @@ void SCH_SendDiagTlmCmd_Test_Disabled(void) UtAssert_True(SCH_AppData.DiagPacket.EntryStates[0] == (2 << 14), "SCH_AppData.DiagPacket.EntryStates[0] == (2 << 14)"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SEND_DIAG_CMD_EID, CFE_EVS_DEBUG, "Transmitting Diagnostic Message"), + (Ut_CFE_EVS_EventSent(SCH_SEND_DIAG_CMD_EID, CFE_EVS_DEBUG_BIT, "Transmitting Diagnostic Message"), "Transmitting Diagnostic Message"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -945,7 +945,7 @@ void SCH_SendDiagTlmCmd_Test_Other(void) { SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), true); SCH_AppData.ScheduleTable[0].EnableState = 99; SCH_AppData.DiagPacket.MsgIDs[0] = 0x1111; @@ -957,7 +957,7 @@ void SCH_SendDiagTlmCmd_Test_Other(void) UtAssert_True(SCH_AppData.DiagPacket.MsgIDs[0] == 0x0000, "SCH_AppData.DiagPacket.MsgIDs[0] == 0x0000"); UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_SEND_DIAG_CMD_EID, CFE_EVS_DEBUG, "Transmitting Diagnostic Message"), + (Ut_CFE_EVS_EventSent(SCH_SEND_DIAG_CMD_EID, CFE_EVS_DEBUG_BIT, "Transmitting Diagnostic Message"), "Transmitting Diagnostic Message"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); @@ -1022,7 +1022,7 @@ void SCH_VerifyCmdLength_Test_LengthError(void) int32 Result; SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), true); CFE_SB_SetCmdCode ((CFE_SB_MsgPtr_t)(&CmdPacket), 1); /* Execute the function being tested */ @@ -1030,7 +1030,7 @@ void SCH_VerifyCmdLength_Test_LengthError(void) /* Verify results */ UtAssert_True - (Ut_CFE_EVS_EventSent(SCH_CMD_LEN_ERR_EID, CFE_EVS_ERROR, "Cmd Msg with Bad length Rcvd: ID = 0x1895, CC = 1, Exp Len = 99, Len = 8"), + (Ut_CFE_EVS_EventSent(SCH_CMD_LEN_ERR_EID, CFE_EVS_ERROR_BIT, "Cmd Msg with Bad length Rcvd: ID = 0x1895, CC = 1, Exp Len = 99, Len = 8"), "Cmd Msg with Bad length Rcvd: ID = 0x1895, CC = 1, Exp Len = 99, Len = 8"); UtAssert_True(Result == SCH_BAD_MSG_LENGTH_RC, "Result == SCH_BAD_MSG_LENGTH_RC"); @@ -1044,7 +1044,7 @@ void SCH_VerifyCmdLength_Test_Success(void) int32 Result; SCH_NoArgsCmd_t CmdPacket; - CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), TRUE); + CFE_SB_InitMsg (&CmdPacket, SCH_CMD_MID, sizeof(SCH_NoArgsCmd_t), true); CFE_SB_SetCmdCode ((CFE_SB_MsgPtr_t)(&CmdPacket), 1); /* Execute the function being tested */ @@ -1059,7 +1059,7 @@ void SCH_VerifyCmdLength_Test_Success(void) void SCH_PostCommandResult_Test_GoodCommand(void) { - boolean GoodCommand = TRUE; + bool GoodCommand = true; /* Execute the function being tested */ SCH_PostCommandResult(GoodCommand); @@ -1073,7 +1073,7 @@ void SCH_PostCommandResult_Test_GoodCommand(void) void SCH_PostCommandResult_Test_Error(void) { - boolean GoodCommand = FALSE; + bool GoodCommand = false; /* Execute the function being tested */ SCH_PostCommandResult(GoodCommand); diff --git a/fsw/unit_test/sch_custom.c.gcov b/fsw/unit_test/sch_custom.c.gcov index 32dbd0b..e4907bc 100644 --- a/fsw/unit_test/sch_custom.c.gcov +++ b/fsw/unit_test/sch_custom.c.gcov @@ -267,7 +267,7 @@ -: 265: ** of noisy major frames. Also, indicate in telemetry that this particular -: 266: ** Major Frame signal is considered noisy. -: 267: */ - 3: 268: SCH_AppData.UnexpectedMajorFrame = TRUE; + 3: 268: SCH_AppData.UnexpectedMajorFrame = true; 3: 269: SCH_AppData.UnexpectedMajorFrameCount++; -: 270: -: 271: /* @@ -283,20 +283,20 @@ -: 281: */ 3: 282: if (SCH_AppData.ConsecutiveNoisyFrameCounter >= SCH_MAX_NOISY_MAJORF) -: 283: { - 2: 284: SCH_AppData.IgnoreMajorFrame = TRUE; + 2: 284: SCH_AppData.IgnoreMajorFrame = true; -: 285: } -: 286: } -: 287: } -: 288: else /* Major Frame occurred when expected */ -: 289: { - 1: 290: SCH_AppData.UnexpectedMajorFrame = FALSE; + 1: 290: SCH_AppData.UnexpectedMajorFrame = false; 1: 291: SCH_AppData.ConsecutiveNoisyFrameCounter = 0; -: 292: } -: 293: -: 294: /* -: 295: ** Ignore this callback if SCH has detected a noisy Major Frame Synch signal -: 296: */ - 4: 297: if (SCH_AppData.IgnoreMajorFrame == FALSE) + 4: 297: if (SCH_AppData.IgnoreMajorFrame == false) -: 298: { -: 299: /* -: 300: ** Stop Minor Frame Timer (which should be waiting for an unusually long diff --git a/fsw/unit_test/sch_custom_test.c b/fsw/unit_test/sch_custom_test.c index 8c2c315..f0e68e0 100644 --- a/fsw/unit_test/sch_custom_test.c +++ b/fsw/unit_test/sch_custom_test.c @@ -212,7 +212,7 @@ void SCH_MajorFrameCallback_Test_NoisyNotSynchronized(void) { SCH_AppData.SyncToMET = SCH_NOT_SYNCHRONIZED; SCH_AppData.MinorFramesSinceTone = 1; - SCH_AppData.IgnoreMajorFrame = FALSE; + SCH_AppData.IgnoreMajorFrame = false; SCH_AppData.ConsecutiveNoisyFrameCounter = SCH_MAX_NOISY_MAJORF - 1; /* Set to make SCH_GetMETSlotNumber return 1 */ @@ -222,10 +222,10 @@ void SCH_MajorFrameCallback_Test_NoisyNotSynchronized(void) SCH_MajorFrameCallback(); /* Verify results */ - UtAssert_True (SCH_AppData.UnexpectedMajorFrame == TRUE, "SCH_AppData.UnexpectedMajorFrame == TRUE"); + UtAssert_True (SCH_AppData.UnexpectedMajorFrame == true, "SCH_AppData.UnexpectedMajorFrame == true"); UtAssert_True (SCH_AppData.UnexpectedMajorFrameCount == 1, "SCH_AppData.UnexpectedMajorFrameCount == 1"); UtAssert_True (SCH_AppData.ConsecutiveNoisyFrameCounter == SCH_MAX_NOISY_MAJORF, "SCH_AppData.ConsecutiveNoisyFrameCounter == SCH_MAX_NOISY_MAJORF"); - UtAssert_True (SCH_AppData.IgnoreMajorFrame == TRUE, "SCH_AppData.IgnoreMajorFrame == TRUE"); + UtAssert_True (SCH_AppData.IgnoreMajorFrame == true, "SCH_AppData.IgnoreMajorFrame == true"); UtAssert_True (SCH_AppData.LastSyncMETSlot == 1, "SCH_AppData.LastSyncMETSlot == 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); @@ -236,7 +236,7 @@ void SCH_MajorFrameCallback_Test_NoisySynchronized(void) { SCH_AppData.SyncToMET = SCH_MINOR_SYNCHRONIZED; SCH_AppData.NextSlotNumber = 1; - SCH_AppData.IgnoreMajorFrame = FALSE; + SCH_AppData.IgnoreMajorFrame = false; SCH_AppData.ConsecutiveNoisyFrameCounter = SCH_MAX_NOISY_MAJORF - 1; /* Set to make SCH_GetMETSlotNumber return 1 */ @@ -246,10 +246,10 @@ void SCH_MajorFrameCallback_Test_NoisySynchronized(void) SCH_MajorFrameCallback(); /* Verify results */ - UtAssert_True (SCH_AppData.UnexpectedMajorFrame == TRUE, "SCH_AppData.UnexpectedMajorFrame == TRUE"); + UtAssert_True (SCH_AppData.UnexpectedMajorFrame == true, "SCH_AppData.UnexpectedMajorFrame == true"); UtAssert_True (SCH_AppData.UnexpectedMajorFrameCount == 1, "SCH_AppData.UnexpectedMajorFrameCount == 1"); UtAssert_True (SCH_AppData.ConsecutiveNoisyFrameCounter == SCH_MAX_NOISY_MAJORF, "SCH_AppData.ConsecutiveNoisyFrameCounter == SCH_MAX_NOISY_MAJORF"); - UtAssert_True (SCH_AppData.IgnoreMajorFrame == TRUE, "SCH_AppData.IgnoreMajorFrame == TRUE"); + UtAssert_True (SCH_AppData.IgnoreMajorFrame == true, "SCH_AppData.IgnoreMajorFrame == true"); UtAssert_True (SCH_AppData.LastSyncMETSlot == 1, "SCH_AppData.LastSyncMETSlot == 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); @@ -259,7 +259,7 @@ void SCH_MajorFrameCallback_Test_NoisySynchronized(void) void SCH_MajorFrameCallback_Test_FrameOccurredWhenExpected(void) { SCH_AppData.SyncToMET = 99; - SCH_AppData.IgnoreMajorFrame = FALSE; + SCH_AppData.IgnoreMajorFrame = false; SCH_AppData.ConsecutiveNoisyFrameCounter = 1; /* Set to make SCH_GetMETSlotNumber return 1 */ @@ -269,7 +269,7 @@ void SCH_MajorFrameCallback_Test_FrameOccurredWhenExpected(void) SCH_MajorFrameCallback(); /* Verify results */ - UtAssert_True (SCH_AppData.UnexpectedMajorFrame == FALSE, "SCH_AppData.UnexpectedMajorFrame == FALSE"); + UtAssert_True (SCH_AppData.UnexpectedMajorFrame == false, "SCH_AppData.UnexpectedMajorFrame == false"); UtAssert_True (SCH_AppData.ConsecutiveNoisyFrameCounter == 0, "SCH_AppData.ConsecutiveNoisyFrameCounter == 0"); UtAssert_True (SCH_AppData.ValidMajorFrameCount == 1, "SCH_AppData.ValidMajorFrameCount == 1"); UtAssert_True (SCH_AppData.MinorFramesSinceTone == 0, "SCH_AppData.MinorFramesSinceTone == 0"); diff --git a/fsw/unit_test/sch_test_log_altconfig.txt b/fsw/unit_test/sch_test_log_altconfig.txt index fd09ea7..305f50b 100644 --- a/fsw/unit_test/sch_test_log_altconfig.txt +++ b/fsw/unit_test/sch_test_log_altconfig.txt @@ -26,11 +26,11 @@ PASS: SCH_LibData.ProcessingDisabledCtr == 1 PASS: Ut_CFE_EVS_GetEventQueueDepth() == 0 Running Test: SCH_GetProcessingState_Test_True -PASS: Result == TRUE +PASS: Result == true PASS: Ut_CFE_EVS_GetEventQueueDepth() == 0 Running Test: SCH_GetProcessingState_Test_False -PASS: Result == FALSE +PASS: Result == false PASS: Ut_CFE_EVS_GetEventQueueDepth() == 0 Running Test: SCH_AppMain_Test_RegisterAppError @@ -73,13 +73,13 @@ INFO EVENT ID=1 SCH Initialized. Version 2.2.1.0 ERROR EVENT ID=21 Major Frame Sync too noisy (Slot 1). Disabling synchronization. INFO EVENT ID=18 Multiple slots processed: slot = 0, count = 2 PASS: Major Frame Sync too noisy (Slot 1). Disabling synchronization. -PASS: SCH_AppData.IgnoreMajorFrameMsgSent == TRUE +PASS: SCH_AppData.IgnoreMajorFrameMsgSent == true PASS: SCH_AppData.AppID == 99 PASS: Ut_CFE_EVS_GetEventQueueDepth() == 3 Running Test: SCH_AppMain_Test_NominalIgnoreMajorFrameFalse INFO EVENT ID=1 SCH Initialized. Version 2.2.1.0 -PASS: SCH_AppData.IgnoreMajorFrameMsgSent == FALSE +PASS: SCH_AppData.IgnoreMajorFrameMsgSent == false PASS: SCH_AppData.AppID == 99 PASS: Ut_CFE_EVS_GetEventQueueDepth() == 1 @@ -316,9 +316,9 @@ PASS: Ut_CFE_EVS_GetEventQueueDepth() == 0 Running Test: SCH_TimerInit_Test_CustomEarlyInitError ERROR EVENT ID=12 Error creating Timer (RC=0xFFFFFFFF) -PASS: SCH_AppData.IgnoreMajorFrame == FALSE -PASS: SCH_AppData.IgnoreMajorFrameMsgSent == FALSE -PASS: SCH_AppData.UnexpectedMajorFrame == FALSE +PASS: SCH_AppData.IgnoreMajorFrame == false +PASS: SCH_AppData.IgnoreMajorFrameMsgSent == false +PASS: SCH_AppData.UnexpectedMajorFrame == false PASS: SCH_AppData.SyncToMET == SCH_NOT_SYNCHRONIZED PASS: SCH_AppData.MajorFrameSource == SCH_MAJOR_FS_NONE PASS: SCH_AppData.NextSlotNumber == 0 @@ -336,9 +336,9 @@ PASS: Ut_CFE_EVS_GetEventQueueDepth() == 1 Running Test: SCH_TimerInit_Test_TimerAccuracyWarning INFO EVENT ID=13 OS Timer Accuracy (102 > reqd 101 usec) requires Minor Frame MET sync -PASS: SCH_AppData.IgnoreMajorFrame == FALSE -PASS: SCH_AppData.IgnoreMajorFrameMsgSent == FALSE -PASS: SCH_AppData.UnexpectedMajorFrame == FALSE +PASS: SCH_AppData.IgnoreMajorFrame == false +PASS: SCH_AppData.IgnoreMajorFrameMsgSent == false +PASS: SCH_AppData.UnexpectedMajorFrame == false PASS: SCH_AppData.MajorFrameSource == SCH_MAJOR_FS_NONE PASS: SCH_AppData.NextSlotNumber == 0 PASS: SCH_AppData.MinorFramesSinceTone == SCH_TIME_SYNC_SLOT @@ -356,9 +356,9 @@ PASS: Ut_CFE_EVS_GetEventQueueDepth() == 1 Running Test: SCH_TimerInit_Test_BinSemCreateError ERROR EVENT ID=15 Error creating Main Loop Timing Semaphore (RC=0xFFFFFFFF) -PASS: SCH_AppData.IgnoreMajorFrame == FALSE -PASS: SCH_AppData.IgnoreMajorFrameMsgSent == FALSE -PASS: SCH_AppData.UnexpectedMajorFrame == FALSE +PASS: SCH_AppData.IgnoreMajorFrame == false +PASS: SCH_AppData.IgnoreMajorFrameMsgSent == false +PASS: SCH_AppData.UnexpectedMajorFrame == false PASS: SCH_AppData.SyncToMET == SCH_NOT_SYNCHRONIZED PASS: SCH_AppData.MajorFrameSource == SCH_MAJOR_FS_NONE PASS: SCH_AppData.NextSlotNumber == 0 @@ -375,9 +375,9 @@ PASS: Result == -1 PASS: Ut_CFE_EVS_GetEventQueueDepth() == 1 Running Test: SCH_TimerInit_Test_Nominal -PASS: SCH_AppData.IgnoreMajorFrame == FALSE -PASS: SCH_AppData.IgnoreMajorFrameMsgSent == FALSE -PASS: SCH_AppData.UnexpectedMajorFrame == FALSE +PASS: SCH_AppData.IgnoreMajorFrame == false +PASS: SCH_AppData.IgnoreMajorFrameMsgSent == false +PASS: SCH_AppData.UnexpectedMajorFrame == false PASS: SCH_AppData.SyncToMET == SCH_NOT_SYNCHRONIZED PASS: SCH_AppData.MajorFrameSource == SCH_MAJOR_FS_NONE PASS: SCH_AppData.NextSlotNumber == 0 @@ -918,8 +918,8 @@ PASS: Ut_CFE_EVS_GetEventQueueDepth() == 1 Running Test: SCH_EnableSyncCmd_Test_Nominal DEBUG EVENT ID=46 Major Frame Synchronization Enabled -PASS: SCH_AppData.IgnoreMajorFrame == FALSE -PASS: SCH_AppData.UnexpectedMajorFrame == FALSE +PASS: SCH_AppData.IgnoreMajorFrame == false +PASS: SCH_AppData.UnexpectedMajorFrame == false PASS: SCH_AppData.ConsecutiveNoisyFrameCounter == 0 PASS: Major Frame Synchronization Enabled PASS: Ut_CFE_EVS_GetEventQueueDepth() == 1 @@ -1019,23 +1019,23 @@ PASS: Result == 1 PASS: Ut_CFE_EVS_GetEventQueueDepth() == 0 Running Test: SCH_MajorFrameCallback_Test_NoisyNotSynchronized -PASS: SCH_AppData.UnexpectedMajorFrame == TRUE +PASS: SCH_AppData.UnexpectedMajorFrame == true PASS: SCH_AppData.UnexpectedMajorFrameCount == 1 PASS: SCH_AppData.ConsecutiveNoisyFrameCounter == SCH_MAX_NOISY_MAJORF -PASS: SCH_AppData.IgnoreMajorFrame == TRUE +PASS: SCH_AppData.IgnoreMajorFrame == true PASS: SCH_AppData.LastSyncMETSlot == 1 PASS: Ut_CFE_EVS_GetEventQueueDepth() == 0 Running Test: SCH_MajorFrameCallback_Test_NoisySynchronized -PASS: SCH_AppData.UnexpectedMajorFrame == TRUE +PASS: SCH_AppData.UnexpectedMajorFrame == true PASS: SCH_AppData.UnexpectedMajorFrameCount == 1 PASS: SCH_AppData.ConsecutiveNoisyFrameCounter == SCH_MAX_NOISY_MAJORF -PASS: SCH_AppData.IgnoreMajorFrame == TRUE +PASS: SCH_AppData.IgnoreMajorFrame == true PASS: SCH_AppData.LastSyncMETSlot == 1 PASS: Ut_CFE_EVS_GetEventQueueDepth() == 0 Running Test: SCH_MajorFrameCallback_Test_FrameOccurredWhenExpected -PASS: SCH_AppData.UnexpectedMajorFrame == FALSE +PASS: SCH_AppData.UnexpectedMajorFrame == false PASS: SCH_AppData.ConsecutiveNoisyFrameCounter == 0 PASS: SCH_AppData.ValidMajorFrameCount == 1 PASS: SCH_AppData.MinorFramesSinceTone == 0 diff --git a/fsw/unit_test/sch_test_log_defaultconfig.txt b/fsw/unit_test/sch_test_log_defaultconfig.txt index f685bb0..7ed3c6a 100644 --- a/fsw/unit_test/sch_test_log_defaultconfig.txt +++ b/fsw/unit_test/sch_test_log_defaultconfig.txt @@ -26,11 +26,11 @@ PASS: SCH_LibData.ProcessingDisabledCtr == 1 PASS: Ut_CFE_EVS_GetEventQueueDepth() == 0 Running Test: SCH_GetProcessingState_Test_True -PASS: Result == TRUE +PASS: Result == true PASS: Ut_CFE_EVS_GetEventQueueDepth() == 0 Running Test: SCH_GetProcessingState_Test_False -PASS: Result == FALSE +PASS: Result == false PASS: Ut_CFE_EVS_GetEventQueueDepth() == 0 Running Test: SCH_AppMain_Test_RegisterAppError @@ -72,13 +72,13 @@ Running Test: SCH_AppMain_Test_NoisyMajorFrameError INFO EVENT ID=1 SCH Initialized. Version 2.2.1.0 ERROR EVENT ID=21 Major Frame Sync too noisy (Slot 1). Disabling synchronization. PASS: Major Frame Sync too noisy (Slot 1). Disabling synchronization. -PASS: SCH_AppData.IgnoreMajorFrameMsgSent == TRUE +PASS: SCH_AppData.IgnoreMajorFrameMsgSent == true PASS: SCH_AppData.AppID == 99 PASS: Ut_CFE_EVS_GetEventQueueDepth() == 2 Running Test: SCH_AppMain_Test_NominalIgnoreMajorFrameFalse INFO EVENT ID=1 SCH Initialized. Version 2.2.1.0 -PASS: SCH_AppData.IgnoreMajorFrameMsgSent == FALSE +PASS: SCH_AppData.IgnoreMajorFrameMsgSent == false PASS: SCH_AppData.AppID == 99 PASS: Ut_CFE_EVS_GetEventQueueDepth() == 1 @@ -315,9 +315,9 @@ PASS: Ut_CFE_EVS_GetEventQueueDepth() == 0 Running Test: SCH_TimerInit_Test_CustomEarlyInitError ERROR EVENT ID=12 Error creating Timer (RC=0xFFFFFFFF) -PASS: SCH_AppData.IgnoreMajorFrame == FALSE -PASS: SCH_AppData.IgnoreMajorFrameMsgSent == FALSE -PASS: SCH_AppData.UnexpectedMajorFrame == FALSE +PASS: SCH_AppData.IgnoreMajorFrame == false +PASS: SCH_AppData.IgnoreMajorFrameMsgSent == false +PASS: SCH_AppData.UnexpectedMajorFrame == false PASS: SCH_AppData.SyncToMET == SCH_NOT_SYNCHRONIZED PASS: SCH_AppData.MajorFrameSource == SCH_MAJOR_FS_NONE PASS: SCH_AppData.NextSlotNumber == 0 @@ -335,9 +335,9 @@ PASS: Ut_CFE_EVS_GetEventQueueDepth() == 1 Running Test: SCH_TimerInit_Test_TimerAccuracyWarning INFO EVENT ID=13 OS Timer Accuracy (102 > reqd 101 usec) requires Minor Frame MET sync -PASS: SCH_AppData.IgnoreMajorFrame == FALSE -PASS: SCH_AppData.IgnoreMajorFrameMsgSent == FALSE -PASS: SCH_AppData.UnexpectedMajorFrame == FALSE +PASS: SCH_AppData.IgnoreMajorFrame == false +PASS: SCH_AppData.IgnoreMajorFrameMsgSent == false +PASS: SCH_AppData.UnexpectedMajorFrame == false PASS: SCH_AppData.MajorFrameSource == SCH_MAJOR_FS_NONE PASS: SCH_AppData.NextSlotNumber == 0 PASS: SCH_AppData.MinorFramesSinceTone == SCH_TIME_SYNC_SLOT @@ -355,9 +355,9 @@ PASS: Ut_CFE_EVS_GetEventQueueDepth() == 1 Running Test: SCH_TimerInit_Test_BinSemCreateError ERROR EVENT ID=15 Error creating Main Loop Timing Semaphore (RC=0xFFFFFFFF) -PASS: SCH_AppData.IgnoreMajorFrame == FALSE -PASS: SCH_AppData.IgnoreMajorFrameMsgSent == FALSE -PASS: SCH_AppData.UnexpectedMajorFrame == FALSE +PASS: SCH_AppData.IgnoreMajorFrame == false +PASS: SCH_AppData.IgnoreMajorFrameMsgSent == false +PASS: SCH_AppData.UnexpectedMajorFrame == false PASS: SCH_AppData.SyncToMET == SCH_NOT_SYNCHRONIZED PASS: SCH_AppData.MajorFrameSource == SCH_MAJOR_FS_NONE PASS: SCH_AppData.NextSlotNumber == 0 @@ -374,9 +374,9 @@ PASS: Result == -1 PASS: Ut_CFE_EVS_GetEventQueueDepth() == 1 Running Test: SCH_TimerInit_Test_Nominal -PASS: SCH_AppData.IgnoreMajorFrame == FALSE -PASS: SCH_AppData.IgnoreMajorFrameMsgSent == FALSE -PASS: SCH_AppData.UnexpectedMajorFrame == FALSE +PASS: SCH_AppData.IgnoreMajorFrame == false +PASS: SCH_AppData.IgnoreMajorFrameMsgSent == false +PASS: SCH_AppData.UnexpectedMajorFrame == false PASS: SCH_AppData.SyncToMET == SCH_NOT_SYNCHRONIZED PASS: SCH_AppData.MajorFrameSource == SCH_MAJOR_FS_NONE PASS: SCH_AppData.NextSlotNumber == 0 @@ -917,8 +917,8 @@ PASS: Ut_CFE_EVS_GetEventQueueDepth() == 1 Running Test: SCH_EnableSyncCmd_Test_Nominal DEBUG EVENT ID=46 Major Frame Synchronization Enabled -PASS: SCH_AppData.IgnoreMajorFrame == FALSE -PASS: SCH_AppData.UnexpectedMajorFrame == FALSE +PASS: SCH_AppData.IgnoreMajorFrame == false +PASS: SCH_AppData.UnexpectedMajorFrame == false PASS: SCH_AppData.ConsecutiveNoisyFrameCounter == 0 PASS: Major Frame Synchronization Enabled PASS: Ut_CFE_EVS_GetEventQueueDepth() == 1 @@ -1018,23 +1018,23 @@ PASS: Result == 1 PASS: Ut_CFE_EVS_GetEventQueueDepth() == 0 Running Test: SCH_MajorFrameCallback_Test_NoisyNotSynchronized -PASS: SCH_AppData.UnexpectedMajorFrame == TRUE +PASS: SCH_AppData.UnexpectedMajorFrame == true PASS: SCH_AppData.UnexpectedMajorFrameCount == 1 PASS: SCH_AppData.ConsecutiveNoisyFrameCounter == SCH_MAX_NOISY_MAJORF -PASS: SCH_AppData.IgnoreMajorFrame == TRUE +PASS: SCH_AppData.IgnoreMajorFrame == true PASS: SCH_AppData.LastSyncMETSlot == 1 PASS: Ut_CFE_EVS_GetEventQueueDepth() == 0 Running Test: SCH_MajorFrameCallback_Test_NoisySynchronized -PASS: SCH_AppData.UnexpectedMajorFrame == TRUE +PASS: SCH_AppData.UnexpectedMajorFrame == true PASS: SCH_AppData.UnexpectedMajorFrameCount == 1 PASS: SCH_AppData.ConsecutiveNoisyFrameCounter == SCH_MAX_NOISY_MAJORF -PASS: SCH_AppData.IgnoreMajorFrame == TRUE +PASS: SCH_AppData.IgnoreMajorFrame == true PASS: SCH_AppData.LastSyncMETSlot == 1 PASS: Ut_CFE_EVS_GetEventQueueDepth() == 0 Running Test: SCH_MajorFrameCallback_Test_FrameOccurredWhenExpected -PASS: SCH_AppData.UnexpectedMajorFrame == FALSE +PASS: SCH_AppData.UnexpectedMajorFrame == false PASS: SCH_AppData.ConsecutiveNoisyFrameCounter == 0 PASS: SCH_AppData.ValidMajorFrameCount == 1 PASS: SCH_AppData.MinorFramesSinceTone == 0 diff --git a/fsw/unit_test/sch_test_utils.c b/fsw/unit_test/sch_test_utils.c index 9ce6991..36e2f9b 100644 --- a/fsw/unit_test/sch_test_utils.c +++ b/fsw/unit_test/sch_test_utils.c @@ -79,7 +79,7 @@ void Ut_CFE_EVS_SetFunctionHook(uint32 Index, void *FunPtr) else { printf("Unsupported EVS Index In SetFunctionHook Call %lu", Index); - UtAssert_True(FALSE, "Unsupported EVS Index In SetFunctionHook Call"); + UtAssert_True(false, "Unsupported EVS Index In SetFunctionHook Call"); } } @@ -93,29 +93,29 @@ void Ut_CFE_EVS_SetReturnCode(uint32 Index, int32 RtnVal, uint32 CallCnt) else { printf("Unsupported EVS Index In SetReturnCode Call %lu\n", Index); - UtAssert_True(FALSE, "Unsupported EVS Index In SetReturnCode Call"); + UtAssert_True(false, "Unsupported EVS Index In SetReturnCode Call"); } } -boolean Ut_CFE_EVS_UseReturnCode(uint32 Index) +bool Ut_CFE_EVS_UseReturnCode(uint32 Index) { if (Ut_CFE_EVS_ReturnCodeTable[Index].Count > 0) { Ut_CFE_EVS_ReturnCodeTable[Index].Count--; if (Ut_CFE_EVS_ReturnCodeTable[Index].Count == 0) - return(TRUE); + return(true); } - else if (Ut_CFE_EVS_ReturnCodeTable[Index].ContinueReturnCodeAfterCountZero == TRUE) + else if (Ut_CFE_EVS_ReturnCodeTable[Index].ContinueReturnCodeAfterCountZero == true) { - return(TRUE); + return(true); } - return(FALSE); + return(false); } void Ut_CFE_EVS_ContinueReturnCodeAfterCountZero(uint32 Index) { - Ut_CFE_EVS_ReturnCodeTable[Index].ContinueReturnCodeAfterCountZero = TRUE; + Ut_CFE_EVS_ReturnCodeTable[Index].ContinueReturnCodeAfterCountZero = true; } int32 CFE_EVS_Register (void *Filters, uint16 NumEventFilters, uint16 FilterScheme) @@ -223,7 +223,7 @@ void Ut_OSTIMER_SetFunctionHook(uint32 Index, void *FunPtr) else { printf("Unsupported OSTIMER Index In SetFunctionHook Call %lu", Index); - UtAssert_True(FALSE, "Unsupported OSTIMER Index In SetFunctionHook Call"); + UtAssert_True(false, "Unsupported OSTIMER Index In SetFunctionHook Call"); } } @@ -237,29 +237,29 @@ void Ut_OSTIMER_SetReturnCode(uint32 Index, int32 RtnVal, uint32 CallCnt) else { printf("Unsupported OSTIMER Index In SetReturnCode Call %lu\n", Index); - UtAssert_True(FALSE, "Unsupported OSTIMER Index In SetReturnCode Call"); + UtAssert_True(false, "Unsupported OSTIMER Index In SetReturnCode Call"); } } -boolean Ut_OSTIMER_UseReturnCode(uint32 Index) +bool Ut_OSTIMER_UseReturnCode(uint32 Index) { if (Ut_OSTIMER_ReturnCodeTable[Index].Count > 0) { Ut_OSTIMER_ReturnCodeTable[Index].Count--; if (Ut_OSTIMER_ReturnCodeTable[Index].Count == 0) - return(TRUE); + return(true); } - else if (Ut_OSTIMER_ReturnCodeTable[Index].ContinueReturnCodeAfterCountZero == TRUE) + else if (Ut_OSTIMER_ReturnCodeTable[Index].ContinueReturnCodeAfterCountZero == true) { - return(TRUE); + return(true); } - return(FALSE); + return(false); } void Ut_OSTIMER_ContinueReturnCodeAfterCountZero(uint32 Index) { - Ut_OSTIMER_ReturnCodeTable[Index].ContinueReturnCodeAfterCountZero = TRUE; + Ut_OSTIMER_ReturnCodeTable[Index].ContinueReturnCodeAfterCountZero = true; } int32 OS_TimerCreate(uint32 *timer_id, const char *timer_name, uint32 *clock_accuracy, OS_TimerCallback_t callback_ptr) @@ -325,7 +325,7 @@ void Ut_CFE_TIME_SetFunctionHook(uint32 Index, void *FunPtr) else { printf("Unsupported TIME Index In SetFunctionHook Call %lu\n", Index); - UtAssert_True(FALSE, "Unsupported TIME Index In SetFunctionHook Call"); + UtAssert_True(false, "Unsupported TIME Index In SetFunctionHook Call"); } } @@ -339,29 +339,29 @@ void Ut_CFE_TIME_SetReturnCode(uint32 Index, int32 RtnVal, uint32 CallCnt) else { printf("Unsupported TIME Index In SetReturnCode Call %lu\n", Index); - UtAssert_True(FALSE, "Unsupported TIME Index In SetReturnCode Call"); + UtAssert_True(false, "Unsupported TIME Index In SetReturnCode Call"); } } -boolean Ut_CFE_TIME_UseReturnCode(uint32 Index) +bool Ut_CFE_TIME_UseReturnCode(uint32 Index) { if (Ut_CFE_TIME_ReturnCodeTable[Index].Count > 0) { Ut_CFE_TIME_ReturnCodeTable[Index].Count--; if (Ut_CFE_TIME_ReturnCodeTable[Index].Count == 0) - return(TRUE); + return(true); } - else if (Ut_CFE_TIME_ReturnCodeTable[Index].ContinueReturnCodeAfterCountZero == TRUE) + else if (Ut_CFE_TIME_ReturnCodeTable[Index].ContinueReturnCodeAfterCountZero == true) { - return(TRUE); + return(true); } - return(FALSE); + return(false); } void Ut_CFE_TIME_ContinueReturnCodeAfterCountZero(uint32 Index) { - Ut_CFE_TIME_ReturnCodeTable[Index].ContinueReturnCodeAfterCountZero = TRUE; + Ut_CFE_TIME_ReturnCodeTable[Index].ContinueReturnCodeAfterCountZero = true; } CFE_TIME_SysTime_t CFE_TIME_GetUTC(void) @@ -475,7 +475,7 @@ CFE_TIME_Compare_t CFE_TIME_Compare(CFE_TIME_SysTime_t TimeA, CFE_TIME_SysTime_ if (Ut_CFE_TIME_HookTable.CFE_TIME_Compare) return Ut_CFE_TIME_HookTable.CFE_TIME_Compare(TimeA, TimeB); - return TRUE; + return true; } uint32 CFE_TIME_FS2CFESeconds(uint32 SecondsFS) @@ -621,7 +621,7 @@ void Ut_CFE_SB_SetFunctionHook(uint32 Index, void *FunPtr) else { printf("Unsupported SB Index In SetFunctionHook Call %lu\n", Index); - UtAssert_True(FALSE, "Unsupported SB Index In SetFunctionHook Call"); + UtAssert_True(false, "Unsupported SB Index In SetFunctionHook Call"); } } @@ -634,29 +634,29 @@ void Ut_CFE_SB_SetReturnCode(uint32 Index, int32 RtnVal, uint32 CallCnt) else { printf("Unsupported SB Index In SetReturnCode Call %lu\n", Index); - UtAssert_True(FALSE, "Unsupported SB Index In SetReturnCode Call"); + UtAssert_True(false, "Unsupported SB Index In SetReturnCode Call"); } } -boolean Ut_CFE_SB_UseReturnCode(uint32 Index) +bool Ut_CFE_SB_UseReturnCode(uint32 Index) { if (Ut_CFE_SB_ReturnCodeTable[Index].Count > 0) { Ut_CFE_SB_ReturnCodeTable[Index].Count--; if (Ut_CFE_SB_ReturnCodeTable[Index].Count == 0) - return(TRUE); + return(true); } - else if (Ut_CFE_SB_ReturnCodeTable[Index].ContinueReturnCodeAfterCountZero == TRUE) + else if (Ut_CFE_SB_ReturnCodeTable[Index].ContinueReturnCodeAfterCountZero == true) { - return(TRUE); + return(true); } - return(FALSE); + return(false); } void Ut_CFE_SB_ContinueReturnCodeAfterCountZero(uint32 Index) { - Ut_CFE_SB_ReturnCodeTable[Index].ContinueReturnCodeAfterCountZero = TRUE; + Ut_CFE_SB_ReturnCodeTable[Index].ContinueReturnCodeAfterCountZero = true; } int32 CFE_SB_CreatePipe (CFE_SB_PipeId_t *PipeIdPtr, uint16 Depth, const char *PipeName) @@ -751,7 +751,7 @@ int32 CFE_SB_UnsubscribeLocal(CFE_SB_MsgId_t MsgId, CFE_SB_PipeId_t PipeId) return CFE_SUCCESS; } -int32 CFE_SB_SendMsg (CFE_SB_Msg_t *MsgPtr) +int32 CFE_SB_SendMsg (CFE_MSG_Message_t *MsgPtr) { /* Check for specified return */ if (Ut_CFE_SB_UseReturnCode(UT_CFE_SB_SENDMSG_INDEX)) @@ -764,7 +764,7 @@ int32 CFE_SB_SendMsg (CFE_SB_Msg_t *MsgPtr) return CFE_SUCCESS; } -int32 CFE_SB_PassMsg (CFE_SB_Msg_t *MsgPtr) +int32 CFE_SB_PassMsg (CFE_MSG_Message_t *MsgPtr) { /* Check for specified return */ if (Ut_CFE_SB_UseReturnCode(UT_CFE_SB_PASSMSG_INDEX)) @@ -804,7 +804,7 @@ uint32 CFE_SB_GetLastSenderId(CFE_SB_SenderId_t **Ptr,CFE_SB_PipeId_t PipeId) return CFE_SUCCESS; } -CFE_SB_Msg_t *CFE_SB_ZeroCopyGetPtr(uint16 MsgSize,CFE_SB_ZeroCopyHandle_t *BufferHandle) +CFE_MSG_Message_t *CFE_SB_ZeroCopyGetPtr(uint16 MsgSize,CFE_SB_ZeroCopyHandle_t *BufferHandle) { /* Can't specify return value - Ut_CFE_SB_SetReturnCode can only return integers */ @@ -815,7 +815,7 @@ CFE_SB_Msg_t *CFE_SB_ZeroCopyGetPtr(uint16 MsgSize,CFE_SB_ZeroCopyHandle_t *Bu return NULL; } -int32 CFE_SB_ZeroCopyReleasePtr(CFE_SB_Msg_t *Ptr2Release,CFE_SB_ZeroCopyHandle_t BufferHandle) +int32 CFE_SB_ZeroCopyReleasePtr(CFE_MSG_Message_t *Ptr2Release,CFE_SB_ZeroCopyHandle_t BufferHandle) { /* Check for specified return */ if (Ut_CFE_SB_UseReturnCode(UT_CFE_SB_ZEROCOPYRELEASEPTR_INDEX)) @@ -828,7 +828,7 @@ int32 CFE_SB_ZeroCopyReleasePtr(CFE_SB_Msg_t *Ptr2Release,CFE_SB_ZeroCopyHandle return CFE_SUCCESS; } -int32 CFE_SB_ZeroCopySend(CFE_SB_Msg_t *MsgPtr, CFE_SB_ZeroCopyHandle_t BufferHandle) +int32 CFE_SB_ZeroCopySend(CFE_MSG_Message_t *MsgPtr, CFE_SB_ZeroCopyHandle_t BufferHandle) { /* Check for specified return */ if (Ut_CFE_SB_UseReturnCode(UT_CFE_SB_ZEROCOPYSEND_INDEX)) @@ -841,7 +841,7 @@ int32 CFE_SB_ZeroCopySend(CFE_SB_Msg_t *MsgPtr, CFE_SB_ZeroCopyHandle_t Buffer return CFE_SUCCESS; } -int32 CFE_SB_ZeroCopyPass(CFE_SB_Msg_t *MsgPtr, CFE_SB_ZeroCopyHandle_t BufferHandle) +int32 CFE_SB_ZeroCopyPass(CFE_MSG_Message_t *MsgPtr, CFE_SB_ZeroCopyHandle_t BufferHandle) { /* Check for specified return */ if (Ut_CFE_SB_UseReturnCode(UT_CFE_SB_ZEROCOPYPASS_INDEX)) @@ -854,7 +854,7 @@ int32 CFE_SB_ZeroCopyPass(CFE_SB_Msg_t *MsgPtr, CFE_SB_ZeroCopyHandle_t Buffer return CFE_SUCCESS; } -void CFE_SB_InitMsg (void *MsgPtr, CFE_SB_MsgId_t MsgId, uint16 Length, boolean Clear) +void CFE_SB_InitMsg (void *MsgPtr, CFE_SB_MsgId_t MsgId, uint16 Length, bool Clear) { /* Can't specify return value - this is a void function */ @@ -1053,7 +1053,7 @@ void CFE_SB_GenerateChecksum(CFE_SB_MsgPtr_t MsgPtr) return; } -boolean CFE_SB_ValidateChecksum(CFE_SB_MsgPtr_t MsgPtr) +bool CFE_SB_ValidateChecksum(CFE_SB_MsgPtr_t MsgPtr) { /* Check for specified return */ if (Ut_CFE_SB_UseReturnCode(UT_CFE_SB_VALIDATECHECKSUM_INDEX)) @@ -1063,7 +1063,7 @@ boolean CFE_SB_ValidateChecksum(CFE_SB_MsgPtr_t MsgPtr) if (Ut_CFE_SB_HookTable.CFE_SB_ValidateChecksum) return Ut_CFE_SB_HookTable.CFE_SB_ValidateChecksum(MsgPtr); - return(TRUE); + return(true); } int32 CFE_SB_CleanUpApp (uint32 AppId) diff --git a/fsw/unit_test/sch_test_utils.h b/fsw/unit_test/sch_test_utils.h index 41c87aa..6efbf2f 100644 --- a/fsw/unit_test/sch_test_utils.h +++ b/fsw/unit_test/sch_test_utils.h @@ -75,7 +75,7 @@ typedef struct { int32 Value; uint32 Count; - boolean ContinueReturnCodeAfterCountZero; + bool ContinueReturnCodeAfterCountZero; } Ut_CFE_EVS_ReturnCodeTable_t; void Ut_CFE_EVS_Reset(void); @@ -105,7 +105,7 @@ typedef struct { int32 Value; uint32 Count; - boolean ContinueReturnCodeAfterCountZero; + bool ContinueReturnCodeAfterCountZero; } Ut_OSTIMER_ReturnCodeTable_t; void Ut_OSTIMER_Reset(void); @@ -158,7 +158,7 @@ typedef struct { int32 Value; uint32 Count; - boolean ContinueReturnCodeAfterCountZero; + bool ContinueReturnCodeAfterCountZero; } Ut_CFE_TIME_ReturnCodeTable_t; void Ut_CFE_TIME_Reset(void);