From 64c422858db9388e210875dc681f2d1952e0d0bb Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Tue, 1 Dec 2020 17:25:28 +0100 Subject: Store GPRS MOs directly under BTS SiteMgr object The only real 1-1 relationship between BTS NM objects is the one between GPRS Cell and BTS (which is actually a BTS cell). In our current osmo-bts implementation we don't care much since we only handle 1-cell BTSses, but let's make the data structure organization more generic. Implementation notes: The gsm_bts_sm is moved to its own file, APIs to allocate are added and the new public object is hooked correctly in the allocation process of osmo-bsc. Change-Id: I06461b7784fa2a78de37383406e35beae85fbad8 --- src/osmo-bsc/nm_channel_fsm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/osmo-bsc/nm_channel_fsm.c') diff --git a/src/osmo-bsc/nm_channel_fsm.c b/src/osmo-bsc/nm_channel_fsm.c index 676c471e6..620051a42 100644 --- a/src/osmo-bsc/nm_channel_fsm.c +++ b/src/osmo-bsc/nm_channel_fsm.c @@ -125,7 +125,7 @@ static void st_op_disabled_dependency_on_enter(struct osmo_fsm_inst *fi, uint32_ { struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; - if (ts->trx->bts->site_mgr.peer_has_no_avstate_offline) { + if (ts->trx->bts->site_mgr->peer_has_no_avstate_offline) { nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_OFFLINE); return; } @@ -208,7 +208,7 @@ static void st_op_disabled_offline(struct osmo_fsm_inst *fi, uint32_t event, voi case NM_AVSTATE_DEPENDENCY: /* There's no point in moving back to Dependency, since it's broken and it acts actually as if it was in Offline state */ - if (!ts->trx->bts->site_mgr.peer_has_no_avstate_offline) { + if (!ts->trx->bts->site_mgr->peer_has_no_avstate_offline) { nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_DEPENDENCY); } else { /* Moreover, in nanoBTS we need to check here for tx -- cgit v1.2.3