Move struct gsm_bts_trx: gsm-data.* => bts_trx.*

See rant fro similar recent commit moving stuff to bts.*.

Change-Id: I11758ca3d255d849d77bd068f24bb68bde1f89a5

8 files changed, 297 insertions, 257 deletions

diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am
index 273530cf5..a1812a9f3 100644
--- a/src/ipaccess/Makefile.am
+++ b/src/ipaccess/Makefile.am
@@ -47,6 +47,7 @@ ipaccess_config_SOURCES = \
 # FIXME: resolve the bogus dependencies patched around here:
 ipaccess_config_LDADD = \
 	$(top_builddir)/src/osmo-bsc/bts.o \
+	$(top_builddir)/src/osmo-bsc/bts_trx.o \
 	$(top_builddir)/src/osmo-bsc/abis_nm.o \
 	$(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \
 	$(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \
@@ -61,7 +62,9 @@ ipaccess_proxy_SOURCES = \
 	$(NULL)
 
 ipaccess_proxy_LDADD = \
+	$(top_builddir)/src/osmo-bsc/abis_nm.o \
 	$(top_builddir)/src/osmo-bsc/bts.o \
+	$(top_builddir)/src/osmo-bsc/bts_trx.o \
 	$(top_builddir)/src/osmo-bsc/gsm_data.o \
 	$(OSMO_LIBS) \
 	$(NULL)
diff --git a/src/ipaccess/network_listen.c b/src/ipaccess/network_listen.c
index bbaf79810..e9f5c93b0 100644
--- a/src/ipaccess/network_listen.c
+++ b/src/ipaccess/network_listen.c
@@ -34,6 +34,7 @@
 #include <osmocom/gsm/gsm48_ie.h>
 
 #include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/bts_trx.h>
 #include <osmocom/bsc/abis_nm.h>
 #include <osmocom/bsc/signal.h>
 #include <osmocom/bsc/debug.h>
diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am
index f66421ac3..231707cd7 100644
--- a/src/osmo-bsc/Makefile.am
+++ b/src/osmo-bsc/Makefile.am
@@ -44,6 +44,7 @@ osmo_bsc_SOURCES = \
 	bsc_subscriber.c \
 	bsc_vty.c \
 	bts.c \
+	bts_trx.c \
 	bts_ericsson_rbs2000.c \
 	bts_init.c \
 	bts_ipaccess_nanobts.c \
diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c
index 19eed8cf7..d88ce248a 100644
--- a/src/osmo-bsc/abis_nm.c
+++ b/src/osmo-bsc/abis_nm.c
@@ -3020,26 +3020,6 @@ void abis_nm_ipaccess_cgi(uint8_t *buf, struct gsm_bts *bts)
 	memcpy(&_buf->rac, &ci, sizeof(ci));
 }
 
-void gsm_trx_lock_rf(struct gsm_bts_trx *trx, bool locked, const char *reason)
-{
-	uint8_t new_state = locked ? NM_STATE_LOCKED : NM_STATE_UNLOCKED;
-
-
-	if (!trx->bts || !trx->bts->oml_link) {
-		/* Set initial state which will be sent when BTS connects. */
-		trx->mo.nm_state.administrative = new_state;
-		return;
-	}
-
-	LOG_TRX(trx, DNM, LOGL_NOTICE, "Requesting administrative state change %s -> %s [%s]\n",
-	     get_value_string(abis_nm_adm_state_names, trx->mo.nm_state.administrative),
-	     get_value_string(abis_nm_adm_state_names, new_state), reason);
-
-	abis_nm_chg_adm_state(trx->bts, NM_OC_RADIO_CARRIER,
-			      trx->bts->bts_nr, trx->nr, 0xff,
-			      new_state);
-}
-
 static const struct value_string ipacc_testres_names[] = {
 	{ NM_IPACC_TESTRES_SUCCESS,	"SUCCESS" },
 	{ NM_IPACC_TESTRES_TIMEOUT,	"TIMEOUT" },
diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c
index 72f24749f..9b1fb3fde 100644
--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c
+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c
@@ -28,6 +28,7 @@
 #include <osmocom/bsc/a_reset.h>
 #include <osmocom/bsc/gsm_08_08.h>
 #include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/bts.h>
 #include <osmocom/bsc/handover_fsm.h>
 #include <osmocom/bsc/lchan_fsm.h>
 #include <osmocom/bsc/lchan_rtp_fsm.h>
diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c
new file mode 100644
index 000000000..15d5b5945
--- /dev/null
+++ b/src/osmo-bsc/bts_trx.c
@@ -0,0 +1,288 @@
+/* (C) 2008-2018 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2020 by sysmocom s.f.m.c. GmbH <info@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 Affero 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 <osmocom/gsm/abis_nm.h>
+
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/bts.h>
+#include <osmocom/bsc/bts_trx.h>
+#include <osmocom/bsc/timeslot_fsm.h>
+#include <osmocom/bsc/abis_nm.h>
+#include <osmocom/bsc/lchan_fsm.h>
+#include <osmocom/bsc/debug.h>
+
+struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts)
+{
+	struct gsm_bts_trx *trx = talloc_zero(bts, struct gsm_bts_trx);
+	int k;
+
+	if (!trx)
+		return NULL;
+
+	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);
+	gsm_mo_init(&trx->bb_transc.mo, bts, NM_OC_BASEB_TRANSC,
+		    bts->nr, trx->nr, 0xff);
+
+	for (k = 0; k < TRX_NR_TS; k++) {
+		struct gsm_bts_trx_ts *ts = &trx->ts[k];
+		int l;
+
+
+		ts->trx = trx;
+		ts->nr = k;
+		ts->pchan_from_config = ts->pchan_on_init = ts->pchan_is = GSM_PCHAN_NONE;
+		ts->tsc = -1;
+
+		ts_fsm_alloc(ts);
+
+		gsm_mo_init(&ts->mo, bts, NM_OC_CHANNEL,
+			    bts->nr, trx->nr, ts->nr);
+
+		ts->hopping.arfcns.data_len = sizeof(ts->hopping.arfcns_data);
+		ts->hopping.arfcns.data = ts->hopping.arfcns_data;
+		ts->hopping.ma.data_len = sizeof(ts->hopping.ma_data);
+		ts->hopping.ma.data = ts->hopping.ma_data;
+
+		for (l = 0; l < TS_MAX_LCHAN; l++) {
+			struct gsm_lchan *lchan;
+			char *name;
+			lchan = &ts->lchan[l];
+
+			lchan->ts = ts;
+			lchan->nr = l;
+			lchan->type = GSM_LCHAN_NONE;
+
+			name = gsm_lchan_name_compute(lchan);
+			lchan->name = talloc_strdup(trx, name);
+		}
+	}
+
+	if (trx->nr != 0)
+		trx->nominal_power = bts->c0->nominal_power;
+
+	llist_add_tail(&trx->list, &bts->trx_list);
+
+	return trx;
+}
+
+static char ts2str[255];
+
+char *gsm_trx_name(const struct gsm_bts_trx *trx)
+{
+	if (!trx)
+		snprintf(ts2str, sizeof(ts2str), "(trx=NULL)");
+	else
+		snprintf(ts2str, sizeof(ts2str), "(bts=%d,trx=%d)",
+			 trx->bts->nr, trx->nr);
+
+	return ts2str;
+}
+
+/* determine logical channel based on TRX and channel number IE */
+struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr,
+				   int *rc)
+{
+	uint8_t ts_nr = chan_nr & 0x07;
+	uint8_t cbits = chan_nr >> 3;
+	uint8_t lch_idx;
+	struct gsm_bts_trx_ts *ts = &trx->ts[ts_nr];
+	bool ok;
+
+	if (rc)
+		*rc = -EINVAL;
+
+	if (cbits == 0x01) {
+		lch_idx = 0;	/* TCH/F */
+		ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_TCH_F)
+			|| ts->pchan_on_init == GSM_PCHAN_PDCH; /* PDCH? really? */
+	} else if ((cbits & 0x1e) == 0x02) {
+		lch_idx = cbits & 0x1;	/* TCH/H */
+		ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_TCH_H);
+	} else if ((cbits & 0x1c) == 0x04) {
+		lch_idx = cbits & 0x3;	/* SDCCH/4 */
+		ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_CCCH_SDCCH4);
+	} else if ((cbits & 0x18) == 0x08) {
+		lch_idx = cbits & 0x7;	/* SDCCH/8 */
+		ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_SDCCH8_SACCH8C);
+	} else if (cbits == 0x10 || cbits == 0x11 || cbits == 0x12) {
+		lch_idx = 0; /* CCCH? */
+		ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_CCCH);
+		/* FIXME: we should not return first sdcch4 !!! */
+	} else if ((chan_nr & RSL_CHAN_NR_MASK) == RSL_CHAN_OSMO_PDCH) {
+		lch_idx = 0;
+		ok = (ts->pchan_on_init == GSM_PCHAN_TCH_F_TCH_H_PDCH);
+	} else
+		return NULL;
+
+	if (rc && ok)
+		*rc = 0;
+
+	return &ts->lchan[lch_idx];
+}
+
+void gsm_trx_lock_rf(struct gsm_bts_trx *trx, bool locked, const char *reason)
+{
+	uint8_t new_state = locked ? NM_STATE_LOCKED : NM_STATE_UNLOCKED;
+
+
+	if (!trx->bts || !trx->bts->oml_link) {
+		/* Set initial state which will be sent when BTS connects. */
+		trx->mo.nm_state.administrative = new_state;
+		return;
+	}
+
+	LOG_TRX(trx, DNM, LOGL_NOTICE, "Requesting administrative state change %s -> %s [%s]\n",
+	     get_value_string(abis_nm_adm_state_names, trx->mo.nm_state.administrative),
+	     get_value_string(abis_nm_adm_state_names, new_state), reason);
+
+	abis_nm_chg_adm_state(trx->bts, NM_OC_RADIO_CARRIER,
+			      trx->bts->bts_nr, trx->nr, 0xff,
+			      new_state);
+}
+
+bool trx_is_usable(const struct gsm_bts_trx *trx)
+{
+	/* FIXME: How does this behave for BS-11 ? */
+	if (is_ipaccess_bts(trx->bts)) {
+		if (!nm_is_running(&trx->mo.nm_state) ||
+		    !nm_is_running(&trx->bb_transc.mo.nm_state))
+			return false;
+	} else if (is_ericsson_bts(trx->bts)) {
+		/* The OM2000 -> 12.21 mapping we do doesn't have separate bb_transc MO */
+		if (!nm_is_running(&trx->mo.nm_state))
+			return false;
+	}
+
+	return true;
+}
+
+
+void gsm_trx_all_ts_dispatch(struct gsm_bts_trx *trx, uint32_t ts_ev, void *data)
+{
+	int i;
+	for (i = 0; i < ARRAY_SIZE(trx->ts); i++) {
+		struct gsm_bts_trx_ts *ts = &trx->ts[i];
+		osmo_fsm_inst_dispatch(ts->fi, ts_ev, data);
+	}
+}
+
+int trx_count_free_ts(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan)
+{
+	struct gsm_bts_trx_ts *ts;
+	struct gsm_lchan *lchan;
+	int j;
+	int count = 0;
+
+	if (!trx_is_usable(trx))
+		return 0;
+
+	for (j = 0; j < ARRAY_SIZE(trx->ts); j++) {
+		ts = &trx->ts[j];
+		if (!ts_is_usable(ts))
+			continue;
+
+		if (ts->pchan_is == GSM_PCHAN_PDCH) {
+			/* Dynamic timeslots in PDCH mode will become TCH if needed. */
+			switch (ts->pchan_on_init) {
+			case GSM_PCHAN_TCH_F_PDCH:
+				if (pchan == GSM_PCHAN_TCH_F)
+					count++;
+				continue;
+
+			case GSM_PCHAN_TCH_F_TCH_H_PDCH:
+				if (pchan == GSM_PCHAN_TCH_F)
+					count++;
+				else if (pchan == GSM_PCHAN_TCH_H)
+					count += 2;
+				continue;
+
+			default:
+				/* Not dynamic, not applicable. */
+				continue;
+			}
+		}
+
+		if (ts->pchan_is != pchan)
+			continue;
+
+		ts_for_each_lchan(lchan, ts) {
+			if (lchan_state_is(lchan, LCHAN_ST_UNUSED))
+				count++;
+		}
+	}
+
+	return count;
+}
+
+bool trx_has_valid_pchan_config(const struct gsm_bts_trx *trx)
+{
+	bool combined = false;
+	bool result = true;
+	unsigned int i;
+
+	/* Iterate over all timeslots */
+	for (i = 0; i < 8; i++) {
+		const struct gsm_bts_trx_ts *ts = &trx->ts[i];
+
+		switch (ts->pchan_from_config) {
+		case GSM_PCHAN_CCCH_SDCCH4_CBCH:
+		case GSM_PCHAN_CCCH_SDCCH4:
+			/* CCCH+SDCCH4 can only be configured on TS0 */
+			if (i > 0) {
+				LOGP(DNM, LOGL_ERROR, "Combined CCCH is not allowed "
+						      "on TS%u > 0\n", i);
+				result = false;
+			}
+			if (i == 0)
+				combined = true;
+			/* fall-through */
+		case GSM_PCHAN_CCCH:
+			/* 3GPP TS 45.002, Table 3, CCCH: TS (0, 2, 4, 6) */
+			if (i % 2 != 0) {
+				LOGP(DNM, LOGL_ERROR, "%s is not allowed on odd TS%u\n",
+				     gsm_pchan_name(ts->pchan_from_config), i);
+				result = false;
+			}
+
+			/* There can be no more CCCHs if TS0/C0 is combined */
+			if (i > 0 && combined) {
+				LOGP(DNM, LOGL_ERROR, "%s is not allowed on TS%u, "
+				     "because TS0 is using combined channel configuration\n",
+				     gsm_pchan_name(ts->pchan_from_config), i);
+				result = false;
+			}
+			break;
+
+		default:
+			/* CCCH on TS0 is mandatory for C0 */
+			if (trx->bts->c0 == trx && i == 0) {
+				LOGP(DNM, LOGL_ERROR, "TS0 on C0 must be CCCH/BCCH\n");
+				result = false;
+			}
+		}
+	}
+
+	return result;
+}
diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c
index 5daee2614..c0c8cf6e1 100644
--- a/src/osmo-bsc/gsm_data.c
+++ b/src/osmo-bsc/gsm_data.c
@@ -290,79 +290,8 @@ struct gsm_bts *gsm_bts_by_cell_id(const struct gsm_network *net,
 	return NULL;
 }
 
-struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts)
-{
-	struct gsm_bts_trx *trx = talloc_zero(bts, struct gsm_bts_trx);
-	int k;
-
-	if (!trx)
-		return NULL;
-
-	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);
-	gsm_mo_init(&trx->bb_transc.mo, bts, NM_OC_BASEB_TRANSC,
-		    bts->nr, trx->nr, 0xff);
-
-	for (k = 0; k < TRX_NR_TS; k++) {
-		struct gsm_bts_trx_ts *ts = &trx->ts[k];
-		int l;
-
-
-		ts->trx = trx;
-		ts->nr = k;
-		ts->pchan_from_config = ts->pchan_on_init = ts->pchan_is = GSM_PCHAN_NONE;
-		ts->tsc = -1;
-
-		ts_fsm_alloc(ts);
-
-		gsm_mo_init(&ts->mo, bts, NM_OC_CHANNEL,
-			    bts->nr, trx->nr, ts->nr);
-
-		ts->hopping.arfcns.data_len = sizeof(ts->hopping.arfcns_data);
-		ts->hopping.arfcns.data = ts->hopping.arfcns_data;
-		ts->hopping.ma.data_len = sizeof(ts->hopping.ma_data);
-		ts->hopping.ma.data = ts->hopping.ma_data;
-
-		for (l = 0; l < TS_MAX_LCHAN; l++) {
-			struct gsm_lchan *lchan;
-			char *name;
-			lchan = &ts->lchan[l];
-
-			lchan->ts = ts;
-			lchan->nr = l;
-			lchan->type = GSM_LCHAN_NONE;
-
-			name = gsm_lchan_name_compute(lchan);
-			lchan->name = talloc_strdup(trx, name);
-		}
-	}
-
-	if (trx->nr != 0)
-		trx->nominal_power = bts->c0->nominal_power;
-
-	llist_add_tail(&trx->list, &bts->trx_list);
-
-	return trx;
-}
-
 static char ts2str[255];
 
