vty info: MS power levels in dBm are not negative

Change-Id: Ib928a1378bc00b8ccb0365e5536f010e1f8a3d43

.github/FUNDING.yml

@@ -0,0 +1 @@
+open_collective: osmocom

.gitignore

@@ -54,6 +54,8 @@ src/osmo-bts-oc2g/misc/.dirstamp
 
 tests/atconfig
 tests/package.m4
+tests/amr/amr_test
+tests/csd/csd_test
 tests/agch/agch_test
 tests/paging/paging_test
 tests/cipher/cipher_test
@@ -92,6 +94,7 @@ debian/tmp/
 doc/manuals/*.html
 doc/manuals/*.svg
 doc/manuals/*.pdf
+doc/manuals/vty/*.pdf
 doc/manuals/*__*.png
 doc/manuals/*.check
 doc/manuals/generated/
@@ -103,3 +106,7 @@ doc/manuals/common
 doc/manuals/build
 
 contrib/osmo-bts.spec
+contrib/ber/rtp_ber
+contrib/ber/rtp_gen_map
+
+arm-poky-linux-gnueabi-libtool

README.md

@@ -27,16 +27,16 @@ Homepage
 --------
 
 The official homepage of the project is
-https://osmocom.org/projects/osmobts/wiki
+<https://osmocom.org/projects/osmobts/wiki>
 
 GIT Repository
 --------------
 
 You can clone from the official osmo-bts.git repository using
 
-	git clone git://git.osmocom.org/osmo-bts.git
+	git clone https://gitea.osmocom.org/cellular-infrastructure/osmo-bts
 
-There is a cgit interface at https://git.osmocom.org/osmo-bts/
+There is a web interface at <https://gitea.osmocom.org/cellular-infrastructure/osmo-bts>
 
 Documentation
 -------------
@@ -57,6 +57,13 @@ There also is an
 [Abis reference Manual](https://ftp.osmocom.org/docs/latest/osmobts-abis.pdf)
 describing the OsmoBTS specific A-bis dialect.
 
+Forum
+-----
+
+We welcome any osmo-bts related discussions in the
+[Cellular Network Infrastructure -> 2G RAN (GERAN)](https://discourse.osmocom.org/c/cni/geran)
+section of the osmocom discourse (web based Forum).
+
 Mailing List
 ------------
 
@@ -69,6 +76,13 @@ Please observe the [Osmocom Mailing List
 Rules](https://osmocom.org/projects/cellular-infrastructure/wiki/Mailing_List_Rules)
 when posting.
 
+Issue Tracker
+-------------
+
+We use the [issue tracker of the osmo-bts project on osmocom.org](https://osmocom.org/projects/osmobts/issues) for
+tracking the state of bug reports and feature requests.  Feel free to submit any issues you may find, or help
+us out by resolving existing issues.
+
 Contributing
 ------------
 
@@ -96,7 +110,6 @@ Common Core
  * System Information limited to 1,2,2bis,2ter,2quater,3,4,5,6,9,13
  * No RATSCCH in AMR
  * Will reject TS 12.21 STARTING TIME in SET BTS ATTR / SET CHAN ATTR
- * No reporting of interference levels as part of TS 08.58 RF RES IND
  * No support of TS 08.58 MultiRate Control
  * No support of TS 08.58 Supported Codec Types
  * No support of Bter frame / ENHANCED MEASUREMENT REPORT

TODO-RELEASE

@@ -0,0 +1,12 @@
+# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install
+# according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info
+# In short:
+# LIBVERSION=c:r:a
+# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a.
+# If any interfaces have been added, removed, or changed since the last update: c + 1:0:0.
+# If any interfaces have been added since the last public release: c:r:a + 1.
+# If any interfaces have been removed or changed since the last public release: c:r:0.
+#library	what	        description / commit summary line
+libosmogsm	>1.9.0		added new PRIM_INFO to include/osmocom/gsm/l1sap.h
+libosmogsm	>1.9.0		use of RLP code in libosmogsm
+libosmoctrl 	>1.9.0		use ctrl_cmd_send2()

configure.ac

@@ -69,14 +69,15 @@ then
 fi
 
 dnl checks for libraries
-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0)
-PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0)
-PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0)
-PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0)
-PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.5.0)
-PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.5.0)
-PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.1.0)
-PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 1.1.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.9.0)
+PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.9.0)
+PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.9.0)
+PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.9.0)
+PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.9.0)
+PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.9.0)
+PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.5.0)
+PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 1.5.0)
+PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.4.0)
 
 AC_MSG_CHECKING([whether to enable support for sysmobts calibration tool])
 AC_ARG_ENABLE(sysmobts-calib,
@@ -349,6 +350,56 @@ then
 	AC_SUBST([OSMO_GSM_MANUALS_DIR])
 fi
 
+AC_ARG_ENABLE([external_tests],
+		AC_HELP_STRING([--enable-external-tests],
+				[Include the VTY/CTRL tests in make check [default=no]]),
+		[enable_ext_tests="$enableval"],[enable_ext_tests="no"])
+if test "x$enable_ext_tests" = "xyes" ; then
+	AC_CHECK_PROG(PYTHON3_AVAIL,python3,yes)
+	 if test "x$PYTHON3_AVAIL" != "xyes" ; then
+		AC_MSG_ERROR([Please install python3 to run the VTY/CTRL tests.])
+	fi
+	AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmotestvty.py,yes)
+	 if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then
+		AC_MSG_ERROR([Please install https://gitea.osmocom.org/cellular-infrastructure/osmo-python-tests to run the VTY/CTRL tests.])
+	fi
+fi
+AC_MSG_CHECKING([whether to enable VTY/CTRL tests])
+AC_MSG_RESULT([$enable_ext_tests])
+AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes")
+
+#
+# SystemTap support
+#
+AC_MSG_CHECKING([whether to include systemtap tracing support])
+AC_ARG_ENABLE([systemtap],
+	      [AS_HELP_STRING([--enable-systemtap],
+			      [Enable inclusion of systemtap trace support])],
+	      [ENABLE_SYSTEMTAP="${enableval}"], [ENABLE_SYSTEMTAP='no'])
+AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$ENABLE_SYSTEMTAP = xyes])
+AC_MSG_RESULT(${ENABLE_SYSTEMTAP})
+
+if test "x${ENABLE_SYSTEMTAP}" = xyes; then
+  # Additional configuration for --enable-systemtap is HERE
+  AC_CHECK_PROGS(DTRACE, dtrace)
+  if test -z "$DTRACE"; then
+    AC_MSG_ERROR([dtrace not found])
+  fi
+  AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'],
+                [SDT_H_FOUND='no';
+                   AC_MSG_ERROR([systemtap support needs sys/sdt.h header])])
+  AC_DEFINE([HAVE_SYSTEMTAP], [1], [Define to 1 if using SystemTap probes.])
+  AC_ARG_WITH([tapset-install-dir],
+	      [AS_HELP_STRING([--with-tapset-install-dir],
+	         [The absolute path where the tapset dir will be installed])],
+	      [if test "x${withval}" = x; then
+		 ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"
+	       else
+		 ABS_TAPSET_DIR="${withval}"
+	       fi], [ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"])
+  AC_SUBST(ABS_TAPSET_DIR)
+fi
+
 # https://www.freedesktop.org/software/systemd/man/daemon.html
 AC_ARG_WITH([systemdsystemunitdir],
      [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],,
@@ -393,10 +444,13 @@ AC_OUTPUT(
     tests/tx_power/Makefile
     tests/power/Makefile
     tests/meas/Makefile
+    tests/amr/Makefile
+    tests/csd/Makefile
     doc/Makefile
     doc/examples/Makefile
     doc/manuals/Makefile
     contrib/Makefile
+    contrib/ber/Makefile
     contrib/systemd/Makefile
     contrib/osmo-bts.spec
     Makefile)

contrib/Makefile.am

@@ -1 +1 @@
-SUBDIRS = systemd
+SUBDIRS = systemd ber

contrib/ber/Makefile.am

@@ -0,0 +1,28 @@
+AM_CPPFLAGS = \
+	$(all_includes) \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	-I$(builddir) \
+	$(NULL)
+
+AM_CFLAGS = \
+	-Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOTRAU_CFLAGS) \
+	$(LIBOSMOCODEC_CFLAGS) \
+	$(NULL)
+
+LDADD = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOTRAU_LIBS) \
+	$(LIBOSMOCODEC_LIBS) \
+	$(NULL)
+
+noinst_PROGRAMS = rtp_ber rtp_gen_map
+
+rtp_ber_SOURCES = rtp_ber.c codec_bit_class.h
+
+rtp_gen_map_SOURCES = rtp_gen_map.c
+
+update_codec_bit_class_h: rtp_gen_map
+	$(AM_V_GEN)./$< > $(top_srcdir)/contrib/ber/codec_bit_class.h

contrib/ber/README

@@ -0,0 +1,26 @@
+BER testing tool
+----------------
+
+* Check all configs (MSC/BSC/BTS) for proper codec support
+  - FR enabled
+  - EFR enabled
+  - AMR 12.2 enabled (and all other modes disabled !)
+  - Use `amr-payload octet-aligned` in BSC config
+
+* Check BTS config
+  - Disable jitter buffer : `bts N / rtp jitter-buffer 0`
+
+* Check BSC config
+  - Disable radio timeout : `network / bts n / radio-link-timeout infinite`
+
+* Start BER testing tool
+  - `./rtp_ber 4000`
+
+* On the MSC CLI, start a silent-call, then request GSM to test loop
+  - `subscriber imsi <XXX> silent-call start tch/f speech-amr`
+  - `subscriber imsi <XXX> ms-test close-loop b`
+
+  Don't forget to terminate the loop and terminate the silent call !
+
+  - `subscriber imsi <XXX> ms-test open-loop`
+  - `subscriber imsi <XXX> silent-call stop`

contrib/ber/codec_bit_class.h

@@ -0,0 +1,59 @@
+static const int gsm_fr_bitclass[] = {
+	-1, -1, -1, -1,  0,  0,  0,  0,  1,  2,  0,  0,  0,  1,  2,  2,
+	 0,  0,  1,  2,  2,  0,  0,  1,  2,  2,  0,  1,  1,  2,  0,  1,
+	 2,  2,  0,  1,  2,  1,  2,  2,  0,  0,  0,  0,  0,  0,  1,  1,
+	 1,  1,  1,  0,  0,  0,  1,  1,  2,  1,  1,  2,  1,  1,  2,  1,
+	 1,  2,  1,  1,  2,  1,  1,  2,  1,  1,  2,  1,  1,  2,  1,  1,
+	 2,  1,  1,  2,  1,  1,  2,  1,  1,  2,  1,  1,  2,  1,  1,  2,
+	 0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  0,  0,  0,  1,  1,
+	 2,  1,  1,  2,  1,  1,  2,  1,  1,  2,  1,  1,  2,  1,  1,  2,
+	 1,  1,  2,  1,  1,  2,  1,  1,  2,  1,  1,  2,  1,  1,  2,  1,
+	 1,  2,  1,  1,  2,  1,  1,  2,  0,  0,  0,  0,  0,  0,  1,  1,
+	 1,  1,  1,  0,  0,  0,  1,  1,  2,  1,  1,  2,  1,  1,  2,  1,
+	 1,  2,  1,  1,  2,  1,  1,  2,  1,  1,  2,  1,  1,  2,  1,  1,
+	 2,  1,  1,  2,  1,  1,  2,  1,  1,  2,  1,  1,  2,  1,  1,  2,
+	 0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  0,  0,  0,  1,  1,
+	 2,  1,  1,  2,  1,  1,  2,  1,  1,  2,  1,  1,  2,  1,  2,  2,
+	 1,  2,  2,  1,  2,  2,  1,  2,  2,  1,  2,  2,  1,  2,  2,  1,
+	 2,  2,  1,  2,  2,  1,  2,  2,
+};
+
+static const int gsm_efr_bitclass[] = {
+	 1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0,
+	 0,  0,  0,  0,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  1,
+	 1,  1,  1,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+	 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+	 1,  1,  1,  1,  1,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
+	 2,  2,  2,  2,  2,  2,  0,  1,  1,  1,  1,  0,  0,  0,  0,  0,
+	 1,  0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+	 1,  1,  1,  1,  1,  1,  1,  2,  2,  2,  2,  2,  2,  2,  2,  2,
+	 2,  2,  2,  2,  2,  2,  2,  2,  0,  1,  1,  1,  1,  0,  0,  0,
+	 0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+	 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  2,  2,  2,  2,
+	 2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  1,  1,  1,
+	 1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+	 1,  1,  2,  2,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  2,  2,
+	 2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  1,
+	 1,  1,  1,  1,  2,  2,  1,  2,
+};
+
+static const int gsm_amr_12_2_bitclass[] = {
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+	 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+	 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+	 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+	 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+	 0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+	 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+	 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+	 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+	 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+	 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+	 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+	 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+	 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+	 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+	 1,  1,  1,  1, -1, -1, -1, -1,
+};
+

contrib/ber/rtp_ber.c

@@ -0,0 +1,483 @@
+/* RTP based GSM BER testing for osmo-bts, implementing ideas described in
+ * https://osmocom.org/projects/osmobts/wiki/BER_Testing
+ *
+ * In short: The command transmits a PRBS sequence encapsulated in RTP frames, which are sent
+ * to the BTS, which transmits that data in the (unimpaired) downlink.  The mobile station
+ * receives the data and is instructed to loop it back in the (possibly impaired) uplink.
+ * The BTS receives that uplink, puts in in RTP frames which end up being received back by this
+ * very tool.  By correlating the received RTP with the PRBS sequence, this tool can compute
+ * the BER (Bit Error Rate) of the (possibly impaired) uplink.  Doing this with different
+ * RF channel model simulators in the uplink allows to establish BER at different levels and
+ * channel conditions. */
+
+/* (C) 2019 sysmocom - s.f.m.c. GmbH; Author: Sylvain Munaut
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <osmocom/codec/codec.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/prbs.h>
+#include <osmocom/core/timer.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/trau/osmo_ortp.h>
+
+#include <codec_bit_class.h>
+
+
+struct app_state {
+	struct osmo_rtp_socket *rs;
+
+	enum {
+		WAIT_CONN = 0,	/* Wait for incoming connection */
+		WAIT_LOOP,	/* Wait for a somewhat valid packet to start measuring */
+		RUNNING,	/* Main state */
+	} state;
+
+	int pt;
+
+	int     ref_len;
+	uint8_t ref_bytes[GSM_FR_BYTES];	/* FR is the largest possible one */
+	ubit_t  ref_bits[8*GSM_FR_BYTES];
+
+	struct osmo_timer_list rtp_timer;
+
+	uint16_t rx_last_seq;
+	uint32_t rx_last_ts;
+	uint32_t rx_idx;
+	uint32_t tx_idx;
+
+	const int *err_tbl;	/* Classification table */
+	int err_frames;		/* Number of accumulated frames */
+	int err_cnt[3];		/* Bit error counter */
+	int err_tot[3];		/* Total # bits in that class */
+};
+
+#define FLOW_REG_TX_MAX_ADVANCE		200
+#define FLOW_REG_TX_MIN_ADVANCE		 50
+
+
+const struct log_info log_info;
+
+
+static const uint8_t amr_size_by_ft[] = {
+	[0]	= 12,	/* 4.75 */
+	[1]	= 13,	/* 5.15 */
+	[2]	= 15,	/* 5.9 */
+	[3]	= 17,	/* 6.7 */
+	[4]	= 19,	/* 7.4 */
+	[5]	= 20,	/* 7.95 */
+	[6]	= 26,	/* 10.2 */
+	[7]	= 31,	/* 12.2 */
+	[8]	= 5,	/* SID */
+};
+
+static const char * const amr_rate_by_ft[] = {
+	[0]	= "4.75",
+	[1]	= "5.15",
+	[2]	= "5.9",
+	[3]	= "6.7",
+	[4]	= "7.4",
+	[5]	= "7.95",
+	[6]	= "10.2",
+	[7]	= "12.2",
+	[8]	= "SID",
+};
+
+
+static void
+_gsm_fr_gen_ref(struct app_state *as)
+{
+	struct osmo_prbs_state pn9;
+
+	/* Length */
+	as->ref_len = GSM_FR_BYTES;
+
+	/* Marker */
+	as->ref_bits[0] = 1;
+	as->ref_bits[1] = 1;
+	as->ref_bits[2] = 0;
+	as->ref_bits[3] = 1;
+
+	/* PN */
+	osmo_prbs_state_init(&pn9, &osmo_prbs9);
+	pn9.state = 31;
+	osmo_prbs_get_ubits(&as->ref_bits[4], 260, &pn9);
+
+	/* Convert to bytes */
+	osmo_ubit2pbit_ext(as->ref_bytes, 0, as->ref_bits, 0, 8*GSM_FR_BYTES, 0);
+
+	/* Init error classes */
+	as->err_tot[0] =  50;
+	as->err_tot[1] = 132;
+	as->err_tot[2] =  78;
+	as->err_tbl = gsm_fr_bitclass;
+}
+
+static void
+_gsm_efr_gen_ref(struct app_state *as)
+{
+	struct osmo_prbs_state pn9;
+
+	/* Length */
+	as->ref_len = GSM_EFR_BYTES;
+
+	/* Marker */
+	as->ref_bits[0] = 1;
+	as->ref_bits[1] = 1;
+	as->ref_bits[2] = 0;
+	as->ref_bits[3] = 0;
+
+	/* PN */
+	osmo_prbs_state_init(&pn9, &osmo_prbs9);
+	pn9.state = 31;
+	osmo_prbs_get_ubits(&as->ref_bits[4], 244, &pn9);
+
+	/* Convert to bytes */
+	osmo_ubit2pbit_ext(as->ref_bytes, 0, as->ref_bits, 0, 8*GSM_EFR_BYTES, 0);
+
+	/* Init error classes */
+	as->err_tot[0] =  50;
+	as->err_tot[1] = 125;
+	as->err_tot[2] =  73;
+	as->err_tbl = gsm_efr_bitclass;
+}
+
+static void
+_gsm_amr_gen_ref(struct app_state *as)
+{
+	struct osmo_prbs_state pn9;
+	uint8_t hdr[2];
+
+	/* Length */
+	as->ref_len = 33;
+
+	/* Header */
+	hdr[0] = 0x70;
+	hdr[1] = 0x3c;
+	osmo_pbit2ubit_ext(as->ref_bits, 0, hdr, 0, 16, 0);
+
+	/* PN */
+	osmo_prbs_state_init(&pn9, &osmo_prbs9);
+	pn9.state = 31;
+	osmo_prbs_get_ubits(&as->ref_bits[16], 244, &pn9);
+
+	/* Unused bits */
+	as->ref_bits[260] = 0;
+	as->ref_bits[261] = 0;
+	as->ref_bits[262] = 0;
+	as->ref_bits[263] = 0;
+
+	/* Convert to bytes */
+	osmo_ubit2pbit_ext(as->ref_bytes, 0, as->ref_bits, 0, 264, 0);
+
+	/* Init error classes */
+	as->err_tot[0] =  81;
+	as->err_tot[1] = 163;
+	as->err_tot[2] =  -1;
+	as->err_tbl = gsm_amr_12_2_bitclass;
+}
+
+
+static void
+_gsm_gen_ref(struct app_state *as)
+{
+	switch (as->pt) {
+	case RTP_PT_GSM_FULL:
+		_gsm_fr_gen_ref(as);
+		break;
+	case RTP_PT_GSM_EFR:
+		_gsm_efr_gen_ref(as);
+		break;
+	case RTP_PT_AMR:
+		_gsm_amr_gen_ref(as);
+		break;
+	default:
+		fprintf(stderr, "[!] Unsupported payload type for BER measurement\n");
+	}
+}
+
+static int
+_gsm_ber(struct app_state *as, const uint8_t *payload, unsigned int payload_len)
+{
+	ubit_t rx_bits[8*33];
+	int err[3];	/* Class 1a, 1b, 2 */
+	int ones;
+	int i, j;
+
+	if (payload) {
+		/* Process real-payload */
+		osmo_pbit2ubit_ext(rx_bits, 0, payload, 0, 8*payload_len, 0);
+
+		err[0] = err[1] = err[2] = 0;
+		ones = 0;
+
+		for (i = 0; i < 8 * payload_len; i++) {
+			j = as->err_tbl[i];
+			if (j >= 0) {
+				err[j] += rx_bits[i] ^ as->ref_bits[i];
+				ones += rx_bits[i];
+			}
+		}
+
+		if (ones < 32) { // This frames is probably us underrunning Tx, don't use it
+			fprintf(stderr, "[w] Frame ignored as probably TX underrun %d %d\n", as->tx_idx, as->rx_idx);
+			return 1;
+		}
+	} else {
+		/* No payload -> Lost frame completely */
+		err[0] = as->err_tot[0] / 2;
+		err[1] = as->err_tot[1] / 2;
+		err[2] = as->err_tot[2] / 2;
+	}
+
+	if (as->state == RUNNING) {
+		/* Update records */
+		if (err[0] != 0) {
+			/* Class 1a bits bad -> Frame error */
+			as->err_cnt[0]++;
+		}
+
+		as->err_cnt[1] += err[1];	/* Class 1b */
+		as->err_cnt[2] += err[2];	/* class 2  */
+
+		as->err_frames++;
+
+		/* Enough for a read-out ? */
+		if (as->err_frames == 200) {
+			printf("FBER: %4.2f    C1b RBER: %5.3f    C2 RBER: %5.3f\n",
+				100.0f * as->err_cnt[0] / as->err_frames,
+				100.0f * as->err_cnt[1] / (as->err_tot[1] * as->err_frames),
+				100.0f * as->err_cnt[2] / (as->err_tot[2] * as->err_frames)
+			);
+			memset(as->err_cnt, 0, sizeof(as->err_cnt));
+			as->err_frames = 0;
+		}
+	}
+
+	return err[0] != 0;
+}
+
+static int
+_rtp_check_payload_type(const uint8_t *payload, unsigned int payload_len)
+{
+	uint8_t ft;
+	int pt = -1;
+
+	switch (payload_len) {
+	case GSM_FR_BYTES: /* FR  or AMR 12.2k */
+		/* Check for AMR */
+		ft = (payload[1] >> 3) & 0xf;
+		if (ft == 7)
+			pt = RTP_PT_AMR;
+
+		/* Check for FR */
+		else if ((payload[0] & 0xF0) == 0xD0)
+			pt = RTP_PT_GSM_FULL;
+
+		/* None of the above */
+		else
+			fprintf(stderr, "[!] FR without 0xD0 signature or AMR with unknwon Frame Type ?!?\n");
+
+		break;
+	case GSM_EFR_BYTES: /* EFR */
+		if ((payload[0] & 0xF0) != 0xC0)
+			fprintf(stderr, "[!] EFR without 0xC0 signature ?!?\n");
+		pt = RTP_PT_GSM_EFR;
+		break;
+	case GSM_HR_BYTES: /* HR */
+		pt = RTP_PT_GSM_HALF;
+		break;
+	default: /* AMR */
+		{
+			uint8_t cmr, cmi, sti;
+			cmr = payload[0] >> 4;
+			ft = (payload[1] >> 3) & 0xf;
+
+			if (payload_len != amr_size_by_ft[ft]+2)
+				fprintf(stderr, "AMR FT %u(%s) but size %u\n",
+					ft, amr_rate_by_ft[ft], payload_len);
+
+			switch (ft) {
+			case 0: case 1: case 2: case 3:
+			case 4: case 5: case 6: case 7:
+				cmi = ft;
+				printf("AMR SPEECH with FT/CMI %u(%s), "
+					"CMR %u\n",
+					cmi, amr_rate_by_ft[cmi],
+					cmr);
+				break;
+			case 8: /* SID */
+				cmi = (payload[2+4] >> 1) & 0x7;
+				sti = payload[2+4] & 0x10;
+				printf("AMR SID %s with CMI %u(%s), CMR %u(%s)\n",
+					sti ? "UPDATE" : "FIRST",
+					cmi, amr_rate_by_ft[cmi],
+					cmr, amr_rate_by_ft[cmr]);
+				break;
+			}
+		}
+		break;
+	}
+
+	return pt;
+}
+
+static void
+rtp_timer_cb(void *priv)
+{
+	struct app_state *as = (struct app_state *)priv;
+
+	/* Send at least one frame if we're not too far ahead */
+	if (as->tx_idx < (as->rx_idx + FLOW_REG_TX_MAX_ADVANCE)) {
+		osmo_rtp_send_frame(as->rs, as->ref_bytes, as->ref_len, GSM_RTP_DURATION);
+		as->tx_idx++;
+	} else {
+		fprintf(stderr, "Skipped\n");
+	}
+
+	/* Then maybe a second one to try and catch up to RX */
+	if (as->tx_idx < (as->rx_idx + FLOW_REG_TX_MIN_ADVANCE)) {
+		osmo_rtp_send_frame(as->rs, as->ref_bytes, as->ref_len, GSM_RTP_DURATION);
+		as->tx_idx++;
+	}
+
+	/* Re-schedule */
+	osmo_timer_schedule(&as->rtp_timer, 0, 20000);
+}
+
+static int
+rtp_seq_num_diff(uint16_t new, uint16_t old)
+{
+	int d = (int)new - (int)old;
+	while (d > 49152)
+		d -= 65536;
+	while (d < -49152)
+		d += 65536;
+	return d;
+}
+
+static void
+rtp_rx_cb(struct osmo_rtp_socket *rs,
+	const uint8_t *payload, unsigned int payload_len,
+	uint16_t seq_number, uint32_t timestamp, bool marker)
+{
+	struct app_state *as = (struct app_state *)rs->priv;
+	int pt, rc, d;
+
+//	printf("Rx(%u, %d, %d, %d): %s\n", payload_len, seq_number, timestamp, marker, osmo_hexdump(payload, payload_len));
+
+	/* Identify payload */
+	pt = _rtp_check_payload_type(payload, payload_len);
+
+	/* First packet ? */
+	if (as->state == WAIT_CONN) {
+		/* Setup for this payload type */
+		as->pt = pt;
+		osmo_rtp_socket_set_pt(as->rs, pt);
+		_gsm_gen_ref(as);
+
+		/* Timer every 20 ms */
+		osmo_timer_setup(&as->rtp_timer, rtp_timer_cb, as);
+		osmo_timer_add(&as->rtp_timer);
+		osmo_timer_schedule(&as->rtp_timer, 0, 20000);
+
+		/* Init our time tracking */
+		as->rx_last_seq = seq_number;
+		as->rx_last_ts  = timestamp;
+
+		/* Now we wait for a loop */
+		as->state = WAIT_LOOP;
+	}
+
+	/* RX sequence & timstamp tracking */
+	if (rtp_seq_num_diff(seq_number, as->rx_last_seq) > 1)
+		fprintf(stderr, "[!] RTP sequence number discontinuity (%d -> %d)\n", as->rx_last_seq, seq_number);
+
+	d = (timestamp - as->rx_last_ts) / GSM_RTP_DURATION;
+
+	as->rx_idx += d;
+	as->rx_last_seq = seq_number;
+	as->rx_last_ts  = timestamp;
+
+	/* Account for missing frames in BER tracking */
+	if (d > 1) {
+		fprintf(stderr, "[!] RTP %d missing frames assumed lost @%d\n", d-1, seq_number);
+		while (--d)
+			_gsm_ber(as, NULL, 0);
+	}
+
+	/* BER analysis */
+	rc = _gsm_ber(as, payload, payload_len);
+
+	if ((as->state == WAIT_LOOP) && (rc == 0))
+		as->state = RUNNING;
+}
+
+
+int main(int argc, char **argv)
+{
+	struct app_state _as, *as = &_as;
+	int rc, port;
+
+	/* Args */
+	if (argc < 2)
+		return -1;
+
+	port = atoi(argv[1]);
+
+	/* App init */
+	memset(as, 0x00, sizeof(struct app_state));
+
+	log_init(&log_info, NULL);
+	osmo_rtp_init(NULL);
+
+	/* Start auto-connect RTP socket */
+	as->rs = osmo_rtp_socket_create(NULL, 0);
+
+	as->rs->priv = as;
+	as->rs->rx_cb = rtp_rx_cb;
+
+		/* Jitter buffer gets in the way, we want the raw traffic */
+	osmo_rtp_socket_set_param(as->rs, OSMO_RTP_P_JIT_ADAP, 0);
+	osmo_rtp_socket_set_param(as->rs, OSMO_RTP_P_JITBUF, 0);
+
+		/* Bind to requested port */
+	fprintf(stderr, "[+] Binding RTP socket on port %u...\n", port);
+	rc = osmo_rtp_socket_bind(as->rs, "0.0.0.0", port);
+	if (rc < 0) {
+		fprintf(stderr, "[!] error binding RTP socket: %d\n", rc);
+		return rc;
+	}
+
+		/* We 'connect' to the first source we hear from */
+	osmo_rtp_socket_autoconnect(as->rs);
+
+	/* Main loop */
+	while (1)
+		osmo_select_main(0);
+
+	return 0;
+}

contrib/ber/rtp_gen_map.c

@@ -0,0 +1,145 @@
+/* utility to generate codec_bit_class.h, a file with structures
+ * describing which [protection] class each bit of a given codec frame belongs to */
+
+/* (C) 2019 sysmocom - s.f.m.c. GmbH; Author: Sylvain Munaut
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <stdio.h>
+
+#include <osmocom/codec/codec.h>
+
+
+static int
+gen_table_fr(int *tbl)
+{
+	int i, j;
+
+	tbl[0] = tbl[1] = tbl[2] = tbl[3] = -1;
+
+	for (i = 0; i < 260; i++) {
+		j = 4 + gsm610_bitorder[i];
+		if (i < 50)
+			tbl[j] = 0;	/* Class 1a */
+		else if (i < 182)
+			tbl[j] = 1;	/* Class 1b */
+		else
+			tbl[j] = 2;	/* Class 2 */
+	}
+
+	return GSM_FR_BYTES * 8;
+}
+
+static int
+gen_table_efr(int *tbl)
+{
+	int i, j, k;
+
+	tbl[0] = tbl[1] = tbl[2] = tbl[3] = -1;
+
+	for (i = 0; i < 260; i++) {
+		j = gsm660_bitorder[i];
+
+		if (j < 71)
+			k = j;
+		else if (j < 73)
+			k = 71;
+		else if (j < 123)
+			k = j - 2;
+		else if (j < 125)
+			k = 119;
+		else if (j < 178)
+			k = j - 4;
+		else if (j < 180)
+			k = 172;
+		else if (j < 230)
+			k = j - 6;
+		else if (j < 232)
+			k = 222;
+		else if (j < 252)
+			k = j - 8;
+		else
+			continue;
+
+		if (i < 50)
+			tbl[k] = 0;	/* Class 1a */
+		else if (i < 182)
+			tbl[k] = 1;	/* Class 1b */
+		else
+			tbl[k] = 2;	/* Class 2 */
+	}
+
+	return GSM_EFR_BYTES * 8;
+}
+
+static int
+gen_table_amr_12_2(int *tbl)
+{
+	int i;
+
+	for (i = 0; i < 16; i++)
+		tbl[i] = -1;
+
+	for (i = 0; i < 244; i++)
+		tbl[i+16] = i < 81 ? 0 : 1;
+
+	for (i = 0; i < 4; i++)
+		tbl[i+16+244] = -1;
+
+	return 8 * 33;
+}
+
+
+static void
+print_table(const char  *name, int *tbl, int len)
+{
+	int i;
+
+	printf("static const int %s[] = {\n", name);
+
+	for (i = 0; i < len; i++) {
+		if ((i & 15) == 0)
+			printf("\t");
+
+		printf("%2d", tbl[i]);
+
+		if (((i & 15) == 15) || (i == len-1))
+			printf(",\n");
+		else
+			printf(", ");
+	}
+
+	printf("};\n\n");
+}
+
+
+int main(int argc, char *argv[])
+{
+	int tbl[33*8];
+	int rv;
+
+	rv = gen_table_fr(tbl);
+	print_table("gsm_fr_bitclass", tbl, rv);
+
+	rv = gen_table_efr(tbl);
+	print_table("gsm_efr_bitclass", tbl, rv);
+
+	rv = gen_table_amr_12_2(tbl);
+	print_table("gsm_amr_12_2_bitclass", tbl, rv);
+
+	return 0;
+}

contrib/jenkins_bts_trx.sh

@@ -9,7 +9,8 @@ export LD_LIBRARY_PATH="$inst/lib"
 
 osmo-build-dep.sh libosmocore "" --disable-doxygen
 
-osmo-build-dep.sh libosmo-abis
+osmo-build-dep.sh libosmo-abis "" --disable-dahdi
+osmo-build-dep.sh libosmo-netif "" --disable-doxygen
 
 cd "$deps"
 
@@ -17,6 +18,7 @@ configure_flags="\
   --enable-sanitize \
   --enable-werror \
   --enable-trx \
+  --enable-external-tests \
   "
 
 build_bts "osmo-bts-trx" "$configure_flags"

contrib/jenkins_lc15.sh

@@ -9,7 +9,8 @@ osmo-build-dep.sh libosmocore "" --disable-doxygen
 export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
 export LD_LIBRARY_PATH="$inst/lib"
 
-osmo-build-dep.sh libosmo-abis
+osmo-build-dep.sh libosmo-abis "" --disable-dahdi
+osmo-build-dep.sh libosmo-netif "" --disable-doxygen
 
 cd "$deps"
 osmo-layer1-headers.sh lc15 "$FIRMWARE_VERSION"

contrib/jenkins_oc2g.sh

@@ -9,7 +9,8 @@ osmo-build-dep.sh libosmocore "" --disable-doxygen
 export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
 export LD_LIBRARY_PATH="$inst/lib"
 
-osmo-build-dep.sh libosmo-abis
+osmo-build-dep.sh libosmo-abis "" --disable-dahdi
+osmo-build-dep.sh libosmo-netif "" --disable-doxygen
 
 cd "$deps"
 osmo-layer1-headers.sh oc2g "$FIRMWARE_VERSION"

contrib/jenkins_oct.sh

@@ -9,7 +9,8 @@ osmo-build-dep.sh libosmocore "" --disable-doxygen
 export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
 export LD_LIBRARY_PATH="$inst/lib"
 
-osmo-build-dep.sh libosmo-abis
+osmo-build-dep.sh libosmo-abis "" --disable-dahdi
+osmo-build-dep.sh libosmo-netif "" --disable-doxygen
 
 cd "$deps"
 osmo-layer1-headers.sh oct "$FIRMWARE_VERSION"

contrib/jenkins_oct_and_bts_trx.sh

@@ -9,7 +9,8 @@ export LD_LIBRARY_PATH="$inst/lib"
 
 osmo-build-dep.sh libosmocore "" --disable-doxygen
 
-osmo-build-dep.sh libosmo-abis
+osmo-build-dep.sh libosmo-abis "" --disable-dahdi
+osmo-build-dep.sh libosmo-netif "" --disable-doxygen
 
 cd "$deps"
 
@@ -20,6 +21,7 @@ configure_flags="\
   --with-octsdr-2g=$deps/layer1-headers/ \
   --enable-octphy \
   --enable-trx \
+  --enable-external-tests \
   "
 
 build_bts "osmo-bts-octphy+trx" "$configure_flags"

contrib/jenkins_sysmobts.sh

@@ -9,7 +9,8 @@ osmo-build-dep.sh libosmocore "" --disable-doxygen
 export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
 export LD_LIBRARY_PATH="$inst/lib"
 
-osmo-build-dep.sh libosmo-abis
+osmo-build-dep.sh libosmo-abis "" --disable-dahdi
+osmo-build-dep.sh libosmo-netif "" --disable-doxygen
 
 cd "$deps"
 osmo-layer1-headers.sh sysmo "$FIRMWARE_VERSION"
@@ -21,6 +22,7 @@ configure_flags="\
   --enable-werror \
   --enable-sysmocom-bts \
   --with-sysmobts=$inst/include/ \
+  --enable-external-tests \
   "
 
 # This will not work for the femtobts

contrib/osmo-bts.spec.in

@@ -27,16 +27,15 @@ BuildRequires:  pkgconfig >= 0.20
 %if 0%{?suse_version}
 BuildRequires:  systemd-rpm-macros
 %endif
-BuildRequires:  pkgconfig(libosmoabis) >= 1.1.0
-BuildRequires:  pkgconfig(libosmocodec) >= 1.5.0
-BuildRequires:  pkgconfig(libosmocoding) >= 1.5.0
-BuildRequires:  pkgconfig(libosmocore) >= 1.5.0
-BuildRequires:  pkgconfig(libosmoctrl) >= 1.5.0
-BuildRequires:  pkgconfig(libosmogsm) >= 1.5.0
-BuildRequires:  pkgconfig(libosmotrau) >= 1.1.0
-BuildRequires:  pkgconfig(libosmovty) >= 1.5.0
-### FIXME: DependencyHACK to include  osmocom/gprs/protocol/gsm_04_60.h
-BuildRequires:  pkgconfig(libosmogb)
+BuildRequires:  pkgconfig(libosmocodec) >= 1.9.0
+BuildRequires:  pkgconfig(libosmocoding) >= 1.9.0
+BuildRequires:  pkgconfig(libosmocore) >= 1.9.0
+BuildRequires:  pkgconfig(libosmoctrl) >= 1.9.0
+BuildRequires:  pkgconfig(libosmogsm) >= 1.9.0
+BuildRequires:  pkgconfig(libosmovty) >= 1.9.0
+BuildRequires:  pkgconfig(libosmoabis) >= 1.5.0
+BuildRequires:  pkgconfig(libosmotrau) >= 1.5.0
+BuildRequires:  pkgconfig(libosmo-netif) >= 1.4.0
 %{?systemd_requires}
 
 %description

contrib/systemd/lc15bts-mgr.service

@@ -2,11 +2,15 @@
 Description=osmo-bts manager for LC15 / sysmoBTS 2100
 After=lc15-sysdev-remap.service
 Wants=lc15-sysdev-remap.service
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=simple
 NotifyAccess=all
 WatchdogSec=21780s
+StateDirectory=osmocom
+WorkingDirectory=%S/osmocom
 Restart=always
 RestartSec=2
 

contrib/systemd/oc2gbts-mgr.service

@@ -2,11 +2,15 @@
 Description=osmo-bts manager for OC-2G
 After=oc2g-sysdev-remap.service
 Wants=oc2g-sysdev-remap.service
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=simple
 NotifyAccess=all
 WatchdogSec=21780s
+StateDirectory=osmocom
+WorkingDirectory=%S/osmocom
 Restart=always
 RestartSec=2
 

contrib/systemd/osmo-bts-lc15.service

@@ -1,17 +1,22 @@
 [Unit]
 Description=osmo-bts for LC15 / sysmoBTS 2100
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=simple
 ExecStart=/usr/bin/osmo-bts-lc15 -t 2 -s -c /etc/osmocom/osmo-bts-lc15.cfg -M
+StateDirectory=osmocom
+WorkingDirectory=%S/osmocom
 RuntimeDirectory=osmo-bts
 Restart=always
 RestartSec=2
-RestartPreventExitStatus=1
 
-# The msg queues must be read fast enough
+# CPU scheduling policy:
 CPUSchedulingPolicy=rr
-CPUSchedulingPriority=1
+# For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority):
+CPUSchedulingPriority=11
+# See sched(7) for further details on real-time policies and priorities
 
 [Install]
 WantedBy=multi-user.target

contrib/systemd/osmo-bts-oc2g.service

@@ -1,17 +1,22 @@
 [Unit]
 Description=osmo-bts for OC-2G
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=simple
 ExecStart=/usr/bin/osmo-bts-oc2g -s -c /etc/osmocom/osmo-bts-oc2g.cfg -M
+StateDirectory=osmocom
+WorkingDirectory=%S/osmocom
 RuntimeDirectory=osmo-bts
 Restart=always
 RestartSec=2
-RestartPreventExitStatus=1
 
-# The msg queues must be read fast enough
+# CPU scheduling policy:
 CPUSchedulingPolicy=rr
-CPUSchedulingPriority=1
+# For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority):
+CPUSchedulingPriority=11
+# See sched(7) for further details on real-time policies and priorities
 
 [Install]
 WantedBy=multi-user.target

contrib/systemd/osmo-bts-sysmo.service

@@ -1,5 +1,7 @@
 [Unit]
 Description=osmo-bts for sysmocom sysmoBTS
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=simple
@@ -7,13 +9,16 @@ ExecStartPre=/bin/sh -c 'echo 0 > /sys/class/leds/activity_led/brightness'
 ExecStart=/usr/bin/osmo-bts-sysmo -s -c /etc/osmocom/osmo-bts-sysmo.cfg -M
 ExecStopPost=/bin/sh -c 'echo 0 > /sys/class/leds/activity_led/brightness'
 ExecStopPost=/bin/sh -c 'cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0 ; sleep 3s; cat /lib/firmware/sysmobts-v?.out > /dev/dspdl_dm644x_0; sleep 1s'
+StateDirectory=osmocom
+WorkingDirectory=%S/osmocom
 Restart=always
 RestartSec=2
-RestartPreventExitStatus=1
 
-# The msg queues must be read fast enough
+# CPU scheduling policy:
 CPUSchedulingPolicy=rr
-CPUSchedulingPriority=1
+# For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority):
+CPUSchedulingPriority=20
+# See sched(7) for further details on real-time policies and priorities
 
 [Install]
 WantedBy=multi-user.target

contrib/systemd/osmo-bts-trx.service

@@ -1,15 +1,21 @@
 [Unit]
 Description=Osmocom osmo-bts for osmo-trx
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=simple
 ExecStart=/usr/bin/osmo-bts-trx -s -c /etc/osmocom/osmo-bts-trx.cfg
+StateDirectory=osmocom
+WorkingDirectory=%S/osmocom
 Restart=always
 RestartSec=2
 
-# Let it process messages quickly enough
+# CPU scheduling policy:
 CPUSchedulingPolicy=rr
-CPUSchedulingPriority=1
+# For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority):
+CPUSchedulingPriority=11
+# See sched(7) for further details on real-time policies and priorities
 
 [Install]
 WantedBy=multi-user.target

contrib/systemd/osmo-bts-virtual.service

@@ -1,15 +1,21 @@
 [Unit]
 Description=Osmocom GSM BTS for virtual Um layer based on GSMTAP/UDP
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=simple
 ExecStart=/usr/bin/osmo-bts-virtual -s -c /etc/osmocom/osmo-bts-virtual.cfg
+StateDirectory=osmocom
+WorkingDirectory=%S/osmocom
 Restart=always
 RestartSec=2
 
-# Let it process messages quickly enough
+# CPU scheduling policy:
 CPUSchedulingPolicy=rr
-CPUSchedulingPriority=1
+# For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority):
+CPUSchedulingPriority=11
+# See sched(7) for further details on real-time policies and priorities
 
 [Install]
 WantedBy=multi-user.target

contrib/systemd/sysmobts-mgr.service

@@ -1,9 +1,13 @@
 [Unit]
 Description=osmo-bts manager for sysmoBTS
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=simple
 ExecStart=/usr/bin/sysmobts-mgr -ns -c /etc/osmocom/sysmobts-mgr.cfg
+StateDirectory=osmocom
+WorkingDirectory=%S/osmocom
 Restart=always
 RestartSec=2
 

debian/changelog

@@ -1,3 +1,816 @@
+osmo-bts (1.7.0) unstable; urgency=medium
+
+  [ arehbein ]
+  * common: Fix memleak in get_smscb_block()
+  * doc: Adapt to use of 'telnet_init_default'
+  * common: Remove redundant checks
+  * common: Remove unused function gsm_objclass2nmstate()
+  * gsm_objclass2mo(): Change signature/set NACK cause
+  * gsm_objclass2obj(): Change signature/set NACK cause
+  * PCU interface: Log version when starting listener
+  * common: Have PCU socket connection use osmo_wqueue
+  * common: Make socket queue max. length configurable
+
+  [ Max ]
+  * bts-virtual: fix segfault
+  * osmo-bts-trx: log TRXC/TRXD connection address
+  * osmo-bts-trx: use bool for true/false flags
+  * GSMTAP: allow configuring local address
+  * license: fix typos
+
+  [ Vadim Yanitskiy ]
+  * paging_add_imm_ass(): remove meaningless from_pcu argument
+  * osmo-bts-{trx,virtual}: clean up bts_model_l1sap_down()
+  * osmo-bts-{trx,virtual}: check lchan against NULL in bts_model_l1sap_down()
+  * osmo-bts-{trx,virtual}: set rc on error in bts_model_l1sap_down()
+  * GSMTAP: print 'gsmtap-local-host' if not NULL
+  * osmo-bts-virtual: indicate BTS_FEAT_[E]GPRS to the BSC
+  * rsl: remove redundant gsm_lchan_name() in rsl_tx_rf_rel_ack()
+  * rsl: reduce logging verbosity on some messages
+  * tests: use -no-install libtool flag to avoid ./lt-* scripts
+  * scheduler: log pchan value in trx_sched_set_pchan()
+  * osmo-bts-virtual: properly handle dynamic TS in vbts_set_ts()
+  * contrib/osmo-bts.spec.in: do not depend on libosmogb
+  * osmo-bts-trx: properly activate [CBCH/]BCCH/CCCH
+  * rsl: rsl_handle_chan_mod_ie(): add missing GSM48_CMODE_* values
+  * osmo-bts-{sysmo,lc15,oc2g}: fix segfault in ph_tch_req()
+  * tests: $(BUILT_SOURCES) is not defined, depend on osmo-bts-virtual
+  * osmo-bts-virtual: properly activate [CBCH/]BCCH/CCCH
+  * flags: add missing entries to bts_impl_flag_desc[]
+  * flags: group BTS_INTERNAL_FLAG_* into an enum
+  * flags: ensure completeness of bts_impl_flag_desc[]
+  * fixup: common: Remove unused function gsm_objclass2nmstate()
+  * oml: gsm_objclass2{mo,obj}(): cosmetic: return immediately
+  * oml: gsm_objclass2{mo,obj}(): set cause for unknown obj_class
+  * oml: reset BCCH carrier power reduction mode (if enabled)
+  * copyright: fix typo: sysmocom s/s.m.f.c./s.f.m.c./ GmbH
+  * osmo-bts-trx: alloc/free burst buffers in trx_sched_set_lchan()
+  * osmo-bts-trx: use direct pointer to chan_state->{ul,dl}_bursts
+  * osmo-bts-trx: tch_dl_dequeue(): do not drop CSD frames
+  * osmo-bts-trx: tx_pdtch_fn(): use msgb_l2len()
+  * osmo-bts-trx: fix recent regression in Tx lchan handlers
+  * osmo-bts-trx: remove redundant memset() on receipt of NOPE.ind
+  * l1sap: use gsm0502_fn2ccch_block() from libosmogsm
+  * scheduler: fix wrong union field in _sched_compose_tch_ind()
+  * scheduler: use msgb_hexdump_l2() in _sched_compose_tch_ind()
+  * scheduler: unify argument names/order for _sched_compose_*_ind()
+  * scheduler: constify *data pointer in _sched_compose_*_ind()
+  * scheduler: use size_t for data_len in _sched_compose_*_ind()
+  * fix bts_supports_cm(): properly check feature flags for VGCS/VBS
+  * measurement: suppress unsupported tch_mode warnings for CSD
+  * osmo-bts-trx: pull the AMR header in tch_dl_dequeue()
+  * osmo-bts-trx: implement CSD scheduling support
+  * osmo-bts-trx: implement FACCH/[FH] support for CSD
+  * osmo-bts-trx: implement TCH/F2.4 support for CSD
+  * osmo-bts-trx: visualize rx_tch[fh]_fn() functions
+  * osmo-bts-trx: unify and enrich 'Received bad data' logging
+  * osmo-bts-trx: rx_tchf_fn(): move compute_ber10k() above
+  * osmo-bts-trx: rx_tch[fh]_fn(): combine rc-checking ifs
+  * osmo-bts-trx: change 'Received bad data' back to LOGL_DEBUG
+  * osmo-bts-trx: tx_tch[fh]_fn(): fix NULL pointer dereference
+  * osmo-bts-trx: document/clarify the meaning of BUFMAX=24
+  * l1sap: proper rate adaptation for CSD (RFC4040 'clearmode')
+  * csd_v110_rtp_encode(): properly set E1/E2/E3 bits
+  * osmo-bts-trx: bts_supports_cm_data(): allow non-transparent modes
+  * rsl: rsl_handle_chan_mod_ie(): set lchan->csd_mode
+  * rsl: rsl_handle_chan_mod_ie(): do not use legacy defines
+  * csd_v110: fix comments in csd_v110_rtp_{en,de}code()
+  * csd_v110: properly set E1/E2/E3 for non-transparent data
+  * csd_v110: handle empty/incomplete Uplink frames gracefully
+
+  [ Philipp Maier ]
+  * pcu_sock: rename rc to fd
+  * pcu_sock: cosmetic: remove whitespace after type cast
+  * pcu_sock: cosmetic: remove unnecessary line breaks
+  * pcu_sock: do not mess with the osmo fd flags directly
+  * sched_lchan_tchx: use GSM_HR_BYTES_RTP_RFC5993 constant
+  * l1sap: fix wording in comment
+  * pcu_sock: don not continue when running out of TRX space
+  * paging: cosmetic: rename all IMM.ASS references to MAC block
+  * paging: parse PCUIF data indication outside of paging.c
+  * paging: do not confirm PAGING COMMAND messages
+  * pcu_sock: move variable declaration of imsi[4] into related scope
+  * l1sap: cosmetic: rename payload_len to rtp_pl_len
+  * pcu_sock: use PCUIF version 11 (direct TLLI)
+  * paging: also accept zero length IMSI strings 3
+  * pcuif_proto: rename tlli to msg_id
+  * pcu_sock: get rid of fn parameter in pcu_tx_pch_data_cnf
+  * pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt
+  * pcuif_proto: get rid of _DT, _dt (Direct TLLI)
+  * bts: make bts_agch_dequeue static
+  * pcuif_proto: use confirm flag in struct gsm_pcu_if_pch
+  * pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH
+  * pcu_sock: print SAPI and msg_id when sending confirmation
+
+  [ Pau Espin Pedrol ]
+  * bts-trx: Fix no NM Radio{Carrier,Channel} switching to Enabled if one TRX is rf_locked
+  * pcu_sock: Submit all DATA.ind regardless of link quality
+  * pcu_sock.c: Call osmo_fd_unregister() before closing and changing bfd->fd
+  * Rewrite pcu_sock_write()
+  * lchan: Improve error path logging in gsm_pchan2chan_nr()
+  * cosmetic: gsm_pchan2chan_nr(): Update spec documentation
+  * cosmetic: bts_trx.h: Fix whitespace
+  * Avoid tx RF Resource Ind for disabled TRX
+  * bts-trx: Avoid pushing interf_meas for disabled TRX
+  * contrib/ber: Avoid regenerating codec_bit_class.h every build
+  * bts-trx: Drop unused param to internal function
+  * Clarify configuration of TSC on each timeslot
+  * bts_model_apply_oml(): Drop unneded code
+  * oml.c: Remove dot character at the end of log lines
+  * nm: Apply BTS/TRX/TS OML Attributes through NM FSMs
+  * nm: Drop NM_EV_SETATTR_{ACK/NACK}
+  * oml: Get rid of unused tlv_parsed param in bts_model_apply_oml()
+  * bts_model_apply_oml(): Improve definition of parameter
+  * lc15,oc2g,sysmo: Update GPRS NM object state at the right time
+  * Simplify implementation of bts_model_opstart() in all bts types
+  * nm: Apply OPSTART through NM FSMs
+  * NM: NACK received OML OPSTART if no attributes were set beforehand
+  * Introduce NM FSM for GPRS NSE object
+  * Fix octet 2 of NM GPRS Cell
+  * Introduce NM FSM for GPRS Cell object
+  * Rearrange declaration of struct gsm_bts_gprs_nsvc
+  * Move NSVC structs to be part of NSE
+  * bts: Simplify lifecycle of BTS inside bts_list
+  * Introduce NM FSM for GPRS NSVC object
+  * nm: Dispatch NM_EV_SW_ACT in cascade to BTS SiteMgr children
+  * Merge gsm_network into gsm_bts_sm and place gsm_bts under it
+  * Move GPRS NSE under BTS SiteMgr
+  * Drop NM_EV_BBTRANSC_INSTALLED in favour of generic NM_EV_SW_ACT
+  * nm: Document current state of SW_ACT in TRX related objects
+  * Properly report all states through NM FSM upon OML link up
+  * Update g_bts_sm->num_bts when bts is added/removed from bts list
+  * Move pcu_sock_state to gprs section of bts_sm
+  * pcu_sock: Allocate pcu_sock_state using g_bts_sm talloc context
+  * pcu_sock: Drop bts_sm pointer
+  * oml: Fix potential null ptr access on trx object
+  * bts-sysmo: Fix pinst->version filled too early
+  * bts-sysmo: Delay marking phy_link as connected until L1 reset + got info
+  * vty.c: Use already available tpp pointer
+  * octphy: Fix clearly wrong noop assignment
+  * bbtransc/rcarrier: Fix statechg done twice upon NM_EV_RX_OPSTART
+  * Increase PCUIF wqueue size
+  * bts-trx: Fix CCCH not enabled if BS_AG_BLKS_RES!=1 is provided by BSC
+  * rsl: Improve logic reactivating CCCH upon SI3 BS_AG_BLKS_RES change
+
+  [ Oliver Smith ]
+  * gitignore: add vty pdf
+  * doc: rsl: add RSL_IE_IPAC_RTP_CSD_FORMAT
+  * rsl_rx_ipac_XXcx: parse csd_fmt_d/ir
+  * debian: set compat level to 10
+  * systemd: depend on networking-online.target
+  * gitignore: add arm-poky-linux-gnueabi-libtool
+  * osmo-bts-sysmo: trx_mute_on_init_cb: call bts_update_status
+  * osmo-bts-sysmo: activate_rf: no dispatch on fail
+  * osmo-bts-sysmo/l1_if: move mute_rf_compl_cb up
+  * osmo-bts-sysmo: mute PHY until OML is ready
+
+  [ Harald Welte ]
+  * DTX: bts-{sysmo,oc2g,lc15}: Print DEBUG messages about ONSET
+  * cosmetic: Replace %i with %d
+  * Introduce LOGPLCFN() for logging lchan-name + frame number
+  * bts-{sysmo,oc2g,lc15}: Fix RTP of AMR SID_FIRST_P1
+  * common/vty: Print AMR MultiRate Configuration in "show lchan"
+  * bts-{sysmo,oc2g,lc15}: Dump logical channel params during MPH-ACTIVATE.req
+  * cosmetic: use __func__ instead of __FUNCTION__
+  * lc15: fix compiler warning about wrong indent
+  * lc15: Remove unused warning
+  * lc15/oc2g: remove unused variables
+  * oc2g: Fix 'unused variable' compiler warning
+  * cosmetic: Remove "FIXME?" from Odd AMR CMI phase
+  * lc15: fix compiler warning about unused variable cell_size
+  * Replace explicit gsm_lchan_name() calls with LOGPLCHAN
+  * logging: Introduce LOGPLCGT()
+  * cosmetic: Change LOGPLCFN argument order
+  * paging: Add support for generating NLN/NLN-Status in P1 Rest Octets
+  * Add ASCI (advanced speech call items) log sub-system
+  * ASCI: NCH / NOTIFICATION support
+  * validate RSL "channel rate and type" against VGCS/VBS flags
+  * Store "Channel rate and type" from RSL Channel Mode IE in BTS
+  * ASCI: VGCS/VBS RACH -> RSL TALKER/LISTENER DETECT
+  * sysmo: Enable VGSCS + VBS feature flags
+  * omldummy: Claim to support VBS + VGCS towards BSC
+
+  [ Mychaela N. Falconia ]
+  * trx: detect UL SID in EFR just like in FR
+  * sysmo: fix handling of SID in EFR
+  * common: implement rtp continuous-streaming mode
+  * rtp continuous-streaming: fix BFI in the quality-suppressed case
+  * sysmo: emit empty RTP ticks during FACCH stealing on TCH/F
+  * bts-{lc15,oc2g,sysmo}: support EFR in repeat_last_sid()
+  * RTP input, FR & EFR: preen incoming payloads for SID errors
+  * lc15,oc2g: fix handling of SID in EFR
+  * all models, FR/EFR UL: change SID check to _is_any_sid()
+  * trx: remove model-specific BFI packet formats
+  * refactor: replace rtppayload_is_valid() with preening before enqueue
+  * all models, HR1 codec: accept both TS101318 and RFC5993 formats
+  * trx: fix HR1 codec breakage from format change
+  * trx, HR1 codec: change UL PHY output format to TS 101 318
+  * all models, HR1 codec: select RTP output format via vty option
+  * FR/HR/EFR TCH DL: implement DTX rules
+  * HR1 codec: validate ToC header in RFC5993 RTP input
+  * HR1 codec: act on SID indication in RFC5993 RTP input
+  * trx TCH DL: transmit invalid speech blocks instead of dummy FACCH
+  * ECU in UL path: make it optional per vty config
+  * ECU in UL path: move state alloc/free to l1sap
+  * ECU in UL path: move it from trx model to l1sap
+
+  [ Sylvain Munaut ]
+  * contrib: Add BER testing tool
+
+  [ Andreas Eversberg ]
+  * Change return value of bts_supports_cm() from int to bool
+  * ASCI: Add function to reactivate channel
+  * ASCI: Retrieve NCH position from System Information 1
+  * ASCI: Add Notification CHannel (NCH) support
+  * ASCI: Add support for rest octets in Paging request type 2 and 3
+  * ASCI: Send only NLN on Paging request type 1 rest octets
+  * ASCI: Add Notification/FACCH support
+  * ASCI: Repeat UPLINK FREE message until uplink becomes busy
+  * Add test cases for rest octets of Paging Requests
+  * ASCI: Enable UPLINK ACCESS on various BTS models
+
+  [ Keith ]
+  * Fix incorrect order of params passed to logging macro
+
+ -- Pau Espin Pedrol <pespin@sysmocom.de>  Tue, 12 Sep 2023 16:05:30 +0200
+
+osmo-bts (1.6.0) unstable; urgency=medium
+
+  [ Vadim Yanitskiy ]
+  * osmo-bts-trx: call osmo_timer_del() unconditionally
+  * osmo-bts-trx: amr_loop: trigger the loop unconditionally
+  * osmo-bts-trx: fix handling of ciphering params in PRIM_INFO_MODIFY
+  * osmo-bts-trx: rx_rach_fn(): properly detect handover RACH
+  * osmo-bts-trx: handle MTS 0b0110 indicating an Access Burst
+  * osmo-bts-trx: use lookup tables for checking AMR CMI/CMR on Downlink
+  * osmo-bts-trx: drop ul_amr_fn_is_cmi() / dl_amr_fn_is_cmi()
+
+  [ Pau Espin Pedrol ]
+  * rsl: rx ipac crcx/mdcx: Log payload_type2
+  * logging: Move category descriptions to be in order with enum
+  * Clean up osmo-bts-*/Makefile.am
+  * Split out lchan rtp socket creation from rsl handling code
+  * Avoid counting lchan->dl_tch_queue length every time a msg is enqueued
+  * Use libosmocore API msgb_queue_free() to free lists
+  * rsl: Reduce scope of variable
+  * Move lchan_dl_tch_queue_enqueue to lchan.c and make it public
+  * cosmetic: Fix formatting of if-else block brackets
+  * Depend on libosmo-netif
+  * Clarify RTP AMR header offset in TCH enc/dec
+  * tests/*/Makefile.am: Fix typo in LIBOSMONETIF_CFLAGS
+  * tests/*/Makefile.am: Add missing libosmo-netif cflags
+  * oc2g: Makefile.am Fix typo in LIBOSMONETIF_LIBS
+  * Introduce Osmux support
+  * abis: Avoid TCP/IPA RSL sockets continue conn establishment while shutting down
+  * osmux: Log sendto() error
+  * lchan: Reset Abis RTP/Osmux config during lchan release
+  * vty: Fix SPEECH_MODE printed with hex prefix but dec value
+  * vty: Print Osmux CID on lchans using Osmux
+  * Allocate struct osmux_in_handle through new libosmo-netif APIs
+  * osmux: Drop logging of osmux internal counters
+  * osmux: Match remote address in osmux_lchan_find()
+  * osmux: Log remote address upon rx of osmux pkt
+  * osmux: Lower log level when osmux batch received for unknown CID
+  * osmux: nullify osmux.rtpst after freeing it
+  * osmux: Skip lchans in lookup which still have no remote associated
+  * osmux: Close osmux socket when bts is freed
+  * osmux: Fix null ptr dereference sending UL data before the remote is configured
+  * osmux: Rotate over available Osmux CID when allocating a new one
+  * osmux: Use new osmux_xfrm_input API to set name on each link
+  * vty: Fix typo in write-config: osmux / local-port
+  * vty: Fix typo in symbol name
+
+  [ Max ]
+  * Set working directory in systemd service file
+  * Don't manually create pid file
+  * Document realtime options in .service units
+  * Update realtime scheduling priority in service file
+  * ctrl: take both address and port from vty config
+  * Add SI10 support
+
+  [ Philipp Maier ]
+  * pcu_sock: fix sourcecode formatting
+  * measurement: do not call msgb_l3len without checking
+  * l1sap: do not call msgb_l2hlen without checking
+  * rsl: use unsigned int
+  * pcuif_proto: cosmetic: add constant PCU_IF_NUM_NSVC and replace magic numbers
+  * sched_lchan_tchf: replace numeric constant with define constant
+  * l1sap: remove unused pointer variable
+  * pcuif_proto: use define constant to specify nax number of trx
+  * pcu_sock: use ARRAY_SIZE rather then magic number
+
+  [ Keith ]
+  * osmo-bts-trx: respond to tx-attenuation config in real time.
+
+  [ Harald Welte ]
+  * update outdated vty copyright statement
+
+  [ Daniel Willmann ]
+  * shutdown_fsm: Only ramp down power when stopping bts through Ctrl-C
+  * shutdown_fsm: Add power_ramp_force() to jump straight to the tgt power
+
+  [ daniel ]
+  * Revert "shutdown_fsm: Only ramp down power when stopping bts through Ctrl-C"
+
+  [ Alexander Couzens ]
+  * OML: NSVC[1] MO should have the same initial state as NVSC[0]
+
+  [ Oliver Smith ]
+  * oc2gbts_mgr_calib: fix build against gpsd >= 3.20
+  * contrib/jenkins: build libosmo-abis without dahdi
+
+  [ arehbein ]
+  * osmo-bts: Transition to use of 'telnet_init_default'
+
+ -- Pau Espin Pedrol <pespin@sysmocom.de>  Tue, 07 Feb 2023 17:15:52 +0100
+
+osmo-bts (1.5.0) unstable; urgency=medium
+
+  [ Pau Espin Pedrol ]
+  * bts_shutdown_fsm.h: Remove wrong comment describing enum
+  * bts: Properly free bts->shutdown_fi when struct gsm_bts is freed
+  * bts-trx: amr: Fix return code of osmo_amr_rtp_dec() checked too late
+  * Change some log levels NOTICE->INFO
+  * rsl: Conditionally decrease log level if cause is normal event
+  * bts-trx: Log lchan if avaialble in Meas Avg
+  * doc: rsl: Fix description of 'IP Connection Statistics' IE
+  * bts-trx: sched_lchan_tchh.c: Workaround gcc false positive error
+  * bts-sysmo: Replace use of deprecated ipa_client_conn_create API
+
+  [ Harald Welte ]
+  * cbch: Fix bts_smscb_state_reset() to avoid double-free
+  * cbch: Fix dangling cur_msg leading to double-free in bts_cbch_reset()
+  * [lc15,oc2g,octphy] Fix memory leak on write queue overflow
+  * update git URLs (git -> https; gitea)
+
+  [ Oliver Smith ]
+  * debian/control: add osmo-bts meta-package
+  * treewide: remove FSF address
+  * model_init: order features alphabetically
+  * model_init: set BTS_FEAT_PAGINATION_COORDINATION
+  * model_init: order features alphabetically, part 2
+  * src/common/bts.c: set BTS_FEAT_PAGING_COORDINATION
+  * src/common/bts.c: set BTS_FEAT_CCN
+
+  [ Vadim Yanitskiy ]
+  * oml: use proper talloc context in oml_rx_set_radio_attr()
+  * oml: use ts->trx as talloc-context in oml_rx_set_chan_attr()
+  * oml: fix copy-pasted comments in oml_rx_set_*_attr()
+  * oml: assign unique names to 'struct tlv_parsed' chunks
+  * osmo-bts-trx: use l1ts as talloc context for burst buffers
+  * osmo-bts-trx: fix a memleak in trx_sched_set_lchan()
+  * cbch: cosmetic: use talloc_zero() in bts_process_smscb_cmd()
+  * phy_instance_destroy(): fix NULL pointer dereference
+  * logging: get rid of logging category DSUM
+  * osmo-bts-trx: make use of OSMO_UNLIKELY() when handling TRXD PDUs
+  * osmo-bts-trx: cosmetic: use rate_ctr_inc2() instead of rate_ctr_inc()
+  * osmo-bts-trx: new rate counter 'trx_sched:dl_fh_cache_miss'
+  * VTY: fix ambiguity in BTS specific command definitions
+  * osmo-bts-trx: do not run osmo_{fr,hr}_check_sid() on FACCH/U frames
+  * osmo-bts-trx: rx_tchh_fn(): do not calculate BER10k for FACCH twice
+  * rsl: fix wrong IE being checked in rsl_rx_chan_activ()
+  * osmo-bts-trx: rx_tchh_fn(): fix HR SID detection (wrong offset)
+  * osmo-bts-trx: rx_tchh_fn(): mark valid SID frames as such
+  * osmo-bts-trx: use consistent naming for 'enum sched_meas_avg_mode'
+  * osmo-bts-trx: use a lookup table in trx_sched_meas_avg()
+  * osmo-bts-trx: rx_tchh_fn(): use proper meas averaging mode
+  * trx_sched_ul_burst(): get rid of the 'switch' statement
+  * fix gsm_bts_get_cbch(): CBCH can be allocated on Cn
+  * osmo-bts-trx: rx_tchh_fn(): indicate BER10k=0 for FACCH BFIs
+  * osmo-bts-trx: rx_tchh_fn(): get rid of chan_state->meas_avg_facch
+  * osmo-bts-trx: rx_{tchf,tchh}_fn(): also use meas_avg for BFI
+  * osmo-bts-trx: rx_{tchf,tchh}_fn(): shift Rx burst buffer on bid=0
+  * osmo-bts-trx: rx_{tchf,tchh}_fn(): ensure complete set of bursts
+  * osmo-bts-trx: rx_{tchf,tchh}_fn(): get TDMA FN from meas history
+  * osmo-bts-trx: rx_{tchh,tchf}_fn(): use AMR CMI lookup tables
+  * osmo-bts-trx: rx_{tchh,tchf}_fn(): use tch_mode directly
+  * osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode
+  * osmo-bts-trx: move AMR CMI lookup tables to the respective files
+  * osmo-bts-trx: rx_tchh_fn(): fix indexes in the AMR CMI lookup table
+  * osmo-bts-trx: rx_tchf_fn(): clarify indexes in the AMR CMI lookup table
+  * power_ctrl_params_def_reset(): set .ctrl_interval for both UL/DL
+  * scheduler: remove redundant OSMO_ASSERT() statements
+  * scheduler: rts_tchh_fn(): use a lookup table for FACCH/H
+  * osmo-bts-trx: rx_tchh_fn(): use a lookup table for FACCH/H
+  * osmo-bts-{trx,virtual}: tx_tchh_fn(): remove FACCH/H alignment check
+  * osmo-bts-trx: rename 'loops.[ch]' to 'amr_loop.[ch]'
+  * osmo-bts-trx: use '#pragma once' in amr_loop.h
+  * osmo-bts-trx: amr_loop: remove unneeded #includes
+  * rsl: de-duplicate parsing of MultiRate configuration IE
+  * rsl: rsl_rx_chan_{activ,modif}: do not sent an Error Report
+  * rsl: parse_multirate_config(): check if AMR codec is used
+  * logging: use a different color tone for DLOOP
+  * rsl: always check return value of rsl_tlv_parse()
+  * rsl: misc / cosmetic fixes for tx_ipac_XXcx_nack()
+  * osmo-bts-virtual: remove unused 'codec_mode_request' argument
+  * l1sap: l1sap_chan_act(): alloc DTX FSM only for TCH
+  * l1sap: l1sap_chan_act(): remove unused *tp argument
+  * osmo-bts-trx: bts_report_interf_meas(): remove unused fn param
+  * rsl: use hard-coded defaults if the MultiRate conf IE is absent
+  * tests/amr/Makefile.am: use proper binary name prefix 'amr_test_'
+  * tests/amr: add a unit test for amr_parse_mr_conf()
+  * amr: fix parsing of threshold and hysteresis in amr_parse_mr_conf()
+  * tests: use 'check_PROGRAMS' instead of 'noinst_PROGRAMS'
+  * struct amr_multirate_conf: remove ms_mode[], raname bts_mode[]
+  * common: fix coding style: if is not a function
+  * osmo-bts-trx: amr_loop: simplify trx_loop_amr_set()
+  * osmo-bts-trx: use C/I in the AMR link adaptation loop
+  * osmo-bts-trx: amr_loop: improve logging in trx_loop_amr_input()
+  * osmo-bts-trx: amr_loop: allow upgrading codec mode > 0
+  * osmo-bts-trx: amr_loop: log if AMR mode remains unchanged
+  * osmo-bts-trx: amr_loop: do not miss C/I samples
+  * osmo-bts-trx: prioritize FACCH in s/tx_tch_common()/tch_dl_dequeue()/s
+  * osmo-bts-trx: tx_tchh_fn(): make handling of FACCH/H cleaner
+  * osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F
+  * VTY: fix NULL-pointer dereference in 'show transceiver'
+  * osmo-bts-trx: check if scheduling of [dummy] FACCH/H is allowed
+  * osmo-bts-trx: rx_{tchh,tchf}_fn(): improve logging of AMR DTX frames
+  * pcu_sock: comment out {dl,ul}_tbf_ext related warnings
+  * osmo-bts-trx: drop Uplink loss detection from Downlink path
+  * scheduler: trx_sched_is_sacch_fn(): make ts pointer const
+  * struct bts_ul_meas: reflect C/I units in field name s/c_i/ci_cb/
+  * tests/meas: improve logging in test_ts45008_83_is_sub_single()
+  * tests/meas: improve test_ts45008_83_is_sub_is_sub()
+  * measurement: log SUB/FULL as text in lchan_new_ul_meas()
+  * measurement: move SACCH detection to process_l1sap_meas_data()
+  * measurement: fix matching of SUB frames by TDMA FN
+  * osmo-bts-trx: rx_tchf_fn(): do not treat AFS_SID_UPDATE as SUB frame
+  * Revert "osmo-bts-trx: rx_tchf_fn(): do not treat AFS_SID_UPDATE as SUB frame"
+
+ -- Pau Espin Pedrol <pespin@sysmocom.de>  Wed, 29 Jun 2022 09:41:38 +0200
+
+osmo-bts (1.4.0) unstable; urgency=medium
+
+  [ Philipp Maier ]
+  * l1sap: Store status of SRR in an lchan struct memeber
+  * l1sap: add logging and VTY introspection for ACCH repetition
+  * sched_lchan_tchh: fix frame number and fill FACCH gap
+  * main,abis: change model name from sysmoBTS to osmo-bts
+  * paging: prioritize CS related paging over PS related pagings.
+  * allow to configure multiple oml remote-ip addresses
+  * sched_lchan_tch_x: do not use cmr as ft
+  * sched_lchan_tch_x: use functions to determine AMR tranmssion phase
+  * sched_lchan_tch_x: use ul_cmr and ul_ft when generating RTP bad frame
+  * rsl: simplfy parse_repeated_acch_capability
+  * rsl: parse temporary overpower value RSL CHAN ACT / MODIFY
+
+  [ Vadim Yanitskiy ]
+  * doc/examples: remove obsolete power control parameters
+  * doc/examples: enable stderr logging for osmo-bts-virtual.cfg
+  * osmo-bts-trx: fix: do not call trx_if_close() two times
+  * osmo-bts-trx: fix segfault on trx_phy_inst_open() failure
+  * l1sap: use the passed 'trx' pointer in l1sap_chan_act()
+  * l1sap: use TLVP_PRES_LEN() macro in l1sap_chan_act()
+  * l1sap: check BTS_FEAT_MULTI_TSC in l1sap_chan_act()
+  * l1sap: fix wrong IEI and parsing in l1sap_chan_act()
+  * manuals: fix wrong VTY node for 'gsmtap-sapi' command
+  * manuals: document GSMTAP 'enable-all' / 'disable-all'
+  * osmo-bts-trx: correct definition of 'osmotrx rx-gain' command
+  * rsl: do not blindly ignore unhandled/unknown Channel Mode
+  * manuals: remove deprecated command line parameters
+  * manuals: document new 'gsmtap-remote-host' command
+  * l1sap: fix incorrect pointer cast in l1sap_chan_act()
+  * rsl: rename, fix and refactor lchan_tchmode_from_cmode()
+  * rsl: add missing Channel Mode values to rsl_handle_chan_mod_ie()
+  * lchan2lch_par(): fix missing default branch in switch
+  * osmo-bts-trx: cosmetic: TRXD 'header version' -> 'PDU version'
+  * osmo-bts-trx: remove outdated TRXD protocol documentation
+  * osmo-bts-trx: cosmetic: use '#pragma once' in trx_if.h
+  * osmo-bts-trx: define TRXC/TRXD message buffer size
+  * osmo-bts-trx: 'burst type' is actually modulation type
+  * osmo-bts-trx: move MTS parser into trx_data_parse_mts()
+  * osmo-bts-trx: discard TRXD PDUs with unexpected version
+  * osmo-bts-trx: move TDMA frame number check to trx_data_read_cb()
+  * osmo-bts-trx: cosmetic: get rid of TRX_CHDR_LEN macro
+  * osmo-bts-trx: generalize checking of TRXD header length
+  * osmo-bts-trx: pass 'struct phy_instance' to TRXD dissectors
+  * osmo-bts-trx: refactor handling of version specific TRXD parts
+  * osmo-bts-trx: enlarge and share TRXD message buffer
+  * osmo-bts-trx: assert PDU version in trx_if_send_burst()
+  * osmo-bts-trx: reduce code nasting in trx_if_send_burst()
+  * vty: fix the use of deprecated osmo_bts_feature_name()
+  * common/abis: fix the use of deprecated e1inp_line_get() API
+  * osmo-bts-trx: refactor parse_rsp(), fix compilation warnings
+  * rsl: fix wrong value printed in rsl_handle_chan_mod_ie()
+  * struct gsm_bts_trx: remove unused leftovers from openbsc
+  * common/sysinfo: make struct gsm_bts_trx const in num_agch()
+  * osmo-bts-{lc15,oc2g}: drop redundant checks in VTY commands
+  * [VAMOS] struct gsm_bts_trx: fix the PHY instance pointer
+  * [VAMOS] Merge bts_trx_init() into gsm_bts_trx_alloc()
+  * [VAMOS] osmo-bts-trx: move {chan,bid} to trx_{dl,ul}_burst_{req,ind}
+  * osmo-bts-trx: implement TRXDv2 protocol support
+  * scheduler.h: cosmetic: use #pragma once
+  * osmo-bts-trx: cosmetic: s/trx_sched_fn/bts_sched_fn/g
+  * osmo-bts-trx: remove redundant assert() in bts_sched_fn()
+  * osmo-bts-trx: fix hopping pointer bug in bts_sched_fn()
+  * [VAMOS] Re-organize osmo-bts-trx specific structures
+  * osmo-bts-trx: clarify logging messages in trx_if_{open,close}()
+  * osmo-bts-{trx,virtual}: fix: pinst->trx may be NULL
+  * common: make the arguments of phy_{link,instance}_name() const
+  * [VAMOS] common: make 'struct gsm_bts_trx_ts' pointers const
+  * [VAMOS] gsm_data.h: fix wrong bit-mask in BSIC2BCC macro
+  * [VAMOS] gsm_data.h: introduce and use BTS_TSC macro
+  * common: phy_links_open(): warn about dangling PHY instances
+  * [VAMOS] osmo-bts-trx: rework and split up bts_sched_fn()
+  * Fix regression in 'osmo-bts-trx: rework and split up bts_sched_fn()'
+  * [VAMOS] osmo-bts-trx: implement and enable PDU batching for TRXDv2
+  * [VAMOS] osmo-bts-trx: indicate MTS in Downlink TRXDv2 PDUs
+  * [VAMOS] rsl_rx_mode_modif(): handle Channel Identification IE
+  * [VAMOS] rsl: call bts_supports_cm() from rsl_handle_chan_mod_ie()
+  * [VAMOS] bts_supports_cm(): handle RSL_CMOD_CRT_OSMO_TCH_VAMOS_{Bm,Lm}
+  * [VAMOS] common/scheduler: unify symbol names for training sequences
+  * [VAMOS] osmo-bts-trx: rework handling of Training Sequence
+  * [VAMOS] osmo-bts-trx: properly handle per-timeslot TSC values
+  * [VAMOS] scheduler: add new GMSK training sequences from 3GPP 45.002
+  * [VAMOS] l1sap_chan_act(): handle Osmocom specific TSC IE
+  * [VAMOS] common/oml: generalize checking BTS_FEAT_MULTI_TSC
+  * [VAMOS] gsm_pchan2chan_nr(): use ABIS_RSL_CHAN_NR_CBITS_* macros
+  * [VAMOS] rsl_lchan_lookup(): use ABIS_RSL_CHAN_NR_CBITS_* macros
+  * [VAMOS] rsl_lchan_lookup(): make it more readable
+  * [VAMOS] gsm_data: rework and rename gsm_lchan_name_compute()
+  * [VAMOS] l1sap: get_lchan_by_chan_nr() may return NULL
+  * [VAMOS] oml_rx_set_chan_attr(): clarify NM_ATT_CHAN_COMB handling
+  * manuals/abis/rsl.adoc: s/TS 08.58/TS 48.058/
+  * manuals/abis/rsl.adoc: rework Channel Number description
+  * manuals/abis/rsl.adoc: add missing CBCH Channel Number values
+  * manuals/abis/rsl.adoc: add VAMOS specific Channel Number values
+  * osmo-bts-trx: fix NULL pointer dereference in trx_if_send_burst()
+  * trx_sched_is_sacch_fn(): fix handling of dynamic timeslots
+  * [VAMOS] scheduler: drop meaningless channel number checks
+  * [VAMOS] conf_lchans_as_pchan(): improve readability
+  * [VAMOS] Implement the concept of 'shadow' timeslots
+  * [VAMOS] osmo-bts-trx: schedule bursts on 'shadow' timeslots
+  * l1sap: fix TDMA frame number wrap in l1sap_info_time_ind()
+  * conf_lchans_as_pchan(): fix GSM_LCHAN_{CCCH->CBCH} regression
+  * conf_lchans_as_pchan(): initialize all lchans with GSM_LCHAN_NONE
+  * measurement: remove over-defensive checks in is_meas_complete()
+  * [VAMOS] trx_sched_init_ts(): assign names to per-timeslot counters
+  * common/vty: facilitate finding duplicate PHY/TRX associations
+  * vty: ensure all warning messages are prefixed with '%%'
+  * osmo-bts-octphy: drop talloc_replace(), use osmo_talloc_replace_string()
+  * l1sap: fix TDMA frame number arithmetic in fn_ms_adj()
+  * osmo-bts-trx: fix typo: s/bisc/bsic/ in 'show transceiver'
+  * osmo-bts-trx: fix copy-pasted comment: s/sysmoBTS/osmo-bts-trx/
+  * oml: fix handling of NM_ATT_INTERF_BOUND attribute
+  * Report interference levels in RSL RF RESource INDication
+  * scheduler: reorder enum trx_chan_type, add TRX_CHAN_IS_DEDIC()
+  * osmo-bts-trx: report interference levels to the upper layers
+  * osmo-bts-{trx,virtual}: get rid of dummy tx_idle_fn()
+  * scheduler: unset TRX_CHAN_FLAG_AUTO_ACTIVE for TRXC_IDLE
+  * osmo-bts-trx: print timeslot brief info in 'show transceiver'
+  * osmo-bts-trx: measure interference levels on TRXC_IDLE
+  * osmo-bts-trx: report PDCH interference levels to the PCU
+  * scheduler: fix wrong union field in trx_sched_tch_req()
+  * scheduler: fix: use ts_pchan() in trx_sched_set_cipher()
+  * Revert "power_control: BS power shall not be reduced on C0"
+  * osmo-bts-omldummy: indicate BTS_FEAT_BCCH_POWER_RED as supported
+  * osmo-bts-trx: implement BCCH carrier power reduction mode
+  * power_control: constrain BS power reduction on BCCH carrier
+  * manuals/abis/rsl.adoc: clarify RF Resource Indication conformance
+  * rsl: use tlvp_val16be() in rsl_rx_ipac_XXcx()
+  * gsm_lchan_interf_meas_calc_band(): also print number of AVG samples
+  * osmo-bts-trx: send dummy FACCH in the absense of RTP frames
+  * osmo-bts-trx: return -ENODEV if 'bursts_p' is NULL
+  * l1sap: unify channel (de)activation/modification messages
+  * gsm_lchan2chan_nr(): separate RSL specific variant of this API
+  * osmo-bts-trx: bts_model_l1sap_down(): remove chan_nr patching
+  * trx_sched_set_lchan(): use LOGL_INFO for logging messages
+  * osmo-bts-trx: remove an 'else' branch in _sched_dl_burst()
+  * osmo-bts-trx: implement Temporary Overpower for SACCH/FACCH
+  * scheduler: fix comments explaining the interleaving of TCH/H
+  * fix handle_ms_meas_report(): properly count measurement reports
+  * abis: fix memory leak in abis_oml_sendmsg()
+  * rsl: remove redundant logging in rsl_rx_chan_activ()
+  * .gitignore: add tests/amr/amr_test
+  * rsl: prevent race condition during timeslot re-configuration
+  * rsl_tx_rf_res(): separate interference AVG / band calculation
+  * rsl_tx_rf_res(): also report noise levels for PDTCH
+  * osmo-bts-trx: report PDCH interference levels to L1SAP
+  * l1sap: check if BTS model supports interference reporting
+  * vty: show interference level / band in 'show lchan'
+  * trx_sched_clean_ts(): also free() the associated 'struct l1sched_ts'
+  * trx_sched_clean(): also free() the shadow timeslot
+  * osmo-bts-trx: refactor 'maxdly' / 'maxdlynb' commands
+  * rsl: rsl_tx_meas_res() does not change l3, make it const
+  * rsl: send NACK if BTS_FEAT_ACCH_REP is not supported
+  * measurement: handle_ms_meas_report() accepts const gh
+  * measurement: move repeated_dl_facch_active_decision() here
+  * measurement: make sure that DL measurements are valid
+  * cosmetic: s/repeated_acch_capability/rep_acch_cap/g
+  * struct gsm_lchan: group ACCH repetition state fields
+  * struct gsm_lchan: move tch.rep_facch to rep_acch.dl_facch
+  * measurement: fix wrong operator used in handle_ms_meas_report()
+  * osmo-bts-trx: fix potential NULL pointer dereference
+  * lchan_set_state(): also free pending messages if any
+  * lchan: introduce and use lchan_is_tch() helper
+  * [overpower] rsl: store full content of RSL_IE_OSMO_TEMP_OVP_ACCH_CAP
+  * [overpower] lchan_dump_full_vty(): print overpower state
+  * [overpower] scheduler: handle {sacch,facch}_enabled flags
+  * l1sap: fix handling of lchan->pending_rel_ind_msg
+  * l1sap: move false PTCCH/U detection into PDCH branch
+  * l1sap: use designated initializers in process_l1sap_meas_data()
+  * l1sap: process_l1sap_meas_data() accepts pointer to lchan
+  * l1sap: make 'l1sap' argument of process_l1sap_meas_data() const
+  * rsl: fix a memory leak in handle_gprs_susp_req()
+  * l1sap: rework handling of DATA.ind on SACCH
+  * lchan_meas_handle_sacch(): check if Measurement Result is valid
+  * measurement: get rid of *le in lchan_meas_handle_sacch()
+  * measurement: pass *mr to repeated_dl_facch_active_decision()
+  * measurement: pass *mr to lchan_bs_pwr_ctrl()
+  * [overpower] Turn it on and off depending on DL RxQual
+  * measurement: make use of gsm48_meas_res_is_valid()
+  * common/Makefile.am: reformat {AM_CPPFLAGS,AM_CFLAGS,LDADD}
+  * rsl: exclude disabled timeslots from interference reports
+  * oml: use ARRAY_SIZE() in oml_rx_set_bts_attr()
+  * gsm_lchan_interf_meas_calc_avg(): fix band calculation
+
+  [ Pau Espin Pedrol ]
+  * l1sap: Transmit pdtch invalid MAC blocks to PCU
+  * bts-trx: Always submit rx PDTCH DATA.ind to l1sap
+  * bts-trx: Avoid submitting first data_ind with FN=0 to upper layers
+  * bts-trx: Drop duplicate set of last_clk_ind
+  * bts-trx: reorder first timerfd schedule to decrease first timeout skew
+  * sysmo,oc2g,lc15: Make RadioChannel MO depend on RadioCarrier MO
+  * bts: Clean up TS selection in sign_link_up
+  * Fix regression in 'bts: Clean up TS selection in sign_link_up'
+  * Add missing value_string for NM_EV_* introduced recently
+  * pcuif: Set missing bsic field during Tx of info_ind
+  * Use new stat item/ctr getter APIs
+  * rsl: Use switch statement in rsl_rx_bcch_info()
+  * pcu_sock: Transmit SI2
+  * doc: rsl.adoc: Fix trailing whitespace
+  * gsm_data: Drop unused function gsm_pchan_parse()
+  * pcuif_proto.h: Add new container messages
+  * Support forwarding proto IPAC_PROTO_EXT_PCU BSC<->PCU
+  * Rename osmo dyn ts enums to contain SDCCH8
+  * Support SDCCH8 in osmo dyn ts
+  * Make gcc 11.1.0 false positivies happy
+  * rsl: Fix rx of multiple RSL_IPAC_EIE_MEAS_AVG_CFG IEs
+  * rsl: Support parsing up to 3 RSL_IPAC_EIE_MEAS_AVG_CFG IEs
+  * MS Power Control Loop: Take C/I into account
+  * MS Power Control Loop: Support EWMA algorithm for C/I measurements
+  * MS Power Control Loop: Improve logging
+  * BS Power Control Loop: refactor lchan_bs_pwr_ctrl() to look similar to lchan_ms_pwr_ctrl()
+  * BS Power Control Loop: Support EWMA average algo for RxQual meas
+  * BS Power Control Loop: Increase attenuation if RxQual is better than upper threshold
+  * MS/BS Power Control Loop: Do RxLEV meas avg & delta calculations directly on RxLevels
+  * MS/BS Power Control Loop: Fix downscaling averaging bug
+  * Power Control Loop: Move skip loop logic to function helper
+  * comsetic: measurement.c: fix typo in comment
+  * l1sap: Take L1SACCH MS_PWR from bitfield instead of manual parsing
+  * TA loop: Take into account UL SACCH 'Actual Timing advance' field
+  * ta_control: Allow switching TA quicker
+  * lchan: Move TA CTRL param to its own substruct
+  * MS Power Control Loop: Feed UL RSSI from correct measurement period
+  * MS Power Control Loop: Feed UL C/I from correct measurement period
+  * TA Control Loop: Change toa256 switch threshold to 75% of a symbol
+  * Power Control Loop: Set P_CON_INTERVAL to 1 by default
+  * Support configuring TA loop SACCH block rate
+  * MS Power Control Loop: Fix sub vs full being passed to algo
+  * abis: Clear code and drop code not executed
+  * abis.h: Drop unused state
+  * cosmetic: fix typo in comment
+  * abis.c: Rearrange code to follow logic state order
+  * abis.c: Convert early return to assert()
+  * power_control: Drop unused param in function
+  * tests: MS Power Control Loop: Show oscillation among good power levels
+  * cosmetic: Fix formatting of conditional operator
+  * abis: Move FSM registration to constructor function
+  * abis: Shorten string names of events
+  * abis.c: Transition to CONNECTED state only when OML link is up
+  * abis.c: Fix mess with priv->bsc_oml_host
+  * abis.c: Loop over list of BSCs until connection succeeds
+  * trx_provision_fsm: Add missing state transition OPEN_WAIT_POWEROFF_CNF => OPEN_POWEROFF
+  * nm_*_fsm: Add missing item in event mask list for state ENABLED
+  * Allow setting administrative state through oml_mo_state_chg()
+  * nm_*_fsm: Set adminsitrative state 'shutting down' when shutdown procedure starts
+  * MS Power Control Loop: Fix oscillations within good MS Power Levels
+  * nm_*_fsm: Move to state Disabled NotInstalled Locked when shtudown proc ends
+  * abis: Drop internal OML msg queue
+  * nm_*fsm: Make FSMs aware of object being properly configured or not
+  * bts_shutdown_fsm: Fix event name
+  * trx_if: Set pointer to null after freeing it
+  * trx_if: Allow calling trx_if_flush/close from within TRXC callback
+  * trx_if: delete retrans timer when flushing the Tx queue
+  * trx_provision_fsm: Properly reset FSM state upon starting listening for events
+  * bts-trx: Submit TRX_PROV_EV_CFG_ARFCN for C0 during SetBtsAttr
+  * bts-trx: Get rid of check_transceiver_availability_trx()
+  * MS Power Control Loop: Disable threshold comparison on {LOWER,UPPER}_CMP_N=0
+  * l1sap: Support rx of empty rlcmac blocks from PCU
+  * bts-trx: Avoid race condition configuring TS-specific TSC values
+  * bts-trx: Submit TRX SW_ACT when PHY becomes connected
+  * trx_sched_clean_ts: Clean VAMOS shadow TS too
+  * phy_link: Introduce bts_model_phy_link_close() and use it in bts-trx
+  * nm_bts_fsm: Make sure PHYs are opened when SW_ACTivating it
+  * bts_shutdown_fsm: Allow configuring FSM to shutdown without exiting process
+  * abis: Call bts_model_abis_close() when  Abis link goes down
+  * bts_trx: Drop non-executed path in trx_link_estab()
+  * Avoid sending Load Indications when BTS is not RSL-connected
+  * abis: Fix memory leak of bts->osmo_link upon link going down
+  * abis: Fix line leaked & recreated upon every reconnect
+  * bts-trx: Keep the process ongoing trying to reconnect on Abis link down
+  * Revert "bts-trx: Keep the process ongoing trying to reconnect on Abis link down"
+  * Revert "abis: Fix line leaked & recreated upon every reconnect"
+  * osmo-bts-omldummy: Fix crash accessing null phy
+  * bts-trx: Fix rxgain & maxdly VTY values being reset
+  * Decouple handling of Measurement Report from lapdm
+  * Move TA & Power Loops further up the stack, take DTXu flag into account
+  * scheduler: Fix lqual_cb not populated for TCH.ind
+  * abis: Fix line leaked & recreated upon every reconnect
+  * trx_provision_fsm: Fix TRX!=0 never going back to CLOSED state
+  * trx_provision_fsm: Support OPEN_POWEROFF->CLOSED transition
+  * bts-trx: Delay power ramp up until RCARRIER is ENABLED
+  * Delay abis reconnect while bts is shutting down
+  * bts-trx: Keep the process ongoing trying to reconnect on Abis link down
+  * trx_provision_fsm: Drop unneeded reset of fields
+  * trx_provision_fsm: Drop impossible paths
+  * trx_provision_fsm: poweronoff_sent flag: track POWERON and POWEROFF separately
+  * trx_provision_fsm: Fix shutdown while POWERON in transit
+  * rsl: NACK Chan Activation for lchans on disabled TS
+  * Introduce gsm_lchan_init() function helper
+  * MS Power Control Loop: Use P_CON_INTERVAL=2 by default
+  * load_indication.c: Avoid sending if CCCH is still not operational
+  * Move lchan,power_ctrl specific code from gsm_data.h to their own files
+  * Move lchan,power_control related code from gsm_data.c to their own files
+  * lchan.h: Add related ticket info to FIXME comment
+  * Introduce gsm_lchan_release function helper
+  * nm_channel_fsm: Release lchans after BTS shutdown
+  * nm_bts_fsm: Reset si_valid bitmask when BTS is shut down
+  * nm_*_fsm: Move reset state code to st_op_disabled_notinstalled_on_enter
+  * nm_*_fsm: reset mo.nm_attr from previous runs when entering state NOT_INSTALLED
+  * Add new gsm_bts_trx_free_shadow_ts() function
+  * Make sure lchan allocated memory from shadow_ts is properly freed
+  * rsl: Fix all shadow TS being Chan Act NACKed
+  * bts-trx: Guard call to trx_sched_clean with NULL trx ptr
+  * lchan: Setup early_rr_ia timer only once during init
+  * Move lchan related code to lchan.{c,h}
+  * lchan: Update log line level to use macro and level INFO
+  * lchan: Avoid applying transition changes if state new==old
+  * Move lchan_deactivate() to lchan.c
+  * Move lchan_init_lapdm inside lchan_set_state(LCHAN_S_ACTIVE)
+  * lchan: Call lapdm_channel_exit() when state changes to NONE
+  * bts_shutdown_fsm: Make sure pending power ramping are aborted before closing TRX
+  * gsm_pchan2chan_nr(): Properly assert if unexpected pchan is passed
+  * Reset CBCH state after BTS shutdown
+  * bts-trx: sched_lchan_pdtch: Refactor tx_pdtch_fn to get rid of goto tag
+  * bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly
+  * Revert "bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly"
+  * scheduler: Fix check against empty PDCH blocks
+  * bts-trx: sched: tx_pdtch_fn: Drop log line clogging logs
+  * l1sap: Avoid re-(de)activating already (de)active lchans
+  * scheduler: Avoid crash upon call to trx_sched_set_lchan if l1ts is uninitialized
+  * bts-trx: sched_lchan_tchf: Drop impossible code path
+  * scheduler: Fix FACCH msg with l2len==0 going to lower layers and logging errors
+  * bts-trx: sched_lchan_tchf: Change log level to debug for line informing about missing dl prim
+  * abis: Drop unneded if condition in else clause
+  * abis: Try one reconnect to previously connected BSC before trying next one
+  * gsm_ts_release(): Make sure pchan{,is_want} is reset to NONE
+
+  [ Neels Hofmeyr ]
+  * osmobts-abis.adoc: add missing bibliography
+  * Abis manual: s/TS 12.21/TS 52.021
+  * Abis manual: add Get Attributes, add BTS features
+  * Abis manual: add VAMOS to BTS features
+  * Abis manual: add RSL_IE_OSMO_TRAINING_SEQUENCE
+  * omldummy: introduce using getopt_long
+  * omldummy: add cmdline arg --features
+  * [VAMOS] osmo-bts-omldummy: allocate shadow timeslots
+  * remove unused LCHAN_S_INACTIVE
+  * enable Early Immediate Assignment
+  * add VTY transcript testing
+  * jenkins: enable new flag --enable-external-tests
+  * add osmo_tdef groups, exposing T timers on VTY config
+  * early IMM ASS: add configurable delay for RR IMM ASS
+  * early IA: change default X15 timer to 0 ms
+  * gsm_lchan_interf_meas_calc_avg(): adapt to the order of boundaries
+
+  [ Harald Welte ]
+  * Introduce ability to set socket priority of RTP sockets
+  * manual: Include QoS chapter and add osmo-bts specific example
+  * manual: Remove manual revision history; we don't use it anywawy
+  * manuals: Update copyright years
+  * l1sap/gsmtap: Don't log UI fill frames [zero information field]
+  * rsl: fix handling of REL IND in lapdm_rll_tx_cb()
+  * initial support for static userspace probes via systemtap
+
+  [ Keith ]
+  * sysmobts-mgr: Fix path to hwmon in /sys
+
+  [ Eric Wild ]
+  * osmo-bts-trx: indicate A5/4 support, handle Kc128
+
+  [ Oliver Smith ]
+  * debian/control: remove dh-systemd build-depend
+
+  [ Eric ]
+  * lc15, oc2g, sysmo: fix show dsp-trace-flags
+  * osmo-trx: fix maxdly
+
+  [ Martin Hauke ]
+  * osmo-bts-trx-calypso.cfg: Adjust settings to work with current osmo-bts versions
+
+ -- Pau Espin Pedrol <pespin@sysmocom.de>  Tue, 16 Nov 2021 16:40:05 +0100
+
 osmo-bts (1.3.0) unstable; urgency=medium
 
   [ Michael McTernan ]

debian/compat

@@ -1 +1 @@
-9
+10

debian/control

@@ -2,25 +2,41 @@ Source: osmo-bts
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Section: net
 Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 10),
                pkg-config,
                dh-autoreconf,
-               dh-systemd (>= 1.5),
                autotools-dev,
                pkg-config,
-               libosmocore-dev (>= 1.5.0),
-               libosmo-abis-dev (>= 1.1.0),
+               libosmocore-dev (>= 1.9.0),
+               libosmo-abis-dev (>= 1.5.0),
+               libosmo-netif-dev (>= 1.4.0),
                libgps-dev,
                txt2man,
-               osmo-gsm-manuals-dev (>= 1.1.0)
+               osmo-gsm-manuals-dev (>= 1.5.0)
 Standards-Version: 3.9.8
-Vcs-Browser: http://git.osmocom.org/osmo-bts/
-Vcs-Git: git://git.osmocom.org/osmo-bts
+Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-bts
+Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-bts
 Homepage: https://projects.osmocom.org/projects/osmobts
 
+Package: osmo-bts
+Architecture: any
+Depends: osmo-bts-trx, osmo-bts-virtual, ${misc:Depends}
+Description: Base Transceiver Station for GSM
+ OsmoBTS is a software implementation of Layer2/3 of a BTS. It implements the
+ following protocols/interfaces:
+    LAPDm (GSM 04.06)
+    RTP
+    A-bis/IP in IPA multiplex
+    OML (GSM TS 12.21)
+    RSL (GSM TS 08.58)
+ .
+ OsmoBTS is modular and has support for multiple back-ends. A back-end talks to
+ a specific L1/PHY implementation of the respective BTS hardware. Based on this
+ architecture, it should be relatively easy to add a new back-end to support
+ so-far unsupported GSM PHY/L1 and associated hardware.
+
 Package: osmo-bts-trx
 Architecture: any
-Conflicts: osmo-bts
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: osmo-bts-trx GSM BTS with osmo-trx
  osmo-bts-trx to be used with the osmo-trx application
@@ -35,7 +51,6 @@ Description: Debug symbols for the osmo-bts-trx
 
 Package: osmo-bts-virtual
 Architecture: any
-Conflicts: osmo-bts
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Virtual Osmocom GSM BTS (no RF hardware; GSMTAP/UDP)
  This version of OsmoBTS doesn't use actual GSM PHY/Hardware/RF, but

doc/examples/Makefile.am

@@ -1,16 +1,29 @@
-OSMOCONF_FILES = virtual/osmo-bts-virtual.cfg
+# all config examples must be listed here unconditionally, so that
+# all of them end up in the release tarball (see OS#6349)
+EXTRA_DIST = \
+	trx/osmo-bts-trx.cfg \
+	trx/osmo-bts-trx-calypso.cfg \
+	octphy/osmo-bts-trx2dsp1.cfg \
+	octphy/osmo-bts-octphy.cfg \
+	oc2g/osmo-bts-oc2g.cfg \
+	oc2g/oc2gbts-mgr.cfg \
+	sysmo/sysmobts-mgr.cfg \
+	sysmo/osmo-bts-sysmo.cfg \
+	litecell15/osmo-bts-lc15.cfg \
+	litecell15/lc15bts-mgr.cfg \
+	virtual/osmo-bts-virtual.cfg \
+	$(NULL)
 
 doc_virtualdir = $(docdir)/examples/osmo-bts-virtual
 doc_virtual_DATA = \
         virtual/osmo-bts-virtual.cfg
-EXTRA_DIST = $(doc_virtual_DATA)
+OSMOCONF_FILES = virtual/osmo-bts-virtual.cfg
 
 if ENABLE_SYSMOBTS
 doc_sysmodir = $(docdir)/examples/osmo-bts-sysmo
 doc_sysmo_DATA = \
         sysmo/osmo-bts-sysmo.cfg \
         sysmo/sysmobts-mgr.cfg
-EXTRA_DIST += $(doc_sysmo_DATA)
 OSMOCONF_FILES += sysmo/osmo-bts-sysmo.cfg sysmo/sysmobts-mgr.cfg
 endif
 
@@ -19,7 +32,6 @@ doc_trxdir = $(docdir)/examples/osmo-bts-trx
 doc_trx_DATA = \
         trx/osmo-bts-trx.cfg \
         trx/osmo-bts-trx-calypso.cfg
-EXTRA_DIST += $(doc_trx_DATA)
 OSMOCONF_FILES += trx/osmo-bts-trx.cfg
 endif
 
@@ -28,7 +40,6 @@ doc_octphydir = $(docdir)/examples/osmo-bts-octphy
 doc_octphy_DATA = \
         octphy/osmo-bts-trx2dsp1.cfg \
         octphy/osmo-bts-octphy.cfg
-EXTRA_DIST += $(doc_octphy_DATA)
 OSMOCONF_FILES += octphy/osmo-bts-octphy.cfg
 endif
 
@@ -37,7 +48,6 @@ doc_lc15dir = $(docdir)/examples/osmo-bts-lc15
 doc_lc15_DATA = \
         litecell15/osmo-bts-lc15.cfg \
         litecell15/lc15bts-mgr.cfg
-EXTRA_DIST += $(doc_lc15_DATA)
 OSMOCONF_FILES += litecell15/osmo-bts-lc15.cfg litecell15/lc15bts-mgr.cfg
 endif
 
@@ -46,7 +56,6 @@ doc_oc2gdir = $(docdir)/examples/osmo-bts-oc2g
 doc_oc2g_DATA = \
         oc2g/osmo-bts-oc2g.cfg \
         oc2g/oc2gbts-mgr.cfg
-EXTRA_DIST += $(doc_oc2g_DATA)
 OSMOCONF_FILES += oc2g/osmo-bts-oc2g.cfg oc2g/oc2gbts-mgr.cfg
 endif
 

doc/examples/litecell15/lc15bts-mgr.cfg

@@ -3,10 +3,12 @@
 !!
 !
 log stderr
- logging filter all 1
  logging color 1
- logging print category 0
+ logging print category-hex 0
+ logging print category 1
  logging timestamp 0
+ logging print file basename last
+ logging print level 1
  logging level temp info
  logging level fw info
  logging level find info

doc/examples/litecell15/osmo-bts-lc15.cfg

@@ -4,7 +4,11 @@
 !
 log stderr
  logging color 1
+ logging print category-hex 0
+ logging print category 1
  logging timestamp 0
+ logging print file basename last
+ logging print level 1
  logging level rsl info
  logging level oml info
  logging level rll notice

doc/examples/oc2g/oc2gbts-mgr.cfg

@@ -3,10 +3,12 @@
 !!
 !
 log stderr
-  logging filter all 1
   logging color 1
-  logging print category 0
+  logging print category-hex 0
+  logging print category 1
   logging timestamp 0
+  logging print file basename last
+  logging print level 1
   logging level temp info
   logging level fw info
   logging level find info

doc/examples/oc2g/osmo-bts-oc2g.cfg

@@ -4,7 +4,11 @@
 !
 log stderr
   logging color 1
+  logging print category-hex 0
+  logging print category 1
   logging timestamp 0
+  logging print file basename last
+  logging print level 1
   logging level rsl info
   logging level oml info
   logging level rll notice

doc/examples/octphy/osmo-bts-octphy.cfg

@@ -4,7 +4,11 @@
 !
 log stderr
  logging color 1
+ logging print category-hex 0
+ logging print category 1
  logging timestamp 0
+ logging print file basename last
+ logging print level 1
  logging level rsl info
  logging level oml info
  logging level rll notice

doc/examples/octphy/osmo-bts-trx2dsp1.cfg

@@ -4,7 +4,11 @@
 !
 log stderr
  logging color 1
+ logging print category-hex 0
+ logging print category 1
  logging timestamp 0
+ logging print file basename last
+ logging print level 1
  logging level rsl info
  logging level oml info
  logging level rll notice

doc/examples/sysmo/osmo-bts-sysmo.cfg

@@ -4,7 +4,11 @@
 !
 log stderr
  logging color 1
+ logging print category-hex 0
+ logging print category 1
  logging timestamp 0
+ logging print file basename last
+ logging print level 1
  logging level rsl info
  logging level oml info
  logging level rll notice

doc/examples/sysmo/sysmobts-mgr.cfg

@@ -3,9 +3,12 @@
 !!
 !
 log stderr
- logging filter all 1
  logging color 1
+ logging print category-hex 0
+ logging print category 1
  logging timestamp 0
+ logging print file basename last
+ logging print level 1
  logging level temp info
  logging level fw info
  logging level find info

doc/examples/trx/osmo-bts-trx-calypso.cfg

@@ -1,11 +1,15 @@
 !
 ! OsmoBTS configuration example for CalypsoBTS
-! http://osmocom.org/projects/baseband/wiki/CalypsoBTS
+! https://osmocom.org/projects/baseband/wiki/CalypsoBTS
 !!
 !
 log stderr
  logging color 1
+ logging print category-hex 0
+ logging print category 1
  logging timestamp 0
+ logging print file basename last
+ logging print level 1
  logging level rsl notice
  logging level oml notice
  logging level rll notice
@@ -24,14 +28,15 @@ phy 0
  instance 0
  osmotrx ip local 127.0.0.1
  osmotrx ip remote 127.0.0.1
- osmotrx timing-advance-loop
- osmotrx ms-power-loop -65
  osmotrx legacy-setbsic
+ osmotrx fn-advance 20
+ osmotrx rts-advance 5
 bts 0
  oml remote-ip 127.0.0.1
- ipa unit-id 1801 0
+ ipa unit-id 6969 0
  gsmtap-sapi pdtch
  gsmtap-sapi ccch
  band 900
  trx 0
   phy 0 instance 0
+  nominal-tx-power 23

doc/examples/trx/osmo-bts-trx.cfg

@@ -4,7 +4,11 @@
 !
 log stderr
  logging color 1
+ logging print category-hex 0
+ logging print category 1
  logging timestamp 0
+ logging print file basename last
+ logging print level 1
  logging level rsl notice
  logging level oml notice
  logging level rll notice

doc/examples/virtual/osmo-bts-virtual.cfg

@@ -3,10 +3,12 @@
 !!
 !
 log stderr
- logging filter all 0
- logging color 0
+ logging color 1
+ logging print category-hex 0
  logging print category 1
  logging timestamp 0
+ logging print file basename last
+ logging print level 1
  logging level rsl info
  logging level oml info
  logging level rll notice
@@ -50,7 +52,6 @@ bts 0
  rtp jitter-buffer 100
  paging queue-size 200
  paging lifetime 0
- uplink-power-target -75
  min-qual-rach 50
  min-qual-norm -5
  trx 0

doc/manuals/abis/oml.adoc

@@ -3,16 +3,17 @@
 === List of Messages
 
 The following tables list the OML messages used by OsmoBTS, grouped by their
-level of compliance with 3GPP TS 12.21.
+level of compliance with 3GPP TS 52.021 [[3gpp-ts-52-021]] (previously 3GPP TS
+12.21).
 
-==== Messages Compliant With TS 12.21
+==== Messages Compliant With TS 52.021
 
 Specific limitations apply, see the linked sections.
 
-.Messages compliant with TS 12.21
+.Messages compliant with TS 52.021
 [options="header",cols="10%,10%,20%,35%,5%,20%"]
 |===
-| TS 12.21 § | type code (hex) | This document § | Message | <-/-> | Received/Sent by OsmoBTS
+| TS 52.021 § | type code (hex) | This document § | Message | <-/-> | Received/Sent by OsmoBTS
 6+<| *SW Download Management Messages:*
 | 8.3.7 | 0x10 | <<sw_act_rep>> | SW Activated Report | -> | Sent
 6+<| *Air Interface Management Messages:*
@@ -34,12 +35,16 @@ Specific limitations apply, see the linked sections.
 .3+.| 8.9.2 | 0x74 .3+.| <<opstart>> | Opstart | <- | Received
             | 0x75                   | Opstart Ack | -> | Sent
             | 0x76                   | Opstart Nack | -> | Sent
+6+<| *Other Messages:*
+.3+.| 8.11.1 | 0x81     | <<get_attributes>> | Get Attributes         | <- | Received
+    | 8.11.3 | 0x82     | <<get_attr_resp>>  | Get Attribute Response | -> | Sent
+    | 8.11.1 | 0x83     |                    | Get Attributes Nack    | -> | Sent
 |===
 
 
 ==== Messages Specific to OsmoBTS
 
-.Messages specific to OsmoBTS, not found in 3GPP TS 12.21
+.Messages specific to OsmoBTS, not found in 3GPP TS 52.021
 [options="header"]
 [options="header",cols="20%,55%,5%,20%"]
 |===
@@ -49,10 +54,10 @@ Specific limitations apply, see the linked sections.
 
 
 ==== Messages Not Implemented by OsmoBTS
-.3GPP TS 12.21 messages not implemented by OsmoBTS
+.3GPP TS 52.021 messages not implemented by OsmoBTS
 [options="header",cols="10%,10%,80%"]
 |===
-| TS 12.21 § | type code (hex) | Message
+| TS 52.021 § | type code (hex) | Message
 3+<| *SW Download Management Messages:*
 .3+.| 8.3.1 | 0x01 | Load Data Initiate
             | 0x02 | Load Data Initiate Ack
@@ -136,9 +141,6 @@ Specific limitations apply, see the linked sections.
     | 8.10.3 | 0x8C | Stop Measurement
     | 8.10.4 | 0x8D | Start Measurement
 3+<| *Other Messages:*
-    | 8.11.1 | 0x81 | Get Attributes
-    | 8.11.3 | 0x82 | Get Attribute(s) Response
-    | 8.11.1 | 0x83 | Get Attributes Nack
 .3+.| 8.11.2 | 0x84 | Set Alarm Threshold
              | 0x85 | Set Alarm Threshold Ack
              | 0x86 | Set Alarm Threshold Nack
@@ -151,7 +153,7 @@ Specific limitations apply, see the linked sections.
 ==== SW Activated Report
 
 OsmoBTS will send an _SW Activated Report_ when RF has been activated
-successfully. The message is compliant with 3GPP TS 12.21 § 8.3.7.
+successfully. The message is compliant with 3GPP TS 52.021 § 8.3.7.
 
 Upon RF activation, two _SW Activated Report_ messages will be sent, for the Object Classes
 
@@ -163,13 +165,13 @@ Upon RF activation, two _SW Activated Report_ messages will be sent, for the Obj
 
 OsmoBTS will receive a _Set BTS Attributes_ message and reply with a
 corresponding ACK message on success. IE handling is fully compliant to TS
-12.21, except that a change of BCCH ARFCN or BSIC while in operation is not
+52.021, except that a change of BCCH ARFCN or BSIC while in operation is not
 supported, and hence the _Starting Time_ IE is rejected.
 
 ._Set BTS Attributes_ IEs not handled by OsmoBTS
 [options="header",cols="10%,30%,60%"]
 |===
-| TS 12.21 § | IE Name | Handling
+| TS 52.021 § | IE Name | Handling
 | 9.4.52 | Starting Time | not supported (provokes NACK cause 0x10)
 |===
 
@@ -177,13 +179,13 @@ supported, and hence the _Starting Time_ IE is rejected.
 [[set_radio_attr]]
 ==== Set Radio Carrier Attributes
 
-This message conforms to 3GPP TS 12.21, with the following limitation,
+This message conforms to 3GPP TS 52.021, with the following limitation,
 as frequency hopping is not supported by OsmoBTS:
 
 ._Set Radio Carrier Attributes_ IE limitations
 [options="header",cols="10%,30%,60%"]
 |===
-| TS 12.21 § | IE Name | Handling
+| TS 52.021 § | IE Name | Handling
 | 9.4.5 | ARFCN List | ignored
 |===
 
@@ -191,14 +193,14 @@ as frequency hopping is not supported by OsmoBTS:
 [[set_chan_attr]]
 ==== Set Channel Attributes
 
-This message conforms to 3GPP TS 12.21, with the following limitation: the
-following 3GPP TS 12.21 IEs provoke a NACK response when sent to OsmoBTS, as
+This message conforms to 3GPP TS 52.021, with the following limitation: the
+following 3GPP TS 52.021 IEs provoke a NACK response when sent to OsmoBTS, as
 frequency hopping is not supported:
 
 ._Set Channel Attributes_ IE limitations
 [options="header",cols="10%,30%,60%"]
 |===
-| TS 12.21 § | IE Name | Handling
+| TS 52.021 § | IE Name | Handling
 | 9.4.21 | HSN | not supported (provokes NACK cause 0x10)
 | 9.4.27 | MAIO | not supported (provokes NACK cause 0x10)
 | 9.4.52 | Starting Time | not supported (provokes NACK cause 0x10)
@@ -207,34 +209,54 @@ frequency hopping is not supported:
 [[state_changed_rep]]
 ==== State Changed Event Report
 
-This message is compliant with 3GPP TS 12.21. Exactly these IEs are sent by
+This message is compliant with 3GPP TS 52.021. Exactly these IEs are sent by
 OsmoBTS:
 
 [options="header"]
 [cols="30%,25%,15%,15%,15%"]
 |===
 | INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
-| Message Type (0xf5) | 3GPP TS 12.21 9.1 | M | V | 1
-| Object Class | 3GPP TS 12.21 9.2 | M | V | 1
-| Object Instance | 3GPP TS 12.21 9.3 | M | V | 3
-| Operational State | 3GPP TS 12.21 9.4.38 | O | TV | 2
-| Availability Status | 3GPP TS 12.21 9.4.7 | O | TL16V (with length of 1) | 3
+| Message Type (0xf5) | 3GPP TS 52.021 9.1 | M | V | 1
+| Object Class | 3GPP TS 52.021 9.2 | M | V | 1
+| Object Instance | 3GPP TS 52.021 9.3 | M | V | 3
+| Operational State | 3GPP TS 52.021 9.4.38 | O | TV | 2
+| Availability Status | 3GPP TS 52.021 9.4.7 | O | TL16V (with length of 1) | 3
 |===
 
 [[chg_adm_state]]
 ==== Change Administrative State
 
-This message is compliant with 3GPP TS 12.21 § 8.8.5. It applies to all of the
-Object Classes defined in 3GPP TS 12.21 § 9.2 as well as
+This message is compliant with 3GPP TS 52.021 § 8.8.5. It applies to all of the
+Object Classes defined in 3GPP TS 52.021 § 9.2 as well as
 <<addnl_obj_classes>>.
 
 [[opstart]]
 ==== Opstart
 
-This message is compliant with 3GPP TS 12.21 § 8.9.2. It applies to all of the
-Object Classes defined in 3GPP TS 12.21 § 9.2 as well as
+This message is compliant with 3GPP TS 52.021 § 8.9.2. It applies to all of the
+Object Classes defined in 3GPP TS 52.021 § 9.2 as well as
 <<addnl_obj_classes>>.
 
+[[get_attributes]]
+==== Get Attributes
+
+This message is compliant with 3GPP TS 52.021 § 8.11.1.
+
+For a list of supported attributes, see <<get_attr_resp>>.
+
+[[get_attr_resp]]
+==== Get Attribute Response
+
+This message is compliant with 3GPP TS 52.021 § 8.11.3.
+
+The following attributes are provided by OsmoBTS:
+
+[options="header"]
+|===
+| 3GPP TS 52.021 chapter | description      | see
+| 9.4.61                 | SW Configuration | <<NM_ATT_SW_CONFIG>>
+| 9.4.30                 | Manufacturer Id  | <<NM_ATT_MANUF_ID>>
+|===
 
 === Details on OsmoBTS Specific Messages
 
@@ -252,9 +274,9 @@ The message specifics depend on the Object Class and are detailed in
 [cols="30%,25%,15%,15%,15%"]
 |===
 | INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
-| Message Type (0xf5) | 3GPP TS 12.21 9.1 | M | V | 1
-| Object Class | 3GPP TS 12.21 9.2 | M | V | 1
-| Object Instance | 3GPP TS 12.21 9.3 | M | V | 3
+| Message Type (0xf5) | 3GPP TS 52.021 9.1 | M | V | 1
+| Object Class | 3GPP TS 52.021 9.2 | M | V | 1
+| Object Instance | 3GPP TS 52.021 9.3 | M | V | 3
 5+<| _Object Class specific IEs follow, see <<addnl_obj_classes>>..._
 |===
 
@@ -262,7 +284,7 @@ The message specifics depend on the Object Class and are detailed in
 [[addnl_obj_classes]]
 === Additional Object Classes
 
-In addition to 3GPP TS 12.21 Chapter 9.2, the following managed objects
+In addition to 3GPP TS 52.021 Chapter 9.2, the following managed objects
 are supported:
 
 .Additional Managed Object Classes
@@ -284,9 +306,9 @@ with the following Information Elements:
 [cols="30%,25%,15%,15%,15%"]
 |===
 | INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
-| Message Type | 3GPP TS 12.21 9.1 | M | V | 1
-| Object Class | 3GPP TS 12.21 9.2 | M | V | 1
-| Object Instance | 3GPP TS 12.21 9.3 | M | V | 3
+| Message Type | 3GPP TS 52.021 9.1 | M | V | 1
+| Object Class | 3GPP TS 52.021 9.2 | M | V | 1
+| Object Instance | 3GPP TS 52.021 9.3 | M | V | 3
 | GPRS NSEI | <<NM_ATT_IPACC_NSEI>> | O | TL16V | >= 5
 | GPRS NS Configuration | <<NM_ATT_IPACC_NS_LINK_CFG>> | O | TL16V | >= 10
 | GPRS BSSGP Configuration | <<NM_ATT_IPACC_BSSGP_CFG>> | O | TL16V | >= 14
@@ -301,9 +323,9 @@ message with the following Information Elements:
 [cols="30%,25%,15%,15%,15%"]
 |===
 | INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
-| Message Type | 3GPP TS 12.21 9.1 | M | V | 1
-| Object Class | 3GPP TS 12.21 9.2 | M | V | 1
-| Object Instance | 3GPP TS 12.21 9.3 | M | V | 3
+| Message Type | 3GPP TS 52.021 9.1 | M | V | 1
+| Object Class | 3GPP TS 52.021 9.2 | M | V | 1
+| Object Instance | 3GPP TS 52.021 9.3 | M | V | 3
 | GPRS Routing Area Code | <<NM_ATT_IPACC_RAC>> | O | TL16V | >= 4
 | GPRS Paging Configuration | <<NM_ATT_IPACC_GPRS_PAGING_CFG>>  | O | TL16V | >= 5
 | GPRS RLC Configuration | <<NM_ATT_IPACC_RLC_CFG>> | O | TL16V | >= 12
@@ -321,9 +343,9 @@ Attribute* message with the following Information Elements:
 [cols="30%,25%,15%,15%,15%"]
 |===
 | INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
-| Message Type | 3GPP TS 12.21 9.1 | M | V | 1
-| Object Class | 3GPP TS 12.21 9.2 | M | V | 1
-| Object Instance | 3GPP TS 12.21 9.3 | M | V | 3
+| Message Type | 3GPP TS 52.021 9.1 | M | V | 1
+| Object Class | 3GPP TS 52.021 9.2 | M | V | 1
+| Object Instance | 3GPP TS 52.021 9.3 | M | V | 3
 | GPRS NSVCI | <<NM_ATT_IPACC_NSVCI>> | O | TL16V | >= 5
 | GPRS NS Link Configuration | <<NM_ATT_IPACC_NS_LINK_CFG>> | O | TL16V | >= 11
 |===
@@ -332,9 +354,9 @@ Attribute* message with the following Information Elements:
 === Information Elements Overview
 
 All of the IEs handled by OsmoBTS are listed below, with limitations and
-additions to TS 12.21 specified in more detail.
+additions to TS 52.021 specified in more detail.
 
-==== IEs Conforming to TS 12.21
+==== IEs Conforming to TS 52.021
 
 The following Information Elements are accepted by OsmoBTS.
 
@@ -346,10 +368,10 @@ IEs marked __ignored__ and additionally marked as being received by OsmoBTS
 (<-) are in fact parsed and their values are stored by OsmoBTS, but these
 stored items are currently not used in the OsmoBTS code base.
 
-.IEs conforming to TS 12.21
+.IEs conforming to TS 52.021
 [options="header",cols="5%,10%,40%,5%,40%"]
 |===
-| tag (hex) | TS 12.21 § | IE name | <-/-> | Received/Sent by OsmoBTS
+| tag (hex) | TS 52.021 § | IE name | <-/-> | Received/Sent by OsmoBTS
 | 0x00 | 9.4.1  | Abis Channel  |  | _ignored_
 | 0x01 | 9.4.2  | Additional Info  |  | _ignored_
 | 0x02 | 9.4.3  | Additional Text  |  | _ignored_
@@ -372,8 +394,8 @@ stored items are currently not used in the OsmoBTS code base.
 | 0x13 | 9.4.19 | File Version  |  | _ignored_
 | 0x14 | 9.4.20 | GSM Time  |  | _ignored_
 | 0x16 | 9.4.22 | HW Configuration  |  | _ignored_
-| 0x18 | 9.4.24 | Intave Parameter  | <- | _ignored_
-| 0x19 | 9.4.25 | Interference level Boundaries  | <- | _ignored_
+| 0x18 | 9.4.24 | Intave Parameter  | <- |
+| 0x19 | 9.4.25 | Interference level Boundaries  | <- |
 | 0x1a | 9.4.26 | List of Required Attributes  |  | _ignored_
 | 0x1c | 9.4.28 | Manufacturer Dependent State  |  | _ignored_
 | 0x1d | 9.4.29 | Manufacturer Dependent Thresholds  |  | _ignored_
@@ -405,20 +427,20 @@ stored items are currently not used in the OsmoBTS code base.
 | 0x38 | 9.4.58 | VSWR Thresholds  |  | _ignored_
 | 0x39 | 9.4.59 | Window Size  |  | _ignored_
 | 0x40 | 9.4.60 | TSC  | <- | Received, with limitations: see <<NM_ATT_TSC>>
-| 0x41 | 9.4.61 | SW Configuration  |  | _ignored_
+| 0x41 | 9.4.61 | SW Configuration  | -> | Sent, see <<NM_ATT_SW_CONFIG>>
 | 0x43 | 9.4.63 | Perceived Severity  |  | _ignored_
-| 0x44 | 9.4.64 | Get Attribute Response Info  |  | _ignored_
+| 0x44 | 9.4.64 | Get Attribute Response Info  | -> | Sent, see <<NM_ATT_MANUF_ID>>
 | 0x45 | 9.4.65 | Outstanding Alarm Sequence  |  | _ignored_
 | 0x46 | 9.4.66 | HW Conf Change Info  |  | _ignored_
 | 0x47 | 9.4.32 | Measurement Result  |  | _ignored_
 |===
 
-==== IEs Not Conforming to TS 12.21
+==== IEs Not Conforming to TS 52.021
 
-.IEs not conforming to TS 12.21
+.IEs not conforming to TS 52.021
 [options="header",cols="5%,10%,30%,55%"]
 |===
-| tag (hex) | TS 12.21 § | IE name | Description
+| tag (hex) | TS 52.021 § | IE name | Description
 | 0x15 | 9.4.21 | HSN              | presence causes NACK response
 | 0x17 | 9.4.23 | HW Description   | _ignored_ by OsmoBTS, but coding may differ, see <<ie_hw_desc>>
 | 0x1b | 9.4.27 | MAIO             | presence causes NACK response 
@@ -431,14 +453,14 @@ stored items are currently not used in the OsmoBTS code base.
 ==== Additional Attributes and Parameters
 
 The following Information Elements are defined in addition to those
-specified in 3GPP TS 12.21 Chapter 9.4.
+specified in 3GPP TS 52.021 Chapter 9.4.
 
 All of these additional IEs are _received_ by OsmoBTS.
 
 These attributes are not used by OsmoBTS, but
 simply passed to OsmoPCU connected to the PCU socket.
 
-.Additional IEs handled by OsmoBTS but not defined in TS 12.21
+.Additional IEs handled by OsmoBTS but not defined in TS 52.021
 [options="header",cols="5%,50%,45%"]
 |===
 | tag (hex) | IE name | Description
@@ -465,7 +487,7 @@ simply passed to OsmoPCU connected to the PCU socket.
 [[ie_hw_desc]]
 ==== HW Description
 
-TS 12.21 suggests a series of 5 length-value pairs for the _HW Description_ IE.
+TS 52.021 suggests a series of 5 length-value pairs for the _HW Description_ IE.
 Instead, OsmoBTS interprets it as a single TL16V. The value of this IE is
 ignored by OsmoBTS, yet the coding may affect message parsing.
 
@@ -487,7 +509,7 @@ exactly one ARFCN.
 [[ie_chan_comb]]
 ==== Additional Channel Combinations
 
-In addition to 3GPP TS 12.21 Chapter 9.4.13, the following channel
+In addition to 3GPP TS 52.021 Chapter 9.4.13, the following channel
 combinations are supported:
 
 .Additional Channel Combinations
@@ -513,7 +535,7 @@ work, please see the <<rsl-dynamic-channels>>.
 [[ie_conn_fail_crit]]
 ==== Connection Failure Criterion
 
-3GPP TS 12.21 Chapter 9.4.14 specifies two different options for the
+3GPP TS 52.021 Chapter 9.4.14 specifies two different options for the
 _Connection Failure Criterion_.  OsmoBTS only implements the option
 coded as 0x01, i.e. based upon uplink SACCH error rate
 (RADIO_LINK_TIMEOUT).
@@ -523,7 +545,7 @@ coded as 0x01, i.e. based upon uplink SACCH error rate
 
 Due to limitations in the currently supported PHY implementations,
 OsmoBTS supports only one global TSC for all channels on one TRX, rather
-than a separate TSC for each timeslot, as expected by 3GPP TS 12.21.
+than a separate TSC for each timeslot, as expected by 3GPP TS 52.021.
 
 
 [[NM_ATT_IPACC_DST_IP]]
@@ -783,10 +805,91 @@ It is encoded as follows:
 This attribute is not used by OsmoBTS, but
 simply passed to OsmoPCU connected to the PCU socket.
 
+[[NM_ATT_SW_CONFIG]]
+==== SW Configuration
+
+The SW Configuration IE is compliant with 3GPP TS 52.021 9.4.61: it contains a
+number of SW Description IEs (9.4.62).
+
+
+.Coding of SW Configuration IE
+[options="header",cols="20%,80%"]
+|===
+| octet | value
+| 1     | NM_ATT_SW_CONFIG IEI (0x41)
+| 2-3   | length of value part
+| 4     | NM_ATT_SW_DESCR IEI (0x42)
+| 5     | NM_ATT_FILE_ID IEI (0x12)
+| 6-7   | length of file name
+| 8-N   | ASCII coded file name (without terminating nul)
+| N+1   | NM_ATT_FILE_VERSION IEI (0x13)
+| N+2 - N+3 | length of file content
+| N+4 - M | file content
+| M+1   | NM_ATT_SW_DESCR IEI (0x42)
+| M+2   | NM_ATT_FILE_ID IEI (0x12)
+2+| ...
+|===
+
+.File names and content sent in the SW Configuration IE
+[options="header",cols="20%,80%"]
+|===
+| file name | content
+| 'osmobts' | ASCII coded OsmoBTS version number like "1.2.3" or "1.2.3.4-abcd"
+| 'BTS_TYPE_VARIANT' | one of "osmo-bts-lc15", "osmo-bts-oc2g", "osmo-bts-octphy",
+                       "osmo-bts-omldummy", "osmo-bts-sysmo", "osmo-bts-trx", "osmo-bts-virtual"
+| 'BTS_SUB_MODEL' | This file may be omitted; if present, may contain an ASCII
+                    coded model number like "sysmoBTS 1002"
+|===
+
+
+[[NM_ATT_MANUF_ID]]
+==== Manufacturer Id
+
+The coding of the Manufacturer Id attribute is a sequence of bit flags (a bit
+vector), where a zero flag indicates absence and a set flag indicates presence
+of a specific BTS feature.
+
+The number of flags transmitted depends on the software version of OsmoBTS and
+the BTS backend in use. More flags may be added in the future. The flag bits
+transmitted are followed by zero bits up to the next full octet boundary.
+
+These features are currently defined:
+
+.coding of BTS feature flags sent in the Manufacturer Id attribute
+[options="header",cols="5%,5%,30%,60%"]
+|===
+| octet  | bit | feature name | description
+.8+.|  0 |  7  | HSCSD | High-Speed Circuit-Switched Data
+         |  6  | GPRS | General Packet Radio Service
+         |  5  | EGPRS | Enhanced GPRS (EDGE)
+         |  4  | ECSD | Enhanced Circuit-Switched Data
+         |  3  | HOPPING | Frequency Hopping
+         |  2  | MULTI_TSC | Multi-TSC
+         |  1  | OML_ALERTS | OML Alerts
+         |  0  | AGCH_PCH_PROP | AGCH/PCH proportional allocation
+.8+.|  1 |  7  | CBCH | Cell Broadcast Channel
+         |  6  | SPEECH_F_V1 | Fullrate speech V1
+         |  5  | SPEECH_H_V1 | Halfrate speech V1
+         |  4  | SPEECH_F_EFR | Fullrate speech EFR
+         |  3  | SPEECH_F_AMR | Fullrate speech AMR
+         |  2  | SPEECH_H_AMR | Halfrate speech AMR
+         |  1  | ETWS_PN | ETWS Primary Notification via PCH
+         |  0  | PAGING_COORDINATION | BSS Paging Coordination
+.8+.|  2 |  7  | IPV6_NSVC | NSVC IPv6
+         |  6  | ACCH_REP | FACCH/SACCH Repetition
+         |  5  | CCN | Cell Change Notification
+         |  4  | VAMOS | Voice services over Adaptive Multi-user channels on One Slot
+         |  3  2.4+.| reserved for future use, sent as zero
+         |  2
+         |  1
+         |  0
+|===
+
+
 === A-bis OML Initialization / BTS bring-up
 
 At the time an Abis/IP BTS connects to via OML to the BSC, it is
-initialized according to the procedures described in 3GPP TS 12.21 as
+initialized according to the procedures described in 3GPP TS 52.021 as
 amended by this document.
 
 Each Managed Object (MO) is separately initialized.  The initialization

doc/manuals/abis/rsl.adoc

@@ -3,16 +3,16 @@
 === List of Messages
 
 The following tables list the RSL messages used by OsmoBTS A-bis/IP,
-grouped by their level of compliance with 3GPP TS 08.58.
+grouped by their level of compliance with 3GPP TS 48.058.
 
-==== Messages Compliant With TS 08.58
+==== Messages Compliant With TS 48.058
 
 Specific additions and limitations apply, see the linked sections.
 
-.Messages compliant with TS 08.58
+.Messages compliant with TS 48.058
 [options="header",cols="10%,20%,45%,5%,20%"]
 |===
-| TS 08.58 § | This document § | Message | <-/-> | Received/Sent by OsmoBTS
+| TS 48.058 § | This document § | Message | <-/-> | Received/Sent by OsmoBTS
 5+<| *Radio link layer management messages*
 | 8.3.1  | - | DATA REQUEST | <- | Received
 | 8.3.2  | - | DATA INDICATION | -> | Sent
@@ -59,7 +59,7 @@ Specific additions and limitations apply, see the linked sections.
 
 ==== Messages Specific to OsmoBTS
 
-.Messages specific to OsmoBTS, not found in 3GPP TS 08.58
+.Messages specific to OsmoBTS, not found in 3GPP TS 48.058
 [options="header",cols="15%,15%,45%,5%,20%"]
 |===
 2+| This document § | Message | <-/-> | Received/Sent by OsmoBTS
@@ -87,10 +87,10 @@ Specific additions and limitations apply, see the linked sections.
 
 ==== Messages Not Implemented by OsmoBTS
 
-.3GPP TS 08.58 messages not implemented by OsmoBTS
+.3GPP TS 48.058 messages not implemented by OsmoBTS
 [options="header",cols="10%,90%"]
 |===
-| TS 08.58 § | Message
+| TS 48.058 § | Message
 2+<| *DEDICATED CHANNEL MANAGEMENT MESSAGES*
 | 8.4.12 | PHYSICAL CONTEXT REQUEST
 | 8.4.13 | PHYSICAL CONTEXT CONFIRM
@@ -123,7 +123,7 @@ Specific additions and limitations apply, see the linked sections.
 ==== Channel Activation
 
 When used on a timeslot using the non-standard channel combination
-'NM_CHANC_OSMO_TCHFull_TCHHalf_PDCH' as configured by OML, the regular
+'NM_CHANC_OSMO_DYN' as configured by OML, the regular
 RSL channel activation procedures can not only be used for activation
 of circuit-switched channels, but also for activation of a PDCH.
 
@@ -135,24 +135,24 @@ dynamic PDCH protocol employed by nanoBTS devices (<<ipa_style_pdch_mgmt>>).
 [[MEASUREMENT_RESULT]]
 ==== Measurement Result
 
-Conforms to 3GPP TS 08.58 § 8.4.8 with this limitation:
+Conforms to 3GPP TS 48.058 § 8.4.8 with this limitation:
 
 ._Measurement Result_ IE limitations
 [options="header",cols="10%,30%,60%"]
 |===
-| TS 08.58 § | IE Name | Handling
+| TS 48.058 § | IE Name | Handling
 | 9.3.37 | MS Timing Offset | never sent by OsmoBTS
 |===
 
 [[MODE_MODIFY]]
 ==== Mode Modify
 
-Conforms to 3GPP TS 08.58 § 8.4.9 with these limitations:
+Conforms to 3GPP TS 48.058 § 8.4.9 with these limitations:
 
 ._Mode Modify_ IE limitations
 [options="header",cols="10%,30%,60%"]
 |===
-| TS 08.58 § | IE Name | Handling
+| TS 48.058 § | IE Name | Handling
 | 9.3.45 | Main channel reference | _ignored_
 | 9.3.53 | MultiRate Control | _ignored_
 | 9.3.54 | Supported Codec Types | _ignored_
@@ -161,12 +161,12 @@ Conforms to 3GPP TS 08.58 § 8.4.9 with these limitations:
 [[MS_POWER_CONTROL]]
 ==== MS Power Control
 
-Conforms to 3GPP TS 08.58 § 8.4.15 with these limitations:
+Conforms to 3GPP TS 48.058 § 8.4.15 with these limitations:
 
 ._MS Power Control_ IE limitations
 [options="header",cols="10%,30%,60%"]
 |===
-| TS 08.58 § | IE Name | Handling
+| TS 48.058 § | IE Name | Handling
 | 9.3.31 | MS Power Parameters | _ignored_
 |===
 
@@ -174,12 +174,12 @@ Conforms to 3GPP TS 08.58 § 8.4.15 with these limitations:
 [[SACCH_INFO_MODIFY]]
 ==== SACCH Info Modify
 
-Conforms to 3GPP TS 08.58 § 8.4.20, with these exceptions:
+Conforms to 3GPP TS 48.058 § 8.4.20, with these exceptions:
 
 ._SACCH Info Modify_ IE limitations
 [options="header",cols="10%,30%,60%"]
 |===
-| TS 08.58 § | IE Name | Handling
+| TS 48.058 § | IE Name | Handling
 | 9.3.30 | System Info Type | See below for available types
 | 9.3.23 | Starting Time | not supported, provokes an _Error Report_ response
 |===
@@ -192,6 +192,7 @@ Conforms to 3GPP TS 08.58 § 8.4.20, with these exceptions:
 | 0x06 | RSL_SYSTEM_INFO_6
 | 0x0d | RSL_SYSTEM_INFO_5bis
 | 0x0e | RSL_SYSTEM_INFO_5ter
+| 0x0f | RSL_SYSTEM_INFO_10
 | 0x47 | RSL_EXT_MEAS_ORDER
 | 0x48 | RSL_MEAS_INFO
 |===
@@ -199,12 +200,12 @@ Conforms to 3GPP TS 08.58 § 8.4.20, with these exceptions:
 [[BCCH_INFORMATION]]
 ==== BCCH Information
 
-Conforms to 3GPP TS 08.58 § 8.5.1, with these limitations and extensions:
+Conforms to 3GPP TS 48.058 § 8.5.1, with these limitations and extensions:
 
 ._BCCH Information_ IE details
 [options="header",cols="10%,30%,60%"]
 |===
-| TS 08.58 § | IE Name | Handling
+| TS 48.058 § | IE Name | Handling
 | 9.3.30 | System Info Type | See <<SACCH_INFO_MODIFY>> for available types
 | 9.3.11 | L3 Info | This IE may be included instead of a 9.3.39 _Full BCCH Info_ IE.
                      The _Full BCCH Info_ takes precedence over _L3 Info_.
@@ -215,12 +216,12 @@ Conforms to 3GPP TS 08.58 § 8.5.1, with these limitations and extensions:
 [[CHANNEL_REQUIRED]]
 ==== Channel Required
 
-Conforms to 3GPP TS 08.58 § 8.5.3, with these limitations:
+Conforms to 3GPP TS 48.058 § 8.5.3, with these limitations:
 
 ._Channel Required_ message IE details
 [options="header",cols="10%,30%,60%"]
 |===
-| TS 08.58 § | IE Name | Handling
+| TS 48.058 § | IE Name | Handling
 | 9.3.16 | Physical Context | never sent by OsmoBTS
 |===
 
@@ -228,12 +229,12 @@ Conforms to 3GPP TS 08.58 § 8.5.3, with these limitations:
 [[PAGING_COMMAND]]
 ==== Paging Command
 
-Conforms to 3GPP TS 08.58 § 8.5.5, with these limitations:
+Conforms to 3GPP TS 48.058 § 8.5.5, with these limitations:
 
 ._Paging Command_ message IE details
 [options="header",cols="10%,30%,60%"]
 |===
-| TS 08.58 § | IE Name | Handling
+| TS 48.058 § | IE Name | Handling
 | 9.3.49 | eMLPP Priority | _ignored_
 |===
 
@@ -244,28 +245,28 @@ in any way.
 [[RF_RESOURCE_INDICATION]]
 ==== RF Resource Indication
 
-This message does not conform to 3GPP TS 08.58 § 8.6.1, in that it omits the
-_Resource Information_ IE that would contain the actual payload data, which
-renders this message void.
+For all osmo-bts variants, except osmo-bts-trx, this message does not conform
+to 3GPP TS 48.058 § 8.6.1, in that it omits the _Resource Information_ IE that
+would contain the actual payload data, which renders this message void.
 
 ._RF Resource Indication_ message IE exceptions
 [options="header",cols="10%,30%,60%"]
 |===
-| TS 08.58 § | IE Name | Handling
-| 9.3.21 | Resource Information | OsmoBTS omits this IE, though TS 08.58
-                                  specifies it as mandatory.
+| TS 48.058 § | IE Name | Handling
+| 9.3.21 | Resource Information | DSP based osmo-bts variants omit this IE, though
+				  TS 48.058 specifies it as mandatory.
 |===
 
 
 [[SACCH_FILLING]]
 ==== SACCH Filling
 
-Conforms to 3GPP TS 08.58 § 8.6.2, with these limitations:
+Conforms to 3GPP TS 48.058 § 8.6.2, with these limitations:
 
 ._SACCH Filling_ message IE limitations
 [options="header",cols="10%,30%,60%"]
 |===
-| TS 08.58 § | IE Name | Handling
+| TS 48.058 § | IE Name | Handling
 | 9.3.30 | System Info Type | See <<SACCH_INFO_MODIFY>> for available types
 | 9.3.23 | Starting Time | _ignored_
 |===
@@ -275,7 +276,7 @@ Conforms to 3GPP TS 08.58 § 8.6.2, with these limitations:
 === User Plane Transport Management
 
 This chapter defines the A-bis/IP specific RSL procedures that are
-introduced in addition to the 3GPP TS 08.58 standard procedures.
+introduced in addition to the 3GPP TS 48.058 standard procedures.
 
 In classic A-bis over E1, user plane traffic is carried over 16kBps
 sub-slots of 64kBps E1 time-slots according to ETSI/3GPP TS 08.60.  As
@@ -417,16 +418,16 @@ include::dyn_ts_ipa_style2.msc[]
 ==== Osmocom Style Dynamic Channels
 
 This method is in use when OML uses
-'NM_CHANC_OSMO_TCHFull_TCHHalf_PDCH' (0x90) for the given time-slot.
+'NM_CHANC_OSMO_DYN' (0x90) for the given time-slot.
 
 The activation of PDCH is performed by using the regular 'RSL CHANNEL ACTIVATE'
 procedure according to <<CHANNEL_ACTIVATION>>, with these modifications:
 
 * The 'C-bits' part of the 'Channel Number' IE take the non-standard binary
-  value 11000 (C5 through C1 as seen in 3GPP TS 08.58 § 9.3.1).
+  value 11000 (C5 through C1 as seen in 3GPP TS 48.058 § 9.3.1).
 * The 'A-bits' part of the 'Activation Type' IE take the non-standard binary
   value 1111, with an additional fourth bit (add A4 to A3 through A1 as seen in
-  3GPP TS 08.58 § 9.3.3; all remaining reserved bits as well as the 'R' bit are
+  3GPP TS 48.058 § 9.3.3; all remaining reserved bits as well as the 'R' bit are
   coded as zero).
 * The normally mandatory 'Channel Mode' IE is omitted; none of the optional IEs
   are included.
@@ -436,7 +437,7 @@ Hence the message consists of exactly these IEs:
 .PDCH type _Channel Activation_ message IEs
 [options="header",cols="10%,30%,60%"]
 |===
-| TS 08.58 § | IE Name | Handling
+| TS 48.058 § | IE Name | Handling
 | 9.1 | Message discriminator | Dedicated Channel Management
 | 9.2 | Message type | CHANnel ACTIVation
 | 9.3.1 | Channel number | 'C-bits' 11000, plus TS bits as usual
@@ -476,6 +477,26 @@ signaling for it.
 See <<OSMO_ETWS_CMD>> for the Osmocom implementation.
 
 
+=== BCCH carrier power reduction operation
+
+According to 3GPP TS 45.008, section 7.1, the BCCH carrier (sometimes called C0) of
+a BTS shall maintain discontinuous Downlink transmission at full power in order to
+stay "visible" to the mobile stations.  Because of that, early versions of this 3GPP
+document prohibited BS power reduction on C0.  However, a new feature was introduced
+version 13.0.0 (2015-11) - "BCCH carrier power reduction operation".
+
+This is a special mode of operation, in which the variation of RF power level for
+some timeslots is relaxed for the purpose of energy saving.  In other words, the
+output power on some timeslots, except the timeslot(s) carrying BCCH/CCCH, can be
+lower than the full power.  In this case the maximum allowed difference is 6 dB.
+
+Unfortunately, 3GPP did not specify in which way the BTS is instructed to activate
+and deactivate the BCCH carrier power reduction mode.  Osmocom had to invent their
+own non-standard approach: the BSC needs to send _BS POWER CONTROL_ message with
+the _Channel Number_ IE set to 0x80 (BCCH) and the _Message Discriminator_ set to
+0x06 (Common Channel Management messages).
+
+
 === Message Formats and Contents
 
 [[rsl_crcx_msg]]
@@ -488,14 +509,15 @@ number*.
 [options="header"]
 [cols="30%,25%,15%,15%,15%"]
 |===
-| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH 
-| Message discriminator | 08.58 9.1 | M | V | 1
+| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
+| Message discriminator | 48.058 9.1 | M | V | 1
 | Message type | <<own_msg_types>> | M | V | 1
-| Channel number | 08.58 9.3.1 | M | TV | 2
+| Channel number | 48.058 9.3.1 | M | TV | 2
 | Destination IP Address | <<RSL_IE_IPAC_REMOTE_IP>> | O | TV | 5
 | Destination IP Port | <<RSL_IE_IPAC_REMOTE_PORT>> | O | TV | 3
 | IP Speech Mode | <<RSL_IE_IPAC_SPEECH_MODE>> | O | TV | 2
 | RTP Payload Type 2 | <<RSL_IE_IPAC_RTP_PAYLOAD2>> | O | TV | 2
+| RTP CSD Format | <<RSL_IE_IPAC_RTP_CSD_FORMAT>> | O | TV | 2
 |===
 
 [[rsl_crcx_msg_ack]]
@@ -508,10 +530,10 @@ in response to the *Create Connection (CRCX)*.
 [options="header"]
 [cols="30%,25%,15%,15%,15%"]
 |===
-| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH 
-| Message discriminator | 08.58 9.1 | M | V | 1
+| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
+| Message discriminator | 48.058 9.1 | M | V | 1
 | Message type | <<own_msg_types>> | M | V | 1
-| Channel number | 08.58 9.3.1 | M | TV | 2
+| Channel number | 48.058 9.3.1 | M | TV | 2
 | Connection Id | <<RSL_IE_IPAC_CONN_ID>> | M | TV | 3
 | Source IP Address | <<RSL_IE_IPAC_LOCAL_IP>> | O | TV | 5
 | Source IP Port | <<RSL_IE_IPAC_LOCAL_PORT>> | O | TV | 3
@@ -528,13 +550,13 @@ sent in response to the *Create Connection (CRCX)*.
 [options="header"]
 [cols="30%,25%,15%,15%,15%"]
 |===
-| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH 
-| Message discriminator | 08.58 9.1 | M | V | 1
+| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
+| Message discriminator | 48.058 9.1 | M | V | 1
 | Message type | <<own_msg_types>> | M | V | 1
-| Channel number | 08.58 9.3.1 | M | TV | 2
+| Channel number | 48.058 9.3.1 | M | TV | 2
 | Destination IP Address | <<RSL_IE_IPAC_REMOTE_IP>> | O | TV | 5
 | Destination IP Port | <<RSL_IE_IPAC_REMOTE_PORT>> | O | TV | 3
-| Cause | 08.58 9.3.26 | O | TLV | >= 3
+| Cause | 48.058 9.3.26 | O | TLV | >= 3
 |===
 
 
@@ -547,15 +569,16 @@ properties of a user-plane RTP connection.
 [options="header"]
 [cols="30%,25%,15%,15%,15%"]
 |===
-| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH 
-| Message discriminator | 08.58 9.1 | M | V | 1
+| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
+| Message discriminator | 48.058 9.1 | M | V | 1
 | Message type | <<own_msg_types>> | M | V | 1
-| Channel number | 08.58 9.3.1 | M | TV | 2
+| Channel number | 48.058 9.3.1 | M | TV | 2
 | Connection Id | <<RSL_IE_IPAC_CONN_ID>> | O | TV | 3
 | Destination IP Address | <<RSL_IE_IPAC_REMOTE_IP>> | O | TV | 5
 | Destination IP Port | <<RSL_IE_IPAC_REMOTE_PORT>> | O | TV | 3
 | IP Speech Mode | <<RSL_IE_IPAC_SPEECH_MODE>> | O | TV | 2
 | RTP Payload Type 2 | <<RSL_IE_IPAC_RTP_PAYLOAD2>> | O | TV | 2
+| RTP CSD Format | <<RSL_IE_IPAC_RTP_CSD_FORMAT>> | O | TV | 2
 |===
 
 [[rsl_mdcx_msg_ack]]
@@ -568,10 +591,10 @@ response to a *Modify Connection (MDCX)*
 [options="header"]
 [cols="30%,25%,15%,15%,15%"]
 |===
-| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH 
-| Message discriminator | 08.58 9.1 | M | V | 1
+| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
+| Message discriminator | 48.058 9.1 | M | V | 1
 | Message type | <<own_msg_types>> | M | V | 1
-| Channel number | 08.58 9.3.1 | M | TV | 2
+| Channel number | 48.058 9.3.1 | M | TV | 2
 | Connection Id | <<RSL_IE_IPAC_CONN_ID>> | O | TV | 3
 | Source IP Address | <<RSL_IE_IPAC_LOCAL_IP>> | C | TV | 5
 | Source IP Port | <<RSL_IE_IPAC_LOCAL_PORT>> | C | TV | 3
@@ -589,11 +612,11 @@ Connection (MDCX)*.
 [options="header"]
 [cols="30%,25%,15%,15%,15%"]
 |===
-| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH 
-| Message discriminator | 08.58 9.1 | M | V | 1
+| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
+| Message discriminator | 48.058 9.1 | M | V | 1
 | Message type | <<own_msg_types>> | M | V | 1
-| Channel number | 08.58 9.3.1 | M | TV | 2
-| Cause | 08.58 9.3.26 | M | TLV | >= 3
+| Channel number | 48.058 9.3.1 | M | TV | 2
+| Cause | 48.058 9.3.26 | M | TLV | >= 3
 |===
 
 [[rsl_dlcx_ind_msg]]
@@ -606,13 +629,13 @@ time of RF Channel release.
 [options="header"]
 [cols="30%,25%,15%,15%,15%"]
 |===
-| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH 
-| Message discriminator | 08.58 9.1 | M | V | 1
+| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
+| Message discriminator | 48.058 9.1 | M | V | 1
 | Message type | <<own_msg_types>> | M | V | 1
-| Channel number | 08.58 9.3.1 | M | TV | 2
+| Channel number | 48.058 9.3.1 | M | TV | 2
 | Connection Id | <<RSL_IE_IPAC_CONN_ID>> | M | TV | 3
 | Connection Id | <<RSL_IE_IPAC_CONN_STAT>> | M | TV | 3
-| Cause | 08.58 9.3.26 | M | TLV | >= 3
+| Cause | 48.058 9.3.26 | M | TLV | >= 3
 |===
 
 [[rsl_dlcx_msg]]
@@ -625,10 +648,10 @@ number.
 [options="header"]
 [cols="30%,25%,15%,15%,15%"]
 |===
-| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH 
-| Message discriminator | 08.58 9.1 | M | V | 1
+| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
+| Message discriminator | 48.058 9.1 | M | V | 1
 | Message type | <<own_msg_types>> | M | V | 1
-| Channel number | 08.58 9.3.1 | M | TV | 2
+| Channel number | 48.058 9.3.1 | M | TV | 2
 | Connection Id | <<RSL_IE_IPAC_CONN_ID>> | O | TV | 3
 |===
 
@@ -643,10 +666,10 @@ Channel number.  It is sent in response to the *Delete Connection
 [options="header"]
 [cols="30%,25%,15%,15%,15%"]
 |===
-| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH 
-| Message discriminator | 08.58 9.1 | M | V | 1
+| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
+| Message discriminator | 48.058 9.1 | M | V | 1
 | Message type | <<own_msg_types>> | M | V | 1
-| Channel number | 08.58 9.3.1 | M | TV | 2
+| Channel number | 48.058 9.3.1 | M | TV | 2
 | Connection Id | <<RSL_IE_IPAC_CONN_ID>> | O | TV | 3
 | Connection Statistics | <<RSL_IE_IPAC_CONN_STAT>> | C | TV | 29
 |===
@@ -662,12 +685,12 @@ Channel number.  It is sent in response to the *Delete Connection
 [options="header"]
 [cols="30%,25%,15%,15%,15%"]
 |===
-| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH 
-| Message discriminator | 08.58 9.1 | M | V | 1
+| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
+| Message discriminator | 48.058 9.1 | M | V | 1
 | Message type | <<own_msg_types>> | M | V | 1
-| Channel number | 08.58 9.3.1 | M | TV | 2
+| Channel number | 48.058 9.3.1 | M | TV | 2
 | Connection Id | <<RSL_IE_IPAC_CONN_ID>> | O | TV | 3
-| Cause | 08.58 9.3.26 | M | TLV | >= 3
+| Cause | 48.058 9.3.26 | M | TLV | >= 3
 |===
 
 [[rsl_pdch_act]]
@@ -679,10 +702,10 @@ a IPA style dynamic TCH/F+PDCH channel.
 [options="header"]
 [cols="30%,25%,15%,15%,15%"]
 |===
-| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH 
-| Message discriminator | 08.58 9.1 | M | V | 1
+| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
+| Message discriminator | 48.058 9.1 | M | V | 1
 | Message type | <<own_msg_types>> | M | V | 1
-| Channel number | 08.58 9.3.1 | M | TV | 2
+| Channel number | 48.058 9.3.1 | M | TV | 2
 |===
 
 NOTE:: This message is *not* used by Osmocom style dynamic channels
@@ -696,11 +719,11 @@ of a PDCH on a IPA style dynamic TCH/F+PDCH channel.
 [options="header"]
 [cols="30%,25%,15%,15%,15%"]
 |===
-| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH 
-| Message discriminator | 08.58 9.1 | M | V | 1
+| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
+| Message discriminator | 48.058 9.1 | M | V | 1
 | Message type | <<own_msg_types>> | M | V | 1
-| Channel number | 08.58 9.3.1 | M | TV | 2
-| Frame Number | 08.58 9.3.8 | O | TV | 3
+| Channel number | 48.058 9.3.1 | M | TV | 2
+| Frame Number | 48.058 9.3.8 | O | TV | 3
 |===
 
 NOTE:: This message is *not* used by Osmocom style dynamic channels
@@ -714,11 +737,11 @@ of a PDCH on a IPA style dynamic TCH/F+PDCH channel.
 [options="header"]
 [cols="30%,25%,15%,15%,15%"]
 |===
-| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH 
-| Message discriminator | 08.58 9.1 | M | V | 1
+| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
+| Message discriminator | 48.058 9.1 | M | V | 1
 | Message type | <<own_msg_types>> | M | V | 1
-| Channel number | 08.58 9.3.1 | M | TV | 2
-| Cause | 08.58 9.3.26 | M | TLV | >= 3
+| Channel number | 48.058 9.3.1 | M | TV | 2
+| Cause | 48.058 9.3.26 | M | TLV | >= 3
 |===
 
 NOTE:: This message is *not* used by Osmocom style dynamic channels
@@ -732,10 +755,10 @@ on a IPA style dynamic TCH/F+PDCH channel.
 [options="header"]
 [cols="30%,25%,15%,15%,15%"]
 |===
-| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH 
-| Message discriminator | 08.58 9.1 | M | V | 1
+| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
+| Message discriminator | 48.058 9.1 | M | V | 1
 | Message type | <<own_msg_types>> | M | V | 1
-| Channel number | 08.58 9.3.1 | M | TV | 2
+| Channel number | 48.058 9.3.1 | M | TV | 2
 |===
 
 NOTE:: This message is *not* used by Osmocom style dynamic channels
@@ -749,10 +772,10 @@ of a PDCH on a IPA style dynamic TCH/F+PDCH channel.
 [options="header"]
 [cols="30%,25%,15%,15%,15%"]
 |===
-| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH 
-| Message discriminator | 08.58 9.1 | M | V | 1
+| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
+| Message discriminator | 48.058 9.1 | M | V | 1
 | Message type | <<own_msg_types>> | M | V | 1
-| Channel number | 08.58 9.3.1 | M | TV | 2
+| Channel number | 48.058 9.3.1 | M | TV | 2
 |===
 
 NOTE:: This message is *not* used by Osmocom style dynamic channels
@@ -766,11 +789,11 @@ on a IPA style dynamic TCH/F+PDCH channel.
 [options="header"]
 [cols="30%,25%,15%,15%,15%"]
 |===
-| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH 
-| Message discriminator | 08.58 9.1 | M | V | 1
+| INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
+| Message discriminator | 48.058 9.1 | M | V | 1
 | Message type | <<own_msg_types>> | M | V | 1
-| Channel number | 08.58 9.3.1 | M | TV | 2
-| Cause | 08.58 9.3.26 | M | TLV | >= 3
+| Channel number | 48.058 9.3.1 | M | TV | 2
+| Cause | 48.058 9.3.26 | M | TLV | >= 3
 |===
 
 NOTE:: This message is *not* used by Osmocom style dynamic channels
@@ -794,10 +817,10 @@ The Channel Number IE is set to the Downlink CCCH (PCH).
 [cols="30%,25%,15%,15%,15%"]
 |===
 | INFORMATION ELEMENT | REFERENCE | PRESENCE | FORMAT | LENGTH
-| Message discriminator | 08.58 9.1 | M | V | 1
+| Message discriminator | 48.058 9.1 | M | V | 1
 | Message type | <<own_msg_types>> | M | V | 1
-| Channel number | 08.58 9.3.1 | M | TV | 2
-| SMSCB Message | 08.58 9.3.42 | M | TLV | 2-58
+| Channel number | 48.058 9.3.1 | M | TV | 2
+| SMSCB Message | 48.058 9.3.42 | M | TLV | 2-58
 |===
 
 
@@ -807,7 +830,7 @@ The Channel Number IE is set to the Downlink CCCH (PCH).
 ==== A-bis/IP specific RSL Message discriminators
 
 The following message discriminators are used in addition to those
-indicated in 3GPP TS 08.58 Section 9.1:
+indicated in 3GPP TS 48.058 Section 9.1:
 
 .OsmoBTS specific new message discriminators
 [options="header",cols="10%,50%,40%"]
@@ -835,7 +858,7 @@ indicated in 3GPP TS 08.58 Section 9.1:
 ==== A-bis/IP specific RSL IEIs
 
 The following Information Element Identifiers (IEIs) are used in
-addition to those indicated in 3GPP TS 08.58 Section 9.3:
+addition to those indicated in 3GPP TS 48.058 Section 9.3:
 
 .A-bis/IP specific information elements
 [options="header",cols="10%,50%,40%"]
@@ -843,30 +866,44 @@ addition to those indicated in 3GPP TS 08.58 Section 9.3:
 | IEI  | Name | This document §
 | 0x01 | RSL_IE_CHAN_NR | <<RSL_IE_CHAN_NR>>
 | 0x60 | RSL_IE_OSMO_REP_ACCH_CAP | <<RSL_IE_OSMO_REP_ACCH_CAP>>
-| 0xf0 | RSL_IE_IPAC_REMOTE_IP | <<RSL_IE_IPAC_REMOTE_IP>> 
+| 0x61 | RSL_IE_OSMO_TRAINING_SEQUENCE | <<RSL_IE_OSMO_TRAINING_SEQUENCE>>
+| 0xf0 | RSL_IE_IPAC_REMOTE_IP | <<RSL_IE_IPAC_REMOTE_IP>>
 | 0xf1 | RSL_IE_IPAC_REMOTE_PORT | <<RSL_IE_IPAC_REMOTE_PORT>>
 | 0xf3 | RSL_IE_IPAC_LOCAL_PORT | <<RSL_IE_IPAC_LOCAL_PORT>>
 | 0xf4 | RSL_IE_IPAC_SPEECH_MODE | <<RSL_IE_IPAC_SPEECH_MODE>>
 | 0xf5 | RSL_IE_IPAC_LOCAL_IP | <<RSL_IE_IPAC_LOCAL_IP>>
 | 0xf6 | RSL_IE_IPAC_CONN_STAT | <<RSL_IE_IPAC_CONN_STAT>>
 | 0xf8 | RSL_IE_IPAC_CONN_ID | <<RSL_IE_IPAC_CONN_ID>>
+| 0xf9 | RSL_IE_IPAC_RTP_CSD_FORMAT | <<RSL_IE_IPAC_RTP_CSD_FORMAT>>
 | 0xfc | RSL_IE_IPAC_RTP_PAYLOAD2 | <<RSL_IE_IPAC_RTP_PAYLOAD2>>
 |===
 
 [[RSL_IE_CHAN_NR]]
 ==== RSL_IE_CHAN_NR
 
-This information element is coded like 3GPP TS 08.58 Section 9.3.1,
-but in addition supports the following extended coding:
+This information element is coded as described in 3GPP TS 48.058 Section 9.3.1,
+but in addition supports the following vendor specific values:
 
-* C5..C1 bits 0b11000 for PDCH type channels
+.RSL Channel Number extensions
+[options="header",cols="5%,5%,5%,5%,5%,75%"]
+|===
+| C5 | C4 | C3 | C2 | C1 | Description
+|  1 |  1 |  0 |  0 |  0 | PDCH `<1>`
+|  1 |  1 |  0 |  0 |  1 | CBCH on SDCCH4
+|  1 |  1 |  0 |  1 |  0 | CBCH on SDCCH8
+|  1 |  1 |  1 |  0 |  1 | VAMOS TCH/F `<2>`
+|  1 |  1 |  1 |  1 |  T | VAMOS TCH/H `<2>`
+|===
+
+`<1>` This extension is only valid on an Osmocom-style dynamic channel, having
+configured the 'NM_CHANC_IPAC_TCHFull_PDCH' channel combination by OML.
+`<2>` These Osmocom specific values are used by osmo-bsc to address logical
+channels on the shadow timeslots in VAMOS mode, iff the BTS is an osmo-bts
+and VAMOS capable.
 
 The TN-Bits are not re-defined in this case but use the same encoding
-as specified in TS 08.58 Section 9.3.1.
+as specified in TS 48.058 Section 9.3.1.
 
-NOTE:: The above extension is only valid on an Osmocom-style dynamic
-channel, having configured the 'NM_CHANC_IPAC_TCHFull_PDCH' channel
-combination by OML.
 
 [[RSL_IE_IPAC_REMOTE_IP]]
 ==== RSL_IE_IPAC_REMOTE_IP
@@ -920,8 +957,8 @@ IEI followed by four bytes IPv4 address.
 
 This information element contains statistics about the RTP connection.
 
-It is encoded as 29 bytes, with the first byte as IEI and 28 bytes
-fixed-length payload encoded as follows:
+It is encoded as 30 bytes, with the first byte as IEI, the second byte as length
+(=28), and 28 bytes fixed-length payload encoded as follows:
 
 .A-bis/IP Connection Statistics
 [options="header",width="60%",cols="15%,15%,70%"]
@@ -979,6 +1016,112 @@ If the IE is not present, then ACCH repetition completely is disabled.
 
 (Bits 7 is reserved for future use and must be set to zero.)
 
+[[RSL_IE_OSMO_TRAINING_SEQUENCE]]
+==== RSL_IE_OSMO_TRAINING_SEQUENCE
+
+This TLV IE instructs the BTS to use a specific training sequence set and
+training sequence code for a given lchan. It is sent by OsmoBSC in RSL CHANNEL
+ACTIVATION and MODE MODIFY messages to the BTS, iff the BTS is VAMOS-capable,
+i.e. if an Abis-over-IP connected BTS indicated BTS_FEAT_VAMOS in the OML BTS
+features (Manufacturer Id information element, see <<NM_ATT_MANUF_ID>>).
+
+If this information element is present, the receiver shall ignore any other
+training sequence set and training sequence code bits from other information
+elements of the same RSL message.
+
+This is an Osmocom-specific extension of the RSL layer, which was added to
+express more than two TSC sets. For VAMOS operation, OsmoBSC selects from one
+of four separate training sequence codings per modulation scheme, while usual
+RSL IEs are only able to express a single-bit TSC set number. For clarity, this
+IE contains both the TSC set and the TSC in one IE, and is defined as
+overruling any other IEs containing TSC or TSC set numbers.
+
+The first value octet indicates the training sequence set, and the second octet
+indicates the training sequence code to be used. Receiving values from a
+reserved value range should be considered an error condition.
+
+.RSL_IE_OSMO_TRAINING_SEQUENCE
+[options="header",width="80%",cols="20%,80%"]
+|===
+| IE octet | value
+| octet 1 |  RSL_IE_OSMO_TRAINING_SEQUENCE IEI (0x61)
+| octet 2 |  length of the value part (2)
+| octet 3 |  TSC set
+| octet 4 |  TSC
+|===
+
+The training sequence set (TSC set) is coded like the 'CS Domain TSC Set' bits,
+as defined in the 'Extended TSC Set' IE in 3GPP TS 44.018 10.5.2.82
+<<3gpp-ts-44-018>>, and corresponds to the 'TSC Set' as defined in 3GPP TS
+45.002 <<3gpp-ts-45-002>>. The encoded training sequence set number ranges from
+0 to 3, any other values are reserved for future use. The encoded 0 corresponds
+to TSC Set 1, see <<RSL_IE_OSMO_TRAINING_SEQUENCE__TSC_set_coding>>.
+
+[[RSL_IE_OSMO_TRAINING_SEQUENCE__TSC_set_coding]]
+.TSC set (octet 3) coding
+[options="header",width="80%",cols="20%,80%"]
+|===
+| octet 3 value | interpretation
+| 0 | 'TSC Set 1' as in 3GPP TS 45.002
+| 1 | 'TSC Set 2'
+| 2 | 'TSC Set 3'
+| 3 | 'TSC Set 4'
+| 4..255 | reserved values
+|===
+
+The training sequence code (TSC) corresponds to the 'TSC' bits as defined in
+the 'Channel Description 2' IE in 3GPP TS 44.018 10.5.2.5a <<3gpp-ts-44-018>>.
+The training sequence code ranges from 0 to 7, any other values are reserved
+for future use.
+
+.TSC (octet 4) coding
+[options="header",width="80%",cols="20%,80%"]
+|===
+| octet 4 value | interpretation
+| 0 | 'Training Sequence Code (TSC) 0' as in 3GPP TS 45.002
+| 1 | 'Training Sequence Code (TSC) 1'
+| 2 | 'Training Sequence Code (TSC) 2'
+| 3 | 'Training Sequence Code (TSC) 3'
+| 4 | 'Training Sequence Code (TSC) 4'
+| 5 | 'Training Sequence Code (TSC) 5'
+| 6 | 'Training Sequence Code (TSC) 6'
+| 7 | 'Training Sequence Code (TSC) 7'
+| 8..255 | reserved values
+|===
+
+[[RSL_IE_IPAC_RTP_CSD_FORMAT]]
+==== RSL_IE_IPAC_RTP_CSD_FORMAT
+
+This information element contains the RTP Circuit Switched Data format.
+
+.A-bis/IP RTP CSD Format
+[options="header",width="60%",cols="15%,15%,70%"]
+|===
+| Offset | Size | Description
+| 0 | 4 | RTP CSD Format D
+| 4 | 4 | RTP CSD Format IR
+|===
+
+.A-bis/IP RTP CSD Format D Values
+[options="header",width="40%",cols="20%,80%"]
+|===
+| Value | Description
+| 0 | External TRAU format
+| 1 | Non-TRAU Packed format
+| 2 | TRAU within the BTS
+| 3 | IWF-Free BTS-BTS Data
+|===
+
+.A-bis/IP RTP CSD Format IR Values
+[options="header",width="40%",cols="20%,80%"]
+|===
+| Value | Description
+| 0 | 8 kb/s
+| 1 | 16 kb/s
+| 2 | 32 kb/s
+| 3 | 48 kb/s
+|===
+
 === A-bis RSL Initialization / BTS bring-up
 
 Upon receiving the 'IPA RSL CONNECT' OML message by the respective
@@ -1003,4 +1146,3 @@ The initialization of the primary and secondary TRX slightly differ, as
 illustrated by the differences of <<rsl-msc-pri>> and <<rsl-msc-sec>>.
 Since the secondary TRX has no BCCH, it does not (need to) receive any 'RSL
 BCCH INFORMATION' messages from the BSC.
-

doc/manuals/chapters/architecture.adoc

@@ -82,13 +82,13 @@ order to specify which PHY instance is allocated to this specific TRX.
 | bts-specific | bts_model_phy_instance_set_defaults() | Called for every PHY Instance created
 | common | bts_controlif_setup() | Initialization of Control Interface
 | bts-specific | bts_model_ctrl_cmds_install() | Install model-specific control interface commands
-| common | telnet_init() | Initialization of telnet interface
+| common | telnet_init_default() | Initialization of telnet interface
 | common | pcu_sock_init() | Initialization of PCU socket
 | common | main() | Installation of signal handlers
 | common | abis_open() | Start of the A-bis connection to BSC
 | common | phy_links_open() | Iterate over list of configured PHY links
 | bts-specific | bts_model_phy_link_open() | Open each of the configured PHY links
-| common | write_pid_file() | Generate the pid file
+| bts-specific | bts_model_phy_link_close() | Close each of the configured PHY links
 | common | osmo_daemonize() | Fork as daemon in background (if configured)
 | common | bts_main() | Run main loop until global variable quit >= 2
 |===

doc/manuals/chapters/configuration.adoc

@@ -19,7 +19,7 @@ The OsmoBTS executables (`osmo-bts-sysmo`, `osmo-bts-trx`,
 generic command line options:
 
 ==== SYNOPSIS
-*osmo-bts-sysmo* [-h|-V] [-d 'DBGMASK'] [-D] [-c 'CONFIGFILE' ] [-s] [-T] [-e 'LOGLEVEL'] [-r 'PRIO'] [-i 'GSMTAP-IP'] [-t <1-255>]
+*osmo-bts-sysmo* [-h|-V] [-d 'DBGMASK'] [-D] [-c 'CONFIGFILE' ] [-s] [-T] [-e 'LOGLEVEL']
 
 ==== OPTIONS
 *-h, --help*::
@@ -48,16 +48,6 @@ generic command line options:
 	Set the global log level for logging to stderr. This has mostly
 	been deprecated by VTY based logging configuration, see
 	<<logging>> for further information.
-*-r, --realtime 'PRIO'*::
-	Enable use of the Linux kernel realtime priority scheduler with
-	the specified priority.
-	It is recommended you use this option on low-performance
-	embedded systems or systems that encounter high non-GSM/GPRS
-	load.
-*-i, --gsmtap-ip 'GSMTAP-IP'*::
-	Specify the destination IP address for GSMTAP messages.
-*-t, --trx-num <1-255>*::
-	Specify the number of TRX supported by this BTS.
 
 There may be additional, hardware specific command line options by the
 different bts_model implementations.
@@ -118,11 +108,22 @@ them via UDP/IP. At that point, they can be captured with utilities like
 *tcpdump* or *tshark* for further analysis by the *wireshark* protocol
 analyzer.
 
-In order to activate this feature, you first need to make sure to start
-OsmoBTS using the `-i` or `--gsmtap-ip` command line option, specifying
-the destination IP address for the GSMTAP messages.  In most cases,
-using 127.0.0.1 for passing the messages over the loopback (`lo`) device
-will be sufficient.
+In order to activate this feature, you first need to make sure to specify
+the remote address of _GSMTAP_ host in the configuration file.  In most
+cases, using 127.0.0.1 for passing the messages over the loopback (`lo`)
+device will be sufficient:
+
+.Example: Enabling GSMTAP Um-frame logging to localhost
+----
+bts 0
+ gsmtap-remote-host 127.0.0.1 <1>
+----
+<1> Destination address for _GSMTAP_ Um-frames
+
+NOTE: Changing this parameter at run-time will not affect the existing
+_GSMTAP_ connection, full program restart is required.
+
+NOTE: Command line parameters `-i` and `--gsmtap-ip` have been deprecated.
 
 OsmoBTS can selectively trace such messages by their L1 SAPI, for both
 Rx and Tx. For a complete list of L1 SAPI values, please refer to the
@@ -137,8 +138,7 @@ node of the OsmoBTS VTY.
 OsmoBTS> enable
 OsmoBTS# configure terminal
 OsmoBTS(config)# bts 0
-OsmoBTS(bts)# trx 0
-OsmoBTS(trx)# gsmtap-sapi sdcch
+OsmoBTS(bts)# gsmtap-sapi sdcch
 OsmoBTS(trx)# write <1>
 ----
 <1> the `write` command will make the configuration persistent in the
@@ -146,12 +146,25 @@ configuration file.  This is not required if you wish to enable GSMTAP
 only in the current session of OsmoBTS.
 
 De-activation can be performed similarly by using the `no gsmtap-sapi
-sdcch` command at the `trx` node of the OsmoBTS VTY.
+sdcch` command at the `bts` node of the OsmoBTS VTY.
+
+It may be useful to enable all SAPIs with a few exceptions, or vice versa
+disable everything using one command.  For this purpose, the VTY provides
+`gsmtap-sapi enable-all` and `gsmtap-sapi disable-all` commands.
+
+.Example: Enabling all SAPIs except PDTCH and PTCCH
+----
+bts 0
+ gsmtap-sapi enable-all <1>
+ no gsmtap-sapi pdtch <2>
+ no gsmtap-sapi ptcch <2>
+----
+<1> Enable all available SAPIs
+<2> Exclude PDTCH and PTCCH SAPIs
 
 From the moment they are enabled via VTY, GSMTAP messages will be
 generated and sent in UDP encapsulation to the IANA-registered UDP port
-for GSMTAP (4729) at the IP address specified in the command line
-argument.
+for GSMTAP (4729) of the specified remote address.
 
 ==== Configuring power ramping
 

doc/manuals/chapters/osmux_bts.adoc

@@ -0,0 +1,39 @@
+include::{commondir}/chapters/osmux/osmux.adoc[]
+
+=== Osmux Support in {program-name}
+
+Osmux usage in {program-name} in managed through the VTY commands in node
+`osmux`. Command `use (on|off|only)` is used to configure use policy of Osmux
+within {program-name}. Once enabled (`on` or `only`), {program-name} will
+announce the _OSMUX_ BTS feature towards the BSC over OML. This way, the BSC
+becomes aware that this BTS supports using Osmux to transfer voice call user
+data when the AMR codec is selected.
+
+It is then up to the BSC to decide whether to use Osmux or not when establishing
+a new call. If the BSC decides to use Osmux for a given call, then the _IPACC
+CRCX/MDCX_ messages sent by the BSC will contain an extra _Osmux CID_ IE
+appended, which contains the Osmux CID to be used by the BTS to send Osmux
+frames to the co-located BSC MGW (aka the BSC MGW' local CID, or {program-name}'
+remote CID). The IP address and port provided in the same messages refer to the
+address and port where Osmux frames with the provided CID are expected to be
+received. Similarly, {program-name} appends an _Osmux CID_ IE to the _IPACC
+CRCX/MDCX ACK_ message it generates, this time with its own local Osmux CID.
+Same goes for the BTS' local IP address and port where Osmux frames are expected
+to be received.
+
+{program-name} will behave differently during call set up based on the VTY
+command  `use (on|off|only)` presented above:
+
+* `off`: If _IPACC CRCX_ from BSC contains _Osmux CID_ IE, meaning
+  BSC wants to use Osmux for this call, then {program-name} will reject the
+  request and the call set up will fail.
+* `on`: {program-name} will support and accept both Osmux and non-Osmux (RTP)
+  upon call set up. If _IPACC CRCX_ from BSC contains the _Osmux CID_ IE on a
+  AMR call (`Channel Mode GSM3`), it will set up an Osmux stream on its end and
+  provide the BSC with the BTS-local CID. If the BSC provides no _Osmux CID_ IE,
+  then {program-name} will set up a regular RTP based call.
+* `only`: Same as per `on`, except that {program-name} will accept only Osmux
+  calls on the CN-side, this is, if  _IPACC CRCX_ from BSC doesn't
+  contain an _Osmux CID_ IE, it will reject the assignment and the call set up
+  will fail. This means also that only AMR calls (`Channel Mode GSM3`) are
+  allowed.

doc/manuals/chapters/qos-example.adoc

@@ -0,0 +1,50 @@
+==== Full example of QoS for osmo-bts uplink QoS
+
+In the below example we will show the full set of configuration required
+for both DSCP and PCP differentiation of uplink Abis traffic by osmo-bts.
+
+What we want to achieve in this example is the following configuration:
+
+.DSCP and PCP assignments for osmo-bts uplink traffic in this example
+[options="header",width="30%",cols="2,1,1"]
+|===
+|Traffic      |DSCP|PCP
+|A-bis RSL    |  56|  7
+|A-bis RTP    |  46|  6
+|A-bis OML    |  34|  5
+|===
+
+. configure the osmocom program to set the DSCP value
+. configure an egrees QoS map to map from priority to PCP
+
+.Example Step 1: add related VTY configuration to `osmo-bts.cfg`
+----
+...
+e1_input
+ ipa ip-dscp oml 34
+ ipa socket-priority oml 5
+ ipa ip-dscp rsl 56
+ ipa socket-priority rsl 7
+...
+bts 0
+ rtp ip-dscp 46
+ rtp socket-priority 6
+ ...
+----
+
+.Example Step 2: egress QoS map to map from socket priority to PCP values
+----
+$ sudo ip link set dev eth0.9<1> type vlan egress-qos-map 0:0 1:1 5:5 6:6 7:7 <2>
+----
+<1> make sure to specify your specific VLAN interface name here instead of `eth0.9`.
+<2> create a egress QoS map that maps the priority value 1:1 to the PCP. We also include the
+    mapping 1:1 from the osmo-pcu example (see <<userman-osmopcu>>) here.
+
+NOTE:: The settings of the `ip` command are volatile and only active until
+the next reboot (or the network device or VLAN is removed).  Please refer to
+the documentation of your specific Linux distribution in order to find out how
+to make such settings persistent by means of an `ifup` hook whenever the interface
+comes up.  For CentOS/RHEL 8 this can e.g. be achieved by means of an `/sbin/ifup-local
+script` (when using `network-scripts` and not NetworkManager).  For Debian or Ubuntu,
+this typically involves adding `up` lines to `/etc/network/interfaces` or a `/etc/network/if-up.d`
+script.

doc/manuals/osmobts-abis-docinfo.xml

@@ -1,39 +1,3 @@
-<revhistory>
-  <revision>
-    <revnumber>1</revnumber>
-    <date>December 2015</date>
-    <authorinitials>NJH, HW</authorinitials>
-    <revremark>
-      Initial version, reflecting OsmoBTS master branch as on 2015-Dec-7
-      (commit e28a20a2d9d049cd6312e218a7646593bbc43431).
-    </revremark>
-  </revision>
-  <revision>
-    <revnumber>2</revnumber>
-    <date>February 2016</date>
-    <authorinitials>HW</authorinitials>
-    <revremark>
-      Updated version with Message Sequence Chart of OML and RSL bring-up.
-    </revremark>
-  </revision>
-  <revision>
-    <revnumber>2.1</revnumber>
-    <date>February 2016</date>
-    <authorinitials>HW</authorinitials>
-    <revremark>
-	    Fix A-bis OML/RSL port number swap in message seqeuence charts.
-    </revremark>
-  </revision>
-  <revision>
-    <revnumber>2.2</revnumber>
-    <date>July 2016</date>
-    <authorinitials>NJH, HW</authorinitials>
-    <revremark>
-	Add description on Dynamic Channel Configuration in OML and activation in RSL.
-    </revremark>
-  </revision>
-
-</revhistory>
 
 <authorgroup>
   <author>
@@ -61,7 +25,7 @@
 </authorgroup>
 
 <copyright>
-  <year>2015-2016</year>
+  <year>2015-2021</year>
   <holder>sysmocom - s.f.m.c. GmbH</holder>
 </copyright>
 

doc/manuals/osmobts-abis.adoc

@@ -87,6 +87,8 @@ include::{srcdir}/abis/rtp.adoc[]
 
 include::./common/chapters/port_numbers.adoc[]
 
+include::./common/chapters/bibliography.adoc[]
+
 include::./common/chapters/glossary.adoc[]
 
 include::./common/chapters/gfdl.adoc[]

doc/manuals/osmobts-usermanual-docinfo.xml

@@ -1,14 +1,3 @@
-<revhistory>
-  <revision>
-    <revnumber>1</revnumber>
-    <date>January 2016</date>
-    <authorinitials>HW</authorinitials>
-    <revremark>
-      Initial version, reflecting OsmoBTS master branch as on FIXME
-      (commit FIXME).
-    </revremark>
-  </revision>
-</revhistory>
 
 <authorgroup>
   <author>
@@ -25,7 +14,7 @@
 </authorgroup>
 
 <copyright>
-  <year>2016</year>
+  <year>2016-2021</year>
   <holder>sysmocom - s.f.m.c. GmbH</holder>
 </copyright>
 

doc/manuals/osmobts-usermanual.adoc

@@ -1,4 +1,5 @@
 :gfdl-enabled:
+:program-name: OsmoBTS
 
 OsmoBTS User Manual
 ===================
@@ -30,6 +31,10 @@ include::{srcdir}/chapters/bts-models.adoc[]
 
 include::{srcdir}/chapters/architecture.adoc[]
 
+include::{srcdir}/chapters/osmux_bts.adoc[]
+
+include::./common/chapters/qos-dscp-pcp.adoc[]
+
 include::./common/chapters/vty_cpu_sched.adoc[]
 
 include::./common/chapters/trx_if.adoc[]

doc/manuals/rtp-amr-docinfo.xml

@@ -1,29 +1,3 @@
-<revhistory>
-  <revision>
-    <revnumber>1</revnumber>
-    <date>October 2016</date>
-    <authorinitials>HW</authorinitials>
-    <revremark>
-      Initial version
-    </revremark>
-  </revision>
-  <revision>
-    <revnumber>2</revnumber>
-    <date>November 2016</date>
-    <authorinitials>MS</authorinitials>
-    <revremark>
-      FSM added
-    </revremark>
-  </revision>
-  <revision>
-    <revnumber>3</revnumber>
-    <date>July 2017</date>
-    <authorinitials>PE</authorinitials>
-    <revremark>
-      Add section and update sequence charts to describe requirement to receive all PH-DATA.ind events
-    </revremark>
-  </revision>
-</revhistory>
 
 <authorgroup>
   <author>
@@ -51,7 +25,7 @@
 </authorgroup>
 
 <copyright>
-  <year>2016</year>
+  <year>2016-2021</year>
   <holder>sysmocom - s.f.m.c. GmbH</holder>
 </copyright>
 

doc/manuals/vty/bts_vty_additions.xml

@@ -1 +1,26 @@
-<vtydoc xmlns='urn:osmocom:xml:libosmocore:vty:doc:1.0'/>
+<!-- ex:ts=2:sw=2:et -->
+<vtydoc xmlns='urn:osmocom:xml:libosmocore:vty:doc:1.0'>
+  <node id='phy-inst'>
+    <!-- FIXME: This command appears twice for some reason. -->
+    <command id='osmotrx maxdly &lt;0-63&gt;'>
+      <description>
+        Access Burst is the first burst a mobile transmits in order to establish a connection and it
+        is used to estimate Timing Advance (TA) which is then applied to Normal Bursts to compensate
+        for signal delay due to distance. So changing this setting effectively changes maximum range
+        of the cell, because Access Bursts with a delay higher than this value will be ignored.
+      </description>
+    </command>
+    <!-- FIXME: This command appears unconditionally, despite being hidden. -->
+    <command id='osmotrx maxdlynb &lt;0-63&gt;'>
+      <description>
+        USE FOR TESTING ONLY, DO NOT CHANGE IN PRODUCTION USE!
+        During the normal operation, delay of Normal Bursts is controlled by the Timing Advance loop
+        and thus Normal Bursts arrive to a BTS with no more than a couple GSM symbols, which is
+        already taken into account in osmo-trx. Changing this setting will have no effect in
+        production installations except increasing osmo-trx CPU load. This setting is only useful
+        when testing with a transmitter which cannot precisely synchronize to the BTS downlink
+        signal, like R&amp;S CMD57.
+      </description>
+    </command>
+  </node>
+</vtydoc>

doc/manuals/vty/osmobts-vty-reference.xml

@@ -12,12 +12,6 @@
 <book>
   <info>
     <revhistory>
-        <revision>
-            <revnumber>v1</revnumber>
-            <date>13th October 2016</date>
-            <authorinitials>hw</authorinitials>
-            <revremark>Initial</revremark>
-        </revision>
         <revision>
             <revnumber>v2</revnumber>
             <date>@@REV_DATE@@</date>

doc/startup.txt

@@ -21,13 +21,12 @@ The start-up procedure of OsmoBTS can be described as follows:
 | bts-specific | bts_model_phy_instance_set_defaults() | Called for every PHY Instance created
 | common | bts_controlif_setup() | Initialization of Control Interface
 | bts-specific | bts_model_ctrl_cmds_install()
-| common | telnet_init() | Initialization of telnet interface
+| common | telnet_init_default() | Initialization of telnet interface
 | common | pcu_sock_init() | Initialization of PCU socket
 | common | main() | Installation of signal handlers
 | common | abis_open() | Start of the A-bis connection to BSC
 | common | phy_links_open() | Iterate over list of configured PHY links
 | bts-specific | bts_model_phy_link_open() | Open each of the configured PHY links
-| common | write_pid_file() | Generate the pid file
 | common | osmo_daemonize() | Fork as daemon in background (if configured)
 | common | bts_main() | Run main loop until global variable quit >= 2
 | bts-specific | bts_model_oml_estab() | Called by core once OML link is established

doc/trx_sched_tch.txt

@@ -0,0 +1,98 @@
+== rx_tchf_fn(): TCH/FS, TCH/EFS, TCH/AFS, TCH/F2.4, and FACCH/F
+
+  00  01  02  03  04  05  06  07  08  09  10  11  12  13  14  15  16  17  18  19  20  21  22  23
++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+  << 4
+|   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   | a | b | c | d |  Rx bid={0,1,2,3}, decode
++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+  << 4
+|   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   | a | b | c | d | e | f | g | h |  Rx bid={0,1,2,3}, decode
++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+  << 4
+                                                                |
+                                                                |<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>|  frame A
+                                                                |               |<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>|  frame B
+                                                                @ decoding from here
+
+
+== rx_tchf_fn(): TCH/F14.4, TCH/F9.6, TCH/F4.8
+
+  00  01  02  03  04  05  06  07  08  09  10  11  12  13  14  15  16  17  18  19  20  21  22  23
+|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  << 4
+|   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   | a | b | c | d |  Rx bid={0,1,2,3}, decode
+|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  << 4
+|   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   | a | b | c | d | e | f | g | h |  Rx bid={0,1,2,3}, decode
+|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  << 4
+|   |   |   |   |   |   |   |   |   |   |   |   | a | b | c | d | e | f | g | h | i | j | k | l |  Rx bid={0,1,2,3}, decode
+|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  << 4
+|   |   |   |   |   |   |   |   | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p |  Rx bid={0,1,2,3}, decode
+|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  << 4
+|   |   |   |   | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | s | t |  Rx bid={0,1,2,3}, decode
+|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  << 4
+| a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | s | t | u | v | w | x |  Rx bid={0,1,2,3}, decode
+|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  << 4
+|
+|<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>|  frame A
+|               |<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>|  frame B
+@ decoding from here
+
+
+== rx_tchh_fn(): TCH/HS, TCH/AHS
+
+  00  01  02  03  04  05  06  07  08  09  10  11  12  13  14  15  16  17  18  19  20  21  22  23
++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+  << 2
+|   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   | a | b |   |   |  Rx bid={0,1}, decode
++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+  << 2
+|   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   | a | b | c | d |   |   |  Rx bid={0,1}, decode
++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+  << 2
+|   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   | a | b | c | d | e | f |   |   |  Rx bid={0,1}, decode
++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+  << 2
+                                                                |
+                                                                |<~~~~~~~~~~~~~>|  frame A
+                                                                |       |<~~~~~~~~~~~~~>|  frame B
+                                                                @ decoding from here
+
+
+== rx_tchh_fn(): FACCH/H
+
+  00  01  02  03  04  05  06  07  08  09  10  11  12  13  14  15  16  17  18  19  20  21  22  23
++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+  << 2
+|   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   | a | b |   |   |  Rx bid={0,1}, decode
++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+  << 2
+|   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   | a | b | c | d |   |   |  Rx bid={0,1}
++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+  << 2
+|   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   | a | b | c | d | e | f |   |   |  Rx bid={0,1}, decode
++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+  << 2
+                                                                |
+                                                                |<~~~~~~~~~~~~~~~~~~~~~>|  frame A
+                                                                |               |<~~~~~~~~~~~~~~~~~~~~~>|  frame B
+                                                                @ decoding from here
+
+
+== rx_tchh_fn(): TCH/H4.8, TCH/H2.4
+
+  00  01  02  03  04  05  06  07  08  09  10  11  12  13  14  15  16  17  18  19  20  21  22  23
+|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  << 2
+|   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   | a | b |   |   |  Rx bid={0,1}, decode
+|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  << 2
+|   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   | a | b | c | d |   |   |  Rx bid={0,1}
+|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  << 2
+|   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   | a | b | c | d | e | f |   |   |  Rx bid={0,1}, decode
+|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  << 2
+|   |   |   |   |   |   |   |   |   |   |   |   |   |   | a | b | c | d | e | f | g | h |   |   |  Rx bid={0,1}
+|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  << 2
+|   |   |   |   |   |   |   |   |   |   |   |   | a | b | c | d | e | f | g | h | i | j |   |   |  Rx bid={0,1}, decode
+|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  << 2
+|   |   |   |   |   |   |   |   |   |   | a | b | c | d | e | f | g | h | i | j | k | l |   |   |  Rx bid={0,1}
+|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  << 2
+|   |   |   |   |   |   |   |   | a | b | c | d | e | f | g | h | i | j | k | l | m | n |   |   |  Rx bid={0,1}, decode
+|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  << 2
+|   |   |   |   |   |   | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p |   |   |  Rx bid={0,1}
+|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  << 2
+|   |   |   |   | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r |   |   |  Rx bid={0,1}, decode
+|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  << 2
+|   |   | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | s | t |   |   |  Rx bid={0,1}
+|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  << 2
+| a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | s | t | u | v |   |   |  Rx bid={0,1}, decode
+|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  << 2
+|
+|<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>|  frame A
+|               |<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>|  frame B
+@ decoding from here

include/osmo-bts/Makefile.am

@@ -1,8 +1,11 @@
 noinst_HEADERS = \
 	abis.h \
+	abis_osmo.h \
+	asci.h \
 	bts.h \
 	bts_model.h \
 	bts_shutdown_fsm.h \
+	bts_sm.h \
 	bts_trx.h \
 	gsm_data.h \
 	logging.h \
@@ -10,6 +13,7 @@ noinst_HEADERS = \
 	oml.h \
 	paging.h \
 	rsl.h \
+	rtp_input_preen.h \
 	signal.h \
 	vty.h \
 	amr.h \
@@ -20,7 +24,9 @@ noinst_HEADERS = \
 	tx_power.h \
 	control_if.h \
 	cbch.h \
+	csd_v110.h \
 	l1sap.h \
+	lchan.h \
 	power_control.h \
 	scheduler.h \
 	scheduler_backend.h \
@@ -28,4 +34,6 @@ noinst_HEADERS = \
 	dtx_dl_amr_fsm.h \
 	ta_control.h \
 	nm_common_fsm.h \
+	notification.h \
+	osmux.h \
 	$(NULL)

include/osmo-bts/abis.h

@@ -6,19 +6,15 @@
 
 #include <osmo-bts/gsm_data.h>
 
-#define	OML_RETRY_TIMER		5
-#define	OML_PING_TIMER		20
-
-enum {
-	LINK_STATE_IDLE = 0,
-	LINK_STATE_RETRYING,
-	LINK_STATE_CONNECTING,
-	LINK_STATE_CONNECT,
+enum abis_link_fsm_event {
+	ABIS_LINK_EV_SIGN_LINK_OML_UP,
+	ABIS_LINK_EV_SIGN_LINK_DOWN,
+	ABIS_LINK_EV_VTY_RM_ADDR, /* data: struct bsc_oml_host* being removed */
 };
 
 void abis_init(struct gsm_bts *bts);
-struct e1inp_line *abis_open(struct gsm_bts *bts, char *dst_host,
-			     char *model_name);
+int abis_open(struct gsm_bts *bts, char *model_name);
+
 
 
 int abis_oml_sendmsg(struct msgb *msg);

include/osmo-bts/abis_osmo.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include <osmocom/core/msgb.h>
+#include <osmo-bts/pcuif_proto.h>
+
+struct gsm_bts;
+
+int down_osmo(struct gsm_bts *bts, struct msgb *msg);
+
+int abis_osmo_pcu_tx_container(struct gsm_bts *bts, const struct gsm_pcu_if_container *container);

include/osmo-bts/amr.h

@@ -14,5 +14,6 @@ int amr_parse_mr_conf(struct amr_multirate_conf *amr_mrc,
 void amr_set_mode_pref(uint8_t *data, const struct amr_multirate_conf *amr_mrc,
 		       uint8_t cmi, uint8_t cmr);
 unsigned int amr_get_initial_mode(struct gsm_lchan *lchan);
+void amr_init_mr_conf_def(struct gsm_lchan *lchan);
 
 #endif /* _OSMO_BTS_AMR_H */

include/osmo-bts/asci.h

@@ -0,0 +1,43 @@
+#pragma once
+#include <stdint.h>
+
+#include <osmo-bts/lchan.h>
+
+enum {
+	VGCS_TALKER_NONE = 0,
+	VGCS_TALKER_WAIT_FRAME,
+	VGCS_TALKER_ACTIVE,
+};
+
+void vgcs_rach(struct gsm_lchan *lchan, uint8_t ra, uint8_t acc_delay, uint32_t fn);
+
+void vgcs_lchan_activate(struct gsm_lchan *lchan);
+
+void vgcs_lchan_react(struct gsm_lchan *lchan);
+
+void vgcs_talker_frame(struct gsm_lchan *lchan);
+
+void vgcs_talker_reset(struct gsm_lchan *lchan, bool ul_access);
+
+void vgcs_listener_reset(struct gsm_lchan *lchan);
+
+static inline bool vgcs_is_uplink_free(struct gsm_lchan *lchan)
+{
+	return lchan->asci.uplink_free;
+}
+
+static inline void vgcs_uplink_free_get(struct gsm_lchan *lchan, uint8_t *msg)
+{
+	memcpy(msg, lchan->asci.uplink_free_msg, GSM_MACBLOCK_LEN);
+}
+
+static inline void vgcs_uplink_free_set(struct gsm_lchan *lchan, uint8_t *msg)
+{
+	memcpy(lchan->asci.uplink_free_msg, msg, GSM_MACBLOCK_LEN);
+	lchan->asci.uplink_free = true;
+}
+
+static inline void vgcs_uplink_free_reset(struct gsm_lchan *lchan)
+{
+	lchan->asci.uplink_free = false;
+}

include/osmo-bts/bts.h

@@ -5,6 +5,7 @@
 #include <osmocom/core/socket.h>
 #include <osmo-bts/gsm_data.h>
 #include <osmo-bts/bts_trx.h>
+#include <osmo-bts/osmux.h>
 
 
 struct gsm_bts_trx;
@@ -18,15 +19,27 @@ enum bts_global_status {
 enum {
 	BTS_CTR_PAGING_RCVD,
 	BTS_CTR_PAGING_DROP,
+	BTS_CTR_PAGING_DROP_PS,
 	BTS_CTR_PAGING_SENT,
+	BTS_CTR_PAGING_CONG,
 	BTS_CTR_RACH_RCVD,
 	BTS_CTR_RACH_DROP,
 	BTS_CTR_RACH_HO,
+	BTS_CTR_RACH_VGCS,
 	BTS_CTR_RACH_CS,
 	BTS_CTR_RACH_PS,
 	BTS_CTR_AGCH_RCVD,
 	BTS_CTR_AGCH_SENT,
 	BTS_CTR_AGCH_DELETED,
+
+	BTS_CTR_RTP_RX_TOTAL,
+	BTS_CTR_RTP_RX_MARKER,
+	BTS_CTR_RTP_RX_DROP_PREEN,
+	BTS_CTR_RTP_RX_DROP_LOOPBACK,
+	BTS_CTR_RTP_RX_DROP_OVERFLOW,
+	BTS_CTR_RTP_RX_DROP_V110_DEC,
+	BTS_CTR_RTP_TX_TOTAL,
+	BTS_CTR_RTP_TX_MARKER,
 };
 
 /* Used by OML layer for BTS Attribute reporting */
@@ -50,31 +63,28 @@ enum gsm_bts_type_variant {
 };
 const char *btsvariant2str(enum gsm_bts_type_variant v);
 
-/* TODO: add a brief description of this flag */
-#define BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP		(1 << 0)
-/* When this flag is set then the measurement data is included in
- * (PRIM_PH_DATA) and struct ph_tch_param (PRIM_TCH). Otherwise the
- * measurement data is passed using a separate MPH INFO MEAS IND.
- * (See also ticket: OS#2977) */
-#define BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB		(1 << 1)
+enum bts_impl_flag {
+	/* TODO: add a brief description of this flag */
+	BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP,
+	/* When this flag is set then the measurement data is included in
+	 * (PRIM_PH_DATA) and struct ph_tch_param (PRIM_TCH). Otherwise the
+	 * measurement data is passed using a separate MPH INFO MEAS IND.
+	 * (See also ticket: OS#2977) */
+	BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB,
+	/* Whether the BTS model requires RadioCarrier MO to be in Enabled state
+	 * (OPSTARTed) before OPSTARTing the RadioChannel MOs. See OS#5157 */
+	BTS_INTERNAL_FLAG_NM_RCHANNEL_DEPENDS_RCARRIER,
+	/* Whether the BTS model reports interference measurements to L1SAP. */
+	BTS_INTERNAL_FLAG_INTERF_MEAS,
+
+	_BTS_INTERNAL_FLAG_NUM, /* must be at the end */
+};
 
 /* BTS implementation flags (internal use, not exposed via OML) */
 #define bts_internal_flag_get(bts, flag) \
-	((bts->flags & (typeof(bts->flags)) flag) != 0)
+	((bts->flags & (typeof(bts->flags))(1 << flag)) != 0)
 #define bts_internal_flag_set(bts, flag) \
-	bts->flags |= (typeof(bts->flags)) flag
-
-struct gsm_bts_gprs_nsvc {
-	struct gsm_bts *bts;
-	/* data read via VTY config file, to configure the BTS
-	 * via OML from BSC */
-	int id;
-	uint16_t nsvci;
-	struct osmo_sockaddr local;	/* on the BTS */
-	struct osmo_sockaddr remote;	/* on the SGSN */
-
-	struct gsm_abis_mo mo;
-};
+	bts->flags |= (typeof(bts->flags))(1 << flag)
 
 struct gprs_rlc_cfg {
 	uint16_t parameter[_NUM_RLC_PAR];
@@ -123,14 +133,28 @@ struct bts_power_ctrl_params {
 	} pf;
 };
 
-/* BTS Site Manager */
-struct gsm_bts_sm {
+/* GPRS CELL; ip.access specific NM Object */
+struct gsm_gprs_cell {
 	struct gsm_abis_mo mo;
+	uint16_t bvci;
+	uint8_t timer[11];
+	struct gprs_rlc_cfg rlc_cfg;
+	struct {
+		uint32_t gprs_codings;	/* see NM_IPAC_F_GPRS_CODING_* flags */
+	} support;
 };
 
+/* Struct that holds one OML-Address (Address of the BSC) */
+struct bsc_oml_host {
+	struct llist_head list;
+	char *addr;
+};
+
+#define BTS_PCU_SOCK_WQUEUE_LEN_DEFAULT 100
+
 /* One BTS */
 struct gsm_bts {
-	/* list header in net->bts_list */
+	/* list header in g_bts_sm->bts_list */
 	struct llist_head list;
 
 	/* number of the BTS in network */
@@ -144,6 +168,7 @@ struct gsm_bts {
 	/* Base Station Identification Code (BSIC), lower 3 bits is BCC,
 	 * which is used as TSC for the CCCH */
 	uint8_t bsic;
+	bool bsic_configured;
 	/* type of BTS */
 	enum gsm_bts_type_variant variant;
 	enum gsm_band band;
@@ -164,6 +189,8 @@ struct gsm_bts {
 	/* how do we talk OML with this TRX? */
 	struct e1inp_sign_link *oml_link;
 	struct timespec oml_conn_established_timestamp;
+	/* OSMO extenion link associated to same line as oml_link: */
+	struct e1inp_sign_link *osmo_link;
 
 	/* Abis network management O&M handle */
 	struct gsm_abis_mo mo;
@@ -177,7 +204,7 @@ struct gsm_bts {
 	/* CCCH is on C0 */
 	struct gsm_bts_trx *c0;
 
-	struct gsm_bts_sm site_mgr;
+	struct gsm_bts_sm *site_mgr;
 
 	/* bitmask of all SI that are present/valid in si_buf */
 	uint32_t si_valid;
@@ -207,18 +234,7 @@ struct gsm_bts {
 
 	/* Not entirely sure how ip.access specific this is */
 	struct {
-		struct {
-			struct gsm_abis_mo mo;
-			uint16_t nsei;
-			uint8_t timer[7];
-		} nse;
-		struct {
-			struct gsm_abis_mo mo;
-			uint16_t bvci;
-			uint8_t timer[11];
-			struct gprs_rlc_cfg rlc_cfg;
-		} cell;
-		struct gsm_bts_gprs_nsvc nsvc[2];
+		struct gsm_gprs_cell cell;
 		uint8_t rac;
 	} gprs;
 
@@ -234,8 +250,9 @@ struct gsm_bts {
 		int16_t boundary[6];
 		uint8_t intave;
 	} interference;
-	unsigned int t200_ms[7];
+	uint32_t t200_fn[7];
 	unsigned int t3105_ms;
+	unsigned int t3115_ms;	/* VGCS UPLINK GRANT repeat timer */
 	struct {
 		uint8_t overload_period;
 		struct {
@@ -258,6 +275,7 @@ struct gsm_bts {
 		} rach;
 	} load;
 	uint8_t ny1;
+	uint8_t ny2;	/* maximum number of repetitions for the VGCS UPLINK GRANT */
 	uint8_t max_ta;
 
 	/* AGCH queuing */
@@ -287,9 +305,17 @@ struct gsm_bts {
 		bool pni;		/* Primary Notification Identifier */
 	} etws;
 
+	/* Advanced Speech Call Items (VBS/VGCS) + NCH related bits */
+	struct {
+		int pos_nch;		/* position of the NCH or < 0, if not available */
+		uint8_t nln, nln_status; /* current notification list number and status */
+		struct llist_head notifications;
+		int notification_entries; /* current number of entries in the list */
+		int notification_count; /* counter to count all entries */
+	} asci;
+
 	struct paging_state *paging_state;
-	char *bsc_oml_host;
-	struct llist_head oml_queue;
+	struct llist_head bsc_oml_hosts;
 	unsigned int rtp_jitter_buf_ms;
 	bool rtp_jitter_adaptive;
 
@@ -297,9 +323,15 @@ struct gsm_bts {
 	uint16_t rtp_port_range_end;
 	uint16_t rtp_port_range_next;
 	int rtp_ip_dscp;
+	int rtp_priority;
+
+	bool rtp_nogaps_mode;		/* emit RTP stream without any gaps */
+	bool use_ul_ecu;		/* "rtp internal-uplink-ecu" option */
+	bool emit_hr_rfc5993;
 
 	struct {
 		uint8_t ciphers;	/* flags A5/1==0x1, A5/2==0x2, A5/3==0x4 */
+		uint8_t max_ta;		/* maximum timing advance */
 	} support;
 	struct {
 		uint8_t tc4_ctr;
@@ -325,6 +357,9 @@ struct gsm_bts {
 	struct gsm_power_ctrl_params bs_dpc_params; /* BS Dynamic Power Control */
 	struct gsm_power_ctrl_params ms_dpc_params; /* MS Dynamic Power Control */
 
+	/* Maximum BCCH carrier power reduction */
+	uint8_t c0_power_red_db;
+
 	/* used by the sysmoBTS to adjust band */
 	uint8_t auto_band;
 
@@ -341,17 +376,26 @@ struct gsm_bts {
 
 	struct {
 		char *sock_path;
+		unsigned int sock_wqueue_len_max;
 	} pcu;
 
 	/* GSMTAP Um logging (disabled by default) */
 	struct {
 		struct gsmtap_inst *inst;
 		char *remote_host;
+		char *local_host;
 		uint32_t sapi_mask;
 		uint8_t sapi_acch;
+		bool rlp;
+		bool rlp_skip_null;
 	} gsmtap;
 
+	struct osmux_state osmux;
+
 	struct osmo_fsm_inst *shutdown_fi; /* FSM instance to manage shutdown procedure during process exit */
+	bool shutdown_fi_exit_proc; /* exit process when shutdown_fsm is finished? */
+	bool shutdown_fi_skip_power_ramp; /* Skip power ramping and change power in one step? */
+	struct osmo_fsm_inst *abis_link_fi; /* FSM instance to manage abis connection during process startup and link failure */
 	struct osmo_tdef *T_defs; /* Timer defines */
 
 	void *model_priv; /* Allocated by bts_model, contains model specific data pointer */
@@ -364,44 +408,60 @@ extern void *tall_bts_ctx;
 #define GSM_BTS_HAS_SI(bts, i) ((bts)->si_valid & (1 << i))
 #define GSM_BTS_SI(bts, i)     (void *)((bts)->si_buf[i][0])
 
-static inline struct gsm_bts *gsm_bts_sm_get_bts(struct gsm_bts_sm *site_mgr) {
-	return (struct gsm_bts *)container_of(site_mgr, struct gsm_bts, site_mgr);
+static inline struct gsm_bts *gsm_gprs_cell_get_bts(struct gsm_gprs_cell *cell)
+{
+	return (struct gsm_bts *)container_of(cell, struct gsm_bts, gprs.cell);
 }
 
-struct gsm_bts *gsm_bts_alloc(void *talloc_ctx, uint8_t bts_num);
-struct gsm_bts *gsm_bts_num(const struct gsm_network *net, int num);
+struct gsm_bts *gsm_bts_alloc(struct gsm_bts_sm *bts_sm, uint8_t bts_num);
+struct gsm_bts *gsm_bts_num(const struct gsm_bts_sm *bts_sm, int num);
 
 int bts_init(struct gsm_bts *bts);
 void bts_shutdown(struct gsm_bts *bts, const char *reason);
+void bts_shutdown_ext(struct gsm_bts *bts, const char *reason, bool exit_proc, bool skip_power_ramp);
 
 int bts_link_estab(struct gsm_bts *bts);
 
 int bts_agch_enqueue(struct gsm_bts *bts, struct msgb *msg);
-struct msgb *bts_agch_dequeue(struct gsm_bts *bts);
 int bts_agch_max_queue_length(int T, int bcch_conf);
-int bts_ccch_copy_msg(struct gsm_bts *bts, uint8_t *out_buf, struct gsm_time *gt,
-		      int is_ag_res);
+
+enum ccch_msgt {
+	CCCH_MSGT_AGCH,
+	CCCH_MSGT_PCH,
+	CCCH_MSGT_NCH,
+};
+
+int bts_ccch_copy_msg(struct gsm_bts *bts, uint8_t *out_buf, struct gsm_time *gt, enum ccch_msgt ccch);
 int bts_supports_cipher(struct gsm_bts *bts, int rsl_cipher);
 uint8_t *bts_sysinfo_get(struct gsm_bts *bts, const struct gsm_time *g_time);
 void regenerate_si3_restoctets(struct gsm_bts *bts);
 void regenerate_si4_restoctets(struct gsm_bts *bts);
 int get_si4_ro_offset(const uint8_t *si4_buf);
-uint8_t *lchan_sacch_get(struct gsm_lchan *lchan);
-int lchan_init_lapdm(struct gsm_lchan *lchan);
 
 void load_timer_start(struct gsm_bts *bts);
+void load_timer_stop(struct gsm_bts *bts);
+bool load_timer_is_running(const struct gsm_bts *bts);
 void bts_update_status(enum bts_global_status which, int on);
 
 struct gsm_time *get_time(struct gsm_bts *bts);
 
 int bts_main(int argc, char **argv);
 
-int bts_supports_cm(struct gsm_bts *bts, enum gsm_phys_chan_config pchan,
-		    enum gsm48_chan_mode cm);
+bool bts_supports_cm(const struct gsm_bts *bts,
+		     const struct rsl_ie_chan_mode *cm);
 
 int32_t bts_get_avg_fn_advance(const struct gsm_bts *bts);
 
 /* return the gsm_lchan for the CBCH (if it exists at all) */
 struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts);
 
+int bts_set_c0_pwr_red(struct gsm_bts *bts, const uint8_t red);
+
+/* Context information to be put in the control buffer (db) of the AGCH msg
+ * buffer */
+struct bts_agch_msg_cb {
+	uint32_t msg_id;
+	bool confirm;
+} __attribute__ ((packed));
+
 #endif /* _BTS_H */

include/osmo-bts/bts_model.h

@@ -5,6 +5,7 @@
 
 #include <osmocom/gsm/tlv.h>
 #include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/gsm/protocol/gsm_12_21.h>
 
 #include <osmo-bts/gsm_data.h>
 
@@ -20,8 +21,8 @@ int bts_model_check_oml(struct gsm_bts *bts, uint8_t msg_type,
 			struct tlv_parsed *old_attr, struct tlv_parsed *new_attr,
 			void *obj);
 
-int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
-			struct tlv_parsed *new_attr, int obj_kind, void *obj);
+int bts_model_apply_oml(struct gsm_bts *bts, const struct msgb *msg,
+			 struct gsm_abis_mo *mo, void *obj);
 
 int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo,
 		      void *obj);

include/osmo-bts/bts_shutdown_fsm.h

@@ -1,6 +1,6 @@
 /* BTS shutdown FSM */
 
-/* (C) 2020 by sysmocom - s.m.f.c. GmbH <info@sysmocom.de>
+/* (C) 2020 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
  * Author: Pau Espin Pedrol <pespin@sysmocom.de>
  *
  * All Rights Reserved
@@ -13,7 +13,7 @@
  * 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.
+ * 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/>.
@@ -24,7 +24,6 @@
 
 #include <osmocom/core/fsm.h>
 
-/* 3GPP TS 24.008 § 4.1.3.3 GMM mobility management states on the network side */
 enum bts_shutdown_fsm_states {
 	BTS_SHUTDOWN_ST_NONE,
 	BTS_SHUTDOWN_ST_WAIT_RAMP_DOWN_COMPL,
@@ -39,3 +38,6 @@ enum bts_shutdown_fsm_events {
 };
 
 extern struct osmo_fsm bts_shutdown_fsm;
+
+struct gsm_bts;
+bool bts_shutdown_in_progress(const struct gsm_bts *bts);

include/osmo-bts/bts_sm.h

@@ -0,0 +1,48 @@
+#pragma once
+
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/socket.h>
+#include <osmocom/gsm/gsm23003.h>
+
+#include <osmo-bts/oml.h>
+
+struct pcu_sock_state;
+
+/* GPRS NSVC; ip.access specific NM Object */
+struct gsm_gprs_nse;
+struct gsm_gprs_nsvc {
+	struct gsm_abis_mo mo;
+	struct gsm_gprs_nse *nse;
+	/* data read via VTY config file, to configure the BTS
+	 * via OML from BSC */
+	int id;
+	uint16_t nsvci;
+	struct osmo_sockaddr local;	/* on the BTS */
+	struct osmo_sockaddr remote;	/* on the SGSN */
+};
+
+/* GPRS NSE; ip.access specific NM Object */
+struct gsm_gprs_nse {
+	struct gsm_abis_mo mo;
+	uint16_t nsei;
+	uint8_t timer[7];
+	struct gsm_gprs_nsvc nsvc[2];
+};
+
+struct gsm_bts *gsm_gprs_nse_get_bts(const struct gsm_gprs_nse *nse);
+
+/* BTS Site Manager */
+struct gsm_bts_sm {
+	struct gsm_abis_mo mo;
+	struct llist_head bts_list;
+	unsigned int num_bts;
+	struct osmo_plmn_id plmn;
+	struct {
+		struct pcu_sock_state *pcu_state;
+		struct gsm_gprs_nse nse;
+	} gprs;
+};
+
+extern struct gsm_bts_sm *g_bts_sm;
+
+struct gsm_bts_sm *gsm_bts_sm_alloc(void *talloc_ctx);

include/osmo-bts/bts_trx.h

@@ -1,9 +1,16 @@
 #pragma once
 
+#include <osmocom/core/sockaddr_str.h>
 #include <osmo-bts/gsm_data.h>
 
 struct gsm_bts_bb_trx {
 	struct gsm_abis_mo mo;
+	/* how do we talk RSL with this TRX? */
+	struct {
+		struct osmo_sockaddr_str rem_addrstr;
+		uint8_t tei;
+		struct e1inp_sign_link *link;
+	} rsl;
 };
 
 /* One TRX in a BTS */
@@ -16,9 +23,6 @@ struct gsm_bts_trx {
 	uint8_t nr;
 	/* human readable name / description */
 	char *description;
-	/* how do we talk RSL with this TRX? */
-	uint8_t rsl_tei;
-	struct e1inp_sign_link *rsl_link;
 
 	/* NM Radio Carrier and Baseband Transciever */
 	struct gsm_abis_mo mo;
@@ -27,26 +31,25 @@ struct gsm_bts_trx {
 	uint16_t arfcn;
 	int nominal_power;		/* in dBm */
 	unsigned int max_power_red;	/* in actual dB */
-        uint8_t max_power_backoff_8psk; /* in actual dB OC-2G only */
-        uint8_t c0_idle_power_red;      /* in actual dB OC-2G only */
+	uint8_t max_power_backoff_8psk; /* in actual dB OC-2G only */
+	uint8_t c0_idle_power_red;      /* in actual dB OC-2G only */
 
+	uint8_t ta_ctrl_interval; /* 1 step is 2 SACCH periods */
 
 	struct trx_power_params power_params;
 	struct gsm_power_ctrl_params *bs_dpc_params; /* BS Dynamic Power Control */
 	struct gsm_power_ctrl_params *ms_dpc_params; /* MS Dynamic Power Control */
 	bool ms_pwr_ctl_soft; /* is power control loop done by osmocom software? */
 
-	struct {
-		void *l1h;
-	} role_bts;
+	/* The associated PHY instance */
+	struct phy_instance *pinst;
+
+	struct {
+		uint32_t freq_bands;	/* see NM_IPAC_F_FREQ_BAND_* flags */
+		uint32_t chan_types;	/* see NM_IPAC_F_CHANT_* flags */
+		uint32_t chan_modes;	/* see NM_IPAC_F_CHANM_* flags */
+	} support;
 
-	union {
-		struct {
-			unsigned int test_state;
-			uint8_t test_nr;
-			struct rxlev_stats rxlev_stat;
-		} ipaccess;
-	};
 	struct gsm_bts_trx_ts ts[TRX_NR_TS];
 };
 
@@ -55,15 +58,17 @@ static inline struct gsm_bts_trx *gsm_bts_bb_trx_get_trx(struct gsm_bts_bb_trx *
 }
 
 struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts);
-int bts_trx_init(struct gsm_bts_trx *trx);
 struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num);
+void gsm_bts_trx_init_shadow_ts(struct gsm_bts_trx *trx);
+void gsm_bts_trx_free_shadow_ts(struct gsm_bts_trx *trx);
 char *gsm_trx_name(const struct gsm_bts_trx *trx);
 const char *gsm_trx_unit_id(struct gsm_bts_trx *trx);
 
 int trx_link_estab(struct gsm_bts_trx *trx);
 void trx_operability_update(struct gsm_bts_trx *trx);
 
-uint8_t num_agch(struct gsm_bts_trx *trx, const char * arg);
+uint8_t num_agch(const struct gsm_bts_trx *trx, const char * arg);
+int pos_nch(const struct gsm_bts_trx *trx, const char *arg);
 bool trx_ms_pwr_ctrl_is_osmo(const struct gsm_bts_trx *trx);
 
 #define LOGPTRX(trx, ss, lvl, fmt, args...) LOGP(ss, lvl, "%s " fmt, gsm_trx_name(trx), ## args)

include/osmo-bts/cbch.h

@@ -21,3 +21,5 @@ int bts_process_smscb_cmd(struct gsm_bts *bts, struct rsl_ie_cb_cmd_type cmd_typ
 /* call-back from bts model specific code when it wants to obtain a CBCH
  * block for a given gsm_time.  outbuf must have 23 bytes of space. */
 int bts_cbch_get(struct gsm_bts *bts, uint8_t *outbuf, struct gsm_time *g_time);
+
+void bts_cbch_reset(struct gsm_bts *bts);

include/osmo-bts/control_if.h

@@ -1,5 +1,4 @@
 #pragma once
 
 int bts_ctrl_cmds_install(struct gsm_bts *bts);
-struct ctrl_handle *bts_controlif_setup(struct gsm_bts *bts,
-					const char *bind_addr, uint16_t port);
+struct ctrl_handle *bts_controlif_setup(struct gsm_bts *bts, uint16_t port);

include/osmo-bts/csd_v110.h

@@ -0,0 +1,23 @@
+#pragma once
+
+/* RFC4040 "clearmode" RTP payload length */
+#define RFC4040_RTP_PLEN 160
+
+struct gsm_lchan;
+
+struct csd_v110_frame_desc {
+	uint16_t num_blocks;
+	uint16_t num_bits;
+};
+
+struct csd_v110_lchan_desc {
+	struct csd_v110_frame_desc fr;
+	struct csd_v110_frame_desc hr;
+};
+
+extern const struct csd_v110_lchan_desc csd_v110_lchan_desc[256];
+
+int csd_v110_rtp_encode(const struct gsm_lchan *lchan, uint8_t *rtp,
+			const uint8_t *data, size_t data_len);
+int csd_v110_rtp_decode(const struct gsm_lchan *lchan, uint8_t *data,
+			const uint8_t *rtp, size_t rtp_len);

include/osmo-bts/gsm_data.h

@@ -9,15 +9,13 @@
 #include <osmocom/core/statistics.h>
 #include <osmocom/core/utils.h>
 #include <osmocom/core/linuxlist.h>
-#include <osmocom/codec/ecu.h>
-#include <osmocom/gsm/lapdm.h>
+#include <osmocom/core/tdef.h>
 #include <osmocom/gsm/gsm23003.h>
 #include <osmocom/gsm/gsm0502.h>
 #include <osmocom/gsm/gsm_utils.h>
 #include <osmocom/gsm/tlv.h>
 #include <osmocom/gsm/rxlev_stat.h>
 #include <osmocom/gsm/sysinfo.h>
-#include <osmocom/gsm/meas_rep.h>
 #include <osmocom/gsm/bts_features.h>
 #include <osmocom/gsm/gsm48_rest_octets.h>
 #include <osmocom/gsm/protocol/gsm_04_08.h>
@@ -29,6 +27,7 @@
 #include <osmo-bts/paging.h>
 #include <osmo-bts/tx_power.h>
 #include <osmo-bts/oml.h>
+#include <osmo-bts/lchan.h>
 
 #define GSM_FR_BITS	260
 #define GSM_EFR_BITS	244
@@ -42,23 +41,6 @@
 #define GSM_BTS_AGCH_QUEUE_LOW_LEVEL_DEFAULT 41
 #define GSM_BTS_AGCH_QUEUE_HIGH_LEVEL_DEFAULT 91
 
-#define LOGPLCHAN(lchan, ss, lvl, fmt, args...) LOGP(ss, lvl, "%s " fmt, gsm_lchan_name(lchan), ## args)
-
-struct gsm_network {
-	struct llist_head bts_list;
-	unsigned int num_bts;
-	struct osmo_plmn_id plmn;
-	struct pcu_sock_state *pcu_state;
-};
-
-enum lchan_ciph_state {
-	LCHAN_CIPH_NONE,
-	LCHAN_CIPH_RX_REQ,
-	LCHAN_CIPH_RX_CONF,
-	LCHAN_CIPH_RXTX_REQ,
-	LCHAN_CIPH_RX_CONF_TX_REQ,
-	LCHAN_CIPH_RXTX_CONF,
-};
 
 /* 16 is the max. number of SI2quater messages according to 3GPP TS 44.018 Table 10.5.2.33b.1:
    4-bit index is used (2#1111 = 10#15) */
@@ -70,351 +52,58 @@ enum lchan_ciph_state {
 /* lchans 0..3 are SDCCH in combined channel configuration,
    use 4 as magic number for BCCH hack - see osmo-bts-../oml.c:opstart_compl() */
 #define CCCH_LCHAN 4
+#define CBCH_LCHAN 2
 
 #define TRX_NR_TS	8
 #define TS_MAX_LCHAN	8
 
 #define MAX_VERSION_LENGTH 64
 
-struct gsm_lchan;
-struct osmo_rtp_socket;
-struct pcu_sock_state;
-struct smscb_msg;
-
-#define MAX_A5_KEY_LEN	(128/8)
-#define RSL_ENC_ALG_A5(x)	(x+1)
-
-/* state of a logical channel */
-enum gsm_lchan_state {
-	LCHAN_S_NONE,		/* channel is not active */
-	LCHAN_S_ACT_REQ,	/* channel activation requested */
-	LCHAN_S_ACTIVE,		/* channel is active and operational */
-	LCHAN_S_REL_REQ,	/* channel release has been requested */
-	LCHAN_S_REL_ERR,	/* channel is in an error state */
-	LCHAN_S_BROKEN,		/* channel is somehow unusable */
-	LCHAN_S_INACTIVE,	/* channel is set inactive */
-};
-
-#define MAX_NUM_UL_MEAS	104
-#define LC_UL_M_F_L1_VALID	(1 << 0)
-#define LC_UL_M_F_RES_VALID	(1 << 1)
-#define LC_UL_M_F_OSMO_EXT_VALID (1 << 2)
-
-struct bts_ul_meas {
-	/* BER in units of 0.01%: 10.000 == 100% ber, 0 == 0% ber */
-	uint16_t ber10k;
-	/* timing advance offset (in 1/256 bits) */
-	int16_t ta_offs_256bits;
-	/* C/I ratio in dB */
-	float c_i;
-	/* flags */
-	uint8_t is_sub:1;
-	/* RSSI in dBm * -1 */
-	uint8_t inv_rssi;
-};
-
-struct amr_mode {
-	uint8_t mode;
-	uint8_t threshold;
-	uint8_t hysteresis;
-};
-
-struct amr_multirate_conf {
-	uint8_t gsm48_ie[2];
-	struct amr_mode ms_mode[4];
-	struct amr_mode bts_mode[4];
-	uint8_t num_modes;
-};
-
-enum lchan_csd_mode {
-	LCHAN_CSD_M_NT,
-	LCHAN_CSD_M_T_1200_75,
-	LCHAN_CSD_M_T_600,
-	LCHAN_CSD_M_T_1200,
-	LCHAN_CSD_M_T_2400,
-	LCHAN_CSD_M_T_9600,
-	LCHAN_CSD_M_T_14400,
-	LCHAN_CSD_M_T_29000,
-	LCHAN_CSD_M_T_32000,
-};
-
-/* State of the SAPIs in the lchan */
-enum lchan_sapi_state {
-	LCHAN_SAPI_S_NONE,
-	LCHAN_SAPI_S_REQ,
-	LCHAN_SAPI_S_ASSIGNED,
-	LCHAN_SAPI_S_REL,
-	LCHAN_SAPI_S_ERROR,
-};
-
-/* What kind of release/activation is done? A silent one for
- * the PDCH or one triggered through RSL? */
-enum lchan_rel_act_kind {
-	LCHAN_REL_ACT_RSL,
-	LCHAN_REL_ACT_PCU,
-	LCHAN_REL_ACT_OML,
-	LCHAN_REL_ACT_REACT, /* remove once auto-activation hack is removed from opstart_compl() */
-};
-
-struct gsm_rep_facch {
-	struct msgb *msg;
-	uint32_t fn;
-};
-
-/* MS/BS Power related measurement averaging algo */
-enum gsm_power_ctrl_meas_avg_algo {
-	GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE			= 0x00,
-	GSM_PWR_CTRL_MEAS_AVG_ALGO_UNWEIGHTED		= 0x01,
-	GSM_PWR_CTRL_MEAS_AVG_ALGO_WEIGHTED		= 0x02,
-	GSM_PWR_CTRL_MEAS_AVG_ALGO_MOD_MEDIAN		= 0x03,
-	/* EWMA is an Osmocom specific algo */
-	GSM_PWR_CTRL_MEAS_AVG_ALGO_OSMO_EWMA		= 0x04,
-};
-
-/* MS/BS Power related measurement parameters */
-struct gsm_power_ctrl_meas_params {
-	/* Thresholds (see 3GPP TS 45.008, section A.3.2.1) */
-	uint8_t lower_thresh; /* lower (decreasing) direction */
-	uint8_t upper_thresh; /* upper (increasing) direction */
-
-	/* Threshold Comparators for lower (decreasing) direction */
-	uint8_t lower_cmp_p; /* P1 for RxLev, P3 for RxQual */
-	uint8_t lower_cmp_n; /* N1 for RxLev, N3 for RxQual */
-	/* Threshold Comparators for upper (increasing) direction */
-	uint8_t upper_cmp_p; /* P2 for RxLev, P4 for RxQual */
-	uint8_t upper_cmp_n; /* N2 for RxLev, N4 for RxQual */
-
-	/* Hreqave and Hreqt (see 3GPP TS 45.008, Annex A) */
-	uint8_t h_reqave;
-	uint8_t h_reqt;
-
-	/* AVG algorithm and its specific parameters */
-	enum gsm_power_ctrl_meas_avg_algo algo;
-	union {
-		/* Exponentially Weighted Moving Average */
-		struct {
-			/* Smoothing factor: higher the value - less smoothing */
-			uint8_t alpha; /* 1 .. 99 (in %) */
-		} ewma;
-	};
-};
-
-/* MS/BS Power Control parameters */
-struct gsm_power_ctrl_params {
-	/* Minimum interval between power level changes */
-	uint8_t ctrl_interval; /* 1 step is 2 SACCH periods */
-
-	/* Power change step size (maximum) */
-	uint8_t inc_step_size_db; /* increasing direction */
-	uint8_t red_step_size_db; /* reducing direction */
-
-	/* Measurement averaging parameters for RxLev & RxQual */
-	struct gsm_power_ctrl_meas_params rxqual_meas;
-	struct gsm_power_ctrl_meas_params rxlev_meas;
-};
-
-/* Default MS/BS Power Control parameters */
-extern const struct gsm_power_ctrl_params power_ctrl_params_def;
-
-/* Measurement pre-processing state */
-struct gsm_power_ctrl_meas_proc_state {
-	/* Number of measurements processed */
-	unsigned int meas_num;
-	/* Algorithm specific data */
-	union {
-		struct {
-			/* Scaled up 100 times average value */
-			int Avg100;
-		} ewma;
-	};
-};
-
-struct lchan_power_ctrl_state {
-	/* Dynamic Power Control parameters (NULL in static mode) */
-	const struct gsm_power_ctrl_params *dpc_params;
-	/* Measurement pre-processing state (for dynamic mode) */
-	struct gsm_power_ctrl_meas_proc_state rxlev_meas_proc;
-	/* Number of SACCH blocks to skip (for dynamic mode) */
-	int skip_block_num;
-
-	/* Depending on the context (MS or BS power control), fields 'current' and 'max'
-	 * reflect either the MS power level (magic numbers), or BS Power reduction level
-	 * (attenuation, in dB). */
-	uint8_t current;
-	uint8_t max;
-};
-
-struct gsm_lchan {
-	/* The TS that we're part of */
-	struct gsm_bts_trx_ts *ts;
-	/* The logical subslot number in the TS */
-	uint8_t nr;
-	/* The logical channel type */
-	enum gsm_chan_t type;
-	/* RSL channel mode */
-	enum rsl_cmod_spd rsl_cmode;
-	/* If TCH, traffic channel mode */
-	enum gsm48_chan_mode tch_mode;
-	enum lchan_csd_mode csd_mode;
-	/* State */
-	enum gsm_lchan_state state;
-	const char *broken_reason;
-	/* Encryption information */
-	struct {
-		uint8_t alg_id;
-		uint8_t key_len;
-		uint8_t key[MAX_A5_KEY_LEN];
-	} encr;
-
-	struct {
-		uint32_t bound_ip;
-		uint32_t connect_ip;
-		uint16_t bound_port;
-		uint16_t connect_port;
-		uint16_t conn_id;
-		uint8_t rtp_payload;
-		uint8_t rtp_payload2;
-		uint8_t speech_mode;
-		struct osmo_rtp_socket *rtp_socket;
-	} abis_ip;
-
-	uint8_t rqd_ta;
-
-	char *name;
-
-	/* For handover, activation is described in 3GPP TS 48.058 4.1.3 and 4.1.4:
-	 *
-	 *          |          | Access ||  transmit         |  activate
-	 *          | MS Power | Delay  ||  on main channel  |  dl SACCH
-	 * ----------------------------------------------------------------------
-	 * async ho   no         *     -->  yes                 no
-	 * async ho   yes        *     -->  yes                 may be started
-	 * sync ho    no         no    -->  yes                 no
-	 * sync ho    yes        no    -->  yes                 may be started
-	 * sync ho    yes        yes   -->  yes                 shall be started
-	 *
-	 * Always start the main channel immediately.
-	 * want_dl_sacch_active indicates whether dl SACCH should be activated on CHAN ACT.
-	 */
-	bool want_dl_sacch_active;
-
-	/* Number of different GsmL1_Sapi_t used in osmo_bts_sysmo is 23.
-	 * Currently we don't share these headers so this is a magic number. */
-	struct llist_head sapi_cmds;
-	uint8_t sapis_dl[23];
-	uint8_t sapis_ul[23];
-	struct lapdm_channel lapdm_ch;
-	struct llist_head dl_tch_queue;
-	struct {
-		/* bitmask of all SI that are present/valid in si_buf */
-		uint32_t valid;
-		/* bitmask of all SI that do not mirror the BTS-global SI values */
-		uint32_t overridden;
-		uint32_t last;
-		/* buffers where we put the pre-computed SI:
-		   SI2Q_MAX_NUM is the max number of SI2quater messages (see 3GPP TS 44.018) */
-		sysinfo_buf_t buf[_MAX_SYSINFO_TYPE][SI2Q_MAX_NUM];
-	} si;
-	struct {
-		uint8_t flags;
-		/* RSL measurement result number, 0 at lchan_act */
-		uint8_t res_nr;
-		/* number of measurements stored in array below */
-		uint8_t num_ul_meas;
-		struct bts_ul_meas uplink[MAX_NUM_UL_MEAS];
-		/* last L1 header from the MS */
-	        struct rsl_l1_info l1_info;
-		struct gsm_meas_rep_unidir ul_res;
-		int16_t ms_toa256;
-		/* Frame number of the last measurement indication receceived */
-		uint32_t last_fn;
-		/* Osmocom extended measurement results, see LC_UL_M_F_EXTD_VALID */
-		struct {
-			/* minimum value of toa256 during measurement period */
-			int16_t toa256_min;
-			/* maximum value of toa256 during measurement period */
-			int16_t toa256_max;
-			/* standard deviation of toa256 value during measurement period */
-			uint16_t toa256_std_dev;
-		} ext;
-	} meas;
-	struct {
-		struct amr_multirate_conf amr_mr;
-		struct {
-			struct osmo_fsm_inst *dl_amr_fsm;
-			/* TCH cache */
-			uint8_t cache[20];
-			/* FACCH cache */
-			uint8_t facch[GSM_MACBLOCK_LEN];
-			uint8_t len;
-			uint32_t fn;
-			bool is_update;
-			/* set for each SID frame to detect talkspurt for codecs
-			   without explicit ONSET event */
-			bool ul_sid;
-			/* indicates if DTXd was active during DL measurement
-			   period */
-			bool dl_active;
-                        /* last UL SPEECH resume flag */
-                        bool is_speech_resume;
-		} dtx;
-		uint8_t last_cmr;
-		uint32_t last_fn;
-
-		/* SLOT #0 and #1 to store FACCH for repetition */
-		struct gsm_rep_facch rep_facch[2];
-
-	} tch;
-
-	/* 3GPP TS 48.058 § 9.3.37: [0; 255] ok, -1 means invalid*/
-	int16_t ms_t_offs;
-	/* 3GPP TS 45.010 § 1.2 round trip propagation delay (in symbols) or -1 */
-	int16_t p_offs;
-
-	/* BTS-side ciphering state (rx only, bi-directional, ...) */
-	uint8_t ciph_state;
-	uint8_t ciph_ns;
-	uint8_t loopback;
-	struct {
-		uint8_t active;
-		uint8_t ref;
-		/* T3105: PHYS INF retransmission */
-		struct osmo_timer_list t3105;
-		/* counts up to Ny1 */
-		unsigned int phys_info_count;
-	} ho;
-	/* S counter for link loss */
-	int s;
-	/* Kind of the release/activation. E.g. RSL or PCU */
-	enum lchan_rel_act_kind rel_act_kind;
-	/* RTP header Marker bit to indicate beginning of speech after pause  */
-	bool rtp_tx_marker;
-
-	/* MS/BS power control state */
-	struct lchan_power_ctrl_state ms_power_ctrl;
-	struct lchan_power_ctrl_state bs_power_ctrl;
-
-	/* MS/BS Dynamic Power Control parameters */
-	struct gsm_power_ctrl_params ms_dpc_params;
-	struct gsm_power_ctrl_params bs_dpc_params;
-
-	struct msgb *pending_rel_ind_msg;
-
-	/* ECU (Error Concealment Unit) state */
-	struct osmo_ecu_state *ecu_state;
-
-	struct abis_rsl_osmo_rep_acch_cap repeated_acch_capability;
-	bool repeated_dl_facch_active;
-	bool repeated_ul_sacch_active;
-
-	/* Message buffer to store DL-SACCH repeation candidate */
-	struct msgb *rep_sacch;
-};
-
-extern const struct value_string lchan_ciph_state_names[];
-static inline const char *lchan_ciph_state_name(uint8_t state) {
-	return get_value_string(lchan_ciph_state_names, state);
-}
+/* NM_IPAC_F_CHANT_* mask for NM_IPAC_EIE_CHAN_TYPES (common) */
+#define NM_IPAC_MASK_CHANT_COMMON \
+	(NM_IPAC_F_CHANT_TCHF		| \
+	 NM_IPAC_F_CHANT_TCHH		| \
+	 NM_IPAC_F_CHANT_SDCCH8		| \
+	 NM_IPAC_F_CHANT_BCCH		| \
+	 NM_IPAC_F_CHANT_BCCH_SDCCH4)
+/* NM_IPAC_F_CHANM_SPEECH_* mask for NM_IPAC_EIE_CHAN_MODES */
+#define NM_IPAC_MASK_CHANM_SPEECH \
+	(NM_IPAC_F_CHANM_SPEECH_FS	| \
+	 NM_IPAC_F_CHANM_SPEECH_EFS	| \
+	 NM_IPAC_F_CHANM_SPEECH_AFS	| \
+	 NM_IPAC_F_CHANM_SPEECH_HS	| \
+	 NM_IPAC_F_CHANM_SPEECH_AHS)
+/* NM_IPAC_F_CHANM_CSD_NT_* mask for NM_IPAC_EIE_CHAN_MODES */
+#define NM_IPAC_MASK_CHANM_CSD_NT \
+	(NM_IPAC_F_CHANM_CSD_NT_4k8	| \
+	 NM_IPAC_F_CHANM_CSD_NT_9k6	| \
+	 NM_IPAC_F_CHANM_CSD_NT_14k4)
+/* NM_IPAC_F_CHANM_CSD_T_* mask for NM_IPAC_EIE_CHAN_MODES */
+#define NM_IPAC_MASK_CHANM_CSD_T \
+	(NM_IPAC_F_CHANM_CSD_T_1200_75	| \
+	 NM_IPAC_F_CHANM_CSD_T_600	| \
+	 NM_IPAC_F_CHANM_CSD_T_1k2	| \
+	 NM_IPAC_F_CHANM_CSD_T_2k4	| \
+	 NM_IPAC_F_CHANM_CSD_T_4k8	| \
+	 NM_IPAC_F_CHANM_CSD_T_9k6	| \
+	 NM_IPAC_F_CHANM_CSD_T_14k4)
+/* NM_IPAC_F_GPRS_CODING_CS[1-4] mask for NM_IPAC_EIE_GPRS_CODING */
+#define NM_IPAC_MASK_GPRS_CODING_CS \
+	(NM_IPAC_F_GPRS_CODING_CS1	| \
+	 NM_IPAC_F_GPRS_CODING_CS2	| \
+	 NM_IPAC_F_GPRS_CODING_CS3	| \
+	 NM_IPAC_F_GPRS_CODING_CS4)
+/* NM_IPAC_F_GPRS_CODING_MCS[1-9] mask for NM_IPAC_EIE_GPRS_CODING */
+#define NM_IPAC_MASK_GPRS_CODING_MCS \
+	(NM_IPAC_F_GPRS_CODING_MCS1	| \
+	 NM_IPAC_F_GPRS_CODING_MCS2	| \
+	 NM_IPAC_F_GPRS_CODING_MCS3	| \
+	 NM_IPAC_F_GPRS_CODING_MCS4	| \
+	 NM_IPAC_F_GPRS_CODING_MCS5	| \
+	 NM_IPAC_F_GPRS_CODING_MCS6	| \
+	 NM_IPAC_F_GPRS_CODING_MCS7	| \
+	 NM_IPAC_F_GPRS_CODING_MCS8	| \
+	 NM_IPAC_F_GPRS_CODING_MCS9)
 
 enum gsm_bts_trx_ts_flags {
 	TS_F_PDCH_ACTIVE =		0x1000,
@@ -435,12 +124,22 @@ struct gsm_bts_trx_ts {
 	struct {
 		enum gsm_phys_chan_config pchan_is;
 		enum gsm_phys_chan_config pchan_want;
-		struct msgb *pending_chan_activ;
 	} dyn;
 
 	unsigned int flags;
 	struct gsm_abis_mo mo;
-	int tsc;		/* -1 == use BTS TSC */
+
+	/* Training Sequence Code (range 0..7) */
+	uint8_t tsc_oml; /* configured via OML */
+	bool tsc_oml_configured;
+	uint8_t tsc_rsl; /* configured via RSL (Osmo extension) */
+	bool tsc_rsl_configured;
+	uint8_t tsc; /* TSC currently in use. Preference: RSL, OML, BTS-BSIC-OML */
+	/* Training Sequence Set (range 0..3) */
+	uint8_t tsc_set;
+
+	/* Actual BCCH carrier power reduction */
+	uint8_t c0_power_red_db;
 
 	/* Frequency hopping parameters (configured via OML) */
 	struct {
@@ -454,11 +153,19 @@ struct gsm_bts_trx_ts {
 	/* Transceiver "cache" for frequency hopping */
 	const struct gsm_bts_trx *fh_trx_list[64];
 
+	/* Implementation specific structure(s) */
+	void *priv;
+
+	/* VAMOS specific fields */
+	struct {
+		/* NULL if BTS_FEAT_VAMOS is not set */
+		struct gsm_bts_trx_ts *peer;
+		bool is_shadow;
+	} vamos;
+
 	struct gsm_lchan lchan[TS_MAX_LCHAN];
 };
 
-#define GSM_LCHAN_SI(lchan, i) (void *)((lchan)->si.buf[i][0])
-
 enum gprs_rlc_par {
 	RLC_T3142,
 	RLC_T3169,
@@ -495,40 +202,33 @@ enum gprs_cs {
  * OML connection will cause a special warning to be logged. */
 #define OSMO_BTS_OML_CONN_EARLY_DISCONNECT 10	 /* in seconds */
 
+extern struct osmo_tdef_group bts_tdef_groups[];
+extern struct osmo_tdef bts_T_defs[];
+extern struct osmo_tdef abis_T_defs[];
 
 extern const struct value_string gsm_pchant_names[13];
 extern const struct value_string gsm_pchant_descs[13];
 const char *gsm_pchan_name(enum gsm_phys_chan_config c);
-enum gsm_phys_chan_config gsm_pchan_parse(const char *name);
 const char *gsm_lchant_name(enum gsm_chan_t c);
 char *gsm_ts_name(const struct gsm_bts_trx_ts *ts);
 char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts);
-char *gsm_lchan_name_compute(const struct gsm_lchan *lchan);
-const char *gsm_lchans_name(enum gsm_lchan_state s);
 
-static inline char *gsm_lchan_name(const struct gsm_lchan *lchan)
-{
-	return lchan->name;
-}
+#define GSM_TS_NAME_FMT \
+	"bts=%u,trx=%u,ts=%u" "%s"
+#define GSM_TS_NAME_ARGS(ts) \
+	(ts)->trx->bts->nr, (ts)->trx->nr, (ts)->nr, \
+	(ts)->vamos.is_shadow ? ",shadow" : ""
 
-uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan);
-uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan,
-				   enum gsm_phys_chan_config as_pchan);
-
-#define BSIC2BCC(bsic) ((bsic) & 0x3)
-
-uint8_t gsm_ts_tsc(const struct gsm_bts_trx_ts *ts);
+#define BSIC2BCC(bsic) ((bsic) & 0x07)
+#define BTS_TSC(bts) BSIC2BCC((bts)->bsic)
 
 struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr,
 				   int *rc);
 
-enum gsm_phys_chan_config ts_pchan(struct gsm_bts_trx_ts *ts);
-uint8_t ts_subslots(struct gsm_bts_trx_ts *ts);
-bool ts_is_tch(struct gsm_bts_trx_ts *ts);
+enum gsm_phys_chan_config ts_pchan(const struct gsm_bts_trx_ts *ts);
+uint8_t ts_subslots(const struct gsm_bts_trx_ts *ts);
+bool ts_is_tch(const struct gsm_bts_trx_ts *ts);
 
-int lchan2ecu_codec(const struct gsm_lchan *lchan);
-
-void lchan_set_state(struct gsm_lchan *lchan, enum gsm_lchan_state state);
 int conf_lchans_as_pchan(struct gsm_bts_trx_ts *ts,
 			 enum gsm_phys_chan_config pchan);
 
@@ -537,4 +237,8 @@ int conf_lchans_as_pchan(struct gsm_bts_trx_ts *ts,
 
 bool ts_is_pdch(const struct gsm_bts_trx_ts *ts);
 
+void gsm_ts_apply_configured_tsc(struct gsm_bts_trx_ts *ts);
+
+void gsm_ts_release(struct gsm_bts_trx_ts *ts);
+
 #endif /* _GSM_DATA_H */

include/osmo-bts/l1sap.h

@@ -4,6 +4,8 @@
 #include <osmocom/gsm/protocol/gsm_04_08.h>
 #include <osmocom/gsm/protocol/gsm_08_58.h>
 
+#define L1SAP_MSGB_HEADROOM 128
+
 /* lchan link ID */
 #define LID_SACCH 0x40
 #define LID_DEDIC 0x00
@@ -19,9 +21,11 @@
 #define L1SAP_IS_LINK_SACCH(link_id) \
 	((link_id & 0xC0) == LID_SACCH)
 #define L1SAP_IS_CHAN_TCHF(chan_nr) \
-	((chan_nr & 0xf8) == RSL_CHAN_Bm_ACCHs)
+	((chan_nr & 0xf8) == RSL_CHAN_Bm_ACCHs || \
+	 (chan_nr & 0xf8) == RSL_CHAN_OSMO_VAMOS_Bm_ACCHs)
 #define L1SAP_IS_CHAN_TCHH(chan_nr) \
-	((chan_nr & 0xf0) == RSL_CHAN_Lm_ACCHs)
+	((chan_nr & 0xf0) == RSL_CHAN_Lm_ACCHs || \
+	 (chan_nr & 0xf0) == RSL_CHAN_OSMO_VAMOS_Lm_ACCHs)
 #define L1SAP_IS_CHAN_SDCCH4(chan_nr) \
 	((chan_nr & 0xe0) == RSL_CHAN_SDCCH4_ACCH)
 #define L1SAP_IS_CHAN_SDCCH8(chan_nr) \
@@ -37,6 +41,9 @@
 #define L1SAP_IS_CHAN_CBCH(chan_nr) \
 	((chan_nr & 0xf8) == RSL_CHAN_OSMO_CBCH4) \
 	|| ((chan_nr & 0xf8) == RSL_CHAN_OSMO_CBCH8)
+#define L1SAP_IS_CHAN_VAMOS(chan_nr) \
+	((chan_nr & 0xf8) == RSL_CHAN_OSMO_VAMOS_Bm_ACCHs || \
+	 (chan_nr & 0xf0) == RSL_CHAN_OSMO_VAMOS_Lm_ACCHs)
 
 /* rach type from ra */
 #define L1SAP_IS_PACKET_RACH(ra) ((ra & 0xf0) == 0x70 && (ra & 0x0f) != 0x0f)
@@ -91,10 +98,11 @@ void l1sap_rtp_rx_cb(struct osmo_rtp_socket *rs, const uint8_t *rtp_pl,
 		     uint32_t timestamp, bool marker);
 
 /* channel control */
-int l1sap_chan_act(struct gsm_bts_trx *trx, uint8_t chan_nr, struct tlv_parsed *tp);
+int l1sap_chan_act(struct gsm_bts_trx *trx, uint8_t chan_nr);
 int l1sap_chan_rel(struct gsm_bts_trx *trx, uint8_t chan_nr);
 int l1sap_chan_deact_sacch(struct gsm_bts_trx *trx, uint8_t chan_nr);
 int l1sap_chan_modify(struct gsm_bts_trx *trx, uint8_t chan_nr);
+int l1sap_uplink_access(struct gsm_lchan *lchan, bool active);
 
 enum l1sap_common_sapi {
 	L1SAP_COMMON_SAPI_UNKNOWN,
@@ -134,12 +142,11 @@ int add_l1sap_header(struct gsm_bts_trx *trx, struct msgb *rmsg,
 
 #define msgb_l1sap_prim(msg) ((struct osmo_phsap_prim *)(msg)->l1h)
 
+void radio_link_timeout_reset(struct gsm_lchan *lchan);
+
 int bts_check_for_first_ciphrd(struct gsm_lchan *lchan,
 				uint8_t *data, int len);
 
-int is_ccch_for_agch(struct gsm_bts_trx *trx, uint32_t fn);
-
-void repeated_dl_facch_active_decision(struct gsm_lchan *lchan,
-				       const uint8_t *l3, size_t l3_len);
+enum ccch_msgt get_ccch_msgt(struct gsm_bts_trx *trx, uint32_t fn);
 
 #endif /* L1SAP_H */

include/osmo-bts/lchan.h

@@ -0,0 +1,428 @@
+#pragma once
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <netinet/in.h>
+
+#include <osmocom/core/timer.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/codec/codec.h>
+#include <osmocom/codec/ecu.h>
+#include <osmocom/gsm/lapdm.h>
+#include <osmocom/gsm/sysinfo.h>
+#include <osmocom/gsm/protocol/gsm_08_58.h>
+#include <osmocom/gsm/gsm48_rest_octets.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/meas_rep.h>
+#include <osmocom/netif/osmux.h>
+
+#include <osmo-bts/power_control.h>
+
+#define LOGPLCHAN(lchan, ss, lvl, fmt, args...) LOGP(ss, lvl, "%s " fmt, gsm_lchan_name(lchan), ## args)
+
+enum lchan_ciph_state {
+	LCHAN_CIPH_NONE,
+	LCHAN_CIPH_RX_REQ,
+	LCHAN_CIPH_RX_CONF,
+	LCHAN_CIPH_RXTX_REQ,
+	LCHAN_CIPH_RX_CONF_TX_REQ,
+	LCHAN_CIPH_RXTX_CONF,
+};
+
+/* state of a logical channel */
+enum gsm_lchan_state {
+	LCHAN_S_NONE,		/* channel is not active */
+	LCHAN_S_ACT_REQ,	/* channel activation requested */
+	LCHAN_S_ACTIVE,		/* channel is active and operational */
+	LCHAN_S_REL_REQ,	/* channel release has been requested */
+	LCHAN_S_REL_ERR,	/* channel is in an error state */
+	LCHAN_S_BROKEN,		/* channel is somehow unusable */
+};
+
+#define MAX_NUM_UL_MEAS	104
+#define LC_UL_M_F_L1_VALID	(1 << 0)
+#define LC_UL_M_F_RES_VALID	(1 << 1)
+#define LC_UL_M_F_OSMO_EXT_VALID (1 << 2)
+
+#define MAX_A5_KEY_LEN	(128/8)
+#define RSL_ENC_ALG_A5(x)	(x+1)
+
+struct bts_ul_meas {
+	/* BER in units of 0.01%: 10.000 == 100% ber, 0 == 0% ber */
+	uint16_t ber10k;
+	/* timing advance offset (in 1/256 bits) */
+	int16_t ta_offs_256bits;
+	/* C/I ratio in cB */
+	int16_t ci_cb;
+	/* flags */
+	uint8_t is_sub:1;
+	/* RSSI in dBm * -1 */
+	uint8_t inv_rssi;
+};
+
+struct amr_mode {
+	uint8_t mode;
+	uint8_t threshold;
+	uint8_t hysteresis;
+};
+
+struct amr_multirate_conf {
+	uint8_t gsm48_ie[2];
+	struct amr_mode mode[4];
+	uint8_t num_modes;
+};
+
+enum lchan_csd_mode {
+	LCHAN_CSD_M_NT = 0,
+	LCHAN_CSD_M_T_1200_75,
+	LCHAN_CSD_M_T_600,
+	LCHAN_CSD_M_T_1200,
+	LCHAN_CSD_M_T_2400,
+	LCHAN_CSD_M_T_4800,
+	LCHAN_CSD_M_T_9600,
+	LCHAN_CSD_M_T_14400,
+	LCHAN_CSD_M_T_29000,
+	LCHAN_CSD_M_T_32000,
+	_LCHAN_CSD_M_NUM,
+};
+
+/* State of the SAPIs in the lchan */
+enum lchan_sapi_state {
+	LCHAN_SAPI_S_NONE,
+	LCHAN_SAPI_S_REQ,
+	LCHAN_SAPI_S_ASSIGNED,
+	LCHAN_SAPI_S_REL,
+	LCHAN_SAPI_S_ERROR,
+};
+
+/* What kind of release/activation is done? A silent one for
+ * the PDCH or one triggered through RSL? */
+enum lchan_rel_act_kind {
+	LCHAN_REL_ACT_RSL,
+	LCHAN_REL_ACT_PCU,
+	LCHAN_REL_ACT_OML,
+	LCHAN_REL_ACT_REACT, /* FIXME: remove once auto-activation hack is removed from opstart_compl() (OS#1575) */
+};
+
+struct gsm_rep_facch {
+	struct msgb *msg;
+	uint32_t fn;
+};
+
+
+struct lchan_power_ctrl_state {
+	/* Dynamic Power Control parameters (NULL in static mode) */
+	const struct gsm_power_ctrl_params *dpc_params;
+	/* Measurement pre-processing state (for dynamic mode) */
+	struct gsm_power_ctrl_meas_proc_state rxlev_meas_proc;
+	struct gsm_power_ctrl_meas_proc_state rxqual_meas_proc;
+	struct gsm_power_ctrl_meas_proc_state ci_meas_proc;
+	/* Number of SACCH blocks to skip (for dynamic mode) */
+	int skip_block_num;
+
+	/* Depending on the context (MS or BS power control), fields 'current' and 'max'
+	 * reflect either the MS power level (magic numbers), or BS Power reduction level
+	 * (attenuation, in dB). */
+	uint8_t current;
+	uint8_t max;
+};
+
+struct lchan_ta_ctrl_state {
+	/* Number of SACCH blocks to skip */
+	int skip_block_num;
+	/* Currently requested TA */
+	uint8_t current;
+};
+
+struct gsm_lchan {
+	/* The TS that we're part of */
+	struct gsm_bts_trx_ts *ts;
+	/* The logical subslot number in the TS */
+	uint8_t nr;
+	/* The logical channel type */
+	enum gsm_chan_t type;
+	/* RSL channel rate and type */
+	enum rsl_cmod_crt rsl_chan_rt;
+	/* RSL channel mode */
+	enum rsl_cmod_spd rsl_cmode;
+	/* If TCH, traffic channel mode */
+	enum gsm48_chan_mode tch_mode;
+	enum lchan_csd_mode csd_mode;
+	/* State */
+	enum gsm_lchan_state state;
+	const char *broken_reason;
+	/* Encryption information */
+	struct {
+		uint8_t alg_id;
+		uint8_t key_len;
+		uint8_t key[MAX_A5_KEY_LEN];
+	} encr;
+
+	struct {
+		uint32_t bound_ip;
+		uint32_t connect_ip;
+		uint16_t bound_port;
+		uint16_t connect_port;
+		uint16_t conn_id;
+		uint8_t rtp_payload;
+		uint8_t rtp_payload2;
+		uint8_t speech_mode;
+		struct {
+			bool use;
+			uint8_t local_cid;
+			uint8_t remote_cid;
+			/* Rx Osmux -> RTP, one allocated & owned per lchan */
+			struct osmux_out_handle *out;
+			 /* Tx RTP -> Osmux, shared by all lchans sharing a
+			  * remote endp (addr+port), see "struct osmux_handle" */
+			struct osmux_in_handle *in;
+			/* Used to build rtp messages we send to osmux */
+			struct osmo_rtp_handle *rtpst;
+		} osmux;
+		struct osmo_rtp_socket *rtp_socket;
+	} abis_ip;
+
+	char *name;
+
+	/* For handover, activation is described in 3GPP TS 48.058 4.1.3 and 4.1.4:
+	 *
+	 *          |          | Access ||  transmit         |  activate
+	 *          | MS Power | Delay  ||  on main channel  |  dl SACCH
+	 * ----------------------------------------------------------------------
+	 * async ho   no         *     -->  yes                 no
+	 * async ho   yes        *     -->  yes                 may be started
+	 * sync ho    no         no    -->  yes                 no
+	 * sync ho    yes        no    -->  yes                 may be started
+	 * sync ho    yes        yes   -->  yes                 shall be started
+	 *
+	 * Always start the main channel immediately.
+	 * want_dl_sacch_active indicates whether dl SACCH should be activated on CHAN ACT.
+	 */
+	bool want_dl_sacch_active;
+
+	/* Number of different GsmL1_Sapi_t used in osmo_bts_sysmo is 23.
+	 * Currently we don't share these headers so this is a magic number. */
+	struct llist_head sapi_cmds;
+	uint8_t sapis_dl[23];
+	uint8_t sapis_ul[23];
+	struct lapdm_channel lapdm_ch;
+	/* It is required to have L3 info with DL establishment. */
+	bool l3_info_estab;
+	struct llist_head dl_tch_queue;
+	unsigned int dl_tch_queue_len;
+	struct {
+		/* bitmask of all SI that are present/valid in si_buf */
+		uint32_t valid;
+		/* bitmask of all SI that do not mirror the BTS-global SI values */
+		uint32_t overridden;
+		uint32_t last;
+		/* buffers where we put the pre-computed SI:
+		   SI2Q_MAX_NUM is the max number of SI2quater messages (see 3GPP TS 44.018) */
+		sysinfo_buf_t buf[_MAX_SYSINFO_TYPE][SI2Q_MAX_NUM];
+	} si;
+	struct {
+		uint8_t flags;
+		/* RSL measurement result number, 0 at lchan_act */
+		uint8_t res_nr;
+		/* number of measurements stored in array below */
+		uint8_t num_ul_meas;
+		struct bts_ul_meas uplink[MAX_NUM_UL_MEAS];
+		/* last L1 header from the MS */
+		struct rsl_l1_info l1_info;
+		struct gsm_meas_rep_unidir ul_res;
+		int16_t ms_toa256;
+		int16_t ul_ci_cb_full;
+		int16_t ul_ci_cb_sub;
+		/* Frame number of the last measurement indication receceived */
+		uint32_t last_fn;
+		/* Osmocom extended measurement results, see LC_UL_M_F_EXTD_VALID */
+		struct {
+			/* minimum value of toa256 during measurement period */
+			int16_t toa256_min;
+			/* maximum value of toa256 during measurement period */
+			int16_t toa256_max;
+			/* standard deviation of toa256 value during measurement period */
+			uint16_t toa256_std_dev;
+		} ext;
+		/* Interference levels reported by PHY (in dBm) */
+		int16_t interf_meas_avg_dbm; /* Average value */
+		int16_t interf_meas_dbm[31]; /* Intave max is 31 */
+		uint8_t interf_meas_num;
+		uint8_t interf_band;
+	} meas;
+	struct {
+		struct amr_multirate_conf amr_mr;
+		struct {
+			struct osmo_fsm_inst *dl_amr_fsm;
+			/* TCH cache */
+			uint8_t cache[20];
+			/* FACCH cache */
+			uint8_t facch[GSM_MACBLOCK_LEN];
+			uint8_t len;
+			uint32_t fn;
+			bool is_update;
+			/* set for each SID frame to detect talkspurt for codecs
+			   without explicit ONSET event */
+			bool ul_sid;
+			/* indicates if DTXd was active during DL measurement
+			   period */
+			bool dl_active;
+			/* last UL SPEECH resume flag */
+			bool is_speech_resume;
+		} dtx;
+		struct {
+			bool last_rtp_input_was_sid;
+			uint8_t last_sid[GSM_FR_BYTES];
+			uint8_t last_sid_len;
+			uint8_t last_sid_age;
+			/* A SID was transmitted on the DL in the period
+			 * beginning with the last transmitted speech frame
+			 * or the last mandatory-Tx position, whichever was
+			 * more recent. */
+			bool dl_sid_transmitted;
+			/* The current frame in the DL is taken up by FACCH */
+			bool dl_facch_stealing;
+		} dtx_fr_hr_efr;
+		uint8_t last_cmr;
+		uint32_t last_fn;
+		struct {
+			/* buffers to re-combine RLP frame from multiple Um blocks */
+			uint8_t rlp_buf_ul[576/8]; /* maximum size of RLP frame */
+			uint8_t rlp_buf_dl[576/8]; /* maximum size of RLP frame */
+		} csd;
+	} tch;
+
+	/* 3GPP TS 48.058 § 9.3.37: [0; 255] ok, -1 means invalid*/
+	int16_t ms_t_offs;
+	/* 3GPP TS 45.010 § 1.2 round trip propagation delay (in symbols) or -1 */
+	int16_t p_offs;
+
+	/* BTS-side ciphering state (rx only, bi-directional, ...) */
+	uint8_t ciph_state;
+	uint8_t ciph_ns;
+	uint8_t loopback;
+	struct {
+		uint8_t active;
+		uint8_t ref;
+		/* T3105: PHYS INF retransmission */
+		struct osmo_timer_list t3105;
+		/* counts up to Ny1 */
+		unsigned int phys_info_count;
+	} ho;
+	struct {
+		bool listener_detected;
+		uint8_t talker_active;
+		uint8_t ref;
+		uint32_t fn;
+		/* T3115: VGCS UPLINK GRANT retransmission */
+		struct osmo_timer_list t3115;
+		/* counts up to Ny2 */
+		unsigned int vgcs_ul_grant_count;
+		/* uplink free message */
+		bool uplink_free;
+		uint8_t uplink_free_msg[GSM_MACBLOCK_LEN];
+	} asci;
+	/* S counter for link loss */
+	int s;
+	/* Kind of the release/activation. E.g. RSL or PCU */
+	enum lchan_rel_act_kind rel_act_kind;
+	/* Pending RSL CHANnel ACTIVation message */
+	struct msgb *pending_chan_activ;
+	/* RTP header Marker bit to indicate beginning of speech after pause  */
+	bool rtp_tx_marker;
+
+	/* TA Control Loop */
+	struct lchan_ta_ctrl_state ta_ctrl;
+
+	/* MS/BS power control state */
+	struct lchan_power_ctrl_state ms_power_ctrl;
+	struct lchan_power_ctrl_state bs_power_ctrl;
+
+	/* MS/BS Dynamic Power Control parameters */
+	struct gsm_power_ctrl_params ms_dpc_params;
+	struct gsm_power_ctrl_params bs_dpc_params;
+
+	/* Temporary ACCH overpower capabilities and state */
+	struct abis_rsl_osmo_temp_ovp_acch_cap top_acch_cap;
+	bool top_acch_active;
+
+	struct msgb *pending_rel_ind_msg;
+
+	/* ECU (Error Concealment Unit) state */
+	struct osmo_ecu_state *ecu_state;
+
+	/* Repeated ACCH capabilities and current state */
+	struct abis_rsl_osmo_rep_acch_cap rep_acch_cap;
+	struct {
+		bool dl_facch_active;
+		bool ul_sacch_active;
+		bool dl_sacch_active;
+
+		/* Message buffers to store repeation candidates */
+		struct gsm_rep_facch dl_facch[2];
+		struct msgb *dl_sacch_msg;
+	} rep_acch;
+
+	/* Cached early Immediate Assignment message: if the Immediate Assignment arrives before the channel is
+	 * confirmed active, then cache it here and send it once the channel is confirmed to be active. This is related
+	 * to the Early IA feature, see OsmoBSC config option 'immediate-assignment pre-chan-ack'. */
+	struct msgb *early_rr_ia;
+	struct osmo_timer_list early_rr_ia_delay;
+};
+
+extern const struct value_string lchan_ciph_state_names[];
+static inline const char *lchan_ciph_state_name(uint8_t state)
+{
+	return get_value_string(lchan_ciph_state_names, state);
+}
+
+#define GSM_LCHAN_SI(lchan, i) (void *)((lchan)->si.buf[i][0])
+
+void gsm_lchan_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned int lchan_nr);
+void gsm_lchan_name_update(struct gsm_lchan *lchan);
+int lchan_init_lapdm(struct gsm_lchan *lchan);
+void gsm_lchan_release(struct gsm_lchan *lchan, enum lchan_rel_act_kind rel_kind);
+int lchan_deactivate(struct gsm_lchan *lchan);
+const char *gsm_lchans_name(enum gsm_lchan_state s);
+
+static inline char *gsm_lchan_name(const struct gsm_lchan *lchan)
+{
+	return lchan->name;
+}
+
+uint8_t *lchan_sacch_get(struct gsm_lchan *lchan);
+
+uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan);
+uint8_t gsm_lchan2chan_nr_rsl(const struct gsm_lchan *lchan);
+uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan,
+				   enum gsm_phys_chan_config as_pchan);
+
+void gsm_lchan_interf_meas_push(struct gsm_lchan *lchan, int dbm);
+void gsm_lchan_interf_meas_calc_avg(struct gsm_lchan *lchan);
+
+int lchan2ecu_codec(const struct gsm_lchan *lchan);
+
+void lchan_set_state(struct gsm_lchan *lchan, enum gsm_lchan_state state);
+
+int lchan_rtp_socket_create(struct gsm_lchan *lchan, const char *bind_ip);
+int lchan_rtp_socket_connect(struct gsm_lchan *lchan, const struct in_addr *ia, uint16_t connect_port);
+void lchan_rtp_socket_free(struct gsm_lchan *lchan);
+
+void lchan_dl_tch_queue_enqueue(struct gsm_lchan *lchan, struct msgb *msg, unsigned int limit);
+
+static inline bool lchan_is_dcch(const struct gsm_lchan *lchan)
+{
+	switch (lchan->type) {
+	case GSM_LCHAN_SDCCH:
+	case GSM_LCHAN_TCH_F:
+	case GSM_LCHAN_TCH_H:
+		return true;
+	default:
+		return false;
+	}
+}
+
+#define lchan_is_tch(lchan) \
+	((lchan)->type == GSM_LCHAN_TCH_F || (lchan)->type == GSM_LCHAN_TCH_H)

include/osmo-bts/logging.h

@@ -20,7 +20,8 @@ enum {
 	DLOOP,
 	DABIS,
 	DRTP,
-	DSUM,
+	DOSMUX,
+	DASCI,
 };
 
 extern const struct log_info bts_log_info;
@@ -37,4 +38,12 @@ extern const struct log_info bts_log_info;
 #define DEBUGPFN(ss, fn, fmt, args...) \
 	LOGP(ss, LOGL_DEBUG, "%s " fmt, gsm_fn_as_gsmtime_str(fn), ## args)
 
+/* LOGP with lchan + frame number prefix */
+#define LOGPLCFN(lchan, fn, ss, lvl, fmt, args...) \
+	LOGP(ss, lvl, "%s %s " fmt, gsm_lchan_name(lchan), gsm_fn_as_gsmtime_str(fn), ## args)
+
+/* LOGP with lchan + gsm_time prefix */
+#define LOGPLCGT(lchan, gt, ss, lvl, fmt, args...) \
+	LOGP(ss, lvl, "%s %s " fmt, gsm_lchan_name(lchan), osmo_dump_gsmtime(gt), ## args)
+
 #endif /* _LOGGING_H */

include/osmo-bts/measurement.h

@@ -20,4 +20,6 @@ bool ts45008_83_is_sub(struct gsm_lchan *lchan, uint32_t fn);
 
 int is_meas_complete(struct gsm_lchan *lchan, uint32_t fn);
 
+void lchan_meas_handle_sacch(struct gsm_lchan *lchan, struct msgb *msg);
+
 #endif

include/osmo-bts/msg_utils.h

@@ -22,6 +22,9 @@ struct msgb;
 /* Access 3rd part of msgb control buffer */
 #define rtpmsg_ts(x) ((x)->cb[2])
 
+/* Access 4th part of msgb control buffer */
+#define rtpmsg_is_rfc5993_sid(x) ((x)->cb[3])
+
 /**
  * Classification of OML message. ETSI for plain GSM 12.21
  * messages and IPA/Osmo for manufacturer messages.

include/osmo-bts/nm_common_fsm.h

@@ -1,7 +1,7 @@
 /* Header for all NM 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@sysmocom.de>
+/* (C) 2020 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
  * Author: Pau Espin Pedrol <pespin@sysmocom.de>
  *
  * All Rights Reserved
@@ -14,7 +14,7 @@
  * 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.
+ * 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/>.
@@ -25,24 +25,34 @@
 
 #include <osmocom/core/fsm.h>
 #include <osmocom/core/utils.h>
+#include <osmocom/core/msgb.h>
 
 /* Common */
 enum nm_fsm_events {
 	NM_EV_SW_ACT,
+	NM_EV_RX_SETATTR, /* data: struct nm_fsm_ev_setattr_data */
+	NM_EV_RX_OPSTART,
 	NM_EV_OPSTART_ACK,
 	NM_EV_OPSTART_NACK,
+	NM_EV_SHUTDOWN_START,
+	NM_EV_SHUTDOWN_FINISH,
+	NM_EV_OML_UP,
 	NM_EV_RSL_UP, /* RadioCarrier and BaseBand Transceiver only */
 	NM_EV_RSL_DOWN,  /* RadioCarrier and BaseBand Transceiver only */
 	NM_EV_PHYLINK_UP, /* RadioCarrier and BaseBand Transceiver only */
 	NM_EV_PHYLINK_DOWN,  /* RadioCarrier and BaseBand Transceiver only */
 	NM_EV_DISABLE,  /* RadioCarrier and BaseBand Transceiver only */
-	NM_EV_BBTRANSC_INSTALLED, /* Radio Channel only */
 	NM_EV_BBTRANSC_ENABLED, /* Radio Channel only */
 	NM_EV_BBTRANSC_DISABLED, /* Radio Channel only */
-
+	NM_EV_RCARRIER_ENABLED, /* Radio Channel only */
+	NM_EV_RCARRIER_DISABLED, /* Radio Channel only */
 };
 extern const struct value_string nm_fsm_event_names[];
 
+struct nm_fsm_ev_setattr_data {
+	const struct msgb *msg;
+};
+
 
 /* BTS SiteManager */
 enum nm_bts_sm_op_fsm_states {
@@ -84,3 +94,30 @@ enum nm_chan_op_fsm_states {
         NM_CHAN_ST_OP_ENABLED,
 };
 extern struct osmo_fsm nm_chan_fsm;
+
+/* GPRS NSE */
+enum nm_gprs_nse_op_fsm_states {
+	NM_GPRS_NSE_ST_OP_DISABLED_NOTINSTALLED,
+	NM_GPRS_NSE_ST_OP_DISABLED_DEPENDENCY,
+	NM_GPRS_NSE_ST_OP_DISABLED_OFFLINE,
+	NM_GPRS_NSE_ST_OP_ENABLED,
+};
+extern struct osmo_fsm nm_gprs_nse_fsm;
+
+/* GPRS NSVC */
+enum nm_gprs_nsvc_op_fsm_states {
+	NM_GPRS_NSVC_ST_OP_DISABLED_NOTINSTALLED,
+	NM_GPRS_NSVC_ST_OP_DISABLED_DEPENDENCY,
+	NM_GPRS_NSVC_ST_OP_DISABLED_OFFLINE,
+	NM_GPRS_NSVC_ST_OP_ENABLED,
+};
+extern struct osmo_fsm nm_gprs_nsvc_fsm;
+
+/* GPRS CELL */
+enum nm_gprs_cell_op_fsm_states {
+	NM_GPRS_CELL_ST_OP_DISABLED_NOTINSTALLED,
+	NM_GPRS_CELL_ST_OP_DISABLED_DEPENDENCY,
+	NM_GPRS_CELL_ST_OP_DISABLED_OFFLINE,
+	NM_GPRS_CELL_ST_OP_ENABLED,
+};
+extern struct osmo_fsm nm_gprs_cell_fsm;

include/osmo-bts/notification.h

@@ -0,0 +1,61 @@
+/* Maintain and generate ASCI notifications */
+
+/*
+ * (C) 2023 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: AGPL-3.0+
+ *
+ * Author: Harald Welte
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+/* one [concurrent] ASCI (VBS/VGCS) notification */
+struct asci_notification {
+	struct llist_head list;	/* linked to bts->asci.notifications */
+
+	/* Group call reference (TS 24.008 10.5.1.9 "Descriptive group or broadcast call reference") */
+	uint8_t group_call_ref[5];
+
+	/* Group Channel Description (TS 44.018 10.5.2.14b) */
+	struct {
+		bool present;
+		uint8_t value[255];
+		uint8_t len;
+	} chan_desc;
+
+	/* NCH DRX Information (TS 48.058 9.3.47) */
+	struct {
+		bool present;
+		struct rsl_ie_nch_drx_info value;
+	} nch_drx_info;
+};
+
+int bts_asci_notification_add(struct gsm_bts *bts, const uint8_t *group_call_ref, const uint8_t *chan_desc,
+			      uint8_t chan_desc_len, const struct rsl_ie_nch_drx_info *nch_drx_info);
+
+int bts_asci_notification_del(struct gsm_bts *bts, const uint8_t *group_call_ref);
+
+int bts_asci_notification_reset(struct gsm_bts *bts);
+
+const struct asci_notification *bts_asci_notification_get_next(struct gsm_bts *bts);
+
+void append_group_call_information(struct bitvec *bv, const uint8_t *gcr, const uint8_t *ch_desc, uint8_t ch_desc_len);
+
+int bts_asci_notify_nch_gen_msg(struct gsm_bts *bts, uint8_t *out_buf);
+int bts_asci_notify_facch_gen_msg(struct gsm_bts *bts, uint8_t *out_buf, const uint8_t *group_call_ref,
+				  const uint8_t *chan_desc, uint8_t chan_desc_len);

include/osmo-bts/oml.h

@@ -32,6 +32,7 @@ struct gsm_abis_mo {
 	struct gsm_bts *bts;
 	/* NM BTS Site Manager FSM */
 	struct osmo_fsm_inst *fi;
+	bool setattr_success;
 	bool opstart_success;
 };
 
@@ -47,7 +48,7 @@ int oml_mo_statechg_ack(const struct gsm_abis_mo *mo);
 int oml_mo_statechg_nack(const struct gsm_abis_mo *mo, uint8_t nack_cause);
 
 /* Change the state and send STATE CHG REP */
-int oml_mo_state_chg(struct gsm_abis_mo *mo, int op_state, int avail_state);
+int oml_mo_state_chg(struct gsm_abis_mo *mo, int op_state, int avail_state, int adm_state);
 
 /* First initialization of MO, does _not_ generate state changes */
 void oml_mo_state_init(struct gsm_abis_mo *mo, int op_state, int avail_state);
@@ -62,11 +63,12 @@ int oml_tx_state_changed(const struct gsm_abis_mo *mo);
 int oml_mo_tx_sw_act_rep(const struct gsm_abis_mo *mo);
 
 int oml_fom_ack_nack(struct msgb *old_msg, uint8_t cause);
+int oml_fom_ack_nack_copy_msg(const struct msgb *old_msg, uint8_t cause);
 
 int oml_mo_fom_ack_nack(const struct gsm_abis_mo *mo, uint8_t orig_msg_type,
 			uint8_t cause);
 
-extern const unsigned int oml_default_t200_ms[7];
+extern const uint32_t oml_default_t200_fn[7];
 
 /* Transmit failure event report */
 int oml_tx_failure_event_rep(const struct gsm_abis_mo *mo, enum abis_nm_severity severity,
@@ -76,11 +78,11 @@ void gsm_mo_init(struct gsm_abis_mo *mo, struct gsm_bts *bts,
 		 uint8_t obj_class, uint8_t p1, uint8_t p2, uint8_t p3);
 
 struct gsm_abis_mo *gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class,
-				    const struct abis_om_obj_inst *obj_inst);
+				    const struct abis_om_obj_inst *obj_inst,
+				    enum abis_nm_nack_cause *c);
 
-struct gsm_nm_state *gsm_objclass2nmstate(struct gsm_bts *bts, uint8_t obj_class,
-					  const struct abis_om_obj_inst *obj_inst);
 void *gsm_objclass2obj(struct gsm_bts *bts, uint8_t obj_class,
-		       const struct abis_om_obj_inst *obj_inst);
+		       const struct abis_om_obj_inst *obj_inst,
+		       enum abis_nm_nack_cause *c);
 
 #endif // _OML_H */

include/osmo-bts/osmux.h

@@ -0,0 +1,48 @@
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <osmocom/core/select.h>
+#include <osmocom/netif/osmux.h>
+
+struct gsm_bts;
+struct gsm_lchan;
+
+enum osmux_usage {
+	OSMUX_USAGE_OFF = 0,
+	OSMUX_USAGE_ON = 1,
+	OSMUX_USAGE_ONLY = 2,
+};
+
+struct osmux_state {
+	enum osmux_usage use;
+	char *local_addr;
+	uint16_t local_port;
+	struct osmo_fd fd;
+	uint8_t batch_factor;
+	unsigned int batch_size;
+	bool dummy_padding;
+	struct llist_head osmux_handle_list;
+};
+
+/* Contains a "struct osmux_in_handle" towards a specific peer (remote IPaddr+port) */
+struct osmux_handle {
+	struct llist_head head;
+	struct gsm_bts *bts;
+	struct osmux_in_handle *in;
+	struct osmo_sockaddr rem_addr;
+	int refcnt;
+};
+
+int bts_osmux_init(struct gsm_bts *bts);
+void bts_osmux_release(struct gsm_bts *bts);
+int bts_osmux_open(struct gsm_bts *bts);
+
+int lchan_osmux_init(struct gsm_lchan *lchan, uint8_t rtp_payload);
+void lchan_osmux_release(struct gsm_lchan *lchan);
+int lchan_osmux_connect(struct gsm_lchan *lchan);
+bool lchan_osmux_connected(const struct gsm_lchan *lchan);
+int lchan_osmux_send_frame(struct gsm_lchan *lchan, const uint8_t *payload,
+			   unsigned int payload_len, unsigned int duration, bool marker);
+
+int lchan_osmux_skipped_frame(struct gsm_lchan *lchan, unsigned int duration);

include/osmo-bts/paging.h

@@ -7,6 +7,55 @@
 
 struct paging_state;
 struct gsm_bts;
+struct asci_notification;
+
+/* abstract representation of P1 rest octets; we only implement those parts we need for now */
+struct p1_rest_octets {
+	struct {
+		bool present;
+		uint8_t nln;
+		uint8_t nln_status;
+	} nln_pch;
+	bool packet_page_ind[2];
+	bool r8_present;
+	struct {
+		bool prio_ul_access;
+		bool etws_present;
+		struct {
+			bool is_first;
+			uint8_t page_nr;
+			const uint8_t *page;
+			size_t page_bytes;
+		} etws;
+	} r8;
+};
+
+/* abstract representation of P2 rest octets; we only implement those parts we need for now */
+struct p2_rest_octets {
+	struct {
+		bool present;
+		uint8_t cn3;
+	} cneed;
+	struct {
+		bool present;
+		uint8_t nln;
+		uint8_t nln_status;
+	} nln_pch;
+};
+
+/* abstract representation of P3 rest octets; we only implement those parts we need for now */
+struct p3_rest_octets {
+	struct {
+		bool present;
+		uint8_t cn3;
+		uint8_t cn4;
+	} cneed;
+	struct {
+		bool present;
+		uint8_t nln;
+		uint8_t nln_status;
+	} nln_pch;
+};
 
 /* initialize paging code */
 struct paging_state *paging_init(struct gsm_bts *bts,
@@ -35,9 +84,15 @@ int paging_si_update(struct paging_state *ps, struct gsm48_control_channel_descr
 int paging_add_identity(struct paging_state *ps, uint8_t paging_group,
 			const uint8_t *identity_lv, uint8_t chan_needed);
 
-/* Add an IMM.ASS message to the paging queue */
-int paging_add_imm_ass(struct paging_state *ps, const uint8_t *data,
-                       uint8_t len);
+/* Add a ready formatted MAC block message to the paging queue, this can be an IMMEDIATE ASSIGNMENT, or a
+ * PAGING COMMAND (from the PCU) */
+int paging_add_macblock(struct paging_state *ps, uint32_t msg_id, const char *imsi, bool confirm, const uint8_t *macblock);
+
+/* Paging rest octests */
+void append_p1_rest_octets(struct bitvec *bv, const struct p1_rest_octets *p1ro,
+			   const struct asci_notification *notif);
+void append_p2_rest_octets(struct bitvec *bv, const struct p2_rest_octets *p2ro);
+void append_p3_rest_octets(struct bitvec *bv, const struct p3_rest_octets *p3ro);
 
 /* generate paging message for given gsm time */
 int paging_gen_msg(struct paging_state *ps, uint8_t *out_buf, struct gsm_time *gt,

include/osmo-bts/pcu_if.h

@@ -1,8 +1,14 @@
 #ifndef _PCU_IF_H
 #define _PCU_IF_H
 
+#include <osmo-bts/pcuif_proto.h>
+
+struct gsm_bts_sm;
+
 extern int pcu_direct;
 
+#define PCUIF_HDR_SIZE (sizeof(struct gsm_pcu_if) - sizeof(((struct gsm_pcu_if *)0)->u))
+
 int pcu_tx_info_ind(void);
 int pcu_tx_si(const struct gsm_bts *bts, enum osmo_sysinfo_type si_type, bool enable);
 int pcu_tx_app_info_req(struct gsm_bts *bts, uint8_t app_type, uint8_t len, const uint8_t *app_data);
@@ -15,11 +21,13 @@ int pcu_tx_rach_ind(uint8_t bts_nr, uint8_t trx_nr, uint8_t ts_nr,
 		    int16_t qta, uint16_t ra, uint32_t fn, uint8_t is_11bit,
 		    enum ph_burst_type burst_type, uint8_t sapi);
 int pcu_tx_time_ind(uint32_t fn);
+int pcu_tx_interf_ind(const struct gsm_bts_trx *trx, uint32_t fn);
 int pcu_tx_pag_req(const uint8_t *identity_lv, uint8_t chan_needed);
-int pcu_tx_pch_data_cnf(uint32_t fn, uint8_t *data, uint8_t len);
+int pcu_tx_data_cnf(uint32_t msg_id, uint8_t sapi);
 int pcu_tx_susp_req(struct gsm_lchan *lchan, uint32_t tlli, const uint8_t *ra_id, uint8_t cause);
+int pcu_sock_send(struct msgb *msg);
 
-int pcu_sock_init(const char *path);
+int pcu_sock_init(const char *path, int qlength_max);
 void pcu_sock_exit(void);
 
 bool pcu_connected(void);

include/osmo-bts/pcuif_proto.h

@@ -3,40 +3,41 @@
 
 #include <osmocom/gsm/l1sap.h>
 #include <arpa/inet.h>
+#include <osmocom/gsm/protocol/gsm_23_003.h>
 
 #define PCU_SOCK_DEFAULT	"/tmp/pcu_bts"
 
-#define PCU_IF_VERSION		0x0a
+#define PCU_IF_VERSION		0x0c
 #define TXT_MAX_LEN	128
 
 /* msg_type */
 #define PCU_IF_MSG_DATA_REQ	0x00	/* send data to given channel */
-#define PCU_IF_MSG_DATA_CNF	0x01	/* confirm (e.g. transmission on PCH) */
 #define PCU_IF_MSG_DATA_IND	0x02	/* receive data from given channel */
 #define PCU_IF_MSG_SUSP_REQ	0x03	/* BTS forwards GPRS SUSP REQ to PCU */
 #define PCU_IF_MSG_APP_INFO_REQ	0x04	/* BTS asks PCU to transmit APP INFO via PACCH */
 #define PCU_IF_MSG_RTS_REQ	0x10	/* ready to send request */
-#define PCU_IF_MSG_DATA_CNF_DT	0x11	/* confirm (with direct tlli) */
+#define PCU_IF_MSG_DATA_CNF_2	0x11	/* confirm (using message id) */
 #define PCU_IF_MSG_RACH_IND	0x22	/* receive RACH */
 #define PCU_IF_MSG_INFO_IND	0x32	/* retrieve BTS info */
 #define PCU_IF_MSG_ACT_REQ	0x40	/* activate/deactivate PDCH */
 #define PCU_IF_MSG_TIME_IND	0x52	/* GSM time indication */
+#define PCU_IF_MSG_INTERF_IND	0x53	/* interference report */
 #define PCU_IF_MSG_PAG_REQ	0x60	/* paging request */
 #define PCU_IF_MSG_TXT_IND	0x70	/* Text indication for BTS */
+#define PCU_IF_MSG_CONTAINER	0x80	/* Transparent container message */
 
 /* sapi */
 #define PCU_IF_SAPI_RACH	0x01	/* channel request on CCCH */
-#define PCU_IF_SAPI_AGCH	0x02	/* assignment on AGCH */
-#define PCU_IF_SAPI_PCH		0x03	/* paging/assignment on PCH */
 #define PCU_IF_SAPI_BCCH	0x04	/* SI on BCCH */
 #define PCU_IF_SAPI_PDTCH	0x05	/* packet data/control/ccch block */
 #define PCU_IF_SAPI_PRACH	0x06	/* packet random access channel */
 #define PCU_IF_SAPI_PTCCH	0x07	/* packet TA control channel */
-#define PCU_IF_SAPI_AGCH_DT	0x08	/* assignment on AGCH but with additional TLLI */
+#define PCU_IF_SAPI_PCH_2	0x08	/* assignment on PCH (confirmed using message id) */
+#define PCU_IF_SAPI_AGCH_2	0x09	/* assignment on AGCH (confirmed using message id) */
 
 /* flags */
 #define PCU_IF_FLAG_ACTIVE	(1 << 0)/* BTS is active */
-#define PCU_IF_FLAG_SYSMO	(1 << 1)/* access PDCH of sysmoBTS directly */
+#define PCU_IF_FLAG_DIRECT_PHY	(1 << 1)/* access PHY directly via dedicated hardware support */
 #define PCU_IF_FLAG_CS1		(1 << 16)
 #define PCU_IF_FLAG_CS2		(1 << 17)
 #define PCU_IF_FLAG_CS3		(1 << 18)
@@ -56,6 +57,20 @@
 #define PCU_IF_ADDR_TYPE_IPV4	0x04	/* IPv4 address */
 #define PCU_IF_ADDR_TYPE_IPV6	0x29	/* IPv6 address */
 
+/* BTS model */
+enum gsm_pcuif_bts_model {
+	PCU_IF_BTS_MODEL_UNSPEC,
+	PCU_IF_BTS_MODEL_LC15,
+	PCU_IF_BTS_MODEL_OC2G,
+	PCU_IF_BTS_MODEL_OCTPHY,
+	PCU_IF_BTS_MODEL_SYSMO,
+	PCU_IF_BTS_MODEL_TRX,
+	PCU_IF_BTS_MODEL_RBS,
+};
+
+#define PCU_IF_NUM_NSVC 2
+#define PCU_IF_NUM_TRX 8
+
 enum gsm_pcu_if_text_type {
 	PCU_VERSION,
 	PCU_OML_ALERT,
@@ -81,19 +96,10 @@ struct gsm_pcu_if_data {
 	int16_t		lqual_cb;	/* !< \brief Link quality in centiBel */
 } __attribute__ ((packed));
 
-/* data confirmation with direct tlli (instead of raw mac block with tlli) */
-struct gsm_pcu_if_data_cnf_dt {
+/* data confirmation with message id (instead of raw mac block) */
+struct gsm_pcu_if_data_cnf {
 	uint8_t		sapi;
-	uint32_t	tlli;
-	uint32_t	fn;
-	uint16_t	arfcn;
-	uint8_t		trx_nr;
-	uint8_t		ts_nr;
-	uint8_t		block_nr;
-	int8_t		rssi;
-	uint16_t	ber10k;		/* !< \brief BER in units of 0.01% */
-	int16_t		ta_offs_qbits;	/* !< \brief Burst TA Offset in quarter bits */
-	int16_t		lqual_cb;	/* !< \brief Link quality in centiBel */
+	uint32_t	msg_id;
 } __attribute__ ((packed));
 
 struct gsm_pcu_if_rts_req {
@@ -138,7 +144,7 @@ struct gsm_pcu_if_info_trx {
 struct gsm_pcu_if_info_ind {
 	uint32_t	version;
 	uint32_t	flags;
-	struct gsm_pcu_if_info_trx trx[8];	/* TRX infos per BTS */
+	struct gsm_pcu_if_info_trx trx[PCU_IF_NUM_TRX];	/* TRX infos per BTS */
 	uint8_t		bsic;
 	/* RAI */
 	uint16_t	mcc, mnc;
@@ -167,14 +173,15 @@ struct gsm_pcu_if_info_ind {
 	uint8_t		initial_cs;
 	uint8_t		initial_mcs;
 	/* NSVC */
-	uint16_t	nsvci[2];
-	uint16_t	local_port[2];
-	uint16_t	remote_port[2];
-	uint8_t		address_type[2];
+	uint16_t	nsvci[PCU_IF_NUM_NSVC];
+	uint16_t	local_port[PCU_IF_NUM_NSVC];
+	uint16_t	remote_port[PCU_IF_NUM_NSVC];
+	uint8_t		address_type[PCU_IF_NUM_NSVC];
 	union {
 		struct in_addr v4;
 		struct in6_addr v6;
-	} remote_ip[2];
+	} remote_ip[PCU_IF_NUM_NSVC];
+	uint8_t		bts_model; /* enum gsm_pcuif_bts_model */
 } __attribute__ ((packed));
 
 struct gsm_pcu_if_act_req {
@@ -208,6 +215,48 @@ struct gsm_pcu_if_susp_req {
 	uint8_t		cause;
 } __attribute__ ((packed));
 
+/* Interference measurements on PDCH timeslots */
+struct gsm_pcu_if_interf_ind {
+	uint8_t		trx_nr;
+	uint8_t		spare[3];
+	uint32_t	fn;
+	uint8_t		interf[8];
+} __attribute__ ((packed));
+
+/* Contains messages transmitted BSC<->PCU, potentially forwarded by BTS via IPA/PCU */
+struct gsm_pcu_if_container {
+	uint8_t		msg_type;
+	uint8_t 	spare;
+	uint16_t	length; /* network byte order */
+	uint8_t		data[0];
+} __attribute__ ((packed));
+
+/* Struct to send a (confirmed) IMMEDIATE ASSIGNMENT message via PCH. The struct is sent as a data request
+ * (data_req) under SAPI PCU_IF_SAPI_PCH_2. */
+struct gsm_pcu_if_pch {
+	/* message id as reference for confirmation */
+	uint32_t msg_id;
+	/* IMSI (to derive paging group) */
+	char imsi[OSMO_IMSI_BUF_SIZE];
+	/* GSM mac-block (with immediate assignment message) */
+	uint8_t data[GSM_MACBLOCK_LEN];
+	/* Set to true in case the receiving end must send a confirmation
+	 * when the MAC block (data) has been sent. */
+	bool confirm;
+} __attribute__((packed));
+
+/* Struct to send a (confirmed) IMMEDIATE ASSIGNMENT message via AGCH. The struct is sent as a data request
+ * (data_req) under SAPI PCU_IF_SAPI_AGCH_2. */
+struct gsm_pcu_if_agch {
+	/* message id as reference for confirmation */
+	uint32_t msg_id;
+	/* GSM mac-block (with immediate assignment message) */
+	uint8_t data[GSM_MACBLOCK_LEN];
+	/* Set to true in case the receiving end must send a confirmation
+	 * when the MAC block (data) has been sent. */
+	bool confirm;
+} __attribute__((packed));
+
 struct gsm_pcu_if {
 	/* context based information */
 	uint8_t		msg_type;	/* message type */
@@ -216,8 +265,7 @@ struct gsm_pcu_if {
 
 	union {
 		struct gsm_pcu_if_data		data_req;
-		struct gsm_pcu_if_data		data_cnf;
-		struct gsm_pcu_if_data_cnf_dt	data_cnf_dt;
+		struct gsm_pcu_if_data_cnf	data_cnf2;
 		struct gsm_pcu_if_data		data_ind;
 		struct gsm_pcu_if_susp_req	susp_req;
 		struct gsm_pcu_if_rts_req	rts_req;
@@ -228,6 +276,8 @@ struct gsm_pcu_if {
 		struct gsm_pcu_if_time_ind	time_ind;
 		struct gsm_pcu_if_pag_req	pag_req;
 		struct gsm_pcu_if_app_info_req	app_info_req;
+		struct gsm_pcu_if_interf_ind	interf_ind;
+		struct gsm_pcu_if_container	container;
 	} u;
 } __attribute__ ((packed));
 

include/osmo-bts/phy_link.h

@@ -48,9 +48,10 @@ struct phy_link {
 			uint32_t clock_advance;
 			uint32_t rts_advance;
 			bool use_legacy_setbsic;
-			uint8_t	 trxd_hdr_ver_max; /* Maximum TRXD header version to negotiate */
+			uint8_t trxd_pdu_ver_max; /* Maximum TRXD PDU version to negotiate */
 			bool powered; /* last POWERON (true) or POWEROFF (false) confirmed */
-			bool poweronoff_sent; /* is there a POWERON/POWEROFF in transit? (one or the other based on ->powered) */
+			bool poweron_sent; /* is there a POWERON in transit? */
+			bool poweroff_sent; /* is there a POWEROFF in transit? */
 		} osmotrx;
 		struct {
 			char *mcast_dev;		/* Network device for multicast */
@@ -97,7 +98,7 @@ struct phy_instance {
 	struct phy_link *phy_link;
 
 	/* back-pointer to the TRX to which we're associated */
-	struct gsm_bts_trx *trx;
+	struct gsm_bts_trx *trx; /* NOTE: may be NULL! */
 
 	union {
 		struct {
@@ -112,11 +113,8 @@ struct phy_instance {
 		} sysmobts;
 		struct {
 			struct trx_l1h *hdl;
-			bool sw_act_reported;
+			struct trx_dl_burst_req br[TRX_NR_TS];
 		} osmotrx;
-		struct {
-			struct l1sched_trx sched;
-		} virt;
 		struct {
 			/* logical transceiver number within one PHY */
 			uint32_t trx_id;
@@ -158,7 +156,7 @@ struct phy_instance {
 struct phy_link *phy_link_by_num(int num);
 struct phy_link *phy_link_create(void *ctx, int num);
 void phy_link_destroy(struct phy_link *plink);
-const char *phy_link_name(struct phy_link *plink);
+const char *phy_link_name(const struct phy_link *plink);
 void phy_link_state_set(struct phy_link *plink, enum phy_link_state state);
 enum phy_link_state phy_link_state_get(struct phy_link *plink);
 const char *phy_link_state_name(enum phy_link_state state);
@@ -168,15 +166,16 @@ struct phy_instance *phy_instance_by_num(const struct phy_link *plink, int num);
 struct phy_instance *phy_instance_create(struct phy_link *plink, int num);
 void phy_instance_link_to_trx(struct phy_instance *pinst, struct gsm_bts_trx *trx);
 void phy_instance_destroy(struct phy_instance *pinst);
-const char *phy_instance_name(struct phy_instance *pinst);
+const char *phy_instance_name(const struct phy_instance *pinst);
 
 static inline struct phy_instance *trx_phy_instance(const struct gsm_bts_trx *trx)
 {
 	OSMO_ASSERT(trx);
-	return trx->role_bts.l1h;
+	return trx->pinst;
 }
 
 int bts_model_phy_link_open(struct phy_link *plink);
+int bts_model_phy_link_close(struct phy_link *plink);
 
 #define LOGPPHL(plink, section, lvl, fmt, args...) LOGP(section, lvl, "%s: " fmt, phy_link_name(plink), ##args)
 #define LOGPPHI(pinst, section, lvl, fmt, args...) LOGP(section, lvl, "%s: " fmt, phy_instance_name(pinst), ##args)

include/osmo-bts/power_control.h

@@ -1,11 +1,90 @@
 #pragma once
 
 #include <stdint.h>
-#include <osmo-bts/gsm_data.h>
+#include <stdbool.h>
 
+/* MS/BS Power related measurement averaging algo */
+enum gsm_power_ctrl_meas_avg_algo {
+	GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE			= 0x00,
+	GSM_PWR_CTRL_MEAS_AVG_ALGO_UNWEIGHTED		= 0x01,
+	GSM_PWR_CTRL_MEAS_AVG_ALGO_WEIGHTED		= 0x02,
+	GSM_PWR_CTRL_MEAS_AVG_ALGO_MOD_MEDIAN		= 0x03,
+	/* EWMA is an Osmocom specific algo */
+	GSM_PWR_CTRL_MEAS_AVG_ALGO_OSMO_EWMA		= 0x04,
+};
+
+/* MS/BS Power related measurement parameters */
+struct gsm_power_ctrl_meas_params {
+	/* Thresholds (see 3GPP TS 45.008, section A.3.2.1) */
+	uint8_t lower_thresh; /* lower (decreasing) direction */
+	uint8_t upper_thresh; /* upper (increasing) direction */
+
+	/* Threshold Comparators for lower (decreasing) direction */
+	uint8_t lower_cmp_p; /* P1 for RxLev, P3 for RxQual */
+	uint8_t lower_cmp_n; /* N1 for RxLev, N3 for RxQual */
+	/* Threshold Comparators for upper (increasing) direction */
+	uint8_t upper_cmp_p; /* P2 for RxLev, P4 for RxQual */
+	uint8_t upper_cmp_n; /* N2 for RxLev, N4 for RxQual */
+
+	/* Hreqave and Hreqt (see 3GPP TS 45.008, Annex A) */
+	uint8_t h_reqave;
+	uint8_t h_reqt;
+
+	/* AVG algorithm and its specific parameters */
+	enum gsm_power_ctrl_meas_avg_algo algo;
+	union {
+		/* Exponentially Weighted Moving Average */
+		struct {
+			/* Smoothing factor: higher the value - less smoothing */
+			uint8_t alpha; /* 1 .. 99 (in %) */
+		} ewma;
+	};
+};
+
+/* MS/BS Power Control parameters */
+struct gsm_power_ctrl_params {
+	/* Minimum interval between power level changes */
+	uint8_t ctrl_interval; /* 1 step is 2 SACCH periods */
+
+	/* Power change step size (maximum) */
+	uint8_t inc_step_size_db; /* increasing direction */
+	uint8_t red_step_size_db; /* reducing direction */
+
+	/* Measurement averaging parameters for RxLev & RxQual */
+	struct gsm_power_ctrl_meas_params rxqual_meas;
+	struct gsm_power_ctrl_meas_params rxlev_meas;
+
+	/* Measurement averaging parameters for C/I, per chan type */
+	struct gsm_power_ctrl_meas_params ci_fr_meas;
+	struct gsm_power_ctrl_meas_params ci_hr_meas;
+	struct gsm_power_ctrl_meas_params ci_amr_fr_meas;
+	struct gsm_power_ctrl_meas_params ci_amr_hr_meas;
+	struct gsm_power_ctrl_meas_params ci_sdcch_meas;
+	struct gsm_power_ctrl_meas_params ci_gprs_meas;
+};
+
+/* Measurement pre-processing state */
+struct gsm_power_ctrl_meas_proc_state {
+	/* Number of measurements processed */
+	unsigned int meas_num;
+	/* Algorithm specific data */
+	union {
+		struct {
+			/* Scaled up 100 times average value */
+			int Avg100;
+		} ewma;
+	};
+};
+
+/* Default MS/BS Power Control parameters */
+extern const struct gsm_power_ctrl_params power_ctrl_params_def;
+void power_ctrl_params_def_reset(struct gsm_power_ctrl_params *params, bool is_bs_pwr);
+
+struct gsm_lchan;
 int lchan_ms_pwr_ctrl(struct gsm_lchan *lchan,
 		      const uint8_t ms_power_lvl,
-		      const int8_t ul_rssi_dbm);
+		      const int8_t ul_rssi_dbm,
+		      const int16_t ul_lqual_cb);
 
 int lchan_bs_pwr_ctrl(struct gsm_lchan *lchan,
-		      const struct gsm48_hdr *gh);
+		      const struct gsm48_meas_res *mr);

include/osmo-bts/rsl.h

@@ -4,7 +4,8 @@
 #define LCHAN_FN_DUMMY 0xFFFFFFFF
 #define LCHAN_FN_WAIT 0xFFFFFFFE
 
-int msgb_queue_flush(struct llist_head *list);
+bool rsl_chan_rt_is_asci(enum rsl_cmod_crt chan_rt);
+bool rsl_chan_rt_is_vgcs(enum rsl_cmod_crt chan_rt);
 
 int down_rsl(struct gsm_bts_trx *trx, struct msgb *msg);
 int rsl_tx_rf_res(struct gsm_bts_trx *trx);
@@ -16,8 +17,8 @@ int rsl_tx_chan_act_acknack(struct gsm_lchan *lchan, uint8_t cause);
 int rsl_tx_conn_fail(const struct gsm_lchan *lchan, uint8_t cause);
 int rsl_tx_rf_rel_ack(struct gsm_lchan *lchan);
 int rsl_tx_hando_det(struct gsm_lchan *lchan, uint8_t *ho_delay);
-
-int lchan_deactivate(struct gsm_lchan *lchan);
+int rsl_tx_listener_det(struct gsm_lchan *lchan, uint8_t *acc_delay);
+int rsl_tx_talker_det(struct gsm_lchan *lchan, uint8_t *acc_delay);
 
 /* call-back for LAPDm code, called when it wants to send msgs UP */
 int lapdm_rll_tx_cb(struct msgb *msg, struct lapdm_entity *le, void *ctx);
@@ -34,6 +35,6 @@ void ipacc_dyn_pdch_complete(struct gsm_bts_trx_ts *ts, int rc);
 
 int rsl_tx_cbch_load_indication(struct gsm_bts *bts, bool ext_cbch, bool overflow, uint8_t amount);
 
-int rsl_tx_meas_res(struct gsm_lchan *lchan, uint8_t *l3, int l3_len, const struct lapdm_entity *le);
+int rsl_tx_meas_res(struct gsm_lchan *lchan, const uint8_t *l3, unsigned int l3_len, int timing_offset);
 
 #endif // _RSL_H */

include/osmo-bts/rtp_input_preen.h

@@ -0,0 +1,20 @@
+/*
+ * RTP input validation function: makes the accept-or-drop decision,
+ * and for some codecs signals additional required actions such as
+ * dropping one header octet.
+ */
+
+#pragma once
+
+#include <stdint.h>
+#include <osmo-bts/lchan.h>
+
+enum pl_input_decision {
+	PL_DECISION_DROP,
+	PL_DECISION_ACCEPT,
+	PL_DECISION_STRIP_HDR_OCTET,
+};
+
+enum pl_input_decision
+rtp_payload_input_preen(struct gsm_lchan *lchan, const uint8_t *rtp_pl,
+			unsigned rtp_pl_len, bool *rfc5993_sid_flag);

include/osmo-bts/scheduler.h

@@ -1,17 +1,18 @@
-#ifndef TRX_SCHEDULER_H
-#define TRX_SCHEDULER_H
+#pragma once
 
 #include <osmocom/core/utils.h>
 #include <osmocom/core/rate_ctr.h>
 
 #include <osmo-bts/gsm_data.h>
 
-/* Whether a logical channel must be activated automatically */
-#define TRX_CHAN_FLAG_AUTO_ACTIVE	(1 << 0)
+#define TRX_GMSK_NB_TSC(br) \
+	_sched_train_seq_gmsk_nb[(br)->tsc_set][(br)->tsc]
 
-/* FIXME: we should actually activate 'auto-active' channels */
-#define TRX_CHAN_IS_ACTIVE(state, chan) \
-	(trx_chan_desc[chan].flags & TRX_CHAN_FLAG_AUTO_ACTIVE || (state)->active)
+#define TRX_8PSK_NB_TSC(br) \
+	_sched_train_seq_8psk_nb[(br)->tsc]
+
+#define TRX_CHAN_IS_DEDIC(chan) \
+	(chan >= TRXC_TCHF)
 
 /* These types define the different channels on a multiframe.
  * Each channel has queues and can be activated individually.
@@ -23,6 +24,10 @@ enum trx_chan_type {
 	TRXC_BCCH,
 	TRXC_RACH,
 	TRXC_CCCH,
+	TRXC_CBCH,
+	TRXC_PDTCH,
+	TRXC_PTCCH,
+/* Dedicated channels start here */
 	TRXC_TCHF,
 	TRXC_TCHH_0,
 	TRXC_TCHH_1,
@@ -53,9 +58,6 @@ enum trx_chan_type {
 	TRXC_SACCH8_5,
 	TRXC_SACCH8_6,
 	TRXC_SACCH8_7,
-	TRXC_PDTCH,
-	TRXC_PTCCH,
-	TRXC_CBCH,
 	_TRX_CHAN_MAX
 };
 
@@ -63,13 +65,15 @@ enum trx_chan_type {
 #define GPRS_BURST_LEN		GSM_BURST_LEN
 #define EGPRS_BURST_LEN		444
 
-enum trx_burst_type {
-	TRX_BURST_GMSK,
-	TRX_BURST_8PSK,
+enum trx_mod_type {
+	TRX_MOD_T_GMSK,
+	TRX_MOD_T_8PSK,
+	TRX_MOD_T_AQPSK,
 };
 
 /* A set of measurements belonging to one Uplink burst */
 struct l1sched_meas_set {
+	uint32_t		fn;		/* TDMA frame number */
 	int16_t			toa256;		/* Timing of Arrival (1/256 of a symbol) */
 	int16_t			ci_cb;		/* Carrier-to-Interference (cB) */
 	float			rssi;		/* RSSI (dBm) */
@@ -85,14 +89,13 @@ struct l1sched_chan_state {
 	/* scheduler */
 	bool			active;		/* Channel is active */
 	ubit_t			*dl_bursts;	/* burst buffer for TX */
-	enum trx_burst_type	dl_burst_type;  /* GMSK or 8PSK burst type */
+	enum trx_mod_type	dl_mod_type;	/* Downlink modulation type */
+	uint8_t			dl_mask;	/* mask of transmitted bursts */
 	sbit_t			*ul_bursts;	/* burst buffer for RX */
-	sbit_t			*ul_bursts_prev;/* previous burst buffer for RX (repeated SACCH) */
 	uint32_t		ul_first_fn;	/* fn of first burst */
-	uint8_t			ul_mask;	/* mask of received bursts */
+	uint32_t		ul_mask;	/* mask of received bursts */
 
 	/* loss detection */
-	uint8_t			lost_frames;	/* how many L2 frames were lost */
 	uint32_t		last_tdma_fn;	/* last processed TDMA frame number */
 	uint32_t		proc_tdma_fs;	/* how many TDMA frames were processed */
 	uint32_t		lost_tdma_fs;	/* how many TDMA frames were lost */
@@ -103,19 +106,20 @@ struct l1sched_chan_state {
 	/* AMR */
 	uint8_t			codec[4];	/* 4 possible codecs for amr */
 	int			codecs;		/* number of possible codecs */
-	float			ber_sum;	/* sum of bit error rates */
-	int			ber_num;	/* number of bit error rates */
+	int			lqual_cb_sum;	/* sum of link quality samples (in cB) */
+	int			lqual_cb_num;	/* number of link quality samples */
 	uint8_t			ul_ft;		/* current uplink FT index */
 	uint8_t			dl_ft;		/* current downlink FT index */
 	uint8_t			ul_cmr;		/* current uplink CMR index */
 	uint8_t			dl_cmr;		/* current downlink CMR index */
-	uint8_t			amr_loop;	/* if AMR loop is enabled */
 	uint8_t			amr_last_dtx;	/* last received dtx frame type */
 
 	/* TCH/H */
 	uint8_t			dl_ongoing_facch; /* FACCH/H on downlink */
 	uint8_t			ul_ongoing_facch; /* FACCH/H on uplink */
 
+	uint8_t			dl_facch_bursts;  /* number of remaining DL FACCH bursts */
+
 	/* encryption */
 	int			ul_encr_algo;	/* A5/x encry algo downlink */
 	int			dl_encr_algo;	/* A5/x encry algo uplink */
@@ -124,10 +128,14 @@ struct l1sched_chan_state {
 	uint8_t			ul_encr_key[MAX_A5_KEY_LEN];
 	uint8_t			dl_encr_key[MAX_A5_KEY_LEN];
 
-	/* Simple ring buffer (up to 8 unique measurements) */
+	/* Uplink measurements */
 	struct {
-		struct l1sched_meas_set buf[8];
+		/* Active channel measurements (simple ring buffer) */
+		struct l1sched_meas_set buf[24]; /* up to 24 (BUFMAX) entries */
 		unsigned int current; /* current position */
+
+		/* Interference measurements */
+		int interf_avg; /* sliding average */
 	} meas;
 
 	/* handover */
@@ -135,6 +143,8 @@ struct l1sched_chan_state {
 };
 
 struct l1sched_ts {
+	struct gsm_bts_trx_ts	*ts;		/* timeslot we belong to */
+
 	uint8_t 		mf_index;	/* selected multiframe index */
 	uint8_t			mf_period;	/* period of multiframe */
 	const struct trx_sched_frame *mf_frames; /* pointer to frame layout */
@@ -147,25 +157,18 @@ struct l1sched_ts {
 	struct l1sched_chan_state chan_state[_TRX_CHAN_MAX];
 };
 
-struct l1sched_trx {
-	struct gsm_bts_trx	*trx;
-	struct l1sched_ts       ts[TRX_NR_TS];
-};
-
-struct l1sched_ts *l1sched_trx_get_ts(struct l1sched_trx *l1t, uint8_t tn);
-
 
 /*! \brief Initialize the scheduler data structures */
-int trx_sched_init(struct l1sched_trx *l1t, struct gsm_bts_trx *trx);
+void trx_sched_init(struct gsm_bts_trx *trx);
 
 /*! \brief De-initialize the scheduler data structures */
-void trx_sched_exit(struct l1sched_trx *l1t);
+void trx_sched_clean(struct gsm_bts_trx *trx);
 
 /*! \brief Handle a PH-DATA.req from L2 down to L1 */
-int trx_sched_ph_data_req(struct l1sched_trx *l1t, struct osmo_phsap_prim *l1sap);
+int trx_sched_ph_data_req(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap);
 
 /*! \brief Handle a PH-TCH.req from L2 down to L1 */
-int trx_sched_tch_req(struct l1sched_trx *l1t, struct osmo_phsap_prim *l1sap);
+int trx_sched_tch_req(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap);
 
 /*! \brief PHY informs us of new (current) GSM frame number */
 int trx_sched_clock(struct gsm_bts *bts, uint32_t fn);
@@ -177,21 +180,25 @@ int trx_sched_clock_started(struct gsm_bts *bts);
 int trx_sched_clock_stopped(struct gsm_bts *bts);
 
 /*! \brief set multiframe scheduler to given physical channel config */
-int trx_sched_set_pchan(struct l1sched_trx *l1t, uint8_t tn,
-        enum gsm_phys_chan_config pchan);
+int trx_sched_set_pchan(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config pchan);
 
 /*! \brief set all matching logical channels active/inactive */
-int trx_sched_set_lchan(struct l1sched_trx *l1t, uint8_t chan_nr, uint8_t link_id, bool active);
+int trx_sched_set_lchan(struct gsm_lchan *lchan, uint8_t chan_nr, uint8_t link_id, bool active);
+
+/*! \brief set uplink access on given logical channels active/inactive */
+int trx_sched_set_ul_access(struct gsm_lchan *lchan, uint8_t chan_nr, bool active);
+
+/*! \brief set all logical channels of BCCH/CCCH active/inactive */
+int trx_sched_set_bcch_ccch(struct gsm_lchan *lchan, bool active);
 
 /*! \brief set mode of all matching logical channels to given mode(s) */
-int trx_sched_set_mode(struct l1sched_trx *l1t, uint8_t chan_nr, uint8_t rsl_cmode,
+int trx_sched_set_mode(struct gsm_bts_trx_ts *ts, uint8_t chan_nr, uint8_t rsl_cmode,
 	uint8_t tch_mode, int codecs, uint8_t codec0, uint8_t codec1,
 	uint8_t codec2, uint8_t codec3, uint8_t initial_codec,
 	uint8_t handover);
 
 /*! \brief set ciphering on given logical channels */
-int trx_sched_set_cipher(struct l1sched_trx *l1t, uint8_t chan_nr, int downlink,
-        int algo, uint8_t *key, int key_len);
+int trx_sched_set_cipher(struct gsm_lchan *lchan, uint8_t chan_nr, bool downlink);
 
 /* frame structures */
 struct trx_sched_frame {
@@ -222,13 +229,17 @@ struct trx_sched_multiframe {
 int find_sched_mframe_idx(enum gsm_phys_chan_config pchan, uint8_t tn);
 
 /*! Determine if given frame number contains SACCH (true) or other (false) burst */
-bool trx_sched_is_sacch_fn(struct gsm_bts_trx_ts *ts, uint32_t fn, bool uplink);
+bool trx_sched_is_sacch_fn(const struct gsm_bts_trx_ts *ts, uint32_t fn, bool uplink);
 extern const struct trx_sched_multiframe trx_sched_multiframes[];
 
 #define TRX_BI_F_NOPE_IND	(1 << 0)
 #define TRX_BI_F_MOD_TYPE	(1 << 1)
 #define TRX_BI_F_TS_INFO	(1 << 2)
 #define TRX_BI_F_CI_CB		(1 << 3)
+#define TRX_BI_F_TRX_NUM	(1 << 4)
+#define TRX_BI_F_BATCH_IND	(1 << 5)
+#define TRX_BI_F_SHADOW_IND	(1 << 6)
+#define TRX_BI_F_ACCESS_BURST	(1 << 7)
 
 /*! UL burst indication with the corresponding meta info */
 struct trx_ul_burst_ind {
@@ -242,21 +253,44 @@ struct trx_ul_burst_ind {
 	int8_t rssi;		/*!< Received Signal Strength Indication */
 
 	/* Optional fields (defined by flags) */
-	enum trx_burst_type bt;	/*!< Modulation type */
+	enum trx_mod_type mod;	/*!< Modulation type */
 	uint8_t tsc_set;	/*!< Training Sequence Set */
 	uint8_t tsc;		/*!< Training Sequence Code */
 	int16_t ci_cb;		/*!< Carrier-to-Interference ratio (in centiBels) */
+	uint8_t trx_num;	/*!< TRX (RF channel) number */
+
+	/* Used internally by the PDU parser */
+	uint8_t _num_pdus;	/*!< Number of processed PDUs */
+
+	/* Internally used by the scheduler */
+	enum trx_chan_type chan;
+	uint8_t bid;
 
 	/*! Burst soft-bits buffer */
 	sbit_t burst[EGPRS_BURST_LEN];
 	size_t burst_len;
 };
 
+#define TRX_BR_F_FACCH		(1 << 0)
+
 /*! DL burst request with the corresponding meta info */
 struct trx_dl_burst_req {
+	uint8_t flags;		/*!< see TRX_BR_F_* */
+
+	/* Mandatory fields */
 	uint32_t fn;		/*!< TDMA frame number */
 	uint8_t tn;		/*!< TDMA timeslot number */
 	uint8_t att;		/*!< Tx power attenuation */
+	int8_t scpir;		/*!< SCPIR (for AQPSK only) */
+	uint8_t trx_num;	/*!< TRX (RF channel) number */
+
+	enum trx_mod_type mod;	/*!< Modulation type */
+	uint8_t tsc_set;	/*!< Training Sequence Set */
+	uint8_t tsc;		/*!< Training Sequence Code */
+
+	/* Internally used by the scheduler */
+	enum trx_chan_type chan;
+	uint8_t bid;
 
 	/*! Burst hard-bits buffer */
 	ubit_t burst[EGPRS_BURST_LEN];
@@ -264,23 +298,29 @@ struct trx_dl_burst_req {
 };
 
 /*! Handle an UL burst received by PHY */
-int trx_sched_route_burst_ind(struct trx_ul_burst_ind *bi, struct l1sched_trx *l1t);
-int trx_sched_ul_burst(struct l1sched_trx *l1t, struct trx_ul_burst_ind *bi);
+int trx_sched_route_burst_ind(const struct gsm_bts_trx *trx, struct trx_ul_burst_ind *bi);
+int trx_sched_ul_burst(struct l1sched_ts *l1ts, struct trx_ul_burst_ind *bi);
 
 /* Averaging mode for trx_sched_meas_avg() */
 enum sched_meas_avg_mode {
-	/* last 4 bursts (default for xCCH, TCH/H, PTCCH and PDTCH) */
-	SCHED_MEAS_AVG_M_QUAD,
+	/* first 22 of last 24 bursts (for TCH/F14.4, TCH/F9.6, TCH/F4.8) */
+	SCHED_MEAS_AVG_M_S24N22,
+	/* last 22 bursts (for TCH/H4.8, TCH/H2.4) */
+	SCHED_MEAS_AVG_M_S22N22,
+	/* last 4 bursts (default for xCCH, PTCCH and PDTCH) */
+	SCHED_MEAS_AVG_M_S4N4,
 	/* last 8 bursts (default for TCH/F and FACCH/F) */
-	SCHED_MEAS_AVG_M_OCTO,
+	SCHED_MEAS_AVG_M_S8N8,
+	/* first 4 of last 6 bursts (default for TCH/H) */
+	SCHED_MEAS_AVG_M_S6N4,
 	/* last 6 bursts (default for FACCH/H) */
-	SCHED_MEAS_AVG_M_SIX,
+	SCHED_MEAS_AVG_M_S6N6,
 	/* first 4 of last 8 bursts */
-	SCHED_MEAS_AVG_M8_FIRST_QUAD,
+	SCHED_MEAS_AVG_M_S8N4,
 	/* first 2 of last 6 bursts */
-	SCHED_MEAS_AVG_M6_FIRST_TWO,
+	SCHED_MEAS_AVG_M_S6N2,
 	/* middle 2 of last 6 bursts */
-	SCHED_MEAS_AVG_M6_MIDDLE_TWO,
+	SCHED_MEAS_AVG_M_S4N2,
 };
 
 void trx_sched_meas_push(struct l1sched_chan_state *chan_state,
@@ -288,5 +328,5 @@ void trx_sched_meas_push(struct l1sched_chan_state *chan_state,
 void trx_sched_meas_avg(const struct l1sched_chan_state *chan_state,
 			struct l1sched_meas_set *avg,
 			enum sched_meas_avg_mode mode);
-
-#endif /* TRX_SCHEDULER_H */
+uint32_t trx_sched_lookup_fn(const struct l1sched_chan_state *chan_state,
+			     const unsigned int shift);

include/osmo-bts/scheduler_backend.h

@@ -1,19 +1,18 @@
 #pragma once
 
-#define LOGL1S(subsys, level, l1t, tn, chan, fn, fmt, args ...)	\
+#define LOGL1S(subsys, level, l1ts, chan, fn, fmt, args ...)	\
 		LOGP(subsys, level, "%s %s %s: " fmt,		\
 			gsm_fn_as_gsmtime_str(fn),		\
-			gsm_ts_name(&(l1t)->trx->ts[tn]),	\
+			gsm_ts_name((l1ts)->ts),		\
 			chan >=0 ? trx_chan_desc[chan].name : "", ## args)
 
-typedef int trx_sched_rts_func(struct l1sched_trx *l1t, uint8_t tn,
-			       uint32_t fn, enum trx_chan_type chan);
+/* Logging helper adding context from trx_{ul,dl}_burst_{ind,req} */
+#define LOGL1SB(subsys, level, l1ts, b, fmt, args ...) \
+	LOGL1S(subsys, level, l1ts, (b)->chan, (b)->fn, fmt, ## args)
 
-typedef int trx_sched_dl_func(struct l1sched_trx *l1t, enum trx_chan_type chan,
-			      uint8_t bid, struct trx_dl_burst_req *br);
-
-typedef int trx_sched_ul_func(struct l1sched_trx *l1t, enum trx_chan_type chan,
-			      uint8_t bid, const struct trx_ul_burst_ind *bi);
+typedef int trx_sched_rts_func(const struct l1sched_ts *l1ts, const struct trx_dl_burst_req *br);
+typedef int trx_sched_dl_func(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br);
+typedef int trx_sched_ul_func(struct l1sched_ts *l1ts, const struct trx_ul_burst_ind *bi);
 
 struct trx_chan_desc {
 	/*! \brief Human-readable name */
@@ -36,51 +35,39 @@ struct trx_chan_desc {
 extern const struct trx_chan_desc trx_chan_desc[_TRX_CHAN_MAX];
 
 extern const ubit_t _sched_dummy_burst[];
-extern const ubit_t _sched_tsc[8][26];
-extern const ubit_t _sched_egprs_tsc[8][78];
-extern const ubit_t _sched_sch_train[64];
+extern const ubit_t _sched_train_seq_gmsk_nb[4][8][26];
+extern const ubit_t _sched_train_seq_8psk_nb[8][78];
+extern const ubit_t _sched_train_seq_gmsk_sb[64];
 
-struct msgb *_sched_dequeue_prim(struct l1sched_trx *l1t, int8_t tn, uint32_t fn,
-				 enum trx_chan_type chan);
+struct msgb *_sched_dequeue_prim(struct l1sched_ts *l1ts, const struct trx_dl_burst_req *br);
 
-int _sched_compose_ph_data_ind(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn,
-			       enum trx_chan_type chan, uint8_t *l2,
-			       uint8_t l2_len, float rssi,
+int _sched_compose_ph_data_ind(struct l1sched_ts *l1ts, uint32_t fn,
+			       enum trx_chan_type chan,
+			       const uint8_t *data, size_t data_len,
+			       uint16_t ber10k, float rssi,
 			       int16_t ta_offs_256bits, int16_t link_qual_cb,
-			       uint16_t ber10k,
 			       enum osmo_ph_pres_info_type presence_info);
 
-int _sched_compose_tch_ind(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn,
-			   enum trx_chan_type chan, uint8_t *tch, uint8_t tch_len,
-			   int16_t ta_offs_256bits, uint16_t ber10k, float rssi,
+int _sched_compose_tch_ind(struct l1sched_ts *l1ts, uint32_t fn,
+			   enum trx_chan_type chan,
+			   const uint8_t *data, size_t data_len,
+			   uint16_t ber10k, float rssi,
+			   int16_t ta_offs_256bits, int16_t link_qual_cb,
 			   uint8_t is_sub);
 
-int tx_idle_fn(struct l1sched_trx *l1t, enum trx_chan_type chan,
-	       uint8_t bid, struct trx_dl_burst_req *br);
-int tx_fcch_fn(struct l1sched_trx *l1t, enum trx_chan_type chan,
-	       uint8_t bid, struct trx_dl_burst_req *br);
-int tx_sch_fn(struct l1sched_trx *l1t, enum trx_chan_type chan,
-	       uint8_t bid, struct trx_dl_burst_req *br);
-int tx_data_fn(struct l1sched_trx *l1t, enum trx_chan_type chan,
-	       uint8_t bid, struct trx_dl_burst_req *br);
-int tx_pdtch_fn(struct l1sched_trx *l1t, enum trx_chan_type chan,
-	       uint8_t bid, struct trx_dl_burst_req *br);
-int tx_tchf_fn(struct l1sched_trx *l1t, enum trx_chan_type chan,
-	       uint8_t bid, struct trx_dl_burst_req *br);
-int tx_tchh_fn(struct l1sched_trx *l1t, enum trx_chan_type chan,
-	       uint8_t bid, struct trx_dl_burst_req *br);
+int tx_fcch_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br);
+int tx_sch_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br);
+int tx_data_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br);
+int tx_pdtch_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br);
+int tx_tchf_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br);
+int tx_tchh_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br);
 
-int rx_rach_fn(struct l1sched_trx *l1t, enum trx_chan_type chan,
-	       uint8_t bid, const struct trx_ul_burst_ind *bi);
-int rx_data_fn(struct l1sched_trx *l1t, enum trx_chan_type chan,
-	       uint8_t bid, const struct trx_ul_burst_ind *bi);
-int rx_pdtch_fn(struct l1sched_trx *l1t, enum trx_chan_type chan,
-	        uint8_t bid, const struct trx_ul_burst_ind *bi);
-int rx_tchf_fn(struct l1sched_trx *l1t, enum trx_chan_type chan,
-	       uint8_t bid, const struct trx_ul_burst_ind *bi);
-int rx_tchh_fn(struct l1sched_trx *l1t, enum trx_chan_type chan,
-	       uint8_t bid, const struct trx_ul_burst_ind *bi);
+int rx_rach_fn(struct l1sched_ts *l1ts, const struct trx_ul_burst_ind *bi);
+int rx_data_fn(struct l1sched_ts *l1ts, const struct trx_ul_burst_ind *bi);
+int rx_pdtch_fn(struct l1sched_ts *l1ts, const struct trx_ul_burst_ind *bi);
+int rx_tchf_fn(struct l1sched_ts *l1ts, const struct trx_ul_burst_ind *bi);
+int rx_tchh_fn(struct l1sched_ts *l1ts, const struct trx_ul_burst_ind *bi);
 
-void _sched_dl_burst(struct l1sched_trx *l1t, struct trx_dl_burst_req *br);
-int _sched_rts(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn);
-void _sched_act_rach_det(struct l1sched_trx *l1t, uint8_t tn, uint8_t ss, int activate);
+void _sched_dl_burst(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br);
+int _sched_rts(const struct l1sched_ts *l1ts, uint32_t fn);
+void _sched_act_rach_det(struct gsm_bts_trx *trx, uint8_t tn, uint8_t ss, int activate);

include/osmo-bts/signal.h

@@ -15,4 +15,10 @@ enum signals_global {
 	S_NEW_NSVC_ATTR,
 };
 
+struct nm_statechg_signal_data {
+	struct gsm_abis_mo *mo;
+	uint8_t old_state;
+	uint8_t new_state;
+};
+
 #endif

include/osmo-bts/ta_control.h

@@ -2,4 +2,4 @@
 
 #include <osmo-bts/gsm_data.h>
 
-void lchan_ms_ta_ctrl(struct gsm_lchan *lchan);
+void lchan_ms_ta_ctrl(struct gsm_lchan *lchan, uint8_t ms_tx_ta, int16_t toa256);

include/osmo-bts/tx_power.h

@@ -77,7 +77,13 @@ int get_p_trxout_target_mdBm_lchan(const struct gsm_lchan *lchan);
 int get_p_trxout_actual_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red);
 int get_p_trxout_actual_mdBm_lchan(const struct gsm_lchan *lchan);
 
-int power_ramp_start(struct gsm_bts_trx *trx, int p_total_tgt_mdBm, int bypass, ramp_compl_cb_t ramp_compl_cb);
+int _power_ramp_start(struct gsm_bts_trx *trx, int p_total_tgt_mdBm, int bypass_max_power, ramp_compl_cb_t ramp_compl_cb, bool skip_ramping);
+#define power_ramp_start(trx, p_total_tgt_mdBm, bypass_max_power, ramp_compl_cb) \
+	_power_ramp_start(trx, p_total_tgt_mdBm, bypass_max_power, ramp_compl_cb, false)
+#define power_ramp_force(trx, p_total_tgt_mdBm, bypass_max_power, ramp_compl_cb) \
+	_power_ramp_start(trx, p_total_tgt_mdBm, bypass_max_power, ramp_compl_cb, true)
+
+void power_ramp_abort(struct gsm_bts_trx *trx);
 
 void power_trx_change_compl(struct gsm_bts_trx *trx, int p_trxout_cur_mdBm);
 

include/osmo-bts/vty.h

@@ -12,6 +12,7 @@ enum bts_vty_node {
 	PHY_INST_NODE,
 	BTS_NODE,
 	TRX_NODE,
+	OSMUX_NODE,
 };
 
 extern struct cmd_element cfg_bts_auto_band_cmd;
@@ -20,12 +21,9 @@ extern struct cmd_element cfg_bts_no_auto_band_cmd;
 struct phy_instance *vty_get_phy_instance(struct vty *vty, int phy_nr, int inst_nr);
 
 int bts_vty_go_parent(struct vty *vty);
-int bts_vty_is_config_node(struct vty *vty, int node);
 
 int bts_vty_init(void *ctx);
 
-struct gsm_network *gsmnet_from_vty(struct vty *v);
-
 extern struct vty_app_info bts_vty_info;
 extern struct gsm_bts *g_bts;
 

src/common/Makefile.am

@@ -1,6 +1,23 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOCODEC_CFLAGS)
-LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOCODEC_LIBS)
+AM_CPPFLAGS = \
+	$(all_includes) \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	$(NULL)
+
+AM_CFLAGS = \
+	-Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOTRAU_CFLAGS) \
+	$(LIBOSMOCODEC_CFLAGS) \
+	$(LIBOSMONETIF_CFLAGS) \
+	$(NULL)
+
+LDADD = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOTRAU_LIBS) \
+	$(LIBOSMOCODEC_LIBS) \
+	$(LIBOSMONETIF_LIBS) \
+	$(NULL)
 
 if ENABLE_LC15BTS
 AM_CFLAGS += -DENABLE_LC15BTS
@@ -12,14 +29,19 @@ libbts_a_SOURCES = \
 	sysinfo.c \
 	logging.c \
 	abis.c \
+	abis_osmo.c \
 	oml.c \
+	osmux.c \
 	bts.c \
+	bts_sm.c \
 	bts_trx.c \
 	rsl.c \
+	rtp_input_preen.c \
 	vty.c \
 	paging.c \
 	measurement.c \
 	amr.c \
+	asci.c \
 	lchan.c \
 	load_indication.c \
 	pcu_sock.c \
@@ -29,6 +51,7 @@ libbts_a_SOURCES = \
 	bts_ctrl_commands.c \
 	bts_ctrl_lookup.c \
 	bts_shutdown_fsm.c \
+	csd_v110.c \
 	l1sap.c \
 	cbch.c \
 	power_control.c \
@@ -42,7 +65,23 @@ libbts_a_SOURCES = \
 	nm_bts_fsm.c \
 	nm_bb_transc_fsm.c \
 	nm_channel_fsm.c \
+	nm_gprs_cell_fsm.c \
+	nm_gprs_nse_fsm.c \
+	nm_gprs_nsvc_fsm.c \
 	nm_radio_carrier_fsm.c \
+	notification.c \
+	probes.d \
 	$(NULL)
 
 libl1sched_a_SOURCES = scheduler.c
+
+if ENABLE_SYSTEMTAP
+probes.h: probes.d
+	$(DTRACE) -C -h -s $< -o $@
+
+probes.lo: probes.d
+	$(LIBTOOL) --mode=compile $(AM_V_lt) --tag=CC env CFLAGS="$(CFLAGS)" $(DTRACE) -C -G -s $< -o $@
+
+BUILT_SOURCES = probes.h probes.lo
+libbts_la_LDADD = probes.lo
+endif

src/common/abis.c

@@ -13,7 +13,7 @@
  * 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.
+ * 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/>.
@@ -38,47 +38,319 @@
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/signal.h>
 #include <osmocom/core/macaddr.h>
+#include <osmocom/core/fsm.h>
 #include <osmocom/abis/abis.h>
 #include <osmocom/abis/e1_input.h>
 #include <osmocom/abis/ipaccess.h>
 #include <osmocom/gsm/ipa.h>
 
+#include <osmo-bts/abis.h>
 #include <osmo-bts/logging.h>
 #include <osmo-bts/gsm_data.h>
 #include <osmo-bts/bts.h>
 #include <osmo-bts/rsl.h>
 #include <osmo-bts/oml.h>
+#include <osmo-bts/abis_osmo.h>
 #include <osmo-bts/bts_model.h>
 #include <osmo-bts/bts_trx.h>
+#include <osmo-bts/bts_shutdown_fsm.h>
 
 static struct gsm_bts *g_bts;
 
+static struct e1inp_line_ops line_ops;
+
+static struct ipaccess_unit bts_dev_info;
+
+#define S(x) (1 << (x))
+#define	OML_RETRY_TIMER	5
+
+enum abis_link_fsm_state {
+	ABIS_LINK_ST_WAIT_RECONNECT, /* OML link has not yet been established */
+	ABIS_LINK_ST_CONNECTING, /* OML link in process of been established */
+	ABIS_LINK_ST_CONNECTED, /* OML link is established, RSL links may be established or not */
+	ABIS_LINK_ST_FAILED, /* There used to be an active OML connection but it became broken */
+};
+
+static const struct value_string abis_link_fsm_event_names[] = {
+	{ ABIS_LINK_EV_SIGN_LINK_OML_UP, "SIGN_LINK_OML_UP", },
+	{ ABIS_LINK_EV_SIGN_LINK_DOWN,   "SIGN_LINK_DOWN" },
+	{ ABIS_LINK_EV_VTY_RM_ADDR,      "VTY_RM_ADDR" },
+	{}
+};
+
+struct abis_link_fsm_priv {
+	struct bsc_oml_host *current_bsc;
+	struct gsm_bts *bts;
+	char *model_name;
+	bool reconnect_to_current_bsc;
+};
+
+static void reset_oml_link(struct gsm_bts *bts)
+{
+	if (bts->oml_link) {
+		struct timespec now;
+
+		e1inp_sign_link_destroy(bts->oml_link);
+
+		/* Log a special notice if the OML connection was dropped relatively quickly. */
+		if (bts->oml_conn_established_timestamp.tv_sec != 0 && clock_gettime(CLOCK_MONOTONIC, &now) == 0 &&
+		    bts->oml_conn_established_timestamp.tv_sec + OSMO_BTS_OML_CONN_EARLY_DISCONNECT >= now.tv_sec) {
+			LOGP(DABIS, LOGL_FATAL, "OML link was closed early within %" PRIu64 " seconds. "
+			     "If this situation persists, please check your BTS and BSC configuration files for errors. "
+			     "A common error is a mismatch between unit_id configuration parameters of BTS and BSC.\n",
+			     (uint64_t) (now.tv_sec - bts->oml_conn_established_timestamp.tv_sec));
+		}
+		bts->oml_link = NULL;
+	}
+	memset(&bts->oml_conn_established_timestamp, 0, sizeof(bts->oml_conn_established_timestamp));
+
+	/* Same for IPAC_PROTO_OSMO on the same ipa connection: */
+	if (bts->osmo_link) {
+		e1inp_sign_link_destroy(bts->osmo_link);
+		bts->osmo_link = NULL;
+	}
+
+}
+
+static int pick_next_bsc(struct osmo_fsm_inst *fi)
+{
+	struct abis_link_fsm_priv *priv = fi->priv;
+	struct gsm_bts *bts = priv->bts;
+	struct bsc_oml_host *last;
+
+	if (llist_empty(&bts->bsc_oml_hosts)) {
+		LOGPFSML(fi, LOGL_ERROR, "List of BSCs to connect to is empty!\n");
+		return -1;
+	}
+
+	/* Keep current pointer to priv->current_bsc: */
+	if (priv->reconnect_to_current_bsc) {
+		OSMO_ASSERT(priv->current_bsc);
+		priv->reconnect_to_current_bsc = false;
+		return 0;
+	}
+
+	last = (struct bsc_oml_host *)llist_last_entry(&bts->bsc_oml_hosts, struct bsc_oml_host, list);
+
+	if (!priv->current_bsc || priv->current_bsc == last) /* Pick first one (wrap around): */
+		priv->current_bsc = (struct bsc_oml_host *)llist_first_entry(&bts->bsc_oml_hosts, struct bsc_oml_host, list);
+	else
+		priv->current_bsc = (struct bsc_oml_host *)llist_entry(priv->current_bsc->list.next, struct bsc_oml_host, list);
+
+	return 0;
+}
+
+static void abis_link_connecting_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)
+{
+	struct e1inp_line *line;
+	struct abis_link_fsm_priv *priv = fi->priv;
+	struct gsm_bts *bts = priv->bts;
+
+	if (bts_shutdown_in_progress(bts)) {
+		LOGPFSML(fi, LOGL_NOTICE, "BTS is shutting down, delaying A-bis connection establishment to BSC\n");
+		osmo_fsm_inst_state_chg(fi, ABIS_LINK_ST_WAIT_RECONNECT, OML_RETRY_TIMER, 0);
+		return;
+	}
+
+	if (pick_next_bsc(fi) < 0) {
+		LOGPFSML(fi, LOGL_FATAL, "No BSC available, A-bis connection establishment failed\n");
+		osmo_fsm_inst_state_chg(fi, ABIS_LINK_ST_FAILED, 0, 0);
+		return;
+	}
+
+	LOGP(DABIS, LOGL_NOTICE, "A-bis connection establishment to BSC (%s) in progress...\n", priv->current_bsc->addr);
+
+	/* patch in various data from VTY and other sources */
+	line_ops.cfg.ipa.addr = priv->current_bsc->addr;
+	osmo_get_macaddr(bts_dev_info.mac_addr, "eth0");
+	bts_dev_info.site_id = bts->ip_access.site_id;
+	bts_dev_info.bts_id = bts->ip_access.bts_id;
+	bts_dev_info.unit_name = priv->model_name;
+	if (bts->description)
+		bts_dev_info.unit_name = bts->description;
+	bts_dev_info.location2 = priv->model_name;
+
+	line = e1inp_line_find(0);
+	if (!line)
+		line = e1inp_line_create(0, "ipa");
+	if (!line) {
+		osmo_fsm_inst_state_chg(fi, ABIS_LINK_ST_FAILED, 0, 0);
+		return;
+	}
+	/* Line always comes already with a "ctor" reference, enough to keep it alive forever. */
+
+	e1inp_line_bind_ops(line, &line_ops);
+	/* This will open the OML connection now */
+	if (e1inp_line_update(line) < 0) {
+		osmo_fsm_inst_state_chg(fi, ABIS_LINK_ST_FAILED, 0, 0);
+		return;
+	}
+
+	/* The TCP connection to the BSC is now in progress.
+	 * Wait for OML Link UP to transition to CONNECTED. */
+}
+
+static void abis_link_connecting(struct osmo_fsm_inst *fi, uint32_t event, void *data)
+{
+	struct abis_link_fsm_priv *priv = fi->priv;
+	struct gsm_bts *bts = priv->bts;
+
+	switch (event) {
+	case ABIS_LINK_EV_SIGN_LINK_OML_UP:
+		osmo_fsm_inst_state_chg(fi, ABIS_LINK_ST_CONNECTED, 0, 0);
+		break;
+	case ABIS_LINK_EV_SIGN_LINK_DOWN:
+		reset_oml_link(bts);
+		osmo_fsm_inst_state_chg(fi, ABIS_LINK_ST_WAIT_RECONNECT, OML_RETRY_TIMER, 0);
+		break;
+	default:
+		OSMO_ASSERT(0);
+	}
+}
+
+static void abis_link_connected_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)
+{
+	bts_link_estab(g_bts);
+}
+
+static void abis_link_connected(struct osmo_fsm_inst *fi, uint32_t event, void *data)
+{
+	struct abis_link_fsm_priv *priv = fi->priv;
+	struct gsm_bts *bts = priv->bts;
+	struct gsm_bts_trx *trx;
+	OSMO_ASSERT(event == ABIS_LINK_EV_SIGN_LINK_DOWN);
+
+	/* First remove the OML signalling link */
+	reset_oml_link(bts);
+
+	/* Then iterate over the RSL signalling links */
+	llist_for_each_entry(trx, &bts->trx_list, list) {
+		if (trx->bb_transc.rsl.link) {
+			e1inp_sign_link_destroy(trx->bb_transc.rsl.link);
+			trx->bb_transc.rsl.link = NULL;
+			if (trx == trx->bts->c0)
+				load_timer_stop(trx->bts);
+		} else {
+			/* If we have no rsl_link yet it may mean that lower
+			 * layers are still establishing the socket (TCP, IPA).
+			 * Let's tell it to stop connection establishment since
+			 * we are shutting down. */
+			struct e1inp_line *line = e1inp_line_find(0);
+			if (line)
+				e1inp_ipa_bts_rsl_close_n(line, trx->nr);
+		}
+		/* Note: Here we could send NM_EV_RSL_DOWN to each
+		 * trx->(bb_transc.)mo.fi, but we are starting shutdown of the
+		 * entire BTS anyway through bts_model_abis_close(), so simply
+		 * let bts_shutdown FSM take care of slowly powering down all
+		 * the TRX. It would make sense to send NM_EV_RSL_DOWN only if a
+		 * RSL link TRX!=C0 was going down, in order to selectively stop
+		 * that TRX only. But libosmo-abis expects us to drop the entire
+		 * line when something goes wrong... */
+	}
+	bts_model_abis_close(bts);
+
+	/* We want to try reconnecting to the current BSC at least once before switching to a new one: */
+	priv->reconnect_to_current_bsc = true;
+	osmo_fsm_inst_state_chg(fi, ABIS_LINK_ST_WAIT_RECONNECT, OML_RETRY_TIMER, 0);
+}
+
+static void abis_link_failed_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)
+{
+	struct abis_link_fsm_priv *priv = fi->priv;
+	struct gsm_bts *bts = priv->bts;
+
+	/* None of the configured BSCs was reachable or there was an existing
+	 * OML/RSL connection that broke. Initiate BTS process shut down now. */
+	bts_model_abis_close(bts);
+}
+
+static void abis_link_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data)
+{
+	struct abis_link_fsm_priv *priv = fi->priv;
+	struct gsm_bts *bts = priv->bts;
+
+	OSMO_ASSERT(event == ABIS_LINK_EV_VTY_RM_ADDR);
+
+	if (priv->current_bsc == data) {
+		if (llist_count(&bts->bsc_oml_hosts) <= 1)
+			priv->current_bsc = NULL;
+		else
+			pick_next_bsc(fi);
+	}
+}
+
+int abis_link_fsm_timer_cb(struct osmo_fsm_inst *fi)
+{
+	switch (fi->state) {
+	case ABIS_LINK_ST_WAIT_RECONNECT:
+		osmo_fsm_inst_state_chg(fi, ABIS_LINK_ST_CONNECTING, 0, 0);
+		break;
+	default:
+		OSMO_ASSERT(0);
+	}
+	return 0;
+}
+
+
+static struct osmo_fsm_state abis_link_fsm_states[] = {
+	[ABIS_LINK_ST_WAIT_RECONNECT] = {
+		.name = "WAIT_RECONNECT",
+		.out_state_mask =
+			S(ABIS_LINK_ST_CONNECTING),
+	},
+	[ABIS_LINK_ST_CONNECTING] = {
+		.name = "CONNECTING",
+		.in_event_mask =
+			S(ABIS_LINK_EV_SIGN_LINK_OML_UP) |
+			S(ABIS_LINK_EV_SIGN_LINK_DOWN),
+		.out_state_mask =
+			S(ABIS_LINK_ST_WAIT_RECONNECT) |
+			S(ABIS_LINK_ST_CONNECTED) |
+			S(ABIS_LINK_ST_FAILED),
+		.onenter = abis_link_connecting_onenter,
+		.action = abis_link_connecting,
+	},
+	[ABIS_LINK_ST_CONNECTED] = {
+		.name = "CONNECTED",
+		.in_event_mask =
+			S(ABIS_LINK_EV_SIGN_LINK_DOWN),
+		.out_state_mask =
+			S(ABIS_LINK_ST_WAIT_RECONNECT),
+		.onenter = abis_link_connected_onenter,
+		.action = abis_link_connected,
+	},
+	[ABIS_LINK_ST_FAILED] = {
+		.name = "FAILED",
+		.onenter = abis_link_failed_onenter,
+	},
+};
+
+static struct osmo_fsm abis_link_fsm = {
+	.name = "abis_link",
+	.states = abis_link_fsm_states,
+	.num_states = ARRAY_SIZE(abis_link_fsm_states),
+	.log_subsys = DABIS,
+	.event_names = abis_link_fsm_event_names,
+	.allstate_action = abis_link_allstate,
+	.allstate_event_mask = S(ABIS_LINK_EV_VTY_RM_ADDR),
+	.timer_cb = abis_link_fsm_timer_cb,
+};
+
 int abis_oml_sendmsg(struct msgb *msg)
 {
 	struct gsm_bts *bts = msg->trx->bts;
 
 	if (!bts->oml_link) {
-		llist_add_tail(&msg->list, &bts->oml_queue);
+		LOGP(DABIS, LOGL_INFO, "Drop Tx OML msg, OML link is down\n");
+		msgb_free(msg);
 		return 0;
-	} else {
-		/* osmo-bts uses msg->trx internally, but libosmo-abis uses
-		 * the signalling link at msg->dst */
-		msg->dst = bts->oml_link;
-		return abis_sendmsg(msg);
 	}
-}
 
-static void drain_oml_queue(struct gsm_bts *bts)
-{
-	struct msgb *msg, *msg2;
-
-	llist_for_each_entry_safe(msg, msg2, &bts->oml_queue, list) {
-		/* osmo-bts uses msg->trx internally, but libosmo-abis uses
-		 * the signalling link at msg->dst */
-		llist_del(&msg->list);
-		msg->dst = bts->oml_link;
-		abis_sendmsg(msg);
-	}
+	/* osmo-bts uses msg->trx internally, but libosmo-abis uses
+	 * the signalling link at msg->dst */
+	msg->dst = bts->oml_link;
+	return abis_sendmsg(msg);
 }
 
 int abis_bts_rsl_sendmsg(struct msgb *msg)
@@ -92,32 +364,37 @@ int abis_bts_rsl_sendmsg(struct msgb *msg)
 
 	/* osmo-bts uses msg->trx internally, but libosmo-abis uses
 	 * the signalling link at msg->dst */
-	msg->dst = msg->trx->rsl_link;
+	msg->dst = msg->trx->bb_transc.rsl.link;
 	return abis_sendmsg(msg);
 }
 
 static struct e1inp_sign_link *sign_link_up(void *unit, struct e1inp_line *line,
 					    enum e1inp_sign_type type)
 {
-	struct e1inp_sign_link *sign_link = NULL;
+	struct e1inp_ts *sign_ts;
 	struct gsm_bts_trx *trx;
 	int trx_nr;
 
 	switch (type) {
 	case E1INP_SIGN_OML:
+		sign_ts = e1inp_line_ipa_oml_ts(line);
 		LOGP(DABIS, LOGL_INFO, "OML Signalling link up\n");
-		e1inp_ts_config_sign(&line->ts[E1INP_SIGN_OML-1], line);
-		sign_link = g_bts->oml_link =
-			e1inp_sign_link_create(&line->ts[E1INP_SIGN_OML-1],
-						E1INP_SIGN_OML, g_bts->c0, 255, 0);
+		e1inp_ts_config_sign(sign_ts, line);
+		g_bts->oml_link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_OML,
+							g_bts->c0, IPAC_PROTO_OML, 0);
 		if (clock_gettime(CLOCK_MONOTONIC, &g_bts->oml_conn_established_timestamp) != 0)
 			memset(&g_bts->oml_conn_established_timestamp, 0,
 			       sizeof(g_bts->oml_conn_established_timestamp));
-		drain_oml_queue(g_bts);
-		bts_link_estab(g_bts);
-		break;
+		g_bts->osmo_link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_OSMO,
+							  g_bts->c0, IPAC_PROTO_OSMO, 0);
+		osmo_fsm_inst_dispatch(g_bts->abis_link_fi, ABIS_LINK_EV_SIGN_LINK_OML_UP, NULL);
+		return g_bts->oml_link;
+
+	case E1INP_SIGN_RSL:
+		/* fall through to default to catch TRXn having type = E1INP_SIGN_RSL + n  */
 	default:
 		trx_nr = type - E1INP_SIGN_RSL;
+		sign_ts = e1inp_line_ipa_rsl_ts(line, trx_nr);
 		LOGP(DABIS, LOGL_INFO, "RSL Signalling link for TRX%d up\n",
 			trx_nr);
 		trx = gsm_bts_trx_num(g_bts, trx_nr);
@@ -126,50 +403,19 @@ static struct e1inp_sign_link *sign_link_up(void *unit, struct e1inp_line *line,
 				trx_nr);
 			break;
 		}
-		e1inp_ts_config_sign(&line->ts[type-1], line);
-		sign_link = trx->rsl_link =
-			e1inp_sign_link_create(&line->ts[type-1],
-						E1INP_SIGN_RSL, trx,
-						trx->rsl_tei, 0);
+		e1inp_ts_config_sign(sign_ts, line);
+		trx->bb_transc.rsl.link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_RSL,
+								 trx, trx->bb_transc.rsl.tei, 0);
 		trx_link_estab(trx);
-		break;
+		return trx->bb_transc.rsl.link;
 	}
-
-	return sign_link;
+	return NULL;
 }
 
 static void sign_link_down(struct e1inp_line *line)
 {
-	struct gsm_bts_trx *trx;
 	LOGPIL(line, DABIS, LOGL_ERROR, "Signalling link down\n");
-
-	/* First remove the OML signalling link */
-	if (g_bts->oml_link) {
-		struct timespec now;
-
-		e1inp_sign_link_destroy(g_bts->oml_link);
-
-		/* Log a special notice if the OML connection was dropped relatively quickly. */
-		if (g_bts->oml_conn_established_timestamp.tv_sec != 0 && clock_gettime(CLOCK_MONOTONIC, &now) == 0 &&
-		    g_bts->oml_conn_established_timestamp.tv_sec + OSMO_BTS_OML_CONN_EARLY_DISCONNECT >= now.tv_sec) {
-			LOGP(DABIS, LOGL_FATAL, "OML link was closed early within %" PRIu64 " seconds. "
-			"If this situation persists, please check your BTS and BSC configuration files for errors. "
-			"A common error is a mismatch between unit_id configuration parameters of BTS and BSC.\n",
-			(uint64_t)(now.tv_sec - g_bts->oml_conn_established_timestamp.tv_sec));
-		}
-	}
-	g_bts->oml_link = NULL;
-	memset(&g_bts->oml_conn_established_timestamp, 0, sizeof(g_bts->oml_conn_established_timestamp));
-
-	/* Then iterate over the RSL signalling links */
-	llist_for_each_entry(trx, &g_bts->trx_list, list) {
-		if (trx->rsl_link) {
-			e1inp_sign_link_destroy(trx->rsl_link);
-			trx->rsl_link = NULL;
-		}
-	}
-
-	bts_model_abis_close(g_bts);
+	osmo_fsm_inst_dispatch(g_bts->abis_link_fi, ABIS_LINK_EV_SIGN_LINK_DOWN, NULL);
 }
 
 
@@ -190,6 +436,9 @@ static int sign_link_cb(struct msgb *msg)
 	case E1INP_SIGN_RSL:
 		down_rsl(link->trx, msg);
 		break;
+	case E1INP_SIGN_OSMO:
+		down_osmo(link->trx->bts, msg);
+		break;
 	default:
 		msgb_free(msg);
 		break;
@@ -235,7 +484,7 @@ static int inp_s_cbfn(unsigned int subsys, unsigned int signal,
 
 
 static struct ipaccess_unit bts_dev_info = {
-	.unit_name	= "sysmoBTS",
+	.unit_name	= "osmo-bts",
 	.equipvers	= "",	/* FIXME: read this from hw */
 	.swversion	= PACKAGE_VERSION,
 	.location1	= "",
@@ -265,33 +514,30 @@ void abis_init(struct gsm_bts *bts)
 	osmo_signal_register_handler(SS_L_INPUT, &inp_s_cbfn, bts);
 }
 
-struct e1inp_line *abis_open(struct gsm_bts *bts, char *dst_host,
-			     char *model_name)
+int abis_open(struct gsm_bts *bts, char *model_name)
 {
-	struct e1inp_line *line;
+	struct abis_link_fsm_priv *abis_link_fsm_priv;
 
-	/* patch in various data from VTY and other sources */
-	line_ops.cfg.ipa.addr = dst_host;
-	osmo_get_macaddr(bts_dev_info.mac_addr, "eth0");
-	bts_dev_info.site_id = bts->ip_access.site_id;
-	bts_dev_info.bts_id = bts->ip_access.bts_id;
-	bts_dev_info.unit_name = model_name;
-	if (bts->description)
-		bts_dev_info.unit_name = bts->description;
-	bts_dev_info.location2 = model_name;
+	if (llist_empty(&bts->bsc_oml_hosts)) {
+		LOGP(DABIS, LOGL_FATAL, "No BSC configured, cannot start BTS without knowing BSC OML IP\n");
+		return -EINVAL;
+	}
 
-	line = e1inp_line_find(0);
-	if (line)
-		e1inp_line_get(line); /* We want a new reference for returned line */
-	else
-		line = e1inp_line_create(0, "ipa"); /* already comes with a reference */
-	if (!line)
-		return NULL;
-	e1inp_line_bind_ops(line, &line_ops);
+	bts->abis_link_fi = osmo_fsm_inst_alloc(&abis_link_fsm, bts, NULL, LOGL_DEBUG, "abis_link");
+	OSMO_ASSERT(bts->abis_link_fi);
 
-	/* This will open the OML connection now */
-	if (e1inp_line_update(line) < 0)
-		return NULL;
+	abis_link_fsm_priv = talloc_zero(bts->abis_link_fi, struct abis_link_fsm_priv);
+	OSMO_ASSERT(abis_link_fsm_priv);
+	abis_link_fsm_priv->bts = bts;
+	abis_link_fsm_priv->model_name = model_name;
+	bts->abis_link_fi->priv = abis_link_fsm_priv;
 
-	return line;
+	osmo_fsm_inst_state_chg(bts->abis_link_fi, ABIS_LINK_ST_CONNECTING, 0, 0);
+
+	return 0;
+}
+
+static __attribute__((constructor)) void abis_link_fsm_init(void)
+{
+	OSMO_ASSERT(osmo_fsm_register(&abis_link_fsm) == 0);
 }

src/common/abis_osmo.c

@@ -0,0 +1,135 @@
+/* OSMO extenion link associated to same line as oml_link: */
+
+/* (C) 2021 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
+ * Author: Pau Espin Pedrol <pespin@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 <errno.h>
+
+#include <osmocom/core/msgb.h>
+#include <osmocom/gsm/ipa.h>
+#include <osmocom/gsm/protocol/ipaccess.h>
+
+#include <osmo-bts/bts.h>
+#include <osmo-bts/logging.h>
+#include <osmo-bts/pcu_if.h>
+#include <osmo-bts/pcuif_proto.h>
+#include <osmo-bts/bts_sm.h>
+
+#define OM_HEADROOM_SIZE	128
+
+////////////////////////////////////////
+// OSMO ABIS extensions (PCU)
+///////////////////////////////////////
+
+static struct msgb *abis_osmo_pcu_msgb_alloc(uint8_t msg_type, uint8_t bts_nr, size_t extra_size)
+{
+	struct msgb *msg;
+	struct gsm_pcu_if *pcu_prim;
+	msg = msgb_alloc_headroom(OM_HEADROOM_SIZE + sizeof(struct gsm_pcu_if) + extra_size,
+				  OM_HEADROOM_SIZE, "IPA/ABIS/OSMO");
+	/* Only header is filled, caller is responible for reserving + filling
+	 * message type specific contents: */
+	msgb_put(msg, PCUIF_HDR_SIZE);
+	pcu_prim = (struct gsm_pcu_if *) msgb_data(msg);
+	pcu_prim->msg_type = msg_type;
+	pcu_prim->bts_nr = bts_nr;
+	return msg;
+}
+
+/* Send a OML NM Message from BSC to BTS */
+int abis_osmo_sendmsg(struct gsm_bts *bts, struct msgb *msg)
+{
+	msg->dst = bts->osmo_link;
+	msg->l2h = msg->data;
+	return abis_sendmsg(msg);
+}
+
+
+/* Send IPA/OSMO/PCU extension Abis message from PCU to BSC */
+static int abis_osmo_pcu_sendmsg(struct gsm_bts *bts, struct msgb *msg)
+{
+	ipa_prepend_header_ext(msg, IPAC_PROTO_EXT_PCU);
+	return abis_osmo_sendmsg(bts, msg);
+}
+
+int abis_osmo_pcu_tx_container(struct gsm_bts *bts, const struct gsm_pcu_if_container *container)
+{
+	uint16_t data_length = osmo_load16be(&container->length);
+	struct msgb *msg = abis_osmo_pcu_msgb_alloc(PCU_IF_MSG_CONTAINER, bts->nr, data_length);
+	struct gsm_pcu_if *pcu_prim = (struct gsm_pcu_if *) msgb_data(msg);
+	struct gsm_pcu_if_container *tx_cont = &pcu_prim->u.container;
+
+	msgb_put(msg, sizeof(*tx_cont) + data_length);
+	tx_cont->msg_type = container->msg_type;
+	tx_cont->length = container->length;
+	if (data_length)
+		memcpy(tx_cont->data, container->data, data_length);
+
+	return abis_osmo_pcu_sendmsg(bts, msg);
+}
+
+
+/* incoming IPA/OSMOEXT/PCU Abis message from BSC */
+static int rx_down_osmo_pcu(struct gsm_bts *bts, struct msgb *msg)
+{
+	struct gsm_pcu_if *pcu_prim;
+	if (msgb_l2len(msg) < PCUIF_HDR_SIZE) {
+		LOGP(DPCU, LOGL_ERROR, "ABIS_OSMO_PCU message too short\n");
+		oml_tx_failure_event_rep(&bts->mo, NM_SEVER_MAJOR, OSMO_EVT_MAJ_UKWN_MSG,
+					 "ABIS_OSMO_PCU message too short\n");
+		msgb_free(msg);
+		return -EIO;
+	}
+	pcu_prim = msgb_l2(msg);
+	LOGP(DPCU, LOGL_INFO, "Rx BSC->BTS%d ABIS_OSMO_PCU msg type %u\n",
+	     pcu_prim->bts_nr, pcu_prim->msg_type);
+	/* we patch the bts_nr received from BTS with the bts_nr we used to set up in the local PCU */
+	pcu_prim->bts_nr = bts->nr;
+	/* Trim Abis lower layers: */
+	msgb_pull_to_l2(msg);
+	/* we simply forward it to PCUIF: */
+	return pcu_sock_send(msg);
+}
+
+/* incoming IPA/OSMO extension Abis message from BSC */
+int down_osmo(struct gsm_bts *bts, struct msgb *msg)
+{
+	uint8_t *type;
+
+	if (msgb_l2len(msg) < 1) {
+		oml_tx_failure_event_rep(&bts->mo, NM_SEVER_MAJOR, OSMO_EVT_MAJ_UKWN_MSG,
+					 "OSMO message too short\n");
+		msgb_free(msg);
+		return -EIO;
+	}
+
+	type = msgb_l2(msg);
+	msg->l2h = type + 1;
+
+	switch (*type) {
+	case IPAC_PROTO_EXT_PCU:
+		return rx_down_osmo_pcu(bts, msg);
+	default:
+		oml_tx_failure_event_rep(&bts->mo, NM_SEVER_MAJOR, OSMO_EVT_MAJ_UKWN_MSG,
+					 "OSMO message unknown extension %u\n", *type);
+		msgb_free(msg);
+		return -EIO;
+	}
+}

src/common/amr.c

@@ -6,6 +6,85 @@
 #include <osmo-bts/logging.h>
 #include <osmo-bts/amr.h>
 
+/* Reasonable defaults for AMR-FR and AMR-HR rate configuration.
+ * The values are taken from 3GPP TS 51.010-1 (version 13.11.0).
+ * See 14.2.19.4.1 and 14.2.20.4.1 for AMR-FR and AMR-HR, respectively.
+ *
+ *                   ^ C/I (dB)             |  FR  /  HR  |
+ *            |      |
+ *            |      |
+ *   MODE4    |      |
+ *          = |  ----+----  THR_MX_Up(3)    | 20.5 / 18.0 |
+ *          | |      |
+ *          | =  ----+----  THR_MX_Dn(4)    | 18.5 / 16.0 |
+ *   MODE3  |        |
+ *          | =  ----+----  THR_MX_Up(2)    | 14.5 / 14.0 |
+ *          | |      |
+ *          = |  ----+----  THR_MX_Dn(3)    | 12.5 / 12.0 |
+ *   MODE2    |      |
+ *          = |  ----+----  THR_MX_Up(1)    |  8.5 / 10.0 |
+ *          | |      |
+ *          | =  ----+----  THR_MX_Dn(2)    |  6.5 /  8.0 |
+ *   MODE1  |        |
+ *          |        |
+ *          |        |
+ */
+static const struct gsm48_multi_rate_conf amr_fr_mr_cfg_def = {
+	.m4_75 = 1,
+	.m5_90 = 1,
+	.m7_95 = 1,
+	.m12_2 = 1,
+};
+static const struct amr_mode amr_fr_bts_mode_def[] = {
+	{
+		.mode = 0, /* 4.75k */
+		.threshold = 13, /* THR_MX_Dn(2): 6.5 dB */
+		.hysteresis = 4, /* THR_MX_Up(1): 8.5 dB */
+	},
+	{
+		.mode = 2, /* 5.90k */
+		.threshold = 25, /* THR_MX_Dn(3): 12.5 dB */
+		.hysteresis = 4, /* THR_MX_Up(2): 14.5 dB */
+	},
+	{
+		.mode = 5, /* 7.95k */
+		.threshold = 37, /* THR_MX_Dn(4): 18.5 dB */
+		.hysteresis = 4, /* THR_MX_Up(3): 20.5 dB */
+	},
+	{
+		.mode = 7, /* 12.2k */
+		/* this is the last mode, so no threshold */
+	},
+};
+
+static const struct gsm48_multi_rate_conf amr_hr_mr_cfg_def = {
+	.m4_75 = 1,
+	.m5_90 = 1,
+	.m6_70 = 1,
+	.m7_95 = 1,
+};
+static const struct amr_mode amr_hr_bts_mode_def[] = {
+	{
+		.mode = 0, /* 4.75k */
+		.threshold = 16, /* THR_MX_Dn(2):  8.0 dB */
+		.hysteresis = 4, /* THR_MX_Up(1): 10.0 dB */
+	},
+	{
+		.mode = 2, /* 5.90k */
+		.threshold = 24, /* THR_MX_Dn(3): 12.0 dB */
+		.hysteresis = 4, /* THR_MX_Up(2): 14.0 dB */
+	},
+	{
+		.mode = 3, /* 6.70k */
+		.threshold = 32, /* THR_MX_Dn(4): 16.0 dB */
+		.hysteresis = 4, /* THR_MX_Up(3): 18.0 dB */
+	},
+	{
+		.mode = 5, /* 7.95k */
+		/* this is the last mode, so no threshold */
+	},
+};
+
 void amr_log_mr_conf(int ss, int logl, const char *pfx,
 		     struct amr_multirate_conf *amr_mrc)
 {
@@ -16,9 +95,9 @@ void amr_log_mr_conf(int ss, int logl, const char *pfx,
 
 	for (i = 0; i < amr_mrc->num_modes; i++)
 		LOGPC(ss, logl, ", mode[%u] = %u/%u/%u",
-			i, amr_mrc->bts_mode[i].mode,
-			amr_mrc->bts_mode[i].threshold,
-			amr_mrc->bts_mode[i].hysteresis);
+			i, amr_mrc->mode[i].mode,
+			amr_mrc->mode[i].threshold,
+			amr_mrc->mode[i].hysteresis);
 	LOGPC(ss, logl, "\n");
 }
 
@@ -27,7 +106,7 @@ static inline int get_amr_mode_idx(const struct amr_multirate_conf *amr_mrc,
 {
 	unsigned int i;
 	for (i = 0; i < amr_mrc->num_modes; i++) {
-		if (amr_mrc->bts_mode[i].mode == cmi)
+		if (amr_mrc->mode[i].mode == cmi)
 			return i;
 	}
 	return -EINVAL;
@@ -117,23 +196,26 @@ int amr_parse_mr_conf(struct amr_multirate_conf *amr_mrc,
 
 	for (i = 0; i < 8; i++) {
 		if (mr_conf[1] & (1 << i)) {
-			amr_mrc->bts_mode[j++].mode = i;
+			amr_mrc->mode[j++].mode = i;
 		}
 	}
 
+	/* skip the first two octets of the IE */
+	mr_conf += 2;
+
 	if (num_codecs >= 2) {
-		amr_mrc->bts_mode[0].threshold = mr_conf[1] & 0x3F;
-		amr_mrc->bts_mode[0].hysteresis = mr_conf[2] >> 4;
+		amr_mrc->mode[0].threshold = mr_conf[0] & 0x3F;
+		amr_mrc->mode[0].hysteresis = mr_conf[1] >> 4;
 	}
 	if (num_codecs >= 3) {
-		amr_mrc->bts_mode[1].threshold =
-			((mr_conf[2] & 0xF) << 2) | (mr_conf[3] >> 6);
-		amr_mrc->bts_mode[1].hysteresis = (mr_conf[3] >> 2) & 0xF;
+		amr_mrc->mode[1].threshold =
+			((mr_conf[1] & 0xF) << 2) | (mr_conf[2] >> 6);
+		amr_mrc->mode[1].hysteresis = (mr_conf[2] >> 2) & 0xF;
 	}
 	if (num_codecs >= 4) {
-		amr_mrc->bts_mode[2].threshold =
-			((mr_conf[3] & 0x3) << 4) | (mr_conf[4] >> 4);
-		amr_mrc->bts_mode[2].hysteresis = mr_conf[4] & 0xF;
+		amr_mrc->mode[2].threshold =
+			((mr_conf[2] & 0x3) << 4) | (mr_conf[3] >> 4);
+		amr_mrc->mode[2].hysteresis = mr_conf[3] & 0xF;
 	}
 
 	return num_codecs;
@@ -171,3 +253,26 @@ unsigned int amr_get_initial_mode(struct gsm_lchan *lchan)
 		}
 	}
 }
+
+void amr_init_mr_conf_def(struct gsm_lchan *lchan)
+{
+	const struct gsm48_multi_rate_conf *mr_cfg;
+	const struct amr_mode *bts_mode;
+	unsigned int num_modes;
+
+	if (lchan->type == GSM_LCHAN_TCH_F) {
+		num_modes = ARRAY_SIZE(amr_fr_bts_mode_def);
+		bts_mode = &amr_fr_bts_mode_def[0];
+		mr_cfg = &amr_fr_mr_cfg_def;
+	} else {
+		num_modes = ARRAY_SIZE(amr_hr_bts_mode_def);
+		bts_mode = &amr_hr_bts_mode_def[0];
+		mr_cfg = &amr_hr_mr_cfg_def;
+	}
+
+	memcpy(lchan->tch.amr_mr.gsm48_ie, mr_cfg,
+	       sizeof(lchan->tch.amr_mr.gsm48_ie));
+	memcpy(&lchan->tch.amr_mr.mode[0], &bts_mode[0],
+	       sizeof(lchan->tch.amr_mr.mode));
+	lchan->tch.amr_mr.num_modes = num_modes;
+}

src/common/asci.c

@@ -0,0 +1,211 @@
+/* ASCI (VGCS/VBS) related common code */
+
+/* (C) 2023 by Harald Welte <laforge@osmocom.org>
+ *
+ * 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 <stdlib.h>
+#include <stdint.h>
+#include <errno.h>
+
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/rsl.h>
+
+#include <osmo-bts/bts.h>
+#include <osmo-bts/bts_model.h>
+#include <osmo-bts/rsl.h>
+#include <osmo-bts/logging.h>
+#include <osmo-bts/l1sap.h>
+#include <osmo-bts/asci.h>
+
+static int tx_vgcs_ul_grant(struct gsm_lchan *lchan)
+{
+	struct gsm0408_vgcs_ul_grant ul_grant;
+	struct gsm_time gt;
+	struct msgb *msg;
+
+	gsm_fn2gsmtime(&gt, lchan->asci.fn);
+
+	/* build the RR VGCS UPLINK GRANT message as per TS 44.018 Section 9.1.49 */
+	ul_grant = (struct gsm0408_vgcs_ul_grant) {
+		.hdr = {
+			.proto_discr = GSM48_PDISC_RR,
+			.msg_type = GSM48_MT_RR_VGCS_UPL_GRANT,
+		},
+		.req_ref = {
+			.ra = lchan->asci.ref,
+			.t1 = gt.t1,
+			.t2 = gt.t2,
+			.t3_low = gt.t3 & 7,
+			.t3_high = gt.t3 >> 3,
+		},
+		.ta = lchan->ta_ctrl.current,
+	};
+
+	/* Wrap it in a RSL UNITDATA REQUEST */
+	msg = rsl_rll_simple(RSL_MT_UNIT_DATA_REQ, gsm_lchan2chan_nr(lchan), 0x00, 0);
+	msg->l3h = msg->tail; /* emulate rsl_rx_rll() behaviour */
+	msgb_tl16v_put(msg, RSL_IE_L3_INFO, sizeof(ul_grant), (uint8_t *) &ul_grant);
+
+	/* send it towards MS, just like a RSL message from the BSC */
+	return lapdm_rslms_recvmsg(msg, &lchan->lapdm_ch);
+}
+
+/* timer call-back for T3115 (VGCS UPLINK GRANT re-transmit) */
+static void vgcs_t3115_cb(void *data)
+{
+	struct gsm_lchan *lchan = data;
+	struct gsm_bts *bts = lchan->ts->trx->bts;
+
+	LOGPLCHAN(lchan, DASCI, LOGL_INFO, "T3115 timeout (%d resends left)\n",
+		  bts->ny2 - lchan->asci.vgcs_ul_grant_count);
+
+	if (lchan->state != LCHAN_S_ACTIVE) {
+		LOGPLCHAN(lchan, DASCI, LOGL_NOTICE, "is not active. It is in state %s. Ignoring\n",
+			  gsm_lchans_name(lchan->state));
+		return;
+	}
+
+	if (lchan->asci.vgcs_ul_grant_count >= bts->ny2) {
+		lchan->asci.vgcs_ul_grant_count = 0;
+		LOGPLCHAN(lchan, DASCI, LOGL_NOTICE, "NY2 reached, sending CONNection FAILure to BSC.\n");
+		rsl_tx_conn_fail(lchan, RSL_ERR_TALKER_ACC_FAIL);
+		lchan->asci.talker_active = VGCS_TALKER_NONE;
+		return;
+	}
+
+	tx_vgcs_ul_grant(lchan);
+	lchan->asci.vgcs_ul_grant_count++;
+	osmo_timer_schedule(&lchan->asci.t3115, 0, bts->t3115_ms * 1000);
+}
+
+/* Received random access on dedicated channel. */
+void vgcs_rach(struct gsm_lchan *lchan, uint8_t ra, uint8_t acc_delay, uint32_t fn)
+{
+	LOGPLCHAN(lchan, DASCI, LOGL_NOTICE, "VGCS RACH on dedicated channel type %s received with "
+		  "TA=%u, ref=%u\n", gsm_lchant_name(lchan->type), acc_delay, ra);
+
+	if (ra == 0x25) { /* See TS 44.018 Table 9.1.45.1 */
+		/* Listener Detection (TS 48.058 Section 4.14) */
+		if (!lchan->asci.listener_detected) {
+			rsl_tx_listener_det(lchan, &acc_delay);
+			lchan->asci.listener_detected = true;
+		}
+	} else {
+		/* Talker Detection (TS 48.058 Section 4.13) */
+		struct gsm_bts *bts = lchan->ts->trx->bts;
+
+		/* Talker detection on group channels only */
+		if (!rsl_chan_rt_is_vgcs(lchan->rsl_chan_rt))
+			return;
+
+		if (lchan->asci.talker_active != VGCS_TALKER_NONE) {
+			LOGPLCHAN(lchan, DASCI, LOGL_DEBUG, "Ignoring RACH, there is an active talker already.\n");
+			return;
+		}
+
+		/* Set timing advance, power level and activate SACCH */
+		lchan->ta_ctrl.current = acc_delay;
+		lchan->ms_power_ctrl.current = lchan->ms_power_ctrl.max;
+		lchan->want_dl_sacch_active = true;
+
+		/* Stop RACH detection, wait for valid frame */
+		lchan->asci.talker_active = VGCS_TALKER_WAIT_FRAME;
+		if (l1sap_uplink_access(lchan, false) != 0) {
+			LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to deactivate uplink access after TALKER DET.\n");
+			rsl_tx_conn_fail(lchan, RSL_ERR_EQUIPMENT_FAIL);
+			lchan->asci.talker_active = VGCS_TALKER_NONE;
+			return;
+		}
+
+		lchan->asci.ref = ra;
+		lchan->asci.fn = fn;
+
+		/* Send TALKER DETECT via RSL to BSC */
+		rsl_tx_talker_det(lchan, &acc_delay);
+
+		/* Send VGCS UPLINK GRANT */
+		lchan->asci.vgcs_ul_grant_count = 1;
+		tx_vgcs_ul_grant(lchan);
+
+		/* Start T3115 */
+		LOGPLCHAN(lchan, DASCI, LOGL_DEBUG, "Starting T3115 with %u ms\n", bts->t3115_ms);
+		lchan->asci.t3115.cb = vgcs_t3115_cb;
+		lchan->asci.t3115.data = lchan;
+		osmo_timer_schedule(&lchan->asci.t3115, 0, bts->t3115_ms * 1000);
+	}
+}
+
+/* Received channel activation. */
+void vgcs_lchan_activate(struct gsm_lchan *lchan)
+{
+	LOGPLCHAN(lchan, DASCI, LOGL_INFO, "Channel is activated.\n");
+	if (l1sap_uplink_access(lchan, true) != 0) {
+		LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to activate uplink access after channel activation.\n");
+		rsl_tx_conn_fail(lchan, RSL_ERR_EQUIPMENT_FAIL);
+	}
+}
+
+/* Received channel reactivation. (for assignment) */
+void vgcs_lchan_react(struct gsm_lchan *lchan)
+{
+	LOGPLCHAN(lchan, DASCI, LOGL_INFO, "Channel is activated for assignment.\n");
+	lchan->asci.talker_active = VGCS_TALKER_WAIT_FRAME;
+	if (l1sap_uplink_access(lchan, false) != 0) {
+		LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to deactivate uplink access for assignment.\n");
+		rsl_tx_conn_fail(lchan, RSL_ERR_EQUIPMENT_FAIL);
+	}
+	radio_link_timeout_reset(lchan);
+}
+
+/* Received first valid data frame on dedicated channel. */
+void vgcs_talker_frame(struct gsm_lchan *lchan)
+{
+	LOGPLCHAN(lchan, DASCI, LOGL_INFO, "First valid frame detected, talker now active.\n");
+	osmo_timer_del(&lchan->asci.t3115);
+	lchan->asci.talker_active = VGCS_TALKER_ACTIVE;
+	radio_link_timeout_reset(lchan);
+}
+
+/* Release VGCS Talker state. */
+void vgcs_talker_reset(struct gsm_lchan *lchan, bool ul_access)
+{
+	if (lchan->asci.talker_active == VGCS_TALKER_NONE)
+		return;
+
+	LOGPLCHAN(lchan, DASCI, LOGL_INFO, "Uplink released, no talker.\n");
+
+	/* Stop T3115 */
+	osmo_timer_del(&lchan->asci.t3115);
+
+	/* Talker released. */
+	lchan->asci.talker_active = VGCS_TALKER_NONE;
+	if (ul_access) {
+		if (l1sap_uplink_access(lchan, true) != 0) {
+			LOGPLCHAN(lchan, DASCI, LOGL_ERROR,
+				  "Failed to activate uplink access after uplink became free.\n");
+			rsl_tx_conn_fail(lchan, RSL_ERR_EQUIPMENT_FAIL);
+		}
+	}
+}
+
+/* Release VGCS Listener state. */
+void vgcs_listener_reset(struct gsm_lchan *lchan)
+{
+	lchan->asci.listener_detected = false;
+}

src/common/bts.c

@@ -13,7 +13,7 @@
  * 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.
+ * 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/>.
@@ -44,8 +44,10 @@
 #include <osmo-bts/abis.h>
 #include <osmo-bts/bts.h>
 #include <osmo-bts/bts_model.h>
+#include <osmo-bts/bts_sm.h>
 #include <osmo-bts/dtx_dl_amr_fsm.h>
 #include <osmo-bts/pcuif_proto.h>
+#include <osmo-bts/pcu_if.h>
 #include <osmo-bts/rsl.h>
 #include <osmo-bts/oml.h>
 #include <osmo-bts/signal.h>
@@ -54,17 +56,15 @@
 #include <osmo-bts/bts_shutdown_fsm.h>
 #include <osmo-bts/nm_common_fsm.h>
 #include <osmo-bts/power_control.h>
+#include <osmo-bts/osmux.h>
+#include <osmo-bts/notification.h>
 
+#define MAX_TA_DEF	 63 /* default max Timing Advance value */
 #define MIN_QUAL_RACH	 50 /* minimum link quality (in centiBels) for Access Bursts */
 #define MIN_QUAL_NORM	 -5 /* minimum link quality (in centiBels) for Normal Bursts */
 
 static void bts_update_agch_max_queue_length(struct gsm_bts *bts);
 
-struct gsm_network bts_gsmnet = {
-	.bts_list = { &bts_gsmnet.bts_list, &bts_gsmnet.bts_list },
-	.num_bts = 0,
-};
-
 void *tall_bts_ctx;
 
 /* Table 3.1 TS 04.08: Values of parameter S */
@@ -90,17 +90,29 @@ static int bts_signal_cbfn(unsigned int subsys, unsigned int signal,
 static const struct rate_ctr_desc bts_ctr_desc[] = {
 	[BTS_CTR_PAGING_RCVD] =		{"paging:rcvd", "Received paging requests (Abis)"},
 	[BTS_CTR_PAGING_DROP] =		{"paging:drop", "Dropped paging requests (Abis)"},
+	[BTS_CTR_PAGING_DROP_PS] =	{"paging:drop-ps", "Dropped paging requests (PS/PCU)"},
+	[BTS_CTR_PAGING_CONG] =		{"paging:cong", "Paging congestion detected (Abis)"},
 	[BTS_CTR_PAGING_SENT] =		{"paging:sent", "Sent paging requests (Um)"},
 
 	[BTS_CTR_RACH_RCVD] =		{"rach:rcvd", "Received RACH requests (Um)"},
 	[BTS_CTR_RACH_DROP] =		{"rach:drop", "Dropped RACH requests (Um)"},
 	[BTS_CTR_RACH_HO] =		{"rach:handover", "Received RACH requests (Handover)"},
+	[BTS_CTR_RACH_VGCS] =		{"rach:vgcs", "Received RACH requests (VGCS)"},
 	[BTS_CTR_RACH_CS] =		{"rach:cs", "Received RACH requests (CS/Abis)"},
 	[BTS_CTR_RACH_PS] =		{"rach:ps", "Received RACH requests (PS/PCU)"},
 
 	[BTS_CTR_AGCH_RCVD] =		{"agch:rcvd", "Received AGCH requests (Abis)"},
 	[BTS_CTR_AGCH_SENT] =		{"agch:sent", "Sent AGCH requests (Abis)"},
 	[BTS_CTR_AGCH_DELETED] =	{"agch:delete", "Sent AGCH DELETE IND (Abis)"},
+
+	[BTS_CTR_RTP_RX_TOTAL] =	{"rtp:rx:total", "Total number of received RTP packets"},
+	[BTS_CTR_RTP_RX_MARKER] =	{"rtp:rx:marker", "Number of received RTP packets with marker bit set"},
+	[BTS_CTR_RTP_RX_DROP_PREEN] =	{"rtp:rx:drop:preen", "Total number of received RTP packets dropped during preening"},
+	[BTS_CTR_RTP_RX_DROP_LOOPBACK] = {"rtp:rx:drop:loopback", "Total number of received RTP packets dropped during loopback"},
+	[BTS_CTR_RTP_RX_DROP_OVERFLOW] = {"rtp:rx:drop:overflow", "Total number of received RTP packets dropped during DL queue overflow"},
+	[BTS_CTR_RTP_RX_DROP_V110_DEC] = {"rtp:rx:drop:v110_dec", "Total number of received RTP packets dropped during V.110 decode"},
+	[BTS_CTR_RTP_TX_TOTAL] =	{"rtp:tx:total", "Total number of transmitted RTP packets"},
+	[BTS_CTR_RTP_TX_MARKER] =	{"rtp:tx:marker", "Number of transmitted RTP packets with marker bit set"},
 };
 static const struct rate_ctr_group_desc bts_ctrg_desc = {
 	"bts",
@@ -126,7 +138,7 @@ static const struct rate_ctr_group_desc cbch_ctrg_desc = {
 	cbch_ctr_desc
 };
 
-static struct osmo_tdef bts_T_defs[] = {
+struct osmo_tdef bts_T_defs[] = {
 	/* T-1: FIXME: Ideally should be dynamically calculated per trx at
 	 * shutdown start based on params below, and highest trx value taken:
 	 * + VTY's power-ramp step-interval.
@@ -141,7 +153,11 @@ static struct osmo_tdef bts_T_defs[] = {
 	{}
 };
 
-static const uint8_t bts_nse_timer_default[] = { 3, 3, 3, 3, 30, 3, 10 };
+struct osmo_tdef abis_T_defs[] = {
+	{ .T=-15, .default_val=0, .unit=OSMO_TDEF_MS, .desc="Time to wait between Channel Activation and dispatching a cached early Immediate Assignment" },
+	{}
+};
+
 static const uint8_t bts_cell_timer_default[] =
 				{ 3, 3, 3, 3, 3, 10, 3, 10, 3, 10, 3 };
 static const struct gprs_rlc_cfg rlc_cfg_default = {
@@ -199,32 +215,46 @@ const char *btsatttr2str(enum bts_attribute v)
 const struct value_string bts_impl_flag_desc[] = {
 	{ BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP,	"DSP/HW based MS Power Control Loop" },
 	{ BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB,	"Measurement and Payload data combined" },
+	{ BTS_INTERNAL_FLAG_NM_RCHANNEL_DEPENDS_RCARRIER, "OML RadioChannel MO depends on RadioCarrier MO" },
+	{ BTS_INTERNAL_FLAG_INTERF_MEAS,	"Uplink interference measurements" },
 	{ 0, NULL }
 };
 
+/* Ensure that all BTS_INTERNAL_FLAG_* entries are present in bts_impl_flag_desc[] */
+osmo_static_assert(ARRAY_SIZE(bts_impl_flag_desc) == _BTS_INTERNAL_FLAG_NUM + 1, _bts_impl_flag_desc);
+
 static int gsm_bts_talloc_destructor(struct gsm_bts *bts)
 {
-	if (bts->site_mgr.mo.fi) {
-		osmo_fsm_inst_free(bts->site_mgr.mo.fi);
-		bts->site_mgr.mo.fi = NULL;
-	}
 	if (bts->mo.fi) {
 		osmo_fsm_inst_free(bts->mo.fi);
 		bts->mo.fi = NULL;
 	}
+	if (bts->shutdown_fi) {
+		osmo_fsm_inst_free(bts->shutdown_fi);
+		bts->shutdown_fi = NULL;
+	}
+
+	bts_osmux_release(bts);
+
+	llist_del(&bts->list);
+	g_bts_sm->num_bts--;
 	return 0;
 }
 
-struct gsm_bts *gsm_bts_alloc(void *ctx, uint8_t bts_num)
+struct gsm_bts *gsm_bts_alloc(struct gsm_bts_sm *bts_sm, uint8_t bts_num)
 {
-	struct gsm_bts *bts = talloc_zero(ctx, struct gsm_bts);
-	int i;
+	struct gsm_bts *bts = talloc_zero(bts_sm, struct gsm_bts);
 
 	if (!bts)
 		return NULL;
 
 	talloc_set_destructor(bts, gsm_bts_talloc_destructor);
 
+	/* add to list of BTSs */
+	llist_add_tail(&bts->list, &bts_sm->bts_list);
+	g_bts_sm->num_bts++;
+
+	bts->site_mgr = bts_sm;
 	bts->nr = bts_num;
 	bts->num_trx = 0;
 	INIT_LLIST_HEAD(&bts->trx_list);
@@ -232,36 +262,24 @@ struct gsm_bts *gsm_bts_alloc(void *ctx, uint8_t bts_num)
 
 	bts->T_defs = bts_T_defs;
 	osmo_tdefs_reset(bts->T_defs);
+	osmo_tdefs_reset(abis_T_defs);
 	bts->shutdown_fi = osmo_fsm_inst_alloc(&bts_shutdown_fsm, bts, bts,
 					       LOGL_INFO, NULL);
 	osmo_fsm_inst_update_id_f(bts->shutdown_fi, "bts%d", bts->nr);
 
-	bts->site_mgr.mo.fi = osmo_fsm_inst_alloc(&nm_bts_sm_fsm, bts, &bts->site_mgr,
-						  LOGL_INFO, "bts_sm");
-	gsm_mo_init(&bts->site_mgr.mo, bts, NM_OC_SITE_MANAGER,
-		    0xff, 0xff, 0xff);
-
+	/* NM BTS */
 	bts->mo.fi = osmo_fsm_inst_alloc(&nm_bts_fsm, bts, bts,
 					 LOGL_INFO, NULL);
 	osmo_fsm_inst_update_id_f(bts->mo.fi, "bts%d", bts->nr);
 	gsm_mo_init(&bts->mo, bts, NM_OC_BTS, bts->nr, 0xff, 0xff);
 
-	for (i = 0; i < ARRAY_SIZE(bts->gprs.nsvc); i++) {
-		bts->gprs.nsvc[i].bts = bts;
-		bts->gprs.nsvc[i].id = i;
-		gsm_mo_init(&bts->gprs.nsvc[i].mo, bts, NM_OC_GPRS_NSVC,
-				bts->nr, i, 0xff);
-	}
-	memcpy(&bts->gprs.nse.timer, bts_nse_timer_default,
-		sizeof(bts->gprs.nse.timer));
-	gsm_mo_init(&bts->gprs.nse.mo, bts, NM_OC_GPRS_NSE,
-			bts->nr, 0xff, 0xff);
-	memcpy(&bts->gprs.cell.timer, bts_cell_timer_default,
-		sizeof(bts->gprs.cell.timer));
-	gsm_mo_init(&bts->gprs.cell.mo, bts, NM_OC_GPRS_CELL,
-			bts->nr, 0xff, 0xff);
-	memcpy(&bts->gprs.cell.rlc_cfg, &rlc_cfg_default,
-		sizeof(bts->gprs.cell.rlc_cfg));
+	/* NM GPRS CELL */
+	bts->gprs.cell.mo.fi = osmo_fsm_inst_alloc(&nm_gprs_cell_fsm, bts, &bts->gprs.cell,
+						  LOGL_INFO, NULL);
+	osmo_fsm_inst_update_id_f(bts->gprs.cell.mo.fi, "gprs_cell%d-0", bts->nr);
+	gsm_mo_init(&bts->gprs.cell.mo, bts, NM_OC_GPRS_CELL, bts->nr, 0, 0xff);
+	memcpy(&bts->gprs.cell.rlc_cfg, &rlc_cfg_default, sizeof(bts->gprs.cell.rlc_cfg));
+	memcpy(&bts->gprs.cell.timer, bts_cell_timer_default, sizeof(bts->gprs.cell.timer));
 
 	/* create our primary TRX. It will be initialized during bts_init() */
 	bts->c0 = gsm_bts_trx_alloc(bts);
@@ -277,14 +295,14 @@ struct gsm_bts *gsm_bts_alloc(void *ctx, uint8_t bts_num)
 	return bts;
 }
 
-struct gsm_bts *gsm_bts_num(const struct gsm_network *net, int num)
+struct gsm_bts *gsm_bts_num(const struct gsm_bts_sm *bts_sm, int num)
 {
 	struct gsm_bts *bts;
 
-	if (num >= net->num_bts)
+	if (num >= bts_sm->num_bts)
 		return NULL;
 
-	llist_for_each_entry(bts, &net->bts_list, list) {
+	llist_for_each_entry(bts, &bts_sm->bts_list, list) {
 		if (bts->nr == num)
 			return bts;
 	}
@@ -300,19 +318,14 @@ int bts_init(struct gsm_bts *bts)
 	static int initialized = 0;
 	void *tall_rtp_ctx;
 
-	/* add to list of BTSs */
-	llist_add_tail(&bts->list, &bts_gsmnet.bts_list);
-
 	bts->band = GSM_BAND_1800;
 
 	INIT_LLIST_HEAD(&bts->agch_queue.queue);
 	bts->agch_queue.length = 0;
 
 	bts->ctrs = rate_ctr_group_alloc(bts, &bts_ctrg_desc, bts->nr);
-	if (!bts->ctrs) {
-		llist_del(&bts->list);
+	if (!bts->ctrs)
 		return -1;
-	}
 
 	/* enable management with default levels,
 	 * raise threshold to GSM_BTS_AGCH_QUEUE_THRESH_LEVEL_DISABLE to
@@ -329,57 +342,67 @@ int bts_init(struct gsm_bts *bts)
 	bts->rtp_port_range_end = 17407;
 	bts->rtp_port_range_next = bts->rtp_port_range_start;
 	bts->rtp_ip_dscp = -1;
+	bts->rtp_priority = -1;
+	bts->emit_hr_rfc5993 = true;
 
 	/* Default (fall-back) MS/BS Power control parameters */
-	bts->bs_dpc_params = power_ctrl_params_def;
-	bts->ms_dpc_params = power_ctrl_params_def;
+	power_ctrl_params_def_reset(&bts->bs_dpc_params, true);
+	power_ctrl_params_def_reset(&bts->ms_dpc_params, false);
 
 	/* configurable via OML */
+	bts->bsic = 0xff; /* invalid value, guarded by bsc_configured=false */
+	bts->bsic_configured = false;
 	bts->load.ccch.load_ind_period = 112;
-	load_timer_start(bts);
 	bts->rtp_jitter_buf_ms = 100;
-	bts->max_ta = 63;
+	bts->max_ta = MAX_TA_DEF;
 	bts->ny1 = 4;
+	bts->ny2 = 4;
 	bts->t3105_ms = 300;
+	bts->t3115_ms = 300;
 	bts->min_qual_rach = MIN_QUAL_RACH;
 	bts->min_qual_norm = MIN_QUAL_NORM;
 	bts->max_ber10k_rach = 1707; /* 7 of 41 bits is Eb/N0 of 0 dB = 0.1707 */
 	bts->pcu.sock_path = talloc_strdup(bts, PCU_SOCK_DEFAULT);
-	for (i = 0; i < ARRAY_SIZE(bts->t200_ms); i++)
-		bts->t200_ms[i] = oml_default_t200_ms[i];
+	bts->pcu.sock_wqueue_len_max = BTS_PCU_SOCK_WQUEUE_LEN_DEFAULT;
+	for (i = 0; i < ARRAY_SIZE(bts->t200_fn); i++)
+		bts->t200_fn[i] = oml_default_t200_fn[i];
 
 	/* default RADIO_LINK_TIMEOUT */
 	bts->radio_link_timeout.oml = 32;
 	bts->radio_link_timeout.current = bts->radio_link_timeout.oml;
 
-	/* Start with the site manager */
-	oml_mo_state_init(&bts->site_mgr.mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED);
+	/* Start with the BTS */
 	oml_mo_state_init(&bts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED);
-
-	/* set BTS attr to dependency */
-	oml_mo_state_init(&bts->gprs.nse.mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY);
-	oml_mo_state_init(&bts->gprs.cell.mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY);
-	oml_mo_state_init(&bts->gprs.nsvc[0].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY);
-	oml_mo_state_init(&bts->gprs.nsvc[1].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE);
+	oml_mo_state_init(&bts->gprs.cell.mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED);
 
 	/* allocate a talloc pool for ORTP to ensure it doesn't have to go back
 	 * to the libc malloc all the time */
 	tall_rtp_ctx = talloc_pool(tall_bts_ctx, 262144);
 	osmo_rtp_init(tall_rtp_ctx);
 
-	/* features implemented in 'common', available for all models */
+	/* Osmux */
+	rc = bts_osmux_init(bts);
+	if (rc < 0)
+		return rc;
+
+	/* features implemented in 'common', available for all models,
+	 * order alphabetically */
+	osmo_bts_set_feature(bts->features, BTS_FEAT_ABIS_OSMO_PCU);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_CCN);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_DYN_TS_SDCCH8);
 	osmo_bts_set_feature(bts->features, BTS_FEAT_ETWS_PN);
 	osmo_bts_set_feature(bts->features, BTS_FEAT_IPV6_NSVC);
+	osmo_bts_set_feature(bts->features, BTS_FEAT_PAGING_COORDINATION);
+
+	/* Maximum TA supported by the PHY (can be overridden by PHY specific code) */
+	bts->support.max_ta = MAX_TA_DEF;
 
 	rc = bts_model_init(bts);
-	if (rc < 0) {
-		llist_del(&bts->list);
+	if (rc < 0)
 		return rc;
-	}
 
 	/* TRX0 was allocated early during gsm_bts_alloc, not later through VTY */
-	bts_trx_init(bts->c0);
-	bts_gsmnet.num_bts++;
+	bts_model_trx_init(bts->c0);
 
 	if (!initialized) {
 		osmo_signal_register_handler(SS_GLOBAL, bts_signal_cbfn, NULL);
@@ -396,7 +419,10 @@ int bts_init(struct gsm_bts *bts)
 	bts->smscb_queue_tgt_len = 2;
 	bts->smscb_queue_hyst = 2;
 
-	INIT_LLIST_HEAD(&bts->oml_queue);
+	bts->asci.pos_nch = -ENOTSUP;
+	INIT_LLIST_HEAD(&bts->asci.notifications);
+
+	INIT_LLIST_HEAD(&bts->bsc_oml_hosts);
 
 	/* register DTX DL FSM */
 	rc = osmo_fsm_register(&dtx_dl_amr_fsm);
@@ -413,97 +439,17 @@ int bts_init(struct gsm_bts *bts)
 /* main link is established, send status report */
 int bts_link_estab(struct gsm_bts *bts)
 {
-	int i, j;
+	LOGP(DOML, LOGL_INFO, "Main link established, sending NM Status\n");
 
-	LOGP(DSUM, LOGL_INFO, "Main link established, sending NM Status.\n");
-
-	/* BTS SITE MGR becomes Offline (tx SW ACT Report), BTS is DEPENDENCY */
-	osmo_fsm_inst_dispatch(bts->site_mgr.mo.fi, NM_EV_SW_ACT, NULL);
-	osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_SW_ACT, NULL);
-
-	/* those should all be in DEPENDENCY */
-	oml_tx_state_changed(&bts->gprs.nse.mo);
-	oml_tx_state_changed(&bts->gprs.cell.mo);
-	oml_tx_state_changed(&bts->gprs.nsvc[0].mo);
-	oml_tx_state_changed(&bts->gprs.nsvc[1].mo);
-
-	/* All other objects start off-line until the BTS Model code says otherwise */
-	for (i = 0; i < bts->num_trx; i++) {
-		struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, i);
-
-		oml_tx_state_changed(&trx->mo);
-		oml_tx_state_changed(&trx->bb_transc.mo);
-
-		for (j = 0; j < ARRAY_SIZE(trx->ts); j++) {
-			struct gsm_bts_trx_ts *ts = &trx->ts[j];
-
-			oml_tx_state_changed(&ts->mo);
-		}
-	}
+	/* Signal OML UP to BTS SITE MGR. It will automatically SW_ACT repoort
+	 * and become Disabled-Offline, then dispatch same event to its children
+	 * objects.
+	 */
+	osmo_fsm_inst_dispatch(bts->site_mgr->mo.fi, NM_EV_OML_UP, NULL);
 
 	return bts_model_oml_estab(bts);
 }
 
-/* prepare the per-SAPI T200 arrays for a given lchan */
-static int t200_by_lchan(int *t200_ms_dcch, int *t200_ms_acch, struct gsm_lchan *lchan)
-{
-	struct gsm_bts *bts = lchan->ts->trx->bts;
-
-	/* we have to compensate for the "RTS advance" due to the asynchronous interface between
-	 * the BTS (LAPDm) and the PHY/L1 (OsmoTRX or DSP in case of osmo-bts-{sysmo,lc15,oc2g,octphy} */
-	int32_t fn_advance = bts_get_avg_fn_advance(bts);
-	int32_t fn_advance_us = fn_advance * 4615;
-	int fn_advance_ms = fn_advance_us / 1000;
-
-	t200_ms_acch[DL_SAPI0] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms;
-	t200_ms_acch[DL_SAPI3] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms;
-
-	if (lchan->repeated_acch_capability.dl_facch_all && (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H)) {
-		t200_ms_acch[DL_SAPI0] *= 2;
-		t200_ms_acch[DL_SAPI3] *= 2;
-	}
-
-	switch (lchan->type) {
-	case GSM_LCHAN_SDCCH:
-		t200_ms_dcch[DL_SAPI0] = bts->t200_ms[T200_SDCCH] + fn_advance_ms;
-		t200_ms_dcch[DL_SAPI3] = bts->t200_ms[T200_SDCCH_SAPI3] + fn_advance_ms;
-		break;
-	case GSM_LCHAN_TCH_F:
-		t200_ms_dcch[DL_SAPI0] = bts->t200_ms[T200_FACCH_F] + fn_advance_ms;
-		t200_ms_dcch[DL_SAPI3] = bts->t200_ms[T200_FACCH_F] + fn_advance_ms;
-		break;
-	case GSM_LCHAN_TCH_H:
-		t200_ms_dcch[DL_SAPI0] = bts->t200_ms[T200_FACCH_H] + fn_advance_ms;
-		t200_ms_dcch[DL_SAPI3] = bts->t200_ms[T200_FACCH_H] + fn_advance_ms;
-		break;
-	default:
-		/* Channels such as CCCH don't use lapdm DL, and hence no T200 is needed */
-		return -1;
-	}
-	return 0;
-}
-
-int lchan_init_lapdm(struct gsm_lchan *lchan)
-{
-	struct lapdm_channel *lc = &lchan->lapdm_ch;
-	int t200_ms_dcch[_NR_DL_SAPI], t200_ms_acch[_NR_DL_SAPI];
-
-	if (t200_by_lchan(t200_ms_dcch, t200_ms_acch, lchan) == 0) {
-		LOGPLCHAN(lchan, DLLAPD, LOGL_DEBUG,
-			  "Setting T200 D0=%u, D3=%u, S0=%u, S3=%u (all in ms)\n",
-			  t200_ms_dcch[DL_SAPI0], t200_ms_dcch[DL_SAPI3],
-			  t200_ms_acch[DL_SAPI0], t200_ms_acch[DL_SAPI3]);
-		lapdm_channel_init3(lc, LAPDM_MODE_BTS, t200_ms_dcch, t200_ms_acch, lchan->type,
-				    gsm_lchan_name(lchan));
-		lapdm_channel_set_flags(lc, LAPDM_ENT_F_POLLING_ONLY);
-		lapdm_channel_set_l1(lc, NULL, lchan);
-	}
-	/* We still need to set Rx callback to receive RACH requests: */
-	lapdm_channel_set_l3(lc, lapdm_rll_tx_cb, lchan);
-
-	return 0;
-}
-
 #define CCCH_RACH_RATIO_COMBINED256      (256*1/9)
 #define CCCH_RACH_RATIO_SEPARATE256      (256*10/55)
 
@@ -698,7 +644,7 @@ int bts_agch_enqueue(struct gsm_bts *bts, struct msgb *msg)
 	struct gsm48_imm_ass_rej *imm_ass_cmd = msgb_l3(msg);
 
 	if (bts->agch_queue.length > hard_limit) {
-		LOGP(DSUM, LOGL_ERROR,
+		LOGP(DRR, LOGL_ERROR,
 		     "AGCH: too many messages in queue, "
 		     "refusing message type %s, length = %d/%d\n",
 		     gsm48_rr_msg_name(((struct gsm48_imm_ass *)msgb_l3(msg))->msg_type),
@@ -726,7 +672,7 @@ int bts_agch_enqueue(struct gsm_bts *bts, struct msgb *msg)
 	return 0;
 }
 
-struct msgb *bts_agch_dequeue(struct gsm_bts *bts)
+static struct msgb *bts_agch_dequeue(struct gsm_bts *bts)
 {
 	struct msgb *msg = msgb_dequeue(&bts->agch_queue.queue);
 	if (!msg)
@@ -792,12 +738,12 @@ static void compact_agch_queue(struct gsm_bts *bts)
 	return;
 }
 
-int bts_ccch_copy_msg(struct gsm_bts *bts, uint8_t *out_buf, struct gsm_time *gt,
-		      int is_ag_res)
+int bts_ccch_copy_msg(struct gsm_bts *bts, uint8_t *out_buf, struct gsm_time *gt, enum ccch_msgt ccch)
 {
 	struct msgb *msg = NULL;
 	int rc = 0;
 	int is_empty = 1;
+	const struct bts_agch_msg_cb *msg_cb;
 
 	/* Do queue house keeping.
 	 * This needs to be done every time a CCCH message is requested, since
@@ -806,26 +752,39 @@ int bts_ccch_copy_msg(struct gsm_bts *bts, uint8_t *out_buf, struct gsm_time *gt
 	 */
 	compact_agch_queue(bts);
 
-	/* Check for paging messages first if this is PCH */
-	if (!is_ag_res)
+	switch (ccch) {
+	case CCCH_MSGT_NCH:
+		/* Send NCH message, it has priority over AGCH and does not overlap with PCH. */
+		rc = bts_asci_notify_nch_gen_msg(bts, out_buf);
+		return rc;
+	case CCCH_MSGT_PCH:
+		/* Check whether the block may be overwritten by AGCH. */
 		rc = paging_gen_msg(bts->paging_state, out_buf, gt, &is_empty);
-
-	/* Check whether the block may be overwritten */
-	if (!is_empty)
-		return rc;
-
-	msg = bts_agch_dequeue(bts);
-	if (!msg)
-		return rc;
+		if (!is_empty)
+			return rc;
+		/* fall-through */
+	case CCCH_MSGT_AGCH:
+		/* If fallen here and the AGCH queue is empty, return empty PCH message. */
+		msg = bts_agch_dequeue(bts);
+		if (!msg)
+			return rc;
+		/* Continue to return AGCH message. */
+		break;
+	}
 
 	rate_ctr_inc2(bts->ctrs, BTS_CTR_AGCH_SENT);
 
+	/* Confirm sending of the AGCH message towards the PCU */
+	msg_cb = (struct bts_agch_msg_cb *) msg->cb;
+	if (msg_cb->confirm)
+		pcu_tx_data_cnf(msg_cb->msg_id, PCU_IF_SAPI_AGCH_2);
+
 	/* Copy AGCH message */
 	memcpy(out_buf, msgb_l3(msg), msgb_l3len(msg));
 	rc = msgb_l3len(msg);
 	msgb_free(msg);
 
-	if (is_ag_res)
+	if (ccch == CCCH_MSGT_AGCH)
 		bts->agch_queue.agch_msgs++;
 	else
 		bts->agch_queue.pch_msgs++;
@@ -853,80 +812,201 @@ struct gsm_time *get_time(struct gsm_bts *bts)
 	return &bts->gsm_time;
 }
 
-int bts_supports_cm(struct gsm_bts *bts, enum gsm_phys_chan_config pchan,
-		    enum gsm48_chan_mode cm)
+bool bts_supports_cm_speech(const struct gsm_bts *bts,
+			    const struct rsl_ie_chan_mode *cm)
 {
 	enum osmo_bts_features feature = _NUM_BTS_FEAT;
 
-	/* We assume that signalling support is mandatory,
-	 * there is no BTS_FEAT_* definition to check that. */
-	if (cm == GSM48_CMODE_SIGN)
-		return 1;
+	/* Stage 1: check support for the requested channel type */
+	switch (cm->chan_rt) {
+	case RSL_CMOD_CRT_TCH_GROUP_Bm:
+	case RSL_CMOD_CRT_TCH_GROUP_Lm:
+		if (!osmo_bts_has_feature(bts->features, BTS_FEAT_VGCS))
+			return false;
+		break;
+	case RSL_CMOD_CRT_TCH_BCAST_Bm:
+	case RSL_CMOD_CRT_TCH_BCAST_Lm:
+		if (!osmo_bts_has_feature(bts->features, BTS_FEAT_VBS))
+			return false;
+		break;
+	case RSL_CMOD_CRT_OSMO_TCH_VAMOS_Bm:
+	case RSL_CMOD_CRT_OSMO_TCH_VAMOS_Lm:
+		if (!osmo_bts_has_feature(bts->features, BTS_FEAT_VAMOS))
+			return false;
+		break;
+	}
 
-	/* Before the requested pchan/cm combination can be checked, we need to
-	 * convert it to a feature identifier we can check */
-	switch (pchan) {
-	case GSM_PCHAN_TCH_F:
-		switch(cm) {
-		case GSM48_CMODE_SPEECH_V1:
+	/* Stage 2: check support for the requested codec */
+	switch (cm->chan_rt) {
+	case RSL_CMOD_CRT_OSMO_TCH_VAMOS_Bm:
+	case RSL_CMOD_CRT_TCH_GROUP_Bm:
+	case RSL_CMOD_CRT_TCH_BCAST_Bm:
+	case RSL_CMOD_CRT_TCH_Bm:
+		switch (cm->chan_rate) {
+		case RSL_CMOD_SP_GSM1:
 			feature	= BTS_FEAT_SPEECH_F_V1;
 			break;
-		case GSM48_CMODE_SPEECH_EFR:
+		case RSL_CMOD_SP_GSM2:
 			feature	= BTS_FEAT_SPEECH_F_EFR;
 			break;
-		case GSM48_CMODE_SPEECH_AMR:
+		case RSL_CMOD_SP_GSM3:
 			feature = BTS_FEAT_SPEECH_F_AMR;
 			break;
 		default:
 			/* Invalid speech codec type => Not supported! */
-			return 0;
+			return false;
 		}
 		break;
 
-	case GSM_PCHAN_TCH_H:
-		switch(cm) {
-		case GSM48_CMODE_SPEECH_V1:
+	case RSL_CMOD_CRT_OSMO_TCH_VAMOS_Lm:
+	case RSL_CMOD_CRT_TCH_GROUP_Lm:
+	case RSL_CMOD_CRT_TCH_BCAST_Lm:
+	case RSL_CMOD_CRT_TCH_Lm:
+		switch (cm->chan_rate) {
+		case RSL_CMOD_SP_GSM1:
 			feature	= BTS_FEAT_SPEECH_H_V1;
 			break;
-		case GSM48_CMODE_SPEECH_AMR:
+		case RSL_CMOD_SP_GSM3:
 			feature = BTS_FEAT_SPEECH_H_AMR;
 			break;
 		default:
 			/* Invalid speech codec type => Not supported! */
-			return 0;
+			return false;
 		}
 		break;
 
 	default:
-		LOGP(DRSL, LOGL_ERROR, "BTS %u: unhandled pchan %s when checking mode %s\n",
-		     bts->nr, gsm_pchan_name(pchan), gsm48_chan_mode_name(cm));
-		return 0;
+		LOGP(DRSL, LOGL_ERROR,
+		     "Unhandled RSL channel type=0x%02x/rate=0x%02x\n",
+		     cm->chan_rt, cm->chan_rate);
+		return false;
 	}
 
 	/* Check if the feature is supported by this BTS */
 	if (osmo_bts_has_feature(bts->features, feature))
-		return 1;
+		return true;
 
-	return 0;
+	return false;
+}
+
+static bool bts_supports_cm_data(const struct gsm_bts *bts,
+				 const struct rsl_ie_chan_mode *cm)
+{
+	switch (bts->variant) {
+	case BTS_OSMO_TRX:
+		switch (cm->chan_rate) {
+		/* TODO: RSL_CMOD_CSD_NT_14k5 */
+		/* TODO: RSL_CMOD_CSD_T_14k4 */
+		case RSL_CMOD_CSD_NT_12k0:
+		case RSL_CMOD_CSD_T_9k6:
+			if (cm->chan_rt != RSL_CMOD_CRT_TCH_Bm)
+				return false; /* invalid */
+			/* fall-through */
+		case RSL_CMOD_CSD_NT_6k0:
+		case RSL_CMOD_CSD_T_4k8:
+		case RSL_CMOD_CSD_T_2k4:
+		case RSL_CMOD_CSD_T_1k2:
+		case RSL_CMOD_CSD_T_600:
+		case RSL_CMOD_CSD_T_1200_75:
+			return true;
+		default:
+			return false;
+		}
+	default:
+		return 0;
+	}
+}
+
+bool bts_supports_cm(const struct gsm_bts *bts,
+		     const struct rsl_ie_chan_mode *cm)
+{
+	switch (cm->spd_ind) {
+	case RSL_CMOD_SPD_SIGN:
+		/* We assume that signalling support is mandatory,
+		 * there is no BTS_FEAT_* definition to check that. */
+		return true;
+	case RSL_CMOD_SPD_SPEECH:
+		return bts_supports_cm_speech(bts, cm);
+	case RSL_CMOD_SPD_DATA:
+		return bts_supports_cm_data(bts, cm);
+	default:
+		return false;
+	}
 }
 
 /* return the gsm_lchan for the CBCH (if it exists at all) */
 struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts)
 {
-	struct gsm_lchan *lchan = NULL;
 	struct gsm_bts_trx *trx = bts->c0;
 
+	/* According to 3GPP TS 45.002, table 3, CBCH can be allocated
+	 * either on C0/TS0 (CCCH+SDCCH4) or on C0..n/TS0..3 (SDCCH/8). */
 	if (trx->ts[0].pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH)
-		lchan = &trx->ts[0].lchan[2];
-	else {
-		int i;
-		for (i = 0; i < 8; i++) {
-			if (trx->ts[i].pchan == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) {
-				lchan = &trx->ts[i].lchan[2];
-				break;
-			}
+		return &trx->ts[0].lchan[2]; /* C0/TS0 */
+
+	llist_for_each_entry(trx, &bts->trx_list, list) { /* C0..n */
+		unsigned int tn;
+		for (tn = 0; tn <= 3; tn++) { /* TS0..3 */
+			struct gsm_bts_trx_ts *ts = &trx->ts[tn];
+			if (ts->pchan == GSM_PCHAN_SDCCH8_SACCH8C_CBCH)
+				return &ts->lchan[2];
 		}
 	}
 
-	return lchan;
+	return NULL;
+}
+
+/* BCCH carrier power reduction (see 3GPP TS 45.008, section 7.1) */
+int bts_set_c0_pwr_red(struct gsm_bts *bts, const uint8_t red)
+{
+	struct gsm_bts_trx *c0 = bts->c0;
+	unsigned int tn;
+
+	if (!osmo_bts_has_feature(bts->features, BTS_FEAT_BCCH_POWER_RED)) {
+		LOGPTRX(c0, DRSL, LOGL_ERROR, "BCCH carrier power reduction "
+			"is not supported by this BTS model\n");
+		return -ENOTSUP;
+	}
+
+	if (red > 6 || red % 2 != 0) {
+		LOGPTRX(c0, DRSL, LOGL_ERROR, "BCCH carrier power reduction "
+			"value (%u dB) is incorrect or out of range\n", red);
+		return -EINVAL;
+	}
+
+	LOGPTRX(c0, DRSL, LOGL_NOTICE, "BCCH carrier power reduction: "
+		"%u dB (%s)\n", red, red ? "enabled" : "disabled");
+
+	/* Timeslot 0 is always transmitting BCCH/CCCH */
+	c0->ts[0].c0_power_red_db = 0;
+
+	for (tn = 1; tn < ARRAY_SIZE(c0->ts); tn++) {
+		struct gsm_bts_trx_ts *ts = &c0->ts[tn];
+		struct gsm_bts_trx_ts *prev = ts - 1;
+
+		switch (ts_pchan(ts)) {
+		/* Not allowed on CCCH/BCCH */
+		case GSM_PCHAN_CCCH:
+			/* Preceeding timeslot shall not exceed 2 dB */
+			if (prev->c0_power_red_db > 0)
+				prev->c0_power_red_db = 2;
+			/* fall-through */
+		/* Not recommended on SDCCH/8 */
+		case GSM_PCHAN_SDCCH8_SACCH8C:
+		case GSM_PCHAN_SDCCH8_SACCH8C_CBCH:
+			ts->c0_power_red_db = 0;
+			break;
+		default:
+			ts->c0_power_red_db = red;
+			break;
+		}
+	}
+
+	/* Timeslot 7 is always preceding BCCH/CCCH */
+	if (c0->ts[7].c0_power_red_db > 0)
+		c0->ts[7].c0_power_red_db = 2;
+
+	bts->c0_power_red_db = red;
+
+	return 0;
 }

src/common/bts_ctrl_commands.c

@@ -12,7 +12,7 @@
  * 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.
+ * 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/>.
@@ -84,12 +84,45 @@ static int set_oml_alert(struct ctrl_cmd *cmd, void *data)
 	return CTRL_CMD_REPLY;
 }
 
+static int verify_max_ber10k_rach(struct ctrl_cmd *cmd, const char *value, void *_data)
+{
+	int max_ber10k_rach = atoi(cmd->value);
+
+	if (max_ber10k_rach < 0 || max_ber10k_rach > 10000) {
+		cmd->reply = "Value is out of range";
+		return 1;
+	}
+
+	return 0;
+}
+
+static int get_max_ber10k_rach(struct ctrl_cmd *cmd, void *data)
+{
+	cmd->reply = talloc_asprintf(cmd, "%u", g_bts->max_ber10k_rach);
+	if (!cmd->reply) {
+		cmd->reply = "OOM";
+		return CTRL_CMD_ERROR;
+	}
+
+	return CTRL_CMD_REPLY;
+}
+
+static int set_max_ber10k_rach(struct ctrl_cmd *cmd, void *data)
+{
+	g_bts->max_ber10k_rach = atoi(cmd->value);
+	cmd->reply = "OK";
+	return CTRL_CMD_REPLY;
+}
+
+CTRL_CMD_DEFINE(max_ber10k_rach, "max-ber10k-rach");
+
 int bts_ctrl_cmds_install(struct gsm_bts *bts)
 {
 	int rc = 0;
 
 	rc |= ctrl_cmd_install(CTRL_NODE_TRX, &cmd_therm_att);
 	rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_oml_alert);
+	rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_max_ber10k_rach);
 	g_bts = bts;
 
 	return rc;

src/common/bts_ctrl_lookup.c

@@ -12,7 +12,7 @@
  * 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.
+ * 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/>.
@@ -88,14 +88,12 @@ err_index:
 	return -ERANGE;
 }
 
-struct ctrl_handle *bts_controlif_setup(struct gsm_bts *bts,
-					const char *bind_addr, uint16_t port)
+struct ctrl_handle *bts_controlif_setup(struct gsm_bts *bts, uint16_t port)
 {
 	struct ctrl_handle *hdl;
 	int rc = 0;
 
-	hdl = ctrl_interface_setup_dynip(bts, bind_addr, port,
-					 bts_ctrl_node_lookup);
+	hdl = ctrl_interface_setup(bts, port, bts_ctrl_node_lookup);
 	if (!hdl)
 		return NULL;