This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20402 )
Change subject: Introduce NM BaseBand Transceiver FSM
......................................................................
Introduce NM BaseBand Transceiver FSM
Change-Id: Ib4d35316c52eb4c71ea0d352a1e06fd5e600fe08
---
M include/osmocom/bsc/Makefile.am
M include/osmocom/bsc/bts_trx.h
A include/osmocom/bsc/nm_bb_transc_fsm.h
M src/ipaccess/Makefile.am
M src/osmo-bsc/Makefile.am
M src/osmo-bsc/bts_ipaccess_nanobts.c
M src/osmo-bsc/bts_trx.c
M src/osmo-bsc/gsm_data.c
A src/osmo-bsc/nm_bb_transc_fsm.c
M src/utils/Makefile.am
M tests/abis/Makefile.am
M tests/acc/Makefile.am
M tests/acc/acc_test.ok
M tests/bsc/Makefile.am
M tests/gsm0408/Makefile.am
M tests/handover/Makefile.am
M tests/nanobts_omlattr/Makefile.am
17 files changed, 502 insertions(+), 11 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/02/20402/1
diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am
index 59ac91a..cf25b21 100644
--- a/include/osmocom/bsc/Makefile.am
+++ b/include/osmocom/bsc/Makefile.am
@@ -35,6 +35,7 @@
misdn.h \
neighbor_ident.h \
network_listen.h \
+ nm_bb_transc_fsm.h \
nm_bts_sm_fsm.h \
nm_bts_fsm.h \
openbscdefines.h \
diff --git a/include/osmocom/bsc/bts_trx.h b/include/osmocom/bsc/bts_trx.h
index 3a635ba..12f397a 100644
--- a/include/osmocom/bsc/bts_trx.h
+++ b/include/osmocom/bsc/bts_trx.h
@@ -42,6 +42,9 @@
struct gsm_abis_mo mo;
struct tlv_parsed nm_attr;
struct {
+ struct osmo_fsm_inst *fi;
+ bool adm_unlock_sent;
+ bool opstart_sent;
struct gsm_abis_mo mo;
} bb_transc;
diff --git a/include/osmocom/bsc/nm_bb_transc_fsm.h b/include/osmocom/bsc/nm_bb_transc_fsm.h
new file mode 100644
index 0000000..440a567
--- /dev/null
+++ b/include/osmocom/bsc/nm_bb_transc_fsm.h
@@ -0,0 +1,43 @@
+/* NM BaseBand Transceiver FSM. Following 3GPP TS 12.21 Figure 2/GSM 12.21:
+ GSM 12.21 Objects' Operational state and availability status behaviour during initialization */
+
+/* (C) 2020 by sysmocom - s.m.f.c. GmbH <info at sysmocom.de>
+ * Author: Pau Espin Pedrol <pespin at sysmocom.de>
+ *
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+#include <osmocom/core/fsm.h>
+
+enum nm_bb_transc_op_fsm_states {
+ NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED,
+ NM_BB_TRANSC_ST_OP_DISABLED_DEPENDENCY,
+ NM_BB_TRANSC_ST_OP_DISABLED_OFFLINE,
+ NM_BB_TRANSC_ST_OP_ENABLED,
+};
+
+enum nm_bb_transc_op_fsm_events {
+ NM_BB_TRANSC_EV_SW_ACT_REP,
+ NM_BB_TRANSC_EV_STATE_CHG_REP,
+ NM_BB_TRANSC_EV_OPSTART_ACK,
+ NM_BB_TRANSC_EV_OPSTART_NACK,
+ NM_BB_TRANSC_EV_OML_DOWN,
+};
+
+extern struct osmo_fsm nm_bb_transc_fsm;
diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am
index 55d7408..729173d 100644
--- a/src/ipaccess/Makefile.am
+++ b/src/ipaccess/Makefile.am
@@ -56,6 +56,7 @@
$(top_builddir)/src/osmo-bsc/net_init.o \
$(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \
$(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \
+ $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \
$(OSMO_LIBS) \
$(NULL)
@@ -73,5 +74,6 @@
$(top_builddir)/src/osmo-bsc/gsm_data.o \
$(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \
$(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \
+ $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \
$(OSMO_LIBS) \
$(NULL)
diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am
index e6fe3f9..c4fe6f0 100644
--- a/src/osmo-bsc/Makefile.am
+++ b/src/osmo-bsc/Makefile.am
@@ -72,6 +72,7 @@
neighbor_ident.c \
neighbor_ident_vty.c \
net_init.c \
+ nm_bb_transc_fsm.c \
nm_bts_sm_fsm.c \
nm_bts_fsm.c \
gsm_08_08.c \
diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c
index f450a16..fdd50f4 100644
--- a/src/osmo-bsc/bts_ipaccess_nanobts.c
+++ b/src/osmo-bsc/bts_ipaccess_nanobts.c
@@ -48,6 +48,7 @@
#include <osmocom/bsc/bts.h>
#include <osmocom/bsc/nm_bts_sm_fsm.h>
#include <osmocom/bsc/nm_bts_fsm.h>
+#include <osmocom/bsc/nm_bb_transc_fsm.h>
static int bts_model_nanobts_start(struct gsm_network *net);
static void bts_model_nanobts_e1line_bind_ops(struct e1inp_line *line);
@@ -143,7 +144,9 @@
/* S_NM_STATECHG_ADM is called after we call chg_adm_state() and would create
* endless loop */
- if (obj_class != NM_OC_BTS && evt != S_NM_STATECHG_OPER)
+ if (obj_class != NM_OC_BTS &&
+ obj_class != NM_OC_BASEB_TRANSC &&
+ evt != S_NM_STATECHG_OPER)
return 0;
switch (obj_class) {
@@ -155,6 +158,10 @@
bts = obj;
osmo_fsm_inst_dispatch(bts->nm.fi, NM_BTS_EV_STATE_CHG_REP, nsd);
break;
+ case NM_OC_BASEB_TRANSC:
+ trx = obj;
+ osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BB_TRANSC_EV_STATE_CHG_REP, nsd);
+ break;
case NM_OC_CHANNEL:
ts = obj;
trx = ts->trx;
@@ -256,14 +263,7 @@
case NM_OC_BASEB_TRANSC:
if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))
return -EINVAL;
- abis_nm_chg_adm_state(trx->bts, foh->obj_class,
- trx->bts->bts_nr, trx->nr, 0xff,
- NM_STATE_UNLOCKED);
- abis_nm_opstart(trx->bts, foh->obj_class,
- trx->bts->bts_nr, trx->nr, 0xff);
- /* TRX software is active, tell it to initiate RSL Link */
- abis_nm_ipaccess_rsl_connect(trx, trx->bts->ip_access.rsl_ip,
- 3003, trx->rsl_tei);
+ osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BB_TRANSC_EV_SW_ACT_REP, NULL);
break;
case NM_OC_RADIO_CARRIER: {
if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))
@@ -310,6 +310,8 @@
struct abis_om_fom_hdr *foh = msgb_l3(oml_msg);
struct e1inp_sign_link *sign_link = oml_msg->dst;
struct gsm_bts *bts = sign_link->trx->bts;
+ struct gsm_bts_trx *trx;
+
switch (foh->obj_class) {
case NM_OC_SITE_MANAGER:
osmo_fsm_inst_dispatch(bts->site_mgr.fi, NM_BTS_SM_EV_OPSTART_ACK, NULL);
@@ -317,6 +319,11 @@
case NM_OC_BTS:
osmo_fsm_inst_dispatch(bts->nm.fi, NM_BTS_EV_OPSTART_ACK, NULL);
break;
+ case NM_OC_BASEB_TRANSC:
+ if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))
+ return;
+ osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BB_TRANSC_EV_OPSTART_ACK, NULL);
+ break;
case NM_OC_CHANNEL:
nm_rx_opstart_ack_chan(oml_msg);
break;
@@ -330,6 +337,8 @@
struct abis_om_fom_hdr *foh = msgb_l3(oml_msg);
struct e1inp_sign_link *sign_link = oml_msg->dst;
struct gsm_bts *bts = sign_link->trx->bts;
+ struct gsm_bts_trx *trx;
+
switch (foh->obj_class) {
case NM_OC_SITE_MANAGER:
osmo_fsm_inst_dispatch(bts->site_mgr.fi, NM_BTS_SM_EV_OPSTART_NACK, NULL);
@@ -337,6 +346,11 @@
case NM_OC_BTS:
osmo_fsm_inst_dispatch(bts->nm.fi, NM_BTS_EV_OPSTART_ACK, NULL);
break;
+ case NM_OC_BASEB_TRANSC:
+ if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))
+ return;
+ osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BB_TRANSC_EV_OPSTART_NACK, NULL);
+ break;
default:
break;
}
@@ -474,8 +488,10 @@
osmo_stat_item_dec(bts->bts_statg->items[BTS_STAT_OML_CONNECTED], 1);
/* we have issues reconnecting RSL, drop everything. */
- llist_for_each_entry(trx, &bts->trx_list, list)
+ llist_for_each_entry(trx, &bts->trx_list, list) {
ipaccess_drop_rsl(trx, "OML link drop");
+ osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BB_TRANSC_EV_OML_DOWN, NULL);
+ }
osmo_fsm_inst_dispatch(bts->site_mgr.fi, NM_BTS_SM_EV_OML_DOWN, NULL);
osmo_fsm_inst_dispatch(bts->nm.fi, NM_BTS_EV_OML_DOWN, NULL);
diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c
index 25a3fc7..78fec9f 100644
--- a/src/osmo-bsc/bts_trx.c
+++ b/src/osmo-bsc/bts_trx.c
@@ -30,6 +30,16 @@
#include <osmocom/bsc/system_information.h>
#include <osmocom/bsc/pcu_if.h>
#include <osmocom/bsc/debug.h>
+#include <osmocom/bsc/nm_bb_transc_fsm.h>
+
+static int gsm_bts_trx_talloc_destructor(struct gsm_bts_trx *trx)
+{
+ if (trx->bb_transc.fi) {
+ osmo_fsm_inst_free(trx->bb_transc.fi);
+ trx->bb_transc.fi = NULL;
+ }
+ return 0;
+}
struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts)
{
@@ -39,12 +49,18 @@
if (!trx)
return NULL;
+ talloc_set_destructor(trx, gsm_bts_trx_talloc_destructor);
+
trx->bts = bts;
trx->nr = bts->num_trx++;
trx->mo.nm_state.administrative = NM_STATE_UNLOCKED;
gsm_mo_init(&trx->mo, bts, NM_OC_RADIO_CARRIER,
bts->nr, trx->nr, 0xff);
+
+ trx->bb_transc.fi = osmo_fsm_inst_alloc(&nm_bb_transc_fsm, trx, trx,
+ LOGL_INFO, NULL);
+ osmo_fsm_inst_update_id_f(trx->bb_transc.fi, "bts%d-trx%d", bts->nr, trx->nr);
gsm_mo_init(&trx->bb_transc.mo, bts, NM_OC_BASEB_TRANSC,
bts->nr, trx->nr, 0xff);
diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c
index 1909d50..5a83c9d 100644
--- a/src/osmo-bsc/gsm_data.c
+++ b/src/osmo-bsc/gsm_data.c
@@ -461,7 +461,7 @@
return NULL;
}
trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
- obj = &trx->bb_transc;
+ obj = trx;
break;
case NM_OC_CHANNEL:
if (obj_inst->trx_nr >= bts->num_trx) {
diff --git a/src/osmo-bsc/nm_bb_transc_fsm.c b/src/osmo-bsc/nm_bb_transc_fsm.c
new file mode 100644
index 0000000..bdee054
--- /dev/null
+++ b/src/osmo-bsc/nm_bb_transc_fsm.c
@@ -0,0 +1,343 @@
+/* NM BaseBand Transceiver FSM */
+
+/* (C) 2020 by sysmocom - s.m.f.c. GmbH <info at sysmocom.de>
+ * Author: Pau Espin Pedrol <pespin at sysmocom.de>
+ *
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <errno.h>
+#include <unistd.h>
+#include <inttypes.h>
+
+#include <osmocom/core/fsm.h>
+#include <osmocom/core/tdef.h>
+#include <osmocom/gsm/protocol/gsm_12_21.h>
+
+#include <osmocom/bsc/bts.h>
+#include <osmocom/bsc/signal.h>
+#include <osmocom/bsc/abis_nm.h>
+#include <osmocom/bsc/bts_ipaccess_nanobts_omlattr.h>
+#include <osmocom/bsc/nm_bb_transc_fsm.h>
+#include <osmocom/bsc/debug.h>
+
+#define X(s) (1 << (s))
+
+#define nm_bb_transc_fsm_state_chg(fi, NEXT_STATE) \
+ osmo_fsm_inst_state_chg(fi, NEXT_STATE, 0, 0)
+
+//////////////////////////
+// FSM STATE ACTIONS
+//////////////////////////
+
+static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)
+{
+ struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv;
+
+ trx->bb_transc.adm_unlock_sent = false;
+ trx->bb_transc.opstart_sent = false;
+}
+
+static void st_op_disabled_notinstalled(struct osmo_fsm_inst *fi, uint32_t event, void *data)
+{
+ struct nm_statechg_signal_data *nsd;
+ struct gsm_nm_state *new_state;
+
+ switch (event) {
+ case NM_BB_TRANSC_EV_SW_ACT_REP:
+ break;
+ case NM_BB_TRANSC_EV_STATE_CHG_REP:
+ nsd = (struct nm_statechg_signal_data *)data;
+ new_state = nsd->new_state;
+ if (new_state->operational == NM_OPSTATE_ENABLED) {
+ /*should not happen... */
+ nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_ENABLED);
+ return;
+ }
+ switch (new_state->availability) { /* operational = DISABLED */
+ case NM_AVSTATE_DEPENDENCY:
+ nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_DEPENDENCY);
+ return;
+ case NM_AVSTATE_OFF_LINE:
+ case NM_AVSTATE_OK:
+ nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_OFFLINE);
+ return;
+ default:
+ return;
+ }
+ default:
+ OSMO_ASSERT(0);
+ }
+}
+
+static void configure_loop(struct gsm_bts_trx *trx, struct gsm_nm_state *state, bool allow_opstart) {
+
+ if (state->administrative != NM_STATE_UNLOCKED && !trx->bb_transc.adm_unlock_sent) {
+ trx->bb_transc.adm_unlock_sent = true;
+ /* Note: nanoBTS sometimes fails NACKing the BaseBand
+ Transceiver Unlock command while in Dependency, specially
+ during first attempt after boot. When NACK is received, the
+ OML link is dropped and the whole procedure is restarted. */
+ abis_nm_chg_adm_state(trx->bts, NM_OC_BASEB_TRANSC,
+ trx->bts->bts_nr, trx->nr, 0xff,
+ NM_STATE_UNLOCKED);
+ }
+
+ if (allow_opstart && state->administrative == NM_STATE_UNLOCKED &&
+ !trx->bb_transc.opstart_sent) {
+ trx->bb_transc.opstart_sent = true;
+ abis_nm_opstart(trx->bts, NM_OC_BASEB_TRANSC, trx->bts->bts_nr, trx->nr, 0xff);
+ /* TRX software is active, tell it to initiate RSL Link */
+ abis_nm_ipaccess_rsl_connect(trx, trx->bts->ip_access.rsl_ip,
+ 3003, trx->rsl_tei);
+ }
+}
+
+static void st_op_disabled_dependency_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)
+{
+ struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv;
+
+ /* nanoBTS is broken, doesn't follow TS 12.21. Opstart MUST be sent
+ during Dependency, so we simply move to OFFLINE state here to avoid
+ duplicating code */
+ if (trx->bts->type == GSM_BTS_TYPE_NANOBTS) {
+ nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_OFFLINE);
+ return;
+ }
+ configure_loop(trx, &trx->bb_transc.mo.nm_state, false);
+}
+
+static void st_op_disabled_dependency(struct osmo_fsm_inst *fi, uint32_t event, void *data)
+{
+ struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv;
+ struct nm_statechg_signal_data *nsd;
+ struct gsm_nm_state *new_state;
+
+ switch (event) {
+ case NM_BB_TRANSC_EV_STATE_CHG_REP:
+ nsd = (struct nm_statechg_signal_data *)data;
+ new_state = nsd->new_state;
+ if (new_state->operational == NM_OPSTATE_ENABLED) {
+ /* should not happen... */
+ nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_ENABLED);
+ return;
+ }
+ switch (new_state->availability) { /* operational = DISABLED */
+ case NM_AVSTATE_NOT_INSTALLED:
+ case NM_AVSTATE_POWER_OFF:
+ nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED);
+ return;
+ case NM_AVSTATE_OFF_LINE:
+ case NM_AVSTATE_OK:
+ nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_OFFLINE);
+ return;
+ case NM_AVSTATE_DEPENDENCY:
+ configure_loop(trx, new_state, false);
+ return;
+ default:
+ return;
+ }
+ default:
+ OSMO_ASSERT(0);
+ }
+}
+
+static void st_op_disabled_offline_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)
+{
+ struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv;
+
+ /* Warning: In here we may be acessing an state older than new_state
+ from prev (syncrhonous) FSM state */
+ configure_loop(trx, &trx->bb_transc.mo.nm_state, true);
+}
+
+static void st_op_disabled_offline(struct osmo_fsm_inst *fi, uint32_t event, void *data)
+{
+ struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv;
+ struct nm_statechg_signal_data *nsd;
+ struct gsm_nm_state *new_state;
+
+ switch (event) {
+ case NM_BB_TRANSC_EV_STATE_CHG_REP:
+ nsd = (struct nm_statechg_signal_data *)data;
+ new_state = nsd->new_state;
+ if (new_state->operational == NM_OPSTATE_ENABLED) {
+ nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_ENABLED);
+ return;
+ }
+ switch (new_state->availability) { /* operational = DISABLED */
+ case NM_AVSTATE_NOT_INSTALLED:
+ case NM_AVSTATE_POWER_OFF:
+ nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED);
+ return;
+ case NM_AVSTATE_DEPENDENCY:
+ /* There's no point in moving back to Dependency in nanoBTS, since it's broken
+ and it acts actually as if it was in Offline state */
+ if (trx->bts->type != GSM_BTS_TYPE_NANOBTS) {
+ nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_DEPENDENCY);
+ } else {
+ /* Moreover, in nanoBTS we need to check here for tx
+ Opstart since we may have gone Unlocked state
+ in this event, which means Opstart may be txed here. */
+ configure_loop(trx, new_state, true);
+ }
+ return;
+ case NM_AVSTATE_OFF_LINE:
+ case NM_AVSTATE_OK:
+ configure_loop(trx, new_state, true);
+ return;
+ default:
+ return;
+ }
+ default:
+ OSMO_ASSERT(0);
+ }
+}
+
+static void st_op_enabled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)
+{
+ struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv;
+
+ /* Reset state, we don't need it in this state and it will need to be
+ reused as soon as we move back to Disabled */
+ trx->bb_transc.opstart_sent = false;
+ trx->bb_transc.adm_unlock_sent = false;
+}
+
+static void st_op_enabled(struct osmo_fsm_inst *fi, uint32_t event, void *data)
+{
+ struct nm_statechg_signal_data *nsd;
+ struct gsm_nm_state *new_state;
+
+ switch (event) {
+ case NM_BB_TRANSC_EV_STATE_CHG_REP:
+ nsd = (struct nm_statechg_signal_data *)data;
+ new_state = nsd->new_state;
+ if (new_state->operational == NM_OPSTATE_ENABLED)
+ return;
+ switch (new_state->availability) { /* operational = DISABLED */
+ case NM_AVSTATE_NOT_INSTALLED:
+ case NM_AVSTATE_POWER_OFF:
+ nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED);
+ return;
+ case NM_AVSTATE_DEPENDENCY:
+ nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_DEPENDENCY);
+ return;
+ case NM_AVSTATE_OFF_LINE:
+ case NM_AVSTATE_OK:
+ nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_OFFLINE);
+ return;
+ default:
+ return;
+ }
+ default:
+ OSMO_ASSERT(0);
+ }
+}
+
+static void st_op_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data)
+{
+ struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv;
+
+ switch (event) {
+ case NM_BB_TRANSC_EV_OPSTART_ACK:
+ case NM_BB_TRANSC_EV_OPSTART_NACK:
+ /* TODO: if on state OFFLINE and rx NACK, try again? */
+ trx->bb_transc.opstart_sent = false;
+ break;
+ case NM_BB_TRANSC_EV_OML_DOWN:
+ nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED);
+ break;
+ default:
+ OSMO_ASSERT(0);
+ }
+}
+
+static struct osmo_fsm_state nm_bb_transc_fsm_states[] = {
+ [NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED] = {
+ .in_event_mask =
+ X(NM_BB_TRANSC_EV_SW_ACT_REP) |
+ X(NM_BB_TRANSC_EV_STATE_CHG_REP),
+ .out_state_mask =
+ X(NM_BB_TRANSC_ST_OP_DISABLED_DEPENDENCY) |
+ X(NM_BB_TRANSC_ST_OP_DISABLED_OFFLINE) |
+ X(NM_BB_TRANSC_ST_OP_ENABLED),
+ .name = "DISABLED_NOTINSTALLED",
+ .onenter = st_op_disabled_notinstalled_on_enter,
+ .action = st_op_disabled_notinstalled,
+ },
+ [NM_BB_TRANSC_ST_OP_DISABLED_DEPENDENCY] = {
+ .in_event_mask =
+ X(NM_BB_TRANSC_EV_STATE_CHG_REP),
+ .out_state_mask =
+ X(NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED) |
+ X(NM_BB_TRANSC_ST_OP_DISABLED_OFFLINE) |
+ X(NM_BB_TRANSC_ST_OP_ENABLED),
+ .name = "DISABLED_DEPENDENCY",
+ .onenter = st_op_disabled_dependency_on_enter,
+ .action = st_op_disabled_dependency,
+ },
+ [NM_BB_TRANSC_ST_OP_DISABLED_OFFLINE] = {
+ .in_event_mask =
+ X(NM_BB_TRANSC_EV_STATE_CHG_REP),
+ .out_state_mask =
+ X(NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED) |
+ X(NM_BB_TRANSC_ST_OP_DISABLED_DEPENDENCY) |
+ X(NM_BB_TRANSC_ST_OP_ENABLED),
+ .name = "DISABLED_OFFLINE",
+ .onenter = st_op_disabled_offline_on_enter,
+ .action = st_op_disabled_offline,
+ },
+ [NM_BB_TRANSC_ST_OP_ENABLED] = {
+ .in_event_mask =
+ X(NM_BB_TRANSC_EV_STATE_CHG_REP),
+ .out_state_mask =
+ X(NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED) |
+ X(NM_BB_TRANSC_ST_OP_DISABLED_DEPENDENCY) |
+ X(NM_BB_TRANSC_ST_OP_DISABLED_OFFLINE),
+ .name = "ENABLED",
+ .onenter = st_op_enabled_on_enter,
+ .action = st_op_enabled,
+ },
+};
+
+const struct value_string nm_bb_transc_fsm_event_names[] = {
+ { NM_BB_TRANSC_EV_SW_ACT_REP, "SW_ACT_REP" },
+ { NM_BB_TRANSC_EV_STATE_CHG_REP, "STATE_CHG_REP" },
+ { NM_BB_TRANSC_EV_OPSTART_ACK, "OPSTART_ACK" },
+ { NM_BB_TRANSC_EV_OPSTART_NACK, "OPSTART_NACK" },
+ { NM_BB_TRANSC_EV_OML_DOWN, "OML_DOWN" },
+ { 0, NULL }
+};
+
+struct osmo_fsm nm_bb_transc_fsm = {
+ .name = "NM_BB_TRANSC_OP",
+ .states = nm_bb_transc_fsm_states,
+ .num_states = ARRAY_SIZE(nm_bb_transc_fsm_states),
+ .allstate_event_mask =
+ X(NM_BB_TRANSC_EV_OPSTART_ACK) |
+ X(NM_BB_TRANSC_EV_OPSTART_NACK) |
+ X(NM_BB_TRANSC_EV_OML_DOWN),
+ .allstate_action = st_op_allstate,
+ .event_names = nm_bb_transc_fsm_event_names,
+ .log_subsys = DNM,
+};
+
+static __attribute__((constructor)) void nm_bb_transc_fsm_init(void)
+{
+ OSMO_ASSERT(osmo_fsm_register(&nm_bb_transc_fsm) == 0);
+}
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 7040989..f7349a1 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -58,6 +58,7 @@
$(top_builddir)/src/osmo-bsc/net_init.o \
$(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \
$(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \
+ $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOABIS_LIBS) \
@@ -131,6 +132,7 @@
$(top_builddir)/src/osmo-bsc/gsm_data.o \
$(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \
$(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \
+ $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOABIS_LIBS) \
diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am
index 1a4b4d7..1027e4a 100644
--- a/tests/abis/Makefile.am
+++ b/tests/abis/Makefile.am
@@ -34,6 +34,7 @@
$(top_builddir)/src/osmo-bsc/net_init.o \
$(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \
$(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \
+ $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOABIS_LIBS) \
$(LIBOSMOGSM_LIBS) \
diff --git a/tests/acc/Makefile.am b/tests/acc/Makefile.am
index b8372c1..5ab48e5 100644
--- a/tests/acc/Makefile.am
+++ b/tests/acc/Makefile.am
@@ -34,6 +34,7 @@
$(top_builddir)/src/osmo-bsc/net_init.o \
$(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \
$(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \
+ $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOABIS_LIBS) \
$(LIBOSMOGSM_LIBS) \
diff --git a/tests/acc/acc_test.ok b/tests/acc/acc_test.ok
index 832c7f5..1060505 100644
--- a/tests/acc/acc_test.ok
+++ b/tests/acc/acc_test.ok
@@ -1,6 +1,7 @@
===test_acc_mgr_no_ramp===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_mgr_no_ramp()
do_allowed_len_adm_loop(1)
@@ -109,10 +110,12 @@
pcu_info_update(): t2=0x00 t3=0x00, allowed: 0 1 2 3 4 5 6 7 8 9
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_mgr_no_ramp()
===test_acc_mgr_manual_ramp===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_mgr_manual_ramp()
do_allowed_len_ramp_loop(1)
@@ -351,10 +354,12 @@
pcu_info_update(): t2=0x01 t3=0xb3, allowed: 2 3 6 9
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_mgr_manual_ramp()
===test_acc_mgr_rotate(true, 1)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_mgr_rotate()
*** Barring one ACC ***
@@ -424,10 +429,12 @@
pcu_info_update(): t2=0x03 t3=0xfd, allowed: 1
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_mgr_rotate()
===test_acc_mgr_rotate(false, 1)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_mgr_rotate()
(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x200 (active_len=1, ramp_len=10, adm_len=1, perm_len=10, rotation=on)
@@ -494,10 +501,12 @@
pcu_info_update(): t2=0x01 t3=0xff, allowed: 9
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_mgr_rotate()
===test_acc_mgr_rotate(true, 2)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_mgr_rotate()
*** Barring one ACC ***
@@ -567,10 +576,12 @@
pcu_info_update(): t2=0x03 t3=0xfc, allowed: 0 1
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_mgr_rotate()
===test_acc_mgr_rotate(false, 2)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_mgr_rotate()
(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x300 (active_len=2, ramp_len=10, adm_len=2, perm_len=10, rotation=on)
@@ -637,10 +648,12 @@
pcu_info_update(): t2=0x00 t3=0xff, allowed: 8 9
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_mgr_rotate()
===test_acc_mgr_rotate(true, 3)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_mgr_rotate()
*** Barring one ACC ***
@@ -710,10 +723,12 @@
pcu_info_update(): t2=0x02 t3=0xfc, allowed: 0 1 8
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_mgr_rotate()
===test_acc_mgr_rotate(false, 3)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_mgr_rotate()
(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x380 (active_len=3, ramp_len=10, adm_len=3, perm_len=10, rotation=on)
@@ -780,10 +795,12 @@
pcu_info_update(): t2=0x00 t3=0x7f, allowed: 7 8 9
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_mgr_rotate()
===test_acc_mgr_rotate(true, 4)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_mgr_rotate()
*** Barring one ACC ***
@@ -853,10 +870,12 @@
pcu_info_update(): t2=0x02 t3=0x7c, allowed: 0 1 7 8
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_mgr_rotate()
===test_acc_mgr_rotate(false, 4)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_mgr_rotate()
(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3c0 (active_len=4, ramp_len=10, adm_len=4, perm_len=10, rotation=on)
@@ -923,10 +942,12 @@
pcu_info_update(): t2=0x00 t3=0x3f, allowed: 6 7 8 9
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_mgr_rotate()
===test_acc_mgr_rotate(true, 5)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_mgr_rotate()
*** Barring one ACC ***
@@ -996,10 +1017,12 @@
pcu_info_update(): t2=0x02 t3=0x3c, allowed: 0 1 6 7 8
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_mgr_rotate()
===test_acc_mgr_rotate(false, 5)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_mgr_rotate()
(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3e0 (active_len=5, ramp_len=10, adm_len=5, perm_len=10, rotation=on)
@@ -1066,10 +1089,12 @@
pcu_info_update(): t2=0x00 t3=0x1f, allowed: 5 6 7 8 9
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_mgr_rotate()
===test_acc_mgr_rotate(true, 6)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_mgr_rotate()
*** Barring one ACC ***
@@ -1139,10 +1164,12 @@
pcu_info_update(): t2=0x02 t3=0x1c, allowed: 0 1 5 6 7 8
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_mgr_rotate()
===test_acc_mgr_rotate(false, 6)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_mgr_rotate()
(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3f0 (active_len=6, ramp_len=10, adm_len=6, perm_len=10, rotation=on)
@@ -1209,10 +1236,12 @@
pcu_info_update(): t2=0x00 t3=0x0f, allowed: 4 5 6 7 8 9
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_mgr_rotate()
===test_acc_mgr_rotate(true, 7)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_mgr_rotate()
*** Barring one ACC ***
@@ -1282,10 +1311,12 @@
pcu_info_update(): t2=0x02 t3=0x0c, allowed: 0 1 4 5 6 7 8
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_mgr_rotate()
===test_acc_mgr_rotate(false, 7)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_mgr_rotate()
(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3f8 (active_len=7, ramp_len=10, adm_len=7, perm_len=10, rotation=on)
@@ -1352,10 +1383,12 @@
pcu_info_update(): t2=0x00 t3=0x07, allowed: 3 4 5 6 7 8 9
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_mgr_rotate()
===test_acc_mgr_rotate(true, 8)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_mgr_rotate()
*** Barring one ACC ***
@@ -1425,10 +1458,12 @@
pcu_info_update(): t2=0x02 t3=0x04, allowed: 0 1 3 4 5 6 7 8
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_mgr_rotate()
===test_acc_mgr_rotate(false, 8)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_mgr_rotate()
(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3fc (active_len=8, ramp_len=10, adm_len=8, perm_len=10, rotation=on)
@@ -1495,10 +1530,12 @@
pcu_info_update(): t2=0x00 t3=0x03, allowed: 2 3 4 5 6 7 8 9
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_mgr_rotate()
===test_acc_mgr_rotate(false, 9)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_mgr_rotate()
(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3fe (active_len=9, ramp_len=10, adm_len=9, perm_len=10, rotation=on)
@@ -1565,10 +1602,12 @@
pcu_info_update(): t2=0x00 t3=0x01, allowed: 1 2 3 4 5 6 7 8 9
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_mgr_rotate()
===test_acc_ramp===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_ramp()
(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off)
@@ -1604,10 +1643,12 @@
pcu_info_update(): t2=0x00 t3=0x00, allowed: 0 1 2 3 4 5 6 7 8 9
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_ramp()
===test_acc_ramp2===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_ramp2()
(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3f8 (active_len=7, ramp_len=10, adm_len=7, perm_len=10, rotation=on)
@@ -1625,10 +1666,12 @@
sys={15.000000}: select()
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_ramp2()
===test_acc_ramp3===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_ramp3()
*** Barring some ACCs ***
@@ -1662,10 +1705,12 @@
(bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=10, adm_len=10, perm_len=5, rotation=off)
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_ramp3()
===test_acc_ramp_up_rotate(0, 100, 100)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_ramp_up_rotate()
*** Barring one ACC ***
@@ -1755,10 +1800,12 @@
sys={3250.000000}: select()
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_ramp_up_rotate()
===test_acc_ramp_up_rotate(0, 20, 50)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_ramp_up_rotate()
*** Barring one ACC ***
@@ -1848,10 +1895,12 @@
sys={3250.000000}: select()
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_ramp_up_rotate()
===test_acc_ramp_up_rotate(70, 80, 90)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_ramp_up_rotate()
*** Barring one ACC ***
@@ -1941,10 +1990,12 @@
sys={3250.000000}: select()
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_ramp_up_rotate()
===test_acc_ramp_updown_rotate(80, 90, 0, 100, 15)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_ramp_updown_rotate()
*** Barring one ACC ***
@@ -2064,10 +2115,12 @@
sys={7500.000000}: select(49): chan_load_avg=100
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_ramp_updown_rotate()
===test_acc_ramp_updown_rotate(30, 50, 10, 100, 15)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_ramp_updown_rotate()
*** Barring one ACC ***
@@ -2211,10 +2264,12 @@
pcu_info_update(): t2=0x03 t3=0xf9, allowed: 1 2
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_ramp_updown_rotate()
===test_acc_ramp_updown_rotate(50, 49, 0, 100, 10)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_ramp_updown_rotate()
*** Barring one ACC ***
@@ -2368,10 +2423,12 @@
pcu_info_update(): t2=0x03 t3=0xc7, allowed: 3 4 5
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_ramp_updown_rotate()
===test_acc_ramp_updown_rotate(30, 80, 30, 80, 5)===
NM_BTS_OP{DISABLED_NOTINSTALLED}: Allocated
NM_BTS_SM_OP{DISABLED_NOTINSTALLED}: Allocated
+NM_BB_TRANSC_OP{DISABLED_NOTINSTALLED}: Allocated
(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)
BTS allocation OK in test_acc_ramp_updown_rotate()
*** Barring one ACC ***
@@ -2431,4 +2488,5 @@
sys={12500.000000}: select(49): chan_load_avg=75
NM_BTS_SM_OP(bts_sm0){DISABLED_NOTINSTALLED}: Deallocated
NM_BTS_OP(bts0){DISABLED_NOTINSTALLED}: Deallocated
+NM_BB_TRANSC_OP(bts0-trx0){DISABLED_NOTINSTALLED}: Deallocated
BTS deallocated OK in test_acc_ramp_updown_rotate()
diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am
index 1fd7396..a0157d9 100644
--- a/tests/bsc/Makefile.am
+++ b/tests/bsc/Makefile.am
@@ -48,6 +48,7 @@
$(top_builddir)/src/osmo-bsc/net_init.o \
$(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \
$(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \
+ $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOVTY_LIBS) \
diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am
index 1cbaca5..5b265f0 100644
--- a/tests/gsm0408/Makefile.am
+++ b/tests/gsm0408/Makefile.am
@@ -37,6 +37,7 @@
$(top_builddir)/src/osmo-bsc/neighbor_ident.o \
$(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \
$(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \
+ $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOABIS_LIBS) \
diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am
index e478882..abd1e14 100644
--- a/tests/handover/Makefile.am
+++ b/tests/handover/Makefile.am
@@ -82,6 +82,7 @@
$(top_builddir)/src/osmo-bsc/net_init.o \
$(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \
$(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \
+ $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \
$(top_builddir)/src/osmo-bsc/osmo_bsc_ctrl.o \
$(top_builddir)/src/osmo-bsc/osmo_bsc_lcls.o \
$(top_builddir)/src/osmo-bsc/osmo_bsc_mgcp.o \
diff --git a/tests/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am
index 5f65337..52ded6b 100644
--- a/tests/nanobts_omlattr/Makefile.am
+++ b/tests/nanobts_omlattr/Makefile.am
@@ -31,6 +31,7 @@
$(top_builddir)/src/osmo-bsc/gsm_data.o \
$(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \
$(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \
+ $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOABIS_LIBS) \
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20402
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ib4d35316c52eb4c71ea0d352a1e06fd5e600fe08
Gerrit-Change-Number: 20402
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201002/97b696c7/attachment.htm>