-char *gsm_trx_name(const struct gsm_bts_trx *trx)
-{
-	if (!trx)
-		snprintf(ts2str, sizeof(ts2str), "(trx=NULL)");
-	else
-		snprintf(ts2str, sizeof(ts2str), "(bts=%d,trx=%d)",
-			 trx->bts->nr, trx->nr);
-
-	return ts2str;
-}
-
-
 char *gsm_ts_name(const struct gsm_bts_trx_ts *ts)
 {
 	snprintf(ts2str, sizeof(ts2str), "(bts=%d,trx=%d,ts=%d)",
@@ -620,48 +549,6 @@ uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan)
 	return gsm_pchan2chan_nr(lchan->ts->pchan_is, lchan->ts->nr, lchan->nr);
 }
 
-/* determine logical channel based on TRX and channel number IE */
-struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr,
-				   int *rc)
-{
-	uint8_t ts_nr = chan_nr & 0x07;
-	uint8_t cbits = chan_nr >> 3;
-	uint8_t lch_idx;
-	struct gsm_bts_trx_ts *ts = &trx->ts[ts_nr];
-	bool ok;
-
-	if (rc)
-		*rc = -EINVAL;
-
-	if (cbits == 0x01) {
-		lch_idx = 0;	/* TCH/F */
-		ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_TCH_F)
-			|| ts->pchan_on_init == GSM_PCHAN_PDCH; /* PDCH? really? */
-	} else if ((cbits & 0x1e) == 0x02) {
-		lch_idx = cbits & 0x1;	/* TCH/H */
-		ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_TCH_H);
-	} else if ((cbits & 0x1c) == 0x04) {
-		lch_idx = cbits & 0x3;	/* SDCCH/4 */
-		ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_CCCH_SDCCH4);
-	} else if ((cbits & 0x18) == 0x08) {
-		lch_idx = cbits & 0x7;	/* SDCCH/8 */
-		ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_SDCCH8_SACCH8C);
-	} else if (cbits == 0x10 || cbits == 0x11 || cbits == 0x12) {
-		lch_idx = 0; /* CCCH? */
-		ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_CCCH);
-		/* FIXME: we should not return first sdcch4 !!! */
-	} else if ((chan_nr & RSL_CHAN_NR_MASK) == RSL_CHAN_OSMO_PDCH) {
-		lch_idx = 0;
-		ok = (ts->pchan_on_init == GSM_PCHAN_TCH_F_TCH_H_PDCH);
-	} else
-		return NULL;
-
-	if (rc && ok)
-		*rc = 0;
-
-	return &ts->lchan[lch_idx];
-}
-
 static const uint8_t subslots_per_pchan[] = {
 	[GSM_PCHAN_NONE] = 0,
 	[GSM_PCHAN_CCCH] = 0,
@@ -708,31 +595,6 @@ struct gsm_bts *conn_get_bts(struct gsm_subscriber_connection *conn) {
 	return conn->lchan->ts->trx->bts;
 }
 
-bool trx_is_usable(const struct gsm_bts_trx *trx)
-{
-	/* FIXME: How does this behave for BS-11 ? */
-	if (is_ipaccess_bts(trx->bts)) {
-		if (!nm_is_running(&trx->mo.nm_state) ||
-		    !nm_is_running(&trx->bb_transc.mo.nm_state))
-			return false;
-	} else if (is_ericsson_bts(trx->bts)) {
-		/* The OM2000 -> 12.21 mapping we do doesn't have separate bb_transc MO */
-		if (!nm_is_running(&trx->mo.nm_state))
-			return false;
-	}
-
-	return true;
-}
-
-void gsm_trx_all_ts_dispatch(struct gsm_bts_trx *trx, uint32_t ts_ev, void *data)
-{
-	int i;
-	for (i = 0; i < ARRAY_SIZE(trx->ts); i++) {
-		struct gsm_bts_trx_ts *ts = &trx->ts[i];
-		osmo_fsm_inst_dispatch(ts->fi, ts_ev, data);
-	}
-}
-
 static void _chan_desc_fill_tail(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan)
 {
 	if (!lchan->ts->hopping.enabled) {
@@ -950,54 +812,6 @@ bool ts_is_capable_of_lchant(struct gsm_bts_trx_ts *ts, enum gsm_chan_t type)
 	}
 }
 
-int trx_count_free_ts(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan)
-{
-	struct gsm_bts_trx_ts *ts;
-	struct gsm_lchan *lchan;
-	int j;
-	int count = 0;
-
-	if (!trx_is_usable(trx))
-		return 0;
-
-	for (j = 0; j < ARRAY_SIZE(trx->ts); j++) {
-		ts = &trx->ts[j];
-		if (!ts_is_usable(ts))
-			continue;
-
-		if (ts->pchan_is == GSM_PCHAN_PDCH) {
-			/* Dynamic timeslots in PDCH mode will become TCH if needed. */
-			switch (ts->pchan_on_init) {
-			case GSM_PCHAN_TCH_F_PDCH:
-				if (pchan == GSM_PCHAN_TCH_F)
-					count++;
-				continue;
-
-			case GSM_PCHAN_TCH_F_TCH_H_PDCH:
-				if (pchan == GSM_PCHAN_TCH_F)
-					count++;
-				else if (pchan == GSM_PCHAN_TCH_H)
-					count += 2;
-				continue;
-
-			default:
-				/* Not dynamic, not applicable. */
-				continue;
-			}
-		}
-
-		if (ts->pchan_is != pchan)
-			continue;
-
-		ts_for_each_lchan(lchan, ts) {
-			if (lchan_state_is(lchan, LCHAN_ST_UNUSED))
-				count++;
-		}
-	}
-
-	return count;
-}
-
 bool ts_is_usable(const struct gsm_bts_trx_ts *ts)
 {
 	if (!trx_is_usable(ts->trx)) {
@@ -1095,57 +909,6 @@ const struct value_string lchan_activate_mode_names[] = {
 	{}
 };
 
-bool trx_has_valid_pchan_config(const struct gsm_bts_trx *trx)
-{
-	bool combined = false;
-	bool result = true;
-	unsigned int i;
-
-	/* Iterate over all timeslots */
-	for (i = 0; i < 8; i++) {
-		const struct gsm_bts_trx_ts *ts = &trx->ts[i];
-
-		switch (ts->pchan_from_config) {
-		case GSM_PCHAN_CCCH_SDCCH4_CBCH:
-		case GSM_PCHAN_CCCH_SDCCH4:
-			/* CCCH+SDCCH4 can only be configured on TS0 */
-			if (i > 0) {
-				LOGP(DNM, LOGL_ERROR, "Combined CCCH is not allowed "
-						      "on TS%u > 0\n", i);
-				result = false;
-			}
-			if (i == 0)
-				combined = true;
-			/* fall-through */
-		case GSM_PCHAN_CCCH:
-			/* 3GPP TS 45.002, Table 3, CCCH: TS (0, 2, 4, 6) */
-			if (i % 2 != 0) {
-				LOGP(DNM, LOGL_ERROR, "%s is not allowed on odd TS%u\n",
-				     gsm_pchan_name(ts->pchan_from_config), i);
-				result = false;
-			}
-
-			/* There can be no more CCCHs if TS0/C0 is combined */
-			if (i > 0 && combined) {
-				LOGP(DNM, LOGL_ERROR, "%s is not allowed on TS%u, "
-				     "because TS0 is using combined channel configuration\n",
-				     gsm_pchan_name(ts->pchan_from_config), i);
-				result = false;
-			}
-			break;
-
-		default:
-			/* CCCH on TS0 is mandatory for C0 */
-			if (trx->bts->c0 == trx && i == 0) {
-				LOGP(DNM, LOGL_ERROR, "TS0 on C0 must be CCCH/BCCH\n");
-				result = false;
-			}
-		}
-	}
-
-	return result;
-}
-
 /* This may be specific to RR Channel Release, and the mappings were chosen by pure naive guessing without a proper
  * specification available. */
 enum gsm48_rr_cause bsc_gsm48_rr_cause_from_gsm0808_cause(enum gsm0808_cause c)
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 669667971..653ed97bf 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -49,6 +49,7 @@ bs11_config_SOURCES = \
 bs11_config_LDADD = \
 	$(top_builddir)/src/osmo-bsc/abis_nm.o \
 	$(top_builddir)/src/osmo-bsc/bts.o \
+	$(top_builddir)/src/osmo-bsc/bts_trx.o \
 	$(top_builddir)/src/osmo-bsc/bts_siemens_bs11.o \
 	$(top_builddir)/src/osmo-bsc/e1_config.o \
 	$(top_builddir)/src/osmo-bsc/gsm_data.o \
@@ -118,7 +119,9 @@ meas_json_SOURCES = \
 	$(NULL)
 
 meas_json_LDADD = \
+	$(top_builddir)/src/osmo-bsc/abis_nm.o \
 	$(top_builddir)/src/osmo-bsc/bts.o \
+	$(top_builddir)/src/osmo-bsc/bts_trx.o \
 	$(top_builddir)/src/osmo-bsc/gsm_data.o \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \