ipc: add master socket number/path parameters

osmo-trx-ipc needs to know which master socket it should talk to, so pass this path in the config device args like this: dev-args ipc_msock=/path/to/socket Additionally, add a master socket suffix number parameter to the ipc backend, ipc-driver-test -n 0 to start serving /tmp/ipc_sock0 Change-Id: I24857fbb74e5fc808b2a218957c723291de2ba04
shm: fix alignment
2025-11-04 06:03:17 +00:00 · 2020-05-06 14:00:37 +02:00 · 2020-05-06 10:54:36 +02:00 · 2020-04-22 15:05:11 +02:00 · 2020-04-22 15:19:31 +02:00 · 2020-04-22 15:21:49 +02:00
84 changed files with 2527 additions and 2945 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -5,9 +5,6 @@
 Transceiver52M/osmo-trx-uhd
 Transceiver52M/osmo-trx-usrp1
 Transceiver52M/osmo-trx-lms
-Transceiver52M/osmo-trx-ipc
-
-.clang-format

 # tests
 tests/CommonLibs/BitVectorTest
@@ -22,7 +19,6 @@ tests/CommonLibs/VectorTest
 tests/CommonLibs/PRBSTest
 tests/Transceiver52M/convolve_test
 tests/Transceiver52M/LMSDeviceTest
-Transceiver52M/device/ipc/ipc-driver-test

 # automake/autoconf
 *.in
@@ -64,14 +60,6 @@ doc/manuals/*.pdf
 doc/manuals/*__*.png
 doc/manuals/*.check
 doc/manuals/generated/
-doc/manuals/vty/osmotrx-*-vty-reference.xml
-doc/manuals/vty/osmotrx-*-vty-reference.xml.inc.gen
-doc/manuals/vty/osmotrx-*-vty-reference.xml.inc.merged
 doc/manuals/osmomsc-usermanual.xml
 doc/manuals/common
 doc/manuals/build
-
-contrib/osmo-trx.spec
-!contrib/osmo-trx.spec.in
-
-utils/osmo-prbs-tool
--- a/CommonLibs/Threads.cpp
+++ b/CommonLibs/Threads.cpp
@@ -32,7 +32,11 @@
 #include "Timeval.h"
 #include "Logger.h"

-#include <osmocom/core/thread.h>
+#ifndef gettid
+#include <sys/syscall.h>
+#define gettid() syscall(SYS_gettid)
+#endif
+

 using namespace std;

@@ -110,7 +114,7 @@ void Signal::wait(Mutex& wMutex, unsigned timeout) const
 void set_selfthread_name(const char *name)
 {
 	pthread_t selfid = pthread_self();
-	pid_t tid = osmo_gettid();
+	pid_t tid = gettid();
 	if (pthread_setname_np(selfid, name) == 0) {
 		LOG(INFO) << "Thread "<< selfid << " (task " << tid << ") set name: " << name;
 	} else {
--- a/CommonLibs/Vector.h
+++ b/CommonLibs/Vector.h
@@ -36,11 +36,6 @@
 #include <assert.h>
 #include <stdlib.h>

-#ifndef __OPTIMIZE__
-#define assert_no_opt(x) assert(x)
-#else
-#define assert_no_opt(x)
-#endif
 // We can't use Logger.h in this file...
 extern int gVectorDebug;
 #define BVDEBUG(msg) if (gVectorDebug) {std::cout << msg;}
@@ -86,8 +81,8 @@ template <class T> class Vector {
 	/** Return the size of the Vector. */
 	size_t size() const
 	{
-		assert_no_opt(mStart>=mData);
-		assert_no_opt(mEnd>=mStart);
+		assert(mStart>=mData);
+		assert(mEnd>=mStart);
 		return mEnd - mStart;
 	}

@@ -117,7 +112,7 @@ template <class T> class Vector {
 	/** Reduce addressable size of the Vector, keeping content. */
 	void shrink(size_t newSize)
 	{
-		assert_no_opt(newSize <= mEnd - mStart);
+		assert(newSize <= mEnd - mStart);
 		mEnd = mStart + newSize;
 	}

@@ -204,7 +199,7 @@ template <class T> class Vector {
 	{
 		T* wStart = mStart + start;
 		T* wEnd = wStart + span;
-		assert_no_opt(wEnd<=mEnd);
+		assert(wEnd<=mEnd);
 		return Vector<T>(NULL,wStart,wEnd);
 	}

@@ -213,7 +208,7 @@ template <class T> class Vector {
 	{
 		T* wStart = mStart + start;
 		T* wEnd = wStart + span;
-		assert_no_opt(wEnd<=mEnd);
+		assert(wEnd<=mEnd);
 		return Vector<T>(NULL,wStart,wEnd);
 	}

@@ -233,8 +228,8 @@ template <class T> class Vector {
 		unsigned int i;
 		T* dst = other.mStart + start;
 		T* src = mStart;
-		assert_no_opt(dst+span<=other.mEnd);
-		assert_no_opt(mStart+span<=mEnd);
+		assert(dst+span<=other.mEnd);
+		assert(mStart+span<=mEnd);
 		for (i = 0; i < span; i++, src++, dst++)
 			*dst = *src;
 		/*TODO if not non-trivially copiable type class, optimize:
@@ -255,8 +250,8 @@ template <class T> class Vector {
 	void segmentCopyTo(Vector<T>& other, size_t start, size_t span) const
 	{
 		const T* base = mStart + start;
-		assert_no_opt(base+span<=mEnd);
-		assert_no_opt(other.mStart+span<=other.mEnd);
+		assert(base+span<=mEnd);
+		assert(other.mStart+span<=other.mEnd);
 		memcpy(other.mStart,base,span*sizeof(T));
 	}

@@ -270,8 +265,8 @@ template <class T> class Vector {
 	{
 		const T* baseFrom = mStart + from;
 		T* baseTo = mStart + to;
-		assert_no_opt(baseFrom+span<=mEnd);
-		assert_no_opt(baseTo+span<=mEnd);
+		assert(baseFrom+span<=mEnd);
+		assert(baseTo+span<=mEnd);
 		memmove(baseTo,baseFrom,span*sizeof(T));
 	}

@@ -285,7 +280,7 @@ template <class T> class Vector {
 	{
 		T* dp=mStart+start;
 		T* end=dp+length;
-		assert_no_opt(end<=mEnd);
+		assert(end<=mEnd);
 		while (dp<end) *dp++=val;
 	}

@@ -297,13 +292,13 @@ template <class T> class Vector {

 	T& operator[](size_t index)
 	{
-		assert_no_opt(mStart+index<mEnd);
+		assert(mStart+index<mEnd);
 		return mStart[index];
 	}

 	const T& operator[](size_t index) const
 	{
-		assert_no_opt(mStart+index<mEnd);
+		assert(mStart+index<mEnd);
 		return mStart[index];
 	}

--- a/CommonLibs/config_defs.h
+++ b/CommonLibs/config_defs.h
@@ -5,8 +5,6 @@
 * osmo-trx (CXX, dir Transceiver52)
 */

-#include <stdbool.h>
-
 enum FillerType {
  FILLER_DUMMY,
  FILLER_ZERO,
@@ -20,40 +18,3 @@ enum ReferenceType {
  REF_EXTERNAL,
  REF_GPS,
 };
-
-/* Maximum number of physical RF channels */
-#define TRX_CHAN_MAX 8
-
-struct trx_ctx;
-
-struct trx_chan {
-	struct trx_ctx *trx; /* backpointer */
-	unsigned int idx; /* channel index */
-	char *rx_path;
-	char *tx_path;
-};
-
-struct trx_cfg {
-	char *bind_addr;
-	char *remote_addr;
-	char *dev_args;
-	unsigned int base_port;
-	unsigned int tx_sps;
-	unsigned int rx_sps;
-	unsigned int rtsc;
-	unsigned int rach_delay;
-	enum ReferenceType clock_ref;
-	enum FillerType filler;
-	bool multi_arfcn;
-	double offset;
-	double freq_offset_khz;
-	double rssi_offset;
-	bool force_rssi_offset; /* Force value set in VTY? */
-	bool swap_channels;
-	bool ext_rach;
-	bool egprs;
-	unsigned int sched_rr;
-	unsigned int stack_size;
-	unsigned int num_chans;
-	struct trx_chan chans[TRX_CHAN_MAX];
-};
--- a/CommonLibs/debug.c
+++ b/CommonLibs/debug.c
@@ -21,6 +21,18 @@
 * See the COPYING file in the main directory for details.
 */

+#include "config.h"
+
+/* If HAVE_GETTID, then "_GNU_SOURCE" may need to be defined to use gettid() */
+#if HAVE_GETTID
+#define _GNU_SOURCE
+#endif
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <sys/syscall.h>
+#include "config.h"
+
 #include <osmocom/core/logging.h>
 #include <osmocom/core/utils.h>
 #include "debug.h"
@@ -69,15 +81,21 @@ static const struct log_info_cat default_categories[] = {
 		.color = NULL,
 		.enabled = 1, .loglevel = LOGL_NOTICE,
 	},
-	[DCTR] = {
-		.name = "DCTR",
-		.description = "Rate counter related logging",
-		.color = NULL,
-		.enabled = 1, .loglevel = LOGL_NOTICE,
-	},
 };

 const struct log_info log_info = {
 	.cat = default_categories,
 	.num_cat = ARRAY_SIZE(default_categories),
 };
+
+pid_t my_gettid(void)
+{
+#if HAVE_GETTID
+	return gettid();
+#elif defined(LINUX) && defined(__NR_gettid)
+	return (pid_t) syscall(__NR_gettid);
+#else
+	#pragma message ("use pid as tid")
+	return getpid();
+#endif
+}
--- a/CommonLibs/debug.h
+++ b/CommonLibs/debug.h
@@ -1,9 +1,9 @@
 #pragma once

 #include <stdbool.h>
+#include <sys/types.h>

 #include <osmocom/core/logging.h>
-#include <osmocom/core/thread.h>

 extern const struct log_info log_info;

@@ -16,13 +16,14 @@ enum {
 	DTRXDUL,
 	DDEV,
 	DDEVDRV,
-	DCTR,
 };

+pid_t my_gettid(void);
+
 #define CLOGC(category, level, fmt, args...) do { \
-	LOGP(category, level, "[tid=%ld] " fmt, (long int) osmo_gettid(), ##args);  \
+	LOGP(category, level, "[tid=%ld] " fmt, (long int) my_gettid(), ##args);  \
 } while(0)

 #define CLOGCHAN(chan, category, level, fmt, args...) do { \
-	LOGP(category, level, "[tid=%ld][chan=%zu] " fmt, (long int) osmo_gettid(), chan, ##args);  \
+	LOGP(category, level, "[tid=%ld][chan=%zu] " fmt, (long int) my_gettid(), chan, ##args);  \
 } while(0)
--- a/CommonLibs/osmo_signal.h
+++ b/CommonLibs/osmo_signal.h
@@ -43,7 +43,6 @@ enum SS_DEVICE {
 	   (struct device_counters). Must be sent with PTHREAD_CANCEL_DISABLE
 	   to avoid deadlocks in case osmo-trx process is asked to exit. */
 	S_DEVICE_COUNTER_CHANGE,
-	S_TRX_COUNTER_CHANGE, /* same, but for Transceiver class */
 };

 /* signal cb for signal <SS_DEVICE,S_DEVICE_COUNTER_CHANGE> */
@@ -56,16 +55,3 @@ struct device_counters {
 	unsigned int tx_dropped_events;
 	unsigned int tx_dropped_samples;
 };
-
-/* signal cb for signal <SS_DEVICE,S_TRX_COUNTER_CHANGE> */
-struct trx_counters {
-	size_t chan;
-	unsigned int tx_stale_bursts;
-	unsigned int tx_unavailable_bursts;
-	unsigned int tx_trxd_fn_repeated;
-	unsigned int tx_trxd_fn_outoforder;
-	unsigned int tx_trxd_fn_skipped;
-	unsigned int rx_empty_burst;
-	unsigned int rx_clipping;
-	unsigned int rx_no_burst_detected;
-};
--- a/CommonLibs/trx_rate_ctr.cpp
+++ b/CommonLibs/trx_rate_ctr.cpp
@@ -67,24 +67,21 @@ extern "C" {
 #include "Threads.h"
 #include "Logger.h"

-/* Used in dev_ctrs_pending, when set it means that channel slot contains unused
+/* Used in ctrs_pending, when set it means that channel slot contains unused
   (non-pending) counter data */
 #define PENDING_CHAN_NONE SIZE_MAX

 static void *trx_rate_ctr_ctx;

 static struct rate_ctr_group** rate_ctrs;
-static struct device_counters* dev_ctrs_pending;
-static struct trx_counters* trx_ctrs_pending;
+static struct device_counters* ctrs_pending;
 static size_t chan_len;
-static struct osmo_fd dev_rate_ctr_timerfd;
-static struct osmo_fd trx_rate_ctr_timerfd;
-static Mutex dev_rate_ctr_mutex;
-static Mutex trx_rate_ctr_mutex;
+static struct osmo_fd rate_ctr_timerfd;
+static Mutex rate_ctr_mutex;

 struct osmo_timer_list threshold_timer;
 static LLIST_HEAD(threshold_list);
-static unsigned int threshold_timer_sched_secs;
+static int threshold_timer_sched_secs;
 static bool threshold_initied;

 const struct value_string rate_ctr_intv[] = {
@@ -96,38 +93,22 @@ const struct value_string rate_ctr_intv[] = {
 };

 const struct value_string trx_chan_ctr_names[] = {
-	{ TRX_CTR_DEV_RX_OVERRUNS,	"rx_overruns" },
-	{ TRX_CTR_DEV_TX_UNDERRUNS,	"tx_underruns" },
-	{ TRX_CTR_DEV_RX_DROP_EV,	"rx_drop_events" },
-	{ TRX_CTR_DEV_RX_DROP_SMPL,	"rx_drop_samples" },
-	{ TRX_CTR_DEV_TX_DROP_EV,	"tx_drop_events" },
-	{ TRX_CTR_DEV_TX_DROP_SMPL,	"tx_drop_samples" },
-	{ TRX_CTR_TRX_TX_STALE_BURSTS,	"tx_stale_bursts" },
-	{ TRX_CTR_TRX_TX_UNAVAILABLE_BURSTS, "tx_unavailable_bursts" },
-	{ TRX_CTR_TRX_TRXD_FN_REPEATED,	"tx_trxd_fn_repeated" },
-	{ TRX_CTR_TRX_TRXD_FN_OUTOFORDER, "tx_trxd_fn_outoforder" },
-	{ TRX_CTR_TRX_TRXD_FN_SKIPPED,	"tx_trxd_fn_skipped" },
-	{ TRX_CTR_TRX_RX_EMPTY_BURST,	"rx_empty_burst" },
-	{ TRX_CTR_TRX_RX_CLIPPING,	"rx_clipping" },
-	{ TRX_CTR_TRX_RX_NO_BURST_DETECTED, "rx_no_burst_detected" },
+	{ TRX_CTR_RX_OVERRUNS,	"rx_overruns" },
+	{ TRX_CTR_TX_UNDERRUNS,	"tx_underruns" },
+	{ TRX_CTR_RX_DROP_EV,	"rx_drop_events" },
+	{ TRX_CTR_RX_DROP_SMPL,	"rx_drop_samples" },
+	{ TRX_CTR_TX_DROP_EV,	"tx_drop_events" },
+	{ TRX_CTR_TX_DROP_SMPL,	"tx_drop_samples" },
 	{ 0, NULL }
 };

 static const struct rate_ctr_desc trx_chan_ctr_desc[] = {
-	[TRX_CTR_DEV_RX_OVERRUNS]		= { "device:rx_overruns",	"Number of Rx overruns in FIFO queue" },
-	[TRX_CTR_DEV_TX_UNDERRUNS]		= { "device:tx_underruns",	"Number of Tx underruns in FIFO queue" },
-	[TRX_CTR_DEV_RX_DROP_EV]		= { "device:rx_drop_events",	"Number of times Rx samples were dropped by HW" },
-	[TRX_CTR_DEV_RX_DROP_SMPL]		= { "device:rx_drop_samples",	"Number of Rx samples dropped by HW" },
-	[TRX_CTR_DEV_TX_DROP_EV]		= { "device:tx_drop_events",	"Number of times Tx samples were dropped by HW" },
-	[TRX_CTR_DEV_TX_DROP_SMPL]		= { "device:tx_drop_samples",	"Number of Tx samples dropped by HW" },
-	[TRX_CTR_TRX_TX_STALE_BURSTS]		= { "trx:tx_stale_bursts",	"Number of Tx burts dropped by TRX due to arriving too late" },
-	[TRX_CTR_TRX_TX_UNAVAILABLE_BURSTS]	= { "trx:tx_unavailable_bursts","Number of Tx burts unavailable (not enqueued) at the time they should be transmitted" },
-	[TRX_CTR_TRX_TRXD_FN_REPEATED]		= { "trx:tx_trxd_fn_repeated",	"Number of Tx burts received from TRXD with repeated FN" },
-	[TRX_CTR_TRX_TRXD_FN_OUTOFORDER]	= { "trx:tx_trxd_fn_outoforder","Number of Tx burts received from TRXD with a past FN" },
-	[TRX_CTR_TRX_TRXD_FN_SKIPPED]		= { "trx:tx_trxd_fn_skipped",	"Number of Tx burts potentially skipped due to FN jumps" },
-	[TRX_CTR_TRX_RX_EMPTY_BURST]		= { "trx:rx_empty_burst",	"Number of Rx bursts empty" },
-	[TRX_CTR_TRX_RX_CLIPPING]		= { "trx:rx_clipping",		"Number of Rx bursts discarded due to clipping" },
-	[TRX_CTR_TRX_RX_NO_BURST_DETECTED]	= { "trx:rx_no_burst_detected",	"Number of Rx burts discarded due to burst detection error" },
+	[TRX_CTR_RX_OVERRUNS]		= { "device:rx_overruns",	"Number of Rx overruns in FIFO queue" },
+	[TRX_CTR_TX_UNDERRUNS]		= { "device:tx_underruns",	"Number of Tx underruns in FIFO queue" },
+	[TRX_CTR_RX_DROP_EV]		= { "device:rx_drop_events",	"Number of times Rx samples were dropped by HW" },
+	[TRX_CTR_RX_DROP_SMPL]		= { "device:rx_drop_samples",	"Number of Rx samples dropped by HW" },
+	[TRX_CTR_TX_DROP_EV]		= { "device:tx_drop_events",	"Number of times Tx samples were dropped by HW" },
+	[TRX_CTR_TX_DROP_SMPL]		= { "device:tx_drop_samples",	"Number of Tx samples dropped by HW" }
 };

 static const struct rate_ctr_group_desc trx_chan_ctr_group_desc = {
@@ -138,68 +119,34 @@ static const struct rate_ctr_group_desc trx_chan_ctr_group_desc = {
 	.ctr_desc			= trx_chan_ctr_desc,
 };

-static int dev_rate_ctr_timerfd_cb(struct osmo_fd *ofd, unsigned int what) {
+static int rate_ctr_timerfd_cb(struct osmo_fd *ofd, unsigned int what) {
 	size_t chan;
 	struct rate_ctr *ctr;
-	LOGC(DCTR, INFO) << "Main thread is updating Device counters";
-	dev_rate_ctr_mutex.lock();
+	LOGC(DMAIN, NOTICE) << "Main thread is updating counters";
+	rate_ctr_mutex.lock();
 	for (chan = 0; chan < chan_len; chan++) {
-		if (dev_ctrs_pending[chan].chan == PENDING_CHAN_NONE)
+		if (ctrs_pending[chan].chan == PENDING_CHAN_NONE)
 			continue;
-		LOGCHAN(chan, DCTR, DEBUG) << "rate_ctr update";
-		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_DEV_RX_OVERRUNS];
-		rate_ctr_add(ctr, dev_ctrs_pending[chan].rx_overruns - ctr->current);
-		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_DEV_TX_UNDERRUNS];
-		rate_ctr_add(ctr, dev_ctrs_pending[chan].tx_underruns - ctr->current);
-		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_DEV_RX_DROP_EV];
-		rate_ctr_add(ctr, dev_ctrs_pending[chan].rx_dropped_events - ctr->current);
-		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_DEV_RX_DROP_SMPL];
-		rate_ctr_add(ctr, dev_ctrs_pending[chan].rx_dropped_samples - ctr->current);
-		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_DEV_TX_DROP_EV];
-		rate_ctr_add(ctr, dev_ctrs_pending[chan].tx_dropped_events - ctr->current);
-		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_DEV_TX_DROP_SMPL];
-		rate_ctr_add(ctr, dev_ctrs_pending[chan].tx_dropped_samples - ctr->current);
+		LOGCHAN(chan, DMAIN, INFO) << "rate_ctr update";
+		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_RX_OVERRUNS];
+		rate_ctr_add(ctr, ctrs_pending[chan].rx_overruns - ctr->current);
+		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TX_UNDERRUNS];
+		rate_ctr_add(ctr, ctrs_pending[chan].tx_underruns - ctr->current);
+		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_RX_DROP_EV];
+		rate_ctr_add(ctr, ctrs_pending[chan].rx_dropped_events - ctr->current);
+		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_RX_DROP_SMPL];
+		rate_ctr_add(ctr, ctrs_pending[chan].rx_dropped_samples - ctr->current);
+		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TX_DROP_EV];
+		rate_ctr_add(ctr, ctrs_pending[chan].tx_dropped_events - ctr->current);
+		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TX_DROP_SMPL];
+		rate_ctr_add(ctr, ctrs_pending[chan].tx_dropped_samples - ctr->current);

 		/* Mark as done */
-		dev_ctrs_pending[chan].chan = PENDING_CHAN_NONE;
+		ctrs_pending[chan].chan = PENDING_CHAN_NONE;
 	}
-	if (osmo_timerfd_disable(&dev_rate_ctr_timerfd) < 0)
-		LOGC(DCTR, ERROR) << "Failed to disable timerfd";
-	dev_rate_ctr_mutex.unlock();
-	return 0;
-}
-
-static int trx_rate_ctr_timerfd_cb(struct osmo_fd *ofd, unsigned int what) {
-	size_t chan;
-	struct rate_ctr *ctr;
-	LOGC(DCTR, INFO) << "Main thread is updating Transceiver counters";
-	trx_rate_ctr_mutex.lock();
-	for (chan = 0; chan < chan_len; chan++) {
-		if (trx_ctrs_pending[chan].chan == PENDING_CHAN_NONE)
-			continue;
-		LOGCHAN(chan, DCTR, DEBUG) << "rate_ctr update";
-		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TX_STALE_BURSTS];
-		rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_stale_bursts - ctr->current);
-		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TX_UNAVAILABLE_BURSTS];
-		rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_unavailable_bursts - ctr->current);
-		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TRXD_FN_REPEATED];
-		rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_trxd_fn_repeated - ctr->current);
-		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TRXD_FN_OUTOFORDER];
-		rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_trxd_fn_outoforder - ctr->current);
-		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TRXD_FN_SKIPPED];
-		rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_trxd_fn_skipped - ctr->current);
-		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_RX_EMPTY_BURST];
-		rate_ctr_add(ctr, trx_ctrs_pending[chan].rx_empty_burst - ctr->current);
-		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_RX_CLIPPING];
-		rate_ctr_add(ctr, trx_ctrs_pending[chan].rx_clipping - ctr->current);
-		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_RX_NO_BURST_DETECTED];
-		rate_ctr_add(ctr, trx_ctrs_pending[chan].rx_no_burst_detected - ctr->current);
-		/* Mark as done */
-		trx_ctrs_pending[chan].chan = PENDING_CHAN_NONE;
-	}
-	if (osmo_timerfd_disable(&trx_rate_ctr_timerfd) < 0)
-		LOGC(DCTR, ERROR) << "Failed to disable timerfd";
-	trx_rate_ctr_mutex.unlock();
+	if (osmo_timerfd_disable(&rate_ctr_timerfd) < 0)
+		LOGC(DMAIN, ERROR) << "Failed to disable timerfd";
+	rate_ctr_mutex.unlock();
 	return 0;
 }

@@ -207,8 +154,7 @@ static int trx_rate_ctr_timerfd_cb(struct osmo_fd *ofd, unsigned int what) {
 static int device_sig_cb(unsigned int subsys, unsigned int signal,
 			 void *handler_data, void *signal_data)
 {
-	struct device_counters *dev_ctr;
-	struct trx_counters *trx_ctr;
+	struct device_counters *ctr;
 	/* Delay sched around 20 ms, in case we receive several calls from several
 	 * channels batched */
 	struct timespec next_sched = {.tv_sec = 0, .tv_nsec = 20*1000*1000};
@@ -217,24 +163,14 @@ static int device_sig_cb(unsigned int subsys, unsigned int signal,

 	switch (signal) {
 	case S_DEVICE_COUNTER_CHANGE:
-		dev_ctr = (struct device_counters *)signal_data;
-		LOGCHAN(dev_ctr->chan, DCTR, INFO) << "Received counter change from radioDevice";
-		dev_rate_ctr_mutex.lock();
-		dev_ctrs_pending[dev_ctr->chan] = *dev_ctr;
-		if (osmo_timerfd_schedule(&dev_rate_ctr_timerfd, &next_sched, &intv_sched) < 0) {
-			LOGC(DCTR, ERROR) << "Failed to schedule timerfd: " << errno << " = "<< strerror(errno);
+		ctr = (struct device_counters *)signal_data;
+		LOGCHAN(ctr->chan, DMAIN, NOTICE) << "Received counter change from radioDevice";
+		rate_ctr_mutex.lock();
+		ctrs_pending[ctr->chan] = *ctr;
+		if (osmo_timerfd_schedule(&rate_ctr_timerfd, &next_sched, &intv_sched) < 0) {
+			LOGC(DMAIN, ERROR) << "Failed to schedule timerfd: " << errno << " = "<< strerror(errno);
 		}
-		dev_rate_ctr_mutex.unlock();
-		break;
-	case S_TRX_COUNTER_CHANGE:
-		trx_ctr = (struct trx_counters *)signal_data;
-		LOGCHAN(trx_ctr->chan, DCTR, INFO) << "Received counter change from Transceiver";
-		trx_rate_ctr_mutex.lock();
-		trx_ctrs_pending[trx_ctr->chan] = *trx_ctr;
-		if (osmo_timerfd_schedule(&trx_rate_ctr_timerfd, &next_sched, &intv_sched) < 0) {
-			LOGC(DCTR, ERROR) << "Failed to schedule timerfd: " << errno << " = "<< strerror(errno);
-		}
-		trx_rate_ctr_mutex.unlock();
+		rate_ctr_mutex.unlock();
 		break;
 	default:
 		break;
@@ -259,15 +195,15 @@ static void threshold_timer_cb(void *data)
 	struct ctr_threshold *ctr_thr;
 	struct rate_ctr *rate_ctr;
 	size_t chan;
-	LOGC(DCTR, DEBUG) << "threshold_timer_cb fired!";
+	LOGC(DMAIN, DEBUG) << "threshold_timer_cb fired!";

 	llist_for_each_entry(ctr_thr, &threshold_list, list) {
 		for (chan = 0; chan < chan_len; chan++) {
 			rate_ctr = &rate_ctrs[chan]->ctr[ctr_thr->ctr_id];
-			LOGCHAN(chan, DCTR, INFO) << "checking threshold: " << ctr_threshold_2_vty_str(ctr_thr)
+			LOGCHAN(chan, DMAIN, INFO) << "checking threshold: " << ctr_threshold_2_vty_str(ctr_thr)
 						   << " ("<< rate_ctr->intv[ctr_thr->intv].rate << " vs " << ctr_thr->val << ")";
 			if (rate_ctr->intv[ctr_thr->intv].rate >= ctr_thr->val) {
-				LOGCHAN(chan, DCTR, FATAL) << "threshold reached, stopping! " << ctr_threshold_2_vty_str(ctr_thr)
+				LOGCHAN(chan, DMAIN, FATAL) << "threshold reached, stopping! " << ctr_threshold_2_vty_str(ctr_thr)
 							   << " ("<< rate_ctr->intv[ctr_thr->intv].rate << " vs " << ctr_thr->val << ")";
 				osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL);
 				return;
@@ -319,13 +255,13 @@ static void threshold_timer_update_intv() {

 	llist_for_each_entry(ctr, &threshold_list, list) {
 		secs = ctr_threshold_2_seconds(ctr);
-		if (min_secs > secs)
+		if( min_secs > secs)
 			min_secs = secs;
 	}


-	threshold_timer_sched_secs = OSMO_MAX((int)(min_secs / 2 - 1), 1);
-	LOGC(DCTR, INFO) << "New ctr-error-threshold check interval: "
+	threshold_timer_sched_secs = OSMO_MAX(min_secs / 2 - 1, 1);
+	LOGC(DMAIN, INFO) << "New ctr-error-threshold check interval: "
 			  << threshold_timer_sched_secs << " seconds";
 	osmo_timer_schedule(&threshold_timer, threshold_timer_sched_secs, 0);
 }
@@ -336,27 +272,20 @@ void trx_rate_ctr_init(void *ctx, struct trx_ctx* trx_ctx)
 	size_t  i;
 	trx_rate_ctr_ctx = ctx;
 	chan_len = trx_ctx->cfg.num_chans;
-	dev_ctrs_pending = (struct device_counters*) talloc_zero_size(ctx, chan_len * sizeof(struct device_counters));
-	trx_ctrs_pending = (struct trx_counters*) talloc_zero_size(ctx, chan_len * sizeof(struct trx_counters));
+	ctrs_pending = (struct device_counters*) talloc_zero_size(ctx, chan_len * sizeof(struct device_counters));
 	rate_ctrs = (struct rate_ctr_group**) talloc_zero_size(ctx, chan_len * sizeof(struct rate_ctr_group*));

 	for (i = 0; i < chan_len; i++) {
-		dev_ctrs_pending[i].chan = PENDING_CHAN_NONE;
-		trx_ctrs_pending[i].chan = PENDING_CHAN_NONE;
+		ctrs_pending[i].chan = PENDING_CHAN_NONE;
 		rate_ctrs[i] = rate_ctr_group_alloc(ctx, &trx_chan_ctr_group_desc, i);
 		if (!rate_ctrs[i]) {
-			LOGCHAN(i, DCTR, ERROR) << "Failed to allocate rate ctr";
+			LOGCHAN(i, DMAIN, ERROR) << "Failed to allocate rate ctr";
 			exit(1);
 		}
 	}
-	dev_rate_ctr_timerfd.fd = -1;
-	if (osmo_timerfd_setup(&dev_rate_ctr_timerfd, dev_rate_ctr_timerfd_cb, NULL) < 0) {
-		LOGC(DCTR, ERROR) << "Failed to setup timerfd";
-		exit(1);
-	}
-	trx_rate_ctr_timerfd.fd = -1;
-	if (osmo_timerfd_setup(&trx_rate_ctr_timerfd, trx_rate_ctr_timerfd_cb, NULL) < 0) {
-		LOGC(DCTR, ERROR) << "Failed to setup timerfd";
+	rate_ctr_timerfd.fd = -1;
+	if (osmo_timerfd_setup(&rate_ctr_timerfd, rate_ctr_timerfd_cb, NULL) < 0) {
+		LOGC(DMAIN, ERROR) << "Failed to setup timerfd";
 		exit(1);
 	}
 	osmo_signal_register_handler(SS_DEVICE, device_sig_cb, NULL);
@@ -373,7 +302,7 @@ void trx_rate_ctr_threshold_add(struct ctr_threshold *ctr)

 	new_ctr = talloc_zero(trx_rate_ctr_ctx, struct ctr_threshold);
 	*new_ctr = *ctr;
-	LOGC(DCTR, NOTICE) << "Adding new threshold check: " << ctr_threshold_2_vty_str(new_ctr);
+	LOGC(DMAIN, NOTICE) << "Adding new threshold check: " << ctr_threshold_2_vty_str(new_ctr);
 	llist_add(&new_ctr->list, &threshold_list);
 	threshold_timer_update_intv();
 }
@@ -388,7 +317,7 @@ int trx_rate_ctr_threshold_del(struct ctr_threshold *del_ctr)
 		    ctr->val != del_ctr->val)
 			continue;

-		LOGC(DCTR, NOTICE) << "Deleting threshold check: " << ctr_threshold_2_vty_str(del_ctr);
+		LOGC(DMAIN, NOTICE) << "Deleting threshold check: " << ctr_threshold_2_vty_str(del_ctr);
 		llist_del(&ctr->list);
 		talloc_free(ctr);
 		threshold_timer_update_intv();
--- a/CommonLibs/trx_rate_ctr.h
+++ b/CommonLibs/trx_rate_ctr.h
@@ -4,20 +4,12 @@
 #include <osmocom/vty/command.h>

 enum TrxCtr {
-	TRX_CTR_DEV_RX_OVERRUNS,
-	TRX_CTR_DEV_TX_UNDERRUNS,
-	TRX_CTR_DEV_RX_DROP_EV,
-	TRX_CTR_DEV_RX_DROP_SMPL,
-	TRX_CTR_DEV_TX_DROP_EV,
-	TRX_CTR_DEV_TX_DROP_SMPL,
-	TRX_CTR_TRX_TX_STALE_BURSTS,
-	TRX_CTR_TRX_TX_UNAVAILABLE_BURSTS,
-	TRX_CTR_TRX_TRXD_FN_REPEATED,
-	TRX_CTR_TRX_TRXD_FN_OUTOFORDER,
-	TRX_CTR_TRX_TRXD_FN_SKIPPED,
-	TRX_CTR_TRX_RX_EMPTY_BURST,
-	TRX_CTR_TRX_RX_CLIPPING,
-	TRX_CTR_TRX_RX_NO_BURST_DETECTED,
+	TRX_CTR_RX_OVERRUNS,
+	TRX_CTR_TX_UNDERRUNS,
+	TRX_CTR_RX_DROP_EV,
+	TRX_CTR_RX_DROP_SMPL,
+	TRX_CTR_TX_DROP_EV,
+	TRX_CTR_TX_DROP_SMPL,
 };

 struct ctr_threshold {
--- a/CommonLibs/trx_vty.c
+++ b/CommonLibs/trx_vty.c
@@ -67,15 +67,6 @@ static const struct value_string filler_types[] = {
 	{ 0,			NULL }
 };

-static const struct value_string filler_docs[] = {
-	{ FILLER_DUMMY,		"Send a Dummy Burst on C0 (TRX0) and empty burst on other channels" },
-	{ FILLER_ZERO,		"Send an empty burst (default)" },
-	{ FILLER_NORM_RAND,	"Send a GMSK modulated Normal Burst with random bits (spectrum mask testing)" },
-	{ FILLER_EDGE_RAND,	"Send an 8-PSK modulated Normal Burst with random bits (spectrum mask testing)" },
-	{ FILLER_ACCESS_RAND,	"Send an Access Burst with random bits (Rx/Tx alignment testing)" },
-	{ 0,			NULL }
-};
-

 struct trx_ctx *trx_from_vty(struct vty *v)
 {
@@ -121,7 +112,7 @@ DEFUN(cfg_trx, cfg_trx_cmd,
 }

 DEFUN(cfg_bind_ip, cfg_bind_ip_cmd,
-	"bind-ip " VTY_IPV4_CMD,
+	"bind-ip A.B.C.D",
 	"Set the IP address for the local bind\n"
 	"IPv4 Address\n")
 {
@@ -133,7 +124,7 @@ DEFUN(cfg_bind_ip, cfg_bind_ip_cmd,
 }

 DEFUN(cfg_remote_ip, cfg_remote_ip_cmd,
-	"remote-ip " VTY_IPV4_CMD,
+	"remote-ip A.B.C.D",
 	"Set the IP address for the remote BTS\n"
 	"IPv4 Address\n")
 {
@@ -171,9 +162,7 @@ DEFUN(cfg_dev_args, cfg_dev_args_cmd,
 DEFUN(cfg_tx_sps, cfg_tx_sps_cmd,
 	"tx-sps (1|4)",
 	"Set the Tx Samples-per-Symbol\n"
-	"Tx Samples-per-Symbol\n"
-	"1 Sample-per-Symbol\n"
-	"4 Samples-per-Symbol\n")
+	"Tx Samples-per-Symbol\n")
 {
 	struct trx_ctx *trx = trx_from_vty(vty);

@@ -185,9 +174,7 @@ DEFUN(cfg_tx_sps, cfg_tx_sps_cmd,
 DEFUN(cfg_rx_sps, cfg_rx_sps_cmd,
 	"rx-sps (1|4)",
 	"Set the Rx Samples-per-Symbol\n"
-	"Rx Samples-per-Symbol\n"
-	"1 Sample-per-Symbol\n"
-	"4 Samples-per-Symbol\n")
+	"Rx Samples-per-Symbol\n")
 {
 	struct trx_ctx *trx = trx_from_vty(vty);

@@ -212,8 +199,7 @@ DEFUN(cfg_clock_ref, cfg_clock_ref_cmd,

 DEFUN(cfg_multi_arfcn, cfg_multi_arfcn_cmd,
 	"multi-arfcn (disable|enable)",
-	"Multi-ARFCN transceiver mode (default=disable)\n"
-	"Enable multi-ARFCN mode\n" "Disable multi-ARFCN mode\n")
+	"Enable multi-ARFCN transceiver (default=disable)\n")
 {
 	struct trx_ctx *trx = trx_from_vty(vty);

@@ -244,38 +230,21 @@ DEFUN(cfg_offset, cfg_offset_cmd,
 	return CMD_SUCCESS;
 }

-DEFUN_ATTR(cfg_freq_offset, cfg_freq_offset_cmd,
-	   "freq-offset FLOAT",
-	   "Apply an artificial offset to Rx/Tx carrier frequency\n"
-	   "Frequency offset in kHz (e.g. -145300)\n",
-	   CMD_ATTR_HIDDEN)
-{
-	struct trx_ctx *trx = trx_from_vty(vty);
-
-	trx->cfg.freq_offset_khz = atof(argv[0]);
-
-	return CMD_SUCCESS;
-}
-
 DEFUN(cfg_rssi_offset, cfg_rssi_offset_cmd,
-	"rssi-offset FLOAT [relative]",
+	"rssi-offset FLOAT",
 	"Set the RSSI to dBm offset in dB (default=0)\n"
-	"RSSI to dBm offset in dB\n"
-	"Add to the default rssi-offset value instead of completely replacing it\n")
+	"RSSI to dBm offset in dB\n")
 {
 	struct trx_ctx *trx = trx_from_vty(vty);

 	trx->cfg.rssi_offset = atof(argv[0]);
-	trx->cfg.force_rssi_offset = (argc == 1);

 	return CMD_SUCCESS;
 }

 DEFUN(cfg_swap_channels, cfg_swap_channels_cmd,
 	"swap-channels (disable|enable)",
-	"Swap primary and secondary channels of the PHY (if any)\n"
-	"Do not swap primary and secondary channels (default)\n"
-	"Swap primary and secondary channels\n")
+	"Swap channels (default=disable)\n")
 {
 	struct trx_ctx *trx = trx_from_vty(vty);

@@ -292,9 +261,7 @@ DEFUN(cfg_swap_channels, cfg_swap_channels_cmd,

 DEFUN(cfg_egprs, cfg_egprs_cmd,
 	"egprs (disable|enable)",
-	"EGPRS (8-PSK demodulation) support (default=disable)\n"
-	"Disable EGPRS (8-PSK demodulation) support\n"
-	"Enable EGPRS (8-PSK demodulation) support\n")
+	"Enable EDGE receiver (default=disable)\n")
 {
 	struct trx_ctx *trx = trx_from_vty(vty);

@@ -311,9 +278,7 @@ DEFUN(cfg_egprs, cfg_egprs_cmd,

 DEFUN(cfg_ext_rach, cfg_ext_rach_cmd,
 	"ext-rach (disable|enable)",
-	"11-bit Access Burst correlation support (default=disable)\n"
-	"Disable 11-bit Access Burst (TS1 & TS2) correlation\n"
-	"Enable 11-bit Access Burst (TS1 & TS2) correlation\n")
+	"Enable extended (11-bit) RACH (default=disable)\n")
 {
 	struct trx_ctx *trx = trx_from_vty(vty);

@@ -326,7 +291,7 @@ DEFUN(cfg_ext_rach, cfg_ext_rach_cmd,
 	return CMD_SUCCESS;
 }

-DEFUN_DEPRECATED(cfg_rt_prio, cfg_rt_prio_cmd,
+DEFUN(cfg_rt_prio, cfg_rt_prio_cmd,
 	"rt-prio <1-32>",
 	"Set the SCHED_RR real-time priority\n"
 	"Real time priority\n")
@@ -334,8 +299,6 @@ DEFUN_DEPRECATED(cfg_rt_prio, cfg_rt_prio_cmd,
 	struct trx_ctx *trx = trx_from_vty(vty);

 	trx->cfg.sched_rr = atoi(argv[0]);
-	vty_out (vty, "%% 'rt-prio %u' is deprecated, use 'policy rr %u' under 'sched' node instead%s",
-		 trx->cfg.sched_rr, trx->cfg.sched_rr, VTY_NEWLINE);

 	return CMD_SUCCESS;
 }
@@ -352,11 +315,20 @@ DEFUN(cfg_stack_size, cfg_stack_size_cmd,
 	return CMD_SUCCESS;
 }

-#define CFG_FILLER_DOC_STR \
-	"Filler burst settings\n"
-
 DEFUN(cfg_filler, cfg_filler_type_cmd,
-      "AUTO-GENERATED", "AUTO-GENERATED")
+	"filler type (zero|dummy|random-nb-gmsk|random-nb-8psk|random-ab)",
+	"Filler burst settings\n"
+	"Filler burst type (default=zero)\n"
+	"Send an empty burst when there is nothing to send (default)\n"
+	"Send a dummy burst when there is nothing to send on C0 (TRX0) and empty burst on other channels."
+	" Use for OpenBTS compatibility only, don't use with OsmoBTS as it breaks encryption.\n"
+	"Send a GMSK modulated Normal Burst with random bits when there is nothing to send."
+	" Use for spectrum mask testing. Configure 'filler tsc' to set training sequence.\n"
+	"Send an 8-PSK modulated Normal Burst with random bits when there is nothing to send."
+	" Use for spectrum mask testing. Configure 'filler tsc' to set training sequence.\n"
+	"Send an Access Burst with random bits when there is nothing to send. Use for Rx/Tx alignment."
+	" Configure 'filler access-burst-delay' to introduce artificial delay.\n"
+)
 {
 	struct trx_ctx *trx = trx_from_vty(vty);
 	// trx->cfg.filler is unsigned, so we need an interim int var to detect errors
@@ -373,7 +345,7 @@ DEFUN(cfg_filler, cfg_filler_type_cmd,

 DEFUN(cfg_test_rtsc, cfg_filler_tsc_cmd,
 	"filler tsc <0-7>",
-	CFG_FILLER_DOC_STR
+	"Filler burst settings\n"
 	"Set the TSC for GMSK/8-PSK Normal Burst random fillers. Used only with 'random-nb-gmsk' and"
 	" 'random-nb-8psk' filler types. (default=0)\n"
 	"TSC\n")
@@ -387,7 +359,7 @@ DEFUN(cfg_test_rtsc, cfg_filler_tsc_cmd,

 DEFUN(cfg_test_rach_delay, cfg_filler_rach_delay_cmd,
 	"filler access-burst-delay <0-68>",
-	CFG_FILLER_DOC_STR
+	"Filler burst settings\n"
 	"Set the delay for Access Burst random fillers. Used only with 'random-ab' filler type. (default=0)\n"
 	"RACH delay in symbols\n")
 {
@@ -418,7 +390,7 @@ static int vty_intv_name_2_id(const char* str) {
 	return -1;
 }

-#define THRESHOLD_ARGS "(rx_overruns|tx_underruns|rx_drop_events|rx_drop_samples|tx_drop_events|tx_drop_samples|tx_stale_bursts|tx_unavailable_bursts|tx_trxd_fn_repeated|tx_trxd_fn_outoforder|tx_trxd_fn_skipped)"
+#define THRESHOLD_ARGS "(rx_overruns|tx_underruns|rx_drop_events|rx_drop_samples|tx_drop_events|tx_drop_samples)"
 #define THRESHOLD_STR_VAL(s) "Set threshold value for rate_ctr device:" OSMO_STRINGIFY_VAL(s) "\n"
 #define THRESHOLD_STRS \
 	THRESHOLD_STR_VAL(rx_overruns) \
@@ -426,13 +398,7 @@ static int vty_intv_name_2_id(const char* str) {
 	THRESHOLD_STR_VAL(rx_drop_events) \
 	THRESHOLD_STR_VAL(rx_drop_samples) \
 	THRESHOLD_STR_VAL(tx_drop_events) \
-	THRESHOLD_STR_VAL(tx_drop_samples) \
-	THRESHOLD_STR_VAL(tx_stale_bursts) \
-	THRESHOLD_STR_VAL(tx_unavailable_bursts) \
-	THRESHOLD_STR_VAL(tx_trxd_fn_repeated) \
-	THRESHOLD_STR_VAL(tx_trxd_fn_outoforder) \
-	THRESHOLD_STR_VAL(tx_trxd_fn_skipped) \
-	""
+	THRESHOLD_STR_VAL(tx_drop_samples)
 #define INTV_ARGS "(per-second|per-minute|per-hour|per-day)"
 #define INTV_STR_VAL(s) "Threshold value sampled " OSMO_STRINGIFY_VAL(s) "\n"
 #define INTV_STRS \
@@ -441,13 +407,12 @@ static int vty_intv_name_2_id(const char* str) {
 	INTV_STR_VAL(per-hour) \
 	INTV_STR_VAL(per-day)

-DEFUN_ATTR(cfg_ctr_error_threshold, cfg_ctr_error_threshold_cmd,
-	   "ctr-error-threshold " THRESHOLD_ARGS " <0-65535> " INTV_ARGS,
-	   "Threshold rate for error counter\n"
-	   THRESHOLD_STRS
-	   "Value to set for threshold\n"
-	   INTV_STRS,
-	   CMD_ATTR_IMMEDIATE)
+DEFUN(cfg_ctr_error_threshold, cfg_ctr_error_threshold_cmd,
+	"ctr-error-threshold " THRESHOLD_ARGS " <0-65535> " INTV_ARGS,
+	"Threshold rate for error counter\n"
+	THRESHOLD_STRS
+	"Value to set for threshold\n"
+	INTV_STRS)
 {
 	int rc;
 	struct ctr_threshold ctr;
@@ -473,13 +438,12 @@ DEFUN_ATTR(cfg_ctr_error_threshold, cfg_ctr_error_threshold_cmd,
 	return CMD_SUCCESS;
 }

-DEFUN_ATTR(cfg_no_ctr_error_threshold, cfg_no_ctr_error_threshold_cmd,
-	   "no ctr-error-threshold " THRESHOLD_ARGS " <0-65535> " INTV_ARGS,
-	   NO_STR "Threshold rate for error counter\n"
-	   THRESHOLD_STRS
-	   "Value to set for threshold\n"
-	   INTV_STRS,
-	   CMD_ATTR_IMMEDIATE)
+DEFUN(cfg_no_ctr_error_threshold, cfg_no_ctr_error_threshold_cmd,
+	"no ctr-error-threshold " THRESHOLD_ARGS " <0-65535> " INTV_ARGS,
+	NO_STR "Threshold rate for error counter\n"
+	THRESHOLD_STRS
+	"Value to set for threshold\n"
+	INTV_STRS)
 {
 	int rc;
 	struct ctr_threshold ctr;
@@ -548,12 +512,6 @@ DEFUN(cfg_chan_rx_path, cfg_chan_rx_path_cmd,
 {
 	struct trx_chan *chan = vty->index;

-	if (chan->trx->cfg.multi_arfcn && chan->idx > 0) {
-		vty_out(vty, "%% Setting 'rx-path' for chan %u in multi-ARFCN mode "
-			     "does not make sense, because only chan 0 is used%s",
-			chan->idx, VTY_NEWLINE);
-	}
-
 	osmo_talloc_replace_string(chan->trx, &chan->rx_path, argv[0]);

 	return CMD_SUCCESS;
@@ -566,12 +524,6 @@ DEFUN(cfg_chan_tx_path, cfg_chan_tx_path_cmd,
 {
 	struct trx_chan *chan = vty->index;

-	if (chan->trx->cfg.multi_arfcn && chan->idx > 0) {
-		vty_out(vty, "%% Setting 'tx-path' for chan %u in multi-ARFCN mode "
-			     "does not make sense, because only chan 0 is used%s",
-			chan->idx, VTY_NEWLINE);
-	}
-
 	osmo_talloc_replace_string(chan->trx, &chan->tx_path, argv[0]);

 	return CMD_SUCCESS;
@@ -606,11 +558,8 @@ static int config_write_trx(struct vty *vty)
 	vty_out(vty, " multi-arfcn %s%s", trx->cfg.multi_arfcn ? "enable" : "disable", VTY_NEWLINE);
 	if (trx->cfg.offset != 0)
 		vty_out(vty, " offset %f%s", trx->cfg.offset, VTY_NEWLINE);
-	if (trx->cfg.freq_offset_khz != 0)
-		vty_out(vty, " freq-offset %f%s", trx->cfg.freq_offset_khz, VTY_NEWLINE);
-	if (!(trx->cfg.rssi_offset == 0 && !trx->cfg.force_rssi_offset))
-		vty_out(vty, " rssi-offset %f%s%s", trx->cfg.rssi_offset,
-			trx->cfg.force_rssi_offset ? " relative": "", VTY_NEWLINE);
+	if (trx->cfg.rssi_offset != 0)
+		vty_out(vty, " rssi-offset %f%s", trx->cfg.rssi_offset, VTY_NEWLINE);
 	vty_out(vty, " swap-channels %s%s", trx->cfg.swap_channels ? "enable" : "disable", VTY_NEWLINE);
 	vty_out(vty, " egprs %s%s", trx->cfg.egprs ? "enable" : "disable", VTY_NEWLINE);
 	vty_out(vty, " ext-rach %s%s", trx->cfg.ext_rach ? "enable" : "disable", VTY_NEWLINE);
@@ -745,19 +694,12 @@ struct trx_ctx *vty_trx_ctx_alloc(void *talloc_ctx)
 	trx->cfg.tx_sps = DEFAULT_TX_SPS;
 	trx->cfg.rx_sps = DEFAULT_RX_SPS;
 	trx->cfg.filler = FILLER_ZERO;
-	trx->cfg.rssi_offset = 0.0f;

 	return trx;
 }

 int trx_vty_init(struct trx_ctx* trx)
 {
-	cfg_filler_type_cmd.string = vty_cmd_string_from_valstr(trx, filler_types,
-		"filler type (", "|", ")", 0);
-	cfg_filler_type_cmd.doc = vty_cmd_string_from_valstr(trx, filler_docs,
-		CFG_FILLER_DOC_STR "What to do when there is nothing to send "
-		"(filler type, default=zero)\n", "\n", "", 0);
-
 	g_trx_ctx = trx;
 	install_element_ve(&show_trx_cmd);

@@ -773,7 +715,6 @@ int trx_vty_init(struct trx_ctx* trx)
 	install_element(TRX_NODE, &cfg_clock_ref_cmd);
 	install_element(TRX_NODE, &cfg_multi_arfcn_cmd);
 	install_element(TRX_NODE, &cfg_offset_cmd);
-	install_element(TRX_NODE, &cfg_freq_offset_cmd);
 	install_element(TRX_NODE, &cfg_rssi_offset_cmd);
 	install_element(TRX_NODE, &cfg_swap_channels_cmd);
 	install_element(TRX_NODE, &cfg_egprs_cmd);
--- a/CommonLibs/trx_vty.h
+++ b/CommonLibs/trx_vty.h
@@ -8,6 +8,8 @@ extern struct vty_app_info g_vty_info;
 extern const struct value_string clock_ref_names[];
 extern const struct value_string filler_names[];

+/* Maximum number of physical RF channels */
+#define TRX_CHAN_MAX 8
 /* Maximum number of carriers in multi-ARFCN mode */
 #define TRX_MCHAN_MAX 3

@@ -33,8 +35,38 @@ extern const struct value_string filler_names[];
 #define DEFAULT_TRX_IP		"127.0.0.1"
 #define DEFAULT_CHANS		1

+struct trx_ctx;
+
+struct trx_chan {
+	struct trx_ctx *trx; /* backpointer */
+	unsigned int idx; /* channel index */
+	char *rx_path;
+	char *tx_path;
+};
+
 struct trx_ctx {
-	struct trx_cfg cfg;
+	struct {
+		char *bind_addr;
+		char *remote_addr;
+		char *dev_args;
+		unsigned int base_port;
+		unsigned int tx_sps;
+		unsigned int rx_sps;
+		unsigned int rtsc;
+		unsigned int rach_delay;
+		enum ReferenceType clock_ref;
+		enum FillerType filler;
+		bool multi_arfcn;
+		double offset;
+		double rssi_offset;
+		bool swap_channels;
+		bool ext_rach;
+		bool egprs;
+		unsigned int sched_rr;
+		unsigned int stack_size;
+		unsigned int num_chans;
+		struct trx_chan chans[TRX_CHAN_MAX];
+	} cfg;
 };

 int trx_vty_init(struct trx_ctx* trx);
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,22 +28,17 @@ AM_CXXFLAGS = -Wall -pthread

 # Order must be preserved
 SUBDIRS = \
+	doc \
 	CommonLibs \
 	GSM \
 	Transceiver52M \
 	contrib \
-	tests \
-	utils \
-	doc \
-	$(NULL)
+	tests

 EXTRA_DIST = \
 	LEGAL \
 	COPYING \
-	README.md \
-	contrib/osmo-trx.spec.in \
-	debian \
-	$(NULL)
+	README.md

 AM_DISTCHECK_CONFIGURE_FLAGS = \
 	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-About OsmoTRX
-=============
+About OsmTRX
+============

 OsmoTRX is a software-defined radio transceiver that implements the Layer 1
 physical layer of a BTS comprising the following 3GPP specifications:
@@ -9,12 +9,14 @@ physical layer of a BTS comprising the following 3GPP specifications:
 * TS 05.04 "Modulation"
 * TS 05.10 "Radio subsystem synchronization"

-OsmoTRX is originally based on the transceiver code from the
+OsmoTRX is based on the transceiver code from the
 [OpenBTS](https://osmocom.org/projects/osmobts/wiki/OpenBTS) project, but setup
 to operate independently with the purpose of using with non-OpenBTS software and
-projects, specifically within the Osmocom stack.  Used together with
-[OsmoBTS](https://osmocom.org/projects/osmobts/wiki) you can get a pretty
-standard GSM BTS with Abis interface as per the relevant 3GPP specifications.
+projects, while still maintaining backwards compatibility with OpenBTS when
+possible. Currently there are numerous features contained in OsmoTRX that extend
+the functionality of the OpenBTS transceiver. These features include enhanced
+support for various embedded platforms - notably ARM - and dual channel
+diversity support for the Fairwaves umtrx.

 Homepage
 --------
@@ -29,7 +31,7 @@ You can clone from the official osmo-trx.git repository using

        git clone git://git.osmocom.org/osmo-trx.git

-There is a cgit interface at <https://git.osmocom.org/osmo-trx/>
+There is a cgit interface at <http://git.osmocom.org/osmo-trx/>

 Documentation
 -------------
@@ -37,7 +39,7 @@ Documentation
 Doxygen-generated API documentation is generated during the build process, but
 also available online for each of the sub-libraries at User Manual for OsmoTRX
 can be generated during the build process, and is also available online at
-<https://ftp.osmocom.org/docs/latest/osmotrx-usermanual.pdf>.
+<http://ftp.osmocom.org/docs/latest/osmotrx-usermanual.pdf>.

 Mailing List
 ------------
--- a/0
+++ b/0
--- a/Transceiver52M/ChannelizerBase.cpp
+++ b/Transceiver52M/ChannelizerBase.cpp
@@ -244,7 +244,6 @@ ChannelizerBase::~ChannelizerBase()
 		free(subFilters[i]);
 		delete[] hist[i];
 	}
-	free(subFilters);

 	fft_free(fftInput);
 	fft_free(fftOutput);
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -105,12 +105,10 @@ osmo_trx_lms_LDADD = \
 osmo_trx_lms_CPPFLAGS  = $(AM_CPPFLAGS) $(LMS_CFLAGS)
 endif

-if DEVICE_IPC
 bin_PROGRAMS += osmo-trx-ipc
 osmo_trx_ipc_SOURCES = osmo-trx.cpp
 osmo_trx_ipc_LDADD = \
 	$(builddir)/device/ipc/libdevice.la \
-	$(COMMON_LDADD)
-osmo_trx_ipc_CPPFLAGS  = $(AM_CPPFLAGS)
-endif
-
+	$(COMMON_LDADD) \
+	$(UHD_LIBS)
+osmo_trx_ipc_CPPFLAGS  = $(AM_CPPFLAGS) $(UHD_CFLAGS)
--- a/Transceiver52M/Resampler.cpp
+++ b/Transceiver52M/Resampler.cpp
@@ -99,7 +99,6 @@ void Resampler::initFilters(float bw)
 		reverse(&part[0], &part[filt_len]);
 }

-#ifndef __OPTIMIZE__
 static bool check_vec_len(int in_len, int out_len, int p, int q)
 {
 	if (in_len % q) {
@@ -130,15 +129,14 @@ static bool check_vec_len(int in_len, int out_len, int p, int q)

 	return true;
 }
-#endif

 int Resampler::rotate(const float *in, size_t in_len, float *out, size_t out_len)
 {
 	int n, path;
-#ifndef __OPTIMIZE__
+
 	if (!check_vec_len(in_len, out_len, p, q))
 		return -1;
-#endif
+
 	/* Generate output from precomputed input/output paths */
 	for (size_t i = 0; i < out_len; i++) {
 		n = in_index[i];
--- a/Transceiver52M/Transceiver.cpp
+++ b/Transceiver52M/Transceiver.cpp
@@ -37,7 +37,6 @@ extern "C" {
 #include <osmocom/core/utils.h>
 #include <osmocom/core/socket.h>
 #include <osmocom/core/bits.h>
-#include <osmocom/vty/cpu_sched_vty.h>
 }

 #ifdef HAVE_CONFIG_H
@@ -53,17 +52,8 @@ Transceiver *transceiver;
 /* Number of running values use in noise average */
 #define NOISE_CNT			20

-
-static void dispatch_trx_rate_ctr_change(TransceiverState *state, unsigned int chan) {
-        thread_enable_cancel(false);
-        state->ctrs.chan = chan;
-        osmo_signal_dispatch(SS_DEVICE, S_TRX_COUNTER_CHANGE, &state->ctrs);
-        thread_enable_cancel(true);
-}
-
 TransceiverState::TransceiverState()
-  : mFiller(FILLER_ZERO), mRetrans(false), mNoiseLev(0.0), mNoises(NOISE_CNT),
-    mPower(0.0), mMuted(false), first_dl_fn_rcv()
+  : mRetrans(false), mNoiseLev(0.0), mNoises(NOISE_CNT), mPower(0.0)
 {
  for (int i = 0; i < 8; i++) {
    chanType[i] = Transceiver::NONE;
@@ -75,7 +65,6 @@ TransceiverState::TransceiverState()
    for (int n = 0; n < 102; n++)
      fillerTable[n][i] = NULL;
  }
-  memset(&ctrs, 0, sizeof(struct trx_counters));
 }

 TransceiverState::~TransceiverState()
@@ -97,8 +86,6 @@ bool TransceiverState::init(FillerType filler, size_t sps, float scale, size_t r
  if ((sps != 1) && (sps != 4))
    return false;

-  mFiller = filler;
-
  for (size_t n = 0; n < 8; n++) {
    for (size_t i = 0; i < 102; i++) {
      switch (filler) {
@@ -132,21 +119,26 @@ bool TransceiverState::init(FillerType filler, size_t sps, float scale, size_t r
  return false;
 }

-Transceiver::Transceiver(const struct trx_cfg *cfg,
+Transceiver::Transceiver(int wBasePort,
+                         const char *TRXAddress,
+                         const char *GSMcoreAddress,
+                         size_t tx_sps, size_t rx_sps, size_t chans,
                         GSM::Time wTransmitLatency,
-                         RadioInterface *wRadioInterface)
-  : cfg(cfg), mClockSocket(-1),
-    mRxLowerLoopThread(nullptr), mTxLowerLoopThread(nullptr),
-    mTransmitLatency(wTransmitLatency), mRadioInterface(wRadioInterface),
-    mChans(cfg->num_chans), mOn(false), mForceClockInterface(false),
-    mTxFreq(0.0), mRxFreq(0.0), mTSC(0), mMaxExpectedDelayAB(0),
-    mMaxExpectedDelayNB(0), mWriteBurstToDiskMask(0)
+                         RadioInterface *wRadioInterface,
+                         double wRssiOffset, int wStackSize)
+  : mBasePort(wBasePort), mLocalAddr(TRXAddress), mRemoteAddr(GSMcoreAddress),
+    mClockSocket(-1), mTransmitLatency(wTransmitLatency), mRadioInterface(wRadioInterface),
+    rssiOffset(wRssiOffset), stackSize(wStackSize),
+    mSPSTx(tx_sps), mSPSRx(rx_sps), mChans(chans), mExtRACH(false), mEdge(false),
+    mOn(false), mForceClockInterface(false),
+    mTxFreq(0.0), mRxFreq(0.0), mTSC(0), mMaxExpectedDelayAB(0), mMaxExpectedDelayNB(0),
+    mWriteBurstToDiskMask(0)
 {
  txFullScale = mRadioInterface->fullScaleInputValue();
  rxFullScale = mRadioInterface->fullScaleOutputValue();

-  for (size_t i = 0; i < ARRAY_SIZE(mHandover); i++) {
-    for (size_t j = 0; j < ARRAY_SIZE(mHandover[i]); j++)
+  for (int i = 0; i < 8; i++) {
+    for (int j = 0; j < 8; j++)
      mHandover[i][j] = false;
  }
 }
@@ -194,9 +186,11 @@ int Transceiver::ctrl_sock_cb(struct osmo_fd *bfd, unsigned int flags)
 * are still expected to report clock indications through control channel
 * activity.
 */
-bool Transceiver::init()
+bool Transceiver::init(FillerType filler, size_t rtsc, unsigned rach_delay,
+                       bool edge, bool ext_rach)
 {
  int d_srcport, d_dstport, c_srcport, c_dstport;
+
  if (!mChans) {
    LOG(FATAL) << "No channels assigned";
    return false;
@@ -207,6 +201,9 @@ bool Transceiver::init()
    return false;
  }

+  mExtRACH = ext_rach;
+  mEdge = edge;
+
  mDataSockets.resize(mChans, -1);
  mCtrlSockets.resize(mChans);
  mTxPriorityQueueServiceLoopThreads.resize(mChans);
@@ -218,28 +215,27 @@ bool Transceiver::init()
  mVersionTRXD.resize(mChans);

  /* Filler table retransmissions - support only on channel 0 */
-  if (cfg->filler == FILLER_DUMMY)
+  if (filler == FILLER_DUMMY)
    mStates[0].mRetrans = true;

  /* Setup sockets */
  mClockSocket = osmo_sock_init2(AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP,
-				    cfg->bind_addr, cfg->base_port,
-				    cfg->remote_addr, cfg->base_port + 100,
+				    mLocalAddr.c_str(), mBasePort,
+				    mRemoteAddr.c_str(), mBasePort + 100,
 				    OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT);
  if (mClockSocket < 0)
    return false;

  for (size_t i = 0; i < mChans; i++) {
    int rv;
-    FillerType filler = cfg->filler;
-    c_srcport = cfg->base_port + 2 * i + 1;
-    c_dstport = cfg->base_port + 2 * i + 101;
-    d_srcport = cfg->base_port + 2 * i + 2;
-    d_dstport = cfg->base_port + 2 * i + 102;
+    c_srcport = mBasePort + 2 * i + 1;
+    c_dstport = mBasePort + 2 * i + 101;
+    d_srcport = mBasePort + 2 * i + 2;
+    d_dstport = mBasePort + 2 * i + 102;

    rv = osmo_sock_init2_ofd(&mCtrlSockets[i].conn_bfd, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP,
-                                      cfg->bind_addr, c_srcport,
-                                      cfg->remote_addr, c_dstport,
+                                      mLocalAddr.c_str(), c_srcport,
+                                      mRemoteAddr.c_str(), c_dstport,
 				      OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT);
    if (rv < 0)
      return false;
@@ -249,8 +245,8 @@ bool Transceiver::init()


    mDataSockets[i] = osmo_sock_init2(AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP,
-                                      cfg->bind_addr, d_srcport,
-                                      cfg->remote_addr, d_dstport,
+                                      mLocalAddr.c_str(), d_srcport,
+                                      mRemoteAddr.c_str(), d_dstport,
 				      OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT);
    if (mDataSockets[i] < 0)
      return false;
@@ -258,7 +254,7 @@ bool Transceiver::init()
    if (i && filler == FILLER_DUMMY)
      filler = FILLER_ZERO;

-    mStates[i].init(filler, cfg->tx_sps, txFullScale, cfg->rtsc, cfg->rach_delay);
+    mStates[i].init(filler, mSPSTx, txFullScale, rtsc, rach_delay);
  }

  /* Randomize the central clock */
@@ -300,8 +296,8 @@ bool Transceiver::start()
  }

  /* Device is running - launch I/O threads */
-  mRxLowerLoopThread = new Thread(cfg->stack_size);
-  mTxLowerLoopThread = new Thread(cfg->stack_size);
+  mRxLowerLoopThread = new Thread(stackSize);
+  mTxLowerLoopThread = new Thread(stackSize);
  mTxLowerLoopThread->start((void * (*)(void*))
                            TxLowerLoopAdapter,(void*) this);
  mRxLowerLoopThread->start((void * (*)(void*))
@@ -312,14 +308,14 @@ bool Transceiver::start()
    TrxChanThParams *params = (TrxChanThParams *)malloc(sizeof(struct TrxChanThParams));
    params->trx = this;
    params->num = i;
-    mRxServiceLoopThreads[i] = new Thread(cfg->stack_size);
+    mRxServiceLoopThreads[i] = new Thread(stackSize);
    mRxServiceLoopThreads[i]->start((void * (*)(void*))
                            RxUpperLoopAdapter, (void*) params);

    params = (TrxChanThParams *)malloc(sizeof(struct TrxChanThParams));
    params->trx = this;
    params->num = i;
-    mTxPriorityQueueServiceLoopThreads[i] = new Thread(cfg->stack_size);
+    mTxPriorityQueueServiceLoopThreads[i] = new Thread(stackSize);
    mTxPriorityQueueServiceLoopThreads[i]->start((void * (*)(void*))
                            TxUpperLoopAdapter, (void*) params);
  }
@@ -392,11 +388,11 @@ void Transceiver::addRadioVector(size_t chan, BitVector &bits,

  /* Use the number of bits as the EDGE burst indicator */
  if (bits.size() == EDGE_BURST_NBITS)
-    burst = modulateEdgeBurst(bits, cfg->tx_sps);
+    burst = modulateEdgeBurst(bits, mSPSTx);
  else
-    burst = modulateBurst(bits, 8 + (wTime.TN() % 4 == 0), cfg->tx_sps);
+    burst = modulateBurst(bits, 8 + (wTime.TN() % 4 == 0), mSPSTx);

-  scaleVector(*burst, txFullScale * pow(10, (double) -RSSI / 20));
+  scaleVector(*burst, txFullScale * pow(10, -RSSI / 10));

  radio_burst = new radioVector(wTime, burst);

@@ -424,29 +420,24 @@ void Transceiver::pushRadioVector(GSM::Time &nowTime)
  std::vector<signalVector *> bursts(mChans);
  std::vector<bool> zeros(mChans);
  std::vector<bool> filler(mChans, true);
-  bool ratectr_changed;
-
-  TN = nowTime.TN();

  for (size_t i = 0; i < mChans; i ++) {
    state = &mStates[i];
-    ratectr_changed = false;
-
-    zeros[i] = state->chanType[TN] == NONE || state->mMuted;
-
-    Mutex *mtx = mTxPriorityQueues[i].getMutex();
-    mtx->lock();

    while ((burst = mTxPriorityQueues[i].getStaleBurst(nowTime))) {
-      LOGCHAN(i, DTRXDDL, INFO) << "dumping STALE burst in TRX->SDR interface ("
+      LOGCHAN(i, DTRXDDL, NOTICE) << "dumping STALE burst in TRX->SDR interface ("
                  << burst->getTime() <<" vs " << nowTime << "), retrans=" << state->mRetrans;
-      state->ctrs.tx_stale_bursts++;
-      ratectr_changed = true;
      if (state->mRetrans)
        updateFillerTable(i, burst);
      delete burst;
    }

+    TN = nowTime.TN();
+    modFN = nowTime.FN() % state->fillerModulus[TN];
+
+    bursts[i] = state->fillerTable[modFN][TN];
+    zeros[i] = state->chanType[TN] == NONE;
+
    if ((burst = mTxPriorityQueues[i].getCurrentBurst(nowTime))) {
      bursts[i] = burst->getVector();

@@ -458,21 +449,7 @@ void Transceiver::pushRadioVector(GSM::Time &nowTime)
      }

      delete burst;
-    } else {
-      modFN = nowTime.FN() % state->fillerModulus[TN];
-      bursts[i] = state->fillerTable[modFN][TN];
-      if (i == 0 && state->mFiller == FILLER_ZERO) {
-        LOGCHAN(i, DTRXDDL, INFO) << "No Tx burst available for " << nowTime
-                                    << ", retrans=" << state->mRetrans;
-        state->ctrs.tx_unavailable_bursts++;
-        ratectr_changed = true;
-      }
    }
-
-    mtx->unlock();
-
-    if (ratectr_changed)
-      dispatch_trx_rate_ctr_change(state, i);
  }

  mRadioInterface->driveTransmitRadio(bursts, zeros);
@@ -557,16 +534,16 @@ CorrType Transceiver::expectedCorrType(GSM::Time currTime,
    break;
  case IV:
  case VI:
-    return cfg->ext_rach ? EXT_RACH : RACH;
+    return mExtRACH ? EXT_RACH : RACH;
    break;
  case V: {
    int mod51 = burstFN % 51;
    if ((mod51 <= 36) && (mod51 >= 14))
-      return cfg->ext_rach ? EXT_RACH : RACH;
+      return mExtRACH ? EXT_RACH : RACH;
    else if ((mod51 == 4) || (mod51 == 5))
-      return cfg->ext_rach ? EXT_RACH : RACH;
+      return mExtRACH ? EXT_RACH : RACH;
    else if ((mod51 == 45) || (mod51 == 46))
-      return cfg->ext_rach ? EXT_RACH : RACH;
+      return mExtRACH ? EXT_RACH : RACH;
    else if (mHandover[burstTN][sdcch4_subslot[burstFN % 102]])
      return RACH;
    else
@@ -584,11 +561,11 @@ CorrType Transceiver::expectedCorrType(GSM::Time currTime,
  case XIII: {
    int mod52 = burstFN % 52;
    if ((mod52 == 12) || (mod52 == 38))
-      return cfg->ext_rach ? EXT_RACH : RACH;
+      return mExtRACH ? EXT_RACH : RACH;
    else if ((mod52 == 25) || (mod52 == 51))
      return IDLE;
    else /* Enable 8-PSK burst detection if EDGE is enabled */
-      return cfg->egprs ? EDGE : TSC;
+      return mEdge ? EDGE : TSC;
    break;
  }
  case LOOPBACK:
@@ -613,13 +590,6 @@ void writeToFile(radioVector *radio_burst, size_t chan)
  outfile.close();
 }

-double Transceiver::rssiOffset(size_t chan)
-{
-  if (cfg->force_rssi_offset)
-        return cfg->rssi_offset;
-  return mRadioInterface->rssiOffset(chan) + cfg->rssi_offset;
-}
-
 /*
 * Pull bursts from the FIFO and handle according to the slot
 * and burst correlation type. Equalzation is currently disabled.
@@ -638,8 +608,6 @@ int Transceiver::pullRadioVector(size_t chan, struct trx_ul_burst_ind *bi)
  GSM::Time burstTime;
  SoftVector *rxBurst;
  TransceiverState *state = &mStates[chan];
-  bool ctr_changed = false;
-  double rssi_offset;

  /* Blocking FIFO read */
  radioVector *radio_burst = mReceiveFIFO[chan]->read();
@@ -678,13 +646,9 @@ int Transceiver::pullRadioVector(size_t chan, struct trx_ul_burst_ind *bi)
    return -ENOENT;
  }

-  /* If TRX RF is locked/muted by BTS, send idle burst indications */
-  if (state->mMuted)
-    goto ret_idle;
-
  /* Select the diversity channel with highest energy */
  for (size_t i = 0; i < radio_burst->chans(); i++) {
-    float pow = energyDetect(*radio_burst->getVector(i), 20 * cfg->rx_sps);
+    float pow = energyDetect(*radio_burst->getVector(i), 20 * mSPSRx);
    if (pow > max) {
      max = pow;
      max_i = i;
@@ -693,9 +657,7 @@ int Transceiver::pullRadioVector(size_t chan, struct trx_ul_burst_ind *bi)
  }

  if (max_i < 0) {
-    LOGCHAN(chan, DTRXDUL, INFO) << "Received empty burst";
-    state->ctrs.rx_empty_burst++;
-    ctr_changed = true;
+    LOGCHAN(chan, DTRXDUL, FATAL) << "Received empty burst";
    goto ret_idle;
  }

@@ -709,9 +671,8 @@ int Transceiver::pullRadioVector(size_t chan, struct trx_ul_burst_ind *bi)
    state->mNoiseLev = state->mNoises.avg();
  }

-  rssi_offset = rssiOffset(chan);
-  bi->rssi = 20.0 * log10(rxFullScale / avg) + rssi_offset;
-  bi->noise = 20.0 * log10(rxFullScale / state->mNoiseLev) + rssi_offset;
+  bi->rssi = 20.0 * log10(rxFullScale / avg) + rssiOffset;
+  bi->noise = 20.0 * log10(rxFullScale / state->mNoiseLev) + rssiOffset;

  if (type == IDLE)
    goto ret_idle;
@@ -720,24 +681,20 @@ int Transceiver::pullRadioVector(size_t chan, struct trx_ul_burst_ind *bi)
            mMaxExpectedDelayAB : mMaxExpectedDelayNB;

  /* Detect normal or RACH bursts */
-  rc = detectAnyBurst(*burst, mTSC, BURST_THRESH, cfg->rx_sps, type, max_toa, &ebp);
+  rc = detectAnyBurst(*burst, mTSC, BURST_THRESH, mSPSRx, type, max_toa, &ebp);
  if (rc <= 0) {
-    if (rc == -SIGERR_CLIP) {
-      LOGCHAN(chan, DTRXDUL, INFO) << "Clipping detected on received RACH or Normal Burst";
-      state->ctrs.rx_clipping++;
-      ctr_changed = true;
-    } else if (rc != SIGERR_NONE) {
-      LOGCHAN(chan, DTRXDUL, INFO) << "Unhandled RACH or Normal Burst detection error";
-      state->ctrs.rx_no_burst_detected++;
-      ctr_changed = true;
-    }
+    if (rc == -SIGERR_CLIP)
+      LOGCHAN(chan, DTRXDUL, NOTICE) << "Clipping detected on received RACH or Normal Burst";
+    else if (rc != SIGERR_NONE)
+      LOGCHAN(chan, DTRXDUL, NOTICE) << "Unhandled RACH or Normal Burst detection error";
    goto ret_idle;
  }

-  rxBurst = demodAnyBurst(*burst, (CorrType) rc, cfg->rx_sps, &ebp);
+  type = (CorrType) rc;
  bi->toa = ebp.toa;
  bi->tsc = ebp.tsc;
  bi->ci = ebp.ci;
+  rxBurst = demodAnyBurst(*burst, mSPSRx, ebp.amp, ebp.toa, type);

  /* EDGE demodulator returns 444 (gSlotLen * 3) bits */
  if (rxBurst->size() == EDGE_BURST_NBITS) {
@@ -756,8 +713,6 @@ int Transceiver::pullRadioVector(size_t chan, struct trx_ul_burst_ind *bi)
  return 0;

 ret_idle:
-  if (ctr_changed)
-    dispatch_trx_rate_ctr_change(state, chan);
  bi->idle = true;
  delete radio_burst;
  return 0;
@@ -805,7 +760,7 @@ void Transceiver::ctrl_sock_send(ctrl_msg& m, int chan)
  struct osmo_fd *conn_bfd = &s.conn_bfd;

  s.txmsgqueue.push_back(m);
-  osmo_fd_write_enable(conn_bfd);
+  conn_bfd->when |= OSMO_FD_WRITE;
 }

 int Transceiver::ctrl_sock_write(int chan)
@@ -820,7 +775,7 @@ int Transceiver::ctrl_sock_write(int chan)
  while (s.txmsgqueue.size()) {
    const ctrl_msg m = s.txmsgqueue.front();

-    osmo_fd_write_disable(&s.conn_bfd);
+    s.conn_bfd.when &= ~OSMO_FD_WRITE;

    /* try to send it over the socket */
    rc = write(s.conn_bfd.fd, m.data, strlen(m.data) + 1);
@@ -828,7 +783,7 @@ int Transceiver::ctrl_sock_write(int chan)
      goto close;
    if (rc < 0) {
      if (errno == EAGAIN) {
-        osmo_fd_write_enable(&s.conn_bfd);
+        s.conn_bfd.when |= OSMO_FD_WRITE;
        break;
      }
      goto close;
@@ -932,7 +887,7 @@ int Transceiver::ctrl_sock_handle_rx(int chan)
              (int) round(20.0 * log10(rxFullScale / lev)));
    }
    else {
-      sprintf(response,"RSP NOISELEV 1 0");
+      sprintf(response,"RSP NOISELEV 1  0");
    }
  } else if (match_cmd(command, "SETPOWER", &params)) {
    int power;
@@ -947,14 +902,11 @@ int Transceiver::ctrl_sock_handle_rx(int chan)
    power = mRadioInterface->setPowerAttenuation(power, chan);
    mStates[chan].mPower = power;
    sprintf(response, "RSP ADJPOWER 0 %d", power);
-} else if (match_cmd(command, "NOMTXPOWER", NULL)) {
-    int power = mRadioInterface->getNominalTxPower(chan);
-    sprintf(response, "RSP NOMTXPOWER 0 %d", power);
  } else if (match_cmd(command, "RXTUNE", &params)) {
    // tune receiver
    int freqKhz;
    sscanf(params, "%d", &freqKhz);
-    mRxFreq = (freqKhz + cfg->freq_offset_khz) * 1e3;
+    mRxFreq = freqKhz * 1e3;
    if (!mRadioInterface->tuneRx(mRxFreq, chan)) {
       LOGCHAN(chan, DTRXCTRL, FATAL) << "RX failed to tune";
       sprintf(response,"RSP RXTUNE 1 %d",freqKhz);
@@ -965,7 +917,7 @@ int Transceiver::ctrl_sock_handle_rx(int chan)
    // tune txmtr
    int freqKhz;
    sscanf(params, "%d", &freqKhz);
-    mTxFreq = (freqKhz + cfg->freq_offset_khz) * 1e3;
+    mTxFreq = freqKhz * 1e3;
    if (!mRadioInterface->tuneTx(mTxFreq, chan)) {
       LOGCHAN(chan, DTRXCTRL, FATAL) << "TX failed to tune";
       sprintf(response,"RSP TXTUNE 1 %d",freqKhz);
@@ -1010,12 +962,6 @@ int Transceiver::ctrl_sock_handle_rx(int chan)
      mVersionTRXD[chan] = version_recv;
      sprintf(response, "RSP SETFORMAT %u %u", version_recv, version_recv);
    }
-  } else if (match_cmd(command, "RFMUTE", &params)) {
-    // (Un)mute RF TX and RX
-    unsigned mute;
-    sscanf(params, "%u", &mute);
-    mStates[chan].mMuted = mute ? true : false;
-    sprintf(response, "RSP RFMUTE 0 %u", mute);
  } else if (match_cmd(command, "_SETBURSTTODISKMASK", &params)) {
    // debug command! may change or disappear without notice
    // set a mask which bursts to dump to disk
@@ -1040,7 +986,6 @@ bool Transceiver::driveTxPriorityQueue(size_t chan)
  struct trxd_hdr_v01_dl *dl;
  char buffer[sizeof(*dl) + EDGE_BURST_NBITS];
  uint32_t fn;
-  uint8_t tn;

  // check data socket
  msgLen = read(mDataSockets[chan], buffer, sizeof(buffer));
@@ -1054,8 +999,8 @@ bool Transceiver::driveTxPriorityQueue(size_t chan)
      burstLen = gSlotLen;
      break;
    case sizeof(*dl) + EDGE_BURST_NBITS: /* EDGE burst */
-      if (cfg->tx_sps != 4) {
-        LOGCHAN(chan, DTRXDDL, ERROR) << "EDGE burst received but SPS is set to " << cfg->tx_sps;
+      if (mSPSTx != 4) {
+        LOGCHAN(chan, DTRXDDL, ERROR) << "EDGE burst received but SPS is set to " << mSPSTx;
        return false;
      }
      burstLen = EDGE_BURST_NBITS;
@@ -1069,7 +1014,6 @@ bool Transceiver::driveTxPriorityQueue(size_t chan)

  /* Convert TDMA FN to the host endianness */
  fn = osmo_load32be(&dl->common.fn);
-  tn = dl->common.tn;

  /* Make sure we support the received header format */
  switch (dl->common.version) {
@@ -1083,44 +1027,7 @@ bool Transceiver::driveTxPriorityQueue(size_t chan)
  }

  LOGCHAN(chan, DTRXDDL, DEBUG) << "Rx TRXD message (hdr_ver=" << unsigned(dl->common.version)
-    << "): fn=" << fn << ", tn=" << unsigned(tn) << ", burst_len=" << burstLen;
-
-  TransceiverState *state = &mStates[chan];
-  GSM::Time currTime = GSM::Time(fn, tn);
-
-  /* Verify proper FN order in DL stream */
-  if (state->first_dl_fn_rcv[tn]) {
-    int32_t delta = GSM::FNDelta(currTime.FN(), state->last_dl_time_rcv[tn].FN());
-    if (delta == 1) {
-        /* usual expected scenario, continue code flow */
-    } else if (delta == 0) {
-      LOGCHAN(chan, DTRXDDL, INFO) << "Rx TRXD msg with repeated FN " << currTime;
-      state->ctrs.tx_trxd_fn_repeated++;
-      dispatch_trx_rate_ctr_change(state, chan);
-      return true;
-    } else if (delta < 0) {
-      LOGCHAN(chan, DTRXDDL, INFO) << "Rx TRXD msg with previous FN " << currTime
-                                     << " vs last " << state->last_dl_time_rcv[tn];
-       state->ctrs.tx_trxd_fn_outoforder++;
-       dispatch_trx_rate_ctr_change(state, chan);
-       /* Allow adding radio vector below, since it gets sorted in the queue */
-    } else if (chan == 0 && state->mFiller == FILLER_ZERO) {
-        /* delta > 1. Some FN was lost in the middle. We can only easily rely
-         * on consecutive FNs in TRX0 since it must transmit continuously in all
-         * setups. Also, osmo-trx supports optionally filling empty bursts on
-         * its own. In that case bts-trx is not obliged to submit all bursts. */
-      LOGCHAN(chan, DTRXDDL, INFO) << "Rx TRXD msg with future FN " << currTime
-                                     << " vs last " << state->last_dl_time_rcv[tn]
-                                     << ", " << delta - 1 << " FN lost";
-      state->ctrs.tx_trxd_fn_skipped += delta - 1;
-      dispatch_trx_rate_ctr_change(state, chan);
-    }
-    if (delta > 0)
-      state->last_dl_time_rcv[tn] = currTime;
-  } else { /* Initial check, simply store state */
-    state->first_dl_fn_rcv[tn] = true;
-    state->last_dl_time_rcv[tn] = currTime;
-  }
+    << "): fn=" << fn << ", tn=" << unsigned(dl->common.tn) << ", burst_len=" << burstLen;

  BitVector newBurst(burstLen);
  BitVector::iterator itr = newBurst.begin();
@@ -1128,6 +1035,8 @@ bool Transceiver::driveTxPriorityQueue(size_t chan)
  while (itr < newBurst.end())
    *itr++ = *bufferItr++;

+  GSM::Time currTime = GSM::Time(fn, dl->common.tn);
+
  addRadioVector(chan, newBurst, dl->tx_att, currTime);

  return true;
@@ -1144,8 +1053,6 @@ bool Transceiver::driveReceiveRadio()
    return false;

  if (mForceClockInterface || mTransmitDeadlineClock > mLastClockUpdateTime + GSM::Time(216,0)) {
-    if (mForceClockInterface)
-      LOGC(DTRXCLK, NOTICE) << "Sending CLOCK indications";
    mForceClockInterface = false;
    return writeClockInterface();
  }
@@ -1162,13 +1069,11 @@ void Transceiver::logRxBurst(size_t chan, const struct trx_ul_burst_ind *bi)
    else os << "-";
  }

-  double rssi_offset = rssiOffset(chan);
-
  LOGCHAN(chan, DTRXDUL, DEBUG) << std::fixed << std::right
    << " time: "   << unsigned(bi->tn) << ":" << bi->fn
-    << " RSSI: "   << std::setw(5) << std::setprecision(1) << (bi->rssi - rssi_offset)
+    << " RSSI: "   << std::setw(5) << std::setprecision(1) << (bi->rssi - rssiOffset)
                   << "dBFS/" << std::setw(6) << -bi->rssi << "dBm"
-    << " noise: "  << std::setw(5) << std::setprecision(1) << (bi->noise - rssi_offset)
+    << " noise: "  << std::setw(5) << std::setprecision(1) << (bi->noise - rssiOffset)
                   << "dBFS/" << std::setw(6) << -bi->noise << "dBm"
    << " TOA: "    << std::setw(5) << std::setprecision(2) << bi->toa
    << " C/I: "    << std::setw(5) << std::setprecision(2) << bi->ci << "dB"
@@ -1188,7 +1093,7 @@ bool Transceiver::driveReceiveFIFO(size_t chan)
    return false; /* other errors: we want to stop the process */
  }

-  if (!bi.idle && log_check_level(DTRXDUL, LOGL_DEBUG))
+  if (!bi.idle)
    logRxBurst(chan, &bi);

  switch (mVersionTRXD[chan]) {
@@ -1286,7 +1191,6 @@ void *RxUpperLoopAdapter(TrxChanThParams *params)

  snprintf(thread_name, 16, "RxUpper%zu", num);
  set_selfthread_name(thread_name);
-  OSMO_ASSERT(osmo_cpu_sched_vty_apply_localthread() == 0);

  while (1) {
    if (!trx->driveReceiveFIFO(num)) {
@@ -1302,7 +1206,6 @@ void *RxUpperLoopAdapter(TrxChanThParams *params)
 void *RxLowerLoopAdapter(Transceiver *transceiver)
 {
  set_selfthread_name("RxLower");
-  OSMO_ASSERT(osmo_cpu_sched_vty_apply_localthread() == 0);

  while (1) {
    if (!transceiver->driveReceiveRadio()) {
@@ -1318,7 +1221,6 @@ void *RxLowerLoopAdapter(Transceiver *transceiver)
 void *TxLowerLoopAdapter(Transceiver *transceiver)
 {
  set_selfthread_name("TxLower");
-  OSMO_ASSERT(osmo_cpu_sched_vty_apply_localthread() == 0);

  while (1) {
    transceiver->driveTxFIFO();
@@ -1337,7 +1239,6 @@ void *TxUpperLoopAdapter(TrxChanThParams *params)

  snprintf(thread_name, 16, "TxUpper%zu", num);
  set_selfthread_name(thread_name);
-  OSMO_ASSERT(osmo_cpu_sched_vty_apply_localthread() == 0);

  while (1) {
    if (!trx->driveTxPriorityQueue(num)) {
--- a/Transceiver52M/Transceiver.h
+++ b/Transceiver52M/Transceiver.h
@@ -63,7 +63,6 @@ struct TransceiverState {
  /* The filler table */
  signalVector *fillerTable[102][8];
  int fillerModulus[8];
-  FillerType mFiller;
  bool mRetrans;

  /* Most recent channel estimate of all timeslots */
@@ -84,35 +83,33 @@ struct TransceiverState {

  /* Shadowed downlink attenuation */
  int mPower;
-
-  /* RF emission and reception disabled, as per NM Administrative State Locked */
-  bool mMuted;
-
-  /* counters */
-  struct trx_counters ctrs;
-
-  /* Used to keep track of lost and out of order frames */
-  bool first_dl_fn_rcv[8];
-  GSM::Time last_dl_time_rcv[8];
 };

 /** The Transceiver class, responsible for physical layer of basestation */
 class Transceiver {
 public:
  /** Transceiver constructor
-      @param cfg VTY populated config
+      @param wBasePort base port number of UDP sockets
+      @param TRXAddress IP address of the TRX, as a string
+      @param GSMcoreAddress IP address of the GSM core, as a string
+      @param wSPS number of samples per GSM symbol
      @param wTransmitLatency initial setting of transmit latency
      @param radioInterface associated radioInterface object
  */
-  Transceiver(const struct trx_cfg *cfg,
+  Transceiver(int wBasePort,
+              const char *TRXAddress,
+              const char *GSMcoreAddress,
+              size_t tx_sps, size_t rx_sps, size_t chans,
              GSM::Time wTransmitLatency,
-              RadioInterface *wRadioInterface);
+              RadioInterface *wRadioInterface,
+              double wRssiOffset, int stackSize);

  /** Destructor */
  ~Transceiver();

  /** Start the control loop */
-  bool init(void);
+  bool init(FillerType filler, size_t rtsc, unsigned rach_delay,
+            bool edge, bool ext_rach);

  /** attach the radioInterface receive FIFO */
  bool receiveFIFO(VectorFIFO *wFIFO, size_t chan)
@@ -125,7 +122,7 @@ public:
  }

  /** accessor for number of channels */
-  size_t numChans() const { return cfg->num_chans; };
+  size_t numChans() const { return mChans; };

  /** Codes for channel combinations */
  typedef enum {
@@ -148,6 +145,7 @@ public:
  } ChannelCombination;

 private:
+
 struct ctrl_msg {
  char data[101];
  ctrl_msg() {};
@@ -168,7 +166,10 @@ struct ctrl_sock_state {
  }
 };

-  const struct trx_cfg *cfg;	///< VTY populated config
+  int mBasePort;
+  std::string mLocalAddr;
+  std::string mRemoteAddr;
+
  std::vector<int> mDataSockets;  ///< socket for writing to/reading from GSM core
  std::vector<ctrl_sock_state> mCtrlSockets;  ///< socket for writing/reading control commands from GSM core
  int mClockSocket;               ///< socket for writing clock updates to GSM core
@@ -190,6 +191,9 @@ struct ctrl_sock_state {
  double txFullScale;                     ///< full scale input to radio
  double rxFullScale;                     ///< full scale output to radio

+  double rssiOffset;                      ///< RSSI to dBm conversion offset
+  int stackSize;                      ///< stack size for threads, 0 = OS default
+
  /** modulate and add a burst to the transmit queue */
  void addRadioVector(size_t chan, BitVector &bits,
                      int RSSI, GSM::Time &wTime);
@@ -218,7 +222,12 @@ struct ctrl_sock_state {
  /** drive handling of control messages from GSM core */
  int ctrl_sock_handle_rx(int chan);

+  int mSPSTx;                          ///< number of samples per Tx symbol
+  int mSPSRx;                          ///< number of samples per Rx symbol
  size_t mChans;
+
+  bool mExtRACH;
+  bool mEdge;
  bool mOn;	                           ///< flag to indicate that transceiver is powered on
  bool mForceClockInterface;           ///< flag to indicate whether IND CLOCK shall be sent unconditionally after transceiver is started
  bool mHandover[8][8];                ///< expect handover to the timeslot/subslot
@@ -260,7 +269,7 @@ protected:
  friend void *RxLowerLoopAdapter(Transceiver *transceiver);
  friend void *TxLowerLoopAdapter(Transceiver *transceiver);

-  double rssiOffset(size_t chan);
+
  void reset();

  void logRxBurst(size_t chan, const struct trx_ul_burst_ind *bi);
--- a/Transceiver52M/arch/x86/convolve.c
+++ b/Transceiver52M/arch/x86/convolve.c
@@ -99,10 +99,9 @@ int convolve_real(const float *x, int x_len,
 		  const float *h, int h_len,
 		  float *y, int y_len, int start, int len)
 {
-#ifndef __OPTIMIZE__
 	if (bounds_check(x_len, h_len, y_len, start, len) < 0)
 		return -1;
-#endif
+
 	memset(y, 0, len * 2 * sizeof(float));

 	switch (h_len) {
@@ -139,10 +138,9 @@ int convolve_complex(const float *x, int x_len,
 		     float *y, int y_len,
 		     int start, int len)
 {
-#ifndef __OPTIMIZE__
 	if (bounds_check(x_len, h_len, y_len, start, len) < 0)
 		return -1;
-#endif
+
 	memset(y, 0, len * 2 * sizeof(float));

 	if (!(h_len % 8))
--- a/Transceiver52M/device/Makefile.am
+++ b/Transceiver52M/device/Makefile.am
@@ -2,9 +2,9 @@ include $(top_srcdir)/Makefile.common

 SUBDIRS = common

-if DEVICE_IPC
+#if DEVICE_IPC
 SUBDIRS += ipc
-endif
+#endif

 if DEVICE_USRP1
 SUBDIRS += usrp1
--- a/Transceiver52M/device/common/Makefile.am
+++ b/Transceiver52M/device/common/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/Makefile.common

 AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES)
-AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS)
+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LMS_CFLAGS)


 noinst_HEADERS = radioDevice.h smpl_buf.h
--- a/Transceiver52M/device/common/radioDevice.h
+++ b/Transceiver52M/device/common/radioDevice.h
@@ -125,11 +125,17 @@ class RadioDevice {
  /** return minimum Rx Gain **/
  virtual double minRxGain(void) = 0;

-  /** return base RSSI offset to apply for received samples **/
-  virtual double rssiOffset(size_t chan) = 0;
+  /** sets the transmit chan gain, returns the gain setting **/
+  virtual double setTxGain(double dB, size_t chan = 0) = 0;

-  /** returns the Nominal transmit output power of the transceiver in dBm, negative on error **/
-  virtual int getNominalTxPower(size_t chan = 0) = 0;
+  /** get transmit gain */
+  virtual double getTxGain(size_t chan = 0) = 0;
+
+  /** return maximum Tx Gain **/
+  virtual double maxTxGain(void) = 0;
+
+  /** return minimum Tx Gain **/
+  virtual double minTxGain(void) = 0;

  /** sets the RX path to use, returns true if successful and false otherwise */
  virtual bool setRxAntenna(const std::string &ant, size_t chan = 0) = 0;
@@ -154,9 +160,6 @@ class RadioDevice {
  virtual double getRxFreq(size_t chan = 0) = 0;
  virtual double getSampleRate()=0;

-  virtual double setPowerAttenuation(int atten, size_t chan) = 0;
-  virtual double getPowerAttenuation(size_t chan=0) = 0;
-
  protected:
  size_t tx_sps, rx_sps;
  InterfaceType iface;
@@ -189,13 +192,6 @@ class RadioDevice {
 	for (i = 0; i < tx_paths.size(); i++) {
 		if (tx_paths[i] == "")
 			continue;
-		if (iface == MULTI_ARFCN && i > 0) {
-			LOGCHAN(i, DDEV, NOTICE) << "Not setting Tx antenna "
-						 << tx_paths[i]
-						 << " for a logical channel";
-			continue;
-		}
-
 		LOGCHAN(i, DDEV, DEBUG) << "Configuring Tx antenna " << tx_paths[i];
 		if (!setTxAntenna(tx_paths[i], i)) {
 			LOGCHAN(i, DDEV, ALERT) << "Failed configuring Tx antenna " << tx_paths[i];
@@ -206,13 +202,6 @@ class RadioDevice {
 	for (i = 0; i < rx_paths.size(); i++) {
 		if (rx_paths[i] == "")
 			continue;
-		if (iface == MULTI_ARFCN && i > 0) {
-			LOGCHAN(i, DDEV, NOTICE) << "Not setting Rx antenna "
-						 << rx_paths[i]
-						 << " for a logical channel";
-			continue;
-		}
-
 		LOGCHAN(i, DDEV, DEBUG) << "Configuring Rx antenna " << rx_paths[i];
 		if (!setRxAntenna(rx_paths[i], i)) {
 			LOGCHAN(i, DDEV, ALERT) << "Failed configuring Rx antenna " << rx_paths[i];
--- a/Transceiver52M/device/common/smpl_buf.cpp
+++ b/Transceiver52M/device/common/smpl_buf.cpp
@@ -28,9 +28,9 @@
 #include <inttypes.h>

 smpl_buf::smpl_buf(size_t len)
-	: buf_len(len)
+	: buf_len(len), time_start(0), time_end(0),
+	  data_start(0), data_end(0)
 {
-	reset();
 	data = new uint32_t[len];
 }

@@ -39,14 +39,6 @@ smpl_buf::~smpl_buf()
 	delete[] data;
 }

-void smpl_buf::reset()
-{
-	time_start = 0;
-	time_end = 0;
-	data_start = 0;
-	data_end = 0;
-}
-
 ssize_t smpl_buf::avail_smpls(TIMESTAMP timestamp) const
 {
 	if (timestamp < time_start)
--- a/Transceiver52M/device/common/smpl_buf.h
+++ b/Transceiver52M/device/common/smpl_buf.h
@@ -44,10 +44,6 @@ public:
 	smpl_buf(size_t len);
 	~smpl_buf();

-	/** Reset this buffer, keeps the size
-	*/
-	void reset();
-
 	/** Query number of samples available for reading
 	    @param timestamp time of first sample
 	    @return number of available samples or error
--- a/Transceiver52M/device/ipc/IPCDevice.cpp
+++ b/Transceiver52M/device/ipc/IPCDevice.cpp
@@ -4,40 +4,38 @@
 *
 * SPDX-License-Identifier: AGPL-3.0+
 *
-* 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/>.
-* See the COPYING file in the main directory for details.
+	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 <cstdint>
-#include <cstring>
-#include <cstdlib>
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "Logger.h"
-#include "Threads.h"
-#include "IPCDevice.h"
-#include "smpl_buf.h"
-
-extern "C" {
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
 #include <sys/mman.h>
 #include <sys/stat.h> /* For mode constants */
 #include <fcntl.h> /* For O_* constants */

+#include <map>
+
+#include "trx_vty.h"
+#include "Logger.h"
+#include "Threads.h"
+#include "Utils.h"
+#include "IPCDevice.h"
+
+extern "C" {
 #include "osmo_signal.h"
+#include <osmocom/core/application.h>
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/select.h>
 #include <osmocom/core/socket.h>
@@ -46,10 +44,12 @@ extern "C" {
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/select.h>
 #include <osmocom/core/timer.h>
-
-#include "ipc_shm.h"
 }

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #define SAMPLE_BUF_SZ (1 << 20)

 using namespace std;
@@ -58,43 +58,41 @@ static int ipc_chan_sock_cb(struct osmo_fd *bfd, unsigned int flags);

 IPCDevice::IPCDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset,
 		     const std::vector<std::string> &tx_paths, const std::vector<std::string> &rx_paths)
-	: RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths), tx_attenuation(),
-	  tmp_state(IPC_IF_MSG_GREETING_REQ), shm(NULL), shm_dec(0), started(false)
+	: RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths),
+	  tmp_state(IPC_IF_MSG_GREETING_REQ), shm(NULL), started(false)
 {
 	LOGC(DDEV, INFO) << "creating IPC device...";

+	//m_IPC_stream_rx.resize(chans);
+	//m_IPC_stream_tx.resize(chans);
 	rx_gains.resize(chans);
 	tx_gains.resize(chans);

 	rx_buffers.resize(chans);

-	sk_chan_state.resize(chans, ipc_per_trx_sock_state());
-
 	/* Set up per-channel Rx timestamp based Ring buffers */
 	for (size_t i = 0; i < rx_buffers.size(); i++)
 		rx_buffers[i] = new smpl_buf(SAMPLE_BUF_SZ / sizeof(uint32_t));
+
+	memset(&sk_chan_state, 0, sizeof(sk_chan_state));
 }

 IPCDevice::~IPCDevice()
 {
+	//unsigned int i;
 	LOGC(DDEV, INFO) << "Closing IPC device";
 	/* disable all channels */

 	for (size_t i = 0; i < rx_buffers.size(); i++)
 		delete rx_buffers[i];

-	ipc_sock_close(&master_sk_state);
-
-	for (unsigned int i = 0; i < sk_chan_state.size(); i++)
+	for (unsigned int i = 0; i < ARRAY_SIZE(sk_chan_state); i++)
 		ipc_sock_close(&sk_chan_state[i]);

 	for (auto i : shm_io_rx_streams)
 		ipc_shm_close(i);
 	for (auto i : shm_io_tx_streams)
 		ipc_shm_close(i);
-
-	if (shm_dec)
-		talloc_free(shm_dec);
 }

 int IPCDevice::ipc_shm_connect(const char *shm_name)
@@ -127,7 +125,7 @@ int IPCDevice::ipc_shm_connect(const char *shm_name)
 		goto err_mmap;
 	}
 	LOGP(DDEV, LOGL_NOTICE, "mmap'ed shared memory at addr %p\n", shm);
-	//	LOGP(DDEV, LOGL_NOTICE, "%s\n", osmo_hexdump((const unsigned char *)shm, 80));
+	LOGP(DDEV, LOGL_NOTICE, "%s\n", osmo_hexdump((const unsigned char *)shm, 80));
 	/* After a call to mmap(2) the file descriptor may be closed without affecting the memory mapping. */
 	close(fd);
 	return 0;
@@ -138,7 +136,7 @@ err_shm_open:
 	return rc;
 }

-static int ipc_sock_send(struct ipc_per_trx_sock_state *state, struct msgb *msg);
+static int ipc_sock_send(struct ipc_sock_state *state, struct msgb *msg);

 static struct msgb *ipc_msgb_alloc(uint8_t msg_type)
 {
@@ -155,7 +153,7 @@ static struct msgb *ipc_msgb_alloc(uint8_t msg_type)
 	return msg;
 }

-static int ipc_tx_greeting_req(struct ipc_per_trx_sock_state *state, uint8_t req_version)
+static int ipc_tx_greeting_req(struct ipc_sock_state *state, uint8_t req_version)
 {
 	struct msgb *msg;
 	struct ipc_sk_if *ipc_prim;
@@ -173,7 +171,7 @@ static int ipc_tx_greeting_req(struct ipc_per_trx_sock_state *state, uint8_t req
 	return ipc_sock_send(state, msg);
 }

-static int ipc_tx_info_req(struct ipc_per_trx_sock_state *state)
+static int ipc_tx_info_req(struct ipc_sock_state *state)
 {
 	struct msgb *msg;
 	//struct ipc_sk_if *ipc_prim;
@@ -189,7 +187,7 @@ static int ipc_tx_info_req(struct ipc_per_trx_sock_state *state)
 	return ipc_sock_send(state, msg);
 }

-int IPCDevice::ipc_tx_open_req(struct ipc_per_trx_sock_state *state, uint32_t num_chans, uint32_t ref)
+int IPCDevice::ipc_tx_open_req(struct ipc_sock_state *state, uint32_t num_chans, uint32_t ref)
 {
 	struct msgb *msg;
 	struct ipc_sk_if *ipc_prim;
@@ -204,8 +202,7 @@ int IPCDevice::ipc_tx_open_req(struct ipc_per_trx_sock_state *state, uint32_t nu
 	ipc_prim = (struct ipc_sk_if *)msg->data;
 	ipc_prim->u.open_req.num_chans = num_chans;

-	/* FIXME: this is actually the sps value, not the sample rate!
-	 * sample rate is looked up according to the sps rate by uhd backend */
+	/* FIXME: pass fractional freq */
 	ipc_prim->u.open_req.rx_sample_freq_num = rx_sps;
 	ipc_prim->u.open_req.rx_sample_freq_den = 1;
 	ipc_prim->u.open_req.tx_sample_freq_num = tx_sps;
@@ -256,10 +253,8 @@ int IPCDevice::ipc_rx_info_cnf(const struct ipc_sk_if_info_cnf *info_cnf)
 	current_info_cnf = *info_cnf;
 	unsigned int i;

-	if (info_cnf->max_num_chans < chans) {
-		LOGC(DDEV, ERROR) << "chan num mismatch:" << info_cnf->max_num_chans << " vs " << chans;
+	if (info_cnf->max_num_chans < chans)
 		return -1;
-	}

 	/* Here:
 	 * verify info_cnf->max_num_chans >= requested chans
@@ -269,20 +264,17 @@ int IPCDevice::ipc_rx_info_cnf(const struct ipc_sk_if_info_cnf *info_cnf)
 	 * cache rx/tx paths per channel, and make sure it matches the one the user wants to set
 	 */

-	LOGC(DDEV, NOTICE)
-		<< "Rx Info CNF:"
-		<< " name=" << info_cnf->dev_desc << std::endl
-		<< " max_num_chans=" << info_cnf->max_num_chans << " feature_mask=" << info_cnf->feature_mask;
+	LOGC(DDEV, NOTICE) << "Rx Info CNF:"
+			   << " name=" << info_cnf->dev_desc << std::endl
+			   << " max_num_chans=" << info_cnf->max_num_chans << " feature_mask=" << info_cnf->feature_mask
+			   << " min_rx_gain=" << info_cnf->min_rx_gain << " max_rx_gain=" << info_cnf->max_rx_gain
+			   << " min_tx_gain=" << info_cnf->min_tx_gain << " max_tx_gain=" << info_cnf->max_tx_gain;
 	for (i = 0; i < info_cnf->max_num_chans; i++) {
 		int j = 0;
 		bool rx_found = false, tx_found = false;
 		while (strcmp(info_cnf->chan_info[i].rx_path[j], "") != 0) {
 			LOGC(DDEV, NOTICE)
-				<< "chan " << i << ": RxPath[" << j << "]: " << info_cnf->chan_info[i].rx_path[j]
-				<< " min_rx_gain=" << info_cnf->chan_info[i].min_rx_gain
-				<< " max_rx_gain=" << info_cnf->chan_info[i].max_rx_gain
-				<< " min_tx_gain=" << info_cnf->chan_info[i].min_tx_gain
-				<< " max_tx_gain=" << info_cnf->chan_info[i].max_tx_gain;
+				<< "chan " << i << ": RxPath[" << j << "]: " << info_cnf->chan_info[i].rx_path[j];

 			if (rx_paths.size() < (i + 1) ||
 			    strcmp(rx_paths[i].c_str(), info_cnf->chan_info[i].rx_path[j]) == 0) {
@@ -330,9 +322,10 @@ int IPCDevice::ipc_rx_open_cnf(const struct ipc_sk_if_open_cnf *open_cnf)
 		int rc;
 		LOGC(DDEV, NOTICE) << "chan " << i << ": sk_path=" << open_cnf->chan_info[i].chan_ipc_sk_path;

-		/* FIXME: current limit IPC_MAX_NUM_TRX chans, make dynamic */
-		if (i < IPC_MAX_NUM_TRX) {
-			struct ipc_per_trx_sock_state *state = &sk_chan_state[i];
+		/* FIXME: current limit 8 chans, make dynamic */
+		if (i < 8) {
+			struct ipc_sock_state *state = &sk_chan_state[i];
+			memset(state, 0x00, sizeof(*state));

 			INIT_LLIST_HEAD(&state->upqueue);
 			rc = osmo_sock_unix_init_ofd(&state->conn_bfd, SOCK_SEQPACKET, 0,
@@ -360,17 +353,12 @@ int IPCDevice::ipc_rx_open_cnf(const struct ipc_sk_if_open_cnf *open_cnf)
 	/* server inits both producers */
 	for (unsigned int i = 0; i < shm_dec->num_chans; i++) {
 		LOGC(DDEV, NOTICE)
-			<< "shm: chan" << i << "/dl: num_buffers=" << shm_dec->channels[i]->dl_stream->num_buffers;
+			<< "shm: chan" << i << "/dl: num_buffers=" << shm_dec->channels[0]->dl_stream->num_buffers;
 		LOGC(DDEV, NOTICE)
-			<< "shm: chan" << i << "/dl: buffer_size=" << shm_dec->channels[i]->dl_stream->buffer_size;
-		LOGC(DDEV, NOTICE)
-			<< "shm: chan" << i << "/ul: num_buffers=" << shm_dec->channels[i]->ul_stream->num_buffers;
-		LOGC(DDEV, NOTICE)
-			<< "shm: chan" << i << "/ul: buffer_size=" << shm_dec->channels[i]->ul_stream->buffer_size;
+			<< "shm: chan" << i << "/dl: buffer_size=" << shm_dec->channels[0]->dl_stream->buffer_size;
 		shm_io_rx_streams.push_back(ipc_shm_init_consumer(shm_dec->channels[i]->ul_stream));
 		shm_io_tx_streams.push_back(ipc_shm_init_consumer(shm_dec->channels[i]->dl_stream));
-		// we should init a producer here, but delegating all producers and therefore lock management
-		// to the other side is the reasonable approach to circumvent shutdown issues
+		//		shm_io_tx_streams.push_back(ipc_shm_init_producer(shm_dec->channels[i]->dl_stream));
 	}

 	tmp_state = IPC_IF_MSG_OPEN_CNF;
@@ -401,56 +389,24 @@ int IPCDevice::ipc_rx(uint8_t msg_type, struct ipc_sk_if *ipc_prim)

 int IPCDevice::ipc_rx_chan_start_cnf(ipc_sk_chan_if_op_rc *ret, uint8_t chan_nr)
 {
-	if (chan_nr >= chans) {
-		LOGC(DDEV, NOTICE) << "shm: illegal start response for chan #" << chan_nr << " ?!?";
-		return 0;
-	}
+	tmp_state = IPC_IF_MSG_START_CNF;
 	return 0;
 }
 int IPCDevice::ipc_rx_chan_stop_cnf(ipc_sk_chan_if_op_rc *ret, uint8_t chan_nr)
 {
-	if (chan_nr >= chans) {
-		LOGC(DDEV, NOTICE) << "shm: illegal stop response for chan #" << chan_nr << " ?!?";
-		return 0;
-	}
 	return 0;
 }
 int IPCDevice::ipc_rx_chan_setgain_cnf(ipc_sk_chan_if_gain *ret, uint8_t chan_nr)
 {
-	if (chan_nr >= chans) {
-		LOGC(DDEV, NOTICE) << "shm: illegal setgain response for chan #" << chan_nr << " ?!?";
-		return 0;
-	}
-
 	ret->is_tx ? tx_gains[chan_nr] = ret->gain : rx_gains[chan_nr] = ret->gain;
 	return 0;
 }
-int IPCDevice::ipc_rx_chan_settxattn_cnf(ipc_sk_chan_if_tx_attenuation *ret, uint8_t chan_nr)
-{
-	if (chan_nr >= chans) {
-		LOGC(DDEV, NOTICE) << "shm: illegal tx attn response for chan #" << chan_nr << " ?!?";
-		return 0;
-	}
-
-	tx_attenuation[chan_nr] = ret->attenuation;
-	return 0;
-}
 int IPCDevice::ipc_rx_chan_setfreq_cnf(ipc_sk_chan_if_freq_cnf *ret, uint8_t chan_nr)
 {
-	if (chan_nr >= chans) {
-		LOGC(DDEV, NOTICE) << "shm: illegal setfreq response for chan #" << chan_nr << " ?!?";
-		return 0;
-	}
-
 	return 0;
 }
 int IPCDevice::ipc_rx_chan_notify_underflow(ipc_sk_chan_if_notfiy *ret, uint8_t chan_nr)
 {
-	if (chan_nr >= chans) {
-		LOGC(DDEV, NOTICE) << "shm: illegal underfloww notification for chan #" << chan_nr << " ?!?";
-		return 0;
-	}
-
 	m_ctr[chan_nr].tx_underruns += 1;
 	osmo_signal_dispatch(SS_DEVICE, S_DEVICE_COUNTER_CHANGE, &m_ctr[chan_nr]);

@@ -458,11 +414,6 @@ int IPCDevice::ipc_rx_chan_notify_underflow(ipc_sk_chan_if_notfiy *ret, uint8_t
 }
 int IPCDevice::ipc_rx_chan_notify_overflow(ipc_sk_chan_if_notfiy *ret, uint8_t chan_nr)
 {
-	if (chan_nr >= chans) {
-		LOGC(DDEV, NOTICE) << "shm: illegal overflow notification for chan #" << chan_nr << " ?!?";
-		return 0;
-	}
-
 	m_ctr[chan_nr].rx_overruns += 1;
 	osmo_signal_dispatch(SS_DEVICE, S_DEVICE_COUNTER_CHANGE, &m_ctr[chan_nr]);
 	return 0;
@@ -491,9 +442,6 @@ int IPCDevice::ipc_chan_rx(uint8_t msg_type, struct ipc_sk_chan_if *ipc_prim, ui
 	case IPC_IF_NOTIFY_OVERFLOW:
 		rc = ipc_rx_chan_notify_overflow(&ipc_prim->u.notify, chan_nr);
 		break;
-	case IPC_IF_MSG_SETTXATTN_CNF:
-		rc = ipc_rx_chan_settxattn_cnf(&ipc_prim->u.txatten_cnf, chan_nr);
-		break;
 	default:
 		LOGP(DMAIN, LOGL_ERROR, "Received unknown IPC msg type %d\n", msg_type);
 		rc = -EINVAL;
@@ -502,9 +450,10 @@ int IPCDevice::ipc_chan_rx(uint8_t msg_type, struct ipc_sk_chan_if *ipc_prim, ui
 	return rc;
 }

-static int ipc_sock_send(struct ipc_per_trx_sock_state *state, struct msgb *msg)
+static int ipc_sock_send(struct ipc_sock_state *state, struct msgb *msg)
 {
 	struct osmo_fd *conn_bfd;
+	//struct ipc_sk_if *ipc_prim = (struct ipc_sk_if *) msg->data;

 	if (!state) {
 		LOGP(DMAIN, LOGL_INFO,
@@ -522,12 +471,12 @@ static int ipc_sock_send(struct ipc_per_trx_sock_state *state, struct msgb *msg)
 		return -EIO;
 	}
 	msgb_enqueue(&state->upqueue, msg);
-	osmo_fd_write_enable(conn_bfd);
+	conn_bfd->when |= BSC_FD_WRITE;

 	return 0;
 }

-void IPCDevice::ipc_sock_close(struct ipc_per_trx_sock_state *state)
+void IPCDevice::ipc_sock_close(struct ipc_sock_state *state)
 {
 	if (state == 0)
 		return;
@@ -593,7 +542,7 @@ int IPCDevice::ipc_sock_read(struct osmo_fd *bfd)

 close:
 	msgb_free(msg);
-	ipc_sock_close(&master_sk_state);
+	ipc_sock_close(&sk_state);
 	return -1;
 }

@@ -630,9 +579,6 @@ int IPCDevice::ipc_chan_sock_read(struct osmo_fd *bfd)
 		return 0;
 	}

-	/* store mask of last received messages so we can check later */
-	sk_chan_state[bfd->priv_nr].messages_processed_mask |= (1 << (ipc_prim->msg_type - IPC_IF_CHAN_MSG_OFFSET));
-
 	rc = ipc_chan_rx(ipc_prim->msg_type, ipc_prim, bfd->priv_nr);

 	/* as we always synchronously process the message in IPC_rx() and
@@ -651,15 +597,15 @@ int IPCDevice::ipc_sock_write(struct osmo_fd *bfd)
 {
 	int rc;

-	while (!llist_empty(&master_sk_state.upqueue)) {
+	while (!llist_empty(&sk_state.upqueue)) {
 		struct msgb *msg, *msg2;
 		struct ipc_sk_if *ipc_prim;

 		/* peek at the beginning of the queue */
-		msg = llist_entry(master_sk_state.upqueue.next, struct msgb, list);
+		msg = llist_entry(sk_state.upqueue.next, struct msgb, list);
 		ipc_prim = (struct ipc_sk_if *)msg->data;

-		osmo_fd_write_disable(bfd);
+		bfd->when &= ~BSC_FD_WRITE;

 		/* bug hunter 8-): maybe someone forgot msgb_put(...) ? */
 		if (!msgb_length(msg)) {
@@ -676,7 +622,7 @@ int IPCDevice::ipc_sock_write(struct osmo_fd *bfd)
 			goto close;
 		if (rc < 0) {
 			if (errno == EAGAIN) {
-				osmo_fd_write_enable(bfd);
+				bfd->when |= BSC_FD_WRITE;
 				break;
 			}
 			goto close;
@@ -684,14 +630,14 @@ int IPCDevice::ipc_sock_write(struct osmo_fd *bfd)

 	dontsend:
 		/* _after_ we send it, we can deueue */
-		msg2 = msgb_dequeue(&master_sk_state.upqueue);
+		msg2 = msgb_dequeue(&sk_state.upqueue);
 		assert(msg == msg2);
 		msgb_free(msg);
 	}
 	return 0;

 close:
-	ipc_sock_close(&master_sk_state);
+	ipc_sock_close(&sk_state);
 	return -1;
 }

@@ -706,7 +652,7 @@ int IPCDevice::ipc_chan_sock_write(struct osmo_fd *bfd)
 		/* peek at the beginning of the queue */
 		msg = llist_entry(sk_chan_state[bfd->priv_nr].upqueue.next, struct msgb, list);
 		ipc_prim = (struct ipc_sk_chan_if *)msg->data;
-		osmo_fd_write_disable(bfd);
+		bfd->when &= ~BSC_FD_WRITE;
 		/* bug hunter 8-): maybe someone forgot msgb_put(...) ? */
 		if (!msgb_length(msg)) {
 			LOGP(DDEV, LOGL_ERROR,
@@ -722,14 +668,14 @@ int IPCDevice::ipc_chan_sock_write(struct osmo_fd *bfd)
 			goto close;
 		if (rc < 0) {
 			if (errno == EAGAIN) {
-				osmo_fd_write_enable(bfd);
+				bfd->when |= BSC_FD_WRITE;
 				break;
 			}
 			goto close;
 		}

 	dontsend:
-		/* _after_ we send it, we can dequeue */
+		/* _after_ we send it, we can deueue */
 		msg2 = msgb_dequeue(&sk_chan_state[bfd->priv_nr].upqueue);
 		assert(msg == msg2);
 		msgb_free(msg);
@@ -746,12 +692,12 @@ static int ipc_sock_cb(struct osmo_fd *bfd, unsigned int flags)
 	IPCDevice *device = static_cast<IPCDevice *>(bfd->data);
 	int rc = 0;

-	if (flags & OSMO_FD_READ)
+	if (flags & BSC_FD_READ)
 		rc = device->ipc_sock_read(bfd);
 	if (rc < 0)
 		return rc;

-	if (flags & OSMO_FD_WRITE)
+	if (flags & BSC_FD_WRITE)
 		rc = device->ipc_sock_write(bfd);

 	return rc;
@@ -762,12 +708,12 @@ static int ipc_chan_sock_cb(struct osmo_fd *bfd, unsigned int flags)
 	IPCDevice *device = static_cast<IPCDevice *>(bfd->data);
 	int rc = 0;

-	if (flags & OSMO_FD_READ)
+	if (flags & BSC_FD_READ)
 		rc = device->ipc_chan_sock_read(bfd);
 	if (rc < 0)
 		return rc;

-	if (flags & OSMO_FD_WRITE)
+	if (flags & BSC_FD_WRITE)
 		rc = device->ipc_chan_sock_write(bfd);

 	return rc;
@@ -775,7 +721,7 @@ static int ipc_chan_sock_cb(struct osmo_fd *bfd, unsigned int flags)

 int IPCDevice::open(const std::string &args, int ref, bool swap_channels)
 {
-	std::string k, v;
+	std::string k,v;
 	std::string::size_type keyend;
 	int rc;

@@ -783,36 +729,37 @@ int IPCDevice::open(const std::string &args, int ref, bool swap_channels)
 		k = args.substr(0, keyend++);
 		v = args.substr(keyend);
 	}
-	if (k != "ipc_msock" || !v.length()) {
-		LOGC(DDEV, ERROR) << "Invalid device args provided, expected  \"dev-args ipc_msock=/path/to/socket\"\n";
-		return -1;
+	if(k != "ipc_msock" || !v.length()) {
+			LOGC(DDEV, ERROR) << "Invalid device args provided, expected  \"dev-args ipc_msock=/path/to/socket\"\n";
+			return -1;
 	}

 	LOGC(DDEV, INFO) << "Opening IPC device" << v << "..";

-	INIT_LLIST_HEAD(&master_sk_state.upqueue);
-	rc = osmo_sock_unix_init_ofd(&master_sk_state.conn_bfd, SOCK_SEQPACKET, 0, v.c_str(), OSMO_SOCK_F_CONNECT);
+	memset(&sk_state, 0x00, sizeof(sk_state));
+	INIT_LLIST_HEAD(&sk_state.upqueue);
+	rc = osmo_sock_unix_init_ofd(&sk_state.conn_bfd, SOCK_SEQPACKET, 0, v.c_str(), OSMO_SOCK_F_CONNECT);
 	if (rc < 0) {
-		LOGC(DDEV, ERROR) << "Failed to connect to the IPC device (" << v << "). "
+		LOGC(DDEV, ERROR) << "Failed to connect to the BTS (" << v << "). "
 				  << "Retrying...\n";
-		osmo_timer_setup(&master_sk_state.timer, ipc_sock_timeout, NULL);
-		osmo_timer_schedule(&master_sk_state.timer, 5, 0);
+		osmo_timer_setup(&sk_state.timer, ipc_sock_timeout, NULL);
+		osmo_timer_schedule(&sk_state.timer, 5, 0);
 		return -1;
 	}
-	master_sk_state.conn_bfd.cb = ipc_sock_cb;
-	master_sk_state.conn_bfd.data = this;
+	sk_state.conn_bfd.cb = ipc_sock_cb;
+	sk_state.conn_bfd.data = this;

-	ipc_tx_greeting_req(&master_sk_state, IPC_SOCK_API_VERSION);
+	ipc_tx_greeting_req(&sk_state, IPC_SOCK_API_VERSION);
 	/* Wait until confirmation is recieved */
 	while (tmp_state != IPC_IF_MSG_GREETING_CNF)
 		osmo_select_main(0);

-	ipc_tx_info_req(&master_sk_state);
+	ipc_tx_info_req(&sk_state);
 	/* Wait until confirmation is recieved */
 	while (tmp_state != IPC_IF_MSG_INFO_CNF)
 		osmo_select_main(0);

-	ipc_tx_open_req(&master_sk_state, chans, ref);
+	ipc_tx_open_req(&sk_state, chans, ref);
 	/* Wait until confirmation is recieved */
 	while (tmp_state != IPC_IF_MSG_OPEN_CNF)
 		osmo_select_main(0);
@@ -831,118 +778,6 @@ out_close:
 	return -1;
 }

-void IPCDevice::manually_poll_sock_fds()
-{
-	struct timeval wait = { 0, 100000 };
-	fd_set crfds, cwfds;
-	int max_fd = 0;
-
-	FD_ZERO(&crfds);
-	FD_ZERO(&cwfds);
-	for (unsigned int i = 0; i < chans; i++) {
-		struct osmo_fd *curr_fd = &sk_chan_state[i].conn_bfd;
-		max_fd = curr_fd->fd > max_fd ? curr_fd->fd : max_fd;
-
-		if (curr_fd->when & OSMO_FD_READ)
-			FD_SET(curr_fd->fd, &crfds);
-		if (curr_fd->when & OSMO_FD_WRITE)
-			FD_SET(curr_fd->fd, &cwfds);
-	}
-
-	select(max_fd + 1, &crfds, &cwfds, 0, &wait);
-
-	for (unsigned int i = 0; i < chans; i++) {
-		int flags = 0;
-		struct osmo_fd *ofd = &sk_chan_state[i].conn_bfd;
-
-		if (FD_ISSET(ofd->fd, &crfds)) {
-			flags |= OSMO_FD_READ;
-			FD_CLR(ofd->fd, &crfds);
-		}
-
-		if (FD_ISSET(ofd->fd, &cwfds)) {
-			flags |= OSMO_FD_WRITE;
-			FD_CLR(ofd->fd, &cwfds);
-		}
-		if (flags)
-			ipc_chan_sock_cb(ofd, flags);
-	}
-}
-
-bool IPCDevice::send_chan_wait_rsp(uint32_t chan, struct msgb *msg_to_send, uint32_t expected_rsp_msg_id)
-{
-	struct timeval timer_now, timeout;
-
-	sk_chan_state[chan].messages_processed_mask = 0;
-	ipc_sock_send(&sk_chan_state[chan], msg_to_send);
-
-	gettimeofday(&timeout, 0);
-	timeout.tv_sec += 2;
-
-	while (!(sk_chan_state[chan].messages_processed_mask & (1 << (expected_rsp_msg_id - IPC_IF_CHAN_MSG_OFFSET)))) {
-		/* just poll here, we're already in select, so there is no other way to drive
-	 * the fds and "wait" for a response or retry */
-		manually_poll_sock_fds();
-
-		gettimeofday(&timer_now, 0);
-		if (timercmp(&timer_now, &timeout, >))
-			return false;
-	}
-	return true;
-}
-
-bool IPCDevice::send_all_chan_wait_rsp(uint32_t msgid_to_send, uint32_t msgid_to_expect)
-{
-	struct msgb *msg;
-	struct ipc_sk_chan_if *ipc_prim;
-	struct timeval timer_now, timeout;
-
-	for (unsigned int i = 0; i < chans; i++) {
-		msg = ipc_msgb_alloc(msgid_to_send);
-		if (!msg)
-			return -ENOMEM;
-		ipc_prim = (struct ipc_sk_chan_if *)msg->data;
-		ipc_prim->u.start_req.dummy = 0;
-
-		sk_chan_state[i].messages_processed_mask = 0;
-		ipc_sock_send(&sk_chan_state[i], msg);
-	}
-
-	gettimeofday(&timeout, 0);
-	timeout.tv_sec += 2;
-
-	unsigned int msg_received_count = 0;
-	while (msg_received_count != chans) {
-		msg_received_count = 0;
-
-		/* just poll here, we're already in select, so there is no other way to drive
-		 * the fds and "wait" for a response or retry */
-		manually_poll_sock_fds();
-
-		for (unsigned int i = 0; i < sk_chan_state.size(); i++)
-			if (sk_chan_state[i].messages_processed_mask &
-			    (1 << (msgid_to_expect - IPC_IF_CHAN_MSG_OFFSET)))
-				msg_received_count++;
-
-		gettimeofday(&timer_now, 0);
-		if (timercmp(&timer_now, &timeout, >))
-			return false;
-	}
-
-	return true;
-}
-
-/* the call stack is rather difficult here, we're already in select:
->~"#0  IPCDevice::start (this=<optimized out>) at IPCDevice.cpp:789\n"
->~"#1  in RadioInterface::start (this=0x614000001640) at radioInterface.cpp:187\n"
->~"#2  in Transceiver::start (this=<optimized out>) at Transceiver.cpp:293\n"
->~"#3  in Transceiver::ctrl_sock_handle_rx (this=0x61600000b180, chan=0) at Transceiver.cpp:838\n"
->~"#4  in Transceiver::ctrl_sock_cb (bfd=<optimized out>, flags=1) at Transceiver.cpp:168\n"
->~"#5  in osmo_fd_disp_fds (_rset=<optimized out>, _wset=<optimized out>, _eset=<optimized out>) at select.c:227\n"
->~"#6  _osmo_select_main (polling=<optimized out>) at select.c:265\n"
->~"#7  in osmo_select_main (polling=128) at select.c:274\n"
->~"#8  in main (argc=<optimized out>, argv=<optimized out>) at osmo-trx.cpp:649\n"
- * */
 bool IPCDevice::start()
 {
 	LOGC(DDEV, INFO) << "starting IPC...";
@@ -952,17 +787,20 @@ bool IPCDevice::start()
 		return true;
 	}

-	if (!(send_all_chan_wait_rsp(IPC_IF_MSG_START_REQ, IPC_IF_MSG_START_CNF))) {
-		LOGC(DDEV, ERR) << "start timeout!";
-		return false;
-	}
+	struct msgb *msg;
+	struct ipc_sk_chan_if *ipc_prim;

-	int max_bufs_to_flush = 0;
-	for (unsigned int i = 0; i < shm_dec->num_chans; i++) {
-		int buf_per_chan = shm_dec->channels[i]->ul_stream->num_buffers;
-		max_bufs_to_flush = max_bufs_to_flush < buf_per_chan ? buf_per_chan : max_bufs_to_flush;
-	}
-	flush_recv(max_bufs_to_flush);
+	msg = ipc_msgb_alloc(IPC_IF_MSG_START_REQ);
+	if (!msg)
+		return -ENOMEM;
+	ipc_prim = (struct ipc_sk_chan_if *)msg->data;
+	ipc_prim->u.start_req.dummy = 0;
+
+	ipc_sock_send(&sk_chan_state[0], msg);
+	while (tmp_state != IPC_IF_MSG_START_CNF)
+		osmo_select_main(0);
+
+	flush_recv(10);

 	started = true;
 	return true;
@@ -970,68 +808,84 @@ bool IPCDevice::start()

 bool IPCDevice::stop()
 {
+	//unsigned int i;
+
 	if (!started)
 		return true;

-	if (!(send_all_chan_wait_rsp(IPC_IF_MSG_STOP_REQ, IPC_IF_MSG_STOP_CNF))) {
-		LOGC(DDEV, ERR) << "stop timeout!";
-		return false;
-	}
+	struct msgb *msg;
+	struct ipc_sk_chan_if *ipc_prim;

-	LOGC(DDEV, NOTICE) << "All channels stopped, terminating...";
+	msg = ipc_msgb_alloc(IPC_IF_MSG_STOP_REQ);
+	if (!msg)
+		return -ENOMEM;
+	ipc_prim = (struct ipc_sk_chan_if *)msg->data;
+	ipc_prim->u.start_req.dummy = 0;

-	/* reset internal buffer timestamps */
-	for (size_t i = 0; i < rx_buffers.size(); i++)
-		rx_buffers[i]->reset();
+	ipc_sock_send(&sk_chan_state[0], msg);

 	started = false;
 	return true;
 }

+/* do rx/tx calibration - depends on gain, freq and bw */
+bool IPCDevice::do_calib(size_t chan)
+{
+	LOGCHAN(chan, DDEV, INFO) << "Calibrating";
+	return true;
+}
+
+/* do rx/tx filter config - depends on bw only? */
+bool IPCDevice::do_filters(size_t chan)
+{
+	LOGCHAN(chan, DDEV, INFO) << "Setting filters";
+	return true;
+}
+
+double IPCDevice::maxTxGain()
+{
+	//return dev_param_map.at(m_dev_type).max_tx_gain;
+	return current_info_cnf.max_tx_gain;
+}
+
+double IPCDevice::minTxGain()
+{
+	return current_info_cnf.min_tx_gain;
+}
+
 double IPCDevice::maxRxGain()
 {
-	return current_info_cnf.chan_info[0].max_rx_gain;
+	return current_info_cnf.max_rx_gain;
 }

 double IPCDevice::minRxGain()
 {
-	return current_info_cnf.chan_info[0].min_rx_gain;
+	return current_info_cnf.min_rx_gain;
 }

-int IPCDevice::getNominalTxPower(size_t chan)
-{
-	return current_info_cnf.chan_info[chan].nominal_tx_power;
-}
-
-double IPCDevice::setPowerAttenuation(int atten, size_t chan)
+double IPCDevice::setTxGain(double dB, size_t chan)
 {
 	struct msgb *msg;
 	struct ipc_sk_chan_if *ipc_prim;

-	if (chan >= chans)
-		return 0;
+	if (dB > maxTxGain())
+		dB = maxTxGain();
+	if (dB < minTxGain())
+		dB = minTxGain();

-	LOGCHAN(chan, DDEV, NOTICE) << "Setting TX attenuation to " << atten << " dB"
-				    << " chan " << chan;
+	LOGCHAN(chan, DDEV, NOTICE) << "Setting TX gain to " << dB << " dB";

-	msg = ipc_msgb_alloc(IPC_IF_MSG_SETTXATTN_REQ);
+	msg = ipc_msgb_alloc(IPC_IF_MSG_SETGAIN_REQ);
 	if (!msg)
 		return -ENOMEM;
 	ipc_prim = (struct ipc_sk_chan_if *)msg->data;
-	ipc_prim->u.txatten_req.attenuation = atten;
+	ipc_prim->u.set_gain_req.is_tx = 1;
+	ipc_prim->u.set_gain_req.gain = dB;

-	if (!send_chan_wait_rsp(chan, msg, IPC_IF_MSG_SETTXATTN_CNF))
-		LOGCHAN(chan, DDEV, ERROR) << "Setting TX attenuation timeout! ";
+	ipc_sock_send(&sk_chan_state[chan], msg);

-	return atten;
-}
-
-double IPCDevice::getPowerAttenuation(size_t chan)
-{
-	if (chan >= chans)
-		return 0;
-
-	return tx_attenuation[chan];
+	tx_gains[chan] = dB;
+	return tx_gains[chan];
 }

 double IPCDevice::setRxGain(double dB, size_t chan)
@@ -1053,9 +907,9 @@ double IPCDevice::setRxGain(double dB, size_t chan)
 	ipc_prim->u.set_gain_req.is_tx = 0;
 	ipc_prim->u.set_gain_req.gain = dB;

-	if (!send_chan_wait_rsp(chan, msg, IPC_IF_MSG_SETGAIN_CNF))
-		LOGCHAN(chan, DDEV, ERROR) << "Setting RX gain timeout! ";
+	ipc_sock_send(&sk_chan_state[chan], msg);

+	rx_gains[chan] = dB;
 	return rx_gains[chan];
 }

@@ -1063,14 +917,14 @@ bool IPCDevice::flush_recv(size_t num_pkts)
 {
 	std::vector<uint16_t> tmp(4096);
 	uint64_t tmps;
-	uint32_t read = 0;
+	uint32_t read;

 	for (uint32_t j = 0; j < num_pkts; j++) {
 		for (unsigned int i = 0; i < chans; i++)
-			read = ipc_shm_read(shm_io_rx_streams[i], (uint16_t *)&tmp.front(), 4096 / 2, &tmps, 3);
+			read = ipc_shm_read(shm_io_rx_streams[i], (uint16_t *)&tmp.front(), 4096 / 2, &tmps, 1);
 	}
 	ts_initial = tmps + read;
-
+	return ts_initial;
 	LOGC(DDEV, INFO) << "Initial timestamp " << ts_initial << std::endl;
 	return true;
 }
@@ -1121,7 +975,7 @@ TIMESTAMP IPCDevice::initialReadTimestamp(void)
 // NOTE: Assumes sequential reads
 int IPCDevice::readSamples(std::vector<short *> &bufs, int len, bool *overrun, TIMESTAMP timestamp, bool *underrun)
 {
-	int rc, num_smpls; //, expect_smpls;
+	int rc, num_smpls, expect_smpls;
 	ssize_t avail_smpls;
 	TIMESTAMP expect_timestamp;
 	unsigned int i;
@@ -1150,17 +1004,22 @@ int IPCDevice::readSamples(std::vector<short *> &bufs, int len, bool *overrun, T
 			uint64_t recv_timestamp = 0;

 			thread_enable_cancel(false);
+
 			num_smpls = ipc_shm_read(shm_io_rx_streams[i], (uint16_t *)bufs[i], len - avail_smpls,
 						 &recv_timestamp, 1);
 			expect_timestamp = timestamp + avail_smpls;
 			thread_enable_cancel(true);

-			if (num_smpls == -ETIMEDOUT)
-				continue;
-
 			LOGCHAN(i, DDEV, DEBUG)
 			"Received timestamp = " << (TIMESTAMP)recv_timestamp << " (" << num_smpls << ")";

+			expect_smpls = len - avail_smpls;
+			//			if (expect_smpls != num_smpls)
+			//				LOGCHAN(i, DDEV, NOTICE)
+			//					<< "Unexpected recv buffer len: expect " << expect_smpls << " got " << num_smpls
+			//					<< ", diff=" << expect_smpls - num_smpls;
+
+			//expect_timestamp = timestamp + avail_smpls;
 			if (expect_timestamp != (TIMESTAMP)recv_timestamp)
 				LOGCHAN(i, DDEV, ERROR) << "Unexpected recv buffer timestamp: expect "
 							<< expect_timestamp << " got " << recv_timestamp << ", diff="
@@ -1170,8 +1029,7 @@ int IPCDevice::readSamples(std::vector<short *> &bufs, int len, bool *overrun, T

 			rc = rx_buffers[i]->write(bufs[i], num_smpls, (TIMESTAMP)recv_timestamp);
 			if (rc < 0) {
-				LOGCHAN(i, DDEV, ERROR)
-					<< rx_buffers[i]->str_code(rc) << " num smpls: " << num_smpls << " chan: " << i;
+				LOGCHAN(i, DDEV, ERROR) << rx_buffers[i]->str_code(rc);
 				LOGCHAN(i, DDEV, ERROR) << rx_buffers[i]->str_status(timestamp);
 				if (rc != smpl_buf::ERROR_OVERFLOW)
 					return 0;
@@ -1206,10 +1064,12 @@ int IPCDevice::writeSamples(std::vector<short *> &bufs, int len, bool *underrun,

 	for (i = 0; i < chans; i++) {
 		LOGCHAN(i, DDEV, DEBUG) << "send buffer of len " << len << " timestamp " << std::hex << timestamp;
-		thread_enable_cancel(false);
+		//		thread_enable_cancel(false);
 		rc = ipc_shm_enqueue(shm_io_tx_streams[i], timestamp, len, (uint16_t *)bufs[i]);
-		thread_enable_cancel(true);

+		//		rc = LMS_SendStream(&m_lms_stream_tx[i], bufs[i], len, &tx_metadata, 100);
+		//		update_stream_stats_tx(i, underrun);
+		//		thread_enable_cancel(true);
 		if (rc != len) {
 			LOGCHAN(i, DDEV, ERROR) << "LMS: Device Tx timed out (" << rc << " vs exp " << len << ").";
 			return -1;
@@ -1237,7 +1097,7 @@ bool IPCDevice::setTxFreq(double wFreq, size_t chan)
 	ipc_prim->u.set_freq_req.is_tx = 1;
 	ipc_prim->u.set_freq_req.freq = wFreq;

-	return send_chan_wait_rsp(chan, msg, IPC_IF_MSG_SETFREQ_CNF);
+	return ipc_sock_send(&sk_chan_state[chan], msg) < 0 ? false : true;
 }

 bool IPCDevice::setRxFreq(double wFreq, size_t chan)
@@ -1253,7 +1113,7 @@ bool IPCDevice::setRxFreq(double wFreq, size_t chan)
 	ipc_prim->u.set_freq_req.is_tx = 0;
 	ipc_prim->u.set_freq_req.freq = wFreq;

-	return send_chan_wait_rsp(chan, msg, IPC_IF_MSG_SETFREQ_CNF);
+	return ipc_sock_send(&sk_chan_state[chan], msg) < 0 ? false : true;
 }

 RadioDevice *RadioDevice::make(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chans, double lo_offset,
--- a/Transceiver52M/device/ipc/IPCDevice.h
+++ b/Transceiver52M/device/ipc/IPCDevice.h
@@ -4,29 +4,21 @@
 *
 * SPDX-License-Identifier: AGPL-3.0+
 *
-* 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 software is distributed under multiple licenses; see the COPYING file in
+* the main directory for licensing information for this specific distribution.
 *
-* 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/>.
-* See the COPYING file in the main directory for details.
+* This use of this software may be subject to additional restrictions.
+* See the LEGAL file in the main directory for details.
+
+    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.
+
 */

 #ifndef _IPC_DEVICE_H_
 #define _IPC_DEVICE_H_

-#include <cstdint>
-#include <cstddef>
-#include <climits>
-#include <string>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -35,32 +27,31 @@ extern "C" {
 #include <osmocom/core/select.h>
 #include <osmocom/core/timer.h>
 #include "shm.h"
+#include "ipc_shm.h"
 }

 #include "radioDevice.h"
+#include "smpl_buf.h"

-class smpl_buf;
+#include <sys/time.h>
+#include <math.h>
+#include <limits.h>
+#include <string>
+#include <iostream>
+#include <lime/LimeSuite.h>

-#define IPC_MAX_NUM_TRX 8
-
-struct ipc_per_trx_sock_state {
+struct ipc_sock_state {
 	struct osmo_fd conn_bfd; /* fd for connection to the BTS */
 	struct osmo_timer_list timer; /* socket connect retry timer */
 	struct llist_head upqueue; /* queue for sending messages */
-	uint32_t messages_processed_mask; // (=| IPC_IF_MSG_xxx-IPC_IF_CHAN_MSG_OFFSET) bitmask
-	ipc_per_trx_sock_state() : conn_bfd(), timer(), upqueue(), messages_processed_mask()
-	{
-		conn_bfd.fd = -1;
-	}
 };

+/** A class to handle a LimeSuite supported device */
 class IPCDevice : public RadioDevice {
    protected:
-	struct ipc_per_trx_sock_state master_sk_state;
-
-	std::vector<struct ipc_per_trx_sock_state> sk_chan_state;
-
-	uint32_t tx_attenuation[IPC_MAX_NUM_TRX];
+	struct ipc_sock_state sk_state;
+	/* FIXME: current limit 8 chans, make dynamic */
+	struct ipc_sock_state sk_chan_state[8];
 	uint8_t tmp_state;
 	char shm_name[SHM_NAME_MAX];
 	int ipc_shm_connect(const char *shm_name);
@@ -68,9 +59,10 @@ class IPCDevice : public RadioDevice {
 	struct ipc_shm_region *shm_dec;

 	std::vector<smpl_buf *> rx_buffers;
-	double actualSampleRate;
+	double actualSampleRate; ///< the actual USRP sampling rate

-	bool started;
+	bool started; ///< flag indicates LMS has started
+	bool skipRx; ///< set if LMS is transmit-only.

 	TIMESTAMP ts_initial, ts_offset;

@@ -83,73 +75,59 @@ class IPCDevice : public RadioDevice {
 	std::vector<struct ipc_shm_io *> shm_io_rx_streams;
 	std::vector<struct ipc_shm_io *> shm_io_tx_streams;

-	bool flush_recv(size_t num_pkts);
+	bool do_calib(size_t chan);
+	bool do_filters(size_t chan);
+	int get_ant_idx(const std::string &name, bool dir_tx, size_t chan);
+	virtual bool flush_recv(size_t num_pkts);
 	void update_stream_stats_rx(size_t chan, bool *overrun);
 	void update_stream_stats_tx(size_t chan, bool *underrun);
-	void manually_poll_sock_fds();
-
-	void ipc_sock_close(ipc_per_trx_sock_state *state);
-
-	int ipc_rx(uint8_t msg_type, struct ipc_sk_if *ipc_prim);
-	int ipc_rx_greeting_cnf(const struct ipc_sk_if_greeting *greeting_cnf);
-	int ipc_rx_info_cnf(const struct ipc_sk_if_info_cnf *info_cnf);
-	int ipc_rx_open_cnf(const struct ipc_sk_if_open_cnf *open_cnf);
-	int ipc_tx_open_req(struct ipc_per_trx_sock_state *state, uint32_t num_chans, uint32_t ref);
-
-	int ipc_chan_rx(uint8_t msg_type, ipc_sk_chan_if *ipc_prim, uint8_t chan_nr);
-	int ipc_rx_chan_start_cnf(ipc_sk_chan_if_op_rc *ret, uint8_t chan_nr);
-	int ipc_rx_chan_stop_cnf(ipc_sk_chan_if_op_rc *ret, uint8_t chan_nr);
-	int ipc_rx_chan_setgain_cnf(ipc_sk_chan_if_gain *ret, uint8_t chan_nr);
-	int ipc_rx_chan_setfreq_cnf(ipc_sk_chan_if_freq_cnf *ret, uint8_t chan_nr);
-	int ipc_rx_chan_notify_underflow(ipc_sk_chan_if_notfiy *ret, uint8_t chan_nr);
-	int ipc_rx_chan_notify_overflow(ipc_sk_chan_if_notfiy *ret, uint8_t chan_nr);
-	int ipc_rx_chan_settxattn_cnf(ipc_sk_chan_if_tx_attenuation *ret, uint8_t chan_nr);
-
-	bool send_chan_wait_rsp(uint32_t chan, struct msgb *msg_to_send, uint32_t expected_rsp_msg_id);
-	bool send_all_chan_wait_rsp(uint32_t msgid_to_send, uint32_t msgid_to_expect);
+	bool do_clock_src_freq(enum ReferenceType ref, double freq);

    public:
-	int ipc_sock_read(struct osmo_fd *bfd);
-	int ipc_sock_write(struct osmo_fd *bfd);
-	int ipc_chan_sock_read(osmo_fd *bfd);
-	int ipc_chan_sock_write(osmo_fd *bfd);
+	virtual void ipc_sock_close(ipc_sock_state *state);
+	virtual int ipc_sock_read(struct osmo_fd *bfd);
+	virtual int ipc_sock_write(struct osmo_fd *bfd);
+	virtual int ipc_rx(uint8_t msg_type, struct ipc_sk_if *ipc_prim);
+	virtual int ipc_rx_greeting_cnf(const struct ipc_sk_if_greeting *greeting_cnf);
+	virtual int ipc_rx_info_cnf(const struct ipc_sk_if_info_cnf *info_cnf);
+	virtual int ipc_rx_open_cnf(const struct ipc_sk_if_open_cnf *open_cnf);
+	virtual int ipc_tx_open_req(struct ipc_sock_state *state, uint32_t num_chans, uint32_t ref);

 	/** Object constructor */
 	IPCDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset,
 		  const std::vector<std::string> &tx_paths, const std::vector<std::string> &rx_paths);
 	virtual ~IPCDevice() override;

-	/** Instantiate the IPC */
+	/** Instantiate the LMS */
 	virtual int open(const std::string &args, int ref, bool swap_channels) override;

-	/** Start the IPC */
+	/** Start the LMS */
 	virtual bool start() override;

-	/** Stop the IPC */
+	/** Stop the LMS */
 	virtual bool stop() override;

-	/* FIXME: any != USRP1 will do for now... */
 	enum TxWindowType getWindowType() override
 	{
 		return TX_WINDOW_LMS1;
 	}

 	/**
-	Read samples from the IPC.
+	Read samples from the LMS.
 	@param buf preallocated buf to contain read result
 	@param len number of samples desired
 	@param overrun Set if read buffer has been overrun, e.g. data not being read fast enough
 	@param timestamp The timestamp of the first samples to be read
-	@param underrun Set if IPC does not have data to transmit, e.g. data not being sent fast enough
+	@param underrun Set if LMS does not have data to transmit, e.g. data not being sent fast enough
 	@return The number of samples actually read
 	*/
 	virtual int readSamples(std::vector<short *> &buf, int len, bool *overrun, TIMESTAMP timestamp = 0xffffffff,
 				bool *underrun = NULL) override;
 	/**
-	Write samples to the IPC.
+	Write samples to the LMS.
 	@param buf Contains the data to be written.
 	@param len number of samples to write.
-	@param underrun Set if IPC does not have data to transmit, e.g. data not being sent fast enough
+	@param underrun Set if LMS does not have data to transmit, e.g. data not being sent fast enough
 	@param timestamp The timestamp of the first sample of the data buffer.
 	@return The number of samples actually written
 	*/
@@ -198,13 +176,20 @@ class IPCDevice : public RadioDevice {
 	/** return minimum Rx Gain **/
 	virtual double minRxGain(void) override;

-	/* FIXME: return rx_gains[chan] ? receive factor from IPC Driver? */
-	double rssiOffset(size_t chan) { return 0.0f; };
+	/** sets the transmit chan gain, returns the gain setting **/
+	virtual double setTxGain(double dB, size_t chan = 0) override;

-	double setPowerAttenuation(int atten, size_t chan) override;
-	double getPowerAttenuation(size_t chan = 0) override;
+	/** get transmit gain */
+	virtual double getTxGain(size_t chan = 0) override
+	{
+		return tx_gains[chan];
+	}

-	virtual int getNominalTxPower(size_t chan = 0) override;
+	/** return maximum Tx Gain **/
+	virtual double maxTxGain(void) override;
+
+	/** return minimum Rx Gain **/
+	virtual double minTxGain(void) override;

 	/** sets the RX path to use, returns true if successful and false otherwise */
 	virtual bool setRxAntenna(const std::string &ant, size_t chan = 0) override;
@@ -237,6 +222,15 @@ class IPCDevice : public RadioDevice {
 	{
 		return actualSampleRate;
 	}
+	int ipc_chan_sock_read(osmo_fd *bfd);
+	int ipc_chan_sock_write(osmo_fd *bfd);
+	int ipc_chan_rx(uint8_t msg_type, ipc_sk_chan_if *ipc_prim, uint8_t chan_nr);
+	int ipc_rx_chan_start_cnf(ipc_sk_chan_if_op_rc *ret, uint8_t chan_nr);
+	int ipc_rx_chan_stop_cnf(ipc_sk_chan_if_op_rc *ret, uint8_t chan_nr);
+	int ipc_rx_chan_setgain_cnf(ipc_sk_chan_if_gain *ret, uint8_t chan_nr);
+	int ipc_rx_chan_setfreq_cnf(ipc_sk_chan_if_freq_cnf *ret, uint8_t chan_nr);
+	int ipc_rx_chan_notify_underflow(ipc_sk_chan_if_notfiy *ret, uint8_t chan_nr);
+	int ipc_rx_chan_notify_overflow(ipc_sk_chan_if_notfiy *ret, uint8_t chan_nr);
 };

 #endif // _IPC_DEVICE_H_
--- a/Transceiver52M/device/ipc/Makefile.am
+++ b/Transceiver52M/device/ipc/Makefile.am
@@ -1,42 +1,29 @@
 include $(top_srcdir)/Makefile.common

 AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common
-AM_CFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS)
-AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS)
+AM_CFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
 AM_LDFLAGS = -lpthread -lrt

-noinst_HEADERS = IPCDevice.h shm.h ipc_shm.h ipc_chan.h ipc_sock.h
-
-if DEVICE_UHD
-noinst_HEADERS += ../uhd/UHDDevice.h uhdwrap.h ipc-driver-test.h
-endif
+noinst_HEADERS = IPCDevice.h shm.h ../uhd/UHDDevice.h uhdwrap.h

 noinst_LTLIBRARIES = libdevice.la

-libdevice_la_SOURCES = IPCDevice.cpp shm.c ipc_shm.c ipc_chan.c ipc_sock.c
+libdevice_la_SOURCES = ipc-driver-test.c IPCDevice.cpp shm.c ../uhd/UHDDevice.cpp uhdwrap.cpp ipc_shm.c ipc_chan.c ipc_sock.c 
 libdevice_la_LIBADD = $(top_builddir)/Transceiver52M/device/common/libdevice_common.la
-libdevice_la_CXXFLAGS = $(AM_CXXFLAGS) -DIPCMAGIC
-
-#work around distclean issue on older autotools vers:
-#a direct build of ../uhd/UHDDevice.cpp tries to clean
-#../uhd/.dep/UHDDevice.Plo twice and fails
-uhddev_ipc.cpp:
-	echo "#include \"../uhd/UHDDevice.cpp\"" >$@
-CLEANFILES= uhddev_ipc.cpp
-BUILT_SOURCES = uhddev_ipc.cpp
-
-if DEVICE_UHD
+libdevice_la_CXXFLAGS = $(AM_CXXFLAGS) $(UHD_CFLAGS) -DIPCMAGIC

 bin_PROGRAMS = ipc-driver-test
 #ipc_driver_test_SHORTNAME = drvt
-ipc_driver_test_SOURCES = ipc-driver-test.c uhdwrap.cpp ipc_shm.c ipc_chan.c ipc_sock.c uhddev_ipc.cpp
+ipc_driver_test_SOURCES = ipc-driver-test.c uhdwrap.cpp ipc_shm.c ipc_chan.c ipc_sock.c ../uhd/UHDDevice.cpp
 ipc_driver_test_LDADD = \
        shm.lo \
 	$(LIBOSMOCORE_LIBS) \
-	$(NULL)
+	$(LIBOSMOCTRL_LIBS) \
+	$(LIBOSMOVTY_LIBS)
 ipc_driver_test_CXXFLAGS = $(AM_CXXFLAGS) $(UHD_CFLAGS)
 ipc_driver_test_CPPFLAGS  = $(AM_CPPFLAGS) $(UHD_CFLAGS)
 ipc_driver_test_CFLAGS  = $(AM_CFLAGS) $(UHD_CFLAGS)
 ipc_driver_test_LDFLAGS  = $(AM_LDFLAGS) $(UHD_LIBS)
 ipc_driver_test_LDADD += $(top_builddir)/Transceiver52M/device/common/libdevice_common.la $(top_builddir)/CommonLibs/libcommon.la
-endif
+
--- a/Transceiver52M/device/ipc/ipc-driver-test.c
+++ b/Transceiver52M/device/ipc/ipc-driver-test.c
@@ -4,19 +4,21 @@
 *
 * SPDX-License-Identifier: 0BSD
 *
-* Permission to use, copy, modify, and/or distribute this software for any purpose
-* with or without fee is hereby granted.THE SOFTWARE IS PROVIDED "AS IS" AND THE
-* AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
-* BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
-* USE OR PERFORMANCE OF THIS SOFTWARE.
+    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+    PERFORMANCE OF THIS SOFTWARE.
 */
+#ifdef __cplusplus
+extern "C" {
+#endif

 #define _GNU_SOURCE
 #include <pthread.h>

+
 #include <debug.h>

 #include <stdio.h>
@@ -49,7 +51,6 @@
 #include "ipc_sock.h"

 #define DEFAULT_SHM_NAME "/osmo-trx-ipc-driver-shm2"
-#define IPC_SOCK_PATH_PREFIX "/tmp"

 static void *tall_ctx;
 struct ipc_sock_state *global_ipc_sock_state;
@@ -64,19 +65,17 @@ void *global_dev;

 static struct ipc_shm_region *decoded_region;

-static struct {
-	int msocknum;
-	char *ud_prefix_dir;
-} cmdline_cfg;
-
+/* Debug Areas of the code */
+//enum { DMAIN,
+//};
 static const struct log_info_cat default_categories[] = {
 	[DMAIN] = {
 		.name = "DMAIN",
-		.color = NULL,
+        		.color = NULL,
 		.description = "Main generic category",
-		.loglevel = LOGL_DEBUG,.enabled = 1,
+		 .loglevel = LOGL_DEBUG,.enabled = 1,
 	},
-	[DDEV] = {
+    [DDEV] = {
 		.name = "DDEV",
 		.description = "Device/Driver specific code",
 		.color = NULL,
@@ -88,6 +87,9 @@ const struct log_info log_infox = {
 	.cat = default_categories,
 	.num_cat = ARRAY_SIZE(default_categories),
 };
+#ifdef __cplusplus
+}
+#endif

 #include "uhdwrap.h"

@@ -191,8 +193,7 @@ static int ipc_tx_open_cnf(int rc, uint32_t num_chans, int32_t timingoffset)

 	chan_info = ipc_prim->u.open_cnf.chan_info;
 	for (i = 0; i < num_chans; i++) {
-		snprintf(chan_info->chan_ipc_sk_path, sizeof(chan_info->chan_ipc_sk_path),"%s/ipc_sock%d_%d",
-			 cmdline_cfg.ud_prefix_dir, cmdline_cfg.msocknum, i);
+		snprintf(chan_info->chan_ipc_sk_path, sizeof(chan_info->chan_ipc_sk_path), "%s_%d", IPC_SOCK_PATH_PREFIX, i);
 		/* FIXME: dynamc chan limit, currently 8 */
 		if (i < 8)
 			ipc_sock_init(chan_info->chan_ipc_sk_path, &global_ctrl_socks[i], ipc_chan_sock_accept, i);
@@ -221,7 +222,6 @@ int ipc_rx_open_req(struct ipc_sk_if_open_req *open_req)
 {
 	/* calculate size needed */
 	unsigned int len;
-	unsigned int i;

 	global_dev = uhdwrap_open(open_req);

@@ -232,14 +232,14 @@ int ipc_rx_open_req(struct ipc_sk_if_open_req *open_req)
 	/* Here we verify num_chans, rx_path, tx_path, clockref, etc. */
 	int rc = ipc_shm_setup(DEFAULT_SHM_NAME, len);
 	len = ipc_shm_encode_region((struct ipc_shm_raw_region *)shm, open_req->num_chans, 4, shmbuflen);
-	//	LOGP(DMAIN, LOGL_NOTICE, "%s\n", osmo_hexdump((const unsigned char *)shm, 80));
+	LOGP(DMAIN, LOGL_NOTICE, "%s\n", osmo_hexdump((const unsigned char *)shm, 80));

 	/* set up our own copy of the decoded area, we have to do it here,
-	* since the uhd wrapper does not allow starting single channels
+	 *  since the uhd wrapper does not allow starting single channels
 	* additionally go for the producer init for both, so only we are responsible for the init, instead
-	* of splitting it with the client and causing potential races if one side uses it too early */
+     * of splitting it with the client and causing potential races if one side uses it too early */
 	decoded_region = ipc_shm_decode_region(0, (struct ipc_shm_raw_region *)shm);
-	for (i = 0; i < open_req->num_chans; i++) {
+	for (unsigned int i = 0; i < open_req->num_chans; i++) {
 		//		ios_tx_to_device[i] = ipc_shm_init_consumer(decoded_region->channels[i]->dl_stream);
 		ios_tx_to_device[i] = ipc_shm_init_producer(decoded_region->channels[i]->dl_stream);
 		ios_rx_from_device[i] = ipc_shm_init_producer(decoded_region->channels[i]->ul_stream);
@@ -249,14 +249,11 @@ int ipc_rx_open_req(struct ipc_sk_if_open_req *open_req)
 	return 0;
 }

-volatile bool ul_running = false;
-volatile bool dl_running = false;
-
 void *uplink_thread(void *x_void_ptr)
 {
 	uint32_t chann = decoded_region->num_chans;
-	ul_running = true;
-	pthread_setname_np(pthread_self(), "uplink_rx");
+
+	pthread_setname_np(pthread_self(), "uplink rx");

 	while (!ipc_exit_requested) {
 		int32_t read = uhdwrap_read(global_dev, chann);
@@ -269,8 +266,7 @@ void *uplink_thread(void *x_void_ptr)
 void *downlink_thread(void *x_void_ptr)
 {
 	int chann = decoded_region->num_chans;
-	dl_running = true;
-	pthread_setname_np(pthread_self(), "downlink_tx");
+	pthread_setname_np(pthread_self(), "downlink tx");

 	while (!ipc_exit_requested) {
 		bool underrun;
@@ -283,21 +279,14 @@ int ipc_rx_chan_start_req(struct ipc_sk_chan_if_op_void *req, uint8_t chan_nr)
 {
 	struct msgb *msg;
 	struct ipc_sk_chan_if *ipc_prim;
-	int rc = 0;
-
-	rc = uhdwrap_start(global_dev, chan_nr);
+	int rc;

 	/* no per-chan start/stop */
-	if (!dl_running || !ul_running) {
-		/* chan != first chan start will "fail", which is fine, usrp can't start/stop chans independently */
-		if (rc) {
-			LOGP(DMAIN, LOGL_INFO, "starting rx/tx threads.. req for chan:%d\n", chan_nr);
-			pthread_t rx, tx;
-			pthread_create(&rx, NULL, uplink_thread, 0);
-			pthread_create(&tx, NULL, downlink_thread, 0);
-		}
-	} else
-		LOGP(DMAIN, LOGL_INFO, "starting rx/tx threads request ignored.. req for chan:%d\n", chan_nr);
+	rc = uhdwrap_start(global_dev, chan_nr);
+
+	pthread_t rx, tx;
+	pthread_create(&rx, NULL, uplink_thread, 0);
+	pthread_create(&tx, NULL, downlink_thread, 0);

 	msg = ipc_msgb_alloc(IPC_IF_MSG_START_CNF);
 	if (!msg)
@@ -359,23 +348,6 @@ int ipc_rx_chan_setfreq_req(struct ipc_sk_chan_if_freq_req *req, uint8_t chan_nr
 	return ipc_chan_sock_send(msg, chan_nr);
 }

-int ipc_rx_chan_settxatten_req(struct ipc_sk_chan_if_tx_attenuation *req, uint8_t chan_nr)
-{
-	struct msgb *msg;
-	struct ipc_sk_chan_if *ipc_prim;
-	double rv;
-
-	rv = uhdwrap_set_txatt(global_dev, req->attenuation, chan_nr);
-
-	msg = ipc_msgb_alloc(IPC_IF_MSG_SETTXATTN_CNF);
-	if (!msg)
-		return -ENOMEM;
-	ipc_prim = (struct ipc_sk_chan_if *)msg->data;
-	ipc_prim->u.txatten_cnf.attenuation = rv;
-
-	return ipc_chan_sock_send(msg, chan_nr);
-}
-
 int ipc_sock_init(const char *path, struct ipc_sock_state **global_state_var,
 		  int (*sock_callback_fn)(struct osmo_fd *fd, unsigned int what), int n)
 {
@@ -400,7 +372,10 @@ int ipc_sock_init(const char *path, struct ipc_sock_state **global_state_var,
 		return -1;
 	}

-	osmo_fd_setup(bfd, bfd->fd, OSMO_FD_READ, sock_callback_fn, state, n);
+	bfd->when = BSC_FD_READ;
+	bfd->cb = sock_callback_fn;
+	bfd->data = state;
+	bfd->priv_nr = n;

 	rc = osmo_fd_register(bfd);
 	if (rc < 0) {
@@ -410,6 +385,8 @@ int ipc_sock_init(const char *path, struct ipc_sock_state **global_state_var,
 		return rc;
 	}

+	//osmo_signal_register_handler(SS_GLOBAL, IPC_if_signal_cb, NULL);
+
 	LOGP(DMAIN, LOGL_INFO, "Started listening on IPC socket: %s\n", path);

 	return 0;
@@ -417,22 +394,26 @@ int ipc_sock_init(const char *path, struct ipc_sock_state **global_state_var,

 static void print_help(void)
 {
-	printf("ipc-driver-test Usage:\n"
-	       " -h  --help		This message\n"
-	       " -u  --unix-sk-dir DIR	Existing directory where to create the Master socket\n"
-	       " -n  --sock-num NR	Master socket suffix number NR\n");
+	printf(	"ipc-driver-test Usage:\n"
+		" -h  --help		This message\n"
+		" -n  --sock-num NR	Master socket suffix number NR\n"
+	      );
 }

+static int msocknum = 0;
+
 static void handle_options(int argc, char **argv)
 {
 	while (1) {
 		int option_index = 0, c;
-		const struct option long_options[] = { { "help", 0, 0, 'h' },
-						       { "unix-sk-dir", 1, 0, 'u' },
-						       { "sock-num", 1, 0, 'n' },
-						       { 0, 0, 0, 0 } };
+		const struct option long_options[] = {
+			{ "help", 0, 0, 'h' },
+			{ "sock-num", 1, 0, 'n' },
+			{0,0,0,0}
+		};

-		c = getopt_long(argc, argv, "hu:n:", long_options, &option_index);
+		c = getopt_long(argc, argv, "hn:",
+				long_options, &option_index);
 		if (c == -1)
 			break;

@@ -441,13 +422,9 @@ static void handle_options(int argc, char **argv)
 			print_help();
 			exit(0);
 			break;
-		case 'u':
-			cmdline_cfg.ud_prefix_dir = talloc_strdup(tall_ctx, optarg);
-			break;
 		case 'n':
-			cmdline_cfg.msocknum = atoi(optarg);
+			msocknum = atoi(optarg);
 			break;
-
 		default:
 			exit(2);
 			break;
@@ -460,33 +437,31 @@ static void handle_options(int argc, char **argv)
 	}
 }

+#if defined(IPCMAGIC) && defined(__cplusplus)
+extern "C" int osmo_ctx_init(const char *id);
+
+extern "C" int magicmain(int argc, char **argv)
+{
+	osmo_ctx_init("main");
+	osmo_select_init();
+
+#else
 int main(int argc, char **argv)
 {
-	char ipc_msock_path[128];
+#endif
+	char ipc_msock_path[sizeof(IPC_SOCK_PATH_PREFIX)+3];
 	tall_ctx = talloc_named_const(NULL, 0, "OsmoTRX");
 	msgb_talloc_ctx_init(tall_ctx, 0);
 	osmo_init_logging2(tall_ctx, &log_infox);
 	log_enable_multithread();

 	handle_options(argc, argv);
-
-	if (!cmdline_cfg.ud_prefix_dir)
-		cmdline_cfg.ud_prefix_dir = talloc_strdup(tall_ctx, IPC_SOCK_PATH_PREFIX);
-
-
-	snprintf(ipc_msock_path, sizeof(ipc_msock_path), "%s/ipc_sock%d", cmdline_cfg.ud_prefix_dir, cmdline_cfg.msocknum);
+	snprintf(ipc_msock_path,sizeof(ipc_msock_path), "%s%d", IPC_SOCK_PATH_PREFIX, msocknum);

 	LOGP(DMAIN, LOGL_INFO, "Starting %s\n", argv[0]);
 	ipc_sock_init(ipc_msock_path, &global_ipc_sock_state, ipc_sock_accept, 0);
 	while (!ipc_exit_requested)
 		osmo_select_main(0);
-
-	if (global_dev) {
-		unsigned int i;
-		for (i = 0; i < decoded_region->num_chans; i++)
-			uhdwrap_stop(global_dev, i);
-	}
-
-	ipc_sock_close(global_ipc_sock_state);
+	//ipc_sock_close()
 	return 0;
 }
--- a/Transceiver52M/device/ipc/ipc-driver-test.h
+++ b/Transceiver52M/device/ipc/ipc-driver-test.h
@@ -4,14 +4,12 @@
 *
 * SPDX-License-Identifier: 0BSD
 *
-* Permission to use, copy, modify, and/or distribute this software for any purpose
-* with or without fee is hereby granted.THE SOFTWARE IS PROVIDED "AS IS" AND THE
-* AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
-* BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
-* USE OR PERFORMANCE OF THIS SOFTWARE.
+    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+    PERFORMANCE OF THIS SOFTWARE.
 */
 #pragma once

@@ -27,7 +25,7 @@ extern struct ipc_shm_io *ios_rx_from_device[8];

 struct ipc_sock_state {
 	struct osmo_fd listen_bfd; /* fd for listen socket */
-	struct osmo_fd conn_bfd; /* fd for connection */
+	struct osmo_fd conn_bfd; /* fd for connection to lcr */
 	struct llist_head upqueue; /* queue for sending messages */
 };

@@ -42,4 +40,3 @@ int ipc_rx_chan_start_req(struct ipc_sk_chan_if_op_void *req, uint8_t chan_nr);
 int ipc_rx_chan_stop_req(struct ipc_sk_chan_if_op_void *req, uint8_t chan_nr);
 int ipc_rx_chan_setgain_req(struct ipc_sk_chan_if_gain *req, uint8_t chan_nr);
 int ipc_rx_chan_setfreq_req(struct ipc_sk_chan_if_freq_req *req, uint8_t chan_nr);
-int ipc_rx_chan_settxatten_req(struct ipc_sk_chan_if_tx_attenuation *req, uint8_t chan_nr);
--- a/Transceiver52M/device/ipc/ipc_chan.c
+++ b/Transceiver52M/device/ipc/ipc_chan.c
@@ -4,14 +4,12 @@
 *
 * SPDX-License-Identifier: 0BSD
 *
-* Permission to use, copy, modify, and/or distribute this software for any purpose
-* with or without fee is hereby granted.THE SOFTWARE IS PROVIDED "AS IS" AND THE
-* AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
-* BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
-* USE OR PERFORMANCE OF THIS SOFTWARE.
+    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+    PERFORMANCE OF THIS SOFTWARE.
 */
 #include <stdio.h>
 #include <stdlib.h>
@@ -59,11 +57,8 @@ static int ipc_chan_rx(uint8_t msg_type, struct ipc_sk_chan_if *ipc_prim, uint8_
 	case IPC_IF_MSG_SETFREQ_REQ:
 		rc = ipc_rx_chan_setfreq_req(&ipc_prim->u.set_freq_req, chan_nr);
 		break;
-	case IPC_IF_MSG_SETTXATTN_REQ:
-		rc = ipc_rx_chan_settxatten_req(&ipc_prim->u.txatten_req, chan_nr);
-		break;
 	default:
-		LOGP(DDEV, LOGL_ERROR, "Received unknown IPC msg type 0x%02x on chan %d\n", msg_type, chan_nr);
+		LOGP(DMAIN, LOGL_ERROR, "Received unknown IPC msg type %d\n", msg_type);
 		rc = -EINVAL;
 	}

@@ -96,7 +91,7 @@ static int ipc_chan_sock_read(struct osmo_fd *bfd)
 	}

 	if (rc < (int)sizeof(*ipc_prim)) {
-		LOGP(DDEV, LOGL_ERROR,
+		LOGP(DMAIN, LOGL_ERROR,
 		     "Received %d bytes on Unix Socket, but primitive size "
 		     "is %zu, discarding\n",
 		     rc, sizeof(*ipc_prim));
@@ -127,7 +122,7 @@ int ipc_chan_sock_send(struct msgb *msg, uint8_t chan_nr)
 		return -EINVAL;

 	if (!state) {
-		LOGP(DDEV, LOGL_INFO,
+		LOGP(DMAIN, LOGL_INFO,
 		     "IPC socket not created, "
 		     "dropping message\n");
 		msgb_free(msg);
@@ -135,14 +130,14 @@ int ipc_chan_sock_send(struct msgb *msg, uint8_t chan_nr)
 	}
 	conn_bfd = &state->conn_bfd;
 	if (conn_bfd->fd <= 0) {
-		LOGP(DDEV, LOGL_NOTICE,
+		LOGP(DMAIN, LOGL_NOTICE,
 		     "IPC socket not connected, "
 		     "dropping message\n");
 		msgb_free(msg);
 		return -EIO;
 	}
 	msgb_enqueue(&state->upqueue, msg);
-	osmo_fd_write_enable(conn_bfd);
+	conn_bfd->when |= BSC_FD_WRITE;

 	return 0;
 }
@@ -160,11 +155,11 @@ static int ipc_chan_sock_write(struct osmo_fd *bfd)
 		msg = llist_entry(state->upqueue.next, struct msgb, list);
 		ipc_prim = (struct ipc_sk_chan_if *)msg->data;

-		osmo_fd_write_disable(bfd);
+		bfd->when &= ~BSC_FD_WRITE;

 		/* bug hunter 8-): maybe someone forgot msgb_put(...) ? */
 		if (!msgb_length(msg)) {
-			LOGP(DDEV, LOGL_ERROR,
+			LOGP(DMAIN, LOGL_ERROR,
 			     "message type (%d) with ZERO "
 			     "bytes!\n",
 			     ipc_prim->msg_type);
@@ -177,14 +172,14 @@ static int ipc_chan_sock_write(struct osmo_fd *bfd)
 			goto close;
 		if (rc < 0) {
 			if (errno == EAGAIN) {
-				osmo_fd_write_enable(bfd);
+				bfd->when |= BSC_FD_WRITE;
 				break;
 			}
 			goto close;
 		}

 	dontsend:
-		/* _after_ we send it, we can dequeue */
+		/* _after_ we send it, we can deueue */
 		msg2 = msgb_dequeue(&state->upqueue);
 		assert(msg == msg2);
 		msgb_free(msg);
@@ -200,12 +195,12 @@ static int ipc_chan_sock_cb(struct osmo_fd *bfd, unsigned int flags)
 {
 	int rc = 0;

-	if (flags & OSMO_FD_READ)
+	if (flags & BSC_FD_READ)
 		rc = ipc_chan_sock_read(bfd);
 	if (rc < 0)
 		return rc;

-	if (flags & OSMO_FD_WRITE)
+	if (flags & BSC_FD_WRITE)
 		rc = ipc_chan_sock_write(bfd);

 	return rc;
@@ -222,25 +217,27 @@ int ipc_chan_sock_accept(struct osmo_fd *bfd, unsigned int flags)
 	len = sizeof(un_addr);
 	rc = accept(bfd->fd, (struct sockaddr *)&un_addr, &len);
 	if (rc < 0) {
-		LOGP(DDEV, LOGL_ERROR, "Failed to accept a new connection\n");
+		LOGP(DMAIN, LOGL_ERROR, "Failed to accept a new connection\n");
 		return -1;
 	}

 	if (conn_bfd->fd >= 0) {
-		LOGP(DDEV, LOGL_NOTICE,
+		LOGP(DMAIN, LOGL_NOTICE,
 		     "osmo-trx connects but we already have "
 		     "another active connection ?!?\n");
 		/* We already have one IPC connected, this is all we support */
-		osmo_fd_read_disable(&state->listen_bfd);
+		state->listen_bfd.when &= ~BSC_FD_READ;
 		close(rc);
 		return 0;
 	}

-	/* copy chan nr, required for proper bfd<->chan # mapping */
-	osmo_fd_setup(conn_bfd, rc, OSMO_FD_READ, ipc_chan_sock_cb, state, bfd->priv_nr);
+	conn_bfd->fd = rc;
+	conn_bfd->when = BSC_FD_READ;
+	conn_bfd->cb = ipc_chan_sock_cb;
+	conn_bfd->data = state;

 	if (osmo_fd_register(conn_bfd) != 0) {
-		LOGP(DDEV, LOGL_ERROR,
+		LOGP(DMAIN, LOGL_ERROR,
 		     "Failed to register new connection "
 		     "fd\n");
 		close(conn_bfd->fd);
@@ -248,7 +245,10 @@ int ipc_chan_sock_accept(struct osmo_fd *bfd, unsigned int flags)
 		return -1;
 	}

-	LOGP(DDEV, LOGL_NOTICE, "Unix socket connected to external osmo-trx\n");
+	LOGP(DMAIN, LOGL_NOTICE, "Unix socket connected to external osmo-trx\n");
+
+	/* send current info */
+	//IPC_tx_info_ind();

 	return 0;
 }
--- a/Transceiver52M/device/ipc/ipc_chan.h
+++ b/Transceiver52M/device/ipc/ipc_chan.h
@@ -4,14 +4,12 @@
 *
 * SPDX-License-Identifier: 0BSD
 *
-* Permission to use, copy, modify, and/or distribute this software for any purpose
-* with or without fee is hereby granted.THE SOFTWARE IS PROVIDED "AS IS" AND THE
-* AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
-* BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
-* USE OR PERFORMANCE OF THIS SOFTWARE.
+    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+    PERFORMANCE OF THIS SOFTWARE.
 */
 #ifndef IPC_CHAN_H
 #define IPC_CHAN_H
--- a/Transceiver52M/device/ipc/ipc_shm.c
+++ b/Transceiver52M/device/ipc/ipc_shm.c
@@ -4,14 +4,12 @@
 *
 * SPDX-License-Identifier: 0BSD
 *
-* Permission to use, copy, modify, and/or distribute this software for any purpose
-* with or without fee is hereby granted.THE SOFTWARE IS PROVIDED "AS IS" AND THE
-* AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
-* BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
-* USE OR PERFORMANCE OF THIS SOFTWARE.
+    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+    PERFORMANCE OF THIS SOFTWARE.
 */
 #ifdef __cplusplus
 extern "C" {
@@ -26,15 +24,12 @@ extern "C" {
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <osmocom/core/panic.h>
-
-#include <debug.h>

 #ifdef __cplusplus
 }
 #endif

-#define SAMPLE_SIZE_BYTE (sizeof(uint16_t) * 2)
+#define SAMPLE_SIZE_BYTE sizeof(uint16_t) * 2

 struct ipc_shm_io *ipc_shm_init_consumer(struct ipc_shm_stream *s)
 {
@@ -61,44 +56,52 @@ struct ipc_shm_io *ipc_shm_init_producer(struct ipc_shm_stream *s)
 	struct ipc_shm_io *r = ipc_shm_init_consumer(s);
 	rv = pthread_mutexattr_init(&att);
 	if (rv != 0) {
-		osmo_panic("%s:%d rv:%d", __FILE__, __LINE__, rv);
+		fprintf(stderr, "%s:%d rv:%d", __FILE__, __LINE__, rv);
+		exit(EXIT_FAILURE);
 	}

 	rv = pthread_mutexattr_setrobust(&att, PTHREAD_MUTEX_ROBUST);
 	if (rv != 0) {
-		osmo_panic("%s:%d rv:%d", __FILE__, __LINE__, rv);
+		fprintf(stderr, "%s:%d rv:%d", __FILE__, __LINE__, rv);
+		exit(EXIT_FAILURE);
 	}

 	rv = pthread_mutexattr_setpshared(&att, PTHREAD_PROCESS_SHARED);
 	if (rv != 0) {
-		osmo_panic("%s:%d rv:%d", __FILE__, __LINE__, rv);
+		fprintf(stderr, "%s:%d rv:%d", __FILE__, __LINE__, rv);
+		exit(EXIT_FAILURE);
 	}

 	rv = pthread_mutex_init((pthread_mutex_t *)&r->this_stream->lock, &att);
 	if (rv != 0) {
-		osmo_panic("%s:%d rv:%d", __FILE__, __LINE__, rv);
+		fprintf(stderr, "%s:%d rv:%d", __FILE__, __LINE__, rv);
+		exit(EXIT_FAILURE);
 	}

 	pthread_mutexattr_destroy(&att);

 	rv = pthread_condattr_setpshared(&t1, PTHREAD_PROCESS_SHARED);
 	if (rv != 0) {
-		osmo_panic("%s:%d rv:%d", __FILE__, __LINE__, rv);
+		fprintf(stderr, "%s:%d rv:%d", __FILE__, __LINE__, rv);
+		exit(EXIT_FAILURE);
 	}

 	rv = pthread_condattr_setpshared(&t2, PTHREAD_PROCESS_SHARED);
 	if (rv != 0) {
-		osmo_panic("%s:%d rv:%d", __FILE__, __LINE__, rv);
+		fprintf(stderr, "%s:%d rv:%d", __FILE__, __LINE__, rv);
+		exit(EXIT_FAILURE);
 	}

 	rv = pthread_cond_init((pthread_cond_t *)&r->this_stream->cf, &t1);
 	if (rv != 0) {
-		osmo_panic("%s:%d rv:%d", __FILE__, __LINE__, rv);
+		fprintf(stderr, "%s:%d rv:%d", __FILE__, __LINE__, rv);
+		exit(EXIT_FAILURE);
 	}

 	rv = pthread_cond_init((pthread_cond_t *)&r->this_stream->ce, &t2);
 	if (rv != 0) {
-		osmo_panic("%s:%d rv:%d", __FILE__, __LINE__, rv);
+		fprintf(stderr, "%s:%d rv:%d", __FILE__, __LINE__, rv);
+		exit(EXIT_FAILURE);
 	}

 	pthread_condattr_destroy(&t1);
@@ -112,7 +115,8 @@ struct ipc_shm_io *ipc_shm_init_producer(struct ipc_shm_stream *s)
 void ipc_shm_close(struct ipc_shm_io *r)
 {
 	if (r) {
-		free(r->buf_ptrs);
+		if (r->buf_ptrs)
+			free(r->buf_ptrs);
 		free(r);
 	}
 }
--- a/Transceiver52M/device/ipc/ipc_shm.h
+++ b/Transceiver52M/device/ipc/ipc_shm.h
@@ -4,14 +4,12 @@
 *
 * SPDX-License-Identifier: 0BSD
 *
-* Permission to use, copy, modify, and/or distribute this software for any purpose
-* with or without fee is hereby granted.THE SOFTWARE IS PROVIDED "AS IS" AND THE
-* AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
-* BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
-* USE OR PERFORMANCE OF THIS SOFTWARE.
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
 */
 #ifndef IPC_SHM_H
 #define IPC_SHM_H
@@ -28,7 +26,7 @@ extern "C" {
 #endif

 struct ipc_shm_io {
-	volatile struct ipc_shm_raw_stream *this_stream;
+	volatile struct ipc_shm_raw_stream *this_stream; // plus num_buffers at end
 	volatile struct ipc_shm_raw_smpl_buf **volatile buf_ptrs;
 	uint32_t partial_read_begin_ptr;
 };
--- a/Transceiver52M/device/ipc/ipc_sock.c
+++ b/Transceiver52M/device/ipc/ipc_sock.c
@@ -4,14 +4,12 @@
 *
 * SPDX-License-Identifier: 0BSD
 *
-* Permission to use, copy, modify, and/or distribute this software for any purpose
-* with or without fee is hereby granted.THE SOFTWARE IS PROVIDED "AS IS" AND THE
-* AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
-* BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
-* USE OR PERFORMANCE OF THIS SOFTWARE.
+    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+    PERFORMANCE OF THIS SOFTWARE.
 */
 #include <stdio.h>
 #include <stdlib.h>
@@ -56,7 +54,7 @@ static int ipc_rx(uint8_t msg_type, struct ipc_sk_if *ipc_prim)
 		rc = ipc_rx_open_req(&ipc_prim->u.open_req);
 		break;
 	default:
-		LOGP(DDEV, LOGL_ERROR, "Received unknown IPC msg type 0x%02x\n", msg_type);
+		LOGP(DMAIN, LOGL_ERROR, "Received unknown IPC msg type %d\n", msg_type);
 		rc = -EINVAL;
 	}

@@ -67,9 +65,10 @@ int ipc_sock_send(struct msgb *msg)
 {
 	struct ipc_sock_state *state = global_ipc_sock_state;
 	struct osmo_fd *conn_bfd;
+	//struct ipc_sk_if *ipc_prim = (struct ipc_sk_if *) msg->data;

 	if (!state) {
-		LOGP(DDEV, LOGL_INFO,
+		LOGP(DMAIN, LOGL_INFO,
 		     "IPC socket not created, "
 		     "dropping message\n");
 		msgb_free(msg);
@@ -77,14 +76,14 @@ int ipc_sock_send(struct msgb *msg)
 	}
 	conn_bfd = &state->conn_bfd;
 	if (conn_bfd->fd <= 0) {
-		LOGP(DDEV, LOGL_NOTICE,
+		LOGP(DMAIN, LOGL_NOTICE,
 		     "IPC socket not connected, "
 		     "dropping message\n");
 		msgb_free(msg);
 		return -EIO;
 	}
 	msgb_enqueue(&state->upqueue, msg);
-	osmo_fd_write_enable(conn_bfd);
+	conn_bfd->when |= BSC_FD_WRITE;

 	return 0;
 }
@@ -93,7 +92,7 @@ void ipc_sock_close(struct ipc_sock_state *state)
 {
 	struct osmo_fd *bfd = &state->conn_bfd;

-	LOGP(DDEV, LOGL_NOTICE, "IPC socket has LOST connection\n");
+	LOGP(DMAIN, LOGL_NOTICE, "IPC socket has LOST connection\n");

 	ipc_exit_requested = 1;

@@ -102,7 +101,7 @@ void ipc_sock_close(struct ipc_sock_state *state)
 	osmo_fd_unregister(bfd);

 	/* re-enable the generation of ACCEPT for new connections */
-	osmo_fd_read_enable(&state->listen_bfd);
+	state->listen_bfd.when |= BSC_FD_READ;

 	/* flush the queue */
 	while (!llist_empty(&state->upqueue)) {
@@ -137,7 +136,7 @@ int ipc_sock_read(struct osmo_fd *bfd)
 	}

 	if (rc < (int)sizeof(*ipc_prim)) {
-		LOGP(DDEV, LOGL_ERROR,
+		LOGP(DMAIN, LOGL_ERROR,
 		     "Received %d bytes on Unix Socket, but primitive size "
 		     "is %zu, discarding\n",
 		     rc, sizeof(*ipc_prim));
@@ -172,11 +171,11 @@ static int ipc_sock_write(struct osmo_fd *bfd)
 		msg = llist_entry(state->upqueue.next, struct msgb, list);
 		ipc_prim = (struct ipc_sk_if *)msg->data;

-		osmo_fd_write_disable(bfd);
+		bfd->when &= ~BSC_FD_WRITE;

 		/* bug hunter 8-): maybe someone forgot msgb_put(...) ? */
 		if (!msgb_length(msg)) {
-			LOGP(DDEV, LOGL_ERROR,
+			LOGP(DMAIN, LOGL_ERROR,
 			     "message type (%d) with ZERO "
 			     "bytes!\n",
 			     ipc_prim->msg_type);
@@ -189,7 +188,7 @@ static int ipc_sock_write(struct osmo_fd *bfd)
 			goto close;
 		if (rc < 0) {
 			if (errno == EAGAIN) {
-				osmo_fd_write_enable(bfd);
+				bfd->when |= BSC_FD_WRITE;
 				break;
 			}
 			goto close;
@@ -212,12 +211,12 @@ static int ipc_sock_cb(struct osmo_fd *bfd, unsigned int flags)
 {
 	int rc = 0;

-	if (flags & OSMO_FD_READ)
+	if (flags & BSC_FD_READ)
 		rc = ipc_sock_read(bfd);
 	if (rc < 0)
 		return rc;

-	if (flags & OSMO_FD_WRITE)
+	if (flags & BSC_FD_WRITE)
 		rc = ipc_sock_write(bfd);

 	return rc;
@@ -235,24 +234,27 @@ int ipc_sock_accept(struct osmo_fd *bfd, unsigned int flags)
 	len = sizeof(un_addr);
 	rc = accept(bfd->fd, (struct sockaddr *)&un_addr, &len);
 	if (rc < 0) {
-		LOGP(DDEV, LOGL_ERROR, "Failed to accept a new connection\n");
+		LOGP(DMAIN, LOGL_ERROR, "Failed to accept a new connection\n");
 		return -1;
 	}

 	if (conn_bfd->fd >= 0) {
-		LOGP(DDEV, LOGL_NOTICE,
+		LOGP(DMAIN, LOGL_NOTICE,
 		     "ip clent connects but we already have "
 		     "another active connection ?!?\n");
 		/* We already have one IPC connected, this is all we support */
-		osmo_fd_read_disable(&state->listen_bfd);
+		state->listen_bfd.when &= ~BSC_FD_READ;
 		close(rc);
 		return 0;
 	}

-	osmo_fd_setup(conn_bfd, rc, OSMO_FD_READ, ipc_sock_cb, state, 0);
+	conn_bfd->fd = rc;
+	conn_bfd->when = BSC_FD_READ;
+	conn_bfd->cb = ipc_sock_cb;
+	conn_bfd->data = state;

 	if (osmo_fd_register(conn_bfd) != 0) {
-		LOGP(DDEV, LOGL_ERROR,
+		LOGP(DMAIN, LOGL_ERROR,
 		     "Failed to register new connection "
 		     "fd\n");
 		close(conn_bfd->fd);
@@ -260,7 +262,10 @@ int ipc_sock_accept(struct osmo_fd *bfd, unsigned int flags)
 		return -1;
 	}

-	LOGP(DDEV, LOGL_NOTICE, "Unix socket connected to external osmo-trx\n");
+	LOGP(DMAIN, LOGL_NOTICE, "Unix socket connected to external osmo-trx\n");
+
+	/* send current info */
+	//IPC_tx_info_ind();

 	return 0;
 }
--- a/Transceiver52M/device/ipc/ipc_sock.h
+++ b/Transceiver52M/device/ipc/ipc_sock.h
@@ -4,14 +4,12 @@
 *
 * SPDX-License-Identifier: 0BSD
 *
-* Permission to use, copy, modify, and/or distribute this software for any purpose
-* with or without fee is hereby granted.THE SOFTWARE IS PROVIDED "AS IS" AND THE
-* AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
-* BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
-* USE OR PERFORMANCE OF THIS SOFTWARE.
+    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+    PERFORMANCE OF THIS SOFTWARE.
 */
 #ifndef IPC_SOCK_H
 #define IPC_SOCK_H
--- a/Transceiver52M/device/ipc/shm.c
+++ b/Transceiver52M/device/ipc/shm.c
@@ -4,23 +4,23 @@
 *
 * SPDX-License-Identifier: 0BSD
 *
-* Permission to use, copy, modify, and/or distribute this software for any purpose
-* with or without fee is hereby granted.THE SOFTWARE IS PROVIDED "AS IS" AND THE
-* AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
-* BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
-* USE OR PERFORMANCE OF THIS SOFTWARE.
+    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+    PERFORMANCE OF THIS SOFTWARE.
 */

 #include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
 #include <stddef.h>
 #include <osmocom/core/talloc.h>

 #include "shm.h"

-#define ENCDECDEBUG(...) //fprintf(stderr, __VA_ARGS__)
+//#define ENCDECDEBUG

 /* Convert offsets to pointers */
 struct ipc_shm_stream *ipc_shm_decode_stream(void *tall_ctx, struct ipc_shm_raw_region *root_raw,
@@ -37,7 +37,9 @@ struct ipc_shm_stream *ipc_shm_decode_stream(void *tall_ctx, struct ipc_shm_raw_
 	stream->buffer_size = stream_raw->buffer_size;
 	stream->raw = stream_raw;
 	for (i = 0; i < stream->num_buffers; i++) {
-		ENCDECDEBUG("decode: smpl_buf %d at offset %u\n", i, stream_raw->buffer_offset[i]);
+#ifdef ENCDECDEBUG
+		fprintf(stderr, "decode: smpl_buf %d at offset %u\n", i, stream_raw->buffer_offset[i]);
+#endif
 		stream->buffers[i] =
 			(struct ipc_shm_raw_smpl_buf *)(((uint8_t *)root_raw) + stream_raw->buffer_offset[i]);
 	}
@@ -51,7 +53,9 @@ struct ipc_shm_channel *ipc_shm_decode_channel(void *tall_ctx, struct ipc_shm_ra
 	chan = talloc_zero(tall_ctx, struct ipc_shm_channel);
 	if (!chan)
 		return NULL;
-	ENCDECDEBUG("decode: streams at offset %u and %u\n", chan_raw->dl_buf_offset, chan_raw->ul_buf_offset);
+#ifdef ENCDECDEBUG
+	fprintf(stderr, "decode: streams at offset %u and %u\n", chan_raw->dl_buf_offset, chan_raw->ul_buf_offset);
+#endif
 	chan->dl_stream = ipc_shm_decode_stream(
 		chan, root_raw, (struct ipc_shm_raw_stream *)(((uint8_t *)root_raw) + chan_raw->dl_buf_offset));
 	chan->ul_stream = ipc_shm_decode_stream(
@@ -69,7 +73,9 @@ struct ipc_shm_region *ipc_shm_decode_region(void *tall_ctx, struct ipc_shm_raw_

 	root->num_chans = root_raw->num_chans;
 	for (i = 0; i < root->num_chans; i++) {
-		ENCDECDEBUG("decode: channel %d at offset %u\n", i, root_raw->chan_offset[i]);
+#ifdef ENCDECDEBUG
+		fprintf(stderr, "decode: channel %d at offset %u\n", i, root_raw->chan_offset[i]);
+#endif
 		root->channels[i] = ipc_shm_decode_channel(
 			root, root_raw,
 			(struct ipc_shm_raw_channel *)(((uint8_t *)root_raw) + root_raw->chan_offset[i]));
@@ -80,9 +86,12 @@ struct ipc_shm_region *ipc_shm_decode_region(void *tall_ctx, struct ipc_shm_raw_
 unsigned int ipc_shm_encode_smpl_buf(struct ipc_shm_raw_region *root_raw, struct ipc_shm_raw_smpl_buf *smpl_buf_raw,
 				     uint32_t buffer_size)
 {
+	uint8_t *start = (uint8_t *)smpl_buf_raw;
 	unsigned int offset = sizeof(struct ipc_shm_raw_smpl_buf);
 	offset = (((uintptr_t)offset + 7) & ~0x07ULL);
-	ENCDECDEBUG("encode: smpl_buf at offset %u\n", offset);
+#ifdef ENCDECDEBUG
+	fprintf(stderr, "encode: smpl_buf at offset %lu\n", (start - (uint8_t *)root_raw));
+#endif
 	offset += buffer_size * sizeof(uint16_t) * 2; /* samples */
 	return offset;
 }
@@ -94,7 +103,9 @@ unsigned int ipc_shm_encode_stream(struct ipc_shm_raw_region *root_raw, struct i
 	ptrdiff_t start = (ptrdiff_t)stream_raw;
 	unsigned int offset = sizeof(struct ipc_shm_raw_stream) + sizeof(uint32_t) * num_buffers;
 	offset = (((uintptr_t)offset + 7) & ~0x07ULL);
-	ENCDECDEBUG("encode: stream at offset %lu\n", (start - (ptrdiff_t)root_raw));
+#ifdef ENCDECDEBUG
+	fprintf(stderr, "encode: stream at offset %lu\n", (start - (ptrdiff_t)root_raw));
+#endif
 	if (root_raw) {
 		stream_raw->num_buffers = num_buffers;
 		stream_raw->buffer_size = buffer_size;
@@ -115,7 +126,9 @@ unsigned int ipc_shm_encode_channel(struct ipc_shm_raw_region *root_raw, struct
 	uint8_t *start = (uint8_t *)chan_raw;
 	unsigned int offset = sizeof(struct ipc_shm_raw_channel);
 	offset = (((uintptr_t)offset + 7) & ~0x07ULL);
-	ENCDECDEBUG("encode: channel at offset %lu\n", (start - (uint8_t *)root_raw));
+#ifdef ENCDECDEBUG
+	fprintf(stderr, "encode: channel at offset %lu\n", (start - (uint8_t *)root_raw));
+#endif
 	if (root_raw)
 		chan_raw->dl_buf_offset = (start + offset - (uint8_t *)root_raw);
 	offset += ipc_shm_encode_stream(root_raw, (struct ipc_shm_raw_stream *)(start + offset), num_buffers,
@@ -138,9 +151,12 @@ unsigned int ipc_shm_encode_region(struct ipc_shm_raw_region *root_raw, uint32_t
 	if (root_raw)
 		root_raw->num_chans = num_chans;
 	for (i = 0; i < num_chans; i++) {
+		uint32_t ofs = (start + offset - (uintptr_t)root_raw);
 		if (root_raw)
 			root_raw->chan_offset[i] = (start + offset - (uintptr_t)root_raw);
-		ENCDECDEBUG("encode: channel %d chan_offset[i]=%lu\n", i, start + offset - (uintptr_t)root_raw);
+#ifdef ENCDECDEBUG
+		fprintf(stderr, "encode: channel %d chan_offset[i]=%u\n", i, ofs);
+#endif
 		offset += ipc_shm_encode_channel(root_raw, (struct ipc_shm_raw_channel *)(start + offset), num_buffers,
 						 buffer_size);
 	}
--- a/Transceiver52M/device/ipc/shm.h
+++ b/Transceiver52M/device/ipc/shm.h
@@ -4,21 +4,19 @@
 *
 * SPDX-License-Identifier: 0BSD
 *
-* Permission to use, copy, modify, and/or distribute this software for any purpose
-* with or without fee is hereby granted.THE SOFTWARE IS PROVIDED "AS IS" AND THE
-* AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
-* BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
-* USE OR PERFORMANCE OF THIS SOFTWARE.
+    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+    PERFORMANCE OF THIS SOFTWARE.
 */
 #pragma once

 #include <stdint.h>
 #include <unistd.h>
 #include <limits.h>
-#include <pthread.h>
+//#include <pthread.h>
 #include <semaphore.h>

 /* RAW structures */
@@ -29,9 +27,9 @@ struct ipc_shm_raw_smpl_buf {
 };

 struct ipc_shm_raw_stream {
-	pthread_mutex_t lock; /* protects this struct */
-	pthread_cond_t cf; /* signals fill to reader */
-	pthread_cond_t ce; /* signals empty nbuf to writer */
+	pthread_mutex_t lock;
+	pthread_cond_t cf;
+	pthread_cond_t ce;
 	uint32_t num_buffers;
 	uint32_t buffer_size; /* In samples */
 	uint32_t read_next;
@@ -79,6 +77,8 @@ struct ipc_shm_region *ipc_shm_decode_region(void *tall_ctx, struct ipc_shm_raw_
 //////////////////
 // Master socket
 //////////////////
+
+#define IPC_SOCK_PATH_PREFIX "/tmp/ipc_sock"
 #define IPC_SOCK_API_VERSION 1

 /* msg_type */
@@ -99,11 +99,6 @@ struct ipc_shm_region *ipc_shm_decode_region(void *tall_ctx, struct ipc_shm_raw_
 struct ipc_sk_if_info_chan {
 	char tx_path[MAX_NUM_RF_PATHS][RF_PATH_NAME_SIZE];
 	char rx_path[MAX_NUM_RF_PATHS][RF_PATH_NAME_SIZE];
-	double min_rx_gain;
-	double max_rx_gain;
-	double min_tx_gain;
-	double max_tx_gain;
-	double nominal_tx_power; /* dBm */
 } __attribute__((packed));

 struct ipc_sk_if_open_req_chan {
@@ -125,11 +120,15 @@ struct ipc_sk_if_info_req {

 struct ipc_sk_if_info_cnf {
 	uint32_t feature_mask;
-	double iq_scaling_val_rx; /* for scaling, sample format is 16 bit, but adc/dac might be less */
+	double min_rx_gain;
+	double max_rx_gain;
+	double min_tx_gain;
+	double max_tx_gain;
+	double iq_scaling_val_rx;
 	double iq_scaling_val_tx;
 	uint32_t max_num_chans;
 	char dev_desc[200];
-	struct ipc_sk_if_info_chan chan_info[MAX_NUM_CHANS];
+	struct ipc_sk_if_info_chan chan_info[0];
 } __attribute__((packed));

 struct ipc_sk_if_open_req {
@@ -140,14 +139,14 @@ struct ipc_sk_if_open_req {
 	uint32_t tx_sample_freq_num;
 	uint32_t tx_sample_freq_den;
 	uint32_t bandwidth;
-	struct ipc_sk_if_open_req_chan chan_info[MAX_NUM_CHANS];
+	struct ipc_sk_if_open_req_chan chan_info[0];
 } __attribute__((packed));

 struct ipc_sk_if_open_cnf {
 	uint8_t return_code;
 	uint32_t path_delay;
 	char shm_name[SHM_NAME_MAX];
-	struct ipc_sk_if_open_cnf_chan chan_info[MAX_NUM_CHANS];
+	struct ipc_sk_if_open_cnf_chan chan_info[0];
 } __attribute__((packed));

 struct ipc_sk_if {
@@ -168,20 +167,17 @@ struct ipc_sk_if {
 // Channel socket
 //////////////////
 #define IPC_IF_CHAN_MSG_OFFSET 50
-#define IPC_IF_MSG_START_REQ IPC_IF_CHAN_MSG_OFFSET + 0
-#define IPC_IF_MSG_START_CNF IPC_IF_CHAN_MSG_OFFSET + 1
-#define IPC_IF_MSG_STOP_REQ IPC_IF_CHAN_MSG_OFFSET + 2
-#define IPC_IF_MSG_STOP_CNF IPC_IF_CHAN_MSG_OFFSET + 3
-#define IPC_IF_MSG_SETGAIN_REQ IPC_IF_CHAN_MSG_OFFSET + 4
-#define IPC_IF_MSG_SETGAIN_CNF IPC_IF_CHAN_MSG_OFFSET + 5
-#define IPC_IF_MSG_SETFREQ_REQ IPC_IF_CHAN_MSG_OFFSET + 6
-#define IPC_IF_MSG_SETFREQ_CNF IPC_IF_CHAN_MSG_OFFSET + 7
+#define IPC_IF_MSG_START_REQ IPC_IF_CHAN_MSG_OFFSET + 0x00
+#define IPC_IF_MSG_START_CNF IPC_IF_CHAN_MSG_OFFSET + 0x01
+#define IPC_IF_MSG_STOP_REQ IPC_IF_CHAN_MSG_OFFSET + 0x02
+#define IPC_IF_MSG_STOP_CNF IPC_IF_CHAN_MSG_OFFSET + 0x03
+#define IPC_IF_MSG_SETGAIN_REQ IPC_IF_CHAN_MSG_OFFSET + 0x04
+#define IPC_IF_MSG_SETGAIN_CNF IPC_IF_CHAN_MSG_OFFSET + 0x05
+#define IPC_IF_MSG_SETFREQ_REQ IPC_IF_CHAN_MSG_OFFSET + 0x06
+#define IPC_IF_MSG_SETFREQ_CNF IPC_IF_CHAN_MSG_OFFSET + 0x07

-#define IPC_IF_NOTIFY_UNDERFLOW IPC_IF_CHAN_MSG_OFFSET + 8
-#define IPC_IF_NOTIFY_OVERFLOW IPC_IF_CHAN_MSG_OFFSET + 9
-
-#define IPC_IF_MSG_SETTXATTN_REQ IPC_IF_CHAN_MSG_OFFSET + 10
-#define IPC_IF_MSG_SETTXATTN_CNF IPC_IF_CHAN_MSG_OFFSET + 11
+#define IPC_IF_NOTIFY_UNDERFLOW IPC_IF_CHAN_MSG_OFFSET + 0x08
+#define IPC_IF_NOTIFY_OVERFLOW IPC_IF_CHAN_MSG_OFFSET + 0x09

 struct ipc_sk_chan_if_op_void {
 	// at least one dummy byte, to allow c/c++ compatibility
@@ -210,10 +206,6 @@ struct ipc_sk_chan_if_notfiy {
 	uint8_t dummy;
 } __attribute__((packed));

-struct ipc_sk_chan_if_tx_attenuation {
-	double attenuation;
-} __attribute__((packed));
-
 struct ipc_sk_chan_if {
 	uint8_t msg_type; /* message type */
 	uint8_t spare[2];
@@ -228,7 +220,5 @@ struct ipc_sk_chan_if {
 		struct ipc_sk_chan_if_freq_req set_freq_req;
 		struct ipc_sk_chan_if_freq_cnf set_freq_cnf;
 		struct ipc_sk_chan_if_notfiy notify;
-		struct ipc_sk_chan_if_tx_attenuation txatten_req;
-		struct ipc_sk_chan_if_tx_attenuation txatten_cnf;
 	} u;
 } __attribute__((packed));
--- a/Transceiver52M/device/ipc/uhdwrap.cpp
+++ b/Transceiver52M/device/ipc/uhdwrap.cpp
@@ -4,14 +4,12 @@
 *
 * SPDX-License-Identifier: 0BSD
 *
-* Permission to use, copy, modify, and/or distribute this software for any purpose
-* with or without fee is hereby granted.THE SOFTWARE IS PROVIDED "AS IS" AND THE
-* AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
-* BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
-* USE OR PERFORMANCE OF THIS SOFTWARE.
+    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+    PERFORMANCE OF THIS SOFTWARE.
 */
 extern "C" {
 #include <osmocom/core/application.h>
@@ -31,6 +29,7 @@ extern "C" {
 #include "../uhd/UHDDevice.h"
 #include "uhdwrap.h"

+#include "trx_vty.h"
 #include "Logger.h"
 #include "Threads.h"
 #include "Utils.h"
@@ -107,8 +106,6 @@ extern "C" void *uhdwrap_open(struct ipc_sk_if_open_req *open_req)
 		rx_paths.push_back(open_req->chan_info[i].rx_path);
 	}

-	/* FIXME: this is actually the sps value, not the sample rate!
-	 * sample rate is looked up according to the sps rate by uhd backend */
 	rx_sps = open_req->rx_sample_freq_num / open_req->rx_sample_freq_den;
 	tx_sps = open_req->tx_sample_freq_num / open_req->tx_sample_freq_den;
 	uhd_wrap *uhd_wrap_dev =
@@ -139,9 +136,7 @@ extern "C" int32_t uhdwrap_read(void *dev, uint32_t num_chans)
 	}

 	int32_t read = d->wrap_read(&t);
-
-	/* multi channel rx on b210 will return 0 due to alignment adventures, do not put 0 samples into a ipc buffer... */
-	if (read <= 0)
+	if (read < 0)
 		return read;

 	for (uint32_t i = 0; i < num_chans; i++) {
@@ -155,7 +150,7 @@ extern "C" int32_t uhdwrap_write(void *dev, uint32_t num_chans, bool *underrun)
 	uhd_wrap *d = (uhd_wrap *)dev;

 	uint64_t timestamp;
-	int32_t len = -1;
+	int32_t len;
 	for (uint32_t i = 0; i < num_chans; i++) {
 		len = ipc_shm_read(ios_tx_to_device[i], (uint16_t *)&d->wrap_tx_buffs[i].front(), 5000, &timestamp, 1);
 		if (len < 0)
@@ -177,16 +172,10 @@ extern "C" double uhdwrap_set_freq(void *dev, double f, size_t chan, bool for_tx
 extern "C" double uhdwrap_set_gain(void *dev, double f, size_t chan, bool for_tx)
 {
 	uhd_wrap *d = (uhd_wrap *)dev;
-	//	if (for_tx)
-	//		return d->setTxGain(f, chan);
-	//	else
-	return d->setRxGain(f, chan);
-}
-
-extern "C" double uhdwrap_set_txatt(void *dev, double a, size_t chan)
-{
-	uhd_wrap *d = (uhd_wrap *)dev;
-	return d->setPowerAttenuation(a, chan);
+	if (for_tx)
+		return d->setTxGain(f, chan);
+	else
+		return d->setRxGain(f, chan);
 }

 extern "C" int32_t uhdwrap_start(void *dev, int chan)
@@ -231,6 +220,10 @@ extern "C" void uhdwrap_fill_info_cnf(struct ipc_sk_if *ipc_prim)
 	// at least one duplex channel
 	auto num_chans = rxchans == txchans ? txchans : 1;

+	ipc_prim->u.info_cnf.min_rx_gain = rx_range.start();
+	ipc_prim->u.info_cnf.max_rx_gain = rx_range.stop();
+	ipc_prim->u.info_cnf.min_tx_gain = tx_range.start();
+	ipc_prim->u.info_cnf.max_tx_gain = tx_range.stop();
 	ipc_prim->u.info_cnf.iq_scaling_val_rx = 0.3;
 	ipc_prim->u.info_cnf.iq_scaling_val_tx = 1;
 	ipc_prim->u.info_cnf.max_num_chans = num_chans;
@@ -245,11 +238,6 @@ extern "C" void uhdwrap_fill_info_cnf(struct ipc_sk_if *ipc_prim)
 		for (unsigned int j = 0; j < rxant.size(); j++) {
 			OSMO_STRLCPY_ARRAY(chan_info->rx_path[j], rxant[j].c_str());
 		}
-		chan_info->min_rx_gain = rx_range.start();
-		chan_info->max_rx_gain = rx_range.stop();
-		chan_info->min_tx_gain = tx_range.start();
-		chan_info->max_tx_gain = tx_range.stop();
-		chan_info->nominal_tx_power = 7.5; // FIXME: would require uhd dev + freq info
 		chan_info++;
 	}
 }
--- a/Transceiver52M/device/ipc/uhdwrap.h
+++ b/Transceiver52M/device/ipc/uhdwrap.h
@@ -4,14 +4,12 @@
 *
 * SPDX-License-Identifier: 0BSD
 *
-* Permission to use, copy, modify, and/or distribute this software for any purpose
-* with or without fee is hereby granted.THE SOFTWARE IS PROVIDED "AS IS" AND THE
-* AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
-* BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
-* USE OR PERFORMANCE OF THIS SOFTWARE.
+    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+    PERFORMANCE OF THIS SOFTWARE.
 */
 #ifndef IPC_UHDWRAP_H
 #define IPC_UHDWRAP_H
@@ -76,8 +74,6 @@ int32_t uhdwrap_start(void *dev, int chan);
 int32_t uhdwrap_stop(void *dev, int chan);

 void uhdwrap_fill_info_cnf(struct ipc_sk_if *ipc_prim);
-
-double uhdwrap_set_txatt(void *dev, double a, size_t chan);
 #endif

 #endif // IPC_B210_H
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -23,6 +23,7 @@

 #include <map>

+#include "trx_vty.h"
 #include "Logger.h"
 #include "Threads.h"
 #include "LMSDevice.h"
@@ -31,7 +32,6 @@
 #include <lime/LimeSuite.h>

 extern "C" {
-#include "trx_vty.h"
 #include "osmo_signal.h"
 #include <osmocom/core/utils.h>
 }
@@ -40,6 +40,8 @@ extern "C" {
 #include "config.h"
 #endif

+using namespace std;
+
 #define MAX_ANTENNA_LIST_SIZE 10
 #define GSM_CARRIER_BW 270000.0 /* 270kHz */
 #define LMS_MIN_BW_SUPPORTED 2.5e6 /* 2.5mHz, minimum supported by LMS */
@@ -63,6 +65,8 @@ struct dev_desc {
 	 * LimeNET-Micro does not like selecting internal clock
 	 */
 	bool clock_src_int_usable;
+	/* Device specific maximum tx levels selected by phasenoise measurements, in dB */
+	double max_tx_gain;
 	/* Sample rate coef (without having TX/RX samples per symbol into account) */
 	double rate;
 	/* Sample rate coef (without having TX/RX samples per symbol into account), if multi-arfcn is enabled */
@@ -76,41 +80,12 @@ struct dev_desc {
 };

 static const std::map<enum lms_dev_type, struct dev_desc> dev_param_map {
-	{ LMS_DEV_SDR_USB,   { true,  true,  GSMRATE, MCBTS_SPACING, 8.9e-5, 7.9e-5, LMS_DEV_SDR_USB_PREFIX_NAME } },
-	{ LMS_DEV_SDR_MINI,  { false, true,  GSMRATE, MCBTS_SPACING, 8.9e-5, 8.2e-5, LMS_DEV_SDR_MINI_PREFIX_NAME } },
-	{ LMS_DEV_NET_MICRO, { true,  false, GSMRATE, MCBTS_SPACING, 8.9e-5, 7.9e-5, LMS_DEV_NET_MICRO_PREFIX_NAME } },
-	{ LMS_DEV_UNKNOWN,   { true,  true,  GSMRATE, MCBTS_SPACING, 8.9e-5, 7.9e-5, "UNKNOWN" } },
+	{ LMS_DEV_SDR_USB,   { true,  true,  73.0, GSMRATE, MCBTS_SPACING, 8.9e-5, 7.9e-5, LMS_DEV_SDR_USB_PREFIX_NAME } },
+	{ LMS_DEV_SDR_MINI,  { false, true,  66.0, GSMRATE, MCBTS_SPACING, 8.9e-5, 8.2e-5, LMS_DEV_SDR_MINI_PREFIX_NAME } },
+	{ LMS_DEV_NET_MICRO, { true,  false, 71.0, GSMRATE, MCBTS_SPACING, 8.9e-5, 7.9e-5, LMS_DEV_NET_MICRO_PREFIX_NAME } },
+	{ LMS_DEV_UNKNOWN,   { true,  true,  73.0, GSMRATE, MCBTS_SPACING, 8.9e-5, 7.9e-5, "UNKNOWN" } },
 };

-typedef std::tuple<lms_dev_type, enum gsm_band> dev_band_key;
-typedef std::map<dev_band_key, dev_band_desc>::const_iterator dev_band_map_it;
-static const std::map<dev_band_key, dev_band_desc> dev_band_nom_power_param_map {
-	{ std::make_tuple(LMS_DEV_SDR_USB, GSM_BAND_850),	{ 73.0, 11.2,  -6.0  } },
-	{ std::make_tuple(LMS_DEV_SDR_USB, GSM_BAND_900),	{ 73.0, 10.8,  -6.0  } },
-	{ std::make_tuple(LMS_DEV_SDR_USB, GSM_BAND_1800),	{ 65.0, -3.5,  -17.0 } }, /* FIXME: OS#4583: 1800Mhz is failing above TxGain=65, which is around -3.5dBm (already < 0 dBm) */
-	{ std::make_tuple(LMS_DEV_SDR_USB, GSM_BAND_1900),	{ 73.0, 1.7,   -17.0 } }, /* FIXME: OS#4583: 1900MHz is failing in all TxGain values */
-	{ std::make_tuple(LMS_DEV_SDR_MINI, GSM_BAND_850),	{ 66.0, 3.1,   -6.0  } }, /* FIXME: OS#4583: Ensure BAND2 is used at startup */
-	{ std::make_tuple(LMS_DEV_SDR_MINI, GSM_BAND_900),	{ 66.0, 2.8,   -6.0  } }, /* FIXME: OS#4583: Ensure BAND2 is used at startup */
-	{ std::make_tuple(LMS_DEV_SDR_MINI, GSM_BAND_1800),	{ 66.0, -11.6, -17.0 } }, /* OS#4583: Any of BAND1 or BAND2 is fine */
-	{ std::make_tuple(LMS_DEV_SDR_MINI, GSM_BAND_1900),	{ 66.0, -9.2,  -17.0 } }, /* FIXME: OS#4583: Ensure BAND1 is used at startup */
-	{ std::make_tuple(LMS_DEV_NET_MICRO, GSM_BAND_850),	{ 71.0, 6.8,   -6.0  } },
-	{ std::make_tuple(LMS_DEV_NET_MICRO, GSM_BAND_900),	{ 71.0, 6.8,   -6.0  } },
-	{ std::make_tuple(LMS_DEV_NET_MICRO, GSM_BAND_1800),	{ 65.0, -10.5, -17.0 } }, /* OS#4583: TxGain=71 (-4.4dBm) FAIL rms phase errors ~10° */
-	{ std::make_tuple(LMS_DEV_NET_MICRO, GSM_BAND_1900),	{ 71.0, -6.3,  -17.0 } }, /* FIXME: OS#4583: all FAIL, BAND1/BAND2 rms phase errors >23° */
-};
-
-/* So far measurements done for B210 show really close to linear relationship
- * between gain and real output power, so we simply adjust the measured offset
- */
-static double TxGain2TxPower(const dev_band_desc &desc, double tx_gain_db)
-{
-	return desc.nom_out_tx_power - (desc.nom_lms_tx_gain - tx_gain_db);
-}
-static double TxPower2TxGain(const dev_band_desc &desc, double tx_power_dbm)
-{
-	return desc.nom_lms_tx_gain - (desc.nom_out_tx_power - tx_power_dbm);
-}
-
 static enum lms_dev_type parse_dev_type(lms_device_t *m_lms_dev)
 {
 	std::map<enum lms_dev_type, struct dev_desc>::const_iterator it = dev_param_map.begin();
@@ -135,7 +110,7 @@ LMSDevice::LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t c
 		     const std::vector<std::string>& tx_paths,
 		     const std::vector<std::string>& rx_paths):
 	RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths),
-	m_lms_dev(NULL), started(false), band((enum gsm_band)0), m_dev_type(LMS_DEV_UNKNOWN)
+	m_lms_dev(NULL), started(false), m_dev_type(LMS_DEV_UNKNOWN)
 {
 	LOGC(DDEV, INFO) << "creating LMS device...";

@@ -201,7 +176,7 @@ static void print_range(const char* name, lms_range_t *range)
 int info_list_find(lms_info_str_t* info_list, unsigned int count, const std::string &args)
 {
 	unsigned int i, j;
-	std::vector<std::string> filters;
+	std::vector<string> filters;

 	filters = comma_delimited_to_vector(args.c_str());

@@ -222,44 +197,6 @@ int info_list_find(lms_info_str_t* info_list, unsigned int count, const std::str
 	return -1;
 }

-void LMSDevice::assign_band_desc(enum gsm_band req_band)
-{
-	dev_band_map_it it;
-
-	it = dev_band_nom_power_param_map.find(dev_band_key(m_dev_type, req_band));
-	if (it == dev_band_nom_power_param_map.end()) {
-		dev_desc desc = dev_param_map.at(m_dev_type);
-		LOGC(DDEV, ERROR) << "No Tx Power measurements exist for device "
-				    << desc.name_prefix << " on band " << gsm_band_name(req_band)
-				    << ", using LimeSDR-USB ones as fallback";
-		it = dev_band_nom_power_param_map.find(dev_band_key(LMS_DEV_SDR_USB, req_band));
-	}
-	OSMO_ASSERT(it != dev_band_nom_power_param_map.end());
-	band_desc = it->second;
-}
-
-bool LMSDevice::set_band(enum gsm_band req_band)
-{
-	if (band != 0 && req_band != band) {
-		LOGC(DDEV, ALERT) << "Requesting band " << gsm_band_name(req_band)
-				  << " different from previous band " << gsm_band_name(band);
-		return false;
-	}
-
-	band = req_band;
-	assign_band_desc(band);
-	return true;
-}
-
-void LMSDevice::get_dev_band_desc(dev_band_desc& desc)
-{
-	if (band == 0) {
-		LOGC(DDEV, ERROR) << "Power parameters requested before Tx Frequency was set! Providing band 900 by default...";
-		assign_band_desc(GSM_BAND_900);
-	}
-	desc = band_desc;
-}
-
 int LMSDevice::open(const std::string &args, int ref, bool swap_channels)
 {
 	lms_info_str_t* info_list;
@@ -385,20 +322,17 @@ bool LMSDevice::start()
 	LOGC(DDEV, INFO) << "starting LMS...";

 	unsigned int i;
-	dev_band_desc desc;

 	if (started) {
 		LOGC(DDEV, ERR) << "Device already started";
 		return false;
 	}

-	get_dev_band_desc(desc);
-
 	/* configure the channels/streams */
 	for (i=0; i<chans; i++) {
 		/* Set gains for calibration/filter setup */
 		/* TX gain to maximum */
-		LMS_SetGaindB(m_lms_dev, LMS_CH_TX, i, TxPower2TxGain(desc, desc.nom_out_tx_power));
+		setTxGain(maxTxGain(), i);
 		/* RX gain to midpoint */
 		setRxGain((minRxGain() + maxRxGain()) / 2, i);

@@ -543,6 +477,17 @@ bool LMSDevice::do_filters(size_t chan)
 	return true;
 }

+
+double LMSDevice::maxTxGain()
+{
+	return dev_param_map.at(m_dev_type).max_tx_gain;
+}
+
+double LMSDevice::minTxGain()
+{
+	return 0.0;
+}
+
 double LMSDevice::maxRxGain()
 {
 	return 73.0;
@@ -553,6 +498,22 @@ double LMSDevice::minRxGain()
 	return 0.0;
 }

+double LMSDevice::setTxGain(double dB, size_t chan)
+{
+	if (dB > maxTxGain())
+		dB = maxTxGain();
+	if (dB < minTxGain())
+		dB = minTxGain();
+
+	LOGCHAN(chan, DDEV, NOTICE) << "Setting TX gain to " << dB << " dB";
+
+	if (LMS_SetGaindB(m_lms_dev, LMS_CH_TX, chan, dB) < 0)
+		LOGCHAN(chan, DDEV, ERR) << "Error setting TX gain to " << dB << " dB";
+	else
+		tx_gains[chan] = dB;
+	return tx_gains[chan];
+}
+
 double LMSDevice::setRxGain(double dB, size_t chan)
 {
 	if (dB > maxRxGain())
@@ -569,63 +530,6 @@ double LMSDevice::setRxGain(double dB, size_t chan)
 	return rx_gains[chan];
 }

-double LMSDevice::rssiOffset(size_t chan)
-{
-	double rssiOffset;
-	dev_band_desc desc;
-
-	if (chan >= rx_gains.size()) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
-		return 0.0f;
-	}
-
-	get_dev_band_desc(desc);
-	rssiOffset = rx_gains[chan] + desc.rxgain2rssioffset_rel;
-	return rssiOffset;
-}
-
-double LMSDevice::setPowerAttenuation(int atten, size_t chan)
-{
-	double tx_power, dB;
-	dev_band_desc desc;
-
-	if (chan >= tx_gains.size()) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
-		return 0.0f;
-	}
-
-	get_dev_band_desc(desc);
-	tx_power = desc.nom_out_tx_power - atten;
-	dB = TxPower2TxGain(desc, tx_power);
-
-	LOGCHAN(chan, DDEV, NOTICE) << "Setting TX gain to " << dB << " dB (~" << tx_power << " dBm)";
-
-	if (LMS_SetGaindB(m_lms_dev, LMS_CH_TX, chan, dB) < 0)
-		LOGCHAN(chan, DDEV, ERR) << "Error setting TX gain to " << dB << " dB (~" << tx_power << " dBm)";
-	else
-		tx_gains[chan] = dB;
-	return desc.nom_out_tx_power - TxGain2TxPower(desc, tx_gains[chan]);
-}
-
-double LMSDevice::getPowerAttenuation(size_t chan) {
-	dev_band_desc desc;
-	if (chan >= tx_gains.size()) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
-		return 0.0f;
-	}
-
-	get_dev_band_desc(desc);
-	return desc.nom_out_tx_power - TxGain2TxPower(desc, tx_gains[chan]);
-}
-
-int LMSDevice::getNominalTxPower(size_t chan)
-{
-	dev_band_desc desc;
-	get_dev_band_desc(desc);
-
-	return desc.nom_out_tx_power;
-}
-
 void LMSDevice::log_ant_list(bool dir_tx, size_t chan, std::ostringstream& os)
 {
 	lms_name_t name_list[MAX_ANTENNA_LIST_SIZE]; /* large enough list for antenna names. */
@@ -992,39 +896,13 @@ bool LMSDevice::updateAlignment(TIMESTAMP timestamp)

 bool LMSDevice::setTxFreq(double wFreq, size_t chan)
 {
-	uint16_t req_arfcn;
-	enum gsm_band req_band;
-
-	if (chan >= chans) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
-		return false;
-	}
-
 	LOGCHAN(chan, DDEV, NOTICE) << "Setting Tx Freq to " << wFreq << " Hz";

-	req_arfcn = gsm_freq102arfcn(wFreq / 1000 / 100 , 0);
-	if (req_arfcn == 0xffff) {
-		LOGCHAN(chan, DDEV, ALERT) << "Unknown ARFCN for Tx Frequency " << wFreq / 1000 << " kHz";
-		return false;
-	}
-	if (gsm_arfcn2band_rc(req_arfcn, &req_band) < 0) {
-		LOGCHAN(chan, DDEV, ALERT) << "Unknown GSM band for Tx Frequency " << wFreq
-					   << " Hz (ARFCN " << req_arfcn << " )";
-		return false;
-	}
-
-	if (band != 0 && req_band != band) {
-		LOGCHAN(chan, DDEV, ALERT) << "Requesting Tx Frequency " << wFreq
-					   << " Hz different from previous band " << gsm_band_name(band);
-		return false;
-	}
-
 	if (LMS_SetLOFrequency(m_lms_dev, LMS_CH_TX, chan, wFreq) < 0) {
 		LOGCHAN(chan, DDEV, ERROR) << "Error setting Tx Freq to " << wFreq << " Hz";
 		return false;
 	}

-	band = req_band;
 	return true;
 }

--- a/Transceiver52M/device/lms/LMSDevice.h
+++ b/Transceiver52M/device/lms/LMSDevice.h
@@ -32,10 +32,6 @@
 #include <iostream>
 #include <lime/LimeSuite.h>

-extern "C" {
-#include <osmocom/gsm/gsm_utils.h>
-}
-
 /* Definition of LIMESDR_TX_AMPL limits maximum amplitude of I and Q
 * channels separately. Hence LIMESDR_TX_AMPL value must be 1/sqrt(2) =
 * 0.7071.... to get an amplitude of 1 of the complex signal:
@@ -52,23 +48,6 @@ enum lms_dev_type {
 	LMS_DEV_UNKNOWN,
 };

-struct dev_band_desc {
-	/* Maximum LimeSuite Tx Gain which can be set/used without distorting
-	   the output * signal, and the resulting real output power measured
-	   when that gain is used.
-	 */
-	double nom_lms_tx_gain;  /* dB */
-	double nom_out_tx_power; /* dBm */
-	/* Factor used to infer base real RSSI offset on the Rx path based on current
-	   configured RxGain. The resulting rssiOffset is added to the per burst
-	   calculated energy in upper layers. These values were empirically
-	   found and may change based on multiple factors, see OS#4468.
-	   Correct measured values only provided for LimeSDR-USB so far.
-	   rssiOffset = rxGain + rxgain2rssioffset_rel;
-	*/
-	double rxgain2rssioffset_rel; /* dB */
-};
-
 /** A class to handle a LimeSuite supported device */
 class LMSDevice:public RadioDevice {

@@ -87,8 +66,6 @@ private:
 	TIMESTAMP ts_initial, ts_offset;

 	std::vector<double> tx_gains, rx_gains;
-	enum gsm_band band;
-	struct dev_band_desc band_desc;

 	enum lms_dev_type m_dev_type;

@@ -100,9 +77,7 @@ private:
 	void update_stream_stats_rx(size_t chan, bool *overrun);
 	void update_stream_stats_tx(size_t chan, bool *underrun);
 	bool do_clock_src_freq(enum ReferenceType ref, double freq);
-	void get_dev_band_desc(dev_band_desc& desc);
-	bool set_band(enum gsm_band req_band);
-	void assign_band_desc(enum gsm_band req_band);
+
 public:

 	/** Object constructor */
@@ -190,12 +165,19 @@ public:
 	/** return minimum Rx Gain **/
 	double minRxGain(void);

-	double rssiOffset(size_t chan);
+	/** sets the transmit chan gain, returns the gain setting **/
+	double setTxGain(double dB, size_t chan = 0);

-	double setPowerAttenuation(int atten, size_t chan);
-	double getPowerAttenuation(size_t chan = 0);
+	/** get transmit gain */
+	double getTxGain(size_t chan = 0) {
+		return tx_gains[chan];
+	}

-	int getNominalTxPower(size_t chan = 0);
+	/** return maximum Tx Gain **/
+	double maxTxGain(void);
+
+	/** return minimum Rx Gain **/
+	double minTxGain(void);

 	/** sets the RX path to use, returns true if successful and false otherwise */
 	bool setRxAntenna(const std::string & ant, size_t chan = 0);
--- a/Transceiver52M/device/lms/Makefile.am
+++ b/Transceiver52M/device/lms/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/Makefile.common

 AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common
-AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LMS_CFLAGS)
+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LMS_CFLAGS)

 noinst_HEADERS = LMSDevice.h

--- a/Transceiver52M/device/uhd/Makefile.am
+++ b/Transceiver52M/device/uhd/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/Makefile.common

 AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common
-AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(UHD_CFLAGS)
+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(UHD_CFLAGS)

 noinst_HEADERS = UHDDevice.h

--- a/Transceiver52M/device/uhd/UHDDevice.cpp
+++ b/Transceiver52M/device/uhd/UHDDevice.cpp
@@ -33,12 +33,6 @@
 #include "config.h"
 #endif

-extern "C" {
-#include <osmocom/core/utils.h>
-#include <osmocom/gsm/gsm_utils.h>
-#include <osmocom/vty/cpu_sched_vty.h>
-}
-
 #ifdef USE_UHD_3_11
 #include <uhd/utils/log_add.hpp>
 #include <uhd/utils/thread.hpp>
@@ -129,23 +123,9 @@ static const std::map<dev_key, dev_desc> dev_param_map {
 	{ std::make_tuple(B2XX_MCBTS, 4, 4), { 1, 51.2e6, MCBTS_SPACING*4, B2XX_TIMING_MCBTS, "B200/B210 4 SPS Multi-ARFCN" } },
 };

-typedef std::tuple<uhd_dev_type, enum gsm_band> dev_band_key;
-typedef std::map<dev_band_key, dev_band_desc>::const_iterator dev_band_map_it;
-static const std::map<dev_band_key, dev_band_desc> dev_band_nom_power_param_map {
-	{ std::make_tuple(B200, GSM_BAND_850),	{ 89.75, 13.3, -7.5  } },
-	{ std::make_tuple(B200, GSM_BAND_900),	{ 89.75, 13.3, -7.5  } },
-	{ std::make_tuple(B200, GSM_BAND_1800),	{ 89.75, 7.5,  -11.0 } },
-	{ std::make_tuple(B200, GSM_BAND_1900),	{ 89.75, 7.7,  -11.0 } },
-	{ std::make_tuple(B210, GSM_BAND_850),	{ 89.75, 13.3, -7.5  } },
-	{ std::make_tuple(B210, GSM_BAND_900),	{ 89.75, 13.3, -7.5  } },
-	{ std::make_tuple(B210, GSM_BAND_1800),	{ 89.75, 7.5,  -11.0 } },
-	{ std::make_tuple(B210, GSM_BAND_1900),	{ 89.75, 7.7,  -11.0 } },
-};
-
 void *async_event_loop(uhd_device *dev)
 {
 	set_selfthread_name("UHDAsyncEvent");
-	osmo_cpu_sched_vty_apply_localthread();

 	while (1) {
 		dev->recv_async_msg();
@@ -208,25 +188,14 @@ static void uhd_msg_handler(uhd::msg::type_t type, const std::string &msg)
 }
 #endif

-/* So far measurements done for B210 show really close to linear relationship
- * between gain and real output power, so we simply adjust the measured offset
- */
-static double TxGain2TxPower(const dev_band_desc &desc, double tx_gain_db)
-{
-	return desc.nom_out_tx_power - (desc.nom_uhd_tx_gain - tx_gain_db);
-}
-static double TxPower2TxGain(const dev_band_desc &desc, double tx_power_dbm)
-{
-	return desc.nom_uhd_tx_gain - (desc.nom_out_tx_power - tx_power_dbm);
-}
-
 uhd_device::uhd_device(size_t tx_sps, size_t rx_sps,
 		       InterfaceType iface, size_t chan_num, double lo_offset,
 		       const std::vector<std::string>& tx_paths,
 		       const std::vector<std::string>& rx_paths)
 	: RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths),
+	  tx_gain_min(0.0), tx_gain_max(0.0),
 	  rx_gain_min(0.0), rx_gain_max(0.0),
-	  band((enum gsm_band)0), tx_spp(0), rx_spp(0),
+	  tx_spp(0), rx_spp(0),
 	  started(false), aligned(false), drop_cnt(0),
 	  prev_ts(0,0), ts_initial(0), ts_offset(0), async_event_thrd(NULL)
 {
@@ -240,47 +209,8 @@ uhd_device::~uhd_device()
 		delete rx_buffers[i];
 }

-void uhd_device::assign_band_desc(enum gsm_band req_band)
-{
-	dev_band_map_it it;
-
-	it = dev_band_nom_power_param_map.find(dev_band_key(dev_type, req_band));
-	if (it == dev_band_nom_power_param_map.end()) {
-		dev_desc desc = dev_param_map.at(dev_key(dev_type, tx_sps, rx_sps));
-		LOGC(DDEV, ERROR) << "No Power parameters exist for device "
-				    << desc.str << " on band " << gsm_band_name(req_band)
-				    << ", using B210 ones as fallback";
-		it = dev_band_nom_power_param_map.find(dev_band_key(B210, req_band));
-	}
-	OSMO_ASSERT(it != dev_band_nom_power_param_map.end())
-	band_desc = it->second;
-}
-
-bool uhd_device::set_band(enum gsm_band req_band)
-{
-	if (band != 0 && req_band != band) {
-		LOGC(DDEV, ALERT) << "Requesting band " << gsm_band_name(req_band)
-				  << " different from previous band " << gsm_band_name(band);
-		return false;
-	}
-
-	band = req_band;
-	assign_band_desc(band);
-	return true;
-}
-
-void uhd_device::get_dev_band_desc(dev_band_desc& desc)
-{
-	if (band == 0) {
-		LOGC(DDEV, ERROR) << "Power parameters requested before Tx Frequency was set! Providing band 900 by default...";
-		assign_band_desc(GSM_BAND_900);
-	}
-	desc = band_desc;
-}
-
 void uhd_device::init_gains()
 {
-	double tx_gain_min, tx_gain_max;
 	uhd::gain_range_t range;

 	if (dev_type == UMTRX) {
@@ -345,6 +275,37 @@ void uhd_device::set_rates()
 	LOGC(DDEV, INFO) << "Rates configured for " << desc.str;
 }

+double uhd_device::setTxGain(double db, size_t chan)
+{
+	if (chan >= tx_gains.size()) {
+		LOGC(DDEV, ALERT) << "Requested non-existent channel" << chan;
+		return 0.0f;
+	}
+
+	if (dev_type == UMTRX) {
+		std::vector<std::string> gain_stages = usrp_dev->get_tx_gain_names(0);
+		if (gain_stages[0] == "VGA" || gain_stages[0] == "PA") {
+			usrp_dev->set_tx_gain(db, chan);
+		} else {
+			// New UHD versions support split configuration of
+			// Tx gain stages. We utilize this to set the gain
+			// configuration, optimal for the Tx signal quality.
+			// From our measurements, VGA1 must be 18dB plus-minus
+			// one and VGA2 is the best when 23dB or lower.
+			usrp_dev->set_tx_gain(UMTRX_VGA1_DEF, "VGA1", chan);
+			usrp_dev->set_tx_gain(db-UMTRX_VGA1_DEF, "VGA2", chan);
+		}
+	} else {
+		usrp_dev->set_tx_gain(db, chan);
+	}
+
+	tx_gains[chan] = usrp_dev->get_tx_gain(chan);
+
+	LOGC(DDEV, INFO) << "Set TX gain to " << tx_gains[chan] << "dB (asked for " << db << "dB)";
+
+	return tx_gains[chan];
+}
+
 double uhd_device::setRxGain(double db, size_t chan)
 {
 	if (chan >= rx_gains.size()) {
@@ -370,76 +331,14 @@ double uhd_device::getRxGain(size_t chan)
 	return rx_gains[chan];
 }

-double uhd_device::rssiOffset(size_t chan)
+double uhd_device::getTxGain(size_t chan)
 {
-	double rssiOffset;
-	dev_band_desc desc;
-
-	if (chan >= rx_gains.size()) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
-		return 0.0f;
-	}
-
-	get_dev_band_desc(desc);
-	rssiOffset = rx_gains[chan] + desc.rxgain2rssioffset_rel;
-	return rssiOffset;
-}
-
-double uhd_device::setPowerAttenuation(int atten, size_t chan) {
-	double tx_power, db;
-	dev_band_desc desc;
-
-	if (chan >= tx_gains.size()) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel" << chan;
-		return 0.0f;
-	}
-
-	get_dev_band_desc(desc);
-	tx_power = desc.nom_out_tx_power - atten;
-	db = TxPower2TxGain(desc, tx_power);
-
-	if (dev_type == UMTRX) {
-		std::vector<std::string> gain_stages = usrp_dev->get_tx_gain_names(0);
-		if (gain_stages[0] == "VGA" || gain_stages[0] == "PA") {
-			usrp_dev->set_tx_gain(db, chan);
-		} else {
-			// New UHD versions support split configuration of
-			// Tx gain stages. We utilize this to set the gain
-			// configuration, optimal for the Tx signal quality.
-			// From our measurements, VGA1 must be 18dB plus-minus
-			// one and VGA2 is the best when 23dB or lower.
-			usrp_dev->set_tx_gain(UMTRX_VGA1_DEF, "VGA1", chan);
-			usrp_dev->set_tx_gain(db-UMTRX_VGA1_DEF, "VGA2", chan);
-		}
-	} else {
-		usrp_dev->set_tx_gain(db, chan);
-	}
-
-	tx_gains[chan] = usrp_dev->get_tx_gain(chan);
-
-	LOGC(DDEV, INFO) << "Set TX gain to " << tx_gains[chan] << "dB, ~"
-			 <<  TxGain2TxPower(desc, tx_gains[chan]) << " dBm "
-			 << "(asked for " << db << " dB, ~" << tx_power << " dBm)";
-
-	return desc.nom_out_tx_power - TxGain2TxPower(desc, tx_gains[chan]);
-}
-double uhd_device::getPowerAttenuation(size_t chan) {
-	dev_band_desc desc;
 	if (chan >= tx_gains.size()) {
 		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
 		return 0.0f;
 	}

-	get_dev_band_desc(desc);
-	return desc.nom_out_tx_power - TxGain2TxPower(desc, tx_gains[chan]);
-}
-
-int uhd_device::getNominalTxPower(size_t chan)
-{
-	dev_band_desc desc;
-	get_dev_band_desc(desc);
-
-	return desc.nom_out_tx_power;
+	return tx_gains[chan];
 }

 /*
@@ -775,10 +674,6 @@ bool uhd_device::stop()
 	async_event_thrd->join();
 	delete async_event_thrd;

-	/* reset internal buffer timestamps */
-	for (size_t i = 0; i < rx_buffers.size(); i++)
-		rx_buffers[i]->reset();
-
 	started = false;
 	return true;
 }
@@ -1057,33 +952,13 @@ bool uhd_device::set_freq(double freq, size_t chan, bool tx)

 bool uhd_device::setTxFreq(double wFreq, size_t chan)
 {
-	uint16_t req_arfcn;
-	enum gsm_band req_band;
-
 	if (chan >= tx_freqs.size()) {
 		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
 		return false;
 	}
 	ScopedLock lock(tune_lock);

-	req_arfcn = gsm_freq102arfcn(wFreq / 1000 / 100 , 0);
-	if (req_arfcn == 0xffff) {
-		LOGCHAN(chan, DDEV, ALERT) << "Unknown ARFCN for Tx Frequency " << wFreq / 1000 << " kHz";
-		return false;
-	}
-	if (gsm_arfcn2band_rc(req_arfcn, &req_band) < 0) {
-		LOGCHAN(chan, DDEV, ALERT) << "Unknown GSM band for Tx Frequency " << wFreq
-					   << " Hz (ARFCN " << req_arfcn << " )";
-		return false;
-	}
-
-	if (!set_band(req_band))
-		return false;
-
-	if (!set_freq(wFreq, chan, true))
-		return false;
-
-	return true;
+	return set_freq(wFreq, chan, true);
 }

 bool uhd_device::setRxFreq(double wFreq, size_t chan)
@@ -1125,14 +1000,7 @@ bool uhd_device::setRxAntenna(const std::string &ant, size_t chan)
 		return false;
 	}

-	/* UHD may throw a LookupError/IndexError here (see OS#4636) */
-	try {
-		avail = usrp_dev->get_rx_antennas(chan);
-	} catch (const uhd::index_error &e) {
-		LOGC(DDEV, ALERT) << "UHD Error: " << e.what();
-		return false;
-	}
-
+	avail = usrp_dev->get_rx_antennas(chan);
 	if (std::find(avail.begin(), avail.end(), ant) == avail.end()) {
 		LOGC(DDEV, ALERT) << "Requested non-existent Rx antenna " << ant << " on channel " << chan;
 		LOGC(DDEV, INFO) << "Available Rx antennas: ";
@@ -1168,14 +1036,7 @@ bool uhd_device::setTxAntenna(const std::string &ant, size_t chan)
 		return false;
 	}

-	/* UHD may throw a LookupError/IndexError here (see OS#4636) */
-	try {
-		avail = usrp_dev->get_tx_antennas(chan);
-	} catch (const uhd::index_error &e) {
-		LOGC(DDEV, ALERT) << "UHD Error: " << e.what();
-		return false;
-	}
-
+	avail = usrp_dev->get_tx_antennas(chan);
 	if (std::find(avail.begin(), avail.end(), ant) == avail.end()) {
 		LOGC(DDEV, ALERT) << "Requested non-existent Tx antenna " << ant << " on channel " << chan;
 		LOGC(DDEV, INFO) << "Available Tx antennas: ";
--- a/Transceiver52M/device/uhd/UHDDevice.h
+++ b/Transceiver52M/device/uhd/UHDDevice.h
@@ -37,10 +37,6 @@
 #include <uhd/property_tree.hpp>
 #include <uhd/usrp/multi_usrp.hpp>

-extern "C" {
-#include <osmocom/gsm/gsm_utils.h>
-}
-

 enum uhd_dev_type {
 	USRP1,
@@ -56,21 +52,6 @@ enum uhd_dev_type {
 	LIMESDR,
 };

-struct dev_band_desc {
-	/* Maximum UHD Tx Gain which can be set/used without distorting the
-	   output signal, and the resulting real output power measured when that
-	   gain is used. Correct measured values only provided for B210 so far. */
-	double nom_uhd_tx_gain;  /* dB */
-	double nom_out_tx_power; /* dBm */
-	/* Factor used to infer base real RSSI offset on the Rx path based on current
-	   configured RxGain. The resulting rssiOffset is added to the per burst
-	   calculated energy in upper layers. These values were empirically
-	   found and may change based on multiple factors, see OS#4468.
-	   rssiOffset = rxGain + rxgain2rssioffset_rel;
-	*/
-	double rxgain2rssioffset_rel; /* dB */
-};
-
 /*
    uhd_device - UHD implementation of the Device interface. Timestamped samples
                are sent to and received from the device. An intermediate buffer
@@ -113,12 +94,11 @@ public:
 	double getRxGain(size_t chan);
 	double maxRxGain(void) { return rx_gain_max; }
 	double minRxGain(void) { return rx_gain_min; }
-	double rssiOffset(size_t chan);

-	double setPowerAttenuation(int atten, size_t chan);
-	double getPowerAttenuation(size_t chan = 0);
-
-	int getNominalTxPower(size_t chan = 0);
+	double setTxGain(double db, size_t chan);
+	double getTxGain(size_t chan = 0);
+	double maxTxGain(void) { return tx_gain_max; }
+	double minTxGain(void) { return tx_gain_min; }

 	double getTxFreq(size_t chan);
 	double getRxFreq(size_t chan);
@@ -156,12 +136,11 @@ protected:

 	double tx_rate, rx_rate;

+	double tx_gain_min, tx_gain_max;
 	double rx_gain_min, rx_gain_max;

 	std::vector<double> tx_gains, rx_gains;
 	std::vector<double> tx_freqs, rx_freqs;
-	enum gsm_band band;
-	struct dev_band_desc band_desc;
 	size_t tx_spp, rx_spp;

 	bool started;
@@ -190,9 +169,6 @@ protected:

 	uhd::tune_request_t select_freq(double wFreq, size_t chan, bool tx);
 	bool set_freq(double freq, size_t chan, bool tx);
-	void get_dev_band_desc(dev_band_desc& desc);
-	bool set_band(enum gsm_band req_band);
-	void assign_band_desc(enum gsm_band req_band);

 	Thread *async_event_thrd;
 	Mutex tune_lock;
--- a/Transceiver52M/device/usrp1/Makefile.am
+++ b/Transceiver52M/device/usrp1/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/Makefile.common

 AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common
-AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(USRP_CFLAGS)
+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(USRP_CFLAGS)

 rev2dir = $(datadir)/usrp/rev2
 rev4dir = $(datadir)/usrp/rev4
--- a/Transceiver52M/device/usrp1/USRPDevice.cpp
+++ b/Transceiver52M/device/usrp1/USRPDevice.cpp
@@ -205,8 +205,8 @@ bool USRPDevice::start()
  writeLock.unlock();

  // Set gains to midpoint
-  setTxGain((m_dbTx->gain_min() + m_dbTx->gain_max()) / 2);
-  setRxGain((m_dbTx->gain_min() + m_dbTx->gain_max()) / 2);
+  setTxGain((minTxGain() + maxTxGain()) / 2);
+  setRxGain((minRxGain() + maxRxGain()) / 2);

  data = new short[currDataSize];
  dataStart = 0;
@@ -243,6 +243,16 @@ bool USRPDevice::stop()
 #endif
 }

+double USRPDevice::maxTxGain()
+{
+  return m_dbTx->gain_max();
+}
+
+double USRPDevice::minTxGain()
+{
+  return m_dbTx->gain_min();
+}
+
 double USRPDevice::maxRxGain()
 {
  return m_dbRx->gain_max();
@@ -261,10 +271,10 @@ double USRPDevice::setTxGain(double dB, size_t chan)
  }

  writeLock.lock();
-  if (dB > m_dbTx->gain_max())
-    dB = m_dbTx->gain_max();
-  if (dB < m_dbTx->gain_min())
-    dB = m_dbTx->gain_min();
+  if (dB > maxTxGain())
+    dB = maxTxGain();
+  if (dB < minTxGain())
+    dB = minTxGain();

  LOGC(DDEV, NOTICE) << "Setting TX gain to " << dB << " dB.";

@@ -304,23 +314,6 @@ double USRPDevice::setRxGain(double dB, size_t chan)
  return rxGain;
 }

-double USRPDevice::setPowerAttenuation(int atten, size_t chan) {
-      double rfGain;
-      rfGain = setTxGain(m_dbTx->gain_max() - atten, chan);
-      return m_dbTx->gain_max() - rfGain;
-}
-double USRPDevice::getPowerAttenuation(size_t chan) {
-      return m_dbTx->gain_max() - getTxGain(chan);
-}
-
-int USRPDevice::getNominalTxPower(size_t chan)
-{
-	/* TODO: return value based on some experimentally generated table depending on
-	 * band/arfcn, which is known here thanks to TXTUNE
-	 */
-	return 23;
-}
-
 bool USRPDevice::setRxAntenna(const std::string &ant, size_t chan)
 {
 	if (chan >= rx_paths.size()) {
--- a/Transceiver52M/device/usrp1/USRPDevice.h
+++ b/Transceiver52M/device/usrp1/USRPDevice.h
@@ -85,12 +85,6 @@ private:
  int writeSamplesControl(std::vector<short *> &bufs, int len, bool *underrun,
                   TIMESTAMP timestamp = 0xffffffff, bool isControl = false);

-  /** sets the transmit chan gain, returns the gain setting **/
-  double setTxGain(double dB, size_t chan = 0);
-
-  /** get transmit gain */
-  double getTxGain(size_t chan = 0) { return txGain; }
-
 #ifdef SWLOOPBACK
  short loopbackBuffer[1000000];
  int loopbackBufferSize;
@@ -174,12 +168,17 @@ private:
  /** return minimum Rx Gain **/
  double minRxGain(void);

-  double rssiOffset(size_t chan) { return 0.0f;  } /* FIXME: not implemented */
+  /** sets the transmit chan gain, returns the gain setting **/
+  double setTxGain(double dB, size_t chan = 0);

-  double setPowerAttenuation(int atten, size_t chan);
-  double getPowerAttenuation(size_t chan=0);
+  /** get transmit gain */
+  double getTxGain(size_t chan = 0) { return txGain; }

-  int getNominalTxPower(size_t chan = 0);
+  /** return maximum Tx Gain **/
+  double maxTxGain(void);
+
+  /** return minimum Rx Gain **/
+  double minTxGain(void);

  /** sets the RX path to use, returns true if successful and false otherwise */
  bool setRxAntenna(const std::string &ant, size_t chan = 0);
--- a/Transceiver52M/osmo-trx.cpp
+++ b/Transceiver52M/osmo-trx.cpp
@@ -55,7 +55,6 @@ extern "C" {
 #include <osmocom/ctrl/control_if.h>
 #include <osmocom/vty/stats.h>
 #include <osmocom/vty/command.h>
-#include <osmocom/vty/cpu_sched_vty.h>

 #include "convolve.h"
 #include "convert.h"
@@ -144,8 +143,12 @@ int makeTransceiver(struct trx_ctx *trx, RadioInterface *radio)
 {
 	VectorFIFO *fifo;

-	transceiver = new Transceiver(&trx->cfg, GSM::Time(3,0), radio);
-	if (!transceiver->init()) {
+	transceiver = new Transceiver(trx->cfg.base_port, trx->cfg.bind_addr,
+			      trx->cfg.remote_addr, trx->cfg.tx_sps,
+			      trx->cfg.rx_sps, trx->cfg.num_chans, GSM::Time(3,0),
+			      radio, trx->cfg.rssi_offset, trx->cfg.stack_size);
+	if (!transceiver->init(trx->cfg.filler, trx->cfg.rtsc,
+		       trx->cfg.rach_delay, trx->cfg.egprs, trx->cfg.ext_rach)) {
 		LOG(ALERT) << "Failed to initialize transceiver";
 		return -1;
 	}
@@ -177,17 +180,6 @@ static void sig_handler(int signo)
 		gshutdown = true;
 		break;
 	case SIGABRT:
-		/* in case of abort, we want to obtain a talloc report and
-		 * then run default SIGABRT handler, who will generate coredump
-		 * and abort the process. abort() should do this for us after we
-		 * return, but program wouldn't exit if an external SIGABRT is
-		 * received.
-		 */
-		talloc_report(tall_trx_ctx, stderr);
-		talloc_report_full(tall_trx_ctx, stderr);
-		signal(SIGABRT, SIG_DFL);
-		raise(SIGABRT);
-		break;
 	case SIGUSR1:
 		talloc_report(tall_trx_ctx, stderr);
 		talloc_report_full(tall_trx_ctx, stderr);
@@ -244,7 +236,7 @@ static void setup_signal_handlers()
 		exit(EXIT_FAILURE);
 	}

-	osmo_fd_setup(&signal_ofd, sfd, OSMO_FD_READ, signalfd_callback, NULL, 0);
+	osmo_fd_setup(&signal_ofd, sfd, BSC_FD_READ, signalfd_callback, NULL, 0);
 	if (osmo_fd_register(&signal_ofd) < 0) {
 		fprintf(stderr, "osmo_fd_register() failed.\n");
 		exit(EXIT_FAILURE);
@@ -253,13 +245,10 @@ static void setup_signal_handlers()

 static void print_help()
 {
-	printf( "Some useful options:\n"
-		"  -h, --help			This text\n"
-		"  -C, --config			Filename The config file to use\n"
-		"  -V, --version		Print the version of OsmoTRX\n"
-		"\nVTY reference generation:\n"
-		"      --vty-ref-mode MODE	VTY reference generation mode (e.g. 'expert').\n"
-		"      --vty-ref-xml		Generate the VTY reference XML output and exit.\n"
+	fprintf(stdout, "Options:\n"
+		"  -h, --help      This text\n"
+		"  -C, --config    Filename The config file to use\n"
+		"  -V, --version   Print the version of OsmoTRX\n"
 		);
 }

@@ -270,44 +259,16 @@ static void print_deprecated(char opt)
 		<< " All cmd line options are already being overridden by VTY options if set.";
 }

-static void handle_long_options(const char *prog_name, const int long_option)
-{
-	static int vty_ref_mode = VTY_REF_GEN_MODE_DEFAULT;
-
-	switch (long_option) {
-	case 1:
-		vty_ref_mode = get_string_value(vty_ref_gen_mode_names, optarg);
-		if (vty_ref_mode < 0) {
-			fprintf(stderr, "%s: Unknown VTY reference generation "
-				"mode '%s'\n", prog_name, optarg);
-			exit(2);
-		}
-		break;
-	case 2:
-		fprintf(stderr, "Generating the VTY reference in mode '%s' (%s)\n",
-			get_value_string(vty_ref_gen_mode_names, vty_ref_mode),
-			get_value_string(vty_ref_gen_mode_desc, vty_ref_mode));
-		vty_dump_xml_ref_mode(stdout, (enum vty_ref_gen_mode) vty_ref_mode);
-		exit(0);
-	default:
-		fprintf(stderr, "%s: error parsing cmdline options\n", prog_name);
-		exit(2);
-	}
-}
-
 static void handle_options(int argc, char **argv, struct trx_ctx* trx)
 {
 	int option;
 	unsigned int i;
 	std::vector<std::string> rx_paths, tx_paths;
 	bool rx_paths_set = false, tx_paths_set = false;
-	static int long_option = 0;
 	static struct option long_options[] = {
 		{"help", 0, 0, 'h'},
 		{"config", 1, 0, 'C'},
 		{"version", 0, 0, 'V'},
-		{"vty-ref-mode", 1, &long_option, 1},
-		{"vty-ref-xml", 0, &long_option, 2},
 		{NULL, 0, 0, 0}
 	};

@@ -318,9 +279,6 @@ static void handle_options(int argc, char **argv, struct trx_ctx* trx)
 			print_help();
 			exit(0);
 			break;
-		case 0:
-			handle_long_options(argv[0], long_option);
-			break;
 		case 'a':
 			print_deprecated(option);
 			osmo_talloc_replace_string(trx, &trx->cfg.dev_args, optarg);
@@ -387,7 +345,6 @@ static void handle_options(int argc, char **argv, struct trx_ctx* trx)
 		case 'R':
 			print_deprecated(option);
 			trx->cfg.rssi_offset = atof(optarg);
-			trx->cfg.force_rssi_offset = true;
 			break;
 		case 'S':
 			print_deprecated(option);
@@ -478,9 +435,7 @@ static int set_sched_rr(unsigned int prio)
 	int rc;
 	memset(&param, 0, sizeof(param));
 	param.sched_priority = prio;
-	LOG(INFO) << "Setting SCHED_RR priority " << param.sched_priority
-		  << ". This setting is DEPRECATED, please use 'policy rr " << param.sched_priority
-		  << "' under the 'sched' VTY node instead.";
+	LOG(INFO) << "Setting SCHED_RR priority " << param.sched_priority;
 	rc = sched_setscheduler(getpid(), SCHED_RR, &param);
 	if (rc != 0) {
 		LOG(ERROR) << "Config: Setting SCHED_RR failed";
@@ -489,38 +444,6 @@ static int set_sched_rr(unsigned int prio)
 	return 0;
 }

-static void print_simd_info(void)
-{
-#ifdef HAVE_SSE3
-	LOGP(DMAIN, LOGL_INFO, "SSE3 support compiled in");
-#ifdef HAVE___BUILTIN_CPU_SUPPORTS
-	if (__builtin_cpu_supports("sse3"))
-		LOGPC(DMAIN, LOGL_INFO, " and supported by CPU\n");
-	else
-		LOGPC(DMAIN, LOGL_INFO, ", but not supported by CPU\n");
-#else
-	LOGPC(DMAIN, LOGL_INFO, ", but runtime SIMD detection disabled\n");
-#endif
-#endif
-
-#ifdef HAVE_SSE4_1
-	LOGP(DMAIN, LOGL_INFO, "SSE4.1 support compiled in");
-#ifdef HAVE___BUILTIN_CPU_SUPPORTS
-	if (__builtin_cpu_supports("sse4.1"))
-		LOGPC(DMAIN, LOGL_INFO, " and supported by CPU\n");
-	else
-		LOGPC(DMAIN, LOGL_INFO, ", but not supported by CPU\n");
-#else
-	LOGPC(DMAIN, LOGL_INFO, ", but runtime SIMD detection disabled\n");
-#endif
-#endif
-
-#ifndef HAVE_ATOMIC_OPS
-#pragma message ("Built without atomic operation support. Using Mutex, it may affect performance!")
-	LOG(NOTICE) << "Built without atomic operation support. Using Mutex, it may affect performance!";
-#endif
-}
-
 static void print_config(struct trx_ctx *trx)
 {
 	unsigned int i;
@@ -542,10 +465,8 @@ static void print_config(struct trx_ctx *trx)
 	ost << "   Filler Burst TSC........ " << trx->cfg.rtsc << std::endl;
 	ost << "   Filler Burst RACH Delay. " << trx->cfg.rach_delay << std::endl;
 	ost << "   Multi-Carrier........... " << trx->cfg.multi_arfcn << std::endl;
-	ost << "   LO freq. offset......... " << trx->cfg.offset << std::endl;
-	if (trx->cfg.freq_offset_khz != 0)
-		ost << "   Tune freq. offset....... " << trx->cfg.freq_offset_khz << std::endl;
-	ost << "   RSSI to dBm offset...... " << trx->cfg.rssi_offset << (trx->cfg.force_rssi_offset ? "" : " (relative)") << std::endl;
+	ost << "   Tuning offset........... " << trx->cfg.offset << std::endl;
+	ost << "   RSSI to dBm offset...... " << trx->cfg.rssi_offset << std::endl;
 	ost << "   Swap channels........... " << trx->cfg.swap_channels << std::endl;
 	ost << "   Tx Antennas.............";
 	for (i = 0; i < trx->cfg.num_chans; i++) {
@@ -630,6 +551,35 @@ int main(int argc, char *argv[])

 	g_trx_ctx = vty_trx_ctx_alloc(tall_trx_ctx);

+#ifdef HAVE_SSE3
+	printf("Info: SSE3 support compiled in");
+#ifdef HAVE___BUILTIN_CPU_SUPPORTS
+	if (__builtin_cpu_supports("sse3"))
+		printf(" and supported by CPU\n");
+	else
+		printf(", but not supported by CPU\n");
+#else
+	printf(", but runtime SIMD detection disabled\n");
+#endif
+#endif
+
+#ifdef HAVE_SSE4_1
+	printf("Info: SSE4.1 support compiled in");
+#ifdef HAVE___BUILTIN_CPU_SUPPORTS
+	if (__builtin_cpu_supports("sse4.1"))
+		printf(" and supported by CPU\n");
+	else
+		printf(", but not supported by CPU\n");
+#else
+	printf(", but runtime SIMD detection disabled\n");
+#endif
+#endif
+
+#ifndef HAVE_ATOMIC_OPS
+#pragma message ("Built without atomic operation support. Using Mutex, it may affect performance!")
+	printf("Built without atomic operation support. Using Mutex, it may affect performance!\n");
+#endif
+
 	convolve_init();
 	convert_init();

@@ -639,7 +589,6 @@ int main(int argc, char *argv[])
 	vty_init(&g_vty_info);
 	logging_vty_add_cmds();
 	ctrl_vty_init(tall_trx_ctx);
-	osmo_cpu_sched_vty_init(tall_trx_ctx);
 	trx_vty_init(g_trx_ctx);

 	osmo_talloc_vty_add_cmds();
@@ -676,7 +625,6 @@ int main(int argc, char *argv[])
 			" but expect your config to break in the future.";
 	}

-	print_simd_info();
 	print_config(g_trx_ctx);

 	if (trx_validate_config(g_trx_ctx) < 0) {
--- a/Transceiver52M/proto_trxd.c
+++ b/Transceiver52M/proto_trxd.c
@@ -62,14 +62,14 @@ static void trxd_fill_burst_normalized255(uint8_t* soft_bits, const struct trx_u
 {
 	unsigned i;
 	for (i = 0; i < bi->nbits; i++)
-		soft_bits[i] = (uint8_t) round(bi->rx_burst[i] * 255.0);
+		soft_bits[i] = (char) round(bi->rx_burst[i] * 255.0);
 }

 bool trxd_send_burst_ind_v0(size_t chan, int fd, const struct trx_ul_burst_ind *bi) {
 	int rc;

 	/* v0 doesn't support idle frames, they are simply dropped, not sent */
-	if (bi->idle)
+	if(bi->idle)
 		return true;

 	/* +2: Historically (OpenBTS times), two extra non-used bytes are sent appended to each burst */
--- a/Transceiver52M/radioInterface.cpp
+++ b/Transceiver52M/radioInterface.cpp
@@ -27,9 +27,6 @@
 #include <Threads.h>

 extern "C" {
-#include <osmocom/core/utils.h>
-#include <osmocom/vty/cpu_sched_vty.h>
-
 #include "convert.h"
 }

@@ -106,7 +103,7 @@ double RadioInterface::fullScaleOutputValue(void) {

 int RadioInterface::setPowerAttenuation(int atten, size_t chan)
 {
-  double rfAtten, digAtten;
+  double rfGain, digAtten;

  if (chan >= mChans) {
    LOG(ALERT) << "Invalid channel requested";
@@ -116,8 +113,8 @@ int RadioInterface::setPowerAttenuation(int atten, size_t chan)
  if (atten < 0.0)
    atten = 0.0;

-  rfAtten = mDevice->setPowerAttenuation((double) atten, chan);
-  digAtten = (double) atten - rfAtten;
+  rfGain = setTxGain(mDevice->maxTxGain() - (double) atten, chan);
+  digAtten = (double) atten - mDevice->maxTxGain() + rfGain;

  if (digAtten < 1.0)
    powerScaling[chan] = 1.0;
@@ -127,16 +124,6 @@ int RadioInterface::setPowerAttenuation(int atten, size_t chan)
  return atten;
 }

-int RadioInterface::getNominalTxPower(size_t chan)
-{
-  if (chan >= mChans) {
-    LOG(ALERT) << "Invalid channel requested";
-    return -1;
-  }
-
-    return mDevice->getNominalTxPower(chan);
-}
-
 int RadioInterface::radioifyVector(signalVector &wVector,
                                   size_t chan, bool zero)
 {
@@ -174,7 +161,6 @@ bool RadioInterface::tuneRx(double freq, size_t chan)
 void *AlignRadioServiceLoopAdapter(RadioInterface *radioInterface)
 {
  set_selfthread_name("AlignRadio");
-  OSMO_ASSERT(osmo_cpu_sched_vty_apply_localthread() == 0);
  while (1) {
    sleep(60);
    radioInterface->alignRadio();
@@ -322,9 +308,9 @@ double RadioInterface::setRxGain(double dB, size_t chan)
  return mDevice->setRxGain(dB, chan);
 }

-double RadioInterface::rssiOffset(size_t chan)
+double RadioInterface::setTxGain(double dB, size_t chan)
 {
-	return mDevice->rssiOffset(chan);
+  return mDevice->setTxGain(dB, chan);
 }

 /* Receive a timestamped chunk from the device */
--- a/Transceiver52M/radioInterface.h
+++ b/Transceiver52M/radioInterface.h
@@ -109,9 +109,6 @@ public:
  /** set receive gain */
  virtual double setRxGain(double dB, size_t chan = 0);

-  /** return base RSSI offset to apply for received samples **/
-  virtual double rssiOffset(size_t chan = 0);
-
  /** drive transmission of GSM bursts */
  void driveTransmitRadio(std::vector<signalVector *> &bursts,
                          std::vector<bool> &zeros);
@@ -119,9 +116,7 @@ public:
  /** drive reception of GSM bursts. -1: Error. 0: Radio off. 1: Received something. */
  int driveReceiveRadio();

-  /** set transmit power attenuation */
-  virtual int setPowerAttenuation(int atten, size_t chan = 0);
-  int getNominalTxPower(size_t chan = 0);
+  int setPowerAttenuation(int atten, size_t chan = 0);

  /** returns the full-scale transmit amplitude **/
  double fullScaleInputValue();
@@ -139,6 +134,9 @@ protected:
  /** drive synchronization of Tx/Rx of USRP */
  void alignRadio();

+  /** set transmit gain */
+  virtual double setTxGain(double dB, size_t chan = 0);
+
  friend void *AlignRadioServiceLoopAdapter(RadioInterface*);
 };

@@ -168,7 +166,7 @@ private:
  bool pushBuffer();
  int pullBuffer();
  bool verify_arfcn_consistency(double freq, size_t chan, bool tx);
-  virtual int setPowerAttenuation(int atten, size_t chan = 0);
+  virtual double setTxGain(double dB, size_t chan);

  signalVector *outerSendBuffer;
  signalVector *outerRecvBuffer;
@@ -193,5 +191,4 @@ public:
  bool tuneTx(double freq, size_t chan);
  bool tuneRx(double freq, size_t chan);
  virtual double setRxGain(double dB, size_t chan);
-  virtual double rssiOffset(size_t chan = 0);
 };
--- a/Transceiver52M/radioInterfaceMulti.cpp
+++ b/Transceiver52M/radioInterfaceMulti.cpp
@@ -38,7 +38,6 @@ extern "C" {
 /* Universal resampling parameters */
 #define NUMCHUNKS				24

-/* number of narrow-band virtual ARFCNs in this wide-band multi-ARFCN device */
 #define MCHANS					4

 RadioInterfaceMulti::RadioInterfaceMulti(RadioDevice *radio, size_t tx_sps,
@@ -70,10 +69,6 @@ void RadioInterfaceMulti::close()
 	channelizer = NULL;
 	synthesis = NULL;

-
-	for (std::vector<signalVector*>::iterator it = history.begin(); it != history.end(); ++it)
-		delete *it;
-
 	mReceiveFIFO.resize(0);
 	powerScaling.resize(0);
 	history.resize(0);
@@ -84,10 +79,6 @@ void RadioInterfaceMulti::close()
 	RadioInterface::close();
 }

-/*! we re-map the physical channels from the filter bank to logical per-TRX channels
- *  \param[in] pchan physical channel number within the channelizer
- *  \param[in] chans total number of narrow-band ARFCN channels
- *  \returns logical (TRX) channel number, or -1 in case there is none */
 static int getLogicalChan(size_t pchan, size_t chans)
 {
 	switch (chans) {
@@ -122,9 +113,6 @@ static int getLogicalChan(size_t pchan, size_t chans)
 	return -1;
 }

-/*! do we need to frequency shift our spectrum or not?
- *  \param chans total number of channels
- *  \returns 1 if we need to shift; 0 if not; -1 on error */
 static int getFreqShift(size_t chans)
 {
 	switch (chans) {
@@ -166,7 +154,6 @@ bool RadioInterfaceMulti::init(int type)
 	tx_freq_state.resize(mChans);
 	active.resize(MCHANS, false);

-	/* 4 == sps */
 	inchunk = RESAMP_INRATE * 4;
 	outchunk = RESAMP_OUTRATE * 4;

@@ -443,19 +430,18 @@ bool RadioInterfaceMulti::tuneRx(double freq, size_t chan)
 }

 double RadioInterfaceMulti::setRxGain(double db, size_t chan)
+{
+  if (chan == 0)
+    return mDevice->setRxGain(db);
+  else
+    return mDevice->getRxGain();
+}
+
+double RadioInterfaceMulti::setTxGain(double dB, size_t chan)
 {
 	if (chan == 0)
-		return mDevice->setRxGain(db);
+		return mDevice->setTxGain(dB);
 	else
-		return mDevice->getRxGain();
-}
+		return mDevice->getTxGain();

-double RadioInterfaceMulti::rssiOffset(size_t chan)
-{
-	return mDevice->rssiOffset(0);
-}
-
-int RadioInterfaceMulti::setPowerAttenuation(int atten, size_t chan)
-{
-	return RadioInterface::setPowerAttenuation(atten, 0);
 }
--- a/Transceiver52M/radioVector.cpp
+++ b/Transceiver52M/radioVector.cpp
@@ -120,26 +120,38 @@ GSM::Time VectorQueue::nextTime() const

 radioVector* VectorQueue::getStaleBurst(const GSM::Time& targTime)
 {
-	if ((mQ.size()==0))
+	mLock.lock();
+	if ((mQ.size()==0)) {
+		mLock.unlock();
 		return NULL;
+	}

 	if (mQ.top()->getTime() < targTime) {
 		radioVector* retVal = mQ.top();
 		mQ.pop();
+		mLock.unlock();
 		return retVal;
 	}
+	mLock.unlock();
+
 	return NULL;
 }

 radioVector* VectorQueue::getCurrentBurst(const GSM::Time& targTime)
 {
-	if ((mQ.size()==0))
+	mLock.lock();
+	if ((mQ.size()==0)) {
+		mLock.unlock();
 		return NULL;
+	}

 	if (mQ.top()->getTime() == targTime) {
 		radioVector* retVal = mQ.top();
 		mQ.pop();
+		mLock.unlock();
 		return retVal;
 	}
+	mLock.unlock();
+
 	return NULL;
 }
--- a/Transceiver52M/radioVector.h
+++ b/Transceiver52M/radioVector.h
@@ -65,7 +65,6 @@ public:
 	GSM::Time nextTime() const;
 	radioVector* getStaleBurst(const GSM::Time& targTime);
 	radioVector* getCurrentBurst(const GSM::Time& targTime);
-	Mutex *getMutex() const { return &mLock; };
 };

 #endif /* RADIOVECTOR_H */
--- a/Transceiver52M/sigProcLib.cpp
+++ b/Transceiver52M/sigProcLib.cpp
@@ -1792,15 +1792,15 @@ static SoftVector *signalToSoftVector(signalVector *dec)
 * stages.
 */
 static signalVector *demodCommon(const signalVector &burst, int sps,
-                                 const struct estim_burst_params *ebp)
+                                 complex chan, float toa)
 {
  signalVector *delay, *dec;

  if ((sps != 1) && (sps != 4))
    return NULL;

-  delay = delayVector(&burst, NULL, -ebp->toa * (float) sps);
-  scaleVector(*delay, (complex) 1.0 / ebp->amp);
+  delay = delayVector(&burst, NULL, -toa * (float) sps);
+  scaleVector(*delay, (complex) 1.0 / chan);

  if (sps == 1)
    return delay;
@@ -1816,13 +1816,13 @@ static signalVector *demodCommon(const signalVector &burst, int sps,
 * 4 SPS (if activated) to minimize distortion through the fractional
 * delay filters. Symbol rotation and after always operates at 1 SPS.
 */
-static SoftVector *demodGmskBurst(const signalVector &rxBurst, int sps,
-				  const struct estim_burst_params *ebp)
+static SoftVector *demodGmskBurst(const signalVector &rxBurst,
+                                  int sps, complex channel, float TOA)
 {
  SoftVector *bits;
  signalVector *dec;

-  dec = demodCommon(rxBurst, sps, ebp);
+  dec = demodCommon(rxBurst, sps, channel, TOA);
  if (!dec)
    return NULL;

@@ -1835,27 +1835,6 @@ static SoftVector *demodGmskBurst(const signalVector &rxBurst, int sps,
  return bits;
 }

-static float computeEdgeCI(const signalVector *rot)
-{
-  float err_pwr = 0.0f;
-  float step = 2.0f * M_PI_F / 8.0f;
-
-  for (size_t i = 8; i < rot->size() - 8; i++) {
-    /* Compute the ideal symbol */
-    complex sym = (*rot)[i];
-    float phase = step * roundf(sym.arg() / step);
-    complex ideal = complex(cos(phase), sin(phase));
-
-    /* Compute the error vector */
-    complex err = ideal - sym;
-
-    /* Accumulate power */
-    err_pwr += err.norm2();
-  }
-
-  return 3.0103f * log2f(1.0f * (rot->size() - 16) / err_pwr);
-}
-
 /*
 * Demodulate an 8-PSK burst. Prior to symbol rotation, operate at
 * 4 SPS (if activated) to minimize distortion through the fractional
@@ -1866,20 +1845,19 @@ static float computeEdgeCI(const signalVector *rot)
 * through the fractional delay filters at 1 SPS renders signal
 * nearly unrecoverable.
 */
-static SoftVector *demodEdgeBurst(const signalVector &burst, int sps,
-                                  struct estim_burst_params *ebp)
+static SoftVector *demodEdgeBurst(const signalVector &burst,
+                                  int sps, complex chan, float toa)
 {
  SoftVector *bits;
  signalVector *dec, *rot, *eq;

-  dec = demodCommon(burst, sps, ebp);
+  dec = demodCommon(burst, sps, chan, toa);
  if (!dec)
    return NULL;

  /* Equalize and derotate */
  eq = convolve(dec, GSMPulse4->c0_inv, NULL, NO_DELAY);
  rot = derotateEdgeBurst(*eq, 1);
-  ebp->ci = computeEdgeCI(rot);

  /* Soft slice and normalize */
  bits = softSliceEdgeBurst(*rot);
@@ -1891,13 +1869,13 @@ static SoftVector *demodEdgeBurst(const signalVector &burst, int sps,
  return bits;
 }

-SoftVector *demodAnyBurst(const signalVector &burst, CorrType type,
-                          int sps, struct estim_burst_params *ebp)
+SoftVector *demodAnyBurst(const signalVector &burst, int sps, complex amp,
+                          float toa, CorrType type)
 {
  if (type == EDGE)
-    return demodEdgeBurst(burst, sps, ebp);
+    return demodEdgeBurst(burst, sps, amp, toa);
  else
-    return demodGmskBurst(burst, sps, ebp);
+    return demodGmskBurst(burst, sps, amp, toa);
 }

 bool sigProcLibSetup()
--- a/Transceiver52M/sigProcLib.h
+++ b/Transceiver52M/sigProcLib.h
@@ -134,7 +134,7 @@ int detectAnyBurst(const signalVector &burst,
                   struct estim_burst_params *ebp);

 /** Demodulate burst basde on type and output soft bits */
-SoftVector *demodAnyBurst(const signalVector &burst, CorrType type,
-                          int sps, struct estim_burst_params *ebp);
+SoftVector *demodAnyBurst(const signalVector &burst, int sps,
+                          complex amp, float toa, CorrType type);

 #endif /* SIGPROCLIB_H */
--- a/configure.ac
+++ b/configure.ac
@@ -34,8 +34,6 @@ AC_CANONICAL_TARGET

 AM_INIT_AUTOMAKE([foreign subdir-objects])

-CFLAGS="$CFLAGS -std=gnu11"
-
 dnl Linux kernel KBuild style compile messages
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

@@ -82,10 +80,18 @@ AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_C_BIGENDIAN

-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0)
-PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0)
-PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0)
-PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.5.0)
+# Check if gettid is available (despite not being documented in glibc doc, it requires __USE_GNU on some systems)
+# C compiler is used since __USE_GNU seems to be always defined for g++.
+save_CPPFLAGS=$CPPFLAGS
+AC_LANG_PUSH(C)
+CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+AC_CHECK_FUNCS([gettid])
+AC_LANG_POP(C)
+CPPFLAGS=$save_CPPFLAGS
+
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0)
+PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0)
+PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.3.0)

 AC_ARG_ENABLE(sanitize,
 	[AS_HELP_STRING(
@@ -133,11 +139,6 @@ AC_ARG_WITH(lms, [
        [enable LimeSuite based transceiver])
 ])

-AC_ARG_WITH(ipc, [
-    AS_HELP_STRING([--with-ipc],
-        [enable IPC])
-])
-
 AC_ARG_WITH(singledb, [
    AS_HELP_STRING([--with-singledb],
        [enable single daughterboard use on USRP1])
@@ -177,7 +178,7 @@ AS_IF([test "x$with_lms" = "xyes"], [
    PKG_CHECK_MODULES(LMS, LimeSuite)
 ])

-AS_IF([test "x$with_uhd" = "xyes"],[
+AS_IF([test "x$with_uhd" != "xno"],[
    PKG_CHECK_MODULES(UHD, uhd >= 003.011,
        [AC_DEFINE(USE_UHD_3_11, 1, UHD version 3.11.0 or higher)],
        [PKG_CHECK_MODULES(UHD, uhd >= 003.009,
@@ -236,10 +237,9 @@ AS_IF([test "x$osmo_cv_cc_has___sync_fetch_and_and" = "xyes" && test "x$osmo_cv_
    AC_DEFINE(HAVE_ATOMIC_OPS, 1, [Support all required atomic operations], [AC_MSG_WARN("At least one aotmic operation missing, will use mutex")])
 ])

-AM_CONDITIONAL(DEVICE_UHD, [test "x$with_uhd" = "xyes"])
+AM_CONDITIONAL(DEVICE_UHD, [test "x$with_uhd" != "xno"])
 AM_CONDITIONAL(DEVICE_USRP1, [test "x$with_usrp1" = "xyes"])
 AM_CONDITIONAL(DEVICE_LMS, [test "x$with_lms" = "xyes"])
-AM_CONDITIONAL(DEVICE_IPC, [test "x$with_ipc" = "xyes"])
 AM_CONDITIONAL(ARCH_ARM, [test "x$with_neon" = "xyes" || test "x$with_neon_vfpv4" = "xyes"])
 AM_CONDITIONAL(ARCH_ARM_A15, [test "x$with_neon_vfpv4" = "xyes"])

@@ -328,7 +328,6 @@ AC_CONFIG_FILES([\
    tests/Makefile \
    tests/CommonLibs/Makefile \
    tests/Transceiver52M/Makefile \
-    utils/Makefile \
    doc/Makefile \
    doc/examples/Makefile \
    contrib/Makefile \
@@ -336,5 +335,4 @@ AC_CONFIG_FILES([\
 ])

 AC_OUTPUT(
-	doc/manuals/Makefile
-	contrib/osmo-trx.spec)
+	doc/manuals/Makefile)
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -85,10 +85,11 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
 export LD_LIBRARY_PATH="$inst/lib"
 export PATH="$inst/bin:$PATH"

-CONFIG="--enable-sanitize --enable-werror --with-uhd --with-usrp1 --with-lms --with-ipc $INSTR"
+CONFIG="--enable-sanitize --enable-werror --with-uhd --with-usrp1 --with-lms $INSTR"

 # Additional configure options and depends
 if [ "$WITH_MANUALS" = "1" ]; then
+	osmo-build-dep.sh osmo-gsm-manuals
 	CONFIG="$CONFIG --enable-manuals"
 fi

@@ -106,18 +107,12 @@ autoreconf --install --force
 $MAKE $PARALLEL_MAKE
 $MAKE check \
  || cat-testlogs.sh
-DISTCHECK_CONFIGURE_FLAGS="$CONFIG" $MAKE $PARALLEL_MAKE distcheck \
+DISTCHECK_CONFIGURE_FLAGS="$CONFIG" $MAKE distcheck \
  || cat-testlogs.sh

 if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
 	make -C "$base/doc/manuals" publish
 fi

-$MAKE $PARALLEL_MAKE maintainer-clean
-
-# Verify distro-specific package patches apply:
-for patch in debian/patches/*.patch; do
-        patch --dry-run -p1 < "$patch"
-done
-
+$MAKE maintainer-clean
 osmo-clean-workspace.sh
--- a/contrib/osmo-trx.spec.in
+++ b/contrib/osmo-trx.spec.in
@@ -1,254 +0,0 @@
-#
-# spec file for package osmo-trx
-#
-# Copyright (c) 2017, Martin Hauke <mardnh@gmx.de>
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-Name:           osmo-trx
-Version:        @VERSION@
-Release:        0
-Summary:        SDR transceiver that implements Layer 1 of a GSM BTS
-License:        AGPL-3.0-or-later
-Group:          Productivity/Telephony/Servers
-URL:            https://osmocom.org/projects/osmotrx
-Source:         %{name}-%{version}.tar.xz
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  fdupes
-BuildRequires:  gcc-c++
-BuildRequires:  libtool
-BuildRequires:  pkgconfig >= 0.20
-%if 0%{?suse_version}
-BuildRequires:  systemd-rpm-macros
-%endif
-%if ! 0%{?centos_ver}
-BuildRequires:  pkgconfig(LimeSuite)
-BuildRequires:  pkgconfig(usrp) >= 3.3
-%endif
-BuildRequires:  pkgconfig(fftw3f)
-BuildRequires:  pkgconfig(libosmocoding) >= 1.5.0
-BuildRequires:  pkgconfig(libosmocore) >= 1.5.0
-BuildRequires:  pkgconfig(libosmoctrl) >= 1.5.0
-BuildRequires:  pkgconfig(libosmovty) >= 1.5.0
-BuildRequires:  pkgconfig(libusb-1.0)
-BuildRequires:  pkgconfig(uhd)
-%{?systemd_requires}
-%if 0%{?suse_version} > 1325
-BuildRequires:  libboost_program_options-devel
-BuildRequires:  libboost_system-devel
-BuildRequires:  libboost_test-devel
-BuildRequires:  libboost_thread-devel
-%else
-BuildRequires:  boost-devel
-%endif
-
-%description
-OsmoTRX is a software-defined radio transceiver that implements the Layer 1
-physical layer of a BTS comprising the following 3GPP specifications:
-
-TS 05.01 "Physical layer on the radio path"
-TS 05.02 "Multiplexing and Multiple Access on the Radio Path"
-TS 05.04 "Modulation"
-TS 05.10 "Radio subsystem synchronization"
-
-In this context, BTS is "Base transceiver station". It's the stations that
-connect mobile phones to the mobile network.
-
-3GPP is the "3rd Generation Partnership Project" which is the collaboration
-between different telecommunication associations for developing new
-generations of mobile phone networks. (post-2G/GSM)
-
-%package uhd
-Summary:        SDR transceiver that implements Layer 1 of a GSM BTS (UHD)
-Group:          Productivity/Telephony/Servers
-Requires:       uhd-firmware
-
-%description uhd
-OsmoTRX is a software-defined radio transceiver that implements the Layer 1
-physical layer of a BTS comprising the following 3GPP specifications:
-
-TS 05.01 "Physical layer on the radio path"
-TS 05.02 "Multiplexing and Multiple Access on the Radio Path"
-TS 05.04 "Modulation"
-TS 05.10 "Radio subsystem synchronization"
-
-In this context, BTS is "Base transceiver station". It's the stations that
-connect mobile phones to the mobile network.
-
-3GPP is the "3rd Generation Partnership Project" which is the collaboration
-between different telecommunication associations for developing new
-generations of mobile phone networks. (post-2G/GSM)
-
-%if ! 0%{?centos_ver}
-%package usrp1
-Summary:        SDR transceiver that implements Layer 1 of a GSM BTS (USRP1)
-Group:          Productivity/Telephony/Servers
-
-%description usrp1
-OsmoTRX is a software-defined radio transceiver that implements the Layer 1
-physical layer of a BTS comprising the following 3GPP specifications:
-
-TS 05.01 "Physical layer on the radio path"
-TS 05.02 "Multiplexing and Multiple Access on the Radio Path"
-TS 05.04 "Modulation"
-TS 05.10 "Radio subsystem synchronization"
-
-In this context, BTS is "Base transceiver station". It's the stations that
-connect mobile phones to the mobile network.
-
-3GPP is the "3rd Generation Partnership Project" which is the collaboration
-between different telecommunication associations for developing new
-generations of mobile phone networks. (post-2G/GSM)
-
-%package lms
-Summary:        SDR transceiver that implements Layer 1 of a GSM BTS (LimeSuite)
-Group:          Productivity/Telephony/Servers
-
-%description lms
-OsmoTRX is a software-defined radio transceiver that implements the Layer 1
-physical layer of a BTS comprising the following 3GPP specifications:
-
-TS 05.01 "Physical layer on the radio path"
-TS 05.02 "Multiplexing and Multiple Access on the Radio Path"
-TS 05.04 "Modulation"
-TS 05.10 "Radio subsystem synchronization"
-
-In this context, BTS is "Base transceiver station". It's the stations that
-connect mobile phones to the mobile network.
-
-3GPP is the "3rd Generation Partnership Project" which is the collaboration
-between different telecommunication associations for developing new
-generations of mobile phone networks. (post-2G/GSM)
-%endif
-
-%package ipc
-Summary:        SDR transceiver that implements Layer 1 of a GSM BTS (IPC)
-Group:          Productivity/Telephony/Servers
-
-%description ipc
-OsmoTRX is a software-defined radio transceiver that implements the Layer 1
-physical layer of a BTS comprising the following 3GPP specifications:
-
-TS 05.01 "Physical layer on the radio path"
-TS 05.02 "Multiplexing and Multiple Access on the Radio Path"
-TS 05.04 "Modulation"
-TS 05.10 "Radio subsystem synchronization"
-
-In this context, BTS is "Base transceiver station". It's the stations that
-connect mobile phones to the mobile network.
-
-3GPP is the "3rd Generation Partnership Project" which is the collaboration
-between different telecommunication associations for developing new
-generations of mobile phone networks. (post-2G/GSM)
-
-%package ipc-test
-Summary:        SDR transceiver that implements Layer 1 of a GSM BTS (IPC) driver test utility
-Group:          Productivity/Telephony/Servers
-
-%description ipc-test
-OsmoTRX is a software-defined radio transceiver that implements the Layer 1
-physical layer of a BTS comprising the following 3GPP specifications:
-
-This package include the test tools for osmo-trx-ipc
-
-%prep
-%setup -q
-
-%build
-echo "%{version}" >.tarball-version
-autoreconf -fi
-
-%if 0%{?centos_ver}
-%configure \
-  --docdir=%{_docdir}/%{name} \
-  --with-systemdsystemunitdir=%{_unitdir} \
-  --without-lms \
-  --with-uhd \
-  --without-usrp1 \
-  --with-ipc
-%else
-%configure \
-  --docdir=%{_docdir}/%{name} \
-  --with-systemdsystemunitdir=%{_unitdir} \
-  --with-lms \
-  --with-uhd \
-  --with-usrp1 \
-  --with-ipc
-%endif
-
-make %{?_smp_mflags} V=1
-
-%check
-make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
-
-%install
-%make_install
-%fdupes -s %{buildroot}/%{_datadir}
-
-%if 0%{?suse_version}
-%pre    lms %service_add_pre    osmo-trx-lms.service
-%post   lms %service_add_post   osmo-trx-lms.service
-%preun  lms %service_del_preun  osmo-trx-lms.service
-%postun lms %service_del_postun osmo-trx-lms.service
-%pre    uhd %service_add_pre    osmo-trx-uhd.service
-%post   uhd %service_add_post   osmo-trx-uhd.service
-%preun  uhd %service_del_preun  osmo-trx-uhd.service
-%postun uhd %service_del_postun osmo-trx-uhd.service
-%pre    usrp1 %service_add_pre    osmo-trx-usrp1.service
-%post   usrp1 %service_add_post   osmo-trx-usrp1.service
-%preun  usrp1 %service_del_preun  osmo-trx-usrp1.service
-%postun usrp1 %service_del_postun osmo-trx-usrp1.service
-%pre    ipc %service_add_pre    osmo-trx-ipc.service
-%post   ipc %service_add_post   osmo-trx-ipc.service
-%preun  ipc %service_del_preun  osmo-trx-ipc.service
-%postun ipc %service_del_postun osmo-trx-ipc.service
-%endif
-
-%files
-%license COPYING
-%doc README.md
-%doc %{_docdir}/%{name}/examples
-
-%if ! 0%{?centos_ver}
-%files lms
-%{_bindir}/osmo-trx-lms
-%dir %{_sysconfdir}/osmocom
-%config(noreplace) %{_sysconfdir}/osmocom/osmo-trx-lms.cfg
-%{_unitdir}/osmo-trx-lms.service
-%endif
-
-%files uhd
-%{_bindir}/osmo-trx-uhd
-%dir %{_sysconfdir}/osmocom
-%config(noreplace) %{_sysconfdir}/osmocom/osmo-trx-uhd.cfg
-%{_unitdir}/osmo-trx-uhd.service
-
-%if ! 0%{?centos_ver}
-%files usrp1
-%{_bindir}/osmo-trx-usrp1
-%dir %{_datadir}/usrp
-%dir %{_datadir}/usrp/rev2
-%dir %{_datadir}/usrp/rev4
-%{_datadir}/usrp/rev2/std_inband.rbf
-%{_datadir}/usrp/rev4/std_inband.rbf
-%{_unitdir}/osmo-trx-usrp1.service
-%endif
-
-%files ipc
-%{_bindir}/osmo-trx-ipc
-%dir %{_sysconfdir}/osmocom
-%config(noreplace) %{_sysconfdir}/osmocom/osmo-trx-ipc.cfg
-%{_unitdir}/osmo-trx-ipc.service
-
-%files ipc-test
-%{_bindir}/ipc-driver-test
-
-%changelog
--- a/contrib/systemd/Makefile.am
+++ b/contrib/systemd/Makefile.am
@@ -1,8 +1,7 @@
 EXTRA_DIST = \
  osmo-trx-lms.service \
  osmo-trx-uhd.service \
-  osmo-trx-usrp1.service \
-  osmo-trx-ipc.service
+  osmo-trx-usrp1.service

 if HAVE_SYSTEMD
 SYSTEMD_SERVICES =
@@ -19,9 +18,5 @@ if DEVICE_LMS
 SYSTEMD_SERVICES += osmo-trx-lms.service
 endif

-if DEVICE_IPC
-SYSTEMD_SERVICES += osmo-trx-ipc.service
-endif
-
 systemdsystemunit_DATA = $(SYSTEMD_SERVICES)
 endif # HAVE_SYSTEMD
--- a/contrib/systemd/osmo-trx-ipc.service
+++ b/contrib/systemd/osmo-trx-ipc.service
@@ -1,11 +0,0 @@
-[Unit]
-Description=Osmocom SDR BTS L1 Transceiver (IPC Backend)
-
-[Service]
-Type=simple
-Restart=always
-ExecStart=/usr/bin/osmo-trx-ipc -C /etc/osmocom/osmo-trx-ipc.cfg
-RestartSec=2
-
-[Install]
-WantedBy=multi-user.target
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,163 +1,3 @@
-osmo-trx (1.3.1) unstable; urgency=medium
-
-  * mark uhddev_ipc.cpp as BUILT_SOURCES
-
- -- Harald Welte <laforge@osmocom.org>  Sun, 28 Feb 2021 11:32:11 +0100
-
-osmo-trx (1.3.0) unstable; urgency=medium
-
-  [ Pau Espin Pedrol ]
-  * Make logging category DLMS generic and reusable for other backends
-  * uhd: Use DEVDRV log category and support UHD >=3.11 logging framework
-  * uhd: Improve some logging lines printing UHD pretty-print output
-  * doc: clarify number of channels on B210 with multi-arfcn enabled
-  * radioInterfaceMulti: Fail to tune on freq not following multi-arfcn restrictions
-  * doc: Update vty reference xml file
-  * lms: Move initialization of field started to constructor
-  * lms: Drop unused define
-  * smpl_buf: Fix str_code() param and print unknown error val
-  * lms: Improve smpl_buf error logging
-  * lms: Change radioDevice constructor arg name to avoid masking instance attr
-  * lms: Make reference to std::vector unambiguous
-  * lms: Move rx_buffers allocation to constructor
-  * lms: Store device type specific parameters in one place
-  * lms: Make ts_offset and smpl rate coefs device-specific
-  * lms: Initial multi-arfcn support
-  * contrib/jenkins.sh: Reorder sanity checks
-  * debug.h: Avoid printing pthread_t type
-  * debug.h: Fix print format of chan in CLOGCHAN
-  * cosmetic: fix several typos found by codespell
-  * radioDevice: Drop unused RSSI param from readSamples API
-  * radioDevice: Drop unused isControl param from WriteSamples API
-  * Use OSMO_FD_READ instead of deprecated BSC_FD_READ
-  * Transceiver: Fix extra space in RSP NOISELEV error
-  * Transceiver: Implement TRXC cmd NOMTXPOWER
-  * UHDDevice: Implement getNominalTxPower() based on TxFrequency
-  * radioInterface: Operate on real Tx power attenuation rather than on device specific gains
-  * UHDDevice: Compute TxGain on UHD API based on expected Tx output power
-  * proto_trxd: Fix UndefinedBehaviorSanitizer from ubsan
-  * Transceiver: Allow sending negative nominal tx power in RSP NOMTXPOWER
-  * LMSDevice: Compute TxGain on LimeSuite API based on expected Tx output power
-  * Drop old TxGain APIs from parent radioDevice abstract class
-  * {UHD,LMS}Dervice: Log expected resulting TxPower when setting device specific TxGain
-  * cosmetic: trx_rate_ctr: Fix whitespace
-  * trx_rate_ctr: Fix immediate rescheduling on per-sec thresholds
-  * Rename device specific rate counter multi-thread helpers
-  * Introduce rate counter tx_stale_bursts
-  * TransceiverState: Initialize ctrs field in constructor
-  * doc/manuals: Update thread documentation after dropping CTRL sock threads
-  * trx_rate_ctr: Fix locking wrong mutex
-  * Introduce rate counters to detect issues in received Dl bursts from TRXD
-  * Transceiver: Fix race condition obtaining Dl burst from Upper layer
-  * Add rate counter for missing Txbursts when scheduled towards the radioInterface
-  * Transceiver: Provide initial value for TransceiverState::mFiller in constructor
-  * Transceiver: Use already obtained value from Rx msg structure
-  * Transceiver: Restrict conditions where FN gaps are detected
-  * trx_rate_ctr: Lower some log levels
-  * Introduce CTR log category
-  * Transceiver: Lower some log levels which have an associated counter
-  * Transceiver: Check log level before generating burst str representation
-  * Transceiver: Add several rate_ctr for rx error conditions
-  * Use new libosmovty cpu sched config features
-  * debian: Update debian8 osmo-trx specific patch
-  * jenkins.sh: Verify distro-specific patches apply
-  * ipc: fix var declaration in for loop
-  * Add support for TRXC MUTE command
-  * arch: x86: Fix convolve optimizations breaking signal
-  * contrib/jenkins: Enable parallel make in make distcheck
-  * Transceiver: Pass config struct instead of large list of params
-  * Calculate RSSI offset based on RxGain configuration
-  * main: generate coredump and exit upon SIGABRT received
-  * ipc: Fix wrong reference to BTS in log line
-  * ipc-driver-test: Allow setting dir prefix for UD socket
-  * radioInterfaceMulti: Fix memory leak upon close()
-  * ChannelizerBase: Fix memory leak
-  * Threads.cpp: Use already existing gettid wrapper function
-  * Replace my_gettid with libosmocore osmo_gettid API
-  * tests: Explicitly drop category from log
-  * tests: Replace deprecated API log_set_print_filename
-
-  [ Philipp Maier ]
-  * debug: use LOGL_NOTICE for log category DDEV
-  * doc: do not set the base-port of the trx
-  * doc: apply an rssi-offset of 28 by default.
-  * doc: switch log levels to notice
-  * Transceiver: Log when sending of CLK indications begins
-  * vty: add attributes to VTY commands indicating when they apply
-  * osmo-trx: add commandline option --vty-ref-xml
-
-  [ Eric ]
-  * configure.ac: fix libtool issue  with clang and sanitizer
-  * transceiver: check the right vector
-  * transceiver: get rid of the ctrl threads
-  * add kernel style .clang-format with 120 chars per line limit
-  * devices: reset internal smart sample buffers upon stop
-  * transceiver: optimize code if optimizations are enabled
-  * transceiver: initialize reorder flag so we don't miscount
-
-  [ Harald Welte ]
-  * PRBS tool sending PRBS sequence to TRX
-  * prbs-tool: Add error simulation capabilities
-  * utils: Ensure content of this directory is included in 'make dist'
-  * prbs-tool: Don't require C99
-  * RPM spec file: Require uhd-firmware for osmo-trx-uhd
-  * osmo-trx.spec.in: Use %config(noreplace) to retain current config file
-  * Fix build on Debian8
-  * [cosmetic] radioInterfaceMulti: More comments
-  * [cosmetic] radioIntefaceMulti: Fix whitespace / indent
-  * ipc: Use OSMO_FD_* instead of deprecated BSC_FD_*
-  * Use osmo_fd_setup() wherever applicable
-  * Use osmo_fd_*_{disable,enable}
-  * README update
-  * manual: Fix typo OsmTRX -> OsmoTRX
-
-  [ Oliver Smith ]
-  * contrib: import RPM spec
-  * contrib: integrate RPM spec
-  * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in
-  * contrib/jenkins: don't build osmo-gsm-manuals
-  * configure.ac: set -std=gnu11
-
-  [ Vadim Yanitskiy ]
-  * UHDDevice: catch LookupError/IndexError in set{Rx,Tx}Antenna()
-  * debian/control: change maintainer to the Osmocom team / mailing list
-  * proto_trxd: cosmetic: 'if' is not a function, add space
-  * vty: add multi-ARFCN specific warning for chan N > 0
-  * radioDevice: fix set_antennas(): consider MULTI_ARFCN mode
-  * device/lms: fix: 'trx_vty.h' header requires C linkage
-  * device/lms: fix missing semicolon in LMSDevice::assign_band_desc()
-  * device/lms: get rid of 'using namespace std'
-  * device/common/Makefile.am: remove $(LMS_CFLAGS) from AM_CXXFLAGS
-  * main: add --vty-ref-mode, use vty_dump_xml_ref_mode()
-  * device: drop unreasonable LIBOSMO{CTRL,VTY}_{CFLAGS,LIBS}
-  * Transceiver: use size_t and ARRAY_SIZE() in constructor
-  * Transceiver: explicitly init m{Rx,Tx}LowerLoopThread
-  * vty: fix documentation for 'swap-channels (disable|enable)'
-  * vty: fix documentation for 'egprs (disable|enable)'
-  * vty: fix documentation for 'rx-sps (1|4)' and 'tx-sps (1|4)'
-  * vty: cosmetic: use VTY_IPV4_CMD in 'bind-ip' / 'remote-ip'
-  * vty: fix documentation for 'multi-arfcn (disable|enable)'
-  * vty: remove groundless statement about filler type 'dummy'
-  * vty: auto-generate cmd and doc strings for cfg_filler_type_cmd
-  * vty: fix documentation for 'ext-rach (disable|enable)'
-  * main: use logging API to print SIMD info instead of printf()
-  * doc/manuals: generate XML VTY reference at build-time
-  * vty: fix swapped documentation for 'filler type' command
-  * Transceiver: fix integer division in addRadioVector()
-  * Transceiver: use proper factor for amplitude scaling
-  * Add a (hidden) VTY parameter for Rx/Tx freq. shifting
-
-  [ Eric Wild ]
-  * osmo-trx-ipc
-
-  [ Alexander Couzens ]
-  * osmo-trx.spec: move ipc-driver-test into package ipc-test
-
-  [ Sylvain Munaut ]
-  * sigProcLib: fix C/I computation for 8-PSK modulated bursts
-
- -- Pau Espin Pedrol <pespin@espeweb.net>  Tue, 23 Feb 2021 14:27:15 +0100
-
 osmo-trx (1.2.0) unstable; urgency=medium

  [ Pau Espin Pedrol ]
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: osmo-trx
 Section: net
 Priority: optional
-Maintainer: Osmocom team <openbsc@lists.osmocom.org>
+Maintainer: Ivan Klyuchnikov <ivan.kluchnikov@fairwaves.ru>
 Build-Depends: debhelper (>= 9),
               autotools-dev,
               autoconf-archive,
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9),
               libtalloc-dev,
               libusrp-dev,
               liblimesuite-dev,
-               libosmocore-dev (>= 1.5.0),
+               libosmocore-dev (>= 1.3.0),
               osmo-gsm-manuals-dev
 Standards-Version: 3.9.6
 Vcs-Browser: http://cgit.osmocom.org/osmo-trx
@@ -30,7 +30,7 @@ Package: osmo-trx-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: osmo-trx-uhd (= ${binary:Version}), osmo-trx-usrp1 (= ${binary:Version}), osmo-trx-lms (= ${binary:Version}), osmo-trx-ipc (= ${binary:Version}), ${misc:Depends}
+Depends: osmo-trx-uhd (= ${binary:Version}), osmo-trx-usrp1 (= ${binary:Version}), osmo-trx-lms (= ${binary:Version}), ${misc:Depends}
 Description: Debug symbols for the osmo-trx-*
 Make debugging possible

@@ -91,25 +91,6 @@ Description: SDR transceiver that implements Layer 1 of a GSM BTS (LimeSuite)
 between different telecommunication associations for developing new
 generations of mobile phone networks. (post-2G/GSM)

-Package: osmo-trx-ipc
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: SDR transceiver that implements Layer 1 of a GSM BTS (generic IPC)
- OsmoTRX is a software-defined radio transceiver that implements the Layer 1
- physical layer of a BTS comprising the following 3GPP specifications:
- .
- TS 05.01 "Physical layer on the radio path"
- TS 05.02 "Multiplexing and Multiple Access on the Radio Path"
- TS 05.04 "Modulation"
- TS 05.10 "Radio subsystem synchronization"
- .
- In this context, BTS is "Base transceiver station". It's the stations that
- connect mobile phones to the mobile network.
- .
- 3GPP is the "3rd Generation Partnership Project" which is the collaboration
- between different telecommunication associations for developing new
- generations of mobile phone networks. (post-2G/GSM)
-
 Package: osmo-trx-doc
 Architecture: all
 Section: doc
--- a/debian/osmo-trx-ipc.install
+++ b/debian/osmo-trx-ipc.install
@@ -1,4 +0,0 @@
-etc/osmocom/osmo-trx-ipc.cfg
-lib/systemd/system/osmo-trx-ipc.service
-/usr/bin/osmo-trx-ipc
-/usr/share/doc/osmo-trx/examples/osmo-trx-ipc/osmo-trx-ipc.cfg /usr/share/doc/osmo-trx/examples/osmo-trx-ipc/
--- a/debian/patches/build-for-debian8.patch
+++ b/debian/patches/build-for-debian8.patch
@@ -1,5 +1,5 @@
 diff --git a/debian/control b/debian/control
-index 12d9af5..27b9d60 100644
+index 8ff59f0..126c16a 100644
 --- a/debian/control
 +++ b/debian/control
@@ -13,7 +13,6 @@ Build-Depends: debhelper (>= 9),
@@ -7,15 +7,15 @@ index 12d9af5..27b9d60 100644
                libtalloc-dev,
                libusrp-dev,
 -               liblimesuite-dev,
-                libosmocore-dev (>= 1.5.0),
+                libosmocore-dev (>= 1.3.0),
                osmo-gsm-manuals-dev
 Standards-Version: 3.9.6
@@ -30,7 +29,7 @@ Package: osmo-trx-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: osmo-trx-uhd (= ${binary:Version}), osmo-trx-usrp1 (= ${binary:Version}), osmo-trx-lms (= ${binary:Version}), osmo-trx-ipc (= ${binary:Version}), ${misc:Depends}
-+Depends: osmo-trx-uhd (= ${binary:Version}), osmo-trx-usrp1 (= ${binary:Version}), osmo-trx-ipc (= ${binary:Version}), ${misc:Depends}
+-Depends: osmo-trx-uhd (= ${binary:Version}), osmo-trx-usrp1 (= ${binary:Version}), osmo-trx-lms (= ${binary:Version}), ${misc:Depends}
+Depends: osmo-trx-uhd (= ${binary:Version}), osmo-trx-usrp1 (= ${binary:Version}), ${misc:Depends}
 Description: Debug symbols for the osmo-trx-*
  Make debugging possible
 
@@ -42,19 +42,19 @@ index 12d9af5..27b9d60 100644
 - between different telecommunication associations for developing new
 - generations of mobile phone networks. (post-2G/GSM)
 -
- Package: osmo-trx-ipc
- Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
+ Package: osmo-trx-doc
+ Architecture: all
+ Section: doc
 diff --git a/debian/rules b/debian/rules
-index 5795643..5937c17 100755
+index 627c0c8..d9285e2 100755
 --- a/debian/rules
 +++ b/debian/rules
@@ -9,7 +9,7 @@ override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
 
 override_dh_auto_configure:
-	dh_auto_configure -- --with-uhd --with-usrp1 --with-lms --with-ipc --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals
-+	dh_auto_configure -- --with-uhd --with-usrp1 --with-ipc --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals
+-	dh_auto_configure -- --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals
+	dh_auto_configure -- --with-uhd --with-usrp1 --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals
 
 override_dh_strip:
 	dh_strip --dbg-package=osmo-trx-dbg
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info

 override_dh_auto_configure:
-	dh_auto_configure -- --with-uhd --with-usrp1 --with-lms --with-ipc --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals
+	dh_auto_configure -- --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals

 override_dh_strip:
 	dh_strip --dbg-package=osmo-trx-dbg
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -14,10 +14,6 @@ if DEVICE_LMS
 OSMOCONF_FILES += osmo-trx-lms/osmo-trx-lms.cfg
 endif

-if DEVICE_IPC
-OSMOCONF_FILES += osmo-trx-ipc/osmo-trx-ipc.cfg
-endif
-
 osmoconf_DATA = $(OSMOCONF_FILES)
 EXTRA_DIST = $(OSMOCONF_FILES)

--- a/doc/examples/osmo-trx-ipc/osmo-trx-ipc.cfg
+++ b/doc/examples/osmo-trx-ipc/osmo-trx-ipc.cfg
@@ -1,32 +0,0 @@
-log stderr
- logging filter all 1
- logging color 1
- logging print category 1
- logging timestamp 1
- logging print file basename
- logging level set-all notice
-!
-line vty
- no login
-!
-cpu-sched
- policy rr 18
-trx
- bind-ip 127.0.0.1
- remote-ip 127.0.0.1
- ! 28 dB offset below is valid only for the B2xx in 1800 MHz band, see
- ! https://osmocom.org/issues/4468 for more details
- rssi-offset 28.000000
- tx-sps 4
- rx-sps 4
- clock-ref external
- egprs disable
- ext-rach disable
- dev-args ipc_msock=/tmp/ipc_sock0
- multi-arfcn disable
- chan 0
-  tx-path TX/RX
-  rx-path RX2
- chan 1
-  tx-path TX/RX
-  rx-path RX2
--- a/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg
+++ b/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg
@@ -4,19 +4,18 @@ log stderr
 logging print category 1
 logging timestamp 1
 logging print file basename
- logging level set-all notice
+ logging level set-all info
 !
 line vty
 no login
 !
-cpu-sched
- policy rr 18
 trx
 bind-ip 127.0.0.1
 remote-ip 127.0.0.1
 egprs disable
 tx-sps 4
 rx-sps 4
+ rt-prio 18
 chan 0
  tx-path BAND1
  rx-path LNAW
--- a/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg
+++ b/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg
@@ -4,19 +4,18 @@ log stderr
 logging print category 1
 logging timestamp 1
 logging print file basename
- logging level set-all notice
+ logging level set-all info
 !
 line vty
 no login
 !
-cpu-sched
- policy rr 18
 trx
 bind-ip 127.0.0.1
 remote-ip 127.0.0.1
 egprs disable
 tx-sps 4
 rx-sps 4
+ rt-prio 18
 chan 0
  tx-path BAND1
  rx-path LNAW
--- a/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg
+++ b/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg
@@ -4,13 +4,11 @@ log stderr
 logging print category 1
 logging timestamp 1
 logging print file basename
- logging level set-all notice
+ logging level set-all info
 !
 line vty
 no login
 !
-cpu-sched
- policy rr 18
 trx
 bind-ip 127.0.0.1
 remote-ip 127.0.0.1
@@ -19,5 +17,6 @@ trx
 tx-sps 4
 rx-sps 4
 rssi-offset 38
+ rt-prio 18
 chan 0
 chan 1
--- a/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg
+++ b/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg
@@ -4,18 +4,21 @@ log stderr
 logging print category 1
 logging timestamp 1
 logging print file basename
- logging level set-all notice
+ logging level set-all info
 !
 line vty
 no login
 !
-cpu-sched
- policy rr 18
 trx
 bind-ip 127.0.0.1
 remote-ip 127.0.0.1
 egprs disable
+ ! 28 dB offset below is valid only for the B2xx in 1800 MHz band, see
+ ! https://osmocom.org/issues/4468 for more details
+ rssi-offset 28.000000
 tx-sps 4
 rx-sps 4
 clock-ref external
+ rt-prio 18
 chan 0
+
--- a/doc/manuals/Makefile.am
+++ b/doc/manuals/Makefile.am
@@ -1,5 +1,6 @@
 EXTRA_DIST = osmotrx-usermanual.adoc \
    osmotrx-usermanual-docinfo.xml \
+    osmotrx-vty-reference.xml \
    chapters \
    vty

@@ -8,24 +9,8 @@ if BUILD_MANUALS
  ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc
  include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc

-  VARIANTS = $(NULL)
-
-if DEVICE_UHD
-  VARIANTS += uhd
-endif
-if DEVICE_USRP1
-  VARIANTS += usrp1
-endif
-if DEVICE_LMS
-  VARIANTS += lms
-endif
-if DEVICE_IPC
-  VARIANTS += ipc
-endif
-
-  # This is a significantly modified, multi-target adopted copy of
-  # $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc
-  include $(srcdir)/vty/Makefile.vty-reference.inc
+  VTY_REFERENCE = osmotrx-vty-reference.xml
+  include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc

  OSMO_REPOSITORY = osmo-trx
  include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc
--- a/doc/manuals/chapters/code-architecture.adoc
+++ b/doc/manuals/chapters/code-architecture.adoc
@@ -39,7 +39,8 @@ trans [label="Transceiver"];
 radioiface [label="RadioInterface"];
 radiodev [label="RadioDevice"];

-trans:nw->trans:ne [label="Main"];
+trans:nw->trans:ne [label="Trx.ControlServiceLoop_0"];
+trans:nw->trans:ne [label="Trx.ControlServiceLoop_1"];
 trans:w->radioiface:w [label="Trx.TxPriorityQueueServiceLoop_0"];
 trans:w->radioiface:w [label="Trx.TxPriorityQueueServiceLoop_1"];
 radioiface:e->trans:e [label="Trx.RxServiceLoop_0"];
@@ -91,6 +92,14 @@ Static amount of Threads (1 per `Transceiver` instance):

 Dynamic amount of Threads (1 per RF logical channel on the `Transceiver` instance):

+* `ControlServiceLoop`: Handles commands from the Per-ARFCN Control Interface
+  socket (<<trx_if_control>>). Each thread is responsible for managing one
+  socket related to one ARFCN or which is the same, to one RF logical channel.
+  These are the only threads expected to use the private `start()` and `stop()`
+  methods of the `Transceiver()` class, since those methods don't stop any of
+  the `ControlServiceLoop` threads as they must keep running to handle new
+  commands (for instance, to re-start processing samples with the _POWERON_
+  command).
 * `RxServiceLoop`: Each thread of this type pulls bursts from the
  `RadioInterface` FIFO for one specific logical RF channel and handles it
  according to the slot and burst correlation type, finally sending proper data
@@ -99,10 +108,6 @@ Dynamic amount of Threads (1 per RF logical channel on the `Transceiver` instanc
  Manager UDP socket (<<trx_if>>), and fills the `RadioInterface` with it
  setting clock related information.

-All the Per-ARFCN Control Interface socket (<<trx_if_control>>) commands are
-handled by the event loop runnnig on the main thread. This is the only thread
-expected to use the private `start()` and `stop()` methods.
-
 [[code_component_radioiface]]
 === RadioInterface

--- a/doc/manuals/chapters/configuration.adoc
+++ b/doc/manuals/chapters/configuration.adoc
@@ -1,4 +1,4 @@
-== Configuring OsmoTRX
+== Configuring OsmTRX

 OsmoTRX will read the configuration at startup time and configure the
 transceiver accordingly after validating the configuration.
--- a/doc/manuals/osmotrx-usermanual.adoc
+++ b/doc/manuals/osmotrx-usermanual.adoc
@@ -31,8 +31,6 @@ include::{srcdir}/chapters/trx-backends.adoc[]

 include::{srcdir}/chapters/code-architecture.adoc[]

-include::./common/chapters/vty_cpu_sched.adoc[]
-
 include::./common/chapters/trx_if.adoc[]

 include::./common/chapters/port_numbers.adoc[]
--- a/doc/manuals/vty/osmotrx-vty-reference.xml
+++ b/doc/manuals/vty/osmotrx-vty-reference.xml
@@ -6,7 +6,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
 "http://docbook.org/xml/5.0/dtd/docbook.dtd" [
 <!ENTITY chapter-vty      SYSTEM      "./common/chapters/vty.xml" >
-<!ENTITY sections-vty     SYSTEM      "@@GENERATED@@" >
+<!ENTITY sections-vty     SYSTEM      "generated/docbook_vty.xml"  >
 ]>

 <book>
@@ -18,19 +18,12 @@
            <authorinitials>pe</authorinitials>
            <revremark>Initial</revremark>
        </revision>
-        <revision>
-            <revnumber>v2</revnumber>
-            <date>@@REV_DATE@@</date>
-            <authorinitials>s.f.m.c.</authorinitials>
-            <revremark>Automatic build (@@REV_NUMBER@@)</revremark>
-        </revision>
    </revhistory>

    <title>OsmoTRX VTY Reference</title>
-    <subtitle>@@VARIANT@@</subtitle>

    <copyright>
-      <year>@@CR_YEAR@@</year>
+      <year>2018</year>
    </copyright>

    <legalnotice>
--- a/doc/manuals/vty/Makefile.vty-reference.inc
+++ b/doc/manuals/vty/Makefile.vty-reference.inc
@@ -1,37 +0,0 @@
-DOCBOOKS = $(foreach v,$(VARIANTS),vty/osmotrx-$(v)-vty-reference.xml)
-DOCBOOKS_DEPS = $(DOCBOOKS) $(addsuffix .inc,$(DOCBOOKS))
-INC_DIR = $(abspath $(builddir)/vty)
-
-include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.docbook.inc
-
-CLEAN_FILES += $(DOCBOOKS_DEPS)
-CLEAN_FILES += $(addsuffix .inc.gen,$(DOCBOOKS))
-CLEAN_FILES += $(addsuffix .inc.merged,$(DOCBOOKS))
-
-$(INC_DIR):
-	mkdir -p $@
-
-vty/osmotrx-%-vty-reference.xml: $(top_builddir)/Transceiver52M/osmo-trx-% $(INC_DIR)
-	sed -e "s|@@GENERATED@@|$@.inc|" \
-	    -e "s|@@VARIANT@@|$(notdir $<)|" \
-	    -e "s|@@REV_NUMBER@@|$(VERSION)|" \
-	    -e "s|@@REV_DATE@@|$(shell date +"%dth %B %Y")|" \
-	    -e "s|@@CR_YEAR@@|$(shell date +"%Y")|" \
-		$(srcdir)/vty/osmotrx-vty-reference.xml > $@
-
-vty/osmotrx-%-vty-reference.xml.inc: $(top_builddir)/Transceiver52M/osmo-trx-% \
-				     $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \
-				     $(OSMO_GSM_MANUALS_DIR)/common/chapters/vty.xml \
-				     $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl \
-				     $(srcdir)/vty/*.xml $(INC_DIR)
-	# a) Invoke osmo-trx-% to generate the list of commands first
-	$< --vty-ref-mode default --vty-ref-xml > "$@.gen"
-	# ... filter garbage potentially printed by libraries to stdout
-	sed -i '/^<vtydoc/,$$!d' "$@.gen"
-	# b) Merge the result of a) with global and local additions
-	$(OSMO_GSM_MANUALS_DIR)/build/vty_reference_combine.sh \
-		$(realpath $(OSMO_GSM_MANUALS_DIR)/merge_doc.xsl) "$@.gen" \
-		$(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \
-		$(srcdir)/vty/*additions*.xml > "$@.merged"
-	# c) Convert the result of b) into a valid docbook
-	xsltproc $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl "$@.merged" > $@
--- a/doc/manuals/vty/trx_vty_reference.xml
+++ b/doc/manuals/vty/trx_vty_reference.xml
--- a/tests/CommonLibs/LogTest.cpp
+++ b/tests/CommonLibs/LogTest.cpp
@@ -59,10 +59,8 @@ int main(int argc, char *argv[])
 	osmo_init_logging2(tall_ctx, &linfo);

 	log_set_use_color(osmo_stderr_target, 0);
-	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
+	log_set_print_filename(osmo_stderr_target, 0);
 	log_set_print_level(osmo_stderr_target, 1);
-	log_set_print_category(osmo_stderr_target, 0);
-	log_set_print_category_hex(osmo_stderr_target, 0);

 	Log(MYCAT, LOGL_FATAL, __BASE_FILE__, __LINE__).get() << "testing the logger.";
 	Log(MYCAT, LOGL_ERROR, __BASE_FILE__, __LINE__).get() << "testing the logger.";
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,9 +0,0 @@
-AM_CPPFLAGS = $(LIBOSMOCODING_CFLAGS)
-AM_CFLAGS = -Wall
-
-EXTRA_DIST = clockdump.sh matlab
-
-noinst_PROGRAMS = osmo-prbs-tool
-
-osmo_prbs_tool_SOURCES = prbs-tool.c
-osmo_prbs_tool_LDADD = $(LIBOSMOCODING_LIBS)
--- a/utils/prbs-tool.c
+++ b/utils/prbs-tool.c
@@ -1,386 +0,0 @@
-/* Dummy TRX for sening PRBS test sequences into osmo-bts-trx to test
- * the decoder/receiver processing in osmo-bts-trx as well as any
- * additional PRBS testing code.
- *
- * The purpose of this program is to use it as a mock dummy MS-side
- * transmitter of GSM bursts that contain encoded PRBS sequences,
- * similar to what one would normally do with an arbitrary
- * function/waveform generator or BERT tester in hardware.
- *
- * (C) 2017 by Harald Welte <laforge@gnumonks.org>
- * All Rights Reserved
- *
- * Licensed under terms of the GNU Generral Public License, Version 2,
- * or (at your option) any later version.
- */
-
-#include <stdint.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-
-#include <netinet/in.h>
-
-#include <osmocom/core/bits.h>
-#include <osmocom/core/utils.h>
-#include <osmocom/core/prbs.h>
-#include <osmocom/core/socket.h>
-#include <osmocom/gsm/gsm_utils.h>
-#include <osmocom/coding/gsm0503_coding.h>
-
-/***********************************************************************
- * GSM Constants
- ***********************************************************************/
-
-#define GSM_FR_BYTES	33
-#define GSM_BURST_BITS	116
-#define GSM_4BURST_BITS	(GSM_BURST_BITS*4)
-#define GSM_BURST_LEN	148
-
-
-/***********************************************************************
- * TRX Interface / Protocol
- ***********************************************************************/
-
-#define TRX_BASE_PORT	5700
-/* DATA port on the TRX side */
-#define	TRX_PORT_CTRL_TRX(C) 	(TRX_BASE_PORT+(2*(C))+1)
-#define	TRX_PORT_DATA_TRX(C) 	(TRX_BASE_PORT+(2*(C))+2)
-#define	TRX_PORT_CTRL_BTS(C) 	(TRX_PORT_CTRL_TRX(C)+100)
-#define	TRX_PORT_DATA_BTS(C) 	(TRX_PORT_DATA_TRX(C)+100)
-
-struct trx_ul_msg {
-	uint8_t		ts;
-	uint32_t	fn;
-	uint8_t		rssi;
-	uint16_t	t_offs;
-	uint8_t		bits[148];	/* 0..255, *NOT* sbit_t */
-} __attribute__((packed));
-
-struct trx_dl_msg {
-	uint8_t		ts;
-	uint32_t	fn;
-	uint8_t		att_db;
-	ubit_t		bits[148];
-} __attribute__((packed));
-
-
-/***********************************************************************
- * Helper Functions
- ***********************************************************************/
-
-static int ubits2trxbits(uint8_t *sbits, const ubit_t *ubits, unsigned int count)
-{
-	unsigned int i;
-
-	for (i = 0; i < count; i++) {
-		if ((*ubits++) & 1) {
-			*sbits++ = 255;
-		} else {
-			*sbits++ = 0;
-		}
-	}
-
-	return count;
-}
-
-static int __attribute__((__unused__)) dec(const ubit_t *bursts_u)
-{
-	sbit_t bursts_s[GSM_4BURST_BITS*2];
-	uint8_t dec_tch_data[GSM_FR_BYTES];
-	int n_errors, n_bits_total;
-	int rc;
-
-	/* convert from u_bit (tx) to s_bit (rx)  */
-	osmo_ubit2sbit(bursts_s, bursts_u, sizeof(bursts_s));
-
-	rc = gsm0503_tch_fr_decode(dec_tch_data, bursts_s, 1, 0, &n_errors, &n_bits_total);
-	printf("rc=%d, n_errors=%d, n_bits_total=%d: %s\n", rc, n_errors, n_bits_total,
-		osmo_hexdump(dec_tch_data, sizeof(dec_tch_data)));
-
-	return rc;
-}
-
-/*! \brief Training Sequences (TS 05.02 Chapter 5.2.3) */
-static const ubit_t _sched_tsc[8][26] = {
-	{ 0,0,1,0,0,1,0,1,1,1,0,0,0,0,1,0,0,0,1,0,0,1,0,1,1,1, },
-	{ 0,0,1,0,1,1,0,1,1,1,0,1,1,1,1,0,0,0,1,0,1,1,0,1,1,1, },
-	{ 0,1,0,0,0,0,1,1,1,0,1,1,1,0,1,0,0,1,0,0,0,0,1,1,1,0, },
-	{ 0,1,0,0,0,1,1,1,1,0,1,1,0,1,0,0,0,1,0,0,0,1,1,1,1,0, },
-	{ 0,0,0,1,1,0,1,0,1,1,1,0,0,1,0,0,0,0,0,1,1,0,1,0,1,1, },
-	{ 0,1,0,0,1,1,1,0,1,0,1,1,0,0,0,0,0,1,0,0,1,1,1,0,1,0, },
-	{ 1,0,1,0,0,1,1,1,1,1,0,1,1,0,0,0,1,0,1,0,0,1,1,1,1,1, },
-	{ 1,1,1,0,1,1,1,1,0,0,0,1,0,0,1,0,1,1,1,0,1,1,1,1,0,0, },
-};
-
-/***********************************************************************
- * state + processing functions
- ***********************************************************************/
-
-/* state we have to keep for one physical channel */
-struct pchan_data {
-	/* PRBS state */
-	struct osmo_prbs_state st;
-	/* unpacked PRBS bits, generated from PRBS */
-	ubit_t prbs_u[4+260];
-	/* packed frame (to be sent) */
-	uint8_t tch_data[GSM_FR_BYTES];
-	/* burst bits (ubit) to be transmitted */
-	ubit_t bursts[GSM_4BURST_BITS*2]; /* 116 * 8 */
-	/* burst bits (sbit) 'as if received' */
-	sbit_t bursts_s[GSM_4BURST_BITS*2];
-	/* next to-be transmitted burst number */
-	unsigned int burst_nr;
-	/* training sequence code */
-	unsigned int tsc;
-
-	/* loose 'count' bursts every 'nth_mframe' on TRX-BTS interface */
-	struct {
-		unsigned int count;
-		unsigned int nth_mframe;
-	} sim_lost_bursts;
-
-	/* zero 'count' bursts every 'nth_mframe' on TRX-BTS interface */
-	struct {
-		unsigned int count;
-		unsigned int nth_mframe;
-	} sim_zero_bursts;
-
-	/* flip every 'nth_bit' of the PRNG oudput before encoding */
-	struct {
-		unsigned int nth_bit;
-		unsigned int i;
-	} sim_flip_codec_bits;
-
-	unsigned int i;
-};
-
-struct ts_data {
-	struct pchan_data pchan[2];
-};
-
-struct trx_data {
-	struct ts_data ts[8];
-};
-
-static struct trx_data g_trx_data;
-
-/* initialize the state for one TRX */
-static void trx_data_init(struct trx_data *trx)
-{
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(trx->ts); i++) {
-		struct ts_data *ts = &trx->ts[i];
-		int j;
-		for (j = 0; j < ARRAY_SIZE(ts->pchan); j++) {
-			struct pchan_data *pchan = &ts->pchan[j];
-
-			memset(pchan, 0, sizeof(*pchan));
-			osmo_prbs_state_init(&pchan->st, &osmo_prbs9);
-			pchan->tsc = 7;
-		}
-	}
-}
-
-/* apply any intentional errors to the output of the PRBS sequence */
-static void apply_errors_prbs(struct pchan_data *pchan)
-{
-	int i;
-
-	for (i = 0; i < sizeof(pchan->prbs_u)-4; i++) {
-		pchan->sim_flip_codec_bits.i++;
-		if (pchan->sim_flip_codec_bits.i == pchan->sim_flip_codec_bits.nth_bit) {
-			pchan->sim_flip_codec_bits.i = 0;
-			pchan->prbs_u[4+i] ^= 0x01;
-		}
-	}
-}
-
-/*! obtain the next to-be-transmitted burst for the given pchan
- *  \param pchan physical channel on which we operate
- *  \param[in] fn frame number
- *  \param[out] burst_out caller-provided buffer for 148 unpacked output bits
- *  \retruns number of bits stored in \a burst_out */
-static int pchan_get_next_burst(struct pchan_data *pchan, uint32_t fn, ubit_t *burst_out)
-{
-	uint32_t fn26 = fn % 26;
-	int rc;
-
-	if (fn26 == 0 || fn26 == 4 || fn26 == 8 || fn26 == 13 || fn26 == 17 || fn26 == 21)
-		pchan->burst_nr = 0;
-
-	if (fn26 == 12 || fn26 == 25) {
-		memset(burst_out, 0, GSM_BURST_LEN);
-		return GSM_BURST_LEN;
-	}
-
-	if (pchan->burst_nr == 0) {
-		/* generate PRBS output in ubit format, skipping first nibble for 260-264 padding */
-		const uint8_t prefix[] = { 0xd0 };
-		osmo_pbit2ubit(pchan->prbs_u, prefix, 4);
-		rc = osmo_prbs_get_ubits(pchan->prbs_u+4, sizeof(pchan->prbs_u)-4, &pchan->st);
-		OSMO_ASSERT(rc == sizeof(pchan->prbs_u)-4);
-
-		apply_errors_prbs(pchan);
-
-		/* pack to PBIT format */
-		rc = osmo_ubit2pbit(pchan->tch_data, pchan->prbs_u, sizeof(pchan->prbs_u));
-		//memset(pchan->tch_data, 0xff, sizeof(pchan->tch_data));
-
-		printf("%s\n", osmo_hexdump(pchan->tch_data, GSM_FR_BYTES));
-
-		/* shift buffer by 4 bursts for interleaving */
-		memcpy(pchan->bursts, pchan->bursts + GSM_4BURST_BITS, GSM_4BURST_BITS);
-		memset(pchan->bursts + GSM_4BURST_BITS, 0, GSM_4BURST_BITS);
-
-		/* encode block (codec frame) into four bursts */
-		rc = gsm0503_tch_fr_encode(pchan->bursts, pchan->tch_data, GSM_FR_BYTES, 1);
-		OSMO_ASSERT(rc == 0);
-#if 0
-		int i;
-		for (i = 0; i < sizeof(pchan->bursts); i += GSM_BURST_BITS)
-			printf("\t%s\n", osmo_ubit_dump(pchan->bursts + i, GSM_BURST_BITS));
-
-		dec(pchan->bursts);
-#endif
-	}
-
-	/* for all bursts: format 148 symbols from 116 input bits */
-	ubit_t *burst = pchan->bursts  + pchan->burst_nr * GSM_BURST_BITS;
-//	printf("TX(%u): %s\n", pchan->burst_nr, osmo_ubit_dump(burst, GSM_BURST_BITS));
-	memset(burst_out, 0, 3);		/* guard bits */
-	memcpy(burst_out+3, burst, 58);		/* firrst half */
-	memcpy(burst_out+61, _sched_tsc[pchan->tsc], 26);	/* midamble */
-	memcpy(burst_out+87, burst+58, 58);	/* second half */
-	memset(burst_out+145, 0, 3);		/* guard bits */
-
-	/* increment burst number for next call */
-	pchan->burst_nr += 1;
-
-	return GSM_BURST_LEN;
-}
-
-static int pchan_process_ts_fn(struct pchan_data *pchan, uint32_t fn, uint8_t *burst_t)
-{
-	ubit_t burst_u[GSM_BURST_LEN];
-	int rc;
-
-	rc = pchan_get_next_burst(pchan, fn, burst_u);
-	OSMO_ASSERT(rc == sizeof(burst_u));
-
-	/* convert from u_bit (tx) to s_bit (rx)  */
-	ubits2trxbits(burst_t, burst_u, GSM_BURST_LEN);
-
-	return GSM_BURST_LEN;
-}
-
-/* read TRX DL data from BTS, write TRX UL data to BTS */
-static int read_and_process(int fd)
-{
-	/* receive (downlink) buffer */
-	uint8_t rx_dl_buf[1024];
-	struct trx_dl_msg *dl_msg = (struct trx_dl_msg *) rx_dl_buf;
-	/* transmit (uplink) buffer */
-	uint8_t tx_ul_buf[1024];
-	struct trx_ul_msg *ul_msg = (struct trx_ul_msg *) tx_ul_buf;
-	/* other variables */
-	struct pchan_data *pchan;
-	uint32_t fn;
-	uint8_t rc;
-
-	/* do a blocking read on the socket and receive DL from BTS */
-	rc = read(fd, rx_dl_buf, sizeof(rx_dl_buf));
-	if (rc < sizeof(*dl_msg))
-		return rc;
-
-	fn = ntohl(dl_msg->fn);
-
-	if (dl_msg->ts >= ARRAY_SIZE(g_trx_data.ts))
-		return -ENODEV;
-
-	if (dl_msg->ts != 2)
-		return 0;
-
-	printf("FN=%s TS=%u\n", gsm_fn_as_gsmtime_str(fn), dl_msg->ts);
-
-	/* FIXME: second pchan for TCH/H */
-	pchan = &g_trx_data.ts[dl_msg->ts].pchan[0];
-
-	rc = pchan_process_ts_fn(pchan, fn, (uint8_t *) ul_msg->bits);
-	OSMO_ASSERT(rc == sizeof(ul_msg->bits));
-
-	/* copy over timeslot and frame number */
-	ul_msg->fn = htonl(fn);
-	ul_msg->ts = dl_msg->ts;
-
-	/* simulate lost frames on TRX <-> BTS interface */
-	if (pchan->sim_lost_bursts.count) {
-		/* count number of 26-multiframes */
-		static int count = 0;
-		if (fn % 26 == 0)
-			count++;
-
-		/* every 10th multiframe, drop two entire block of 8 bursts */
-		if (count % pchan->sim_lost_bursts.nth_mframe == 0 &&
-		    (fn % 26) <= pchan->sim_lost_bursts.count) {
-			printf("===> SKIPPING BURST\n");
-			return 0;
-		}
-	}
-
-	/* simulate zero-ed frames on TRX <-> BTS interface */
-	if (pchan->sim_zero_bursts.count) {
-		/* count number of 26-multiframes */
-		static int count = 0;
-		if (fn % 26 == 0)
-			count++;
-
-		/* every 10th multiframe, drop two entire block of 8 bursts */
-		if (count % pchan->sim_zero_bursts.nth_mframe == 0 &&
-		    (fn % 26) <= pchan->sim_zero_bursts.count) {
-			memset(ul_msg->bits, 0, sizeof(ul_msg->bits));
-			printf("===> ZEROING BURST\n");
-		}
-	}
-
-	/* write uplink message towards BTS */
-	rc = write(fd, tx_ul_buf, sizeof(*ul_msg));
-	if (rc < sizeof(*ul_msg))
-		return -EIO;
-
-	return 0;
-}
-
-static int open_trx_data_sock(unsigned int trx_nr, const char *bts_host)
-{
-	int rc;
-
-	rc = osmo_sock_init2(AF_INET, SOCK_DGRAM, IPPROTO_UDP, NULL, TRX_PORT_DATA_TRX(trx_nr),
-				bts_host, TRX_PORT_DATA_BTS(trx_nr),
-				OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_BIND);
-	return rc;
-}
-
-
-int main(int argc, char **argv)
-{
-	int fd;
-
-	trx_data_init(&g_trx_data);
-
-	//g_trx_data.ts[2].pchan[0].sim_zero_bursts.count = 8;
-	//g_trx_data.ts[2].pchan[0].sim_zero_bursts.nth_mframe = 10;
-	g_trx_data.ts[2].pchan[0].sim_flip_codec_bits.nth_bit = 260*4;
-
-	fd = open_trx_data_sock(0, "127.0.0.1");
-	if (fd < 0)
-		exit(1);
-
-	while (1) {
-		read_and_process(fd);
-	}
-
-	return 0;
-}
Author	SHA1	Message	Date
Eric	a670630cfe	ipc: add master socket number/path parameters osmo-trx-ipc needs to know which master socket it should talk to, so pass this path in the config device args like this: dev-args ipc_msock=/path/to/socket Additionally, add a master socket suffix number parameter to the ipc backend, ipc-driver-test -n 0 to start serving /tmp/ipc_sock0 Change-Id: I24857fbb74e5fc808b2a218957c723291de2ba04	2020-05-06 14:00:37 +02:00
Eric	76c8846df9	shm: fix alignment Change-Id: I8b593d792a992973e76dd19f7b678c9caa9c5e16	2020-05-06 10:54:36 +02:00
Eric	904959f860	ipc: gain setting Change-Id: I674d51fdcab2691853681f661b441364ed75207a	2020-04-22 15:05:11 +02:00
Eric	30796c8cbb	ipc: make ipc server uhd output more verbose Change-Id: I9f2c15adff96e71a806ef09f17152c11d7c043aa	2020-04-22 15:19:31 +02:00
Eric	5002af94c1	ipc: print received path delay value Change-Id: Ib072b01451084e055882d2867b558a5f8ede95ea	2020-04-22 15:21:49 +02:00
Eric	ec1f46e88e	ipc: adjust over/underflow reporting Change-Id: Iec2ca94ed8b6cf96d8797540cff43af6542e6437	2020-04-29 18:39:33 +02:00
Eric	57ece5a46f	ipc: remove intermediate class used for debugging Change-Id: I2e8a93389cf2f6fc0b9a591f800c019427cf37e6	2020-04-29 17:26:17 +02:00
Eric	dac7708ff3	ipc: update the licenses Change-Id: If523884e76166c11e88944bb7633ff3b54a3a88b	2020-04-29 17:25:19 +02:00
Eric	90b0b8696d	v1 Change-Id: I057e272623b41421f442206f550bcc8c60f4a747	2020-04-27 05:02:26 +02:00
Eric	2120eb1e0a	scaling val Change-Id: I6ddfd792ea42655e12fae0b195e362c98792b96f	2020-04-20 00:47:03 +02:00
Eric	6d3359e37b	add kernel style .clang-format with 120 chars per line limit Change-Id: I1dc6610d7adfa1a52f3d41ad04544806c2be2c39	2020-04-20 00:19:55 +02:00
Eric	ac85758763	spawn the client as a thread Change-Id: I86cd659e74ebdbf43c4352e83e5adb78f8fe6de5	2020-04-20 00:02:50 +02:00
Eric	a1d2b1f822	silence warnings Change-Id: I01b2dce8e04cdc21872e5bbc3eec7e0a5e3d1b0b	2020-04-19 23:51:57 +02:00
Eric	0f839a1a49	no undefined behavior by adding/substracting values != 0 from null ptr Change-Id: Id2dc21e884991b3cca9f617aece12ac35959c1b2	2020-04-16 00:13:13 +02:00
Eric	ef73893222	shm: fix warnings Change-Id: I0e56539f699c39ab6e3546c96973184552da4d5f	2020-04-16 00:11:16 +02:00
Eric	0bf8882fb6	ipc: fix shm size calculation Total size was previously only as large as sizeof(struct ipc_shm_raw_stream) + sizeof(uint32_t)*num_buffers.... Change-Id: I1205b56a4b11bdf32fbdbfb82b67da36965a7981	2020-04-15 22:43:15 +02:00
Pau Espin Pedrol	87a77440f2	WIP: comments Change-Id: Ia2631a869e23af520b9eade192dfdb032174c689	2020-04-15 22:43:15 +02:00
Pau Espin Pedrol	87d6f3c8e1	WIP: osmo-trx-ipc Change-Id: Ice63d3499026293ade8aad675ff7a883bcdd5756	2020-04-15 22:43:15 +02:00