Skip to content

Commit

Permalink
Clean up empty lines
Browse files Browse the repository at this point in the history
  • Loading branch information
thnkslprpt committed Oct 9, 2022
1 parent 96138cd commit a96fa15
Show file tree
Hide file tree
Showing 16 changed files with 0 additions and 250 deletions.
6 changes: 0 additions & 6 deletions fsw/src/hs_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ void HS_AppMain(void)
** Exit the application
*/
CFE_ES_ExitApp(RunStatus);

} /* end HS_AppMain */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -340,7 +339,6 @@ int32 HS_AppInit(void)
HS_MAJOR_VERSION, HS_MINOR_VERSION, HS_REVISION, HS_MISSION_REV);

return Status;

} /* end HS_AppInit */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -414,7 +412,6 @@ int32 HS_SbInit(void)
*/

return Status;

} /* End of HS_SbInit() */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -531,7 +528,6 @@ int32 HS_TblInit(void)
HS_AcquirePointers();

return CFE_SUCCESS;

} /* End of HS_TblInit() */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -602,7 +598,6 @@ int32 HS_ProcessMain(void)
}

return Status;

} /* End of HS_ProcessMain() */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -670,7 +665,6 @@ int32 HS_ProcessCommands(void)
}

return Status;

} /* End of HS_ProcessCommands() */

/************************/
Expand Down
5 changes: 0 additions & 5 deletions fsw/src/hs_cmds.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ void HS_AppPipe(const CFE_SB_Buffer_t *BufPtr)

switch (CFE_SB_MsgIdToValue(MessageID))
{

/*
** Housekeeping telemetry request
*/
Expand Down Expand Up @@ -239,7 +238,6 @@ void HS_HousekeepingReq(const CFE_SB_Buffer_t *BufPtr)
*/
for (TableIndex = 0; TableIndex < HS_MAX_EXEC_CNT_SLOTS; TableIndex++)
{

ExeCount = HS_INVALID_EXECOUNT;

if (HS_AppData.ExeCountState == HS_STATE_ENABLED)
Expand Down Expand Up @@ -410,7 +408,6 @@ void HS_EnableEventMonCmd(const CFE_SB_Buffer_t *BufPtr)
*/
if (HS_AppData.CurrentEventMonState == HS_STATE_DISABLED)
{

Status = CFE_SB_SubscribeEx(CFE_SB_ValueToMsgId(CFE_EVS_LONG_EVENT_MSG_MID), HS_AppData.EventPipe,
CFE_SB_DEFAULT_QOS, HS_EVENT_PIPE_DEPTH);

Expand Down Expand Up @@ -463,13 +460,11 @@ void HS_DisableEventMonCmd(const CFE_SB_Buffer_t *BufPtr)
*/
if (HS_VerifyMsgLength(&BufPtr->Msg, ExpectedLength))
{

/*
** Unsubscribe from Event Messages if currently enabled
*/
if (HS_AppData.CurrentEventMonState == HS_STATE_ENABLED)
{

Status = CFE_SB_Unsubscribe(CFE_SB_ValueToMsgId(CFE_EVS_LONG_EVENT_MSG_MID), HS_AppData.EventPipe);

if (Status != CFE_SUCCESS)
Expand Down
5 changes: 0 additions & 5 deletions fsw/src/hs_custom.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ void HS_IdleTask(void)

while (HS_CustomData.IdleTaskRunStatus == CFE_SUCCESS)
{

/* Check to see if we are to mark the time. */
if (((HS_CustomData.ThisIdleTaskExec & HS_CustomData.UtilMask) == HS_CustomData.UtilMask) &&
(HS_CustomData.ThisIdleTaskExec > HS_CustomData.UtilMask))
Expand Down Expand Up @@ -129,7 +128,6 @@ int32 HS_CustomInit(void)
HS_CustomData.UtilCallsPerMark = HS_UTIL_CALLS_PER_MARK;

return Status;

} /* end HS_CustomInit */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand All @@ -155,7 +153,6 @@ void HS_CustomCleanup(void)
** Delete the Idle Task
*/
CFE_ES_DeleteChildTask(HS_CustomData.IdleTaskID);

} /* end HS_CustomCleanup */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -215,7 +212,6 @@ void HS_CustomMonitorUtilization(void)
HS_MonitorUtilization();
HS_CustomData.UtilCycleCounter = 0;
}

} /* End of HS_CustomMonitorUtilization() */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -256,7 +252,6 @@ int32 HS_CustomCommands(const CFE_SB_Buffer_t *BufPtr)
} /* end CommandCode switch */

return Status;

} /* End of HS_CustomCommands() */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down
1 change: 0 additions & 1 deletion fsw/src/hs_custom.h
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,6 @@ typedef struct

