dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30748 ) Change subject: abis_om2000: send TS_EV_OML_READY when TRX is fully done ...................................................................... abis_om2000: send TS_EV_OML_READY when TRX is fully done We send the TS_EV_OML_READY event early, even though the TRX is not fully done with all OML initialization steps. Lets complete the TRX initialization first and then notify each timeslot FSM with TS_EV_OML_READY. Change-Id: If5251b102c8aa45dfc8cc4ee4e0223d7dc438938 --- M src/osmo-bsc/abis_om2000.c 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c index cf69ded..2a653bf 100644 --- a/src/osmo-bsc/abis_om2000.c +++ b/src/osmo-bsc/abis_om2000.c @@ -2254,10 +2254,6 @@ struct om2k_trx_fsm_priv *otfp = fi->priv; struct gsm_bts_trx_ts *ts; - /* notify TS is ready */ - ts = &otfp->trx->ts[otfp->cur_ts_nr]; - osmo_fsm_inst_dispatch(ts->fi, TS_EV_OML_READY, NULL); - /* next ? */ if (++otfp->cur_ts_nr < 8) { /* iterate to the next timeslot */ @@ -2285,6 +2281,7 @@ struct nm_statechg_signal_data nsd; struct nm_statechg_signal_data nsd_bb_transc; struct gsm_bts_trx *trx = otfp->trx; + unsigned int i; memset(&nsd, 0, sizeof(nsd)); @@ -2316,6 +2313,10 @@ if (fi->proc.parent) osmo_fsm_inst_dispatch(fi->proc.parent, otfp->done_event, NULL); + + /* Notify the timeslot FSM that all TRX initialization steps are done. */ + for (i = 0; i < ARRAY_SIZE(trx->ts); i++) + osmo_fsm_inst_dispatch(trx->ts[i].fi, TS_EV_OML_READY, NULL); } static void om2k_trx_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data) 9 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If5251b102c8aa45dfc8cc4ee4e0223d7dc438938 Gerrit-Change-Number: 30748 Gerrit-PatchSet: 11 Gerrit-Owner: dexter <pmaier@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier@sysmocom.de> Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: pespin <pespin@sysmocom.de> Gerrit-CC: fixeria <vyanitskiy@sysmocom.de> Gerrit-MessageType: merged