diff options
| author | Vadim Yanitskiy <axilirator@gmail.com> | 2017-07-27 09:21:11 +0600 |
|---|---|---|
| committer | Vadim Yanitskiy <axilirator@gmail.com> | 2017-11-19 17:35:07 +0700 |
| commit | e6acd7bd075effc4906deb9b03b71a18a028da87 (patch) | |
| tree | c361339819d93da58535f712909cff18cce88a1b /src/host | |
| parent | 806e528bd1d21a307d6f1959e65b80f4978a9a36 (diff) | |
host/trxcon: get rid of useless TRX_EVENT_RESET_IND
Change-Id: I2aa4c000b37f64c351a806711b2d19bf27ef82bd
Diffstat (limited to 'src/host')
| -rw-r--r-- | src/host/trxcon/trx_if.c | 6 | ||||
| -rw-r--r-- | src/host/trxcon/trxcon.c | 2 | ||||
| -rw-r--r-- | src/host/trxcon/trxcon.h | 1 |
3 files changed, 2 insertions, 7 deletions
diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index 961f46c4..9c76c6d0 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -488,11 +488,9 @@ static int trx_ctrl_read_cb(struct osmo_fd *ofd, unsigned int what) osmo_fsm_inst_state_chg(trx->fsm, TRX_STATE_IDLE, 0, 0); else if (!strncmp(tcm->cmd + 4, "MEASURE", 7)) trx_if_measure_rsp_cb(trx, buf + 14); - else if (!strncmp(tcm->cmd + 4, "ECHO", 4)) { + else if (!strncmp(tcm->cmd + 4, "ECHO", 4)) osmo_fsm_inst_state_chg(trx->fsm, TRX_STATE_IDLE, 0, 0); - osmo_fsm_inst_dispatch(trxcon_fsm, - TRX_EVENT_RESET_IND, trx); - } else + else osmo_fsm_inst_state_chg(trx->fsm, trx->prev_state, 0, 0); /* Remove command from list */ diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index c509bf1b..82371bdb 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -99,7 +99,6 @@ static void trxcon_fsm_managed_action(struct osmo_fsm_inst *fi, break; case TRX_EVENT_RSP_ERROR: case TRX_EVENT_OFFLINE: - case TRX_EVENT_RESET_IND: /* TODO: notify L2 & L3 about that */ break; default: @@ -117,7 +116,6 @@ static struct osmo_fsm_state trxcon_fsm_states[] = { [TRXCON_STATE_MANAGED] = { .in_event_mask = ( GEN_MASK(L1CTL_EVENT_DISCONNECT) | - GEN_MASK(TRX_EVENT_RESET_IND) | GEN_MASK(TRX_EVENT_RSP_ERROR) | GEN_MASK(TRX_EVENT_OFFLINE)), .out_state_mask = GEN_MASK(TRXCON_STATE_IDLE), diff --git a/src/host/trxcon/trxcon.h b/src/host/trxcon/trxcon.h index 1ab3a14b..65b5e85d 100644 --- a/src/host/trxcon/trxcon.h +++ b/src/host/trxcon/trxcon.h @@ -16,7 +16,6 @@ enum trxcon_fsm_events { L1CTL_EVENT_DISCONNECT, /* TRX specific events */ - TRX_EVENT_RESET_IND, TRX_EVENT_RSP_ERROR, TRX_EVENT_OFFLINE, }; |