int32 IdleTaskRunStatus; /**< \brief HS Idle Task Run Status */
CFE_ES_TaskId_t IdleTaskID; /**< \brief HS Idle Task Task ID */

} HS_CustomData_t;

/**
Expand Down
14 changes: 0 additions & 14 deletions fsw/src/hs_monitors.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ void HS_MonitorApplications(void)

for (TableIndex = 0; TableIndex < HS_MAX_MONITORED_APPS; TableIndex++)
{

ActionType = HS_AppData.AMTablePtr[TableIndex].ActionType;

/*
Expand Down Expand Up @@ -106,15 +105,13 @@ void HS_MonitorApplications(void)
*/
if (HS_AppData.AppMonCheckInCountdown[TableIndex] == 0)
{

/*
** Unset the enabled bit flag
*/
CFE_CLR(HS_AppData.AppMonEnables[TableIndex / HS_BITS_PER_APPMON_ENABLE],
(TableIndex % HS_BITS_PER_APPMON_ENABLE));
switch (ActionType)
{

case HS_AMT_ACT_PROC_RESET:
CFE_EVS_SendEvent(HS_APPMON_PROC_ERR_EID, CFE_EVS_EventType_ERROR,
"App Monitor Failure: APP:(%s): Action: Processor Reset",
Expand Down Expand Up @@ -245,13 +242,11 @@ void HS_MonitorEvent(const CFE_EVS_LongEventTlm_t *EventPtr)
if (strncmp(HS_AppData.EMTablePtr[TableIndex].AppName, EventPtr->Payload.PacketID.AppName,
OS_MAX_API_NAME) == 0)
{

/*
** Perform the action if the strings also match
*/
switch (ActionType)
{

case HS_EMT_ACT_PROC_RESET:
CFE_EVS_SendEvent(HS_EVENTMON_PROC_ERR_EID, CFE_EVS_EventType_ERROR,
"Event Monitor: APP:(%s) EID:(%d): Action: Processor Reset",
Expand Down Expand Up @@ -339,7 +334,6 @@ void HS_MonitorEvent(const CFE_EVS_LongEventTlm_t *EventPtr)
*/
if ((HS_AppData.MsgActsState == HS_STATE_ENABLED) && (MsgActsIndex < HS_MAX_MSG_ACT_TYPES))
{

/*
** Send the message if off cooldown and not disabled
*/
Expand Down Expand Up @@ -482,7 +476,6 @@ int32 HS_ValidateAMTable(void *TableData)

for (TableIndex = 0; TableIndex < HS_MAX_MONITORED_APPS; TableIndex++)
{

ActionType = TableArray[TableIndex].ActionType;
CycleCount = TableArray[TableIndex].CycleCount;
NullTerm = TableArray[TableIndex].NullTerm;
Expand Down Expand Up @@ -540,7 +533,6 @@ int32 HS_ValidateAMTable(void *TableData)
(int)UnusedCount);

return TableResult;

} /* end HS_ValidateAMTable */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -575,7 +567,6 @@ int32 HS_ValidateEMTable(void *TableData)

for (TableIndex = 0; TableIndex < HS_MAX_MONITORED_EVENTS; TableIndex++)
{

ActionType = TableArray[TableIndex].ActionType;
EventID = TableArray[TableIndex].EventID;
NullTerm = TableArray[TableIndex].NullTerm;
Expand Down Expand Up @@ -633,7 +624,6 @@ int32 HS_ValidateEMTable(void *TableData)
(int)UnusedCount);

return TableResult;

} /* end HS_ValidateEMTable */

#if HS_MAX_EXEC_CNT_SLOTS != 0
Expand Down Expand Up @@ -668,7 +658,6 @@ int32 HS_ValidateXCTable(void *TableData)

for (TableIndex = 0; TableIndex < HS_MAX_EXEC_CNT_SLOTS; TableIndex++)
{

ResourceType = TableArray[TableIndex].ResourceType;
NullTerm = TableArray[TableIndex].NullTerm;
EntryResult = HS_XCTVAL_NO_ERR;
Expand Down Expand Up @@ -727,7 +716,6 @@ int32 HS_ValidateXCTable(void *TableData)
(int)UnusedCount);

return TableResult;

} /* end HS_ValidateXCTable */
#endif

Expand Down Expand Up @@ -763,7 +751,6 @@ int32 HS_ValidateMATable(void *TableData)

for (TableIndex = 0; TableIndex < HS_MAX_MSG_ACT_TYPES; TableIndex++)
{

EntryResult = HS_MATVAL_NO_ERR;
BufPtr = (CFE_SB_Buffer_t *)&TableArray[TableIndex].MsgBuf;
CFE_MSG_GetSize(&BufPtr->Msg, &Length);
Expand Down Expand Up @@ -828,7 +815,6 @@ int32 HS_ValidateMATable(void *TableData)
(int)UnusedCount);

return TableResult;

} /* end HS_ValidateMATable */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down
1 change: 0 additions & 1 deletion fsw/src/hs_msg.h
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ typedef struct
#if HS_MAX_EXEC_CNT_SLOTS != 0
uint32 ExeCounts[HS_MAX_EXEC_CNT_SLOTS]; /**< \brief Execution Counters */
#endif

} HS_HkPacket_t;

/**\}*/
Expand Down
2 changes: 0 additions & 2 deletions fsw/src/hs_utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ bool HS_VerifyMsgLength(const CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength)
CFE_MSG_GetSize(MsgPtr, &ActualLength);
if (ExpectedLength != ActualLength)
{

CFE_MSG_GetMsgId(MsgPtr, &MessageID);
CFE_MSG_GetFcnCode(MsgPtr, &CommandCode);

Expand Down Expand Up @@ -83,7 +82,6 @@ bool HS_VerifyMsgLength(const CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength)
}

return result;

} /* End of HS_VerifyMsgLength */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down
1 change: 0 additions & 1 deletion fsw/tables/hs_amt.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ HS_AMTEntry_t HS_Default_AppMon_Tbl[HS_MAX_MONITORED_APPS] = {
/* 29 */ {"", 0, 10, HS_AMT_ACT_NOACT},
/* 30 */ {"", 0, 10, HS_AMT_ACT_NOACT},
/* 31 */ {"", 0, 10, HS_AMT_ACT_NOACT},

};

/************************/
Expand Down
1 change: 0 additions & 1 deletion fsw/tables/hs_emt.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ HS_EMTEntry_t HS_Default_EventMon_Tbl[HS_MAX_MONITORED_EVENTS] = {
/* 13 */ {"", 0, 10, HS_EMT_ACT_NOACT},
/* 14 */ {"", 0, 10, HS_EMT_ACT_NOACT},
/* 15 */ {"", 0, 10, HS_EMT_ACT_NOACT},

};

/************************/
Expand Down
1 change: 0 additions & 1 deletion fsw/tables/hs_mat.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ HS_MATEntry_t HS_Default_MsgActs_Tbl[HS_MAX_MSG_ACT_TYPES] = {
{HS_MAT_STATE_DISABLED,
10,
{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},

};

/************************/
Expand Down
1 change: 0 additions & 1 deletion fsw/tables/hs_xct.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ HS_XCTEntry_t HS_Default_ExeCount_Tbl[HS_MAX_EXEC_CNT_SLOTS] = {
/* 29 */ {"", 0, HS_XCT_TYPE_NOTYPE},
/* 30 */ {"", 0, HS_XCT_TYPE_NOTYPE},
/* 31 */ {"", 0, HS_XCT_TYPE_NOTYPE},

};

/************************/
Expand Down
Loading

0 comments on commit a96fa15

Please sign in to comment.