<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20403">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Introduce NM RadioCarrier FSM<br><br>Change-Id: Ieed61d1fb1e896db42545c2c3421b20cb41ad549<br>---<br>M include/osmocom/bsc/Makefile.am<br>M include/osmocom/bsc/bts_trx.h<br>A include/osmocom/bsc/nm_rcarrier_fsm.h<br>M src/ipaccess/Makefile.am<br>M src/osmo-bsc/Makefile.am<br>M src/osmo-bsc/abis_om2000.c<br>M src/osmo-bsc/acc.c<br>M src/osmo-bsc/bsc_ctrl_commands.c<br>M src/osmo-bsc/bsc_rf_ctrl.c<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/bts.c<br>M src/osmo-bsc/bts_ipaccess_nanobts.c<br>M src/osmo-bsc/bts_nokia_site.c<br>M src/osmo-bsc/bts_trx.c<br>M src/osmo-bsc/e1_config.c<br>M src/osmo-bsc/gsm_data.c<br>A src/osmo-bsc/nm_rcarrier_fsm.c<br>M src/utils/Makefile.am<br>M tests/abis/Makefile.am<br>M tests/acc/Makefile.am<br>M tests/acc/acc_test.ok<br>M tests/bsc/Makefile.am<br>M tests/gsm0408/Makefile.am<br>M tests/handover/Makefile.am<br>M tests/handover/handover_test.c<br>M tests/nanobts_omlattr/Makefile.am<br>26 files changed, 548 insertions(+), 58 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/20403/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am</span><br><span>index cf25b21..0da6f8e 100644</span><br><span>--- a/include/osmocom/bsc/Makefile.am</span><br><span>+++ b/include/osmocom/bsc/Makefile.am</span><br><span>@@ -38,6 +38,7 @@</span><br><span>        nm_bb_transc_fsm.h \</span><br><span>         nm_bts_sm_fsm.h \</span><br><span>    nm_bts_fsm.h \</span><br><span style="color: hsl(120, 100%, 40%);">+        nm_rcarrier_fsm.h \</span><br><span>  openbscdefines.h \</span><br><span>   osmo_bsc.h \</span><br><span>         osmo_bsc_grace.h \</span><br><span>diff --git a/include/osmocom/bsc/bts_trx.h b/include/osmocom/bsc/bts_trx.h</span><br><span>index 12f397a..d592915 100644</span><br><span>--- a/include/osmocom/bsc/bts_trx.h</span><br><span>+++ b/include/osmocom/bsc/bts_trx.h</span><br><span>@@ -39,8 +39,16 @@</span><br><span>     /* Some BTS (specifically Ericsson RBS) have a per-TRX OML Link */</span><br><span>   struct e1inp_sign_link *oml_link;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   struct gsm_abis_mo mo;</span><br><span style="color: hsl(0, 100%, 40%);">-  struct tlv_parsed nm_attr;</span><br><span style="color: hsl(120, 100%, 40%);">+    struct {</span><br><span style="color: hsl(120, 100%, 40%);">+              struct osmo_fsm_inst *fi;</span><br><span style="color: hsl(120, 100%, 40%);">+             bool set_radio_attr_sent;</span><br><span style="color: hsl(120, 100%, 40%);">+             bool set_radio_attr_ack_received;</span><br><span style="color: hsl(120, 100%, 40%);">+             bool adm_unlock_sent;</span><br><span style="color: hsl(120, 100%, 40%);">+         bool opstart_sent;</span><br><span style="color: hsl(120, 100%, 40%);">+            bool force_rf_lock;</span><br><span style="color: hsl(120, 100%, 40%);">+           struct gsm_abis_mo mo;</span><br><span style="color: hsl(120, 100%, 40%);">+                struct tlv_parsed nm_attr;</span><br><span style="color: hsl(120, 100%, 40%);">+    } nm;</span><br><span>        struct {</span><br><span>             struct osmo_fsm_inst *fi;</span><br><span>            bool adm_unlock_sent;</span><br><span>diff --git a/include/osmocom/bsc/nm_rcarrier_fsm.h b/include/osmocom/bsc/nm_rcarrier_fsm.h</span><br><span>new file mode 100644</span><br><span>index 0000000..6e073a6</span><br><span>--- /dev/null</span><br><span>+++ b/include/osmocom/bsc/nm_rcarrier_fsm.h</span><br><span>@@ -0,0 +1,45 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/* NM Radio Carrier FSM. Following 3GPP TS 12.21 Figure 2/GSM 12.21:</span><br><span style="color: hsl(120, 100%, 40%);">+  GSM 12.21 Objects' Operational state and availability status behaviour during initialization */</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%);">+#pragma once</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+enum nm_rcarrier_op_fsm_states {</span><br><span style="color: hsl(120, 100%, 40%);">+        NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED,</span><br><span style="color: hsl(120, 100%, 40%);">+      NM_RCARRIER_ST_OP_DISABLED_DEPENDENCY,</span><br><span style="color: hsl(120, 100%, 40%);">+        NM_RCARRIER_ST_OP_DISABLED_OFFLINE,</span><br><span style="color: hsl(120, 100%, 40%);">+   NM_RCARRIER_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%);">+enum nm_rcarrier_op_fsm_events {</span><br><span style="color: hsl(120, 100%, 40%);">+    NM_RCARRIER_EV_SW_ACT_REP,</span><br><span style="color: hsl(120, 100%, 40%);">+    NM_RCARRIER_EV_STATE_CHG_REP,</span><br><span style="color: hsl(120, 100%, 40%);">+ NM_RCARRIER_EV_SET_ATTR_ACK,</span><br><span style="color: hsl(120, 100%, 40%);">+  NM_RCARRIER_EV_OPSTART_ACK,</span><br><span style="color: hsl(120, 100%, 40%);">+   NM_RCARRIER_EV_OPSTART_NACK,</span><br><span style="color: hsl(120, 100%, 40%);">+  NM_RCARRIER_EV_FORCE_LOCK,</span><br><span style="color: hsl(120, 100%, 40%);">+    NM_RCARRIER_EV_OML_DOWN,</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%);">+extern struct osmo_fsm nm_rcarrier_fsm;</span><br><span>diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am</span><br><span>index 729173d..8c20722 100644</span><br><span>--- a/src/ipaccess/Makefile.am</span><br><span>+++ b/src/ipaccess/Makefile.am</span><br><span>@@ -57,6 +57,7 @@</span><br><span>     $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \</span><br><span>       $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span>  $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span>     $(OSMO_LIBS) \</span><br><span>       $(NULL)</span><br><span> </span><br><span>@@ -75,5 +76,6 @@</span><br><span>      $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \</span><br><span>       $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span>  $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span>     $(OSMO_LIBS) \</span><br><span>       $(NULL)</span><br><span>diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am</span><br><span>index c4fe6f0..4b2a013 100644</span><br><span>--- a/src/osmo-bsc/Makefile.am</span><br><span>+++ b/src/osmo-bsc/Makefile.am</span><br><span>@@ -75,6 +75,7 @@</span><br><span>     nm_bb_transc_fsm.c \</span><br><span>         nm_bts_sm_fsm.c \</span><br><span>    nm_bts_fsm.c \</span><br><span style="color: hsl(120, 100%, 40%);">+        nm_rcarrier_fsm.c \</span><br><span>  gsm_08_08.c \</span><br><span>        osmo_bsc_bssap.c \</span><br><span>   osmo_bsc_ctrl.c \</span><br><span>diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c</span><br><span>index b8c71e8..2c8ba21 100644</span><br><span>--- a/src/osmo-bsc/abis_om2000.c</span><br><span>+++ b/src/osmo-bsc/abis_om2000.c</span><br><span>@@ -872,7 +872,7 @@</span><br><span>                 trx = gsm_bts_trx_num(bts, mo->inst);</span><br><span>             if (!trx)</span><br><span>                    return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-            nm_state = &trx->mo.nm_state;</span><br><span style="color: hsl(120, 100%, 40%);">+          nm_state = &trx->nm.mo.nm_state;</span><br><span>              break;</span><br><span>       case OM2K_MO_CLS_TS:</span><br><span>                 trx = gsm_bts_trx_num(bts, mo->assoc_so);</span><br><span>diff --git a/src/osmo-bsc/acc.c b/src/osmo-bsc/acc.c</span><br><span>index 06f96c6..60035cc 100644</span><br><span>--- a/src/osmo-bsc/acc.c</span><br><span>+++ b/src/osmo-bsc/acc.c</span><br><span>@@ -503,12 +503,12 @@</span><br><span>                             * Administrative state has not changed.</span><br><span>                              * Trigger ramping only if TRX 0 is already unlocked.</span><br><span>                                 */</span><br><span style="color: hsl(0, 100%, 40%);">-                             if (trx->mo.nm_state.administrative == NM_STATE_UNLOCKED)</span><br><span style="color: hsl(120, 100%, 40%);">+                          if (trx->nm.mo.nm_state.administrative == NM_STATE_UNLOCKED)</span><br><span>                                      trigger_ramping = true;</span><br><span>                              else</span><br><span>                                         LOG_TRX(trx, DRSL, LOGL_DEBUG, "ACC RAMP: ignoring state change "</span><br><span>                                          "because TRX is in administrative state '%s'\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                                              get_value_string(abis_nm_adm_state_names, trx->mo.nm_state.administrative));</span><br><span style="color: hsl(120, 100%, 40%);">+                                               get_value_string(abis_nm_adm_state_names, trx->nm.mo.nm_state.administrative));</span><br><span>                   }</span><br><span>                    break;</span><br><span>               case NM_OPSTATE_DISABLED:</span><br><span>diff --git a/src/osmo-bsc/bsc_ctrl_commands.c b/src/osmo-bsc/bsc_ctrl_commands.c</span><br><span>index 9383167..e0dadec 100644</span><br><span>--- a/src/osmo-bsc/bsc_ctrl_commands.c</span><br><span>+++ b/src/osmo-bsc/bsc_ctrl_commands.c</span><br><span>@@ -360,8 +360,8 @@</span><br><span>                         continue;</span><br><span> </span><br><span>                llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">-                        if (trx->mo.nm_state.availability == NM_AVSTATE_OK &&</span><br><span style="color: hsl(0, 100%, 40%);">-                            trx->mo.nm_state.operational != NM_OPSTATE_DISABLED) {</span><br><span style="color: hsl(120, 100%, 40%);">+                 if (trx->nm.mo.nm_state.availability == NM_AVSTATE_OK &&</span><br><span style="color: hsl(120, 100%, 40%);">+                       trx->nm.mo.nm_state.operational != NM_OPSTATE_DISABLED) {</span><br><span>                             cmd->reply = talloc_asprintf(cmd,</span><br><span>                                                 "state=on,policy=%s,bts=%u,trx=%u",</span><br><span>                                                policy_name, bts->nr, trx->nr);</span><br><span>diff --git a/src/osmo-bsc/bsc_rf_ctrl.c b/src/osmo-bsc/bsc_rf_ctrl.c</span><br><span>index 1e04f21..8dc267f 100644</span><br><span>--- a/src/osmo-bsc/bsc_rf_ctrl.c</span><br><span>+++ b/src/osmo-bsc/bsc_rf_ctrl.c</span><br><span>@@ -84,7 +84,7 @@</span><br><span>       struct gsm_bts_trx *trx;</span><br><span> </span><br><span>         llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">-                if (trx->mo.nm_state.operational == NM_OPSTATE_ENABLED)</span><br><span style="color: hsl(120, 100%, 40%);">+            if (trx->nm.mo.nm_state.operational == NM_OPSTATE_ENABLED)</span><br><span>                        return OSMO_BSC_RF_OPSTATE_OPERATIONAL;</span><br><span>      }</span><br><span> </span><br><span>@@ -97,7 +97,7 @@</span><br><span>    struct gsm_bts_trx *trx;</span><br><span> </span><br><span>         llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">-                if (trx->mo.nm_state.administrative == NM_STATE_UNLOCKED)</span><br><span style="color: hsl(120, 100%, 40%);">+          if (trx->nm.mo.nm_state.administrative == NM_STATE_UNLOCKED)</span><br><span>                      return OSMO_BSC_RF_ADMINSTATE_UNLOCKED;</span><br><span>      }</span><br><span> </span><br><span>@@ -193,8 +193,8 @@</span><br><span>                  continue;</span><br><span>            }</span><br><span>            llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">-                        if (trx->mo.nm_state.availability == NM_AVSTATE_OK &&</span><br><span style="color: hsl(0, 100%, 40%);">-                            trx->mo.nm_state.operational != NM_OPSTATE_DISABLED) {</span><br><span style="color: hsl(120, 100%, 40%);">+                 if (trx->nm.mo.nm_state.availability == NM_AVSTATE_OK &&</span><br><span style="color: hsl(120, 100%, 40%);">+                       trx->nm.mo.nm_state.operational != NM_OPSTATE_DISABLED) {</span><br><span>                                     send = RF_CMD_ON;</span><br><span>                                    break;</span><br><span>                       }</span><br><span>@@ -224,9 +224,9 @@</span><br><span>              }</span><br><span> </span><br><span>                llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">-                        if (trx->mo.nm_state.availability != NM_AVSTATE_OK ||</span><br><span style="color: hsl(0, 100%, 40%);">-                            trx->mo.nm_state.operational != NM_OPSTATE_ENABLED ||</span><br><span style="color: hsl(0, 100%, 40%);">-                        trx->mo.nm_state.administrative != NM_STATE_UNLOCKED) {</span><br><span style="color: hsl(120, 100%, 40%);">+                        if (trx->nm.mo.nm_state.availability != NM_AVSTATE_OK ||</span><br><span style="color: hsl(120, 100%, 40%);">+                       trx->nm.mo.nm_state.operational != NM_OPSTATE_ENABLED ||</span><br><span style="color: hsl(120, 100%, 40%);">+                           trx->nm.mo.nm_state.administrative != NM_STATE_UNLOCKED) {</span><br><span>                            LOGP(DNM, LOGL_ERROR, "RF activation failed. Starting again.\n");</span><br><span>                          ipaccess_drop_oml(bts, "rf check");</span><br><span>                                break;</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 1d35dc2..8490e77 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -718,7 +718,7 @@</span><br><span>            vty_out(vty, "   description %s%s", trx->description,</span><br><span>                   VTY_NEWLINE);</span><br><span>        vty_out(vty, "   rf_locked %u%s",</span><br><span style="color: hsl(0, 100%, 40%);">-             trx->mo.nm_state.administrative == NM_STATE_LOCKED ? 1 : 0,</span><br><span style="color: hsl(120, 100%, 40%);">+                trx->nm.force_rf_lock ? 1 : 0,</span><br><span>            VTY_NEWLINE);</span><br><span>        vty_out(vty, "   arfcn %u%s", trx->arfcn, VTY_NEWLINE);</span><br><span>         vty_out(vty, "   nominal power %u%s", trx->nominal_power, VTY_NEWLINE);</span><br><span>@@ -1200,7 +1200,7 @@</span><br><span>                 trx->nominal_power, trx->max_power_red,</span><br><span>                trx->nominal_power - trx->max_power_red, VTY_NEWLINE);</span><br><span>         vty_out(vty, "  Radio Carrier NM State: ");</span><br><span style="color: hsl(0, 100%, 40%);">-   net_dump_nmstate(vty, &trx->mo.nm_state);</span><br><span style="color: hsl(120, 100%, 40%);">+      net_dump_nmstate(vty, &trx->nm.mo.nm_state);</span><br><span>  if (print_rsl)</span><br><span>               vty_out(vty, "  RSL State: %s%s", trx->rsl_link? "connected" : "disconnected", VTY_NEWLINE);</span><br><span>        vty_out(vty, "  Baseband Transceiver NM State: ");</span><br><span>diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c</span><br><span>index 7396117..5f30f67 100644</span><br><span>--- a/src/osmo-bsc/bts.c</span><br><span>+++ b/src/osmo-bsc/bts.c</span><br><span>@@ -597,7 +597,7 @@</span><br><span>      gsm_abis_mo_reset(&bts->gprs.cell.mo);</span><br><span> </span><br><span>    llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">-                gsm_abis_mo_reset(&trx->mo);</span><br><span style="color: hsl(120, 100%, 40%);">+           gsm_abis_mo_reset(&trx->nm.mo);</span><br><span>               gsm_abis_mo_reset(&trx->bb_transc.mo);</span><br><span> </span><br><span>            for (i = 0; i < ARRAY_SIZE(trx->ts); i++) {</span><br><span>diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>index fdd50f4..cf7d17d 100644</span><br><span>--- a/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>+++ b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>@@ -49,6 +49,7 @@</span><br><span> #include <osmocom/bsc/nm_bts_sm_fsm.h></span><br><span> #include <osmocom/bsc/nm_bts_fsm.h></span><br><span> #include <osmocom/bsc/nm_bb_transc_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/nm_rcarrier_fsm.h></span><br><span> </span><br><span> static int bts_model_nanobts_start(struct gsm_network *net);</span><br><span> static void bts_model_nanobts_e1line_bind_ops(struct e1inp_line *line);</span><br><span>@@ -146,6 +147,7 @@</span><br><span>   * endless loop */</span><br><span>   if (obj_class != NM_OC_BTS &&</span><br><span>            obj_class != NM_OC_BASEB_TRANSC &&</span><br><span style="color: hsl(120, 100%, 40%);">+            obj_class != NM_OC_RADIO_CARRIER &&</span><br><span>          evt != S_NM_STATECHG_OPER)</span><br><span>               return 0;</span><br><span> </span><br><span>@@ -181,7 +183,8 @@</span><br><span>          }</span><br><span>            break;</span><br><span>       case NM_OC_RADIO_CARRIER:</span><br><span style="color: hsl(0, 100%, 40%);">-               /* OPSTART done after Set Radio Carrier Attributes ACK is received */</span><br><span style="color: hsl(120, 100%, 40%);">+         trx = obj;</span><br><span style="color: hsl(120, 100%, 40%);">+            osmo_fsm_inst_dispatch(trx->nm.fi, NM_RCARRIER_EV_STATE_CHG_REP, nsd);</span><br><span>            break;</span><br><span>       case NM_OC_GPRS_NSE:</span><br><span>                 bts = container_of(obj, struct gsm_bts, gprs.nse);</span><br><span>@@ -265,27 +268,11 @@</span><br><span>                   return -EINVAL;</span><br><span>              osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BB_TRANSC_EV_SW_ACT_REP, NULL);</span><br><span>              break;</span><br><span style="color: hsl(0, 100%, 40%);">-  case NM_OC_RADIO_CARRIER: {</span><br><span style="color: hsl(120, 100%, 40%);">+   case NM_OC_RADIO_CARRIER:</span><br><span>            if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))</span><br><span>                  return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">-         /*</span><br><span style="color: hsl(0, 100%, 40%);">-               * Locking the radio carrier will make it go</span><br><span style="color: hsl(0, 100%, 40%);">-             * offline again and we would come here. The</span><br><span style="color: hsl(0, 100%, 40%);">-             * framework should determine that there was</span><br><span style="color: hsl(0, 100%, 40%);">-             * no change and avoid recursion.</span><br><span style="color: hsl(0, 100%, 40%);">-                *</span><br><span style="color: hsl(0, 100%, 40%);">-               * This code is here to make sure that on start</span><br><span style="color: hsl(0, 100%, 40%);">-          * a TRX remains locked.</span><br><span style="color: hsl(0, 100%, 40%);">-                 */</span><br><span style="color: hsl(0, 100%, 40%);">-             /* Patch ARFCN into radio attribute */</span><br><span style="color: hsl(0, 100%, 40%);">-          struct msgb *msgb = nanobts_attr_radio_get(trx->bts, trx);</span><br><span style="color: hsl(0, 100%, 40%);">-           abis_nm_set_radio_attr(trx, msgb->data, msgb->len);</span><br><span style="color: hsl(0, 100%, 40%);">-               msgb_free(msgb);</span><br><span style="color: hsl(0, 100%, 40%);">-                abis_nm_chg_adm_state(trx->bts, foh->obj_class,</span><br><span style="color: hsl(0, 100%, 40%);">-                                 trx->bts->bts_nr, trx->nr, 0xff,</span><br><span style="color: hsl(0, 100%, 40%);">-                               trx->mo.nm_state.administrative);</span><br><span style="color: hsl(120, 100%, 40%);">+            osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_RCARRIER_EV_SW_ACT_REP, NULL);</span><br><span>               break;</span><br><span style="color: hsl(0, 100%, 40%);">-          }</span><br><span>    }</span><br><span>    return 0;</span><br><span> }</span><br><span>@@ -319,6 +306,11 @@</span><br><span>        case NM_OC_BTS:</span><br><span>              osmo_fsm_inst_dispatch(bts->nm.fi, NM_BTS_EV_OPSTART_ACK, NULL);</span><br><span>          break;</span><br><span style="color: hsl(120, 100%, 40%);">+        case NM_OC_RADIO_CARRIER:</span><br><span style="color: hsl(120, 100%, 40%);">+             if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))</span><br><span style="color: hsl(120, 100%, 40%);">+                   return;</span><br><span style="color: hsl(120, 100%, 40%);">+               osmo_fsm_inst_dispatch(trx->nm.fi, NM_RCARRIER_EV_OPSTART_ACK, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+              break;</span><br><span>       case NM_OC_BASEB_TRANSC:</span><br><span>             if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))</span><br><span>                  return;</span><br><span>@@ -346,6 +338,11 @@</span><br><span>       case NM_OC_BTS:</span><br><span>              osmo_fsm_inst_dispatch(bts->nm.fi, NM_BTS_EV_OPSTART_ACK, NULL);</span><br><span>          break;</span><br><span style="color: hsl(120, 100%, 40%);">+        case NM_OC_RADIO_CARRIER:</span><br><span style="color: hsl(120, 100%, 40%);">+             if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))</span><br><span style="color: hsl(120, 100%, 40%);">+                   return;</span><br><span style="color: hsl(120, 100%, 40%);">+               osmo_fsm_inst_dispatch(trx->nm.fi, NM_RCARRIER_EV_OPSTART_NACK, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+             break;</span><br><span>       case NM_OC_BASEB_TRANSC:</span><br><span>             if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))</span><br><span>                  return;</span><br><span>@@ -377,12 +374,11 @@</span><br><span>      struct gsm_bts *bts = sign_link->trx->bts;</span><br><span>     struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    if (foh->obj_class != NM_OC_RADIO_CARRIER) {</span><br><span style="color: hsl(120, 100%, 40%);">+       if (!trx || foh->obj_class != NM_OC_RADIO_CARRIER) {</span><br><span>              LOG_TRX(trx, DNM, LOGL_ERROR, "Set Radio Carrier Attr Ack received on non Radio Carrier object!\n");</span><br><span>               return;</span><br><span>      }</span><br><span style="color: hsl(0, 100%, 40%);">-       abis_nm_opstart(trx->bts, foh->obj_class, trx->bts->bts_nr,</span><br><span style="color: hsl(0, 100%, 40%);">-                 trx->nr, 0xff);</span><br><span style="color: hsl(120, 100%, 40%);">+    osmo_fsm_inst_dispatch(trx->nm.fi, NM_RCARRIER_EV_SET_ATTR_ACK, NULL);</span><br><span> }</span><br><span> </span><br><span> /* Callback function to be called every time we receive a signal from NM */</span><br><span>@@ -491,6 +487,7 @@</span><br><span>      llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span>             ipaccess_drop_rsl(trx, "OML link drop");</span><br><span>           osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BB_TRANSC_EV_OML_DOWN, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+         osmo_fsm_inst_dispatch(trx->nm.fi, NM_RCARRIER_EV_OML_DOWN, NULL);</span><br><span>        }</span><br><span> </span><br><span>        osmo_fsm_inst_dispatch(bts->site_mgr.fi, NM_BTS_SM_EV_OML_DOWN, NULL);</span><br><span>@@ -682,7 +679,7 @@</span><br><span>              if (bts == NULL)</span><br><span>                     bts = link->trx->bts;</span><br><span>          /* Cancel RSL connection timeout in case are still waiting for an RSL connection. */</span><br><span style="color: hsl(0, 100%, 40%);">-            if (link->trx->mo.nm_state.administrative == NM_STATE_UNLOCKED)</span><br><span style="color: hsl(120, 100%, 40%);">+         if (link->trx->nm.mo.nm_state.administrative == NM_STATE_UNLOCKED)</span><br><span>                     osmo_timer_del(&link->trx->rsl_connect_timeout);</span><br><span>   }</span><br><span>    if (bts != NULL)</span><br><span>diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c</span><br><span>index 35a252b..9557a28 100644</span><br><span>--- a/src/osmo-bsc/bts_nokia_site.c</span><br><span>+++ b/src/osmo-bsc/bts_nokia_site.c</span><br><span>@@ -1457,7 +1457,7 @@</span><br><span>    llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span>             int i;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-              mo_ok(&trx->mo);</span><br><span style="color: hsl(120, 100%, 40%);">+               mo_ok(&trx->nm.mo);</span><br><span>           mo_ok(&trx->bb_transc.mo);</span><br><span> </span><br><span>                for (i = 0; i < ARRAY_SIZE(trx->ts); i++) {</span><br><span>diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c</span><br><span>index 78fec9f..63645bd 100644</span><br><span>--- a/src/osmo-bsc/bts_trx.c</span><br><span>+++ b/src/osmo-bsc/bts_trx.c</span><br><span>@@ -31,6 +31,7 @@</span><br><span> #include <osmocom/bsc/pcu_if.h></span><br><span> #include <osmocom/bsc/debug.h></span><br><span> #include <osmocom/bsc/nm_bb_transc_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/nm_rcarrier_fsm.h></span><br><span> </span><br><span> static int gsm_bts_trx_talloc_destructor(struct gsm_bts_trx *trx)</span><br><span> {</span><br><span>@@ -38,6 +39,10 @@</span><br><span>            osmo_fsm_inst_free(trx->bb_transc.fi);</span><br><span>            trx->bb_transc.fi = NULL;</span><br><span>         }</span><br><span style="color: hsl(120, 100%, 40%);">+     if (trx->nm.fi) {</span><br><span style="color: hsl(120, 100%, 40%);">+          osmo_fsm_inst_free(trx->nm.fi);</span><br><span style="color: hsl(120, 100%, 40%);">+            trx->nm.fi = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span>    return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -53,9 +58,11 @@</span><br><span> </span><br><span>  trx->bts = bts;</span><br><span>   trx->nr = bts->num_trx++;</span><br><span style="color: hsl(0, 100%, 40%);">- trx->mo.nm_state.administrative = NM_STATE_UNLOCKED;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     gsm_mo_init(&trx->mo, bts, NM_OC_RADIO_CARRIER,</span><br><span style="color: hsl(120, 100%, 40%);">+        trx->nm.fi = osmo_fsm_inst_alloc(&nm_rcarrier_fsm, trx, trx,</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(trx->nm.fi, "bts%d-trx%d", bts->nr, trx->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+    gsm_mo_init(&trx->nm.mo, bts, NM_OC_RADIO_CARRIER,</span><br><span>                bts->nr, trx->nr, 0xff);</span><br><span> </span><br><span>       trx->bb_transc.fi = osmo_fsm_inst_alloc(&nm_bb_transc_fsm, trx, trx,</span><br><span>@@ -165,32 +172,29 @@</span><br><span> {</span><br><span>     uint8_t new_state = locked ? NM_STATE_LOCKED : NM_STATE_UNLOCKED;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ trx->nm.force_rf_lock = locked;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  if (!trx->bts || !trx->bts->oml_link) {</span><br><span style="color: hsl(0, 100%, 40%);">-                /* Set initial state which will be sent when BTS connects. */</span><br><span style="color: hsl(0, 100%, 40%);">-           trx->mo.nm_state.administrative = new_state;</span><br><span style="color: hsl(120, 100%, 40%);">+       /* State will be sent when BTS connects. */</span><br><span style="color: hsl(120, 100%, 40%);">+   if (!trx->bts || !trx->bts->oml_link)</span><br><span>               return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span>        LOG_TRX(trx, DNM, LOGL_NOTICE, "Requesting administrative state change %s -> %s [%s]\n",</span><br><span style="color: hsl(0, 100%, 40%);">-        get_value_string(abis_nm_adm_state_names, trx->mo.nm_state.administrative),</span><br><span style="color: hsl(120, 100%, 40%);">+        get_value_string(abis_nm_adm_state_names, trx->nm.mo.nm_state.administrative),</span><br><span>            get_value_string(abis_nm_adm_state_names, new_state), reason);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- abis_nm_chg_adm_state(trx->bts, NM_OC_RADIO_CARRIER,</span><br><span style="color: hsl(0, 100%, 40%);">-                       trx->bts->bts_nr, trx->nr, 0xff,</span><br><span style="color: hsl(0, 100%, 40%);">-                       new_state);</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo_fsm_inst_dispatch(trx->nm.fi, NM_RCARRIER_EV_FORCE_LOCK, (void*)(intptr_t)locked);</span><br><span> }</span><br><span> </span><br><span> bool trx_is_usable(const struct gsm_bts_trx *trx)</span><br><span> {</span><br><span>        /* FIXME: How does this behave for BS-11 ? */</span><br><span>        if (is_ipaccess_bts(trx->bts)) {</span><br><span style="color: hsl(0, 100%, 40%);">-             if (!nm_is_running(&trx->mo.nm_state) ||</span><br><span style="color: hsl(120, 100%, 40%);">+               if (!nm_is_running(&trx->nm.mo.nm_state) ||</span><br><span>               !nm_is_running(&trx->bb_transc.mo.nm_state))</span><br><span>                      return false;</span><br><span>        } else if (is_ericsson_bts(trx->bts)) {</span><br><span>           /* The OM2000 -> 12.21 mapping we do doesn't have separate bb_transc MO */</span><br><span style="color: hsl(0, 100%, 40%);">-               if (!nm_is_running(&trx->mo.nm_state))</span><br><span style="color: hsl(120, 100%, 40%);">+         if (!nm_is_running(&trx->nm.mo.nm_state))</span><br><span>                     return false;</span><br><span>        }</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/e1_config.c b/src/osmo-bsc/e1_config.c</span><br><span>index 9ccbbfd..7f408c3 100644</span><br><span>--- a/src/osmo-bsc/e1_config.c</span><br><span>+++ b/src/osmo-bsc/e1_config.c</span><br><span>@@ -128,7 +128,7 @@</span><br><span>             ret = bts->model->oml_rcvmsg(msg);</span><br><span>             break;</span><br><span>       case E1INP_SIGN_RSL:</span><br><span style="color: hsl(0, 100%, 40%);">-            if (link->trx->mo.nm_state.administrative == NM_STATE_LOCKED) {</span><br><span style="color: hsl(120, 100%, 40%);">+         if (link->trx->nm.mo.nm_state.administrative == NM_STATE_LOCKED) {</span><br><span>                     LOG_TRX(link->trx, DLMI, LOGL_ERROR, "discarding RSL message received "</span><br><span>                              "in locked administrative state\n");</span><br><span>                  msgb_free(msg);</span><br><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index 5a83c9d..86ed5af 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -358,7 +358,7 @@</span><br><span>                       return NULL;</span><br><span>                 }</span><br><span>            trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);</span><br><span style="color: hsl(0, 100%, 40%);">-                mo = &trx->mo;</span><br><span style="color: hsl(120, 100%, 40%);">+         mo = &trx->nm.mo;</span><br><span>             break;</span><br><span>       case NM_OC_BASEB_TRANSC:</span><br><span>             if (obj_inst->trx_nr >= bts->num_trx) {</span><br><span>diff --git a/src/osmo-bsc/nm_rcarrier_fsm.c b/src/osmo-bsc/nm_rcarrier_fsm.c</span><br><span>new file mode 100644</span><br><span>index 0000000..68cc9ea</span><br><span>--- /dev/null</span><br><span>+++ b/src/osmo-bsc/nm_rcarrier_fsm.c</span><br><span>@@ -0,0 +1,366 @@</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 <osmocom/bsc/bts.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/signal.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/abis_nm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/bts_ipaccess_nanobts_omlattr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/nm_rcarrier_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/debug.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_rcarrier_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 *trx = (struct gsm_bts_trx *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        trx->nm.set_radio_attr_sent = false;</span><br><span style="color: hsl(120, 100%, 40%);">+       trx->nm.set_radio_attr_ack_received = false;</span><br><span style="color: hsl(120, 100%, 40%);">+       trx->nm.adm_unlock_sent = false;</span><br><span style="color: hsl(120, 100%, 40%);">+   trx->nm.opstart_sent = false;</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 nm_statechg_signal_data *nsd;</span><br><span style="color: hsl(120, 100%, 40%);">+  struct gsm_nm_state *new_state;</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_RCARRIER_EV_SW_ACT_REP:</span><br><span style="color: hsl(120, 100%, 40%);">+               break;</span><br><span style="color: hsl(120, 100%, 40%);">+        case NM_RCARRIER_EV_STATE_CHG_REP:</span><br><span style="color: hsl(120, 100%, 40%);">+            nsd = (struct nm_statechg_signal_data *)data;</span><br><span style="color: hsl(120, 100%, 40%);">+         new_state = nsd->new_state;</span><br><span style="color: hsl(120, 100%, 40%);">+                if (new_state->operational == NM_OPSTATE_ENABLED) {</span><br><span style="color: hsl(120, 100%, 40%);">+                        /*should not happen... */</span><br><span style="color: hsl(120, 100%, 40%);">+                     nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_ENABLED);</span><br><span style="color: hsl(120, 100%, 40%);">+                     return;</span><br><span style="color: hsl(120, 100%, 40%);">+               }</span><br><span style="color: hsl(120, 100%, 40%);">+             switch (new_state->availability) { /* operational = DISABLED */</span><br><span style="color: hsl(120, 100%, 40%);">+            case NM_AVSTATE_DEPENDENCY:</span><br><span style="color: hsl(120, 100%, 40%);">+                   nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_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_AVSTATE_OFF_LINE:</span><br><span style="color: hsl(120, 100%, 40%);">+             case NM_AVSTATE_OK:</span><br><span style="color: hsl(120, 100%, 40%);">+                   nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_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%);">+                      return;</span><br><span style="color: hsl(120, 100%, 40%);">+               }</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 configure_loop(struct gsm_bts_trx *trx, struct gsm_nm_state *state, bool allow_opstart)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+        struct msgb *msgb;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  if (!trx->nm.set_radio_attr_sent && !trx->nm.set_radio_attr_ack_received) {</span><br><span style="color: hsl(120, 100%, 40%);">+             trx->nm.set_radio_attr_sent = true;</span><br><span style="color: hsl(120, 100%, 40%);">+                msgb = nanobts_attr_radio_get(trx->bts, trx);</span><br><span style="color: hsl(120, 100%, 40%);">+              abis_nm_set_radio_attr(trx, msgb->data, msgb->len);</span><br><span style="color: hsl(120, 100%, 40%);">+             msgb_free(msgb);</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%);">+   if (!trx->nm.force_rf_lock && state->administrative != NM_STATE_UNLOCKED &&</span><br><span style="color: hsl(120, 100%, 40%);">+         !trx->nm.adm_unlock_sent) {</span><br><span style="color: hsl(120, 100%, 40%);">+            trx->nm.adm_unlock_sent = true;</span><br><span style="color: hsl(120, 100%, 40%);">+            abis_nm_chg_adm_state(trx->bts, NM_OC_RADIO_CARRIER,</span><br><span style="color: hsl(120, 100%, 40%);">+                                     trx->bts->bts_nr, trx->nr, 0xff,</span><br><span style="color: hsl(120, 100%, 40%);">+                                     NM_STATE_UNLOCKED);</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%);">+   if (allow_opstart && state->administrative == NM_STATE_UNLOCKED &&</span><br><span style="color: hsl(120, 100%, 40%);">+     trx->nm.set_radio_attr_ack_received && !trx->nm.opstart_sent) {</span><br><span style="color: hsl(120, 100%, 40%);">+             trx->nm.opstart_sent = true;</span><br><span style="color: hsl(120, 100%, 40%);">+               abis_nm_opstart(trx->bts, NM_OC_RADIO_CARRIER, trx->bts->bts_nr, trx->nr, 0xff);</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 *trx = (struct gsm_bts_trx *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        /* In general nanoBTS is broken, doesn't follow TS 12.21. Opstart MUST</span><br><span style="color: hsl(120, 100%, 40%);">+     * be sent during Dependency, so we simply move to OFFLINE state here to</span><br><span style="color: hsl(120, 100%, 40%);">+       * avoid duplicating code. However, RadioCarrier seems to be implemented</span><br><span style="color: hsl(120, 100%, 40%);">+       * correctly and goes to Offline state during startup. If some HW</span><br><span style="color: hsl(120, 100%, 40%);">+      * version is found with the aboev estated bug, this code needs to be</span><br><span style="color: hsl(120, 100%, 40%);">+  * enabled, similar to what we do in nm_bb_transc_fsm:</span><br><span style="color: hsl(120, 100%, 40%);">+         */</span><br><span style="color: hsl(120, 100%, 40%);">+   /*if (trx->bts->type == GSM_BTS_TYPE_NANOBTS) {</span><br><span style="color: hsl(120, 100%, 40%);">+         nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_OFFLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+            return;</span><br><span style="color: hsl(120, 100%, 40%);">+       }*/</span><br><span style="color: hsl(120, 100%, 40%);">+   configure_loop(trx, &trx->nm.mo.nm_state, false);</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 *trx = (struct gsm_bts_trx *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+  struct nm_statechg_signal_data *nsd;</span><br><span style="color: hsl(120, 100%, 40%);">+  struct gsm_nm_state *new_state;</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_RCARRIER_EV_SET_ATTR_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+             trx->nm.set_radio_attr_ack_received = true;</span><br><span style="color: hsl(120, 100%, 40%);">+                trx->nm.set_radio_attr_sent = false;</span><br><span style="color: hsl(120, 100%, 40%);">+               configure_loop(trx, &trx->nm.mo.nm_state, false);</span><br><span style="color: hsl(120, 100%, 40%);">+              return;</span><br><span style="color: hsl(120, 100%, 40%);">+       case NM_RCARRIER_EV_STATE_CHG_REP:</span><br><span style="color: hsl(120, 100%, 40%);">+            nsd = (struct nm_statechg_signal_data *)data;</span><br><span style="color: hsl(120, 100%, 40%);">+         new_state = nsd->new_state;</span><br><span style="color: hsl(120, 100%, 40%);">+                if (new_state->operational == NM_OPSTATE_ENABLED) {</span><br><span style="color: hsl(120, 100%, 40%);">+                        /* should not happen... */</span><br><span style="color: hsl(120, 100%, 40%);">+                    nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_ENABLED);</span><br><span style="color: hsl(120, 100%, 40%);">+                     return;</span><br><span style="color: hsl(120, 100%, 40%);">+               }</span><br><span style="color: hsl(120, 100%, 40%);">+             switch (new_state->availability) { /* operational = DISABLED */</span><br><span style="color: hsl(120, 100%, 40%);">+            case NM_AVSTATE_NOT_INSTALLED:</span><br><span style="color: hsl(120, 100%, 40%);">+                case NM_AVSTATE_POWER_OFF:</span><br><span style="color: hsl(120, 100%, 40%);">+                    nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED);</span><br><span style="color: hsl(120, 100%, 40%);">+                       return;</span><br><span style="color: hsl(120, 100%, 40%);">+               case NM_AVSTATE_OFF_LINE:</span><br><span style="color: hsl(120, 100%, 40%);">+             case NM_AVSTATE_OK:</span><br><span style="color: hsl(120, 100%, 40%);">+                   nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_OFFLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+                    return;</span><br><span style="color: hsl(120, 100%, 40%);">+               case NM_AVSTATE_DEPENDENCY:</span><br><span style="color: hsl(120, 100%, 40%);">+                   configure_loop(trx, new_state, false);</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%);">+                      return;</span><br><span style="color: hsl(120, 100%, 40%);">+               }</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 *trx = (struct gsm_bts_trx *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        /* Warning: In here we may be acessing an state older than new_state</span><br><span style="color: hsl(120, 100%, 40%);">+     from prev (syncrhonous) FSM state */</span><br><span style="color: hsl(120, 100%, 40%);">+       configure_loop(trx, &trx->nm.mo.nm_state, true);</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 *trx = (struct gsm_bts_trx *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+  struct nm_statechg_signal_data *nsd;</span><br><span style="color: hsl(120, 100%, 40%);">+  struct gsm_nm_state *new_state;</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_RCARRIER_EV_SET_ATTR_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+             trx->nm.set_radio_attr_ack_received = true;</span><br><span style="color: hsl(120, 100%, 40%);">+                trx->nm.set_radio_attr_sent = false;</span><br><span style="color: hsl(120, 100%, 40%);">+               configure_loop(trx, &trx->nm.mo.nm_state, true);</span><br><span style="color: hsl(120, 100%, 40%);">+               return;</span><br><span style="color: hsl(120, 100%, 40%);">+       case NM_RCARRIER_EV_STATE_CHG_REP:</span><br><span style="color: hsl(120, 100%, 40%);">+            nsd = (struct nm_statechg_signal_data *)data;</span><br><span style="color: hsl(120, 100%, 40%);">+         new_state = nsd->new_state;</span><br><span style="color: hsl(120, 100%, 40%);">+                if (new_state->operational == NM_OPSTATE_ENABLED) {</span><br><span style="color: hsl(120, 100%, 40%);">+                        nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_ENABLED);</span><br><span style="color: hsl(120, 100%, 40%);">+                     return;</span><br><span style="color: hsl(120, 100%, 40%);">+               }</span><br><span style="color: hsl(120, 100%, 40%);">+             switch (new_state->availability) { /* operational = DISABLED */</span><br><span style="color: hsl(120, 100%, 40%);">+            case NM_AVSTATE_NOT_INSTALLED:</span><br><span style="color: hsl(120, 100%, 40%);">+                case NM_AVSTATE_POWER_OFF:</span><br><span style="color: hsl(120, 100%, 40%);">+                    nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED);</span><br><span style="color: hsl(120, 100%, 40%);">+                       return;</span><br><span style="color: hsl(120, 100%, 40%);">+               case NM_AVSTATE_DEPENDENCY:</span><br><span style="color: hsl(120, 100%, 40%);">+                   nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_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_AVSTATE_OFF_LINE:</span><br><span style="color: hsl(120, 100%, 40%);">+             case NM_AVSTATE_OK:</span><br><span style="color: hsl(120, 100%, 40%);">+                   configure_loop(trx, new_state, true);</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%);">+                      return;</span><br><span style="color: hsl(120, 100%, 40%);">+               }</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 *trx = (struct gsm_bts_trx *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        /* Reset state, we don't need it in this state and it will need to be</span><br><span style="color: hsl(120, 100%, 40%);">+       reused as soon as we move back to Disabled */</span><br><span style="color: hsl(120, 100%, 40%);">+       trx->nm.opstart_sent = false;</span><br><span style="color: hsl(120, 100%, 40%);">+      trx->nm.adm_unlock_sent = false;</span><br><span style="color: hsl(120, 100%, 40%);">+   trx->nm.set_radio_attr_ack_received = false;</span><br><span style="color: hsl(120, 100%, 40%);">+       trx->nm.set_radio_attr_sent = false;</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%);">+      struct nm_statechg_signal_data *nsd;</span><br><span style="color: hsl(120, 100%, 40%);">+  struct gsm_nm_state *new_state;</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_RCARRIER_EV_STATE_CHG_REP:</span><br><span style="color: hsl(120, 100%, 40%);">+            nsd = (struct nm_statechg_signal_data *)data;</span><br><span style="color: hsl(120, 100%, 40%);">+         new_state = nsd->new_state;</span><br><span style="color: hsl(120, 100%, 40%);">+                if (new_state->operational == NM_OPSTATE_ENABLED)</span><br><span style="color: hsl(120, 100%, 40%);">+                  return;</span><br><span style="color: hsl(120, 100%, 40%);">+               switch (new_state->availability) { /* operational = DISABLED */</span><br><span style="color: hsl(120, 100%, 40%);">+            case NM_AVSTATE_NOT_INSTALLED:</span><br><span style="color: hsl(120, 100%, 40%);">+                case NM_AVSTATE_POWER_OFF:</span><br><span style="color: hsl(120, 100%, 40%);">+                    nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED);</span><br><span style="color: hsl(120, 100%, 40%);">+                       return;</span><br><span style="color: hsl(120, 100%, 40%);">+               case NM_AVSTATE_DEPENDENCY:</span><br><span style="color: hsl(120, 100%, 40%);">+                   nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_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_AVSTATE_OFF_LINE:</span><br><span style="color: hsl(120, 100%, 40%);">+             case NM_AVSTATE_OK:</span><br><span style="color: hsl(120, 100%, 40%);">+                   nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_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%);">+                      return;</span><br><span style="color: hsl(120, 100%, 40%);">+               }</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_allstate(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 *trx = (struct gsm_bts_trx *)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_RCARRIER_EV_OPSTART_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+      case NM_RCARRIER_EV_OPSTART_NACK:</span><br><span style="color: hsl(120, 100%, 40%);">+             /* TODO: if on state OFFLINE and rx NACK, try again? */</span><br><span style="color: hsl(120, 100%, 40%);">+               trx->nm.opstart_sent = false;</span><br><span style="color: hsl(120, 100%, 40%);">+              break;</span><br><span style="color: hsl(120, 100%, 40%);">+        case NM_RCARRIER_EV_FORCE_LOCK:</span><br><span style="color: hsl(120, 100%, 40%);">+               trx->nm.force_rf_lock = (bool)(intptr_t)data;</span><br><span style="color: hsl(120, 100%, 40%);">+              abis_nm_chg_adm_state(trx->bts, NM_OC_RADIO_CARRIER,</span><br><span style="color: hsl(120, 100%, 40%);">+                                     trx->bts->bts_nr, trx->nr, 0xff,</span><br><span style="color: hsl(120, 100%, 40%);">+                                     trx->nm.force_rf_lock ? NM_STATE_LOCKED : NM_STATE_UNLOCKED);</span><br><span style="color: hsl(120, 100%, 40%);">+                break;</span><br><span style="color: hsl(120, 100%, 40%);">+        case NM_RCARRIER_EV_OML_DOWN:</span><br><span style="color: hsl(120, 100%, 40%);">+         nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED);</span><br><span style="color: hsl(120, 100%, 40%);">+               break;</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_rcarrier_fsm_states[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+     [NM_RCARRIER_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_RCARRIER_EV_SW_ACT_REP) |</span><br><span style="color: hsl(120, 100%, 40%);">+                        X(NM_RCARRIER_EV_STATE_CHG_REP),</span><br><span style="color: hsl(120, 100%, 40%);">+              .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+                     X(NM_RCARRIER_ST_OP_DISABLED_DEPENDENCY) |</span><br><span style="color: hsl(120, 100%, 40%);">+                    X(NM_RCARRIER_ST_OP_DISABLED_OFFLINE) |</span><br><span style="color: hsl(120, 100%, 40%);">+                       X(NM_RCARRIER_ST_OP_ENABLED),</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_RCARRIER_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_RCARRIER_EV_STATE_CHG_REP) |</span><br><span style="color: hsl(120, 100%, 40%);">+                     X(NM_RCARRIER_EV_SET_ATTR_ACK),</span><br><span style="color: hsl(120, 100%, 40%);">+               .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+                     X(NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED) |</span><br><span style="color: hsl(120, 100%, 40%);">+                  X(NM_RCARRIER_ST_OP_DISABLED_OFFLINE) |</span><br><span style="color: hsl(120, 100%, 40%);">+                       X(NM_RCARRIER_ST_OP_ENABLED),</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_RCARRIER_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_RCARRIER_EV_STATE_CHG_REP) |</span><br><span style="color: hsl(120, 100%, 40%);">+                     X(NM_RCARRIER_EV_SET_ATTR_ACK),</span><br><span style="color: hsl(120, 100%, 40%);">+               .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+                     X(NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED) |</span><br><span style="color: hsl(120, 100%, 40%);">+                  X(NM_RCARRIER_ST_OP_DISABLED_DEPENDENCY) |</span><br><span style="color: hsl(120, 100%, 40%);">+                    X(NM_RCARRIER_ST_OP_ENABLED),</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_RCARRIER_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_RCARRIER_EV_STATE_CHG_REP),</span><br><span style="color: hsl(120, 100%, 40%);">+      .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+             X(NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED) |</span><br><span style="color: hsl(120, 100%, 40%);">+          X(NM_RCARRIER_ST_OP_DISABLED_DEPENDENCY) |</span><br><span style="color: hsl(120, 100%, 40%);">+            X(NM_RCARRIER_ST_OP_DISABLED_OFFLINE),</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%);">+const struct value_string nm_rcarrier_fsm_event_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { NM_RCARRIER_EV_SW_ACT_REP, "SW_ACT_REP" },</span><br><span style="color: hsl(120, 100%, 40%);">+        { NM_RCARRIER_EV_STATE_CHG_REP, "STATE_CHG_REP" },</span><br><span style="color: hsl(120, 100%, 40%);">+  { NM_RCARRIER_EV_SET_ATTR_ACK, "SET_ATTR_ACK" },</span><br><span style="color: hsl(120, 100%, 40%);">+    { NM_RCARRIER_EV_OPSTART_ACK, "OPSTART_ACK" },</span><br><span style="color: hsl(120, 100%, 40%);">+      { NM_RCARRIER_EV_OPSTART_NACK, "OPSTART_NACK" },</span><br><span style="color: hsl(120, 100%, 40%);">+    { NM_RCARRIER_EV_FORCE_LOCK, "FORCE_LOCK_CHG" },</span><br><span style="color: hsl(120, 100%, 40%);">+    { NM_RCARRIER_EV_OML_DOWN, "OML_DOWN" },</span><br><span style="color: hsl(120, 100%, 40%);">+    { 0, NULL }</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_rcarrier_fsm = {</span><br><span style="color: hsl(120, 100%, 40%);">+        .name = "NM_RCARRIER_OP",</span><br><span style="color: hsl(120, 100%, 40%);">+   .states = nm_rcarrier_fsm_states,</span><br><span style="color: hsl(120, 100%, 40%);">+     .num_states = ARRAY_SIZE(nm_rcarrier_fsm_states),</span><br><span style="color: hsl(120, 100%, 40%);">+     .allstate_event_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+                X(NM_RCARRIER_EV_OPSTART_ACK) |</span><br><span style="color: hsl(120, 100%, 40%);">+               X(NM_RCARRIER_EV_OPSTART_NACK) |</span><br><span style="color: hsl(120, 100%, 40%);">+              X(NM_RCARRIER_EV_FORCE_LOCK) |</span><br><span style="color: hsl(120, 100%, 40%);">+                X(NM_RCARRIER_EV_OML_DOWN),</span><br><span style="color: hsl(120, 100%, 40%);">+   .allstate_action = st_op_allstate,</span><br><span style="color: hsl(120, 100%, 40%);">+    .event_names = nm_rcarrier_fsm_event_names,</span><br><span style="color: hsl(120, 100%, 40%);">+   .log_subsys = DNM,</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_rcarrier_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_rcarrier_fsm) == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am</span><br><span>index f7349a1..8026320 100644</span><br><span>--- a/src/utils/Makefile.am</span><br><span>+++ b/src/utils/Makefile.am</span><br><span>@@ -59,6 +59,7 @@</span><br><span>         $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \</span><br><span>       $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span>  $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span>     $(LIBOSMOCORE_LIBS) \</span><br><span>        $(LIBOSMOGSM_LIBS) \</span><br><span>         $(LIBOSMOABIS_LIBS) \</span><br><span>@@ -133,6 +134,7 @@</span><br><span>  $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \</span><br><span>       $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span>  $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span>     $(LIBOSMOCORE_LIBS) \</span><br><span>        $(LIBOSMOGSM_LIBS) \</span><br><span>         $(LIBOSMOABIS_LIBS) \</span><br><span>diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am</span><br><span>index 1027e4a..1a2420b 100644</span><br><span>--- a/tests/abis/Makefile.am</span><br><span>+++ b/tests/abis/Makefile.am</span><br><span>@@ -35,6 +35,7 @@</span><br><span>       $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \</span><br><span>       $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span>  $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span>     $(LIBOSMOCORE_LIBS) \</span><br><span>        $(LIBOSMOABIS_LIBS) \</span><br><span>        $(LIBOSMOGSM_LIBS) \</span><br><span>diff --git a/tests/acc/Makefile.am b/tests/acc/Makefile.am</span><br><span>index 5ab48e5..5591fc4 100644</span><br><span>--- a/tests/acc/Makefile.am</span><br><span>+++ b/tests/acc/Makefile.am</span><br><span>@@ -35,6 +35,7 @@</span><br><span>    $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \</span><br><span>       $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span>  $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span>     $(LIBOSMOCORE_LIBS) \</span><br><span>        $(LIBOSMOABIS_LIBS) \</span><br><span>        $(LIBOSMOGSM_LIBS) \</span><br><span>diff --git a/tests/acc/acc_test.ok b/tests/acc/acc_test.ok</span><br><span>index 1060505..5a5ddf6 100644</span><br><span>--- a/tests/acc/acc_test.ok</span><br><span>+++ b/tests/acc/acc_test.ok</span><br><span>@@ -1,6 +1,7 @@</span><br><span> ===test_acc_mgr_no_ramp===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_mgr_no_ramp()</span><br><span>@@ -111,10 +112,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_mgr_no_ramp()</span><br><span> ===test_acc_mgr_manual_ramp===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_mgr_manual_ramp()</span><br><span>@@ -355,10 +358,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_mgr_manual_ramp()</span><br><span> ===test_acc_mgr_rotate(true, 1)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_mgr_rotate()</span><br><span>@@ -430,10 +435,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_mgr_rotate()</span><br><span> ===test_acc_mgr_rotate(false, 1)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_mgr_rotate()</span><br><span>@@ -502,10 +509,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_mgr_rotate()</span><br><span> ===test_acc_mgr_rotate(true, 2)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_mgr_rotate()</span><br><span>@@ -577,10 +586,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_mgr_rotate()</span><br><span> ===test_acc_mgr_rotate(false, 2)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_mgr_rotate()</span><br><span>@@ -649,10 +660,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_mgr_rotate()</span><br><span> ===test_acc_mgr_rotate(true, 3)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_mgr_rotate()</span><br><span>@@ -724,10 +737,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_mgr_rotate()</span><br><span> ===test_acc_mgr_rotate(false, 3)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_mgr_rotate()</span><br><span>@@ -796,10 +811,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_mgr_rotate()</span><br><span> ===test_acc_mgr_rotate(true, 4)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_mgr_rotate()</span><br><span>@@ -871,10 +888,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_mgr_rotate()</span><br><span> ===test_acc_mgr_rotate(false, 4)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_mgr_rotate()</span><br><span>@@ -943,10 +962,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_mgr_rotate()</span><br><span> ===test_acc_mgr_rotate(true, 5)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_mgr_rotate()</span><br><span>@@ -1018,10 +1039,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_mgr_rotate()</span><br><span> ===test_acc_mgr_rotate(false, 5)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_mgr_rotate()</span><br><span>@@ -1090,10 +1113,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_mgr_rotate()</span><br><span> ===test_acc_mgr_rotate(true, 6)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_mgr_rotate()</span><br><span>@@ -1165,10 +1190,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_mgr_rotate()</span><br><span> ===test_acc_mgr_rotate(false, 6)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_mgr_rotate()</span><br><span>@@ -1237,10 +1264,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_mgr_rotate()</span><br><span> ===test_acc_mgr_rotate(true, 7)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_mgr_rotate()</span><br><span>@@ -1312,10 +1341,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_mgr_rotate()</span><br><span> ===test_acc_mgr_rotate(false, 7)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_mgr_rotate()</span><br><span>@@ -1384,10 +1415,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_mgr_rotate()</span><br><span> ===test_acc_mgr_rotate(true, 8)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_mgr_rotate()</span><br><span>@@ -1459,10 +1492,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_mgr_rotate()</span><br><span> ===test_acc_mgr_rotate(false, 8)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_mgr_rotate()</span><br><span>@@ -1531,10 +1566,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_mgr_rotate()</span><br><span> ===test_acc_mgr_rotate(false, 9)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_mgr_rotate()</span><br><span>@@ -1603,10 +1640,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_mgr_rotate()</span><br><span> ===test_acc_ramp===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_ramp()</span><br><span>@@ -1644,10 +1683,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_ramp()</span><br><span> ===test_acc_ramp2===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_ramp2()</span><br><span>@@ -1667,10 +1708,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_ramp2()</span><br><span> ===test_acc_ramp3===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_ramp3()</span><br><span>@@ -1706,10 +1749,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_ramp3()</span><br><span> ===test_acc_ramp_up_rotate(0, 100, 100)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_ramp_up_rotate()</span><br><span>@@ -1801,10 +1846,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_ramp_up_rotate()</span><br><span> ===test_acc_ramp_up_rotate(0, 20, 50)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_ramp_up_rotate()</span><br><span>@@ -1896,10 +1943,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_ramp_up_rotate()</span><br><span> ===test_acc_ramp_up_rotate(70, 80, 90)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_ramp_up_rotate()</span><br><span>@@ -1991,10 +2040,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_ramp_up_rotate()</span><br><span> ===test_acc_ramp_updown_rotate(80, 90, 0, 100, 15)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_ramp_updown_rotate()</span><br><span>@@ -2116,10 +2167,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_ramp_updown_rotate()</span><br><span> ===test_acc_ramp_updown_rotate(30, 50, 10, 100, 15)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_ramp_updown_rotate()</span><br><span>@@ -2265,10 +2318,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_ramp_updown_rotate()</span><br><span> ===test_acc_ramp_updown_rotate(50, 49, 0, 100, 10)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_ramp_updown_rotate()</span><br><span>@@ -2424,10 +2479,12 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_ramp_updown_rotate()</span><br><span> ===test_acc_ramp_updown_rotate(30, 80, 30, 80, 5)===</span><br><span> NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_ramp_updown_rotate()</span><br><span>@@ -2489,4 +2546,5 @@</span><br><span> NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+NM_RCARRIER_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated</span><br><span> BTS deallocated OK in test_acc_ramp_updown_rotate()</span><br><span>diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am</span><br><span>index a0157d9..dd5de46 100644</span><br><span>--- a/tests/bsc/Makefile.am</span><br><span>+++ b/tests/bsc/Makefile.am</span><br><span>@@ -49,6 +49,7 @@</span><br><span>         $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \</span><br><span>       $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span>  $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span>     $(LIBOSMOCORE_LIBS) \</span><br><span>        $(LIBOSMOGSM_LIBS) \</span><br><span>         $(LIBOSMOVTY_LIBS) \</span><br><span>diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am</span><br><span>index 5b265f0..b49a396 100644</span><br><span>--- a/tests/gsm0408/Makefile.am</span><br><span>+++ b/tests/gsm0408/Makefile.am</span><br><span>@@ -38,6 +38,7 @@</span><br><span>    $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \</span><br><span>       $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span>  $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span>     $(LIBOSMOCORE_LIBS) \</span><br><span>        $(LIBOSMOGSM_LIBS) \</span><br><span>         $(LIBOSMOABIS_LIBS) \</span><br><span>diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am</span><br><span>index abd1e14..ddf4429 100644</span><br><span>--- a/tests/handover/Makefile.am</span><br><span>+++ b/tests/handover/Makefile.am</span><br><span>@@ -83,6 +83,7 @@</span><br><span>       $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \</span><br><span>       $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span>  $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span>     $(top_builddir)/src/osmo-bsc/osmo_bsc_ctrl.o \</span><br><span>       $(top_builddir)/src/osmo-bsc/osmo_bsc_lcls.o \</span><br><span>       $(top_builddir)/src/osmo-bsc/osmo_bsc_mgcp.o \</span><br><span>diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c</span><br><span>index 78e8daf..77d8244 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -196,9 +196,9 @@</span><br><span>    rsl_link->trx = bts->c0;</span><br><span>       bts->c0->rsl_link = rsl_link;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->c0->mo.nm_state.operational = NM_OPSTATE_ENABLED;</span><br><span style="color: hsl(0, 100%, 40%);">-    bts->c0->mo.nm_state.availability = NM_AVSTATE_OK;</span><br><span style="color: hsl(0, 100%, 40%);">-        bts->c0->mo.nm_state.administrative = NM_STATE_UNLOCKED;</span><br><span style="color: hsl(120, 100%, 40%);">+        bts->c0->nm.mo.nm_state.operational = NM_OPSTATE_ENABLED;</span><br><span style="color: hsl(120, 100%, 40%);">+       bts->c0->nm.mo.nm_state.availability = NM_AVSTATE_OK;</span><br><span style="color: hsl(120, 100%, 40%);">+   bts->c0->nm.mo.nm_state.administrative = NM_STATE_UNLOCKED;</span><br><span>    bts->c0->bb_transc.mo.nm_state.operational = NM_OPSTATE_ENABLED;</span><br><span>       bts->c0->bb_transc.mo.nm_state.availability = NM_AVSTATE_OK;</span><br><span>   bts->c0->bb_transc.mo.nm_state.administrative = NM_STATE_UNLOCKED;</span><br><span>diff --git a/tests/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am</span><br><span>index 52ded6b..f57b942 100644</span><br><span>--- a/tests/nanobts_omlattr/Makefile.am</span><br><span>+++ b/tests/nanobts_omlattr/Makefile.am</span><br><span>@@ -32,6 +32,7 @@</span><br><span>        $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \</span><br><span>       $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span>  $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span>     $(LIBOSMOCORE_LIBS) \</span><br><span>        $(LIBOSMOGSM_LIBS) \</span><br><span>         $(LIBOSMOABIS_LIBS) \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20403">change 20403</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-bsc/+/20403"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ieed61d1fb1e896db42545c2c3421b20cb41ad549 </div>
<div style="display:none"> Gerrit-Change-Number: 20403 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>