This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Harald Welte gerrit-no-reply at lists.osmocom.orgReview at https://gerrit.osmocom.org/6747 host/trxcon: get rid of useless TRX_EVENT_RESET_IND Change-Id: I2aa4c000b37f64c351a806711b2d19bf27ef82bd --- M src/host/trxcon/trx_if.c M src/host/trxcon/trxcon.c M src/host/trxcon/trxcon.h 3 files changed, 2 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/47/6747/1 diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index 961f46c..9c76c6d 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -488,11 +488,9 @@ 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 c509bf1..82371bd 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -99,7 +99,6 @@ 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 @@ [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 1ab3a14..65b5e85 100644 --- a/src/host/trxcon/trxcon.h +++ b/src/host/trxcon/trxcon.h @@ -16,7 +16,6 @@ L1CTL_EVENT_DISCONNECT, /* TRX specific events */ - TRX_EVENT_RESET_IND, TRX_EVENT_RSP_ERROR, TRX_EVENT_OFFLINE, }; -- To view, visit https://gerrit.osmocom.org/6747 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2aa4c000b37f64c351a806711b2d19bf27ef82bd Gerrit-PatchSet: 1 Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Owner: Harald Welte <laforge at gnumonks.org>