dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28838 )

Change subject: abis_om2000: fix missing signal ......................................................................

abis_om2000: fix missing signal

The normal abis nm FSMs are sending S_NM_RUNNING_CHG signals that include an object class to notify other entities about state changes. This also includes paging.c, which only starts paging services when it sees NM_OC_RADIO_CARRIER becoming enabled.

Change-Id: I305df5b2f962473e33e32484c42a79ff96e53e1a Fixes: I1b5b1a98115b4e9d821eb3330fc5b970a0e78a44 Related: OS#5634 --- M src/osmo-bsc/abis_om2000.c 1 file changed, 16 insertions(+), 0 deletions(-)

Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved

diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c index 84fb7ac..8780a6d 100644 --- a/src/osmo-bsc/abis_om2000.c +++ b/src/osmo-bsc/abis_om2000.c @@ -44,9 +44,20 @@ #include <osmocom/bsc/abis_om2000.h> #include <osmocom/bsc/signal.h> #include <osmocom/bsc/timeslot_fsm.h> +#include <osmocom/bsc/nm_common_fsm.h> #include <osmocom/bsc/bts.h> #include <osmocom/abis/e1_input.h>

+static inline void abis_om2000_fsm_transc_becomes_enabled(struct gsm_bts_trx *trx) +{ + nm_obj_fsm_becomes_enabled_disabled(trx->bts, trx, NM_OC_RADIO_CARRIER, true); +} + +static inline void abis_om2000_fsm_transc_becomes_disabled(struct gsm_bts_trx *trx) +{ + nm_obj_fsm_becomes_enabled_disabled(trx->bts, trx, NM_OC_RADIO_CARRIER, false); +} + /* FIXME: move to libosmocore */ struct osmo_fsm_inst *osmo_fsm_inst_alloc_child_id(struct osmo_fsm *fsm, struct osmo_fsm_inst *parent, @@ -2205,14 +2216,19 @@ /* See e1_config:bts_isdn_sign_link() / OS#4914 */ otfp->trx->mo.nm_state.administrative = NM_STATE_UNLOCKED;

+ abis_om2000_fsm_transc_becomes_enabled(otfp->trx); + if (fi->proc.parent) osmo_fsm_inst_dispatch(fi->proc.parent, otfp->done_event, NULL); }

static void om2k_trx_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct om2k_trx_fsm_priv *otfp = fi->priv; + switch (event) { case OM2K_TRX_EVT_RESET: + abis_om2000_fsm_transc_becomes_disabled(otfp->trx); osmo_fsm_inst_broadcast_children(fi, event, data); osmo_fsm_inst_state_chg(fi, OM2K_TRX_S_INIT, 0, 0); break;