<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/20311">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Introduce NM Channel FSM<br><br>Change-Id: I288cbfb4730b25a334ef1c3d6b9679d6f1d4cfc5<br>---<br>M include/osmo-bts/nm_common_fsm.h<br>M src/common/Makefile.am<br>M src/common/bts_trx.c<br>M src/common/nm_bb_transc_fsm.c<br>A src/common/nm_channel_fsm.c<br>M src/common/nm_common_fsm.c<br>M src/common/nm_radio_carrier_fsm.c<br>M src/osmo-bts-litecell15/l1_if.c<br>M src/osmo-bts-litecell15/oml.c<br>M src/osmo-bts-oc2g/l1_if.c<br>M src/osmo-bts-oc2g/oml.c<br>M src/osmo-bts-octphy/l1_if.c<br>M src/osmo-bts-octphy/l1_oml.c<br>M src/osmo-bts-omldummy/bts_model.c<br>M src/osmo-bts-sysmo/l1_if.c<br>M src/osmo-bts-sysmo/oml.c<br>M src/osmo-bts-trx/l1_if.c<br>M src/osmo-bts-virtual/bts_model.c<br>18 files changed, 394 insertions(+), 147 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/nm_common_fsm.h b/include/osmo-bts/nm_common_fsm.h</span><br><span>index 4671725..4a82757 100644</span><br><span>--- a/include/osmo-bts/nm_common_fsm.h</span><br><span>+++ b/include/osmo-bts/nm_common_fsm.h</span><br><span>@@ -36,6 +36,9 @@</span><br><span> NM_EV_PHYLINK_UP, /* RadioCarrier and BaseBand Transceiver only */</span><br><span> NM_EV_PHYLINK_DOWN, /* RadioCarrier and BaseBand Transceiver only */</span><br><span> NM_EV_DISABLE, /* RadioCarrier and BaseBand Transceiver only */</span><br><span style="color: hsl(120, 100%, 40%);">+ NM_EV_BBTRANSC_INSTALLED, /* Radio Channel only */</span><br><span style="color: hsl(120, 100%, 40%);">+ NM_EV_BBTRANSC_ENABLED, /* Radio Channel only */</span><br><span style="color: hsl(120, 100%, 40%);">+ NM_EV_BBTRANSC_DISABLED, /* Radio Channel only */</span><br><span> </span><br><span> };</span><br><span> extern const struct value_string nm_fsm_event_names[];</span><br><span>@@ -72,3 +75,12 @@</span><br><span> NM_RCARRIER_ST_OP_ENABLED,</span><br><span> };</span><br><span> extern struct osmo_fsm nm_rcarrier_fsm;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Radio channel */</span><br><span style="color: hsl(120, 100%, 40%);">+enum nm_chan_op_fsm_states {</span><br><span style="color: hsl(120, 100%, 40%);">+ NM_CHAN_ST_OP_DISABLED_NOTINSTALLED,</span><br><span style="color: hsl(120, 100%, 40%);">+ NM_CHAN_ST_OP_DISABLED_DEPENDENCY,</span><br><span style="color: hsl(120, 100%, 40%);">+ NM_CHAN_ST_OP_DISABLED_OFFLINE,</span><br><span style="color: hsl(120, 100%, 40%);">+ NM_CHAN_ST_OP_ENABLED,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+extern struct osmo_fsm nm_chan_fsm;</span><br><span>diff --git a/src/common/Makefile.am b/src/common/Makefile.am</span><br><span>index 7156785..d979bc0 100644</span><br><span>--- a/src/common/Makefile.am</span><br><span>+++ b/src/common/Makefile.am</span><br><span>@@ -41,6 +41,7 @@</span><br><span> nm_bts_sm_fsm.c \</span><br><span> nm_bts_fsm.c \</span><br><span> nm_bb_transc_fsm.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_channel_fsm.c \</span><br><span> nm_radio_carrier_fsm.c \</span><br><span> $(NULL)</span><br><span> </span><br><span>diff --git a/src/common/bts_trx.c b/src/common/bts_trx.c</span><br><span>index 04c21c3..6bb18a3 100644</span><br><span>--- a/src/common/bts_trx.c</span><br><span>+++ b/src/common/bts_trx.c</span><br><span>@@ -32,6 +32,8 @@</span><br><span> </span><br><span> static int gsm_bts_trx_talloc_destructor(struct gsm_bts_trx *trx)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (trx->bb_transc.mo.fi) {</span><br><span> osmo_fsm_inst_free(trx->bb_transc.mo.fi);</span><br><span> trx->bb_transc.mo.fi = NULL;</span><br><span>@@ -40,6 +42,13 @@</span><br><span> osmo_fsm_inst_free(trx->mo.fi);</span><br><span> trx->mo.fi = NULL;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < TRX_NR_TS; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts = &trx->ts[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->mo.fi) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_free(ts->mo.fi);</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->mo.fi = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -79,6 +88,10 @@</span><br><span> ts->dyn.pchan_want = GSM_PCHAN_NONE;</span><br><span> ts->tsc = -1;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ ts->mo.fi = osmo_fsm_inst_alloc(&nm_chan_fsm, trx, ts,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGL_INFO, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_update_id_f(ts->mo.fi, "bts%d-trx%d-ts%d",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nr, trx->nr, ts->nr);</span><br><span> gsm_mo_init(&ts->mo, bts, NM_OC_CHANNEL,</span><br><span> bts->nr, trx->nr, ts->nr);</span><br><span> </span><br><span>diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c</span><br><span>index b23ff53..936451f 100644</span><br><span>--- a/src/common/nm_bb_transc_fsm.c</span><br><span>+++ b/src/common/nm_bb_transc_fsm.c</span><br><span>@@ -55,11 +55,17 @@</span><br><span> static void st_op_disabled_notinstalled(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span> struct gsm_bts_bb_trx *bb_transc = (struct gsm_bts_bb_trx *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx *trx = gsm_bts_bb_trx_get_trx(bb_transc);</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span> </span><br><span> switch (event) {</span><br><span> case NM_EV_SW_ACT:</span><br><span> oml_mo_tx_sw_act_rep(&bb_transc->mo);</span><br><span> nm_bb_transc_fsm_state_chg(fi, NM_BBTRANSC_ST_OP_DISABLED_OFFLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < TRX_NR_TS; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts = &trx->ts[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_BBTRANSC_INSTALLED, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> return;</span><br><span> case NM_EV_RSL_UP:</span><br><span> return;</span><br><span>@@ -79,8 +85,18 @@</span><br><span> static void st_op_disabled_offline_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span> {</span><br><span> struct gsm_bts_bb_trx *bb_transc = (struct gsm_bts_bb_trx *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx *trx = gsm_bts_bb_trx_get_trx(bb_transc);</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> bb_transc->mo.opstart_success = false;</span><br><span> oml_mo_state_chg(&bb_transc->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (prev_state == NM_BBTRANSC_ST_OP_ENABLED) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < TRX_NR_TS; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts = &trx->ts[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_BBTRANSC_DISABLED, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> static void st_op_disabled_offline(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span>@@ -138,7 +154,15 @@</span><br><span> static void st_op_enabled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span> {</span><br><span> struct gsm_bts_bb_trx *bb_transc = (struct gsm_bts_bb_trx *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx *trx = gsm_bts_bb_trx_get_trx(bb_transc);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tn;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> oml_mo_state_chg(&bb_transc->mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Mark Dependency TS as Offline (ready to be Opstarted) */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (tn = 0; tn < TRX_NR_TS; tn++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts = &trx->ts[tn];</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_BBTRANSC_ENABLED, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> static void st_op_enabled(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span>diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c</span><br><span>new file mode 100644</span><br><span>index 0000000..263d2cc</span><br><span>--- /dev/null</span><br><span>+++ b/src/common/nm_channel_fsm.c</span><br><span>@@ -0,0 +1,210 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/* NM Radio Carrier FSM */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* (C) 2020 by sysmocom - s.m.f.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ * Author: Pau Espin Pedrol <pespin@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <errno.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <unistd.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <inttypes.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/tdef.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/protocol/gsm_12_21.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/gsm_data.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/bts_model.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/bts.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/rsl.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/nm_common_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define X(s) (1 << (s))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define nm_chan_fsm_state_chg(fi, NEXT_STATE) \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_state_chg(fi, NEXT_STATE, 0, 0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+//////////////////////////</span><br><span style="color: hsl(120, 100%, 40%);">+// FSM STATE ACTIONS</span><br><span style="color: hsl(120, 100%, 40%);">+//////////////////////////</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->mo.opstart_success = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_mo_state_chg(&ts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_op_disabled_notinstalled(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_BBTRANSC_INSTALLED:</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_mo_tx_sw_act_rep(&ts->mo);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->trx->bb_transc.mo.nm_state.operational == NM_OPSTATE_ENABLED)</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_OFFLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_DEPENDENCY);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_op_disabled_dependency_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->mo.opstart_success = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_mo_state_chg(&ts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_op_disabled_dependency(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_OPSTART_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSML(fi, LOGL_NOTICE, "BSC trying to activate TS while still in avail=dependency. "</span><br><span style="color: hsl(120, 100%, 40%);">+ "Allowing it to stay backward-compatible with older osmo-bts versions, but BSC is wrong.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->mo.opstart_success = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_mo_opstart_ack(&ts->mo);</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_ENABLED);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_OPSTART_NACK:</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->mo.opstart_success = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_mo_opstart_nack(&ts->mo, (int)(intptr_t)data);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_BBTRANSC_ENABLED:</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_mo_state_chg(&ts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_op_disabled_offline_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->mo.opstart_success = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_mo_state_chg(&ts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_op_disabled_offline(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_OPSTART_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->mo.opstart_success = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_mo_opstart_ack(&ts->mo);</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_ENABLED);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_OPSTART_NACK:</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->mo.opstart_success = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_mo_opstart_nack(&ts->mo, (int)(intptr_t)data);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_BBTRANSC_DISABLED:</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_mo_state_chg(&ts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_op_enabled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_mo_state_chg(&ts->mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_op_enabled(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_BBTRANSC_DISABLED:</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_DEPENDENCY);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_DISABLE:</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_OFFLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static struct osmo_fsm_state nm_chan_fsm_states[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ [NM_CHAN_ST_OP_DISABLED_NOTINSTALLED] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_BBTRANSC_INSTALLED),</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_CHAN_ST_OP_DISABLED_OFFLINE) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_CHAN_ST_OP_DISABLED_DEPENDENCY),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DISABLED_NOTINSTALLED",</span><br><span style="color: hsl(120, 100%, 40%);">+ .onenter = st_op_disabled_notinstalled_on_enter,</span><br><span style="color: hsl(120, 100%, 40%);">+ .action = st_op_disabled_notinstalled,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [NM_CHAN_ST_OP_DISABLED_DEPENDENCY] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_OPSTART_ACK) | /* backward compatibility, buggy BSC */</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_OPSTART_NACK) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_BBTRANSC_ENABLED),</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_CHAN_ST_OP_DISABLED_OFFLINE) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_CHAN_ST_OP_ENABLED), /* backward compatibility, buggy BSC */</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DISABLED_DEPENDENCY",</span><br><span style="color: hsl(120, 100%, 40%);">+ .onenter = st_op_disabled_dependency_on_enter,</span><br><span style="color: hsl(120, 100%, 40%);">+ .action = st_op_disabled_dependency,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [NM_CHAN_ST_OP_DISABLED_OFFLINE] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_OPSTART_ACK) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_OPSTART_NACK) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_BBTRANSC_DISABLED),</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_CHAN_ST_OP_ENABLED) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_CHAN_ST_OP_DISABLED_DEPENDENCY),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DISABLED_OFFLINE",</span><br><span style="color: hsl(120, 100%, 40%);">+ .onenter = st_op_disabled_offline_on_enter,</span><br><span style="color: hsl(120, 100%, 40%);">+ .action = st_op_disabled_offline,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [NM_CHAN_ST_OP_ENABLED] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_BBTRANSC_DISABLED) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_DISABLE),</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_CHAN_ST_OP_DISABLED_OFFLINE) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_CHAN_ST_OP_DISABLED_DEPENDENCY),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "ENABLED",</span><br><span style="color: hsl(120, 100%, 40%);">+ .onenter = st_op_enabled_on_enter,</span><br><span style="color: hsl(120, 100%, 40%);">+ .action = st_op_enabled,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_fsm nm_chan_fsm = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "NM_CHAN_OP",</span><br><span style="color: hsl(120, 100%, 40%);">+ .states = nm_chan_fsm_states,</span><br><span style="color: hsl(120, 100%, 40%);">+ .num_states = ARRAY_SIZE(nm_chan_fsm_states),</span><br><span style="color: hsl(120, 100%, 40%);">+ .event_names = nm_fsm_event_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ .log_subsys = DOML,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static __attribute__((constructor)) void nm_chan_fsm_init(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(osmo_fsm_register(&nm_chan_fsm) == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/common/nm_common_fsm.c b/src/common/nm_common_fsm.c</span><br><span>index 8804569..b2fd451 100644</span><br><span>--- a/src/common/nm_common_fsm.c</span><br><span>+++ b/src/common/nm_common_fsm.c</span><br><span>@@ -32,5 +32,8 @@</span><br><span> { NM_EV_PHYLINK_UP, "PHYLINK_UP" },</span><br><span> { NM_EV_PHYLINK_DOWN, "PHYLINK_DOWN" },</span><br><span> { NM_EV_DISABLE, "DISABLE" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { NM_EV_BBTRANSC_INSTALLED, "BBTRANSC_INSTALLED" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { NM_EV_BBTRANSC_ENABLED, "BBTRANSC_ENABLED" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { NM_EV_BBTRANSC_DISABLED, "BBTRANSC_DISABLED" },</span><br><span> { 0, NULL }</span><br><span> };</span><br><span>diff --git a/src/common/nm_radio_carrier_fsm.c b/src/common/nm_radio_carrier_fsm.c</span><br><span>index 01849d1..d8291f8 100644</span><br><span>--- a/src/common/nm_radio_carrier_fsm.c</span><br><span>+++ b/src/common/nm_radio_carrier_fsm.c</span><br><span>@@ -136,16 +136,7 @@</span><br><span> static void st_op_enabled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span> {</span><br><span> struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tn;</span><br><span> oml_mo_state_chg(&trx->mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Mark Dependency TS as Offline (ready to be Opstarted) */</span><br><span style="color: hsl(0, 100%, 40%);">- for (tn = 0; tn < TRX_NR_TS; tn++) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (trx->ts[tn].mo.nm_state.operational == NM_OPSTATE_DISABLED &&</span><br><span style="color: hsl(0, 100%, 40%);">- trx->ts[tn].mo.nm_state.availability == NM_AVSTATE_DEPENDENCY) {</span><br><span style="color: hsl(0, 100%, 40%);">- oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> }</span><br><span> </span><br><span> static void st_op_enabled(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span>diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c</span><br><span>index 94fd165..b7c24c0 100644</span><br><span>--- a/src/osmo-bts-litecell15/l1_if.c</span><br><span>+++ b/src/osmo-bts-litecell15/l1_if.c</span><br><span>@@ -1273,9 +1273,6 @@</span><br><span> /* signal availability */</span><br><span> osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SW_ACT, NULL);</span><br><span> osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < ARRAY_SIZE(trx->ts); i++)</span><br><span style="color: hsl(0, 100%, 40%);">- oml_mo_state_chg(&trx->ts[i].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY);</span><br><span> } else {</span><br><span> if (bts_lc15->led_ctrl_mode == LC15_LED_CONTROL_BTS)</span><br><span> bts_update_status(BTS_STATUS_RF_ACTIVE, 0);</span><br><span>diff --git a/src/osmo-bts-litecell15/oml.c b/src/osmo-bts-litecell15/oml.c</span><br><span>index d810987..1fe7205 100644</span><br><span>--- a/src/osmo-bts-litecell15/oml.c</span><br><span>+++ b/src/osmo-bts-litecell15/oml.c</span><br><span>@@ -277,38 +277,41 @@</span><br><span> get_value_string(lc15bts_l1prim_names, l1p->id),</span><br><span> get_value_string(lc15bts_l1status_names, status));</span><br><span> msgb_free(l1_msg);</span><br><span style="color: hsl(0, 100%, 40%);">- if (mo->obj_class == NM_OC_RADIO_CARRIER)</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (mo->obj_class) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_OC_RADIO_CARRIER:</span><br><span> return osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_NACK,</span><br><span> (void*)(intptr_t)NM_NACK_CANT_PERFORM);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- return oml_mo_opstart_nack(mo, NM_NACK_CANT_PERFORM);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(l1_msg);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* We already have a FSM for Radio Carrier, handle it there */</span><br><span style="color: hsl(0, 100%, 40%);">- if (mo->obj_class == NM_OC_RADIO_CARRIER)</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_ACK, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Set to Operational State: Enabled */</span><br><span style="color: hsl(0, 100%, 40%);">- oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* ugly hack to auto-activate all SAPIs for the BCCH/CCCH on TS0 */</span><br><span style="color: hsl(0, 100%, 40%);">- if (mo->obj_class == NM_OC_CHANNEL && mo->obj_inst.trx_nr == 0 &&</span><br><span style="color: hsl(0, 100%, 40%);">- mo->obj_inst.ts_nr == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_lchan *cbch = gsm_bts_get_cbch(mo->bts);</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DL1C, "====> trying to activate lchans of BCCH\n");</span><br><span style="color: hsl(0, 100%, 40%);">- mo->bts->c0->ts[0].lchan[CCCH_LCHAN].rel_act_kind =</span><br><span style="color: hsl(0, 100%, 40%);">- LCHAN_REL_ACT_OML;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_activate(&mo->bts->c0->ts[0].lchan[CCCH_LCHAN]);</span><br><span style="color: hsl(0, 100%, 40%);">- if (cbch) {</span><br><span style="color: hsl(0, 100%, 40%);">- cbch->rel_act_kind = LCHAN_REL_ACT_OML;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_activate(cbch);</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_OC_CHANNEL:</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_fsm_inst_dispatch(trx->ts[mo->obj_inst.ts_nr].mo.fi, NM_EV_OPSTART_NACK,</span><br><span style="color: hsl(120, 100%, 40%);">+ (void*)(intptr_t)NM_NACK_CANT_PERFORM);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Send OPSTART ack */</span><br><span style="color: hsl(0, 100%, 40%);">- return oml_mo_opstart_ack(mo);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(l1_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (mo->obj_class) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_OC_RADIO_CARRIER:</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_ACK, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_OC_CHANNEL:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* ugly hack to auto-activate all SAPIs for the BCCH/CCCH on TS0 */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mo->obj_inst.trx_nr == 0 &&</span><br><span style="color: hsl(120, 100%, 40%);">+ mo->obj_inst.ts_nr == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *cbch = gsm_bts_get_cbch(mo->bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DL1C, "====> trying to activate lchans of BCCH\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ mo->bts->c0->ts[0].lchan[CCCH_LCHAN].rel_act_kind =</span><br><span style="color: hsl(120, 100%, 40%);">+ LCHAN_REL_ACT_OML;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_activate(&mo->bts->c0->ts[0].lchan[CCCH_LCHAN]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cbch) {</span><br><span style="color: hsl(120, 100%, 40%);">+ cbch->rel_act_kind = LCHAN_REL_ACT_OML;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_activate(cbch);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_fsm_inst_dispatch(trx->ts[mo->obj_inst.ts_nr].mo.fi,</span><br><span style="color: hsl(120, 100%, 40%);">+ NM_EV_OPSTART_ACK, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> static int opstart_compl_cb(struct gsm_bts_trx *trx, struct msgb *l1_msg,</span><br><span>@@ -1886,6 +1889,7 @@</span><br><span> {</span><br><span> struct gsm_bts_bb_trx *bb_transc;</span><br><span> struct gsm_bts_trx *trx;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts;</span><br><span> int rc;</span><br><span> </span><br><span> switch (mo->obj_class) {</span><br><span>@@ -1904,7 +1908,8 @@</span><br><span> rc = osmo_fsm_inst_dispatch(bb_transc->mo.fi, NM_EV_OPSTART_ACK, NULL);</span><br><span> break;</span><br><span> case NM_OC_CHANNEL:</span><br><span style="color: hsl(0, 100%, 40%);">- rc = ts_opstart(obj);</span><br><span style="color: hsl(120, 100%, 40%);">+ ts = (struct gsm_bts_trx_ts*) obj;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = ts_opstart(ts);</span><br><span> break;</span><br><span> case NM_OC_GPRS_NSE:</span><br><span> case NM_OC_GPRS_CELL:</span><br><span>diff --git a/src/osmo-bts-oc2g/l1_if.c b/src/osmo-bts-oc2g/l1_if.c</span><br><span>index 4044f43..475edd2 100644</span><br><span>--- a/src/osmo-bts-oc2g/l1_if.c</span><br><span>+++ b/src/osmo-bts-oc2g/l1_if.c</span><br><span>@@ -1328,9 +1328,6 @@</span><br><span> /* signal availability */</span><br><span> osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SW_ACT, NULL);</span><br><span> osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < ARRAY_SIZE(trx->ts); i++)</span><br><span style="color: hsl(0, 100%, 40%);">- oml_mo_state_chg(&trx->ts[i].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY);</span><br><span> } else {</span><br><span> bts_update_status(BTS_STATUS_RF_ACTIVE, 0);</span><br><span> osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_DISABLE, NULL);</span><br><span>diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c</span><br><span>index 2efa577..6403a22 100644</span><br><span>--- a/src/osmo-bts-oc2g/oml.c</span><br><span>+++ b/src/osmo-bts-oc2g/oml.c</span><br><span>@@ -277,38 +277,41 @@</span><br><span> get_value_string(oc2gbts_l1prim_names, l1p->id),</span><br><span> get_value_string(oc2gbts_l1status_names, status));</span><br><span> msgb_free(l1_msg);</span><br><span style="color: hsl(0, 100%, 40%);">- if (mo->obj_class == NM_OC_RADIO_CARRIER)</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (mo->obj_class) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_OC_RADIO_CARRIER:</span><br><span> return osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_NACK,</span><br><span> (void*)(intptr_t)NM_NACK_CANT_PERFORM);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- return oml_mo_opstart_nack(mo, NM_NACK_CANT_PERFORM);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(l1_msg);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* We already have a FSM for Radio Carrier, handle it there */</span><br><span style="color: hsl(0, 100%, 40%);">- if (mo->obj_class == NM_OC_RADIO_CARRIER)</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_ACK, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Set to Operational State: Enabled */</span><br><span style="color: hsl(0, 100%, 40%);">- oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* ugly hack to auto-activate all SAPIs for the BCCH/CCCH on TS0 */</span><br><span style="color: hsl(0, 100%, 40%);">- if (mo->obj_class == NM_OC_CHANNEL && mo->obj_inst.trx_nr == 0 &&</span><br><span style="color: hsl(0, 100%, 40%);">- mo->obj_inst.ts_nr == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_lchan *cbch = gsm_bts_get_cbch(mo->bts);</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DL1C, "====> trying to activate lchans of BCCH\n");</span><br><span style="color: hsl(0, 100%, 40%);">- mo->bts->c0->ts[0].lchan[CCCH_LCHAN].rel_act_kind =</span><br><span style="color: hsl(0, 100%, 40%);">- LCHAN_REL_ACT_OML;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_activate(&mo->bts->c0->ts[0].lchan[CCCH_LCHAN]);</span><br><span style="color: hsl(0, 100%, 40%);">- if (cbch) {</span><br><span style="color: hsl(0, 100%, 40%);">- cbch->rel_act_kind = LCHAN_REL_ACT_OML;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_activate(cbch);</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_OC_CHANNEL:</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_fsm_inst_dispatch(trx->ts[mo->obj_inst.ts_nr].mo.fi, NM_EV_OPSTART_NACK,</span><br><span style="color: hsl(120, 100%, 40%);">+ (void*)(intptr_t)NM_NACK_CANT_PERFORM);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Send OPSTART ack */</span><br><span style="color: hsl(0, 100%, 40%);">- return oml_mo_opstart_ack(mo);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(l1_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (mo->obj_class) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_OC_RADIO_CARRIER:</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_ACK, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_OC_CHANNEL:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* ugly hack to auto-activate all SAPIs for the BCCH/CCCH on TS0 */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mo->obj_inst.trx_nr == 0 &&</span><br><span style="color: hsl(120, 100%, 40%);">+ mo->obj_inst.ts_nr == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *cbch = gsm_bts_get_cbch(mo->bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DL1C, "====> trying to activate lchans of BCCH\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ mo->bts->c0->ts[0].lchan[CCCH_LCHAN].rel_act_kind =</span><br><span style="color: hsl(120, 100%, 40%);">+ LCHAN_REL_ACT_OML;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_activate(&mo->bts->c0->ts[0].lchan[CCCH_LCHAN]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cbch) {</span><br><span style="color: hsl(120, 100%, 40%);">+ cbch->rel_act_kind = LCHAN_REL_ACT_OML;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_activate(cbch);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_fsm_inst_dispatch(trx->ts[mo->obj_inst.ts_nr].mo.fi,</span><br><span style="color: hsl(120, 100%, 40%);">+ NM_EV_OPSTART_ACK, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> static int opstart_compl_cb(struct gsm_bts_trx *trx, struct msgb *l1_msg,</span><br><span>@@ -1894,6 +1897,7 @@</span><br><span> {</span><br><span> struct gsm_bts_bb_trx *bb_transc;</span><br><span> struct gsm_bts_trx* trx;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts;</span><br><span> int rc;</span><br><span> </span><br><span> switch (mo->obj_class) {</span><br><span>@@ -1916,6 +1920,7 @@</span><br><span> rc = osmo_fsm_inst_dispatch(bb_transc->mo.fi, NM_EV_OPSTART_ACK, NULL);</span><br><span> break;</span><br><span> case NM_OC_CHANNEL:</span><br><span style="color: hsl(120, 100%, 40%);">+ ts = (struct gsm_bts_trx_ts*) obj;</span><br><span> rc = ts_opstart(obj);</span><br><span> break;</span><br><span> case NM_OC_GPRS_NSE:</span><br><span>diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c</span><br><span>index c7e0b42..4dc399e 100644</span><br><span>--- a/src/osmo-bts-octphy/l1_if.c</span><br><span>+++ b/src/osmo-bts-octphy/l1_if.c</span><br><span>@@ -310,15 +310,10 @@</span><br><span> /* For OctPHY, this only about sending state changes to BSC */</span><br><span> int l1if_activate_rf(struct gsm_bts_trx *trx, int on)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span> if (on) {</span><br><span> /* signal availability */</span><br><span> osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SW_ACT, NULL);</span><br><span> osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < ARRAY_SIZE(trx->ts); i++)</span><br><span style="color: hsl(0, 100%, 40%);">- oml_mo_state_chg(&trx->ts[i].mo, NM_OPSTATE_DISABLED,</span><br><span style="color: hsl(0, 100%, 40%);">- NM_AVSTATE_DEPENDENCY);</span><br><span> } else {</span><br><span> osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_DISABLE, NULL);</span><br><span> osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_DISABLE, NULL);</span><br><span>diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c</span><br><span>index a72367c..bf17125 100644</span><br><span>--- a/src/osmo-bts-octphy/l1_oml.c</span><br><span>+++ b/src/osmo-bts-octphy/l1_oml.c</span><br><span>@@ -190,28 +190,28 @@</span><br><span> struct gsm_bts_trx *trx = gsm_bts_trx_num(mo->bts, mo->obj_inst.trx_nr);</span><br><span> /* TODO: Send NACK in case of error! */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* We already have a FSM for Radio Carrier, handle it there */</span><br><span style="color: hsl(0, 100%, 40%);">- if (mo->obj_class == NM_OC_RADIO_CARRIER)</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (mo->obj_class) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_OC_RADIO_CARRIER:</span><br><span> return osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_ACK, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Set to Operational State: Enabled */</span><br><span style="color: hsl(0, 100%, 40%);">- oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* hack to auto-activate all SAPIs for the BCCH/CCCH on TS0 */</span><br><span style="color: hsl(0, 100%, 40%);">- if (mo->obj_class == NM_OC_CHANNEL && mo->obj_inst.trx_nr == 0 &&</span><br><span style="color: hsl(0, 100%, 40%);">- mo->obj_inst.ts_nr == 7) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_lchan *cbch = gsm_bts_get_cbch(mo->bts);</span><br><span style="color: hsl(0, 100%, 40%);">- mo->bts->c0->ts[0].lchan[CCCH_LCHAN].rel_act_kind =</span><br><span style="color: hsl(0, 100%, 40%);">- LCHAN_REL_ACT_OML;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_activate(&mo->bts->c0->ts[0].lchan[CCCH_LCHAN]);</span><br><span style="color: hsl(0, 100%, 40%);">- if (cbch) {</span><br><span style="color: hsl(0, 100%, 40%);">- cbch->rel_act_kind = LCHAN_REL_ACT_OML;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_activate(cbch);</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_OC_CHANNEL:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* ugly hack to auto-activate all SAPIs for the BCCH/CCCH on TS0 */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mo->obj_inst.trx_nr == 0 &&</span><br><span style="color: hsl(120, 100%, 40%);">+ mo->obj_inst.ts_nr == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *cbch = gsm_bts_get_cbch(mo->bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DL1C, "====> trying to activate lchans of BCCH\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ mo->bts->c0->ts[0].lchan[CCCH_LCHAN].rel_act_kind =</span><br><span style="color: hsl(120, 100%, 40%);">+ LCHAN_REL_ACT_OML;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_activate(&mo->bts->c0->ts[0].lchan[CCCH_LCHAN]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cbch) {</span><br><span style="color: hsl(120, 100%, 40%);">+ cbch->rel_act_kind = LCHAN_REL_ACT_OML;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_activate(cbch);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_fsm_inst_dispatch(trx->ts[mo->obj_inst.ts_nr].mo.fi,</span><br><span style="color: hsl(120, 100%, 40%);">+ NM_EV_OPSTART_ACK, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Send OPSTART ack */</span><br><span style="color: hsl(0, 100%, 40%);">- return oml_mo_opstart_ack(mo);</span><br><span> }</span><br><span> </span><br><span> static</span><br><span>diff --git a/src/osmo-bts-omldummy/bts_model.c b/src/osmo-bts-omldummy/bts_model.c</span><br><span>index 06e1373..5624fc1 100644</span><br><span>--- a/src/osmo-bts-omldummy/bts_model.c</span><br><span>+++ b/src/osmo-bts-omldummy/bts_model.c</span><br><span>@@ -73,13 +73,8 @@</span><br><span> static uint8_t vbts_set_bts(struct gsm_bts *bts)</span><br><span> {</span><br><span> struct gsm_bts_trx *trx;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tn;</span><br><span> </span><br><span> llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (tn = 0; tn < TRX_NR_TS; tn++)</span><br><span style="color: hsl(0, 100%, 40%);">- oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* report availability of trx to the bts. this will trigger the rsl connection */</span><br><span> osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SW_ACT, NULL);</span><br><span> osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL);</span><br><span>@@ -124,6 +119,7 @@</span><br><span> int rc;</span><br><span> struct gsm_bts_bb_trx *bb_transc;</span><br><span> struct gsm_bts_trx* trx;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts* ts;</span><br><span> </span><br><span> switch (mo->obj_class) {</span><br><span> case NM_OC_SITE_MANAGER:</span><br><span>@@ -140,6 +136,10 @@</span><br><span> bb_transc = (struct gsm_bts_bb_trx *) obj;</span><br><span> rc = osmo_fsm_inst_dispatch(bb_transc->mo.fi, NM_EV_OPSTART_ACK, NULL);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_OC_CHANNEL:</span><br><span style="color: hsl(120, 100%, 40%);">+ ts = (struct gsm_bts_trx_ts *) obj;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_OPSTART_ACK, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case NM_OC_GPRS_NSE:</span><br><span> case NM_OC_GPRS_CELL:</span><br><span> case NM_OC_GPRS_NSVC:</span><br><span>diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c</span><br><span>index 4d228bb..2e4765d 100644</span><br><span>--- a/src/osmo-bts-sysmo/l1_if.c</span><br><span>+++ b/src/osmo-bts-sysmo/l1_if.c</span><br><span>@@ -1218,7 +1218,6 @@</span><br><span> SuperFemto_Prim_t *sysp = msgb_sysprim(resp);</span><br><span> GsmL1_Status_t status;</span><br><span> int on = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int i;</span><br><span> </span><br><span> if (sysp->id == SuperFemto_PrimId_ActivateRfCnf)</span><br><span> on = 1;</span><br><span>@@ -1243,9 +1242,6 @@</span><br><span> /* signal availability */</span><br><span> osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SW_ACT, NULL);</span><br><span> osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < ARRAY_SIZE(trx->ts); i++)</span><br><span style="color: hsl(0, 100%, 40%);">- oml_mo_state_chg(&trx->ts[i].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY);</span><br><span> } else {</span><br><span> bts_update_status(BTS_STATUS_RF_ACTIVE, 0);</span><br><span> osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_DISABLE, NULL);</span><br><span>diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c</span><br><span>index 9a82647..e8bfb2d 100644</span><br><span>--- a/src/osmo-bts-sysmo/oml.c</span><br><span>+++ b/src/osmo-bts-sysmo/oml.c</span><br><span>@@ -276,38 +276,41 @@</span><br><span> get_value_string(femtobts_l1prim_names, l1p->id),</span><br><span> get_value_string(femtobts_l1status_names, status));</span><br><span> msgb_free(l1_msg);</span><br><span style="color: hsl(0, 100%, 40%);">- if (mo->obj_class == NM_OC_RADIO_CARRIER)</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (mo->obj_class) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_OC_RADIO_CARRIER:</span><br><span> return osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_NACK,</span><br><span> (void*)(intptr_t)NM_NACK_CANT_PERFORM);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- return oml_mo_opstart_nack(mo, NM_NACK_CANT_PERFORM);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(l1_msg);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* We already have a FSM for Radio Carrier, handle it there */</span><br><span style="color: hsl(0, 100%, 40%);">- if (mo->obj_class == NM_OC_RADIO_CARRIER)</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_ACK, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Set to Operational State: Enabled */</span><br><span style="color: hsl(0, 100%, 40%);">- oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* ugly hack to auto-activate all SAPIs for the BCCH/CCCH on TS0 */</span><br><span style="color: hsl(0, 100%, 40%);">- if (mo->obj_class == NM_OC_CHANNEL && mo->obj_inst.trx_nr == 0 &&</span><br><span style="color: hsl(0, 100%, 40%);">- mo->obj_inst.ts_nr == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_lchan *cbch = gsm_bts_get_cbch(mo->bts);</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DL1C, "====> trying to activate lchans of BCCH\n");</span><br><span style="color: hsl(0, 100%, 40%);">- mo->bts->c0->ts[0].lchan[CCCH_LCHAN].rel_act_kind =</span><br><span style="color: hsl(0, 100%, 40%);">- LCHAN_REL_ACT_OML;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_activate(&mo->bts->c0->ts[0].lchan[CCCH_LCHAN]);</span><br><span style="color: hsl(0, 100%, 40%);">- if (cbch) {</span><br><span style="color: hsl(0, 100%, 40%);">- cbch->rel_act_kind = LCHAN_REL_ACT_OML;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_activate(cbch);</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_OC_CHANNEL:</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_fsm_inst_dispatch(trx->ts[mo->obj_inst.ts_nr].mo.fi, NM_EV_OPSTART_NACK,</span><br><span style="color: hsl(120, 100%, 40%);">+ (void*)(intptr_t)NM_NACK_CANT_PERFORM);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Send OPSTART ack */</span><br><span style="color: hsl(0, 100%, 40%);">- return oml_mo_opstart_ack(mo);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(l1_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (mo->obj_class) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_OC_RADIO_CARRIER:</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_ACK, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_OC_CHANNEL:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* ugly hack to auto-activate all SAPIs for the BCCH/CCCH on TS0 */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mo->obj_inst.trx_nr == 0 &&</span><br><span style="color: hsl(120, 100%, 40%);">+ mo->obj_inst.ts_nr == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *cbch = gsm_bts_get_cbch(mo->bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DL1C, "====> trying to activate lchans of BCCH\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ mo->bts->c0->ts[0].lchan[CCCH_LCHAN].rel_act_kind =</span><br><span style="color: hsl(120, 100%, 40%);">+ LCHAN_REL_ACT_OML;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_activate(&mo->bts->c0->ts[0].lchan[CCCH_LCHAN]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cbch) {</span><br><span style="color: hsl(120, 100%, 40%);">+ cbch->rel_act_kind = LCHAN_REL_ACT_OML;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_activate(cbch);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_fsm_inst_dispatch(trx->ts[mo->obj_inst.ts_nr].mo.fi,</span><br><span style="color: hsl(120, 100%, 40%);">+ NM_EV_OPSTART_ACK, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> static int opstart_compl_cb(struct gsm_bts_trx *trx, struct msgb *l1_msg,</span><br><span>@@ -1772,6 +1775,7 @@</span><br><span> {</span><br><span> struct gsm_bts_bb_trx *bb_transc;</span><br><span> struct gsm_bts_trx* trx;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts;</span><br><span> int rc;</span><br><span> </span><br><span> switch (mo->obj_class) {</span><br><span>@@ -1794,7 +1798,8 @@</span><br><span> rc = osmo_fsm_inst_dispatch(bb_transc->mo.fi, NM_EV_OPSTART_ACK, NULL);</span><br><span> break;</span><br><span> case NM_OC_CHANNEL:</span><br><span style="color: hsl(0, 100%, 40%);">- rc = ts_opstart(obj);</span><br><span style="color: hsl(120, 100%, 40%);">+ ts = (struct gsm_bts_trx_ts*) obj;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = ts_opstart(ts);</span><br><span> break;</span><br><span> case NM_OC_GPRS_NSE:</span><br><span> case NM_OC_GPRS_CELL:</span><br><span>diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c</span><br><span>index 9c8069a..fc8ef76 100644</span><br><span>--- a/src/osmo-bts-trx/l1_if.c</span><br><span>+++ b/src/osmo-bts-trx/l1_if.c</span><br><span>@@ -91,7 +91,6 @@</span><br><span> {</span><br><span> struct phy_instance *pinst = l1h->phy_inst;</span><br><span> struct gsm_bts_trx *trx = pinst->trx;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tn;</span><br><span> </span><br><span> /* HACK, we should change state when we receive first clock from</span><br><span> * transceiver */</span><br><span>@@ -102,19 +101,9 @@</span><br><span> osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL);</span><br><span> pinst->u.osmotrx.sw_act_reported = true;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (tn = 0; tn < TRX_NR_TS; tn++)</span><br><span style="color: hsl(0, 100%, 40%);">- oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED,</span><br><span style="color: hsl(0, 100%, 40%);">- (l1h->config.slotmask & (1 << tn)) ?</span><br><span style="color: hsl(0, 100%, 40%);">- NM_AVSTATE_DEPENDENCY :</span><br><span style="color: hsl(0, 100%, 40%);">- NM_AVSTATE_NOT_INSTALLED);</span><br><span> } else {</span><br><span> osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_DISABLE, NULL);</span><br><span> osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_DISABLE, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (tn = 0; tn < TRX_NR_TS; tn++)</span><br><span style="color: hsl(0, 100%, 40%);">- oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED,</span><br><span style="color: hsl(0, 100%, 40%);">- NM_AVSTATE_OFF_LINE);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -604,6 +593,7 @@</span><br><span> {</span><br><span> struct gsm_bts_bb_trx *bb_transc;</span><br><span> struct gsm_bts_trx *trx;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts;</span><br><span> int rc;</span><br><span> </span><br><span> switch (mo->obj_class) {</span><br><span>@@ -623,6 +613,9 @@</span><br><span> rc = osmo_fsm_inst_dispatch(bb_transc->mo.fi, NM_EV_OPSTART_ACK, NULL);</span><br><span> break;</span><br><span> case NM_OC_CHANNEL:</span><br><span style="color: hsl(120, 100%, 40%);">+ ts = (struct gsm_bts_trx_ts *) obj;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_OPSTART_ACK, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case NM_OC_GPRS_NSE:</span><br><span> case NM_OC_GPRS_CELL:</span><br><span> case NM_OC_GPRS_NSVC:</span><br><span>diff --git a/src/osmo-bts-virtual/bts_model.c b/src/osmo-bts-virtual/bts_model.c</span><br><span>index c3a75f4..e7b0f81 100644</span><br><span>--- a/src/osmo-bts-virtual/bts_model.c</span><br><span>+++ b/src/osmo-bts-virtual/bts_model.c</span><br><span>@@ -83,13 +83,8 @@</span><br><span> static uint8_t vbts_set_bts(struct gsm_bts *bts)</span><br><span> {</span><br><span> struct gsm_bts_trx *trx;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tn;</span><br><span> </span><br><span> llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (tn = 0; tn < TRX_NR_TS; tn++)</span><br><span style="color: hsl(0, 100%, 40%);">- oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* report availability of trx to the bts. this will trigger the rsl connection */</span><br><span> osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SW_ACT, NULL);</span><br><span> osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL);</span><br><span>@@ -141,6 +136,7 @@</span><br><span> int rc;</span><br><span> struct gsm_bts_bb_trx *bb_transc;</span><br><span> struct gsm_bts_trx* trx;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts;</span><br><span> </span><br><span> switch (mo->obj_class) {</span><br><span> case NM_OC_SITE_MANAGER:</span><br><span>@@ -157,6 +153,10 @@</span><br><span> bb_transc = (struct gsm_bts_bb_trx *) obj;</span><br><span> rc = osmo_fsm_inst_dispatch(bb_transc->mo.fi, NM_EV_OPSTART_ACK, NULL);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_OC_CHANNEL:</span><br><span style="color: hsl(120, 100%, 40%);">+ ts = (struct gsm_bts_trx_ts *) obj;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_OPSTART_ACK, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case NM_OC_GPRS_NSE:</span><br><span> case NM_OC_GPRS_CELL:</span><br><span> case NM_OC_GPRS_NSVC:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/20311">change 20311</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/20311"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I288cbfb4730b25a334ef1c3d6b9679d6f1d4cfc5 </div>
<div style="display:none"> Gerrit-Change-Number: 20311 </div>
<div style="display:none"> Gerrit-PatchSet: 11 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>