Skip to content

Commit

Permalink
Merge pull request #261 from skliper/fix260-rm_empty_filters
Browse files Browse the repository at this point in the history 
Fix #260, Remove registration of empty EVS filters
  • Loading branch information
@astrogeco
astrogeco authored Jun 16, 2022
2 parents 8c2d040 + 6e5a36b commit 593d61a
Showing 1 changed file with 1 addition and 109 deletions.
110 changes: 1 addition & 109 deletions fsw/src/cf_app.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,113 +212,6 @@ int32 CF_TableInit(void)
*-----------------------------------------------------------------*/
int32 CF_Init(void)
{
static CFE_EVS_BinFilter_t cf_event_filters[] = {
{CF_EID_ERR_ASSERT, 0x0000},
{CF_EID_INF_INIT, 0x0000},
{CF_EID_ERR_INIT_TBL_CHECK_REL, 0x0000},
{CF_EID_ERR_INIT_TBL_CHECK_MAN, 0x0000},
{CF_EID_ERR_INIT_TBL_CHECK_GA, 0x0000},
{CF_EID_ERR_INIT_TBL_REG, 0x0000},
{CF_EID_ERR_INIT_TBL_LOAD, 0x0000},
{CF_EID_ERR_INIT_TBL_MANAGE, 0x0000},
{CF_EID_ERR_INIT_TBL_GETADDR, 0x0000},
{CF_EID_ERR_INIT_CMD_LENGTH, 0x0000},
{CF_EID_ERR_INIT_MSG_RECV, 0x0000},
{CF_EID_ERR_INIT_SEM, 0x0000},
{CF_EID_ERR_INIT_PIPE, 0x0000},
{CF_EID_ERR_INIT_SUB, 0x0000},
{CF_EID_ERR_INIT_TPS, 0x0000},
{CF_EID_ERR_INIT_CRC_ALIGN, 0x0000},
{CF_EID_ERR_INIT_OUTGOING_SIZE, 0x0000},
{CF_EID_INF_PDU_MD_RECVD, 0x0000},
{CF_EID_ERR_PDU_SHORT_HEADER, 0x0000},
{CF_EID_ERR_PDU_LONG_VS_RECVD, 0x0000},
{CF_EID_ERR_PDU_MD_SHORT, 0x0000},
{CF_EID_ERR_PDU_INVALID_SRC_LEN, 0x0000},
{CF_EID_ERR_PDU_INVALID_DST_LEN, 0x0000},
{CF_EID_ERR_PDU_FD_SHORT, 0x0000},
{CF_EID_ERR_PDU_EOF_SHORT, 0x0000},
{CF_EID_ERR_PDU_ACK_SHORT, 0x0000},
{CF_EID_ERR_PDU_FIN_SHORT, 0x0000},
{CF_EID_ERR_PDU_NAK_SHORT, 0x0000},
{CF_EID_ERR_PDU_BAD_RX_MSG_SIZE, 0x0000},
{CF_EID_ERR_PDU_GET_EID_SIZE, 0x0000},
{CF_EID_ERR_PDU_GET_TSN_SIZE, 0x0000},
{CF_EID_ERR_CFDP_RX_DROPPED, 0x0000},
{CF_EID_ERR_CFDP_INVALID_DST_EID, 0x0000},
{CF_EID_ERR_CFDP_IDLE_MD, 0x0000},
{CF_EID_ERR_CFDP_FD_UNHANDLED, 0x0000},
{CF_EID_ERR_CFDP_MAX_CMD_TX, 0x0000},
{CF_EID_ERR_CFDP_OPENDIR, 0x0000},
{CF_EID_ERR_CFDP_DIR_SLOT, 0x0000},
{CF_EID_ERR_CFDP_NO_MSG, 0x0000},
{CF_EID_INF_CFDP_R_REQUEST_MD, 0x0000},
{CF_EID_INF_CFDP_R_TEMP_FILE, 0x0000},
{CF_EID_ERR_CFDP_R_NAK_LIMIT, 0x0000},
{CF_EID_ERR_CFDP_R_ACK_LIMIT, 0x0000},
{CF_EID_ERR_CFDP_R_CRC, 0x0000},
{CF_EID_ERR_CFDP_R_SEEK_FD, 0x0000},
{CF_EID_ERR_CFDP_R_SEEK_CRC, 0x0000},
{CF_EID_ERR_CFDP_R_WRITE, 0x0000},
{CF_EID_ERR_CFDP_R_SIZE_MISMATCH, 0x0000},
{CF_EID_ERR_CFDP_R_PDU_EOF, 0x0000},
{CF_EID_ERR_CFDP_R_CREAT, 0x0000},
{CF_EID_ERR_CFDP_R_PDU_FINACK, 0x0000},
{CF_EID_ERR_CFDP_R_EOF_MD_SIZE, 0x0000},
{CF_EID_ERR_CFDP_R_RENAME, 0x0000},
{CF_EID_ERR_CFDP_R_OPEN, 0x0000},
{CF_EID_ERR_CFDP_R_PDU_MD, 0x0000},
{CF_EID_ERR_CFDP_R_READ, 0x0000},
{CF_EID_ERR_CFDP_R_DC_INV, 0x0000},
{CF_EID_ERR_CFDP_R_INACT_TIMER, 0x0000},
{CF_EID_INF_CFDP_S_START_SEND, 0x0000},
{CF_EID_ERR_CFDP_S_SEEK_FD, 0x0000},
{CF_EID_ERR_CFDP_S_READ, 0x0000},
{CF_EID_ERR_CFDP_S_SEND_FD, 0x0000},
{CF_EID_ERR_CFDP_S_ALREADY_OPEN, 0x0000},
{CF_EID_ERR_CFDP_S_OPEN, 0x0000},
{CF_EID_ERR_CFDP_S_SEEK_END, 0x0000},
{CF_EID_ERR_CFDP_S_SEEK_BEG, 0x0000},
{CF_EID_ERR_CFDP_S_SEND_MD, 0x0000},
{CF_EID_ERR_CFDP_S_PDU_FIN, 0x0000},
{CF_EID_ERR_CFDP_S_INVALID_SR, 0x0000},
{CF_EID_ERR_CFDP_S_PDU_NAK, 0x0000},
{CF_EID_ERR_CFDP_S_PDU_EOF, 0x0000},
{CF_EID_ERR_CFDP_S_EARLY_FIN, 0x0000},
{CF_EID_ERR_CFDP_S_DC_INV, 0x0000},
{CF_EID_ERR_CFDP_S_NON_FD_PDU, 0x0000},
{CF_EID_ERR_CFDP_S_ACK_LIMIT, 0x0000},
{CF_EID_ERR_CFDP_S_INACT_TIMER, 0x0000},
{CF_EID_INF_CMD_NOOP, 0x0000},
{CF_EID_INF_CMD_RESET, 0x0000},
{CF_EID_INF_CMD_GETSET1, 0x0000},
{CF_EID_INF_CMD_GETSET2, 0x0000},
{CF_EID_ERR_CMD_RESET_INVALID, 0x0000},
{CF_EID_ERR_CMD_CHAN_PARAM, 0x0000},
{CF_EID_ERR_CMD_TRANS_NOT_FOUND, 0x0000},
{CF_EID_ERR_CMD_TSN_CHAN_INVALID, 0x0000},
{CF_EID_ERR_CMD_SUSPRES_SAME, 0x0000},
{CF_EID_ERR_CMD_SUSPRES_CHAN, 0x0000},
{CF_EID_ERR_CMD_POLLDIR_INVALID, 0x0000},
{CF_EID_ERR_CMD_PURGE_ARG, 0x0000},
{CF_EID_ERR_CMD_WQ_CHAN, 0x0000},
{CF_EID_ERR_CMD_WQ_ARGS, 0x0000},
{CF_EID_ERR_CMD_WQ_OPEN, 0x0000},
{CF_EID_ERR_CMD_WQ_WRITEQ_RX, 0x0000},
{CF_EID_ERR_CMD_WQ_WRITEHIST_RX, 0x0000},
{CF_EID_ERR_CMD_WQ_WRITEQ_TX, 0x0000},
{CF_EID_ERR_CMD_WQ_WRITEQ_PEND, 0x0000},
{CF_EID_ERR_CMD_WQ_WRITEHIST_TX, 0x0000},
{CF_EID_ERR_CMD_GETSET_VALIDATE, 0x0000},
{CF_EID_ERR_CMD_GETSET_PARAM, 0x0000},
{CF_EID_ERR_CMD_ENABLE_ENGINE, 0x0000},
{CF_EID_ERR_CMD_ENG_ALREADY_ENA, 0x0000},
{CF_EID_ERR_CMD_ENG_ALREADY_DIS, 0x0000},
{CF_EID_ERR_CMD_GCMD_LEN, 0x0000},
{CF_EID_ERR_CMD_GCMD_CC, 0x0000},
{CF_EID_ERR_CMD_WHIST_WRITE, 0x0000},
};

int32 status = CFE_SUCCESS;
static const CFE_SB_MsgId_Atom_t MID_VALUES[] = {CF_CMD_MID, CF_SEND_HK_MID, CF_WAKE_UP_MID};
uint32 i;
Expand All @@ -327,8 +220,7 @@ int32 CF_Init(void)

CFE_MSG_Init(&CF_AppData.hk.tlm_header.Msg, CFE_SB_ValueToMsgId(CF_HK_TLM_MID), sizeof(CF_AppData.hk));

status = CFE_EVS_Register(cf_event_filters, sizeof(cf_event_filters) / sizeof(*cf_event_filters),
CFE_EVS_EventFilter_BINARY);
status = CFE_EVS_Register(NULL, 0, CFE_EVS_EventFilter_BINARY);
if (status != CFE_SUCCESS)
{
CFE_ES_WriteToSysLog("CF app: error registering with EVS, returned 0x%08lx", (unsigned long)status);
Expand Down

0 comments on commit 593d61a

Please sign in to comment.