lms: Fix coding style

In Change-Id Ib2fca81b76d027b08e2891056fa076d071597783 we introduced
some coding style violations.  Let's make newly-added code follows
standard Osmocom coding style.

Change-Id: Ib7ddd275014f03a2eed3cddc02b1356e2b00c0bc

.gitignore

@@ -18,7 +18,6 @@ tests/CommonLibs/URLEncodeTest
 tests/CommonLibs/VectorTest
 tests/CommonLibs/PRBSTest
 tests/Transceiver52M/convolve_test
-tests/Transceiver52M/LMSDeviceTest
 
 # automake/autoconf
 *.in
@@ -52,14 +51,3 @@ tests/testsuite.log
 
 # vim
 *.sw?
-
-# manuals
-doc/manuals/*.html
-doc/manuals/*.svg
-doc/manuals/*.pdf
-doc/manuals/*__*.png
-doc/manuals/*.check
-doc/manuals/generated/
-doc/manuals/osmomsc-usermanual.xml
-doc/manuals/common
-doc/manuals/build

CommonLibs/LinkedLists.cpp

@@ -29,25 +29,6 @@
 #include "LinkedLists.h"
 
 
-PointerFIFO::~PointerFIFO()
-{
-	ListNode *node, *next;
-
-	node = mHead;
-	while (node != NULL) {
-		next = node->next();
-		delete node;
-		node = next;
-	}
-
-	node = mFreeList;
-	while (node != NULL) {
-		next = node->next();
-		delete node;
-		node = next;
-	}
-}
-
 void PointerFIFO::push_front(void* val)	// by pat
 {
 	// Pat added this routine for completeness, but never used or tested.

CommonLibs/LinkedLists.h

@@ -70,7 +70,6 @@ class PointerFIFO {
 		:mHead(NULL),mTail(NULL),mFreeList(NULL),
 		mSize(0)
 	{}
-	~PointerFIFO();
 
 	unsigned size() const { return mSize; }
 	unsigned totalSize() const { return 0; }	// Not used in this version.

CommonLibs/Logger.cpp

@@ -44,8 +44,6 @@ std::ostream& operator<<(std::ostream& os, std::ostringstream& ss)
 
 Log::~Log()
 {
-	int old_state;
-	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_state);
 	int mlen = mStream.str().size();
 	int neednl = (mlen==0 || mStream.str()[mlen-1] != '\n');
 	const char *fmt = neednl ? "%s\n" : "%s";
@@ -53,7 +51,6 @@ Log::~Log()
 	// The COUT() macro prevents messages from stomping each other but adds uninteresting thread numbers,
 	// so just use std::cout.
 	LOGPSRC(mCategory, mPriority, filename, line, fmt, mStream.str().c_str());
-	pthread_setcancelstate(old_state, NULL);
 }
 
 ostringstream& Log::get()

CommonLibs/Logger.h

@@ -56,9 +56,6 @@ extern "C" {
 #define LOGLV(category, level) \
 	Log(category, level, __BASE_FILE__, __LINE__).get() <<  "[tid=" << pthread_self() << "] "
 
-#define LOGCHAN(chan, category, level) \
-	Log(category, LOGL_##level, __BASE_FILE__, __LINE__).get() <<  "[tid=" << pthread_self() << "][chan=" << chan << "] "
-
 /**
 	A C++ stream-based thread-safe logger.
 	This object is NOT the global logger;

CommonLibs/Makefile.am

@@ -34,10 +34,8 @@ libcommon_la_SOURCES = \
 	Threads.cpp \
 	Timeval.cpp \
 	Logger.cpp \
-	Utils.cpp \
 	trx_vty.c \
 	debug.c
-libcommon_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS)
 
 noinst_HEADERS = \
 	BitVector.h \
@@ -49,8 +47,6 @@ noinst_HEADERS = \
 	Timeval.h \
 	Vector.h \
 	Logger.h \
-	Utils.h \
 	trx_vty.h \
 	debug.h \
-	osmo_signal.h \
 	config_defs.h

CommonLibs/Threads.cpp

@@ -24,17 +24,11 @@
 */
 
 
-#include <string.h>
-#include <sys/types.h>
+
+
 
 #include "Threads.h"
 #include "Timeval.h"
-#include "Logger.h"
-
-#ifndef gettid
-#include <sys/syscall.h>
-#define gettid() syscall(SYS_gettid)
-#endif
 
 
 using namespace std;
@@ -108,25 +102,6 @@ void Signal::wait(Mutex& wMutex, unsigned timeout) const
 	pthread_cond_timedwait(&mSignal,&wMutex.mMutex,&waitTime);
 }
 
-void set_selfthread_name(const char *name)
-{
-	pthread_t selfid = pthread_self();
-	pid_t tid = gettid();
-	if (pthread_setname_np(selfid, name) == 0) {
-		LOG(INFO) << "Thread "<< selfid << " (task " << tid << ") set name: " << name;
-	} else {
-		char buf[256];
-		int err = errno;
-		char* err_str = strerror_r(err, buf, sizeof(buf));
-		LOG(NOTICE) << "Thread "<< selfid << " (task " << tid << ") set name \"" << name << "\" failed: (" << err << ") " << err_str;
-	}
-}
-
-void thread_enable_cancel(bool cancel)
-{
-	cancel ? pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) :
-		 pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
-}
 
 void Thread::start(void *(*task)(void*), void *arg)
 {

CommonLibs/Threads.h

@@ -55,7 +55,7 @@ void unlockCout();		///< call after writing cout
 #define OBJDCOUT(text) {}
 #else
 #define DCOUT(text) { COUT(__FILE__ << ":" << __LINE__ << " " << text); }
-#define OBJDCOUT(text) { DCOUT(this << " " << text); }
+#define OBJDCOUT(text) { DCOUT(this << " " << text); } 
 #endif
 //@}
 //@}
@@ -141,9 +141,6 @@ class Signal {
 #define START_THREAD(thread,function,argument) \
 	thread.start((void *(*)(void*))function, (void*)argument);
 
-void set_selfthread_name(const char *name);
-void thread_enable_cancel(bool cancel);
-
 /** A C++ wrapper for pthread threads.  */
 class Thread {
 
@@ -153,7 +150,7 @@ class Thread {
 	pthread_attr_t mAttrib;
 	// FIXME -- Can this be reduced now?
 	size_t mStackSize;
-
+	
 
 	public:
 

CommonLibs/Timeval.cpp

@@ -27,49 +27,43 @@
 
 #include "Timeval.h"
 
-extern "C" {
-#include <osmocom/core/timer.h>
-}
-
 using namespace std;
 
-void Timeval::now()
-{
-	osmo_clock_gettime(CLOCK_REALTIME, &mTimespec);
-}
-
 void Timeval::future(unsigned offset)
 {
 	now();
 	unsigned sec = offset/1000;
 	unsigned msec = offset%1000;
-	mTimespec.tv_nsec += msec*1000*1000;
-	mTimespec.tv_sec += sec;
-	if (mTimespec.tv_nsec > 1000*1000*1000) {
-		mTimespec.tv_nsec -= 1000*1000*1000;
-		mTimespec.tv_sec += 1;
+	mTimeval.tv_usec += msec*1000;
+	mTimeval.tv_sec += sec;
+	if (mTimeval.tv_usec>1000000) {
+		mTimeval.tv_usec -= 1000000;
+		mTimeval.tv_sec += 1;
 	}
 }
 
 
 struct timespec Timeval::timespec() const
 {
-	return mTimespec;
+	struct timespec retVal;
+	retVal.tv_sec = mTimeval.tv_sec;
+	retVal.tv_nsec = 1000 * (long)mTimeval.tv_usec;
+	return retVal;
 }
 
 
 bool Timeval::passed() const
 {
 	Timeval nowTime;
-	if (nowTime.mTimespec.tv_sec < mTimespec.tv_sec) return false;
-	if (nowTime.mTimespec.tv_sec > mTimespec.tv_sec) return true;
-	if (nowTime.mTimespec.tv_nsec >= mTimespec.tv_nsec) return true;
+	if (nowTime.mTimeval.tv_sec < mTimeval.tv_sec) return false;
+	if (nowTime.mTimeval.tv_sec > mTimeval.tv_sec) return true;
+	if (nowTime.mTimeval.tv_usec > mTimeval.tv_usec) return true;
 	return false;
 }
 
 double Timeval::seconds() const
 {
-	return ((double)mTimespec.tv_sec) + 1e-9*((double)mTimespec.tv_nsec);
+	return ((double)mTimeval.tv_sec) + 1e-6*((double)mTimeval.tv_usec);
 }
 
 
@@ -78,8 +72,8 @@ long Timeval::delta(const Timeval& other) const
 {
 	// 2^31 milliseconds is just over 4 years.
 	int32_t deltaS = other.sec() - sec();
-	int32_t deltaNs = other.nsec() - nsec();
-	return 1000*deltaS + deltaNs/1000000;
+	int32_t deltaUs = other.usec() - usec();
+	return 1000*deltaS + deltaUs/1000;
 }
 	
 
@@ -95,7 +89,7 @@ ostream& operator<<(ostream& os, const Timeval& tv)
 
 ostream& operator<<(ostream& os, const struct timespec& ts)
 {
-	os << ts.tv_sec << "," << ts.tv_nsec/1000;
+	os << ts.tv_sec << "," << ts.tv_nsec;
 	return os;
 }
 

CommonLibs/Timeval.h

@@ -42,12 +42,12 @@ class Timeval {
 
 	private:
 
-	struct timespec mTimespec;
+	struct timeval mTimeval;
 
 	public:
 
-	/** Set the value to current time. */
-	void now();
+	/** Set the value to gettimeofday. */
+	void now() { gettimeofday(&mTimeval,NULL); }
 
 	/** Set the value to gettimeofday plus an offset. */
 	void future(unsigned ms);
@@ -55,18 +55,16 @@ class Timeval {
 	//@{
 	Timeval(unsigned sec, unsigned usec)
 	{
-		mTimespec.tv_sec = sec;
-		mTimespec.tv_nsec = usec*1000;
+		mTimeval.tv_sec = sec;
+		mTimeval.tv_usec = usec;
 	}
 
 	Timeval(const struct timeval& wTimeval)
-	{
-		mTimespec.tv_sec = wTimeval.tv_sec;
-		mTimespec.tv_nsec = wTimeval.tv_sec*1000;
-	}
+		:mTimeval(wTimeval)
+	{}
 
 	/**
-		Create a Timespec offset into the future.
+		Create a Timeval offset into the future.
 		@param offset milliseconds
 	*/
 	Timeval(unsigned offset=0) { future(offset); }
@@ -78,9 +76,8 @@ class Timeval {
 	/** Return total seconds. */
 	double seconds() const;
 
-	uint32_t sec() const { return mTimespec.tv_sec; }
-	uint32_t usec() const { return mTimespec.tv_nsec / 1000; }
-	uint32_t nsec() const { return mTimespec.tv_nsec; }
+	uint32_t sec() const { return mTimeval.tv_sec; }
+	uint32_t usec() const { return mTimeval.tv_usec; }
 
 	/** Return differnce from other (other-self), in ms. */
 	long delta(const Timeval& other) const;
@@ -91,11 +88,11 @@ class Timeval {
 	/** Remaining time in ms. */
 	long remaining() const { return -elapsed(); }
 
-	/** Return true if the time has passed, as per clock_gettime(CLOCK_REALTIME). */
+	/** Return true if the time has passed, as per gettimeofday. */
 	bool passed() const;
 
 	/** Add a given number of minutes to the time. */
-	void addMinutes(unsigned minutes) { mTimespec.tv_sec += minutes*60; }
+	void addMinutes(unsigned minutes) { mTimeval.tv_sec += minutes*60; }
 
 };
 

CommonLibs/Utils.cpp

@@ -1,36 +0,0 @@
-/*
- * Copyright 2018 sysmocom - s.f.m.c. GmbH
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <vector>
-#include <string>
-#include <sstream>
-
-std::vector<std::string> comma_delimited_to_vector(const char* opt)
-{
-	std::string str = std::string(opt);
-	std::vector<std::string> result;
-	std::stringstream ss(str);
-
-	while( ss.good() )
-	{
-	    std::string substr;
-	    getline(ss, substr, ',');
-	    result.push_back(substr);
-	}
-	return result;
-}

CommonLibs/Utils.h

@@ -1,24 +0,0 @@
-/*
- * Copyright 2018 sysmocom - s.f.m.c. GmbH
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#pragma once
-
-#include <vector>
-#include <string>
-
-std::vector<std::string> comma_delimited_to_vector(const char* opt);

CommonLibs/Vector.h

@@ -32,14 +32,11 @@
 #include <string.h>
 #include <iostream>
 #include <assert.h>
-#include <stdlib.h>
-
 // We cant use Logger.h in this file...
 extern int gVectorDebug;
 #define BVDEBUG(msg) if (gVectorDebug) {std::cout << msg;}
 
-typedef void (*vector_free_func)(void* wData);
-typedef void *(*vector_alloc_func)(size_t newSize);
+
 
 /**
 	A simplified Vector template with aliases.
@@ -63,8 +60,6 @@ template <class T> class Vector {
 	T* mData;		///< allocated data block, if any
 	T* mStart;		///< start of useful data
 	T* mEnd;		///< end of useful data + 1
-	vector_alloc_func mAllocFunc; ///< function used to alloc new mData during resize.
-	vector_free_func mFreeFunc; ///< function used to free mData.
 
 	public:
 
@@ -90,19 +85,9 @@ template <class T> class Vector {
 	/** Change the size of the Vector, discarding content. */
 	void resize(size_t newSize)
 	{
-		if (mData!=NULL) {
-			if (mFreeFunc)
-				mFreeFunc(mData);
-			else
-				delete[] mData;
-		}
+		if (mData!=NULL) delete[] mData;
 		if (newSize==0) mData=NULL;
-		else {
-			if (mAllocFunc)
-				mData = (T*) mAllocFunc(newSize);
-			else
-				mData = new T[newSize];
-		}
+		else mData = new T[newSize];
 		mStart = mData;
 		mEnd = mStart + newSize;
 	}
@@ -122,7 +107,7 @@ template <class T> class Vector {
 	void clone(const Vector<T>& other)
 	{
 		resize(other.size());
-		other.copyTo(*this);
+		memcpy(mData,other.mStart,other.bytes());
 	}
 
 
@@ -131,31 +116,29 @@ template <class T> class Vector {
 	//@{
 
 	/** Build an empty Vector of a given size. */
-	Vector(size_t wSize=0, vector_alloc_func wAllocFunc=NULL, vector_free_func wFreeFunc=NULL)
-		:mData(NULL), mAllocFunc(wAllocFunc), mFreeFunc(wFreeFunc)
-	{ resize(wSize); }
+	Vector(size_t wSize=0):mData(NULL) { resize(wSize); }
 
 	/** Build a Vector by moving another. */
 	Vector(Vector<T>&& other)
-		:mData(other.mData),mStart(other.mStart),mEnd(other.mEnd), mAllocFunc(other.mAllocFunc),  mFreeFunc(other.mFreeFunc)
+		:mData(other.mData),mStart(other.mStart),mEnd(other.mEnd)
 	{ other.mData=NULL; }
 
 	/** Build a Vector by copying another. */
-	Vector(const Vector<T>& other):mData(NULL), mAllocFunc(other.mAllocFunc), mFreeFunc(other.mFreeFunc) { clone(other); }
+	Vector(const Vector<T>& other):mData(NULL) { clone(other); }
 
 	/** Build a Vector with explicit values. */
-	Vector(T* wData, T* wStart, T* wEnd, vector_alloc_func wAllocFunc=NULL, vector_free_func wFreeFunc=NULL)
-		:mData(wData),mStart(wStart),mEnd(wEnd), mAllocFunc(wAllocFunc), mFreeFunc(wFreeFunc)
+	Vector(T* wData, T* wStart, T* wEnd)
+		:mData(wData),mStart(wStart),mEnd(wEnd)
 	{ }
 
 	/** Build a vector from an existing block, NOT to be deleted upon destruction. */
-	Vector(T* wStart, size_t span, vector_alloc_func wAllocFunc=NULL, vector_free_func wFreeFunc=NULL)
-		:mData(NULL),mStart(wStart),mEnd(wStart+span),mAllocFunc(wAllocFunc), mFreeFunc(wFreeFunc)
+	Vector(T* wStart, size_t span)
+		:mData(NULL),mStart(wStart),mEnd(wStart+span)
 	{ }
 
 	/** Build a Vector by concatenation. */
-	Vector(const Vector<T>& other1, const Vector<T>& other2, vector_alloc_func wAllocFunc=NULL, vector_free_func wFreeFunc=NULL)
-		:mData(NULL), mAllocFunc(wAllocFunc), mFreeFunc(wFreeFunc)
+	Vector(const Vector<T>& other1, const Vector<T>& other2)
+		:mData(NULL)
 	{
 		resize(other1.size()+other2.size());
 		memcpy(mStart, other1.mStart, other1.bytes());
@@ -179,8 +162,6 @@ template <class T> class Vector {
 		mData=other.mData;
 		mStart=other.mStart;
 		mEnd=other.mEnd;
-		mAllocFunc=other.mAllocFunc;
-		mFreeFunc=other.mFreeFunc;
 		other.mData=NULL;
 	}
 
@@ -223,15 +204,10 @@ template <class T> class Vector {
 	*/
 	void copyToSegment(Vector<T>& other, size_t start, size_t span) const
 	{
-		unsigned int i;
-		T* dst = other.mStart + start;
-		T* src = mStart;
-		assert(dst+span<=other.mEnd);
+		T* base = other.mStart + start;
+		assert(base+span<=other.mEnd);
 		assert(mStart+span<=mEnd);
-		for (i = 0; i < span; i++, src++, dst++)
-			*dst = *src;
-		/*TODO if not non-trivially copyable type class, optimize:
-		memcpy(dst,mStart,span*sizeof(T)); */
+		memcpy(base,mStart,span*sizeof(T));
 	}
 
 	/** Copy all of this Vector to a segment of another Vector. */
@@ -306,7 +282,7 @@ template <class T> class Vector {
 	T* end() { return mEnd; }
 	bool isOwner() { return !!mData; }	// Do we own any memory ourselves?
 	//@}
-
+	
 
 };
 

CommonLibs/debug.c

@@ -10,21 +10,9 @@ static const struct log_info_cat default_categories[] = {
 		.color = NULL,
 		.enabled = 1, .loglevel = LOGL_NOTICE,
 	},
-	[DTRXCTRL] = {
-			.name = "DTRXCTRL",
-			.description = "TRX CTRL interface",
-			.color = "\033[1;33m",
-			.enabled = 1, .loglevel = LOGL_NOTICE,
-	},
-	[DDEV] = {
-		.name = "DDEV",
-		.description = "Device/Driver specific code",
-		.color = NULL,
-		.enabled = 1, .loglevel = LOGL_INFO,
-	},
 	[DLMS] = {
 		.name = "DLMS",
-		.description = "Logging from within LimeSuite itself",
+		.description = "LimeSuite category",
 		.color = NULL,
 		.enabled = 1, .loglevel = LOGL_NOTICE,
 	},

CommonLibs/debug.h

@@ -5,7 +5,5 @@ extern const struct log_info log_info;
 /* Debug Areas of the code */
 enum {
 	DMAIN,
-	DTRXCTRL,
-	DDEV,
 	DLMS,
 };

CommonLibs/osmo_signal.h

@@ -1,35 +0,0 @@
-/* Generic signalling/notification infrastructure */
-/* (C) 2018 by sysmocom s.f.m.c. GmbH <info@sysmocom.de>
- *
- * Author: Pau Espin Pedrol <pespin@sysmocom.de>
- *
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#pragma once
-
-#include <osmocom/core/signal.h>
-
-/* Signalling subsystems */
-enum signal_subsystems {
-	SS_TRANSC,
-};
-
-/* SS_TRANSC signals */
-enum SS_TRANSC {
-	S_TRANSC_STOP_REQUIRED, /* Transceiver fatal error, it should be stopped */
-};

CommonLibs/trx_vty.c

@@ -39,7 +39,7 @@ static struct trx_ctx* g_trx_ctx;
 static const struct value_string clock_ref_names[] = {
 	{ REF_INTERNAL,	"internal" },
 	{ REF_EXTERNAL,	"external" },
-	{ REF_GPS,	"gpsdo" },
+	{ REF_GPS,	"gspdo" },
 	{ 0,		NULL }
 };
 
@@ -236,16 +236,12 @@ DEFUN(cfg_multi_arfcn, cfg_multi_arfcn_cmd,
 
 	if (strcmp("disable", argv[0]) == 0) {
 		trx->cfg.multi_arfcn = false;
-		return CMD_SUCCESS;
-	}
-
-	if (trx->cfg.num_chans > TRX_MCHAN_MAX) {
-		vty_out(vty, "Up to %i channels are supported for multi-TRX mode%s",
-			TRX_MCHAN_MAX, VTY_NEWLINE);
+	} else if (strcmp("enable", argv[0]) == 0) {
+		trx->cfg.multi_arfcn = true;
+	} else {
 		return CMD_WARNING;
 	}
 
-	trx->cfg.multi_arfcn = true;
 	return CMD_SUCCESS;
 }
 
@@ -308,21 +304,6 @@ DEFUN(cfg_egprs, cfg_egprs_cmd,
 	return CMD_SUCCESS;
 }
 
-DEFUN(cfg_ext_rach, cfg_ext_rach_cmd,
-	"ext-rach (disable|enable)",
-	"Enable extended (11-bit) RACH (default=disable)\n")
-{
-	struct trx_ctx *trx = trx_from_vty(vty);
-
-	if (strcmp("disable", argv[0]) == 0)
-		trx->cfg.ext_rach = false;
-
-	if (strcmp("enable", argv[0]) == 0)
-		trx->cfg.ext_rach = true;
-
-	return CMD_SUCCESS;
-}
-
 DEFUN(cfg_rt_prio, cfg_rt_prio_cmd,
 	"rt-prio <1-32>",
 	"Set the SCHED_RR real-time priority\n"
@@ -358,12 +339,7 @@ DEFUN(cfg_chan, cfg_chan_cmd,
 	if (idx >= TRX_CHAN_MAX) {
 		vty_out(vty, "Chan list full.%s", VTY_NEWLINE);
 		return CMD_WARNING;
-	} else if (trx->cfg.multi_arfcn && trx->cfg.num_chans >= TRX_MCHAN_MAX) {
-		vty_out(vty, "Up to %i channels are supported for multi-TRX mode%s",
-			TRX_MCHAN_MAX, VTY_NEWLINE);
-		return CMD_WARNING;
 	}
-
 	if (trx->cfg.num_chans < idx) { /* Unexisting or creating non-consecutive */
 		vty_out(vty, "Non-existent or non-consecutive chan %d.%s",
 				idx, VTY_NEWLINE);
@@ -441,7 +417,6 @@ static int config_write_trx(struct vty *vty)
 		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);
 	if (trx->cfg.sched_rr != 0)
 		vty_out(vty, " rt-prio %u%s", trx->cfg.sched_rr, VTY_NEWLINE);
 
@@ -449,9 +424,9 @@ static int config_write_trx(struct vty *vty)
 		chan = &trx->cfg.chans[i];
 		vty_out(vty, " chan %u%s", chan->idx, VTY_NEWLINE);
 		if (chan->rx_path)
-			vty_out(vty, "  rx-path %s%s", chan->rx_path, VTY_NEWLINE);
+			vty_out(vty, " rx-path %s%s", chan->rx_path, VTY_NEWLINE);
 		if (chan->tx_path)
-			vty_out(vty, "  tx-path %s%s", chan->tx_path, VTY_NEWLINE);
+			vty_out(vty, " tx-path %s%s", chan->tx_path, VTY_NEWLINE);
 	}
 
 	return CMD_SUCCESS;
@@ -479,7 +454,6 @@ static void trx_dump_vty(struct vty *vty, struct trx_ctx *trx)
 	vty_out(vty, " RSSI to dBm offset: %f%s", trx->cfg.rssi_offset, VTY_NEWLINE);
 	vty_out(vty, " Swap channels: %s%s", trx->cfg.swap_channels ? "Enabled" : "Disabled", VTY_NEWLINE);
 	vty_out(vty, " EDGE support: %s%s", trx->cfg.egprs ? "Enabled" : "Disabled", VTY_NEWLINE);
-	vty_out(vty, " Extended RACH support: %s%s", trx->cfg.ext_rach ? "Enabled" : "Disabled", VTY_NEWLINE);
 	vty_out(vty, " Real Time Priority: %u (%s)%s", trx->cfg.sched_rr,
 		trx->cfg.sched_rr ? "Enabled" : "Disabled", VTY_NEWLINE);
 	vty_out(vty, " Channels: %u%s", trx->cfg.num_chans, VTY_NEWLINE);
@@ -590,7 +564,6 @@ int trx_vty_init(struct trx_ctx* trx)
 	install_element(TRX_NODE, &cfg_rssi_offset_cmd);
 	install_element(TRX_NODE, &cfg_swap_channels_cmd);
 	install_element(TRX_NODE, &cfg_egprs_cmd);
-	install_element(TRX_NODE, &cfg_ext_rach_cmd);
 	install_element(TRX_NODE, &cfg_rt_prio_cmd);
 	install_element(TRX_NODE, &cfg_filler_cmd);
 

CommonLibs/trx_vty.h

@@ -6,10 +6,7 @@
 
 extern struct vty_app_info g_vty_info;
 
-/* Maximum number of physical RF channels */
 #define TRX_CHAN_MAX 8
-/* Maximum number of carriers in multi-ARFCN mode */
-#define TRX_MCHAN_MAX 3
 
 /* Samples-per-symbol for downlink path
  *     4 - Uses precision modulator (more computation, less distortion)
@@ -60,7 +57,6 @@ struct trx_ctx {
 		double offset;
 		double rssi_offset;
 		bool swap_channels;
-		bool ext_rach;
 		bool egprs;
 		unsigned int sched_rr;
 		unsigned int num_chans;

GSM/GSMCommon.cpp

@@ -54,10 +54,7 @@ const BitVector GSM::gEdgeTrainingSequence[] = {
 
 const BitVector GSM::gDummyBurst("0001111101101110110000010100100111000001001000100000001111100011100010111000101110001010111010010100011001100111001111010011111000100101111101010000");
 
-/* 3GPP TS 05.02, section 5.2.7 "Access burst (AB)", synch. sequence bits */
-const BitVector GSM::gRACHSynchSequenceTS0("01001011011111111001100110101010001111000");  /* GSM, GMSK (default) */
-const BitVector GSM::gRACHSynchSequenceTS1("01010100111110001000011000101111001001101");  /* EGPRS, 8-PSK */
-const BitVector GSM::gRACHSynchSequenceTS2("11101111001001110101011000001101101110111");  /* EGPRS, GMSK */
+const BitVector GSM::gRACHSynchSequence("01001011011111111001100110101010001111000");
 
 //                               |-head-||---------midamble----------------------||--------------data----------------||t|
 const BitVector GSM::gRACHBurst("0011101001001011011111111001100110101010001111000110111101111110000111001001010110011000");

GSM/GSMCommon.h

@@ -52,9 +52,7 @@ extern const BitVector gEdgeTrainingSequence[];
 extern const BitVector gDummyBurst;
 
 /** Random access burst synch. sequence */
-extern const BitVector gRACHSynchSequenceTS0;
-extern const BitVector gRACHSynchSequenceTS1;
-extern const BitVector gRACHSynchSequenceTS2;
+extern const BitVector gRACHSynchSequence;
 /** Random access burst synch. sequence, GSM 05.02 5.2.7 */
 extern const BitVector gRACHBurst;
 

Makefile.am

@@ -28,11 +28,9 @@ AM_CXXFLAGS = -Wall -pthread
 
 # Order must be preserved
 SUBDIRS = \
-	doc \
 	CommonLibs \
 	GSM \
 	Transceiver52M \
-	contrib \
 	tests
 
 EXTRA_DIST = \
@@ -42,9 +40,6 @@ EXTRA_DIST = \
 	COPYING \
 	README
 
-AM_DISTCHECK_CONFIGURE_FLAGS = \
-	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
-
 .PHONY: release
 
 @RELMAKE@

Transceiver52M/Channelizer.cpp

@@ -88,7 +88,7 @@ bool Channelizer::rotate(const float *in, size_t len)
 		convolve_real(hInputs[i], blockLen,
 			      subFilters[i], hLen,
 			      hOutputs[i], blockLen,
-			      0, blockLen);
+			      0, blockLen, 1, 0);
 	}
 
 	cxvec_fft(fftHandle);

Transceiver52M/ChannelizerBase.cpp

@@ -239,7 +239,7 @@ ChannelizerBase::~ChannelizerBase()
 
 	for (size_t i = 0; i < m; i++) {
 		free(subFilters[i]);
-		delete[] hist[i];
+		delete hist[i];
 	}
 
 	fft_free(fftInput);

Transceiver52M/Makefile.am

@@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.common
 
 SUBDIRS = arch device
 
-AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/arch/common -I${srcdir}/device/common
+AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/arch/common -I${srcdir}/device
 AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
 
 rev2dir = $(datadir)/usrp/rev2

Transceiver52M/Resampler.cpp

@@ -143,7 +143,7 @@ int Resampler::rotate(const float *in, size_t in_len, float *out, size_t out_len
 		convolve_real(in, in_len,
 			      reinterpret_cast<float *>(partitions[path]),
 			      filt_len, &out[2 * i], out_len - i,
-			      n, 1);
+			      n, 1, 1, 0);
 	}
 
 	return out_len;

Transceiver52M/Synthesis.cpp

@@ -102,7 +102,7 @@ bool Synthesis::rotate(float *out, size_t len)
 		convolve_real(hInputs[i], blockLen,
 			      subFilters[i], hLen,
 			      hOutputs[i], blockLen,
-			      0, blockLen);
+			      0, blockLen, 1, 0);
 	}
 
 	/* Interleave into output vector */

Transceiver52M/Transceiver.cpp

@@ -27,10 +27,6 @@
 #include "Transceiver.h"
 #include <Logger.h>
 
-extern "C" {
-#include "osmo_signal.h"
-}
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -119,7 +115,7 @@ Transceiver::Transceiver(int wBasePort,
   : mBasePort(wBasePort), mLocalAddr(TRXAddress), mRemoteAddr(GSMcoreAddress),
     mClockSocket(TRXAddress, wBasePort, GSMcoreAddress, wBasePort + 100),
     mTransmitLatency(wTransmitLatency), mRadioInterface(wRadioInterface),
-    rssiOffset(wRssiOffset), sig_cbfn(NULL),
+    rssiOffset(wRssiOffset),
     mSPSTx(tx_sps), mSPSRx(rx_sps), mChans(chans), mEdge(false), mOn(false), mForceClockInterface(false),
     mTxFreq(0.0), mRxFreq(0.0), mTSC(0), mMaxExpectedDelayAB(0), mMaxExpectedDelayNB(0),
     mWriteBurstToDiskMask(0)
@@ -159,8 +155,7 @@ Transceiver::~Transceiver()
  * are still expected to report clock indications through control channel
  * activity.
  */
-bool Transceiver::init(FillerType filler, size_t rtsc, unsigned rach_delay,
-                       bool edge, bool ext_rach)
+bool Transceiver::init(FillerType filler, size_t rtsc, unsigned rach_delay, bool edge)
 {
   int d_srcport, d_dstport, c_srcport, c_dstport;
 
@@ -174,7 +169,6 @@ bool Transceiver::init(FillerType filler, size_t rtsc, unsigned rach_delay,
     return false;
   }
 
-  mExtRACH = ext_rach;
   mEdge = edge;
 
   mDataSockets.resize(mChans);
@@ -225,17 +219,6 @@ bool Transceiver::init(FillerType filler, size_t rtsc, unsigned rach_delay,
   return true;
 }
 
-void Transceiver::setSignalHandler(osmo_signal_cbfn cbfn)
-{
-  if (this->sig_cbfn)
-    osmo_signal_unregister_handler(SS_TRANSC, this->sig_cbfn, NULL);
-
-  if (cbfn) {
-    this->sig_cbfn = cbfn;
-    osmo_signal_register_handler(SS_TRANSC, this->sig_cbfn, NULL);
-  }
-}
-
 /*
  * Start the transceiver
  *
@@ -390,7 +373,7 @@ void Transceiver::pushRadioVector(GSM::Time &nowTime)
     state = &mStates[i];
 
     while ((burst = mTxPriorityQueues[i].getStaleBurst(nowTime))) {
-      LOGCHAN(i, DMAIN, NOTICE) << "dumping STALE burst in TRX->SDR interface ("
+      LOG(NOTICE) << "chan " << i << " dumping STALE burst in TRX->USRP interface ("
                   << burst->getTime() <<" vs " << nowTime << "), retrans=" << state->mRetrans;
       if (state->mRetrans)
         updateFillerTable(i, burst);
@@ -499,16 +482,16 @@ CorrType Transceiver::expectedCorrType(GSM::Time currTime,
     break;
   case IV:
   case VI:
-    return mExtRACH ? EXT_RACH : RACH;
+    return RACH;
     break;
   case V: {
     int mod51 = burstFN % 51;
     if ((mod51 <= 36) && (mod51 >= 14))
-      return mExtRACH ? EXT_RACH : RACH;
+      return RACH;
     else if ((mod51 == 4) || (mod51 == 5))
-      return mExtRACH ? EXT_RACH : RACH;
+      return RACH;
     else if ((mod51 == 45) || (mod51 == 46))
-      return mExtRACH ? EXT_RACH : RACH;
+      return RACH;
     else if (mHandover[burstTN][sdcch4_subslot[burstFN % 102]])
       return RACH;
     else
@@ -526,7 +509,7 @@ CorrType Transceiver::expectedCorrType(GSM::Time currTime,
   case XIII: {
     int mod52 = burstFN % 52;
     if ((mod52 == 12) || (mod52 == 38))
-      return mExtRACH ? EXT_RACH : RACH;
+      return RACH;
     else if ((mod52 == 25) || (mod52 == 51))
       return IDLE;
     else
@@ -637,11 +620,9 @@ SoftVector *Transceiver::pullRadioVector(GSM::Time &wTime, double &RSSI, bool &i
     noise = 20.0 * log10(rxFullScale / state->mNoiseLev);
   }
 
-  unsigned max_toa = (type == RACH || type == EXT_RACH) ?
-                      mMaxExpectedDelayAB : mMaxExpectedDelayNB;
-
   /* Detect normal or RACH bursts */
-  rc = detectAnyBurst(*burst, mTSC, BURST_THRESH, mSPSRx, type, amp, toa, max_toa);
+  rc = detectAnyBurst(*burst, mTSC, BURST_THRESH, mSPSRx, type, amp, toa,
+                      (type==RACH)?mMaxExpectedDelayAB:mMaxExpectedDelayNB);
 
   if (rc > 0) {
     type = (CorrType) rc;
@@ -719,13 +700,13 @@ void Transceiver::driveControl(size_t chan)
 
   /* Verify a command signature */
   if (strncmp(buffer, "CMD ", 4)) {
-    LOGC(DTRXCTRL, WARNING) << "bogus message on control interface";
+    LOG(WARNING) << "bogus message on control interface";
     return;
   }
 
   /* Set command pointer */
   command = buffer + 4;
-  LOGCHAN(chan, DTRXCTRL, INFO) << "command is '" << command << "'";
+  LOG(INFO) << "command is " << command;
 
   if (match_cmd(command, "POWEROFF", NULL)) {
     stop();
@@ -804,7 +785,7 @@ void Transceiver::driveControl(size_t chan)
     sscanf(params, "%d", &freqKhz);
     mRxFreq = freqKhz * 1e3;
     if (!mRadioInterface->tuneRx(mRxFreq, chan)) {
-       LOGC(DTRXCTRL, ALERT) << "RX failed to tune";
+       LOG(ALERT) << "RX failed to tune";
        sprintf(response,"RSP RXTUNE 1 %d",freqKhz);
     }
     else
@@ -815,7 +796,7 @@ void Transceiver::driveControl(size_t chan)
     sscanf(params, "%d", &freqKhz);
     mTxFreq = freqKhz * 1e3;
     if (!mRadioInterface->tuneTx(mTxFreq, chan)) {
-       LOGC(DTRXCTRL, ALERT) << "TX failed to tune";
+       LOG(ALERT) << "TX failed to tune";
        sprintf(response,"RSP TXTUNE 1 %d",freqKhz);
     }
     else
@@ -827,7 +808,7 @@ void Transceiver::driveControl(size_t chan)
     if (TSC > 7) {
       sprintf(response, "RSP SETTSC 1 %d", TSC);
     } else {
-      LOGC(DTRXCTRL, NOTICE) << "Changing TSC from " << mTSC << " to " << TSC;
+      LOG(NOTICE) << "Changing TSC from " << mTSC << " to " << TSC;
       mTSC = TSC;
       sprintf(response,"RSP SETTSC 0 %d", TSC);
     }
@@ -837,7 +818,7 @@ void Transceiver::driveControl(size_t chan)
     int  timeslot;
     sscanf(params, "%d %d", &timeslot, &corrCode);
     if ((timeslot < 0) || (timeslot > 7)) {
-      LOGC(DTRXCTRL, WARNING) << "bogus message on control interface";
+      LOG(WARNING) << "bogus message on control interface";
       sprintf(response,"RSP SETSLOT 1 %d %d",timeslot,corrCode);
       return;
     }
@@ -852,11 +833,10 @@ void Transceiver::driveControl(size_t chan)
     mWriteBurstToDiskMask = mask;
     sprintf(response,"RSP _SETBURSTTODISKMASK 0 %d",mask);
   } else {
-    LOGC(DTRXCTRL, WARNING) << "bogus command " << command << " on control interface.";
+    LOG(WARNING) << "bogus command " << command << " on control interface.";
     sprintf(response,"RSP ERR 1");
   }
 
-  LOGCHAN(chan, DTRXCTRL, INFO) << "response is '" << response << "'";
   mCtrlSockets[chan]->write(response, strlen(response) + 1);
 }
 
@@ -905,12 +885,8 @@ bool Transceiver::driveTxPriorityQueue(size_t chan)
 
 void Transceiver::driveReceiveRadio()
 {
-  int rc = mRadioInterface->driveReceiveRadio();
-  if (rc == 0) {
+  if (!mRadioInterface->driveReceiveRadio()) {
     usleep(100000);
-  } else if (rc < 0) {
-    LOG(FATAL) << "radio Interface receive failed, requesting stop.";
-    osmo_signal_dispatch(SS_TRANSC, S_TRANSC_STOP_REQUIRED, this);
   } else if (mForceClockInterface || mTransmitDeadlineClock > mLastClockUpdateTime + GSM::Time(216,0)) {
     mForceClockInterface = false;
     writeClockInterface();
@@ -1006,8 +982,7 @@ void Transceiver::driveTxFIFO()
           // only update latency at the defined frame interval
           if (radioClock->get() > mLatencyUpdateTime + GSM::Time(USB_LATENCY_INTRVL)) {
             mTransmitLatency = mTransmitLatency + GSM::Time(1,0);
-            LOG(INFO) << "new latency: " << mTransmitLatency << " (underrun "
-                      << radioClock->get() << " vs " << mLatencyUpdateTime + GSM::Time(USB_LATENCY_INTRVL) << ")";
+            LOG(INFO) << "new latency: " << mTransmitLatency;
             mLatencyUpdateTime = radioClock->get();
           }
         }
@@ -1050,15 +1025,11 @@ void Transceiver::writeClockInterface()
 
 void *RxUpperLoopAdapter(TransceiverChannel *chan)
 {
-  char thread_name[16];
   Transceiver *trx = chan->trx;
   size_t num = chan->num;
 
   delete chan;
 
-  snprintf(thread_name, 16, "RxUpper%zu", num);
-  set_selfthread_name(thread_name);
-
   trx->setPriority(0.42);
 
   while (1) {
@@ -1070,8 +1041,6 @@ void *RxUpperLoopAdapter(TransceiverChannel *chan)
 
 void *RxLowerLoopAdapter(Transceiver *transceiver)
 {
-  set_selfthread_name("RxLower");
-
   transceiver->setPriority(0.45);
 
   while (1) {
@@ -1083,8 +1052,6 @@ void *RxLowerLoopAdapter(Transceiver *transceiver)
 
 void *TxLowerLoopAdapter(Transceiver *transceiver)
 {
-  set_selfthread_name("TxLower");
-
   transceiver->setPriority(0.44);
 
   while (1) {
@@ -1096,15 +1063,11 @@ void *TxLowerLoopAdapter(Transceiver *transceiver)
 
 void *ControlServiceLoopAdapter(TransceiverChannel *chan)
 {
-  char thread_name[16];
   Transceiver *trx = chan->trx;
   size_t num = chan->num;
 
   delete chan;
 
-  snprintf(thread_name, 16, "CtrlService%zu", num);
-  set_selfthread_name(thread_name);
-
   while (1) {
     trx->driveControl(num);
     pthread_testcancel();
@@ -1114,15 +1077,11 @@ void *ControlServiceLoopAdapter(TransceiverChannel *chan)
 
 void *TxUpperLoopAdapter(TransceiverChannel *chan)
 {
-  char thread_name[16];
   Transceiver *trx = chan->trx;
   size_t num = chan->num;
 
   delete chan;
 
-  snprintf(thread_name, 16, "TxUpper%zu", num);
-  set_selfthread_name(thread_name);
-
   trx->setPriority(0.40);
 
   while (1) {

Transceiver52M/Transceiver.h

@@ -31,7 +31,6 @@
 #include <sys/socket.h>
 
 extern "C" {
-#include <osmocom/core/signal.h>
 #include "config_defs.h"
 }
 
@@ -114,8 +113,7 @@ public:
   ~Transceiver();
 
   /** Start the control loop */
-  bool init(FillerType filler, size_t rtsc, unsigned rach_delay,
-            bool edge, bool ext_rach);
+  bool init(FillerType filler, size_t rtsc, unsigned rach_delay, bool edge);
 
   /** attach the radioInterface receive FIFO */
   bool receiveFIFO(VectorFIFO *wFIFO, size_t chan)
@@ -130,8 +128,6 @@ public:
   /** accessor for number of channels */
   size_t numChans() const { return mChans; };
 
-  void setSignalHandler(osmo_signal_cbfn cbfn);
-
   /** Codes for channel combinations */
   typedef enum {
     FILL,               ///< Channel is transmitted, but unused
@@ -181,8 +177,6 @@ private:
 
   double rssiOffset;                      ///< RSSI to dBm conversion offset
 
-  osmo_signal_cbfn *sig_cbfn;              ///< Registered Signal Handler to announce events.
-
   /** modulate and add a burst to the transmit queue */
   void addRadioVector(size_t chan, BitVector &bits,
                       int RSSI, GSM::Time &wTime);
@@ -211,7 +205,6 @@ private:
   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

Transceiver52M/arch/arm/convolve.c

@@ -29,15 +29,17 @@
 int _base_convolve_real(float *x, int x_len,
 			float *h, int h_len,
 			float *y, int y_len,
-			int start, int len);
+			int start, int len,
+			int step, int offset);
 
 int _base_convolve_complex(float *x, int x_len,
 			   float *h, int h_len,
 			   float *y, int y_len,
-			   int start, int len);
+			   int start, int len,
+			   int step, int offset);
 
 int bounds_check(int x_len, int h_len, int y_len,
-		 int start, int len);
+		 int start, int len, int step);
 
 #ifdef HAVE_NEON
 /* Calls into NEON assembler */
@@ -67,32 +69,35 @@ void convolve_init(void)
 int convolve_real(float *x, int x_len,
 		  float *h, int h_len,
 		  float *y, int y_len,
-		  int start, int len)
+		  int start, int len,
+		  int step, int offset)
 {
 	void (*conv_func)(float *, float *, float *, int) = NULL;
 
-	if (bounds_check(x_len, h_len, y_len, start, len) < 0)
+	if (bounds_check(x_len, h_len, y_len, start, len, step) < 0)
 		return -1;
 
 	memset(y, 0, len * 2 * sizeof(float));
 
 #ifdef HAVE_NEON
-	switch (h_len) {
-	case 4:
-		conv_func = neon_conv_real4;
-		break;
-	case 8:
-		conv_func = neon_conv_real8;
-		break;
-	case 12:
-		conv_func = neon_conv_real12;
-		break;
-	case 16:
-		conv_func = neon_conv_real16;
-		break;
-	case 20:
-		conv_func = neon_conv_real20;
-		break;
+	if (step <= 4) {
+		switch (h_len) {
+		case 4:
+			conv_func = neon_conv_real4;
+			break;
+		case 8:
+			conv_func = neon_conv_real8;
+			break;
+		case 12:
+			conv_func = neon_conv_real12;
+			break;
+		case 16:
+			conv_func = neon_conv_real16;
+			break;
+		case 20:
+			conv_func = neon_conv_real20;
+			break;
+		}
 	}
 #endif
 	if (conv_func) {
@@ -102,7 +107,7 @@ int convolve_real(float *x, int x_len,
 		_base_convolve_real(x, x_len,
 				    h, h_len,
 				    y, y_len,
-				    start, len);
+				    start, len, step, offset);
 	}
 
 	return len;
@@ -113,17 +118,18 @@ int convolve_real(float *x, int x_len,
 int convolve_complex(float *x, int x_len,
 		     float *h, int h_len,
 		     float *y, int y_len,
-		     int start, int len)
+		     int start, int len,
+		     int step, int offset)
 {
 	void (*conv_func)(float *, float *, float *, int, int) = NULL;
 
-	if (bounds_check(x_len, h_len, y_len, start, len) < 0)
+	if (bounds_check(x_len, h_len, y_len, start, len, step) < 0)
 		return -1;
 
 	memset(y, 0, len * 2 * sizeof(float));
 
 #ifdef HAVE_NEON
-	if (!(h_len % 4))
+	if (step <= 4 && !(h_len % 4))
 		conv_func = neon_conv_cmplx_4n;
 #endif
 	if (conv_func) {
@@ -133,7 +139,7 @@ int convolve_complex(float *x, int x_len,
 		_base_convolve_complex(x, x_len,
 				       h, h_len,
 				       y, y_len,
-				       start, len);
+				       start, len, step, offset);
 	}
 
 	return len;

Transceiver52M/arch/arm/convolve_neon.S

@@ -92,8 +92,8 @@ neon_conv_real12:
 	vld2.32     {q8-q9}, [r4], r6
 	vld2.32   {q10-q11}, [r5], r6
 #ifdef HAVE_NEON_FMA
-	vmul.f32         q1,   q6, q0
-	vmul.f32         q3,   q7, q0
+	vfma.f32         q1,   q6, q0
+	vfma.f32         q3,   q7, q0
 	vfma.f32         q1,   q8, q2
 	vfma.f32         q3,   q9, q2
 	vfma.f32         q1,  q10, q4

Transceiver52M/arch/common/convolve.h

@@ -1,27 +1,31 @@
 #ifndef _CONVOLVE_H_
 #define _CONVOLVE_H_
 
-void *convolve_h_alloc(size_t num);
+void *convolve_h_alloc(int num);
 
 int convolve_real(const float *x, int x_len,
 		  const float *h, int h_len,
 		  float *y, int y_len,
-		  int start, int len);
+		  int start, int len,
+		  int step, int offset);
 
 int convolve_complex(const float *x, int x_len,
 		     const float *h, int h_len,
 		     float *y, int y_len,
-		     int start, int len);
+		     int start, int len,
+		     int step, int offset);
 
 int base_convolve_real(const float *x, int x_len,
 		       const float *h, int h_len,
 		       float *y, int y_len,
-		       int start, int len);
+		       int start, int len,
+		       int step, int offset);
 
 int base_convolve_complex(const float *x, int x_len,
 			  const float *h, int h_len,
 			  float *y, int y_len,
-			  int start, int len);
+			  int start, int len,
+			  int step, int offset);
 
 void convolve_init(void);
 

Transceiver52M/arch/common/convolve_base.c

@@ -41,17 +41,17 @@ static void mac_cmplx(const float *x, const float *h, float *y)
 
 /* Base vector complex-complex multiply and accumulate */
 static void mac_real_vec_n(const float *x, const float *h, float *y,
-			   int len)
+			   int len, int step, int offset)
 {
-	for (int i=0; i<len; i++)
+	for (int i = offset; i < len; i += step)
 		mac_real(&x[2 * i], &h[2 * i], y);
 }
 
 /* Base vector complex-complex multiply and accumulate */
 static void mac_cmplx_vec_n(const float *x, const float *h, float *y,
-			    int len)
+			    int len, int step, int offset)
 {
-	for (int i=0; i<len; i++)
+	for (int i = offset; i < len; i += step)
 		mac_cmplx(&x[2 * i], &h[2 * i], y);
 }
 
@@ -59,12 +59,14 @@ static void mac_cmplx_vec_n(const float *x, const float *h, float *y,
 int _base_convolve_real(const float *x, int x_len,
 			const float *h, int h_len,
 			float *y, int y_len,
-			int start, int len)
+			int start, int len,
+			int step, int offset)
 {
 	for (int i = 0; i < len; i++) {
 		mac_real_vec_n(&x[2 * (i - (h_len - 1) + start)],
 			       h,
-			       &y[2 * i], h_len);
+			       &y[2 * i], h_len,
+			       step, offset);
 	}
 
 	return len;
@@ -74,13 +76,14 @@ int _base_convolve_real(const float *x, int x_len,
 int _base_convolve_complex(const float *x, int x_len,
 			   const float *h, int h_len,
 			   float *y, int y_len,
-			   int start, int len)
+			   int start, int len,
+			   int step, int offset)
 {
 	for (int i = 0; i < len; i++) {
 		mac_cmplx_vec_n(&x[2 * (i - (h_len - 1) + start)],
 				h,
 				&y[2 * i],
-				h_len);
+				h_len, step, offset);
 	}
 
 	return len;
@@ -88,10 +91,10 @@ int _base_convolve_complex(const float *x, int x_len,
 
 /* Buffer validity checks */
 int bounds_check(int x_len, int h_len, int y_len,
-		 int start, int len)
+		 int start, int len, int step)
 {
 	if ((x_len < 1) || (h_len < 1) ||
-	    (y_len < 1) || (len < 1)) {
+	    (y_len < 1) || (len < 1) || (step < 1)) {
 		fprintf(stderr, "Convolve: Invalid input\n");
 		return -1;
 	}
@@ -110,9 +113,10 @@ int bounds_check(int x_len, int h_len, int y_len,
 int base_convolve_real(const float *x, int x_len,
 		       const float *h, int h_len,
 		       float *y, int y_len,
-		       int start, int len)
+		       int start, int len,
+		       int step, int offset)
 {
-	if (bounds_check(x_len, h_len, y_len, start, len) < 0)
+	if (bounds_check(x_len, h_len, y_len, start, len, step) < 0)
 		return -1;
 
 	memset(y, 0, len * 2 * sizeof(float));
@@ -120,16 +124,17 @@ int base_convolve_real(const float *x, int x_len,
 	return _base_convolve_real(x, x_len,
 				   h, h_len,
 				   y, y_len,
-				   start, len);
+				   start, len, step, offset);
 }
 
 /* API: Non-aligned (no SSE) complex-complex */
 int base_convolve_complex(const float *x, int x_len,
 			  const float *h, int h_len,
 			  float *y, int y_len,
-			  int start, int len)
+			  int start, int len,
+			  int step, int offset)
 {
-	if (bounds_check(x_len, h_len, y_len, start, len) < 0)
+	if (bounds_check(x_len, h_len, y_len, start, len, step) < 0)
 		return -1;
 
 	memset(y, 0, len * 2 * sizeof(float));
@@ -137,11 +142,11 @@ int base_convolve_complex(const float *x, int x_len,
 	return _base_convolve_complex(x, x_len,
 				      h, h_len,
 				      y, y_len,
-				      start, len);
+				      start, len, step, offset);
 }
 
 /* Aligned filter tap allocation */
-void *convolve_h_alloc(size_t len)
+void *convolve_h_alloc(int len)
 {
 #ifdef HAVE_SSE3
 	return memalign(16, len * 2 * sizeof(float));

Transceiver52M/arch/x86/convolve.c

@@ -30,25 +30,25 @@
 /* Architecture dependant function pointers */
 struct convolve_cpu_context {
 	void (*conv_cmplx_4n) (const float *, int, const float *, int, float *,
-			       int, int, int);
+			       int, int, int, int, int);
 	void (*conv_cmplx_8n) (const float *, int, const float *, int, float *,
-			       int, int, int);
+			       int, int, int, int, int);
 	void (*conv_cmplx) (const float *, int, const float *, int, float *,
-			    int, int, int);
+			    int, int, int, int, int);
 	void (*conv_real4) (const float *, int, const float *, int, float *,
-			    int, int, int);
+			    int, int, int, int, int);
 	void (*conv_real8) (const float *, int, const float *, int, float *,
-			    int, int, int);
+			    int, int, int, int, int);
 	void (*conv_real12) (const float *, int, const float *, int, float *,
-			     int, int, int);
+			     int, int, int, int, int);
 	void (*conv_real16) (const float *, int, const float *, int, float *,
-			     int, int, int);
+			     int, int, int, int, int);
 	void (*conv_real20) (const float *, int, const float *, int, float *,
-			     int, int, int);
+			     int, int, int, int, int);
 	void (*conv_real4n) (const float *, int, const float *, int, float *,
-			     int, int, int);
+			     int, int, int, int, int);
 	void (*conv_real) (const float *, int, const float *, int, float *, int,
-			   int, int);
+			   int, int, int, int);
 };
 static struct convolve_cpu_context c;
 
@@ -56,15 +56,17 @@ static struct convolve_cpu_context c;
 int _base_convolve_real(const float *x, int x_len,
 			const float *h, int h_len,
 			float *y, int y_len,
-			int start, int len);
+			int start, int len,
+			int step, int offset);
 
 int _base_convolve_complex(const float *x, int x_len,
 			   const float *h, int h_len,
 			   float *y, int y_len,
-			   int start, int len);
+			   int start, int len,
+			   int step, int offset);
 
 int bounds_check(int x_len, int h_len, int y_len,
-		 int start, int len);
+		 int start, int len, int step);
 
 /* API: Initalize convolve module */
 void convolve_init(void)
@@ -97,37 +99,46 @@ void convolve_init(void)
 /* API: Aligned complex-real */
 int convolve_real(const float *x, int x_len,
 		  const float *h, int h_len,
-		  float *y, int y_len, int start, int len)
+		  float *y, int y_len, int start, int len, int step, int offset)
 {
-	if (bounds_check(x_len, h_len, y_len, start, len) < 0)
+	if (bounds_check(x_len, h_len, y_len, start, len, step) < 0)
 		return -1;
 
 	memset(y, 0, len * 2 * sizeof(float));
 
-	switch (h_len) {
-	case 4:
-		c.conv_real4(x, x_len, h, h_len, y, y_len, start, len);
-		break;
-	case 8:
-		c.conv_real8(x, x_len, h, h_len, y, y_len, start, len);
-		break;
-	case 12:
-		c.conv_real12(x, x_len, h, h_len, y, y_len, start, len);
-		break;
-	case 16:
-		c.conv_real16(x, x_len, h, h_len, y, y_len, start, len);
-		break;
-	case 20:
-		c.conv_real20(x, x_len, h, h_len, y, y_len, start, len);
-		break;
-	default:
-		if (!(h_len % 4))
-			c.conv_real4n(x, x_len, h, h_len, y, y_len,
-				      start, len);
-		else
-			c.conv_real(x, x_len, h, h_len, y, y_len, start,
-				    len);
-	}
+	if (step <= 4) {
+		switch (h_len) {
+		case 4:
+			c.conv_real4(x, x_len, h, h_len, y, y_len, start, len,
+				     step, offset);
+			break;
+		case 8:
+			c.conv_real8(x, x_len, h, h_len, y, y_len, start, len,
+				     step, offset);
+			break;
+		case 12:
+			c.conv_real12(x, x_len, h, h_len, y, y_len, start, len,
+				      step, offset);
+			break;
+		case 16:
+			c.conv_real16(x, x_len, h, h_len, y, y_len, start, len,
+				      step, offset);
+			break;
+		case 20:
+			c.conv_real20(x, x_len, h, h_len, y, y_len, start, len,
+				      step, offset);
+			break;
+		default:
+			if (!(h_len % 4))
+				c.conv_real4n(x, x_len, h, h_len, y, y_len,
+					      start, len, step, offset);
+			else
+				c.conv_real(x, x_len, h, h_len, y, y_len, start,
+					    len, step, offset);
+		}
+	} else
+		c.conv_real(x, x_len, h, h_len, y, y_len, start, len, step,
+			    offset);
 
 	return len;
 }
@@ -136,19 +147,26 @@ int convolve_real(const float *x, int x_len,
 int convolve_complex(const float *x, int x_len,
 		     const float *h, int h_len,
 		     float *y, int y_len,
-		     int start, int len)
+		     int start, int len, int step, int offset)
 {
-	if (bounds_check(x_len, h_len, y_len, start, len) < 0)
+	if (bounds_check(x_len, h_len, y_len, start, len, step) < 0)
 		return -1;
 
 	memset(y, 0, len * 2 * sizeof(float));
 
-	if (!(h_len % 8))
-		c.conv_cmplx_8n(x, x_len, h, h_len, y, y_len, start, len);
-	else if (!(h_len % 4))
-		c.conv_cmplx_4n(x, x_len, h, h_len, y, y_len, start, len);
-	else
-		c.conv_cmplx(x, x_len, h, h_len, y, y_len, start, len);
+	if (step <= 4) {
+		if (!(h_len % 8))
+			c.conv_cmplx_8n(x, x_len, h, h_len, y, y_len, start,
+					len, step, offset);
+		else if (!(h_len % 4))
+			c.conv_cmplx_4n(x, x_len, h, h_len, y, y_len, start,
+					len, step, offset);
+		else
+			c.conv_cmplx(x, x_len, h, h_len, y, y_len, start, len,
+				     step, offset);
+	} else
+		c.conv_cmplx(x, x_len, h, h_len, y, y_len, start, len, step,
+			     offset);
 
 	return len;
 }

Transceiver52M/arch/x86/convolve_sse_3.c

@@ -34,12 +34,12 @@
 void sse_conv_real4(const float *x, int x_len,
 		    const float *h, int h_len,
 		    float *y, int y_len,
-		    int start, int len)
+		    int start, int len, int step, int offset)
 {
 	/* NOTE: The parameter list of this function has to match the parameter
 	 * list of _base_convolve_real() in convolve_base.c. This specific
 	 * implementation, ignores some of the parameters of
-	 * _base_convolve_complex(), which are: x_len, y_len. */
+	 * _base_convolve_complex(), which are: x_len, y_len, offset, step */
 
 	__m128 m0, m1, m2, m3, m4, m5, m6, m7;
 
@@ -75,7 +75,7 @@ void sse_conv_real4(const float *x, int x_len,
 void sse_conv_real8(const float *x, int x_len,
 		    const float *h, int h_len,
 		    float *y, int y_len,
-		    int start, int len)
+		    int start, int len, int step, int offset)
 {
 	/* See NOTE in sse_conv_real4() */
 
@@ -126,7 +126,7 @@ void sse_conv_real8(const float *x, int x_len,
 void sse_conv_real12(const float *x, int x_len,
 		     const float *h, int h_len,
 		     float *y, int y_len,
-		     int start, int len)
+		     int start, int len, int step, int offset)
 {
 	/* See NOTE in sse_conv_real4() */
 
@@ -192,7 +192,7 @@ void sse_conv_real12(const float *x, int x_len,
 void sse_conv_real16(const float *x, int x_len,
 		     const float *h, int h_len,
 		     float *y, int y_len,
-		     int start, int len)
+		     int start, int len, int step, int offset)
 {
 	/* See NOTE in sse_conv_real4() */
 
@@ -271,7 +271,7 @@ void sse_conv_real16(const float *x, int x_len,
 void sse_conv_real20(const float *x, int x_len,
 		     const float *h, int h_len,
 		     float *y, int y_len,
-		     int start, int len)
+		     int start, int len, int step, int offset)
 {
 	/* See NOTE in sse_conv_real4() */
 
@@ -361,7 +361,7 @@ void sse_conv_real20(const float *x, int x_len,
 void sse_conv_real4n(const float *x, int x_len,
 		     const float *h, int h_len,
 		     float *y, int y_len,
-		     int start, int len)
+		     int start, int len, int step, int offset)
 {
 	/* See NOTE in sse_conv_real4() */
 
@@ -408,12 +408,12 @@ void sse_conv_real4n(const float *x, int x_len,
 void sse_conv_cmplx_4n(const float *x, int x_len,
 		       const float *h, int h_len,
 		       float *y, int y_len,
-		       int start, int len)
+		       int start, int len, int step, int offset)
 {
 	/* NOTE: The parameter list of this function has to match the parameter
 	 * list of _base_convolve_complex() in convolve_base.c. This specific
 	 * implementation, ignores some of the parameters of
-	 * _base_convolve_complex(), which are: x_len, y_len. */
+	 * _base_convolve_complex(), which are: x_len, y_len, offset, step. */
 
 	__m128 m0, m1, m2, m3, m4, m5, m6, m7;
 
@@ -466,7 +466,7 @@ void sse_conv_cmplx_4n(const float *x, int x_len,
 void sse_conv_cmplx_8n(const float *x, int x_len,
 		       const float *h, int h_len,
 		       float *y, int y_len,
-		       int start, int len)
+		       int start, int len, int step, int offset)
 {
 	/* See NOTE in sse_conv_cmplx_4n() */
 

Transceiver52M/arch/x86/convolve_sse_3.h

@@ -23,46 +23,46 @@
 void sse_conv_real4(const float *x, int x_len,
 		    const float *h, int h_len,
 		    float *y, int y_len,
-		    int start, int len);
+		    int start, int len, int step, int offset);
 
 /* 8-tap SSE complex-real convolution */
 void sse_conv_real8(const float *x, int x_len,
 		    const float *h, int h_len,
 		    float *y, int y_len,
-		    int start, int len);
+		    int start, int len, int step, int offset);
 
 /* 12-tap SSE complex-real convolution */
 void sse_conv_real12(const float *x, int x_len,
 		     const float *h, int h_len,
 		     float *y, int y_len,
-		     int start, int len);
+		     int start, int len, int step, int offset);
 
 /* 16-tap SSE complex-real convolution */
 void sse_conv_real16(const float *x, int x_len,
 		     const float *h, int h_len,
 		     float *y, int y_len,
-		     int start, int len);
+		     int start, int len, int step, int offset);
 
 /* 20-tap SSE complex-real convolution */
 void sse_conv_real20(const float *x, int x_len,
 		     const float *h, int h_len,
 		     float *y, int y_len,
-		     int start, int len);
+		     int start, int len, int step, int offset);
 
 /* 4*N-tap SSE complex-real convolution */
 void sse_conv_real4n(const float *x, int x_len,
 		     const float *h, int h_len,
 		     float *y, int y_len,
-		     int start, int len);
+		     int start, int len, int step, int offset);
 
 /* 4*N-tap SSE complex-complex convolution */
 void sse_conv_cmplx_4n(const float *x, int x_len,
 		       const float *h, int h_len,
 		       float *y, int y_len,
-		       int start, int len);
+		       int start, int len, int step, int offset);
 
 /* 8*N-tap SSE complex-complex convolution */
 void sse_conv_cmplx_8n(const float *x, int x_len,
 		       const float *h, int h_len,
 		       float *y, int y_len,
-		       int start, int len);
+		       int start, int len, int step, int offset);

Transceiver52M/device/Makefile.am

@@ -1,6 +1,8 @@
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = common
+noinst_HEADERS = radioDevice.h
+
+SUBDIRS =
 
 if DEVICE_USRP1
 SUBDIRS += usrp1

Transceiver52M/device/common/Makefile.am

@@ -1,12 +0,0 @@
-include $(top_srcdir)/Makefile.common
-
-AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES)
-AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LMS_CFLAGS)
-
-
-noinst_HEADERS = radioDevice.h smpl_buf.h
-
-noinst_LTLIBRARIES = libdevice_common.la
-
-libdevice_common_la_SOURCES = \
-	smpl_buf.cpp

Transceiver52M/device/common/smpl_buf.cpp

@@ -1,169 +0,0 @@
-/*
- * Sample Buffer - Allows reading and writing of timed samples
- *
- * Copyright 2010,2011 Free Software Foundation, Inc.
- * Copyright (C) 2015 Ettus Research LLC
- * Copyright 2019 sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
- *
- * Author: Tom Tsou <tom.tsou@ettus.com>
- *
- * 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.
- */
-
-#include "smpl_buf.h"
-#include <inttypes.h>
-
-smpl_buf::smpl_buf(size_t len)
-	: buf_len(len), time_start(0), time_end(0),
-	  data_start(0), data_end(0)
-{
-	data = new uint32_t[len];
-}
-
-smpl_buf::~smpl_buf()
-{
-	delete[] data;
-}
-
-ssize_t smpl_buf::avail_smpls(TIMESTAMP timestamp) const
-{
-	if (timestamp < time_start)
-		return ERROR_TIMESTAMP;
-	else if (timestamp >= time_end)
-		return 0;
-	else
-		return time_end - timestamp;
-}
-
-ssize_t smpl_buf::read(void *buf, size_t len, TIMESTAMP timestamp)
-{
-	int type_sz = 2 * sizeof(short);
-
-	// Check for valid read
-	if (timestamp < time_start)
-		return ERROR_TIMESTAMP;
-	if (timestamp >= time_end)
-		return 0;
-	if (len >= buf_len)
-		return ERROR_READ;
-
-	// How many samples should be copied
-	size_t num_smpls = time_end - timestamp;
-	if (num_smpls > len)
-		num_smpls = len;
-
-	// Starting index
-	size_t read_start = (data_start + (timestamp - time_start)) % buf_len;
-
-	// Read it
-	if (read_start + num_smpls < buf_len) {
-		size_t numBytes = len * type_sz;
-		memcpy(buf, data + read_start, numBytes);
-	} else {
-		size_t first_cp = (buf_len - read_start) * type_sz;
-		size_t second_cp = len * type_sz - first_cp;
-
-		memcpy(buf, data + read_start, first_cp);
-		memcpy((char*) buf + first_cp, data, second_cp);
-	}
-
-	data_start = (read_start + len) % buf_len;
-	time_start = timestamp + len;
-
-	if (time_start > time_end)
-		return ERROR_READ;
-	else
-		return num_smpls;
-}
-
-ssize_t smpl_buf::write(void *buf, size_t len, TIMESTAMP timestamp)
-{
-	int type_sz = 2 * sizeof(short);
-
-	// Check for valid write
-	if ((len == 0) || (len >= buf_len))
-		return ERROR_WRITE;
-	if ((timestamp + len) <= time_end)
-		return ERROR_TIMESTAMP;
-
-	if (timestamp < time_end) {
-		LOGC(DDEV, ERR) << "Overwriting old buffer data: timestamp="
-				<< timestamp << " time_end=" << time_end;
-		// Do not return error here, because it's a rounding error and is not fatal
-	}
-	if (timestamp > time_end && time_end != 0) {
-		LOGC(DDEV, ERR) << "Skipping buffer data: timestamp="
-				<< timestamp << " time_end=" << time_end;
-		// Do not return error here, because it's a rounding error and is not fatal
-	}
-
-	// Starting index
-	size_t write_start = (data_start + (timestamp - time_start)) % buf_len;
-
-	// Write it
-	if ((write_start + len) < buf_len) {
-		size_t numBytes = len * type_sz;
-		memcpy(data + write_start, buf, numBytes);
-	} else {
-		size_t first_cp = (buf_len - write_start) * type_sz;
-		size_t second_cp = len * type_sz - first_cp;
-
-		memcpy(data + write_start, buf, first_cp);
-		memcpy(data, (char*) buf + first_cp, second_cp);
-	}
-
-	data_end = (write_start + len) % buf_len;
-	time_end = timestamp + len;
-
-	if (!data_start)
-		data_start = write_start;
-
-	if (((write_start + len) > buf_len) && (data_end > data_start))
-		return ERROR_OVERFLOW;
-	else if (time_end <= time_start)
-		return ERROR_WRITE;
-	else
-		return len;
-}
-
-std::string smpl_buf::str_status(TIMESTAMP timestamp) const
-{
-	std::ostringstream ost("Sample buffer: ");
-
-	ost << "timestamp = " << timestamp;
-	ost << ", length = " << buf_len;
-	ost << ", time_start = " << time_start;
-	ost << ", time_end = " << time_end;
-	ost << ", data_start = " << data_start;
-	ost << ", data_end = " << data_end;
-
-	return ost.str();
-}
-
-std::string smpl_buf::str_code(ssize_t code)
-{
-	switch (code) {
-	case ERROR_TIMESTAMP:
-		return "Sample buffer: Requested timestamp is not valid";
-	case ERROR_READ:
-		return "Sample buffer: Read error";
-	case ERROR_WRITE:
-		return "Sample buffer: Write error";
-	case ERROR_OVERFLOW:
-		return "Sample buffer: Overrun";
-	default:
-		return "Sample buffer: Unknown error";
-	}
-}

Transceiver52M/device/common/smpl_buf.h

@@ -1,87 +0,0 @@
-/*
- * Sample Buffer - Allows reading and writing of timed samples
- *
- * Copyright 2010,2011 Free Software Foundation, Inc.
- * Copyright (C) 2015 Ettus Research LLC
- * Copyright 2019 sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
- *
- * Author: Tom Tsou <tom.tsou@ettus.com>
- *
- * 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.
- */
-
-#pragma once
-
-#include <unistd.h>
-
-#include "radioDevice.h"
-
-/*
-    Sample Buffer - Allows reading and writing of timed samples using osmo-trx
-                    timestamps. Time conversions are handled
-                    internally or accessable through the static convert calls.
-*/
-class smpl_buf {
-public:
-	/** Sample buffer constructor
-	    @param len number of 32-bit samples the buffer should hold
-	    @param timestamp
-	*/
-	smpl_buf(size_t len);
-	~smpl_buf();
-
-	/** Query number of samples available for reading
-	    @param timestamp time of first sample
-	    @return number of available samples or error
-	*/
-	ssize_t avail_smpls(TIMESTAMP timestamp) const;
-
-	/** Read and write
-	    @param buf pointer to buffer
-	    @param len number of samples desired to read or write
-	    @param timestamp time of first stample
-	    @return number of actual samples read or written or error
-	*/
-	ssize_t read(void *buf, size_t len, TIMESTAMP timestamp);
-	ssize_t write(void *buf, size_t len, TIMESTAMP timestamp);
-
-	/** Buffer status string
-	    @return a formatted string describing internal buffer state
-	*/
-	std::string str_status(TIMESTAMP timestamp) const;
-
-	/** Formatted error string
-	    @param code an error code
-	    @return a formatted error string
-	*/
-	static std::string str_code(ssize_t code);
-
-	enum err_code {
-		ERROR_TIMESTAMP = -1,
-		ERROR_READ = -2,
-		ERROR_WRITE = -3,
-		ERROR_OVERFLOW = -4
-	};
-
-private:
-	uint32_t *data;
-	size_t buf_len;
-
-	TIMESTAMP time_start;
-	TIMESTAMP time_end;
-
-	size_t data_start;
-	size_t data_end;
-};

Transceiver52M/device/lms/LMSDevice.cpp

@@ -21,7 +21,6 @@
 #include "Logger.h"
 #include "Threads.h"
 #include "LMSDevice.h"
-#include "Utils.h"
 
 #include <lime/LimeSuite.h>
 
@@ -40,7 +39,6 @@ constexpr double LMSDevice::masterClockRate;
 #define GSM_CARRIER_BW 270000.0 /* 270kHz */
 #define LMS_MIN_BW_SUPPORTED 2.5e6 /* 2.5mHz, minimum supported by LMS */
 #define LMS_CALIBRATE_BW_HZ OSMO_MAX(GSM_CARRIER_BW, LMS_MIN_BW_SUPPORTED)
-#define SAMPLE_BUF_SZ    (1 << 20) /* Size of Rx timestamp based Ring buffer, in bytes */
 
 LMSDevice::LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chans, double lo_offset,
 		     const std::vector<std::string>& tx_paths,
@@ -48,35 +46,15 @@ LMSDevice::LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t c
 	RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths),
 	m_lms_dev(NULL)
 {
-	LOGC(DDEV, INFO) << "creating LMS device...";
+	LOG(INFO) << "creating LMS device...";
 
 	m_lms_stream_rx.resize(chans);
 	m_lms_stream_tx.resize(chans);
 
 	m_last_rx_underruns.resize(chans, 0);
 	m_last_rx_overruns.resize(chans, 0);
-	m_last_rx_dropped.resize(chans, 0);
 	m_last_tx_underruns.resize(chans, 0);
-
-	rx_buffers.resize(chans);
-}
-
-LMSDevice::~LMSDevice()
-{
-	unsigned int i;
-	LOGC(DDEV, INFO) << "Closing LMS device";
-	if (m_lms_dev) {
-		/* disable all channels */
-		for (i=0; i<chans; i++) {
-			LMS_EnableChannel(m_lms_dev, LMS_CH_RX, i, false);
-			LMS_EnableChannel(m_lms_dev, LMS_CH_TX, i, false);
-		}
-		LMS_Close(m_lms_dev);
-		m_lms_dev = NULL;
-	}
-
-	for (size_t i = 0; i < rx_buffers.size(); i++)
-		delete rx_buffers[i];
+	m_last_tx_overruns.resize(chans, 0);
 }
 
 static void lms_log_callback(int lvl, const char *msg)
@@ -84,208 +62,169 @@ static void lms_log_callback(int lvl, const char *msg)
 	/* map lime specific log levels */
 	static const int lvl_map[5] = {
 		[0] = LOGL_FATAL,
-		[LMS_LOG_ERROR] = LOGL_ERROR,
-		[LMS_LOG_WARNING] = LOGL_NOTICE,
-		[LMS_LOG_INFO] = LOGL_INFO,
-		[LMS_LOG_DEBUG] = LOGL_DEBUG,
+		[1] = LOGL_ERROR,
+		[2] = LOGL_NOTICE,
+		[3] = LOGL_INFO,
+		[4] = LOGL_DEBUG,
 	};
 	/* protect against future higher log level values (lower importance) */
 	if ((unsigned int) lvl >= ARRAY_SIZE(lvl_map))
 		lvl = ARRAY_SIZE(lvl_map)-1;
 
-	LOGLV(DLMS, lvl_map[lvl]) << msg;
+	LOGLV(DLMS, lvl) << msg;
+}
+
+static void thread_enable_cancel(bool cancel)
+{
+	cancel ? pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) :
+		 pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
 }
 
 static void print_range(const char* name, lms_range_t *range)
 {
-	LOGC(DDEV, INFO) << name << ": Min=" << range->min << " Max=" << range->max
+	LOG(DEBUG) << name << ": Min=" << range->min << " Max=" << range->max
 		   << " Step=" << range->step;
 }
 
-/*! Find the device string that matches all filters from \a args.
- *  \param[in] info_list device addresses found by LMS_GetDeviceList()
- *  \param[in] count length of info_list
- *  \param[in] args dev-args value from osmo-trx.cfg, containing comma separated key=value pairs
- *  \return index of first matching device or -1 (no match) */
-int info_list_find(lms_info_str_t* info_list, unsigned int count, const std::string &args)
-{
-	unsigned int i, j;
-	vector<string> filters;
-
-	filters = comma_delimited_to_vector(args.c_str());
-
-	/* iterate over device addresses */
-	for (i=0; i < count; i++) {
-		/* check if all filters match */
-		bool match = true;
-		for (j=0; j < filters.size(); j++) {
-			if (!strstr(info_list[i], filters[j].c_str())) {
-				match = false;
-				break;
-			}
-		}
-
-		if (match)
-			return i;
-	}
-	return -1;
-}
-
 int LMSDevice::open(const std::string &args, int ref, bool swap_channels)
 {
+	//lms_info_str_t dev_str;
 	lms_info_str_t* info_list;
-	const lms_dev_info_t* device_info;
-	lms_range_t range_sr;
-	float_type sr_host, sr_rf;
+	lms_range_t range_lpfbw_rx, range_lpfbw_tx, range_sr;
+	float_type sr_host, sr_rf, lpfbw_rx, lpfbw_tx;
+	uint16_t dac_val;
 	unsigned int i, n;
-	int rc, dev_id;
+	int rc;
 
-	LOGC(DDEV, INFO) << "Opening LMS device..";
+	LOG(INFO) << "Opening LMS device..";
 
 	LMS_RegisterLogHandler(&lms_log_callback);
 
 	if ((n = LMS_GetDeviceList(NULL)) < 0)
-		LOGC(DDEV, ERROR) << "LMS_GetDeviceList(NULL) failed";
-	LOGC(DDEV, INFO) << "Devices found: " << n;
+		LOG(ERROR) << "LMS_GetDeviceList(NULL) failed";
+	LOG(DEBUG) << "Devices found: " << n;
 	if (n < 1)
 	    return -1;
 
 	info_list = new lms_info_str_t[n];
 
 	if (LMS_GetDeviceList(info_list) < 0)
-		LOGC(DDEV, ERROR) << "LMS_GetDeviceList(info_list) failed";
+		LOG(ERROR) << "LMS_GetDeviceList(info_list) failed";
 
 	for (i = 0; i < n; i++)
-		LOGC(DDEV, INFO) << "Device [" << i << "]: " << info_list[i];
+		LOG(DEBUG) << "Device [" << i << "]: " << info_list[i];
 
-	dev_id = info_list_find(info_list, n, args);
-	if (dev_id == -1) {
-		LOGC(DDEV, ERROR) << "No LMS device found with address '" << args << "'";
-		delete[] info_list;
-		return -1;
-	}
-
-	LOGC(DDEV, INFO) << "Using device[" << dev_id << "]";
-	rc = LMS_Open(&m_lms_dev, info_list[dev_id], NULL);
+	rc = LMS_Open(&m_lms_dev, info_list[0], NULL);
 	if (rc != 0) {
-		LOGC(DDEV, ERROR) << "LMS_GetDeviceList() failed)";
+		LOG(ERROR) << "LMS_GetDeviceList() failed)";
 		delete [] info_list;
 		return -1;
 	}
 
 	delete [] info_list;
 
-	device_info = LMS_GetDeviceInfo(m_lms_dev);
-
-	if ((ref != REF_EXTERNAL) && (ref != REF_INTERNAL)){
-		LOGC(DDEV, ERROR) << "Invalid reference type";
-		goto out_close;
-	}
-
-	/* if reference clock is external setup must happen _before_ calling LMS_Init */
-	/* FIXME make external reference frequency configurable */
-	if (ref == REF_EXTERNAL) {
-		LOGC(DDEV, INFO) << "Setting External clock reference to 10MHz";
-		/* Assume an external 10 MHz reference clock */
-		if (LMS_SetClockFreq(m_lms_dev, LMS_CLOCK_EXTREF, 10000000.0) < 0)
-			goto out_close;
-	}
-
-	LOGC(DDEV, INFO) << "Init LMS device";
+	LOG(INFO) << "Init LMS device";
 	if (LMS_Init(m_lms_dev) != 0) {
-		LOGC(DDEV, ERROR) << "LMS_Init() failed";
-		goto out_close;
+		LOG(ERROR) << "LMS_Init() failed";
+		return -1;
 	}
 
-	/* LimeSDR-Mini does not have switches but needs soldering to select external/internal clock */
-	/* LimeNET-Micro also does not like selecting internal clock*/
-	/* also set device specific maximum tx levels selected by phasenoise measurements*/
-	if (strncmp(device_info->deviceName,"LimeSDR-USB",11) == 0){
-		/* if reference clock is internal setup must happen _after_ calling LMS_Init */
-		/* according to lms using LMS_CLOCK_EXTREF with a frequency <= 0 is the correct way to set clock to internal reference*/
-		if (ref == REF_INTERNAL) {
-			LOGC(DDEV, INFO) << "Setting Internal clock reference";
-			if (LMS_SetClockFreq(m_lms_dev, LMS_CLOCK_EXTREF, -1) < 0)
-				goto out_close;
-		}
-		maxTxGainClamp = 73.0;
-	} else if (strncmp(device_info->deviceName,"LimeSDR-Mini",12) == 0)
-		maxTxGainClamp = 66.0;
-	else
-		maxTxGainClamp = 71.0; /* "LimeNET-Micro", etc FIXME pciE based LMS boards?*/
-
-	/* enable all used channels */
-	for (i=0; i<chans; i++) {
-		if (LMS_EnableChannel(m_lms_dev, LMS_CH_RX, i, true) < 0)
-			goto out_close;
-		if (LMS_EnableChannel(m_lms_dev, LMS_CH_TX, i, true) < 0)
-			goto out_close;
-	}
-
-	/* set samplerate */
 	if (LMS_GetSampleRateRange(m_lms_dev, LMS_CH_RX, &range_sr))
 		goto out_close;
 	print_range("Sample Rate", &range_sr);
 
-	LOGC(DDEV, INFO) << "Setting sample rate to " << GSMRATE*tx_sps << " " << tx_sps;
+	LOG(DEBUG) << "Setting sample rate to " << GSMRATE*tx_sps << " " << tx_sps;
 	if (LMS_SetSampleRate(m_lms_dev, GSMRATE*tx_sps, 32) < 0)
 		goto out_close;
 
 	if (LMS_GetSampleRate(m_lms_dev, LMS_CH_RX, 0, &sr_host, &sr_rf))
 		goto out_close;
-	LOGC(DDEV, INFO) << "Sample Rate: Host=" << sr_host << " RF=" << sr_rf;
+	LOG(DEBUG) << "Sample Rate: Host=" << sr_host << " RF=" << sr_rf;
 
 	/* FIXME: make this device/model dependent, like UHDDevice:dev_param_map! */
 	ts_offset = static_cast<TIMESTAMP>(8.9e-5 * GSMRATE * tx_sps); /* time * sample_rate */
 
-	/* configure antennas */
-	if (!set_antennas()) {
-		LOGC(DDEV, FATAL) << "LMS antenna setting failed";
+	switch (ref) {
+	case REF_INTERNAL:
+		LOG(DEBUG) << "Setting Internal clock reference";
+		/* Ugly API: Selecting clock source implicit by writing to VCTCXO DAC ?!? */
+		if (LMS_VCTCXORead(m_lms_dev, &dac_val) < 0)
+			goto out_close;
+		LOG(DEBUG) << "Setting VCTCXO to " << dac_val;
+		if (LMS_VCTCXOWrite(m_lms_dev, dac_val) < 0)
+			goto out_close;
+		break;
+	case REF_EXTERNAL:
+		LOG(DEBUG) << "Setting External clock reference to " << 10000000.0;
+		/* Assume an external 10 MHz reference clock */
+		if (LMS_SetClockFreq(m_lms_dev, LMS_CLOCK_EXTREF, 10000000.0) < 0)
+			goto out_close;
+		break;
+	default:
+		LOG(ALERT) << "Invalid reference type";
 		goto out_close;
 	}
 
-	/* 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));
+	if (LMS_GetLPFBWRange(m_lms_dev, LMS_CH_RX, &range_lpfbw_rx))
+		goto out_close;
+	print_range("LPFBWRange Rx", &range_lpfbw_rx);
+	if (LMS_GetLPFBWRange(m_lms_dev, LMS_CH_RX, &range_lpfbw_tx))
+		goto out_close;
+	print_range("LPFBWRange Tx", &range_lpfbw_tx);
+	lpfbw_rx = OSMO_MIN(OSMO_MAX(1.4001e6, range_lpfbw_rx.min), range_lpfbw_rx.max);
+	lpfbw_tx = OSMO_MIN(OSMO_MAX(5.2e6, range_lpfbw_tx.min), range_lpfbw_tx.max);
 
+	LOG(DEBUG) << "LPFBW: Rx=" << lpfbw_rx << " Tx=" << lpfbw_tx;
+
+	if (!set_antennas()) {
+		LOG(ALERT) << "LMS antenna setting failed";
+		return -1;
+	}
+
+	/* Perform Rx and Tx calibration */
+	for (i=0; i<chans; i++) {
+		LOG(INFO) << "Setting LPFBW chan " << i;
+		if (LMS_SetLPFBW(m_lms_dev, LMS_CH_RX, i, lpfbw_rx) < 0)
+			goto out_close;
+		if (LMS_SetLPFBW(m_lms_dev, LMS_CH_TX, i, lpfbw_tx) < 0)
+			goto out_close;
+		LOG(INFO) << "Calibrating chan " << i;
+		if (LMS_Calibrate(m_lms_dev, LMS_CH_RX, i, LMS_CALIBRATE_BW_HZ, 0) < 0)
+			goto out_close;
+		if (LMS_Calibrate(m_lms_dev, LMS_CH_TX, i, LMS_CALIBRATE_BW_HZ, 0) < 0)
+			goto out_close;
+	}
+
+	samplesRead = 0;
+	samplesWritten = 0;
 	started = false;
 
 	return NORMAL;
 
 out_close:
-	LOGC(DDEV, FATAL) << "Error in LMS open, closing: " << LMS_GetLastErrorMessage();
+	LOG(ALERT) << "Error in LMS open, closing: " << LMS_GetLastErrorMessage();
 	LMS_Close(m_lms_dev);
-	m_lms_dev = NULL;
 	return -1;
 }
 
 bool LMSDevice::start()
 {
-	LOGC(DDEV, INFO) << "starting LMS...";
+	LOG(INFO) << "starting LMS...";
 
 	unsigned int i;
 
-	if (started) {
-		LOGC(DDEV, ERR) << "Device already started";
-		return false;
-	}
-
 	/* configure the channels/streams */
 	for (i=0; i<chans; i++) {
-		/* Set gains for calibration/filter setup */
-		/* TX gain to maximum */
-		setTxGain(maxTxGain(), i);
-		/* RX gain to midpoint */
+		if (LMS_EnableChannel(m_lms_dev, LMS_CH_RX, i, true) < 0)
+			return false;
+
+		if (LMS_EnableChannel(m_lms_dev, LMS_CH_TX, i, true) < 0)
+			return false;
+
+		// Set gains to midpoint
+		setTxGain((minTxGain() + maxTxGain()) / 2, i);
 		setRxGain((minRxGain() + maxRxGain()) / 2, i);
 
-		/* set up Rx and Tx filters */
-		if (!do_filters(i))
-			return false;
-		/* Perform Rx and Tx calibration */
-		if (!do_calib(i))
-			return false;
-
-		/* configure Streams */
 		m_lms_stream_rx[i] = {};
 		m_lms_stream_rx[i].isTx = false;
 		m_lms_stream_rx[i].channel = i;
@@ -333,59 +272,17 @@ bool LMSDevice::stop()
 	for (i=0; i<chans; i++) {
 		LMS_StopStream(&m_lms_stream_tx[i]);
 		LMS_StopStream(&m_lms_stream_rx[i]);
+
+		LMS_EnableChannel(m_lms_dev, LMS_CH_RX, i, false);
+		LMS_EnableChannel(m_lms_dev, LMS_CH_TX, i, false);
 	}
 
-	for (i=0; i<chans; i++) {
-		LMS_DestroyStream(m_lms_dev, &m_lms_stream_tx[i]);
-		LMS_DestroyStream(m_lms_dev, &m_lms_stream_rx[i]);
-	}
-
-	started = false;
 	return true;
 }
 
-/* do rx/tx calibration - depends on gain, freq and bw */
-bool LMSDevice::do_calib(size_t chan)
-{
-	LOGCHAN(chan, DDEV, INFO) << "Calibrating";
-	if (LMS_Calibrate(m_lms_dev, LMS_CH_RX, chan, LMS_CALIBRATE_BW_HZ, 0) < 0)
-		return false;
-	if (LMS_Calibrate(m_lms_dev, LMS_CH_TX, chan, LMS_CALIBRATE_BW_HZ, 0) < 0)
-		return false;
-	return true;
-}
-
-/* do rx/tx filter config - depends on bw only? */
-bool LMSDevice::do_filters(size_t chan)
-{
-	lms_range_t range_lpfbw_rx, range_lpfbw_tx;
-	float_type lpfbw_rx, lpfbw_tx;
-
-	LOGCHAN(chan, DDEV, INFO) << "Setting filters";
-	if (LMS_GetLPFBWRange(m_lms_dev, LMS_CH_RX, &range_lpfbw_rx))
-		return false;
-	print_range("LPFBWRange Rx", &range_lpfbw_rx);
-	if (LMS_GetLPFBWRange(m_lms_dev, LMS_CH_RX, &range_lpfbw_tx))
-		return false;
-	print_range("LPFBWRange Tx", &range_lpfbw_tx);
-
-	lpfbw_rx = OSMO_MIN(OSMO_MAX(1.4001e6, range_lpfbw_rx.min), range_lpfbw_rx.max);
-	lpfbw_tx = OSMO_MIN(OSMO_MAX(5.2e6, range_lpfbw_tx.min), range_lpfbw_tx.max);
-
-	LOGCHAN(chan, DDEV, INFO) << "LPFBW: Rx=" << lpfbw_rx << " Tx=" << lpfbw_tx;
-
-	LOGCHAN(chan, DDEV, INFO) << "Setting LPFBW";
-	if (LMS_SetLPFBW(m_lms_dev, LMS_CH_RX, chan, lpfbw_rx) < 0)
-		return false;
-	if (LMS_SetLPFBW(m_lms_dev, LMS_CH_TX, chan, lpfbw_tx) < 0)
-		return false;
-	return true;
-}
-
-
 double LMSDevice::maxTxGain()
 {
-	return maxTxGainClamp;
+	return 73.0;
 }
 
 double LMSDevice::minTxGain()
@@ -405,30 +302,42 @@ double LMSDevice::minRxGain()
 
 double LMSDevice::setTxGain(double dB, size_t chan)
 {
+	if (chan) {
+		LOG(ALERT) << "Invalid channel " << chan;
+		return 0.0;
+	}
+
 	if (dB > maxTxGain())
 		dB = maxTxGain();
 	if (dB < minTxGain())
 		dB = minTxGain();
 
-	LOGCHAN(chan, DDEV, NOTICE) << "Setting TX gain to " << dB << " dB";
+	LOG(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";
+		LOG(ERR) << "Error setting TX gain";
 
 	return dB;
 }
 
 double LMSDevice::setRxGain(double dB, size_t chan)
 {
+	if (chan) {
+		LOG(ALERT) << "Invalid channel " << chan;
+		return 0.0;
+	}
+
+	dB = 34.0;
+
 	if (dB > maxRxGain())
 		dB = maxRxGain();
 	if (dB < minRxGain())
 		dB = minRxGain();
 
-	LOGCHAN(chan, DDEV, NOTICE) << "Setting RX gain to " << dB << " dB";
+	LOG(NOTICE) << "Setting RX gain to " << dB << " dB.";
 
 	if (LMS_SetGaindB(m_lms_dev, LMS_CH_RX, chan, dB) < 0)
-		LOGCHAN(chan, DDEV, ERR) << "Error setting RX gain to " << dB << " dB";
+		LOG(ERR) << "Error setting RX gain";
 
 	return dB;
 }
@@ -452,7 +361,7 @@ bool LMSDevice::flush_recv(size_t num_pkts)
 {
 	#define CHUNK 625
 	int len = CHUNK * tx_sps;
-	short *buffer = (short*) alloca(sizeof(short) * len * 2);
+	short *buffer = new short[len * 2];
 	int rc;
 	lms_stream_meta_t rx_metadata = {};
 	rx_metadata.flushPartialPacket = false;
@@ -462,16 +371,18 @@ bool LMSDevice::flush_recv(size_t num_pkts)
 
 	while (!ts_initial || (num_pkts-- > 0)) {
 		rc = LMS_RecvStream(&m_lms_stream_rx[0], &buffer[0], len, &rx_metadata, 100);
-		LOGC(DDEV, DEBUG) << "Flush: Recv buffer of len " << rc << " at " << std::hex << rx_metadata.timestamp;
+		LOG(DEBUG) << "Flush: Recv buffer of len " << rc << " at " << std::hex << rx_metadata.timestamp;
 		if (rc != len) {
-			LOGC(DDEV, ERROR) << "Flush: Device receive timed out";
+			LOG(ALERT) << "LMS: Device receive timed out";
+			delete[] buffer;
 			return false;
 		}
 
 		ts_initial = rx_metadata.timestamp + len;
 	}
 
-	LOGC(DDEV, INFO) << "Initial timestamp " << ts_initial << std::endl;
+	LOG(INFO) << "Initial timestamp " << ts_initial << std::endl;
+	delete[] buffer;
 	return true;
 }
 
@@ -480,18 +391,18 @@ bool LMSDevice::setRxAntenna(const std::string & ant, size_t chan)
 	int idx;
 
 	if (chan >= rx_paths.size()) {
-		LOGC(DDEV, ERROR) << "Requested non-existent channel " << chan;
+		LOG(ALERT) << "Requested non-existent channel " << chan;
 		return false;
 	}
 
 	idx = get_ant_idx(ant, LMS_CH_RX, chan);
 	if (idx < 0) {
-		LOGCHAN(chan, DDEV, ERROR) << "Invalid Rx Antenna";
+		LOG(ALERT) << "Invalid Rx Antenna";
 		return false;
 	}
 
 	if (LMS_SetAntenna(m_lms_dev, LMS_CH_RX, chan, idx) < 0) {
-		LOGCHAN(chan, DDEV, ERROR) << "Unable to set Rx Antenna";
+		LOG(ALERT) << "Unable to set Rx Antenna";
 	}
 
 	return true;
@@ -503,18 +414,18 @@ std::string LMSDevice::getRxAntenna(size_t chan)
 	int idx;
 
 	if (chan >= rx_paths.size()) {
-		LOGC(DDEV, ERROR) << "Requested non-existent channel " << chan;
+		LOG(ALERT) << "Requested non-existent channel " << chan;
 		return "";
 	}
 
 	idx = LMS_GetAntenna(m_lms_dev, LMS_CH_RX, chan);
 	if (idx < 0) {
-		LOGCHAN(chan, DDEV, ERROR) << "Error getting Rx Antenna";
+		LOG(ALERT) << "Error getting Rx Antenna";
 		return "";
 	}
 
 	if (LMS_GetAntennaList(m_lms_dev, LMS_CH_RX, chan, name_list) < idx) {
-		LOGCHAN(chan, DDEV, ERROR) << "Error getting Rx Antenna List";
+		LOG(ALERT) << "Error getting Rx Antenna List";
 		return "";
 	}
 
@@ -526,18 +437,18 @@ bool LMSDevice::setTxAntenna(const std::string & ant, size_t chan)
 	int idx;
 
 	if (chan >= tx_paths.size()) {
-		LOGC(DDEV, ERROR) << "Requested non-existent channel " << chan;
+		LOG(ALERT) << "Requested non-existent channel " << chan;
 		return false;
 	}
 
 	idx = get_ant_idx(ant, LMS_CH_TX, chan);
 	if (idx < 0) {
-		LOGCHAN(chan, DDEV, ERROR) << "Invalid Rx Antenna";
+		LOG(ALERT) << "Invalid Rx Antenna";
 		return false;
 	}
 
 	if (LMS_SetAntenna(m_lms_dev, LMS_CH_TX, chan, idx) < 0) {
-		LOGCHAN(chan, DDEV, ERROR) << "Unable to set Rx Antenna";
+		LOG(ALERT) << "Unable to set Rx Antenna";
 	}
 
 	return true;
@@ -549,18 +460,18 @@ std::string LMSDevice::getTxAntenna(size_t chan)
 	int idx;
 
 	if (chan >= tx_paths.size()) {
-		LOGC(DDEV, ERROR) << "Requested non-existent channel " << chan;
+		LOG(ALERT) << "Requested non-existent channel " << chan;
 		return "";
 	}
 
 	idx = LMS_GetAntenna(m_lms_dev, LMS_CH_TX, chan);
 	if (idx < 0) {
-		LOGCHAN(chan, DDEV, ERROR) << "Error getting Tx Antenna";
+		LOG(ALERT) << "Error getting Tx Antenna";
 		return "";
 	}
 
 	if (LMS_GetAntennaList(m_lms_dev, LMS_CH_TX, chan, name_list) < idx) {
-		LOGCHAN(chan, DDEV, ERROR) << "Error getting Tx Antenna List";
+		LOG(ALERT) << "Error getting Tx Antenna List";
 		return "";
 	}
 
@@ -573,122 +484,66 @@ bool LMSDevice::requiresRadioAlign()
 }
 
 GSM::Time LMSDevice::minLatency() {
-	/* UNUSED on limesdr (only used on usrp1/2) */
-	return GSM::Time(0,0);
-}
-
-void LMSDevice::update_stream_stats(size_t chan, bool * underrun, bool * overrun)
-{
-	lms_stream_status_t status;
-	if (LMS_GetStreamStatus(&m_lms_stream_rx[chan], &status) == 0) {
-		if (status.underrun > m_last_rx_underruns[chan]) {
-			*underrun = true;
-			LOGCHAN(chan, DDEV, ERROR) << "recv Underrun! ("
-						   << m_last_rx_underruns[chan] << " -> "
-						   << status.underrun << ")";
-		}
-		m_last_rx_underruns[chan] = status.underrun;
-
-		if (status.overrun > m_last_rx_overruns[chan]) {
-			*overrun = true;
-			LOGCHAN(chan, DDEV, ERROR) << "recv Overrun! ("
-						   << m_last_rx_overruns[chan] << " -> "
-						   << status.overrun << ")";
-		}
-		m_last_rx_overruns[chan] = status.overrun;
-
-		if (status.droppedPackets > m_last_rx_dropped[chan]) {
-			LOGCHAN(chan, DDEV, ERROR) << "recv Dropped packets by HW! ("
-						   << m_last_rx_dropped[chan] << " -> "
-						   << status.droppedPackets << ")";
-		}
-		m_last_rx_dropped[chan] = m_last_rx_overruns[chan];
-	}
+	/* Empirical data from a handful of
+	relatively recent machines shows that the B100 will underrun when
+	the transmit threshold is reduced to a time of 6 and a half frames,
+	so we set a minimum 7 frame threshold. */
+	return GSM::Time(6,7);
 }
 
 // NOTE: Assumes sequential reads
 int LMSDevice::readSamples(std::vector < short *>&bufs, int len, bool * overrun,
 			   TIMESTAMP timestamp, bool * underrun, unsigned *RSSI)
 {
-	int rc, num_smpls, expect_smpls;
-	ssize_t avail_smpls;
-	TIMESTAMP expect_timestamp;
+	int rc = 0;
 	unsigned int i;
+	lms_stream_status_t status;
 	lms_stream_meta_t rx_metadata = {};
 	rx_metadata.flushPartialPacket = false;
 	rx_metadata.waitForTimestamp = false;
 	rx_metadata.timestamp = 0;
 
 	if (bufs.size() != chans) {
-		LOGC(DDEV, ERROR) << "Invalid channel combination " << bufs.size();
+		LOG(ALERT) << "Invalid channel combination " << bufs.size();
 		return -1;
 	}
 
 	*overrun = false;
 	*underrun = false;
-
-	/* Check that timestamp is valid */
-	rc = rx_buffers[0]->avail_smpls(timestamp);
-	if (rc < 0) {
-		LOGC(DDEV, ERROR) << rx_buffers[0]->str_code(rc);
-		LOGC(DDEV, ERROR) << rx_buffers[0]->str_status(timestamp);
-		return 0;
-	}
-
 	for (i = 0; i<chans; i++) {
-		/* Receive samples from HW until we have enough */
-		while ((avail_smpls = rx_buffers[i]->avail_smpls(timestamp)) < len) {
-			thread_enable_cancel(false);
-			num_smpls = LMS_RecvStream(&m_lms_stream_rx[i], bufs[i], len - avail_smpls, &rx_metadata, 100);
-			update_stream_stats(i, underrun, overrun);
-			thread_enable_cancel(true);
-			if (num_smpls <= 0) {
-				LOGCHAN(i, DDEV, ERROR) << "Device receive timed out (" << rc << " vs exp " << len << ").";
-				return -1;
-			}
-
-			LOGCHAN(i, DDEV, DEBUG) "Received timestamp = " << (TIMESTAMP)rx_metadata.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)rx_metadata.timestamp)
-				LOGCHAN(i, DDEV, ERROR) << "Unexpected recv buffer timestamp: expect "
-							<< expect_timestamp << " got " << (TIMESTAMP)rx_metadata.timestamp
-							<< ", diff=" << rx_metadata.timestamp - expect_timestamp;
-
-			rc = rx_buffers[i]->write(bufs[i], num_smpls, (TIMESTAMP)rx_metadata.timestamp);
-			if (rc < 0) {
-				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;
-			}
+		thread_enable_cancel(false);
+		rc = LMS_RecvStream(&m_lms_stream_rx[i], bufs[i], len, &rx_metadata, 100);
+		if (timestamp != (TIMESTAMP)rx_metadata.timestamp)
+			LOG(ALERT) << "chan "<< i << " recv buffer of len " << rc << " expect " << std::hex << timestamp << " got " << std::hex << (TIMESTAMP)rx_metadata.timestamp << " (" << std::hex << rx_metadata.timestamp <<") diff=" << rx_metadata.timestamp - timestamp;
+		if (rc != len) {
+			LOG(ALERT) << "LMS: Device receive timed out";
 		}
+
+		if (LMS_GetStreamStatus(&m_lms_stream_rx[i], &status) == 0) {
+			if (status.underrun > m_last_rx_underruns[i])
+				*underrun = true;
+			m_last_rx_underruns[i] = status.underrun;
+
+			if (status.overrun > m_last_rx_overruns[i])
+				*overrun = true;
+			m_last_rx_overruns[i] = status.overrun;
+		}
+		thread_enable_cancel(true);
 	}
 
-	/* We have enough samples */
-	for (size_t i = 0; i < rx_buffers.size(); i++) {
-		rc = rx_buffers[i]->read(bufs[i], len, timestamp);
-		if ((rc < 0) || (rc != len)) {
-			LOGC(DDEV, ERROR) << rx_buffers[i]->str_code(rc);
-			LOGC(DDEV, ERROR) << rx_buffers[i]->str_status(timestamp);
-			return 0;
-		}
-	}
+	samplesRead += rc;
 
-	return len;
+	if (((TIMESTAMP) rx_metadata.timestamp) < timestamp)
+		rc = 0;
+
+	return rc;
 }
 
 int LMSDevice::writeSamples(std::vector < short *>&bufs, int len,
 			    bool * underrun, unsigned long long timestamp,
 			    bool isControl)
 {
-	int rc = 0;
+	int rc;
 	unsigned int i;
 	lms_stream_status_t status;
 	lms_stream_meta_t tx_metadata = {};
@@ -697,23 +552,23 @@ int LMSDevice::writeSamples(std::vector < short *>&bufs, int len,
 	tx_metadata.timestamp = timestamp - ts_offset;	/* Shift Tx time by offset */
 
 	if (isControl) {
-		LOGC(DDEV, ERROR) << "Control packets not supported";
+		LOG(ERR) << "Control packets not supported";
 		return 0;
 	}
 
 	if (bufs.size() != chans) {
-		LOGC(DDEV, ERROR) << "Invalid channel combination " << bufs.size();
+		LOG(ALERT) << "Invalid channel combination " << bufs.size();
 		return -1;
 	}
 
 	*underrun = false;
 
 	for (i = 0; i<chans; i++) {
-		LOGCHAN(i, DDEV, DEBUG) << "send buffer of len " << len << " timestamp " << std::hex << tx_metadata.timestamp;
+		LOG(DEBUG) << "chan "<< i << " send buffer of len " << len << " timestamp " << std::hex << tx_metadata.timestamp;
 		thread_enable_cancel(false);
 		rc = LMS_SendStream(&m_lms_stream_tx[i], bufs[i], len, &tx_metadata, 100);
 		if (rc != len) {
-			LOGCHAN(i, DDEV, ERROR) << "LMS: Device send timed out";
+			LOG(ALERT) << "LMS: Device send timed out";
 		}
 
 		if (LMS_GetStreamStatus(&m_lms_stream_tx[i], &status) == 0) {
@@ -724,6 +579,8 @@ int LMSDevice::writeSamples(std::vector < short *>&bufs, int len,
 		thread_enable_cancel(true);
 	}
 
+	samplesWritten += rc;
+
 	return rc;
 }
 
@@ -734,10 +591,14 @@ bool LMSDevice::updateAlignment(TIMESTAMP timestamp)
 
 bool LMSDevice::setTxFreq(double wFreq, size_t chan)
 {
-	LOGCHAN(chan, DDEV, NOTICE) << "Setting Tx Freq to " << wFreq << " Hz";
+
+	if (chan) {
+		LOG(ALERT) << "Invalid channel " << chan;
+		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";
+		LOG(ALERT) << "set Tx: " << wFreq << " failed!";
 		return false;
 	}
 
@@ -746,10 +607,13 @@ bool LMSDevice::setTxFreq(double wFreq, size_t chan)
 
 bool LMSDevice::setRxFreq(double wFreq, size_t chan)
 {
-	LOGCHAN(chan, DDEV, NOTICE) << "Setting Rx Freq to " << wFreq << " Hz";
+	if (chan) {
+		LOG(ALERT) << "Invalid channel " << chan;
+		return false;
+	}
 
 	if (LMS_SetLOFrequency(m_lms_dev, LMS_CH_RX, chan, wFreq) < 0) {
-		LOGCHAN(chan, DDEV, ERROR) << "Error setting Rx Freq to " << wFreq << " Hz";
+		LOG(ALERT) << "set Rx: " << wFreq << " failed!";
 		return false;
 	}
 
@@ -761,13 +625,5 @@ RadioDevice *RadioDevice::make(size_t tx_sps, size_t rx_sps,
 			       const std::vector < std::string > &tx_paths,
 			       const std::vector < std::string > &rx_paths)
 {
-	if (tx_sps != rx_sps) {
-		LOGC(DDEV, ERROR) << "LMS Requires tx_sps == rx_sps";
-		return NULL;
-	}
-	if (lo_offset != 0.0) {
-		LOGC(DDEV, ERROR) << "LMS doesn't support lo_offset";
-		return NULL;
-	}
 	return new LMSDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths);
 }

Transceiver52M/device/lms/LMSDevice.h

@@ -20,7 +20,6 @@
 #endif
 
 #include "radioDevice.h"
-#include "smpl_buf.h"
 
 #include <sys/time.h>
 #include <math.h>
@@ -29,14 +28,7 @@
 #include <iostream>
 #include <lime/LimeSuite.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:
- * 	A^2 = I^2 + Q^2
- * 	A^2 = (1/sqrt(2))^2 + (1/sqrt(2))^2
- * 	A^2 = 1/2 + 1/2
- * 	A^2 = 1 */
-#define LIMESDR_TX_AMPL  0.707
+#define LIMESDR_TX_AMPL  0.3
 
 /** A class to handle a LimeSuite supported device */
 class LMSDevice:public RadioDevice {
@@ -51,26 +43,23 @@ private:
 
 	std::vector<uint32_t> m_last_rx_underruns;
 	std::vector<uint32_t> m_last_rx_overruns;
-	std::vector<uint32_t> m_last_rx_dropped;
 	std::vector<uint32_t> m_last_tx_underruns;
-
-	std::vector<smpl_buf *> rx_buffers;
+	std::vector<uint32_t> m_last_tx_overruns;
 
 	double actualSampleRate;	///< the actual USRP sampling rate
 
+	unsigned long long samplesRead;	///< number of samples read from LMS
+	unsigned long long samplesWritten;	///< number of samples sent to LMS
+
 	bool started;		///< flag indicates LMS has started
 	bool skipRx;		///< set if LMS is transmit-only.
 
 	TIMESTAMP ts_initial, ts_offset;
 
 	double rxGain;
-	double maxTxGainClamp;
 
-	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);
 	bool flush_recv(size_t num_pkts);
-	void update_stream_stats(size_t chan, bool * underrun, bool * overrun);
 
 public:
 
@@ -78,7 +67,6 @@ public:
 	LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chans, double lo_offset,
 		  const std::vector<std::string>& tx_paths,
 		  const std::vector<std::string>& rx_paths);
-	~LMSDevice();
 
 	/** Instantiate the LMS */
 	int open(const std::string &args, int ref, bool swap_channels);
@@ -203,6 +191,12 @@ public:
 	inline double getSampleRate() {
 		return actualSampleRate;
 	}
+	inline double numberRead() {
+		return samplesRead;
+	}
+	inline double numberWritten() {
+		return samplesWritten;
+	}
 };
 
 #endif // _LMS_DEVICE_H_

Transceiver52M/device/lms/Makefile.am

@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.common
 
-AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common
+AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/..
 AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LMS_CFLAGS)
 
 noinst_HEADERS = LMSDevice.h
@@ -8,4 +8,3 @@ noinst_HEADERS = LMSDevice.h
 noinst_LTLIBRARIES = libdevice.la
 
 libdevice_la_SOURCES = LMSDevice.cpp
-libdevice_la_LIBADD = $(top_builddir)/Transceiver52M/device/common/libdevice_common.la

Transceiver52M/device/radioDevice.h

@@ -58,6 +58,13 @@ class RadioDevice {
   /** Initialize the USRP */
   virtual int open(const std::string &args, int ref, bool swap_channels)=0;
 
+  RadioDevice(size_t tx_sps, size_t rx_sps, InterfaceType type, size_t chans, double offset,
+              const std::vector<std::string>& tx_paths,
+              const std::vector<std::string>& rx_paths):
+		tx_sps(tx_sps), rx_sps(rx_sps), iface(type), chans(chans), lo_offset(offset),
+		tx_paths(tx_paths), rx_paths(rx_paths)
+	{ }
+
   virtual ~RadioDevice() { }
 
   /** Start the USRP */
@@ -161,6 +168,8 @@ class RadioDevice {
   virtual double getTxFreq(size_t chan = 0) = 0;
   virtual double getRxFreq(size_t chan = 0) = 0;
   virtual double getSampleRate()=0;
+  virtual double numberRead()=0;
+  virtual double numberWritten()=0;
 
   protected:
   size_t tx_sps, rx_sps;
@@ -168,14 +177,6 @@ class RadioDevice {
   size_t chans;
   double lo_offset;
   std::vector<std::string> tx_paths, rx_paths;
-
-  RadioDevice(size_t tx_sps, size_t rx_sps, InterfaceType type, size_t chans, double offset,
-              const std::vector<std::string>& tx_paths,
-              const std::vector<std::string>& rx_paths):
-		tx_sps(tx_sps), rx_sps(rx_sps), iface(type), chans(chans), lo_offset(offset),
-		tx_paths(tx_paths), rx_paths(rx_paths)
-	{ }
-
   bool set_antennas() {
 	unsigned int i;
 

Transceiver52M/device/uhd/Makefile.am

@@ -1,11 +1,8 @@
 include $(top_srcdir)/Makefile.common
 
-AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common
+AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/..
 AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(UHD_CFLAGS)
 
-noinst_HEADERS = UHDDevice.h
-
 noinst_LTLIBRARIES = libdevice.la
 
 libdevice_la_SOURCES = UHDDevice.cpp
-libdevice_la_LIBADD = $(top_builddir)/Transceiver52M/device/common/libdevice_common.la

Transceiver52M/device/uhd/UHDDevice.cpp

@@ -23,9 +23,12 @@
 
 #include <map>
 #include "radioDevice.h"
-#include "UHDDevice.h"
 #include "Threads.h"
 #include "Logger.h"
+#include <uhd/version.hpp>
+#include <uhd/property_tree.hpp>
+#include <uhd/usrp/multi_usrp.hpp>
+#include <uhd/utils/thread_priority.hpp>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -33,9 +36,6 @@
 
 #ifndef USE_UHD_3_11
 #include <uhd/utils/msg.hpp>
-#include <uhd/utils/thread_priority.hpp>
-#else
-#include <uhd/utils/thread.hpp>
 #endif
 
 #define USRP_TX_AMPL     0.3
@@ -56,6 +56,20 @@
  */
 #define UMTRX_VGA1_DEF   -18
 
+enum uhd_dev_type {
+	USRP1,
+	USRP2,
+	B100,
+	B200,
+	B210,
+	B2XX_MCBTS,
+	E1XX,
+	E3XX,
+	X3XX,
+	UMTRX,
+	LIMESDR,
+};
+
 /*
  * USRP version dependent device timings
  */
@@ -120,9 +134,192 @@ 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" } },
 };
 
+/*
+    Sample Buffer - Allows reading and writing of timed samples using osmo-trx
+                    or UHD style timestamps. Time conversions are handled
+                    internally or accessable through the static convert calls.
+*/
+class smpl_buf {
+public:
+	/** Sample buffer constructor
+	    @param len number of 32-bit samples the buffer should hold
+	    @param rate sample clockrate
+	    @param timestamp
+	*/
+	smpl_buf(size_t len, double rate);
+	~smpl_buf();
+
+	/** Query number of samples available for reading
+	    @param timestamp time of first sample
+	    @return number of available samples or error
+	*/
+	ssize_t avail_smpls(TIMESTAMP timestamp) const;
+	ssize_t avail_smpls(uhd::time_spec_t timestamp) const;
+
+	/** Read and write
+	    @param buf pointer to buffer
+	    @param len number of samples desired to read or write
+	    @param timestamp time of first stample
+	    @return number of actual samples read or written or error
+	*/
+	ssize_t read(void *buf, size_t len, TIMESTAMP timestamp);
+	ssize_t read(void *buf, size_t len, uhd::time_spec_t timestamp);
+	ssize_t write(void *buf, size_t len, TIMESTAMP timestamp);
+	ssize_t write(void *buf, size_t len, uhd::time_spec_t timestamp);
+
+	/** Buffer status string
+	    @return a formatted string describing internal buffer state
+	*/
+	std::string str_status(size_t ts) const;
+
+	/** Formatted error string
+	    @param code an error code
+	    @return a formatted error string
+	*/
+	static std::string str_code(ssize_t code);
+
+	enum err_code {
+		ERROR_TIMESTAMP = -1,
+		ERROR_READ = -2,
+		ERROR_WRITE = -3,
+		ERROR_OVERFLOW = -4
+	};
+
+private:
+	uint32_t *data;
+	size_t buf_len;
+
+	double clk_rt;
+
+	TIMESTAMP time_start;
+	TIMESTAMP time_end;
+
+	size_t data_start;
+	size_t data_end;
+};
+
+/*
+    uhd_device - UHD implementation of the Device interface. Timestamped samples
+                are sent to and received from the device. An intermediate buffer
+                on the receive side collects and aligns packets of samples.
+                Events and errors such as underruns are reported asynchronously
+                by the device and received in a separate thread.
+*/
+class uhd_device : public RadioDevice {
+public:
+	uhd_device(size_t tx_sps, size_t rx_sps, InterfaceType type,
+		   size_t chans, double offset,
+		   const std::vector<std::string>& tx_paths,
+		   const std::vector<std::string>& rx_paths);
+	~uhd_device();
+
+	int open(const std::string &args, int ref, bool swap_channels);
+	bool start();
+	bool stop();
+	bool restart();
+	void setPriority(float prio);
+	enum TxWindowType getWindowType() { return tx_window; }
+
+	int readSamples(std::vector<short *> &bufs, int len, bool *overrun,
+			TIMESTAMP timestamp, bool *underrun, unsigned *RSSI);
+
+	int writeSamples(std::vector<short *> &bufs, int len, bool *underrun,
+			 TIMESTAMP timestamp, bool isControl);
+
+	bool updateAlignment(TIMESTAMP timestamp);
+
+	bool setTxFreq(double wFreq, size_t chan);
+	bool setRxFreq(double wFreq, size_t chan);
+
+	TIMESTAMP initialWriteTimestamp();
+	TIMESTAMP initialReadTimestamp();
+
+	double fullScaleInputValue();
+	double fullScaleOutputValue();
+
+	double setRxGain(double db, size_t chan);
+	double getRxGain(size_t chan);
+	double maxRxGain(void) { return rx_gain_max; }
+	double minRxGain(void) { return rx_gain_min; }
+
+	double setTxGain(double db, size_t chan);
+	double maxTxGain(void) { return tx_gain_max; }
+	double minTxGain(void) { return tx_gain_min; }
+
+	double getTxFreq(size_t chan);
+	double getRxFreq(size_t chan);
+	double getRxFreq();
+
+	bool setRxAntenna(const std::string &ant, size_t chan);
+	std::string getRxAntenna(size_t chan);
+	bool setTxAntenna(const std::string &ant, size_t chan);
+	std::string getTxAntenna(size_t chan);
+
+	bool requiresRadioAlign();
+
+	GSM::Time minLatency();
+
+	inline double getSampleRate() { return tx_rate; }
+	inline double numberRead() { return rx_pkt_cnt; }
+	inline double numberWritten() { return 0; }
+
+	/** Receive and process asynchronous message
+	    @return true if message received or false on timeout or error
+	*/
+	bool recv_async_msg();
+
+	enum err_code {
+		ERROR_TIMING = -1,
+		ERROR_TIMEOUT = -2,
+		ERROR_UNRECOVERABLE = -3,
+		ERROR_UNHANDLED = -4,
+	};
+
+private:
+	uhd::usrp::multi_usrp::sptr usrp_dev;
+	uhd::tx_streamer::sptr tx_stream;
+	uhd::rx_streamer::sptr rx_stream;
+	enum TxWindowType tx_window;
+	enum uhd_dev_type dev_type;
+
+	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;
+	size_t tx_spp, rx_spp;
+
+	bool started;
+	bool aligned;
+
+	size_t rx_pkt_cnt;
+	size_t drop_cnt;
+	uhd::time_spec_t prev_ts;
+
+	TIMESTAMP ts_initial, ts_offset;
+	std::vector<smpl_buf *> rx_buffers;
+
+	void init_gains();
+	void set_channels(bool swap);
+	void set_rates();
+	bool parse_dev_type();
+	bool flush_recv(size_t num_pkts);
+	int check_rx_md_err(uhd::rx_metadata_t &md, ssize_t num_smpls);
+
+	std::string str_code(uhd::rx_metadata_t metadata);
+	std::string str_code(uhd::async_metadata_t metadata);
+
+	uhd::tune_request_t select_freq(double wFreq, size_t chan, bool tx);
+	bool set_freq(double freq, size_t chan, bool tx);
+
+	Thread *async_event_thrd;
+	Mutex tune_lock;
+};
+
 void *async_event_loop(uhd_device *dev)
 {
-	set_selfthread_name("UHDAsyncEvent");
 	dev->setPriority(0.43);
 
 	while (1) {
@@ -143,13 +340,13 @@ void uhd_msg_handler(uhd::msg::type_t type, const std::string &msg)
 {
 	switch (type) {
 	case uhd::msg::status:
-		LOGC(DDEV, INFO) << msg;
+		LOG(INFO) << msg;
 		break;
 	case uhd::msg::warning:
-		LOGC(DDEV, WARNING) << msg;
+		LOG(WARNING) << msg;
 		break;
 	case uhd::msg::error:
-		LOGC(DDEV, ERROR) << msg;
+		LOG(ERR) << msg;
 		break;
 	case uhd::msg::fastpath:
 		break;
@@ -157,6 +354,12 @@ void uhd_msg_handler(uhd::msg::type_t type, const std::string &msg)
 }
 #endif
 
+static void thread_enable_cancel(bool cancel)
+{
+	cancel ? pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) :
+		 pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
+}
+
 uhd_device::uhd_device(size_t tx_sps, size_t rx_sps,
 		       InterfaceType iface, size_t chans, double lo_offset,
 		       const std::vector<std::string>& tx_paths,
@@ -165,7 +368,7 @@ uhd_device::uhd_device(size_t tx_sps, size_t rx_sps,
 	  tx_gain_min(0.0), tx_gain_max(0.0),
 	  rx_gain_min(0.0), rx_gain_max(0.0),
 	  tx_spp(0), rx_spp(0),
-	  started(false), aligned(false), drop_cnt(0),
+	  started(false), aligned(false), rx_pkt_cnt(0), drop_cnt(0),
 	  prev_ts(0,0), ts_initial(0), ts_offset(0), async_event_thrd(NULL)
 {
 }
@@ -185,7 +388,7 @@ void uhd_device::init_gains()
 	if (dev_type == UMTRX) {
 		std::vector<std::string> gain_stages = usrp_dev->get_tx_gain_names(0);
 		if (gain_stages[0] == "VGA") {
-			LOGC(DDEV, WARNING) << "Update your UHD version for a proper Tx gain support";
+			LOG(WARNING) << "Update your UHD version for a proper Tx gain support";
 		}
 		if (gain_stages[0] == "VGA" || gain_stages[0] == "PA") {
 			range = usrp_dev->get_tx_gain_range();
@@ -201,23 +404,23 @@ void uhd_device::init_gains()
 		tx_gain_min = range.start();
 		tx_gain_max = range.stop();
 	}
-	LOGC(DDEV, INFO) << "Supported Tx gain range [" << tx_gain_min << "; " << tx_gain_max << "]";
+	LOG(INFO) << "Supported Tx gain range [" << tx_gain_min << "; " << tx_gain_max << "]";
 
 	range = usrp_dev->get_rx_gain_range();
 	rx_gain_min = range.start();
 	rx_gain_max = range.stop();
-	LOGC(DDEV, INFO) << "Supported Rx gain range [" << rx_gain_min << "; " << rx_gain_max << "]";
+	LOG(INFO) << "Supported Rx gain range [" << rx_gain_min << "; " << rx_gain_max << "]";
 
 	for (size_t i = 0; i < tx_gains.size(); i++) {
 		double gain = (tx_gain_min + tx_gain_max) / 2;
-		LOGC(DDEV, INFO) << "Default setting Tx gain for channel " << i << " to " << gain;
+		LOG(INFO) << "Default setting Tx gain for channel " << i << " to " << gain;
 		usrp_dev->set_tx_gain(gain, i);
 		tx_gains[i] = usrp_dev->get_tx_gain(i);
 	}
 
 	for (size_t i = 0; i < rx_gains.size(); i++) {
 		double gain = (rx_gain_min + rx_gain_max) / 2;
-		LOGC(DDEV, INFO) << "Default setting Rx gain for channel " << i << " to " << gain;
+		LOG(INFO) << "Default setting Rx gain for channel " << i << " to " << gain;
 		usrp_dev->set_rx_gain(gain, i);
 		rx_gains[i] = usrp_dev->get_rx_gain(i);
 	}
@@ -241,7 +444,7 @@ void uhd_device::set_rates()
 	rx_rate = usrp_dev->get_rx_rate();
 
 	ts_offset = static_cast<TIMESTAMP>(desc.offset * rx_rate);
-	LOGC(DDEV, INFO) << "Rates configured for " << desc.str;
+	LOG(INFO) << "Rates configured for " << desc.str;
 }
 
 double uhd_device::setTxGain(double db, size_t chan)
@@ -250,7 +453,7 @@ double uhd_device::setTxGain(double db, size_t chan)
 		chan = 0;
 
 	if (chan >= tx_gains.size()) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel" << chan;
+		LOG(ALERT) << "Requested non-existent channel" << chan;
 		return 0.0f;
 	}
 
@@ -273,25 +476,22 @@ double uhd_device::setTxGain(double db, size_t 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)";
+	LOG(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 (iface == MULTI_ARFCN)
-		chan = 0;
-
 	if (chan >= rx_gains.size()) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
+		LOG(ALERT) << "Requested non-existent channel " << chan;
 		return 0.0f;
 	}
 
 	usrp_dev->set_rx_gain(db, chan);
 	rx_gains[chan] = usrp_dev->get_rx_gain(chan);
 
-	LOGC(DDEV, INFO) << "Set RX gain to " << rx_gains[chan] << "dB (asked for " << db << "dB)";
+	LOG(INFO) << "Set RX gain to " << rx_gains[chan] << "dB (asked for " << db << "dB)";
 
 	return rx_gains[chan];
 }
@@ -302,7 +502,7 @@ double uhd_device::getRxGain(size_t chan)
 		chan = 0;
 
 	if (chan >= rx_gains.size()) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
+		LOG(ALERT) << "Requested non-existent channel " << chan;
 		return 0.0f;
 	}
 
@@ -350,7 +550,7 @@ bool uhd_device::parse_dev_type()
 		mapIter++;
 	}
 
-	LOGC(DDEV, ALERT) << "Unsupported device " << devString;
+	LOG(ALERT) << "Unsupported device " << devString;
 	return false;
 }
 
@@ -421,16 +621,16 @@ int uhd_device::open(const std::string &args, int ref, bool swap_channels)
 	uhd::device_addr_t addr(args);
 	uhd::device_addrs_t dev_addrs = uhd::device::find(addr);
 	if (dev_addrs.size() == 0) {
-		LOGC(DDEV, ALERT) << "No UHD devices found with address '" << args << "'";
+		LOG(ALERT) << "No UHD devices found with address '" << args << "'";
 		return -1;
 	}
 
 	// Use the first found device
-	LOGC(DDEV, INFO) << "Using discovered UHD device " << dev_addrs[0].to_string();
+	LOG(INFO) << "Using discovered UHD device " << dev_addrs[0].to_string();
 	try {
 		usrp_dev = uhd::usrp::multi_usrp::make(addr);
-	} catch(uhd::key_error::exception &e) {
-		LOGC(DDEV, ALERT) << "UHD make failed, device " << args << ", exception:\n" << e.what();
+	} catch(...) {
+		LOG(ALERT) << "UHD make failed, device " << args;
 		return -1;
 	}
 
@@ -439,19 +639,19 @@ int uhd_device::open(const std::string &args, int ref, bool swap_channels)
 		return -1;
 
 	if ((dev_type == E3XX) && !uhd_e3xx_version_chk()) {
-		LOGC(DDEV, ALERT) << "E3XX requires UHD 003.009.000 or greater";
+		LOG(ALERT) << "E3XX requires UHD 003.009.000 or greater";
 		return -1;
 	}
 
 	try {
 		set_channels(swap_channels);
         } catch (const std::exception &e) {
-		LOGC(DDEV, ALERT) << "Channel setting failed - " << e.what();
+		LOG(ALERT) << "Channel setting failed - " << e.what();
 		return -1;
 	}
 
 	if (!set_antennas()) {
-		LOGC(DDEV, ALERT) << "UHD antenna setting failed";
+		LOG(ALERT) << "UHD antenna setting failed";
 		return -1;
 	}
 
@@ -472,7 +672,7 @@ int uhd_device::open(const std::string &args, int ref, bool swap_channels)
 		refstr = "gpsdo";
 		break;
 	default:
-		LOGC(DDEV, ALERT) << "Invalid reference type";
+		LOG(ALERT) << "Invalid reference type";
 		return -1;
 	}
 
@@ -481,7 +681,7 @@ int uhd_device::open(const std::string &args, int ref, bool swap_channels)
 	try {
 		set_rates();
         } catch (const std::exception &e) {
-		LOGC(DDEV, ALERT) << "UHD rate setting failed - " << e.what();
+		LOG(ALERT) << "UHD rate setting failed - " << e.what();
 		return -1;
 	}
 
@@ -514,18 +714,13 @@ int uhd_device::open(const std::string &args, int ref, bool swap_channels)
 	// Create receive buffer
 	size_t buf_len = SAMPLE_BUF_SZ / sizeof(uint32_t);
 	for (size_t i = 0; i < rx_buffers.size(); i++)
-		rx_buffers[i] = new smpl_buf(buf_len);
-
-	// Create vector buffer
-	pkt_bufs = std::vector<std::vector<short> >(chans, std::vector<short>(2 * rx_spp));
-	for (size_t i = 0; i < pkt_bufs.size(); i++)
-		pkt_ptrs.push_back(&pkt_bufs[i].front());
+		rx_buffers[i] = new smpl_buf(buf_len, rx_rate);
 
 	// Initialize and shadow gain values
 	init_gains();
 
 	// Print configuration
-	LOGC(DDEV, INFO) << "\n" << usrp_dev->get_pp_string();
+	LOG(INFO) << "\n" << usrp_dev->get_pp_string();
 
 	if (iface == MULTI_ARFCN)
 		return MULTI_ARFCN;
@@ -554,6 +749,13 @@ bool uhd_device::flush_recv(size_t num_pkts)
 	size_t num_smpls;
 	float timeout = UHD_RESTART_TIMEOUT;
 
+	std::vector<std::vector<short> >
+		pkt_bufs(chans, std::vector<short>(2 * rx_spp));
+
+	std::vector<short *> pkt_ptrs;
+	for (size_t i = 0; i < pkt_bufs.size(); i++)
+		pkt_ptrs.push_back(&pkt_bufs[i].front());
+
 	ts_initial = 0;
 	while (!ts_initial || (num_pkts-- > 0)) {
 		num_smpls = rx_stream->recv(pkt_ptrs, rx_spp, md,
@@ -561,7 +763,7 @@ bool uhd_device::flush_recv(size_t num_pkts)
 		if (!num_smpls) {
 			switch (md.error_code) {
 			case uhd::rx_metadata_t::ERROR_CODE_TIMEOUT:
-				LOGC(DDEV, ALERT) << "Device timed out";
+				LOG(ALERT) << "Device timed out";
 				return false;
 			default:
 				continue;
@@ -571,7 +773,7 @@ bool uhd_device::flush_recv(size_t num_pkts)
 		ts_initial = md.time_spec.to_ticks(rx_rate);
 	}
 
-	LOGC(DDEV, INFO) << "Initial timestamp " << ts_initial << std::endl;
+	LOG(INFO) << "Initial timestamp " << ts_initial << std::endl;
 
 	return true;
 }
@@ -596,10 +798,10 @@ bool uhd_device::restart()
 
 bool uhd_device::start()
 {
-	LOGC(DDEV, INFO) << "Starting USRP...";
+	LOG(INFO) << "Starting USRP...";
 
 	if (started) {
-		LOGC(DDEV, ERROR) << "Device already started";
+		LOG(ERR) << "Device already started";
 		return false;
 	}
 
@@ -617,7 +819,7 @@ bool uhd_device::start()
 
 	// Display usrp time
 	double time_now = usrp_dev->get_time_now().get_real_secs();
-	LOGC(DDEV, INFO) << "The current time is " << time_now << " seconds";
+	LOG(INFO) << "The current time is " << time_now << " seconds";
 
 	started = true;
 	return true;
@@ -650,11 +852,11 @@ void uhd_device::setPriority(float prio)
 int uhd_device::check_rx_md_err(uhd::rx_metadata_t &md, ssize_t num_smpls)
 {
 	if (!num_smpls) {
-		LOGC(DDEV, ERROR) << str_code(md);
+		LOG(ERR) << str_code(md);
 
 		switch (md.error_code) {
 		case uhd::rx_metadata_t::ERROR_CODE_TIMEOUT:
-			LOGC(DDEV, ALERT) << "UHD: Receive timed out";
+			LOG(ALERT) << "UHD: Receive timed out";
 			return ERROR_TIMEOUT;
 		case uhd::rx_metadata_t::ERROR_CODE_OVERFLOW:
 		case uhd::rx_metadata_t::ERROR_CODE_LATE_COMMAND:
@@ -667,14 +869,14 @@ int uhd_device::check_rx_md_err(uhd::rx_metadata_t &md, ssize_t num_smpls)
 
 	// Missing timestamp
 	if (!md.has_time_spec) {
-		LOGC(DDEV, ALERT) << "UHD: Received packet missing timestamp";
+		LOG(ALERT) << "UHD: Received packet missing timestamp";
 		return ERROR_UNRECOVERABLE;
 	}
 
 	// Monotonicity check
 	if (md.time_spec < prev_ts) {
-		LOGC(DDEV, ALERT) << "UHD: Loss of monotonic time";
-		LOGC(DDEV, ALERT) << "Current time: " << md.time_spec.get_real_secs() << ", "
+		LOG(ALERT) << "UHD: Loss of monotonic time";
+		LOG(ALERT) << "Current time: " << md.time_spec.get_real_secs() << ", "
 			   << "Previous time: " << prev_ts.get_real_secs();
 		return ERROR_TIMING;
 	}
@@ -697,7 +899,7 @@ int uhd_device::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
 	uhd::rx_metadata_t metadata;
 
 	if (bufs.size() != chans) {
-		LOGC(DDEV, ALERT) << "Invalid channel combination " << bufs.size();
+		LOG(ALERT) << "Invalid channel combination " << bufs.size();
 		return -1;
 	}
 
@@ -708,16 +910,24 @@ int uhd_device::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
 	timestamp += ts_offset;
 
 	ts = uhd::time_spec_t::from_ticks(timestamp, rx_rate);
-	LOGC(DDEV, DEBUG) << "Requested timestamp = " << ts.get_real_secs();
+	LOG(DEBUG) << "Requested timestamp = " << ts.get_real_secs();
 
 	// Check that timestamp is valid
 	rc = rx_buffers[0]->avail_smpls(timestamp);
 	if (rc < 0) {
-		LOGC(DDEV, ERROR) << rx_buffers[0]->str_code(rc);
-		LOGC(DDEV, ERROR) << rx_buffers[0]->str_status(timestamp);
+		LOG(ERR) << rx_buffers[0]->str_code(rc);
+		LOG(ERR) << rx_buffers[0]->str_status(timestamp);
 		return 0;
 	}
 
+	// Create vector buffer
+	std::vector<std::vector<short> >
+		pkt_bufs(chans, std::vector<short>(2 * rx_spp));
+
+	std::vector<short *> pkt_ptrs;
+	for (size_t i = 0; i < pkt_bufs.size(); i++)
+		pkt_ptrs.push_back(&pkt_bufs[i].front());
+
 	// Receive samples from the usrp until we have enough
 	while (rx_buffers[0]->avail_smpls(timestamp) < len) {
 		thread_enable_cancel(false);
@@ -725,12 +935,14 @@ int uhd_device::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
 						   metadata, 0.1, true);
 		thread_enable_cancel(true);
 
+		rx_pkt_cnt++;
+
 		// Check for errors
 		rc = check_rx_md_err(metadata, num_smpls);
 		switch (rc) {
 		case ERROR_UNRECOVERABLE:
-			LOGC(DDEV, ALERT) << "UHD: Version " << uhd::get_version_string();
-			LOGC(DDEV, ALERT) << "UHD: Unrecoverable error, exiting...";
+			LOG(ALERT) << "UHD: Version " << uhd::get_version_string();
+			LOG(ALERT) << "UHD: Unrecoverable error, exiting...";
 			exit(-1);
 		case ERROR_TIMEOUT:
 			// Assume stopping condition
@@ -742,17 +954,17 @@ int uhd_device::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
 		}
 
 		ts = metadata.time_spec;
-		LOGC(DDEV, DEBUG) << "Received timestamp = " << ts.get_real_secs();
+		LOG(DEBUG) << "Received timestamp = " << ts.get_real_secs();
 
 		for (size_t i = 0; i < rx_buffers.size(); i++) {
 			rc = rx_buffers[i]->write((short *) &pkt_bufs[i].front(),
 						  num_smpls,
-						  metadata.time_spec.to_ticks(rx_rate));
+						  metadata.time_spec);
 
 			// Continue on local overrun, exit on other errors
 			if ((rc < 0)) {
-				LOGC(DDEV, ERROR) << rx_buffers[i]->str_code(rc);
-				LOGC(DDEV, ERROR) << rx_buffers[i]->str_status(timestamp);
+				LOG(ERR) << rx_buffers[i]->str_code(rc);
+				LOG(ERR) << rx_buffers[i]->str_status(timestamp);
 				if (rc != smpl_buf::ERROR_OVERFLOW)
 					return 0;
 			}
@@ -763,8 +975,8 @@ int uhd_device::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
 	for (size_t i = 0; i < rx_buffers.size(); i++) {
 		rc = rx_buffers[i]->read(bufs[i], len, timestamp);
 		if ((rc < 0) || (rc != len)) {
-			LOGC(DDEV, ERROR) << rx_buffers[i]->str_code(rc);
-			LOGC(DDEV, ERROR) << rx_buffers[i]->str_status(timestamp);
+			LOG(ERR) << rx_buffers[i]->str_code(rc);
+			LOG(ERR) << rx_buffers[i]->str_status(timestamp);
 			return 0;
 		}
 	}
@@ -785,12 +997,12 @@ int uhd_device::writeSamples(std::vector<short *> &bufs, int len, bool *underrun
 
 	// No control packets
 	if (isControl) {
-		LOGC(DDEV, ERROR) << "Control packets not supported";
+		LOG(ERR) << "Control packets not supported";
 		return 0;
 	}
 
 	if (bufs.size() != chans) {
-		LOGC(DDEV, ALERT) << "Invalid channel combination " << bufs.size();
+		LOG(ALERT) << "Invalid channel combination " << bufs.size();
 		return -1;
 	}
 
@@ -799,14 +1011,14 @@ int uhd_device::writeSamples(std::vector<short *> &bufs, int len, bool *underrun
 		drop_cnt++;
 
 		if (drop_cnt == 1) {
-			LOGC(DDEV, DEBUG) << "Aligning transmitter: stop burst";
+			LOG(DEBUG) << "Aligning transmitter: stop burst";
 			*underrun = true;
 			metadata.end_of_burst = true;
 		} else if (drop_cnt < 30) {
-			LOGC(DDEV, DEBUG) << "Aligning transmitter: packet advance";
+			LOG(DEBUG) << "Aligning transmitter: packet advance";
 			return len;
 		} else {
-			LOGC(DDEV, DEBUG) << "Aligning transmitter: start burst";
+			LOG(DEBUG) << "Aligning transmitter: start burst";
 			metadata.start_of_burst = true;
 			aligned = true;
 			drop_cnt = 0;
@@ -818,7 +1030,7 @@ int uhd_device::writeSamples(std::vector<short *> &bufs, int len, bool *underrun
 	thread_enable_cancel(true);
 
 	if (num_smpls != (unsigned) len) {
-		LOGC(DDEV, ALERT) << "UHD: Device send timed out";
+		LOG(ALERT) << "UHD: Device send timed out";
 	}
 
 	return num_smpls;
@@ -854,7 +1066,7 @@ uhd::tune_request_t uhd_device::select_freq(double freq, size_t chan, bool tx)
 
 		return uhd::tune_request_t(freq, lo_offset);
 	} else if ((dev_type != B210) || (chans > 2) || (chan > 1)) {
-		LOGC(DDEV, ALERT) << chans << " channels unsupported";
+		LOG(ALERT) << chans << " channels unsupported";
 		return treq;
 	}
 
@@ -870,7 +1082,7 @@ uhd::tune_request_t uhd_device::select_freq(double freq, size_t chan, bool tx)
 	/* Find center frequency between channels */
 	rf_spread = fabs(freqs[!chan] - freq);
 	if (rf_spread > dev_param_map.at(dev_key(B210, tx_sps, rx_sps)).mcr) {
-		LOGC(DDEV, ALERT) << rf_spread << "Hz tuning spread not supported\n";
+		LOG(ALERT) << rf_spread << "Hz tuning spread not supported\n";
 		return treq;
 	}
 
@@ -896,7 +1108,7 @@ bool uhd_device::set_freq(double freq, size_t chan, bool tx)
 		tres = usrp_dev->set_rx_freq(treq, chan);
 		rx_freqs[chan] = usrp_dev->get_rx_freq(chan);
 	}
-	LOGC(DDEV, INFO) << "\n" << tres.to_pp_string() << std::endl;
+	LOG(INFO) << "\n" << tres.to_pp_string() << std::endl;
 
 	if ((chans == 1) || ((chans == 2) && dev_type == UMTRX))
 		return true;
@@ -916,7 +1128,7 @@ bool uhd_device::set_freq(double freq, size_t chan, bool tx)
 			rx_freqs[!chan] = usrp_dev->get_rx_freq(!chan);
 
 		}
-		LOGC(DDEV, INFO) << "\n" << tres.to_pp_string() << std::endl;
+		LOG(INFO) << "\n" << tres.to_pp_string() << std::endl;
 	}
 
 	return true;
@@ -925,7 +1137,7 @@ bool uhd_device::set_freq(double freq, size_t chan, bool tx)
 bool uhd_device::setTxFreq(double wFreq, size_t chan)
 {
 	if (chan >= tx_freqs.size()) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
+		LOG(ALERT) << "Requested non-existent channel " << chan;
 		return false;
 	}
 	ScopedLock lock(tune_lock);
@@ -936,7 +1148,7 @@ bool uhd_device::setTxFreq(double wFreq, size_t chan)
 bool uhd_device::setRxFreq(double wFreq, size_t chan)
 {
 	if (chan >= rx_freqs.size()) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
+		LOG(ALERT) << "Requested non-existent channel " << chan;
 		return false;
 	}
 	ScopedLock lock(tune_lock);
@@ -947,7 +1159,7 @@ bool uhd_device::setRxFreq(double wFreq, size_t chan)
 double uhd_device::getTxFreq(size_t chan)
 {
 	if (chan >= tx_freqs.size()) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
+		LOG(ALERT) << "Requested non-existent channel " << chan;
 		return 0.0;
 	}
 
@@ -957,7 +1169,7 @@ double uhd_device::getTxFreq(size_t chan)
 double uhd_device::getRxFreq(size_t chan)
 {
 	if (chan >= rx_freqs.size()) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
+		LOG(ALERT) << "Requested non-existent channel " << chan;
 		return 0.0;
 	}
 
@@ -968,23 +1180,23 @@ bool uhd_device::setRxAntenna(const std::string &ant, size_t chan)
 {
 	std::vector<std::string> avail;
 	if (chan >= rx_paths.size()) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
+		LOG(ALERT) << "Requested non-existent channel " << chan;
 		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: ";
+		LOG(ALERT) << "Requested non-existent Rx antenna " << ant << " on channel " << chan;
+		LOG(INFO) << "Available Rx antennas: ";
 		for (std::vector<std::string>::const_iterator i = avail.begin(); i != avail.end(); ++i)
-			LOGC(DDEV, INFO) << "- '" << *i << "'";
+			LOG(INFO) << "- '" << *i << "'";
 		return false;
 	}
 	usrp_dev->set_rx_antenna(ant, chan);
 	rx_paths[chan] = usrp_dev->get_rx_antenna(chan);
 
 	if (ant != rx_paths[chan]) {
-		LOGC(DDEV, ALERT) << "Failed setting antenna " << ant << " on channel " << chan << ", got instead " << rx_paths[chan];
+		LOG(ALERT) << "Failed setting antenna " << ant << " on channel " << chan << ", got instead " << rx_paths[chan];
 		return false;
 	}
 
@@ -994,7 +1206,7 @@ bool uhd_device::setRxAntenna(const std::string &ant, size_t chan)
 std::string uhd_device::getRxAntenna(size_t chan)
 {
 	if (chan >= rx_paths.size()) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
+		LOG(ALERT) << "Requested non-existent channel " << chan;
 		return "";
 	}
 	return usrp_dev->get_rx_antenna(chan);
@@ -1004,23 +1216,23 @@ bool uhd_device::setTxAntenna(const std::string &ant, size_t chan)
 {
 	std::vector<std::string> avail;
 	if (chan >= tx_paths.size()) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
+		LOG(ALERT) << "Requested non-existent channel " << chan;
 		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: ";
+		LOG(ALERT) << "Requested non-existent Tx antenna " << ant << " on channel " << chan;
+		LOG(INFO) << "Available Tx antennas: ";
 		for (std::vector<std::string>::const_iterator i = avail.begin(); i != avail.end(); ++i)
-			LOGC(DDEV, INFO) << "- '" << *i << "'";
+			LOG(INFO) << "- '" << *i << "'";
 		return false;
 	}
 	usrp_dev->set_tx_antenna(ant, chan);
 	tx_paths[chan] = usrp_dev->get_tx_antenna(chan);
 
 	if (ant != tx_paths[chan]) {
-		LOGC(DDEV, ALERT) << "Failed setting antenna " << ant << " on channel " << chan << ", got instead " << tx_paths[chan];
+		LOG(ALERT) << "Failed setting antenna " << ant << " on channel " << chan << ", got instead " << tx_paths[chan];
 		return false;
 	}
 
@@ -1030,7 +1242,7 @@ bool uhd_device::setTxAntenna(const std::string &ant, size_t chan)
 std::string uhd_device::getTxAntenna(size_t chan)
 {
 	if (chan >= tx_paths.size()) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
+		LOG(ALERT) << "Requested non-existent channel " << chan;
 		return "";
 	}
 	return usrp_dev->get_tx_antenna(chan);
@@ -1098,7 +1310,7 @@ bool uhd_device::recv_async_msg()
 
 		if ((md.event_code != uhd::async_metadata_t::EVENT_CODE_UNDERFLOW) &&
 		    (md.event_code != uhd::async_metadata_t::EVENT_CODE_TIME_ERROR)) {
-			LOGC(DDEV, ERROR) << str_code(md);
+			LOG(ERR) << str_code(md);
 		}
 	}
 
@@ -1174,6 +1386,166 @@ std::string uhd_device::str_code(uhd::async_metadata_t metadata)
 	return ost.str();
 }
 
+smpl_buf::smpl_buf(size_t len, double rate)
+	: buf_len(len), clk_rt(rate),
+	  time_start(0), time_end(0), data_start(0), data_end(0)
+{
+	data = new uint32_t[len];
+}
+
+smpl_buf::~smpl_buf()
+{
+	delete[] data;
+}
+
+ssize_t smpl_buf::avail_smpls(TIMESTAMP timestamp) const
+{
+	if (timestamp < time_start)
+		return ERROR_TIMESTAMP;
+	else if (timestamp >= time_end)
+		return 0;
+	else
+		return time_end - timestamp;
+}
+
+ssize_t smpl_buf::avail_smpls(uhd::time_spec_t timespec) const
+{
+	return avail_smpls(timespec.to_ticks(clk_rt));
+}
+
+ssize_t smpl_buf::read(void *buf, size_t len, TIMESTAMP timestamp)
+{
+	int type_sz = 2 * sizeof(short);
+
+	// Check for valid read
+	if (timestamp < time_start)
+		return ERROR_TIMESTAMP;
+	if (timestamp >= time_end)
+		return 0;
+	if (len >= buf_len)
+		return ERROR_READ;
+
+	// How many samples should be copied
+	size_t num_smpls = time_end - timestamp;
+	if (num_smpls > len)
+		num_smpls = len;
+
+	// Starting index
+	size_t read_start = (data_start + (timestamp - time_start)) % buf_len;
+
+	// Read it
+	if (read_start + num_smpls < buf_len) {
+		size_t numBytes = len * type_sz;
+		memcpy(buf, data + read_start, numBytes);
+	} else {
+		size_t first_cp = (buf_len - read_start) * type_sz;
+		size_t second_cp = len * type_sz - first_cp;
+
+		memcpy(buf, data + read_start, first_cp);
+		memcpy((char*) buf + first_cp, data, second_cp);
+	}
+
+	data_start = (read_start + len) % buf_len;
+	time_start = timestamp + len;
+
+	if (time_start > time_end)
+		return ERROR_READ;
+	else
+		return num_smpls;
+}
+
+ssize_t smpl_buf::read(void *buf, size_t len, uhd::time_spec_t ts)
+{
+	return read(buf, len, ts.to_ticks(clk_rt));
+}
+
+ssize_t smpl_buf::write(void *buf, size_t len, TIMESTAMP timestamp)
+{
+	int type_sz = 2 * sizeof(short);
+
+	// Check for valid write
+	if ((len == 0) || (len >= buf_len))
+		return ERROR_WRITE;
+	if ((timestamp + len) <= time_end)
+		return ERROR_TIMESTAMP;
+
+	if (timestamp < time_end) {
+		LOG(ERR) << "Overwriting old buffer data: timestamp="<<timestamp<<" time_end="<<time_end;
+		uhd::time_spec_t ts = uhd::time_spec_t::from_ticks(timestamp, clk_rt);
+		LOG(DEBUG) << "Requested timestamp = " << timestamp << " (real_sec=" << std::fixed << ts.get_real_secs() << " = " << ts.to_ticks(clk_rt) << ") rate=" << clk_rt;
+		// Do not return error here, because it's a rounding error and is not fatal
+	}
+	if (timestamp > time_end && time_end != 0) {
+		LOG(ERR) << "Skipping buffer data: timestamp="<<timestamp<<" time_end="<<time_end;
+		uhd::time_spec_t ts = uhd::time_spec_t::from_ticks(timestamp, clk_rt);
+		LOG(DEBUG) << "Requested timestamp = " << timestamp << " (real_sec=" << std::fixed << ts.get_real_secs() << " = " << ts.to_ticks(clk_rt) << ") rate=" << clk_rt;
+		// Do not return error here, because it's a rounding error and is not fatal
+	}
+
+	// Starting index
+	size_t write_start = (data_start + (timestamp - time_start)) % buf_len;
+
+	// Write it
+	if ((write_start + len) < buf_len) {
+		size_t numBytes = len * type_sz;
+		memcpy(data + write_start, buf, numBytes);
+	} else {
+		size_t first_cp = (buf_len - write_start) * type_sz;
+		size_t second_cp = len * type_sz - first_cp;
+
+		memcpy(data + write_start, buf, first_cp);
+		memcpy(data, (char*) buf + first_cp, second_cp);
+	}
+
+	data_end = (write_start + len) % buf_len;
+	time_end = timestamp + len;
+
+	if (!data_start)
+		data_start = write_start;
+
+	if (((write_start + len) > buf_len) && (data_end > data_start))
+		return ERROR_OVERFLOW;
+	else if (time_end <= time_start)
+		return ERROR_WRITE;
+	else
+		return len;
+}
+
+ssize_t smpl_buf::write(void *buf, size_t len, uhd::time_spec_t ts)
+{
+	return write(buf, len, ts.to_ticks(clk_rt));
+}
+
+std::string smpl_buf::str_status(size_t ts) const
+{
+	std::ostringstream ost("Sample buffer: ");
+
+	ost << "timestamp = " << ts;
+	ost << ", length = " << buf_len;
+	ost << ", time_start = " << time_start;
+	ost << ", time_end = " << time_end;
+	ost << ", data_start = " << data_start;
+	ost << ", data_end = " << data_end;
+
+	return ost.str();
+}
+
+std::string smpl_buf::str_code(ssize_t code)
+{
+	switch (code) {
+	case ERROR_TIMESTAMP:
+		return "Sample buffer: Requested timestamp is not valid";
+	case ERROR_READ:
+		return "Sample buffer: Read error";
+	case ERROR_WRITE:
+		return "Sample buffer: Write error";
+	case ERROR_OVERFLOW:
+		return "Sample buffer: Overrun";
+	default:
+		return "Sample buffer: Unknown error";
+	}
+}
+
 RadioDevice *RadioDevice::make(size_t tx_sps, size_t rx_sps,
 			       InterfaceType iface, size_t chans, double lo_offset,
 			       const std::vector<std::string>& tx_paths,

Transceiver52M/device/uhd/UHDDevice.h

@@ -1,173 +0,0 @@
-/*
- * Device support for Ettus Research UHD driver
- *
- * Copyright 2010,2011 Free Software Foundation, Inc.
- * Copyright (C) 2015 Ettus Research LLC
- * Copyright 2019 sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
- *
- * Author: Tom Tsou <tom.tsou@ettus.com>
- *
- * 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.
- */
-
-#pragma once
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "radioDevice.h"
-#include "smpl_buf.h"
-
-#include <uhd/version.hpp>
-#include <uhd/property_tree.hpp>
-#include <uhd/usrp/multi_usrp.hpp>
-
-
-enum uhd_dev_type {
-	USRP1,
-	USRP2,
-	B100,
-	B200,
-	B210,
-	B2XX_MCBTS,
-	E1XX,
-	E3XX,
-	X3XX,
-	UMTRX,
-	LIMESDR,
-};
-
-/*
-    uhd_device - UHD implementation of the Device interface. Timestamped samples
-                are sent to and received from the device. An intermediate buffer
-                on the receive side collects and aligns packets of samples.
-                Events and errors such as underruns are reported asynchronously
-                by the device and received in a separate thread.
-*/
-class uhd_device : public RadioDevice {
-public:
-	uhd_device(size_t tx_sps, size_t rx_sps, InterfaceType type,
-		   size_t chans, double offset,
-		   const std::vector<std::string>& tx_paths,
-		   const std::vector<std::string>& rx_paths);
-	~uhd_device();
-
-	int open(const std::string &args, int ref, bool swap_channels);
-	bool start();
-	bool stop();
-	bool restart();
-	void setPriority(float prio);
-	enum TxWindowType getWindowType() { return tx_window; }
-
-	int readSamples(std::vector<short *> &bufs, int len, bool *overrun,
-			TIMESTAMP timestamp, bool *underrun, unsigned *RSSI);
-
-	int writeSamples(std::vector<short *> &bufs, int len, bool *underrun,
-			 TIMESTAMP timestamp, bool isControl);
-
-	bool updateAlignment(TIMESTAMP timestamp);
-
-	bool setTxFreq(double wFreq, size_t chan);
-	bool setRxFreq(double wFreq, size_t chan);
-
-	TIMESTAMP initialWriteTimestamp();
-	TIMESTAMP initialReadTimestamp();
-
-	double fullScaleInputValue();
-	double fullScaleOutputValue();
-
-	double setRxGain(double db, size_t chan);
-	double getRxGain(size_t chan);
-	double maxRxGain(void) { return rx_gain_max; }
-	double minRxGain(void) { return rx_gain_min; }
-
-	double setTxGain(double db, size_t chan);
-	double maxTxGain(void) { return tx_gain_max; }
-	double minTxGain(void) { return tx_gain_min; }
-
-	double getTxFreq(size_t chan);
-	double getRxFreq(size_t chan);
-	double getRxFreq();
-
-	bool setRxAntenna(const std::string &ant, size_t chan);
-	std::string getRxAntenna(size_t chan);
-	bool setTxAntenna(const std::string &ant, size_t chan);
-	std::string getTxAntenna(size_t chan);
-
-	bool requiresRadioAlign();
-
-	GSM::Time minLatency();
-
-	inline double getSampleRate() { return tx_rate; }
-
-	/** Receive and process asynchronous message
-	    @return true if message received or false on timeout or error
-	*/
-	bool recv_async_msg();
-
-	enum err_code {
-		ERROR_TIMING = -1,
-		ERROR_TIMEOUT = -2,
-		ERROR_UNRECOVERABLE = -3,
-		ERROR_UNHANDLED = -4,
-	};
-
-private:
-	uhd::usrp::multi_usrp::sptr usrp_dev;
-	uhd::tx_streamer::sptr tx_stream;
-	uhd::rx_streamer::sptr rx_stream;
-	enum TxWindowType tx_window;
-	enum uhd_dev_type dev_type;
-
-	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;
-	size_t tx_spp, rx_spp;
-
-	bool started;
-	bool aligned;
-
-	size_t drop_cnt;
-	uhd::time_spec_t prev_ts;
-
-	TIMESTAMP ts_initial, ts_offset;
-	std::vector<smpl_buf *> rx_buffers;
-	/* Sample buffers used to receive samples from UHD: */
-	std::vector<std::vector<short> > pkt_bufs;
-	/* Used to call UHD API: Buffer pointer of each elem in pkt_ptrs will
-	   point to corresponding buffer of vector pkt_bufs. */
-	std::vector<short *> pkt_ptrs;
-
-	void init_gains();
-	void set_channels(bool swap);
-	void set_rates();
-	bool parse_dev_type();
-	bool flush_recv(size_t num_pkts);
-	int check_rx_md_err(uhd::rx_metadata_t &md, ssize_t num_smpls);
-
-	std::string str_code(uhd::rx_metadata_t metadata);
-	std::string str_code(uhd::async_metadata_t metadata);
-
-	uhd::tune_request_t select_freq(double wFreq, size_t chan, bool tx);
-	bool set_freq(double freq, size_t chan, bool tx);
-
-	Thread *async_event_thrd;
-	Mutex tune_lock;
-};

Transceiver52M/device/usrp1/Makefile.am

@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.common
 
-AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common
+AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/..
 AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(USRP_CFLAGS)
 
 noinst_HEADERS = USRPDevice.h

Transceiver52M/device/usrp1/USRPDevice.cpp

@@ -64,7 +64,7 @@ USRPDevice::USRPDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface,
 		       const std::vector<std::string>& rx_paths):
 		RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths)
 {
-  LOGC(DDEV, INFO) << "creating USRP device...";
+  LOG(INFO) << "creating USRP device...";
 
   decimRate = (unsigned int) round(masterClockRate/((GSMRATE) * (double) tx_sps));
   actualSampleRate = masterClockRate/decimRate;
@@ -95,11 +95,12 @@ int USRPDevice::open(const std::string &, int, bool)
 {
   writeLock.unlock();
 
-  LOGC(DDEV, INFO) << "opening USRP device..";
+  LOG(INFO) << "opening USRP device..";
 #ifndef SWLOOPBACK
   string rbf = "std_inband.rbf";
   //string rbf = "inband_1rxhb_1tx.rbf";
   m_uRx.reset();
+  if (!skipRx) {
   try {
     m_uRx = usrp_standard_rx_sptr(usrp_standard_rx::make(
                                         0, decimRate * tx_sps, 1, -1,
@@ -109,18 +110,19 @@ int USRPDevice::open(const std::string &, int, bool)
   }
 
   catch(...) {
-    LOGC(DDEV, ALERT) << "make failed on Rx";
+    LOG(ALERT) << "make failed on Rx";
     m_uRx.reset();
     return -1;
   }
 
   if (m_uRx->fpga_master_clock_freq() != masterClockRate)
   {
-    LOGC(DDEV, ALERT) << "WRONG FPGA clock freq = " << m_uRx->fpga_master_clock_freq()
+    LOG(ALERT) << "WRONG FPGA clock freq = " << m_uRx->fpga_master_clock_freq()
                << ", desired clock freq = " << masterClockRate;
     m_uRx.reset();
     return -1;
   }
+  }
 
   try {
     m_uTx = usrp_standard_tx_sptr(usrp_standard_tx::make(
@@ -130,20 +132,20 @@ int USRPDevice::open(const std::string &, int, bool)
   }
 
   catch(...) {
-    LOGC(DDEV, ALERT) << "make failed on Tx";
+    LOG(ALERT) << "make failed on Tx";
     m_uTx.reset();
     return -1;
   }
 
   if (m_uTx->fpga_master_clock_freq() != masterClockRate)
   {
-    LOGC(DDEV, ALERT) << "WRONG FPGA clock freq = " << m_uTx->fpga_master_clock_freq()
+    LOG(ALERT) << "WRONG FPGA clock freq = " << m_uTx->fpga_master_clock_freq()
                << ", desired clock freq = " << masterClockRate;
     m_uTx.reset();
     return -1;
   }
 
-  m_uRx->stop();
+  if (!skipRx) m_uRx->stop();
   m_uTx->stop();
 
 #endif
@@ -173,6 +175,8 @@ int USRPDevice::open(const std::string &, int, bool)
   m_dbTx = m_uTx->selected_subdev(txSubdevSpec);
   m_dbRx = m_uRx->selected_subdev(rxSubdevSpec);
 
+  samplesRead = 0;
+  samplesWritten = 0;
   started = false;
 
   return NORMAL;
@@ -182,12 +186,12 @@ int USRPDevice::open(const std::string &, int, bool)
 
 bool USRPDevice::start()
 {
-  LOGC(DDEV, INFO) << "starting USRP...";
+  LOG(INFO) << "starting USRP...";
 #ifndef SWLOOPBACK
-  if (!m_uRx) return false;
+  if (!m_uRx && !skipRx) return false;
   if (!m_uTx) return false;
 
-  m_uRx->stop();
+  if (!skipRx) m_uRx->stop();
   m_uTx->stop();
 
   writeLock.lock();
@@ -217,7 +221,10 @@ bool USRPDevice::start()
   isAligned = false;
 
 
+  if (!skipRx)
   started = (m_uRx->start() && m_uTx->start());
+  else
+  started = m_uTx->start();
   return started;
 #else
   gettimeofday(&lastReadTime,NULL);
@@ -263,7 +270,7 @@ double USRPDevice::minRxGain()
 double USRPDevice::setTxGain(double dB, size_t chan)
 {
   if (chan) {
-    LOGC(DDEV, ALERT) << "Invalid channel " << chan;
+    LOG(ALERT) << "Invalid channel " << chan;
     return 0.0;
   }
 
@@ -273,10 +280,10 @@ double USRPDevice::setTxGain(double dB, size_t chan)
   if (dB < minTxGain())
     dB = minTxGain();
 
-  LOGC(DDEV, NOTICE) << "Setting TX gain to " << dB << " dB.";
+  LOG(NOTICE) << "Setting TX gain to " << dB << " dB.";
 
   if (!m_dbTx->set_gain(dB))
-    LOGC(DDEV, ERR) << "Error setting TX gain";
+    LOG(ERR) << "Error setting TX gain";
 
   writeLock.unlock();
 
@@ -287,7 +294,7 @@ double USRPDevice::setTxGain(double dB, size_t chan)
 double USRPDevice::setRxGain(double dB, size_t chan)
 {
   if (chan) {
-    LOGC(DDEV, ALERT) << "Invalid channel " << chan;
+    LOG(ALERT) << "Invalid channel " << chan;
     return 0.0;
   }
 
@@ -299,10 +306,10 @@ double USRPDevice::setRxGain(double dB, size_t chan)
   if (dB < minRxGain())
     dB = minRxGain();
 
-  LOGC(DDEV, NOTICE) << "Setting RX gain to " << dB << " dB.";
+  LOG(NOTICE) << "Setting RX gain to " << dB << " dB.";
 
   if (!m_dbRx->set_gain(dB))
-    LOGC(DDEV, ERR) << "Error setting RX gain";
+    LOG(ERR) << "Error setting RX gain";
 
   writeLock.unlock();
 
@@ -312,40 +319,40 @@ double USRPDevice::setRxGain(double dB, size_t chan)
 bool USRPDevice::setRxAntenna(const std::string &ant, size_t chan)
 {
 	if (chan >= rx_paths.size()) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
+		LOG(ALERT) << "Requested non-existent channel " << chan;
 		return false;
 	}
-	LOGC(DDEV, ALERT) << "Not implemented";
+	LOG(ALERT) << "Not implemented";
 	return true;
 }
 
 std::string USRPDevice::getRxAntenna(size_t chan)
 {
 	if (chan >= rx_paths.size()) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
+		LOG(ALERT) << "Requested non-existent channel " << chan;
 		return "";
 	}
-	LOGC(DDEV, ALERT) << "Not implemented";
+	LOG(ALERT) << "Not implemented";
 	return "";
 }
 
 bool USRPDevice::setTxAntenna(const std::string &ant, size_t chan)
 {
 	if (chan >= tx_paths.size()) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
+		LOG(ALERT) << "Requested non-existent channel " << chan;
 		return false;
 	}
-	LOGC(DDEV, ALERT) << "Not implemented";
+	LOG(ALERT) << "Not implemented";
 	return true;
 }
 
 std::string USRPDevice::getTxAntenna(size_t chan)
 {
 	if (chan >= tx_paths.size()) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
+		LOG(ALERT) << "Requested non-existent channel " << chan;
 		return "";
 	}
-	LOGC(DDEV, ALERT) << "Not implemented";
+	LOG(ALERT) << "Not implemented";
 	return "";
 }
 
@@ -391,18 +398,18 @@ int USRPDevice::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
 
     // read USRP packets, parse and save A/D data as needed
     readLen = m_uRx->read((void *)readBuf,readLen,overrun);
-    for (int pktNum = 0; pktNum < (readLen/512); pktNum++) {
+    for(int pktNum = 0; pktNum < (readLen/512); pktNum++) {
       // tmpBuf points to start of a USB packet
       uint32_t* tmpBuf = (uint32_t *) (readBuf+pktNum*512/4);
       TIMESTAMP pktTimestamp = usrp_to_host_u32(tmpBuf[1]);
       uint32_t word0 = usrp_to_host_u32(tmpBuf[0]);
       uint32_t chan = (word0 >> 16) & 0x1f;
       unsigned payloadSz = word0 & 0x1ff;
-      LOGC(DDEV, DEBUG) << "first two bytes: " << hex << word0 << " " << dec << pktTimestamp;
+      LOG(DEBUG) << "first two bytes: " << hex << word0 << " " << dec << pktTimestamp;
 
       bool incrementHi32 = ((lastPktTimestamp & 0x0ffffffffll) > pktTimestamp);
       if (incrementHi32 && (timeStart!=0)) {
-           LOGC(DDEV, DEBUG) << "high 32 increment!!!";
+           LOG(DEBUG) << "high 32 increment!!!";
            hi32Timestamp++;
       }
       pktTimestamp = (((TIMESTAMP) hi32Timestamp) << 32) | pktTimestamp;
@@ -414,19 +421,19 @@ int USRPDevice::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
 	if ((word2 >> 16) == ((0x01 << 8) | 0x02)) {
           timestamp -= timestampOffset;
 	  timestampOffset = pktTimestamp - pingTimestamp + pingOffset;
-	  LOGC(DDEV, DEBUG) << "updating timestamp offset to: " << timestampOffset;
+	  LOG(DEBUG) << "updating timestamp offset to: " << timestampOffset;
           timestamp += timestampOffset;
 	  isAligned = true;
 	}
 	continue;
       }
       if (chan != 0) {
-	LOGC(DDEV, DEBUG) << "chan: " << chan << ", timestamp: " << pktTimestamp << ", sz:" << payloadSz;
+	LOG(DEBUG) << "chan: " << chan << ", timestamp: " << pktTimestamp << ", sz:" << payloadSz;
 	continue;
       }
       if ((word0 >> 28) & 0x04) {
 	if (underrun) *underrun = true;
-	LOGC(DDEV, DEBUG) << "UNDERRUN in TRX->USRP interface";
+	LOG(DEBUG) << "UNDERRUN in TRX->USRP interface";
       }
       if (RSSI) *RSSI = (word0 >> 21) & 0x3f;
 
@@ -447,7 +454,7 @@ int USRPDevice::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
       if (pktTimestamp + payloadSz/2/sizeof(short) > timeEnd)
 	timeEnd = pktTimestamp+payloadSz/2/sizeof(short);
 
-      LOGC(DDEV, DEBUG) << "timeStart: " << timeStart << ", timeEnd: " << timeEnd << ", pktTimestamp: " << pktTimestamp;
+      LOG(DEBUG) << "timeStart: " << timeStart << ", timeEnd: " << timeEnd << ", pktTimestamp: " << pktTimestamp;
 
     }
   }
@@ -455,14 +462,14 @@ int USRPDevice::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
   // copy desired data to buf
   unsigned bufStart = dataStart+(timestamp-timeStart);
   if (bufStart + len < currDataSize/2) {
-    LOGC(DDEV, DEBUG) << "bufStart: " << bufStart;
+    LOG(DEBUG) << "bufStart: " << bufStart;
     memcpy(buf,data+bufStart*2,len*2*sizeof(short));
     memset(data+bufStart*2,0,len*2*sizeof(short));
   }
   else {
-    LOGC(DDEV, DEBUG) << "len: " << len << ", currDataSize/2: " << currDataSize/2 << ", bufStart: " << bufStart;
+    LOG(DEBUG) << "len: " << len << ", currDataSize/2: " << currDataSize/2 << ", bufStart: " << bufStart;
     unsigned firstLength = (currDataSize/2-bufStart);
-    LOGC(DDEV, DEBUG) << "firstLength: " << firstLength;
+    LOG(DEBUG) << "firstLength: " << firstLength;
     memcpy(buf,data+bufStart*2,firstLength*2*sizeof(short));
     memset(data+bufStart*2,0,firstLength*2*sizeof(short));
     memcpy(buf+firstLength*2,data,(len-firstLength)*2*sizeof(short));
@@ -503,6 +510,7 @@ int USRPDevice::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
     gettimeofday(&lastReadTime,NULL);
     firstRead = true;
   }
+  samplesRead += numSamples;
 
   return numSamples;
 #endif
@@ -552,12 +560,14 @@ int USRPDevice::writeSamples(std::vector<short *> &bufs, int len,
   }
   m_uTx->write((const void*) outPkt,sizeof(uint32_t)*128*numPkts,NULL);
 
+  samplesWritten += len/2/sizeof(short);
   writeLock.unlock();
 
   return len/2/sizeof(short);
 #else
   int retVal = len;
   memcpy(loopbackBuffer+loopbackBufferSize,buf,sizeof(short)*2*len);
+  samplesWritten += retVal;
   loopbackBufferSize += retVal*2;
 
   return retVal;
@@ -589,19 +599,19 @@ bool USRPDevice::setTxFreq(double wFreq, size_t chan)
   usrp_tune_result result;
 
   if (chan) {
-    LOGC(DDEV, ALERT) << "Invalid channel " << chan;
+    LOG(ALERT) << "Invalid channel " << chan;
     return false;
   }
 
   if (m_uTx->tune(txSubdevSpec.side, m_dbTx, wFreq, &result)) {
-    LOGC(DDEV, INFO) << "set TX: " << wFreq << std::endl
+    LOG(INFO) << "set TX: " << wFreq << std::endl
               << "    baseband freq: " << result.baseband_freq << std::endl
               << "    DDC freq:      " << result.dxc_freq << std::endl
               << "    residual freq: " << result.residual_freq;
     return true;
   }
   else {
-    LOGC(DDEV, ALERT) << "set TX: " << wFreq << " failed" << std::endl
+    LOG(ALERT) << "set TX: " << wFreq << "failed" << std::endl
                << "    baseband freq: " << result.baseband_freq << std::endl
                << "    DDC freq:      " << result.dxc_freq << std::endl
                << "    residual freq: " << result.residual_freq;
@@ -614,19 +624,19 @@ bool USRPDevice::setRxFreq(double wFreq, size_t chan)
   usrp_tune_result result;
 
   if (chan) {
-    LOGC(DDEV, ALERT) << "Invalid channel " << chan;
+    LOG(ALERT) << "Invalid channel " << chan;
     return false;
   }
 
   if (m_uRx->tune(0, m_dbRx, wFreq, &result)) {
-    LOGC(DDEV, INFO) << "set RX: " << wFreq << std::endl
+    LOG(INFO) << "set RX: " << wFreq << std::endl
               << "    baseband freq: " << result.baseband_freq << std::endl
               << "    DDC freq:      " << result.dxc_freq << std::endl
               << "    residual freq: " << result.residual_freq;
     return true;
   }
   else {
-    LOGC(DDEV, ALERT) << "set RX: " << wFreq << " failed" << std::endl
+    LOG(ALERT) << "set RX: " << wFreq << "failed" << std::endl
                << "    baseband freq: " << result.baseband_freq << std::endl
                << "    DDC freq:      " << result.dxc_freq << std::endl
                << "    residual freq: " << result.residual_freq;
@@ -645,17 +655,5 @@ RadioDevice *RadioDevice::make(size_t tx_sps, size_t rx_sps,
 			       const std::vector<std::string>& tx_paths,
 			       const std::vector<std::string>& rx_paths)
 {
-	if (tx_sps != rx_sps) {
-		LOGC(DDEV, ERROR) << "USRP1 requires tx_sps == rx_sps";
-		return NULL;
-	}
-	if (chans != 1) {
-		LOGC(DDEV, ERROR) << "USRP1 supports only 1 channel";
-		return NULL;
-	}
-	if (lo_offset != 0.0) {
-		LOGC(DDEV, ERROR) << "USRP1 doesn't support lo_offset";
-		return NULL;
-	}
 	return new USRPDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths);
 }

Transceiver52M/device/usrp1/USRPDevice.h

@@ -51,7 +51,11 @@ private:
   double actualSampleRate;	///< the actual USRP sampling rate
   unsigned int decimRate;	///< the USRP decimation rate
 
+  unsigned long long samplesRead;	///< number of samples read from USRP
+  unsigned long long samplesWritten;	///< number of samples sent to USRP
+
   bool started;			///< flag indicates USRP has started
+  bool skipRx;			///< set if USRP is transmit-only.
 
   static const unsigned int currDataSize_log2 = 21;
   static const unsigned long currDataSize = (1 << currDataSize_log2);
@@ -198,6 +202,8 @@ private:
   inline double getTxFreq(size_t chan = 0) { return 0; }
   inline double getRxFreq(size_t chan = 0) { return 0; }
   inline double getSampleRate() { return actualSampleRate; }
+  inline double numberRead() { return samplesRead; }
+  inline double numberWritten() { return samplesWritten; }
 };
 
 #endif // _USRP_DEVICE_H_

Transceiver52M/osmo-trx.cpp

@@ -22,19 +22,16 @@
 
 #include "Transceiver.h"
 #include "radioDevice.h"
-#include "Utils.h"
 
 #include <time.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <getopt.h>
 #include <sched.h>
 #include <vector>
 #include <string>
 #include <sstream>
 #include <iostream>
-#include <sys/signalfd.h>
 
 #include <GSMCommon.h>
 #include <Logger.h>
@@ -52,13 +49,10 @@ extern "C" {
 #include <osmocom/ctrl/ports.h>
 #include <osmocom/ctrl/control_if.h>
 #include <osmocom/vty/stats.h>
-#include <osmocom/vty/command.h>
-
 #include "convolve.h"
 #include "convert.h"
 #include "trx_vty.h"
 #include "debug.h"
-#include "osmo_signal.h"
 }
 
 #define DEFAULT_CONFIG_FILE	"osmo-trx.cfg"
@@ -67,7 +61,6 @@ extern "C" {
 
 static char* config_file = (char*)DEFAULT_CONFIG_FILE;
 
-struct osmo_fd signal_ofd;
 volatile bool gshutdown = false;
 
 static void *tall_trx_ctx;
@@ -117,20 +110,6 @@ RadioInterface *makeRadioInterface(struct trx_ctx *trx,
 	return radio;
 }
 
-/* Callback function to be called every time we receive a signal from TRANSC */
-static int transc_sig_cb(unsigned int subsys, unsigned int signal,
-		     void *handler_data, void *signal_data)
-{
-	switch (signal) {
-	case S_TRANSC_STOP_REQUIRED:
-		gshutdown = true;
-                break;
-	default:
-                break;
-	}
-	return 0;
-}
-
 /* Create transceiver core
  *     The multi-threaded modem core operates at multiples of the GSM rate of
  *     270.8333 ksps and consists of GSM specific modulation, demodulation,
@@ -146,13 +125,11 @@ int makeTransceiver(struct trx_ctx *trx, RadioInterface *radio)
 			      trx->cfg.rx_sps, trx->cfg.num_chans, GSM::Time(3,0),
 			      radio, trx->cfg.rssi_offset);
 	if (!transceiver->init(trx->cfg.filler, trx->cfg.rtsc,
-		       trx->cfg.rach_delay, trx->cfg.egprs, trx->cfg.ext_rach)) {
+		       trx->cfg.rach_delay, trx->cfg.egprs)) {
 		LOG(ALERT) << "Failed to initialize transceiver";
 		return -1;
 	}
 
-        transceiver->setSignalHandler(transc_sig_cb);
-
 	for (size_t i = 0; i < trx->cfg.num_chans; i++) {
 		fifo = radio->receiveFIFO(i);
 		if (fifo && transceiver->receiveFIFO(fifo, i))
@@ -166,12 +143,6 @@ int makeTransceiver(struct trx_ctx *trx, RadioInterface *radio)
 
 static void sig_handler(int signo)
 {
-
-	if (gshutdown)
-		/* We are in the middle of shutdown process, avoid any kind of extra
-		   action like printing */
-		return;
-
 	fprintf(stdout, "signal %d received\n", signo);
 	switch (signo) {
 	case SIGINT:
@@ -187,68 +158,42 @@ static void sig_handler(int signo)
 	case SIGUSR2:
 		talloc_report_full(tall_trx_ctx, stderr);
 		break;
-	case SIGHUP:
-		log_targets_reopen();
 	default:
 		break;
 	}
-
-}
-
-static int signalfd_callback(struct osmo_fd *ofd, unsigned int what)
-{
-	struct signalfd_siginfo fdsi;
-	ssize_t s;
-
-	s = read(ofd->fd, &fdsi, sizeof(struct signalfd_siginfo));
-	if (s < 0) {
-		LOG(FATAL) << "Failed to read from signalfd ("<< ofd->fd << "): " << errno;
-		gshutdown = true;
-		return 0;
-	}
-	sig_handler(fdsi.ssi_signo);
-	return 0;
 }
 
 static void setup_signal_handlers()
 {
-	sigset_t set;
-	int sfd;
-
+	/* Handle keyboard interrupt SIGINT */
+	signal(SIGINT, &sig_handler);
+	signal(SIGTERM, &sig_handler);
 	signal(SIGABRT, &sig_handler);
+	signal(SIGUSR1, &sig_handler);
+	signal(SIGUSR2, &sig_handler);
 	osmo_init_ignore_signals();
+}
 
-	/* Other threads created by this thread (main) will inherit a copy of the
-	signal mask. */
-	sigemptyset(&set);
-	sigaddset(&set, SIGINT);
-	sigaddset(&set, SIGTERM);
-	sigaddset(&set, SIGUSR1);
-	sigaddset(&set, SIGUSR2);
-	sigaddset(&set, SIGHUP);
-	if (pthread_sigmask(SIG_BLOCK, &set, NULL)) {
-		fprintf(stderr, "pthread_sigmask() failed.\n");
-		exit(EXIT_FAILURE);
-	}
+static std::vector<std::string> comma_delimited_to_vector(char* opt)
+{
+	std::string str = std::string(opt);
+	std::vector<std::string> result;
+	std::stringstream ss(str);
 
-	if ((sfd = signalfd(-1, &set, 0)) == -1) {
-		fprintf(stderr, "signalfd() failed (%d).\n", errno);
-		exit(EXIT_FAILURE);
-	}
-
-	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);
+	while( ss.good() )
+	{
+	    std::string substr;
+	    getline(ss, substr, ',');
+	    result.push_back(substr);
 	}
+	return result;
 }
 
 static void print_help()
 {
 	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"
+		"  -h    This text\n"
+		"  -C    Filename The config file to use\n"
 		);
 }
 
@@ -265,15 +210,8 @@ static void handle_options(int argc, char **argv, struct trx_ctx* trx)
 	unsigned int i;
 	std::vector<std::string> rx_paths, tx_paths;
 	bool rx_paths_set = false, tx_paths_set = false;
-	static struct option long_options[] = {
-		{"help", 0, 0, 'h'},
-		{"config", 1, 0, 'C'},
-		{"version", 0, 0, 'V'},
-		{NULL, 0, 0, 0}
-	};
 
-	while ((option = getopt_long(argc, argv, "ha:l:i:j:p:c:dmxgfo:s:b:r:A:R:Set:y:z:C:V", long_options,
-		NULL)) != -1) {
+	while ((option = getopt(argc, argv, "ha:l:i:j:p:c:dmxgfo:s:b:r:A:R:Set:y:z:C:")) != -1) {
 		switch (option) {
 		case 'h':
 			print_help();
@@ -373,10 +311,6 @@ static void handle_options(int argc, char **argv, struct trx_ctx* trx)
 		case 'C':
 			config_file = optarg;
 			break;
-		case 'V':
-			print_version(1);
-			exit(0);
-			break;
 		default:
 			goto bad_config;
 		}
@@ -411,14 +345,14 @@ bad_config:
 
 int trx_validate_config(struct trx_ctx *trx)
 {
-	if (trx->cfg.multi_arfcn && trx->cfg.num_chans > TRX_MCHAN_MAX) {
+	if (trx->cfg.multi_arfcn && trx->cfg.num_chans > 5) {
 		LOG(ERROR) << "Unsupported number of channels";
 		return -1;
 	}
 
 	/* Force 4 SPS for EDGE or multi-ARFCN configurations */
 	if ((trx->cfg.egprs || trx->cfg.multi_arfcn) &&
-	    (trx->cfg.tx_sps!=4 || trx->cfg.rx_sps!=4)) {
+	    (trx->cfg.tx_sps!=4 || trx->cfg.tx_sps!=4)) {
 		LOG(ERROR) << "EDGE and Multi-Carrier options require 4 tx and rx sps. Check you config.";
 		return -1;
 	}
@@ -432,7 +366,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;
+	printf("Setting SCHED_RR priority(%d)\n", param.sched_priority);
 	rc = sched_setscheduler(getpid(), SCHED_RR, &param);
 	if (rc != 0) {
 		LOG(ERROR) << "Config: Setting SCHED_RR failed";
@@ -456,7 +390,6 @@ static void print_config(struct trx_ctx *trx)
 	ost << "   Tx Samples-per-Symbol... " << trx->cfg.tx_sps << std::endl;
 	ost << "   Rx Samples-per-Symbol... " << trx->cfg.rx_sps << std::endl;
 	ost << "   EDGE support............ " << trx->cfg.egprs << std::endl;
-	ost << "   Extended RACH support... " << trx->cfg.ext_rach << std::endl;
 	ost << "   Reference............... " << trx->cfg.clock_ref << std::endl;
 	ost << "   C0 Filler Table......... " << trx->cfg.filler << std::endl;
 	ost << "   Multi-Carrier........... " << trx->cfg.multi_arfcn << std::endl;
@@ -476,12 +409,12 @@ static void print_config(struct trx_ctx *trx)
 	}
 	ost << std::endl;
 
-	LOG(INFO) << ost << std::endl;
+	std::cout << ost << std::endl;
 }
 
 static void trx_stop()
 {
-	LOG(NOTICE) << "Shutting down transceiver..." << std::endl;
+	std::cout << "Shutting down transceiver..." << std::endl;
 
 	delete transceiver;
 	delete radio;
@@ -524,7 +457,7 @@ static int trx_start(struct trx_ctx *trx)
 		goto shutdown;
 
 	chans = transceiver->numChans();
-	LOG(NOTICE) << "-- Transceiver active with "
+	std::cout << "-- Transceiver active with "
 		  << chans << " channel(s)" << std::endl;
 
 	return 0;
@@ -599,7 +532,7 @@ int main(int argc, char *argv[])
 
 	g_ctrlh = ctrl_interface_setup(NULL, OSMO_CTRL_PORT_TRX, NULL);
 	if (!g_ctrlh) {
-		LOG(ERROR) << "Failed to create CTRL interface.\n";
+		fprintf(stderr, "Failed to create CTRL interface.\n");
 		exit(1);
 	}
 
@@ -636,7 +569,5 @@ int main(int argc, char *argv[])
 
 	trx_stop();
 
-	osmo_fd_unregister(&signal_ofd);
-	osmo_fd_close(&signal_ofd);
 	return 0;
 }

Transceiver52M/radioInterface.cpp

@@ -75,14 +75,6 @@ bool RadioInterface::init(int type)
 
 void RadioInterface::close()
 {
-  for (std::vector<RadioBuffer*>::iterator it = sendBuffer.begin(); it != sendBuffer.end(); ++it)
-          delete *it;
-  for (std::vector<RadioBuffer*>::iterator it = recvBuffer.begin(); it != recvBuffer.end(); ++it)
-          delete *it;
-  for (std::vector<short*>::iterator it = convertSendBuffer.begin(); it != convertSendBuffer.end(); ++it)
-          delete[] *it;
-  for (std::vector<short*>::iterator it = convertRecvBuffer.begin(); it != convertRecvBuffer.end(); ++it)
-          delete[] *it;
   sendBuffer.resize(0);
   recvBuffer.resize(0);
   convertSendBuffer.resize(0);
@@ -156,7 +148,6 @@ bool RadioInterface::tuneRx(double freq, size_t chan)
 /** synchronization thread loop */
 void *AlignRadioServiceLoopAdapter(RadioInterface *radioInterface)
 {
-  set_selfthread_name("AlignRadio");
   while (1) {
     sleep(60);
     radioInterface->alignRadio();
@@ -227,15 +218,14 @@ void RadioInterface::driveTransmitRadio(std::vector<signalVector *> &bursts,
   while (pushBuffer());
 }
 
-int RadioInterface::driveReceiveRadio()
+bool RadioInterface::driveReceiveRadio()
 {
   radioVector *burst = NULL;
 
   if (!mOn)
-    return 0;
+    return false;
 
-  if (pullBuffer() < 0)
-    return  -1;
+  pullBuffer();
 
   GSM::Time rcvClock = mClock.get();
   rcvClock.decTN(receiveOffset);
@@ -249,11 +239,11 @@ int RadioInterface::driveReceiveRadio()
   else
     burstSize = symbolsPerSlot + (tN % 4 == 0);
 
-  /*
+  /* 
    * Pre-allocate head room for the largest correlation size
    * so we can later avoid a re-allocation and copy
    * */
-  size_t head = GSM::gRACHSynchSequenceTS0.size();
+  size_t head = GSM::gRACHSynchSequence.size();
 
   /*
    * Form receive bursts and pass up to transceiver. Use repeating
@@ -280,7 +270,7 @@ int RadioInterface::driveReceiveRadio()
       burstSize = (symbolsPerSlot + (tN % 4 == 0)) * mSPSRx;
   }
 
-  return 1;
+  return true;
 }
 
 bool RadioInterface::isUnderrun()
@@ -310,14 +300,13 @@ double RadioInterface::getRxGain(size_t chan)
 }
 
 /* Receive a timestamped chunk from the device */
-int RadioInterface::pullBuffer()
+void RadioInterface::pullBuffer()
 {
   bool local_underrun;
-  int numRecv;
-  size_t segmentLen = recvBuffer[0]->getSegmentLen();
+  size_t numRecv, segmentLen = recvBuffer[0]->getSegmentLen();
 
   if (recvBuffer[0]->getFreeSegments() <= 0)
-    return -1;
+    return;
 
   /* Outer buffer access size is fixed */
   numRecv = mRadio->readSamples(convertRecvBuffer,
@@ -326,9 +315,9 @@ int RadioInterface::pullBuffer()
                                 readTimestamp,
                                 &local_underrun);
 
-  if ((size_t) numRecv != segmentLen) {
+  if (numRecv != segmentLen) {
           LOG(ALERT) << "Receive error " << numRecv;
-          return -1;
+          return;
   }
 
   for (size_t i = 0; i < mChans; i++) {
@@ -339,7 +328,6 @@ int RadioInterface::pullBuffer()
 
   underrun |= local_underrun;
   readTimestamp += numRecv;
-  return 0;
 }
 
 /* Send timestamped chunk to the device with arbitrary size */

Transceiver52M/radioInterface.h

@@ -14,7 +14,7 @@
 
 
 
-#include "sigProcLib.h"
+#include "sigProcLib.h"  
 #include "GSMCommon.h"
 #include "LinkedLists.h"
 #include "radioDevice.h"
@@ -71,7 +71,7 @@ private:
   virtual bool pushBuffer(void);
 
   /** pull GSM bursts from the receive buffer */
-  virtual int pullBuffer(void);
+  virtual void pullBuffer(void);
 
 public:
 
@@ -116,8 +116,8 @@ public:
   void driveTransmitRadio(std::vector<signalVector *> &bursts,
                           std::vector<bool> &zeros);
 
-  /** drive reception of GSM bursts. -1: Error. 0: Radio off. 1: Received something. */
-  int driveReceiveRadio();
+  /** drive reception of GSM bursts */
+  bool driveReceiveRadio();
 
   int setPowerAttenuation(int atten, size_t chan = 0);
 
@@ -130,7 +130,7 @@ public:
   /** set thread priority on current thread */
   void setPriority(float prio = 0.5) { mRadio->setPriority(prio); }
 
-  /** get transport window type of attached device */
+  /** get transport window type of attached device */ 
   enum RadioDevice::TxWindowType getWindowType() { return mRadio->getWindowType(); }
 
   /** Minimum latency that the device can achieve */
@@ -149,7 +149,7 @@ private:
   signalVector *outerRecvBuffer;
 
   bool pushBuffer();
-  int pullBuffer();
+  void pullBuffer();
 
 public:
   RadioInterfaceResamp(RadioDevice* wRadio, size_t tx_sps, size_t rx_sps);
@@ -162,7 +162,7 @@ public:
 class RadioInterfaceMulti : public RadioInterface {
 private:
   bool pushBuffer();
-  int pullBuffer();
+  void pullBuffer();
 
   signalVector *outerSendBuffer;
   signalVector *outerRecvBuffer;

Transceiver52M/radioInterfaceMulti.cpp

@@ -1,7 +1,7 @@
 /*
  * Multi-carrier radio interface
  *
- * Copyright (C) 2016 Ettus Research LLC
+ * Copyright (C) 2016 Ettus Research LLC 
  *
  * Author: Tom Tsou <tom.tsou@ettus.com>
  *
@@ -225,15 +225,14 @@ bool RadioInterfaceMulti::init(int type)
 }
 
 /* Receive a timestamped chunk from the device */
-int RadioInterfaceMulti::pullBuffer()
+void RadioInterfaceMulti::pullBuffer()
 {
 	bool local_underrun;
 	size_t num;
 	float *buf;
-	unsigned int i;
 
 	if (recvBuffer[0]->getFreeSegments() <= 0)
-		return -1;
+		return;
 
 	/* Outer buffer access size is fixed */
 	num = mRadio->readSamples(convertRecvBuffer,
@@ -243,7 +242,7 @@ int RadioInterfaceMulti::pullBuffer()
 				  &local_underrun);
 	if (num != channelizer->inputLen()) {
 		LOG(ALERT) << "Receive error " << num << ", " << channelizer->inputLen();
-		return -1;
+		return;
 	}
 
 	convert_short_float((float *) outerRecvBuffer->begin(),
@@ -274,22 +273,10 @@ int RadioInterfaceMulti::pullBuffer()
 		buf = channelizer->outputBuffer(pchan);
 		size_t cLen = channelizer->outputLen();
 		size_t hLen = dnsampler->len();
+		size_t hSize = 2 * hLen * sizeof(float);
 
-		float *fdst = &buf[2 * -hLen];
-		complex *src = history[lchan]->begin();
-		for (i = 0; i < hLen; i++) {
-			fdst[0] = src->real();
-			fdst[1] = src->imag();
-			src++;
-			fdst += 2;
-		}
-		complex *dst = history[lchan]->begin();
-		float *fsrc = &buf[2 * (cLen - hLen)];
-		for (i = 0; i < hLen; i++) {
-			*dst = complex(fdst[0], fdst[1]);
-			fsrc += 2;
-			dst++;
-		}
+		memcpy(&buf[2 * -hLen], history[lchan]->begin(), hSize);
+		memcpy(history[lchan]->begin(), &buf[2 * (cLen - hLen)], hSize);
 
 		float *wr_segment = recvBuffer[lchan]->getWriteSegment();
 
@@ -301,7 +288,6 @@ int RadioInterfaceMulti::pullBuffer()
 			LOG(ALERT) << "Sample rate upsampling error";
 		}
 	}
-	return 0;
 }
 
 /* Send a timestamped chunk to the device */

Transceiver52M/radioInterfaceResamp.cpp

@@ -160,13 +160,13 @@ bool RadioInterfaceResamp::init(int type)
 }
 
 /* Receive a timestamped chunk from the device */
-int RadioInterfaceResamp::pullBuffer()
+void RadioInterfaceResamp::pullBuffer()
 {
 	bool local_underrun;
 	int rc, num_recv;
 
 	if (recvBuffer[0]->getFreeSegments() <= 0)
-		return -1;
+		return;
 
 	/* Outer buffer access size is fixed */
 	num_recv = mRadio->readSamples(convertRecvBuffer,
@@ -176,7 +176,7 @@ int RadioInterfaceResamp::pullBuffer()
 				       &local_underrun);
 	if (num_recv != (int) resamp_outchunk) {
 		LOG(ALERT) << "Receive error " << num_recv;
-		return -1;
+		return;
 	}
 
 	convert_short_float((float *) outerRecvBuffer->begin(),
@@ -196,7 +196,6 @@ int RadioInterfaceResamp::pullBuffer()
 
 	/* Set history for the next chunk */
 	outerRecvBuffer->updateHistory();
-	return 0;
 }
 
 /* Send a timestamped chunk to the device */

Transceiver52M/sigProcLib.cpp

@@ -84,13 +84,14 @@ static Resampler *dnsampler = NULL;
  * perform 16-byte memory alignment required by many SSE instructions.
  */
 struct CorrelationSequence {
-  CorrelationSequence() : sequence(NULL)
+  CorrelationSequence() : sequence(NULL), buffer(NULL)
   {
   }
 
   ~CorrelationSequence()
   {
     delete sequence;
+    free(buffer);
   }
 
   signalVector *sequence;
@@ -105,7 +106,8 @@ struct CorrelationSequence {
  * for SSE instructions.
  */
 struct PulseSequence {
-  PulseSequence() : c0(NULL), c1(NULL), c0_inv(NULL), empty(NULL)
+  PulseSequence() : c0(NULL), c1(NULL), c0_inv(NULL), empty(NULL),
+		    c0_buffer(NULL), c1_buffer(NULL), c0_inv_buffer(NULL)
   {
   }
 
@@ -115,17 +117,22 @@ struct PulseSequence {
     delete c1;
     delete c0_inv;
     delete empty;
+    free(c0_buffer);
+    free(c1_buffer);
   }
 
   signalVector *c0;
   signalVector *c1;
   signalVector *c0_inv;
   signalVector *empty;
+  void *c0_buffer;
+  void *c1_buffer;
+  void *c0_inv_buffer;
 };
 
 static CorrelationSequence *gMidambles[] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};
 static CorrelationSequence *gEdgeMidambles[] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};
-static CorrelationSequence *gRACHSequences[] = {NULL,NULL,NULL};
+static CorrelationSequence *gRACHSequence = NULL;
 static PulseSequence *GSMPulse1 = NULL;
 static PulseSequence *GSMPulse4 = NULL;
 
@@ -143,15 +150,11 @@ void sigProcLibDestroy()
     delayFilters[i] = NULL;
   }
 
-  for (int i = 0; i < 3; i++) {
-    delete gRACHSequences[i];
-    gRACHSequences[i] = NULL;
-  }
-
   delete GMSKRotation1;
   delete GMSKReverseRotation1;
   delete GMSKRotation4;
   delete GMSKReverseRotation4;
+  delete gRACHSequence;
   delete GSMPulse1;
   delete GSMPulse4;
   delete dnsampler;
@@ -160,6 +163,7 @@ void sigProcLibDestroy()
   GMSKRotation4 = NULL;
   GMSKReverseRotation4 = NULL;
   GMSKReverseRotation1 = NULL;
+  gRACHSequence = NULL;
   GSMPulse1 = NULL;
   GSMPulse4 = NULL;
 }
@@ -285,7 +289,8 @@ enum ConvType {
 
 static signalVector *convolve(const signalVector *x, const signalVector *h,
                               signalVector *y, ConvType spanType,
-                              size_t start = 0, size_t len = 0)
+                              size_t start = 0, size_t len = 0,
+                              size_t step = 1, int offset = 0)
 {
   int rc;
   size_t head = 0, tail = 0;
@@ -332,7 +337,7 @@ static signalVector *convolve(const signalVector *x, const signalVector *h,
   if (y && (len > y->size()))
     return NULL;
   if (!y) {
-    y = new signalVector(len, convolve_h_alloc, free);
+    y = new signalVector(len);
     alloc = true;
   }
 
@@ -353,22 +358,22 @@ static signalVector *convolve(const signalVector *x, const signalVector *h,
     rc = convolve_real((float *) _x->begin(), _x->size(),
                        (float *) h->begin(), h->size(),
                        (float *) y->begin(), y->size(),
-                       start, len);
+                       start, len, step, offset);
   } else if (!h->isReal() && h->isAligned()) {
     rc = convolve_complex((float *) _x->begin(), _x->size(),
                           (float *) h->begin(), h->size(),
                           (float *) y->begin(), y->size(),
-                          start, len);
+                          start, len, step, offset);
   } else if (h->isReal() && !h->isAligned()) {
     rc = base_convolve_real((float *) _x->begin(), _x->size(),
                             (float *) h->begin(), h->size(),
                             (float *) y->begin(), y->size(),
-                            start, len);
+                            start, len, step, offset);
   } else if (!h->isReal() && !h->isAligned()) {
     rc = base_convolve_complex((float *) _x->begin(), _x->size(),
                                (float *) h->begin(), h->size(),
                                (float *) y->begin(), y->size(),
-                               start, len);
+                               start, len, step, offset);
   } else {
     rc = -1;
   }
@@ -395,7 +400,8 @@ static bool generateInvertC0Pulse(PulseSequence *pulse)
   if (!pulse)
     return false;
 
-  pulse->c0_inv = new signalVector((complex *) convolve_h_alloc(5), 0, 5, convolve_h_alloc, free);
+  pulse->c0_inv_buffer = convolve_h_alloc(5);
+  pulse->c0_inv = new signalVector((complex *) pulse->c0_inv_buffer, 0, 5);
   pulse->c0_inv->isReal(true);
   pulse->c0_inv->setAligned(false);
 
@@ -424,7 +430,9 @@ static bool generateC1Pulse(int sps, PulseSequence *pulse)
     return false;
   }
 
-  pulse->c1 = new signalVector((complex *) convolve_h_alloc(len), 0, len, convolve_h_alloc, free);
+  pulse->c1_buffer = convolve_h_alloc(len);
+  pulse->c1 = new signalVector((complex *)
+                                  pulse->c1_buffer, 0, len);
   pulse->c1->isReal(true);
 
   /* Enable alignment for SSE usage */
@@ -478,7 +486,8 @@ static PulseSequence *generateGSMPulse(int sps)
     len = 4;
   }
 
-  pulse->c0 = new signalVector((complex *) convolve_h_alloc(len), 0, len, convolve_h_alloc, free);
+  pulse->c0_buffer = convolve_h_alloc(len);
+  pulse->c0 = new signalVector((complex *) pulse->c0_buffer, 0, len);
   pulse->c0->isReal(true);
 
   /* Enable alingnment for SSE usage */
@@ -1007,7 +1016,7 @@ static void generateDelayFilters()
 
   for (int i = 0; i < DELAYFILTS; i++) {
     data = (complex *) convolve_h_alloc(h_len);
-    h = new signalVector(data, 0, h_len, convolve_h_alloc, free);
+    h = new signalVector(data, 0, h_len);
     h->setAligned(true);
     h->isReal(true);
 
@@ -1093,17 +1102,17 @@ static complex interpolatePoint(const signalVector &inSig, float ix)
   if (start < 0) start = 0;
   int end = (int) (floor(ix) + 11);
   if ((unsigned) end > inSig.size()-1) end = inSig.size()-1;
-
+  
   complex pVal = 0.0;
   if (!inSig.isReal()) {
-    for (int i = start; i < end; i++)
+    for (int i = start; i < end; i++) 
       pVal += inSig[i] * sinc(M_PI_F*(i-ix));
   }
   else {
-    for (int i = start; i < end; i++)
+    for (int i = start; i < end; i++) 
       pVal += inSig[i].real() * sinc(M_PI_F*(i-ix));
   }
-
+   
   return pVal;
 }
 
@@ -1148,12 +1157,12 @@ static complex peakDetect(const signalVector &rxBurst,
   // to save computation, we'll use early-late balancing
   float earlyIndex = maxIndex-1;
   float lateIndex = maxIndex+1;
-
+  
   float incr = 0.5;
   while (incr > 1.0/1024.0) {
     complex earlyP = interpolatePoint(rxBurst,earlyIndex);
     complex lateP =  interpolatePoint(rxBurst,lateIndex);
-    if (earlyP < lateP)
+    if (earlyP < lateP) 
       earlyIndex += incr;
     else if (earlyP > lateP)
       earlyIndex -= incr;
@@ -1241,7 +1250,7 @@ static bool generateMidamble(int sps, int tsc)
 
   // NOTE: Because ideal TSC 16-bit midamble is 66 symbols into burst,
   //       the ideal TSC has an + 180 degree phase shift,
-  //       due to the pi/2 frequency shift, that
+  //       due to the pi/2 frequency shift, that 
   //       needs to be accounted for.
   //       26-midamble is 61 symbols into burst, has +90 degree phase shift.
   scaleVector(*midMidamble, complex(-1.0, 0.0));
@@ -1251,9 +1260,10 @@ static bool generateMidamble(int sps, int tsc)
 
   /* For SSE alignment, reallocate the midamble sequence on 16-byte boundary */
   data = (complex *) convolve_h_alloc(midMidamble->size());
-  _midMidamble = new signalVector(data, 0, midMidamble->size(), convolve_h_alloc, free);
+  _midMidamble = new signalVector(data, 0, midMidamble->size());
   _midMidamble->setAligned(true);
-  midMidamble->copyTo(*_midMidamble);
+  memcpy(_midMidamble->begin(), midMidamble->begin(),
+	 midMidamble->size() * sizeof(complex));
 
   autocorr = convolve(midamble, _midMidamble, NULL, NO_DELAY);
   if (!autocorr) {
@@ -1262,6 +1272,7 @@ static bool generateMidamble(int sps, int tsc)
   }
 
   gMidambles[tsc] = new CorrelationSequence;
+  gMidambles[tsc]->buffer = data;
   gMidambles[tsc]->sequence = _midMidamble;
   gMidambles[tsc]->gain = peakDetect(*autocorr, &toa, NULL);
 
@@ -1306,12 +1317,14 @@ static CorrelationSequence *generateEdgeMidamble(int tsc)
   conjugateVector(*midamble);
 
   data = (complex *) convolve_h_alloc(midamble->size());
-  _midamble = new signalVector(data, 0, midamble->size(), convolve_h_alloc, free);
+  _midamble = new signalVector(data, 0, midamble->size());
   _midamble->setAligned(true);
-  midamble->copyTo(*_midamble);
+  memcpy(_midamble->begin(), midamble->begin(),
+	 midamble->size() * sizeof(complex));
 
   /* Channel gain is an empirically measured value */
   seq = new CorrelationSequence;
+  seq->buffer = data;
   seq->sequence = _midamble;
   seq->gain = Complex<float>(-19.6432, 19.5006) / 1.18;
   seq->toa = 0;
@@ -1321,7 +1334,7 @@ static CorrelationSequence *generateEdgeMidamble(int tsc)
   return seq;
 }
 
-static bool generateRACHSequence(CorrelationSequence **seq, const BitVector &bv, int sps)
+static bool generateRACHSequence(int sps)
 {
   bool status = true;
   float toa;
@@ -1329,14 +1342,13 @@ static bool generateRACHSequence(CorrelationSequence **seq, const BitVector &bv,
   signalVector *autocorr = NULL;
   signalVector *seq0 = NULL, *seq1 = NULL, *_seq1 = NULL;
 
-  if (*seq != NULL)
-    delete *seq;
+  delete gRACHSequence;
 
-  seq0 = modulateBurst(bv, 0, sps, false);
+  seq0 = modulateBurst(gRACHSynchSequence, 0, sps, false);
   if (!seq0)
     return false;
 
-  seq1 = modulateBurst(bv.segment(0, 40), 0, sps, true);
+  seq1 = modulateBurst(gRACHSynchSequence.segment(0, 40), 0, sps, true);
   if (!seq1) {
     status = false;
     goto release;
@@ -1346,9 +1358,9 @@ static bool generateRACHSequence(CorrelationSequence **seq, const BitVector &bv,
 
   /* For SSE alignment, reallocate the midamble sequence on 16-byte boundary */
   data = (complex *) convolve_h_alloc(seq1->size());
-  _seq1 = new signalVector(data, 0, seq1->size(), convolve_h_alloc, free);
+  _seq1 = new signalVector(data, 0, seq1->size());
   _seq1->setAligned(true);
-  seq1->copyTo(*_seq1);
+  memcpy(_seq1->begin(), seq1->begin(), seq1->size() * sizeof(complex));
 
   autocorr = convolve(seq0, _seq1, autocorr, NO_DELAY);
   if (!autocorr) {
@@ -1356,18 +1368,19 @@ static bool generateRACHSequence(CorrelationSequence **seq, const BitVector &bv,
     goto release;
   }
 
-  *seq = new CorrelationSequence;
-  (*seq)->sequence = _seq1;
-  (*seq)->gain = peakDetect(*autocorr, &toa, NULL);
+  gRACHSequence = new CorrelationSequence;
+  gRACHSequence->sequence = _seq1;
+  gRACHSequence->buffer = data;
+  gRACHSequence->gain = peakDetect(*autocorr, &toa, NULL);
 
   /* For 1 sps only
    *     (Half of correlation length - 1) + midpoint of pulse shaping filer
    *     20.5 = (40 / 2 - 1) + 1.5
    */
   if (sps == 1)
-    (*seq)->toa = toa - 20.5;
+    gRACHSequence->toa = toa - 20.5;
   else
-    (*seq)->toa = 0.0;
+    gRACHSequence->toa = 0.0;
 
 release:
   delete autocorr;
@@ -1377,7 +1390,7 @@ release:
   if (!status) {
     delete _seq1;
     free(data);
-    *seq = NULL;
+    gRACHSequence = NULL;
   }
 
   return status;
@@ -1444,7 +1457,7 @@ static signalVector *downsampleBurst(const signalVector &burst)
 {
   signalVector in(DOWNSAMPLE_IN_LEN, dnsampler->len());
   signalVector *out = new signalVector(DOWNSAMPLE_OUT_LEN);
-  burst.copyToSegment(in, 0, DOWNSAMPLE_IN_LEN);
+  memcpy(in.begin(), burst.begin(), DOWNSAMPLE_IN_LEN * 2 * sizeof(float));
 
   if (dnsampler->rotate((float *) in.begin(), DOWNSAMPLE_IN_LEN,
                         (float *) out->begin(), DOWNSAMPLE_OUT_LEN) < 0) {
@@ -1455,28 +1468,6 @@ static signalVector *downsampleBurst(const signalVector &burst)
   return out;
 };
 
-static float computeCI(const signalVector *burst, CorrelationSequence *sync,
-                       float toa, int start, complex xcorr)
-{
-  float S, C;
-  int ps;
-
-  /* Integer position where the sequence starts */
-  ps = start + 1 - sync->sequence->size() + (int)roundf(toa);
-
-  /* Estimate Signal power */
-  S = 0.0f;
-  for (int i=0, j=ps; i<(int)sync->sequence->size(); i++,j++)
-    S += (*burst)[j].norm2();
-  S /= sync->sequence->size();
-
-  /* Esimate Carrier power */
-  C = xcorr.norm2() / ((sync->sequence->size() - 1) * sync->gain.abs());
-
-  /* Interference = Signal - Carrier, so C/I = C / (S - C) */
-  return 3.0103f * log2f(C / (S - C));
-}
-
 /*
  * Detect a burst based on correlation and peak-to-average ratio
  *
@@ -1492,7 +1483,6 @@ static int detectBurst(const signalVector &burst,
 {
   const signalVector *corr_in;
   signalVector *dec = NULL;
-  complex xcorr;
 
   if (sps == 4) {
     dec = downsampleBurst(burst);
@@ -1504,7 +1494,7 @@ static int detectBurst(const signalVector &burst,
 
   /* Correlate */
   if (!convolve(corr_in, sync->sequence, &corr,
-                CUSTOM, start, len)) {
+                CUSTOM, start, len, 1, 0)) {
     delete dec;
     return -1;
   }
@@ -1520,18 +1510,15 @@ static int detectBurst(const signalVector &burst,
   if ((*toa < 3 * sps) || (*toa > len - 3 * sps))
     return 0;
 
-  /* Peak-to-average ratio */
+  /* Peak -to-average ratio */
   if (computePeakRatio(&corr, sps, *toa, *amp) < thresh)
     return 0;
 
-  /* Refine TOA and correlation value */
-  xcorr = peakDetect(corr, toa, NULL);
-
-  /* Compute C/I */
-  float CI = computeCI(corr_in, sync, *toa, start, xcorr);
+  /* Compute peak-to-average ratio. Reject if we don't have enough values */
+  *amp = peakDetect(corr, toa, NULL);
 
   /* Normalize our channel gain */
-  *amp = xcorr / sync->gain;
+  *amp = *amp / sync->gain;
 
   /* Compensate for residuate time lag */
   *toa = *toa - sync->toa;
@@ -1604,7 +1591,7 @@ static int detectGeneralBurst(const signalVector &rxBurst,
 }
 
 
-/*
+/* 
  * RACH burst detection
  *
  * Correlation window parameters:
@@ -1613,27 +1600,23 @@ static int detectGeneralBurst(const signalVector &rxBurst,
  *   tail: Search 8 symbols + maximum expected delay
  */
 static int detectRACHBurst(const signalVector &burst, float threshold, int sps,
-                           complex &amplitude, float &toa, unsigned max_toa, bool ext)
+                           complex &amplitude, float &toa, unsigned max_toa)
 {
   int rc, target, head, tail;
-  int i, num_seq;
+  CorrelationSequence *sync;
 
   target = 8 + 40;
   head = 8;
   tail = 8 + max_toa;
-  num_seq = ext ? 3 : 1;
+  sync = gRACHSequence;
 
-  for (i = 0; i < num_seq; i++) {
-    rc = detectGeneralBurst(burst, threshold, sps, amplitude, toa,
-                            target, head, tail, gRACHSequences[i]);
-    if (rc > 0)
-      break;
-  }
+  rc = detectGeneralBurst(burst, threshold, sps, amplitude, toa,
+                          target, head, tail, sync);
 
   return rc;
 }
 
-/*
+/* 
  * Normal burst detection
  *
  * Correlation window parameters:
@@ -1697,10 +1680,9 @@ int detectAnyBurst(const signalVector &burst, unsigned tsc, float threshold,
     rc = analyzeTrafficBurst(burst, tsc, threshold, sps,
                              amp, toa, max_toa);
     break;
-  case EXT_RACH:
   case RACH:
     rc = detectRACHBurst(burst, threshold, sps, amp, toa,
-                         max_toa, type == EXT_RACH);
+                         max_toa);
     break;
   default:
     LOG(ERR) << "Invalid correlation type";
@@ -1878,10 +1860,7 @@ bool sigProcLibSetup()
   GSMPulse1 = generateGSMPulse(1);
   GSMPulse4 = generateGSMPulse(4);
 
-  generateRACHSequence(&gRACHSequences[0], gRACHSynchSequenceTS0, 1);
-  generateRACHSequence(&gRACHSequences[1], gRACHSynchSequenceTS1, 1);
-  generateRACHSequence(&gRACHSequences[2], gRACHSynchSequenceTS2, 1);
-
+  generateRACHSequence(1);
   for (int tsc = 0; tsc < 8; tsc++) {
     generateMidamble(1, tsc);
     gEdgeMidambles[tsc] = generateEdgeMidamble(tsc);

Transceiver52M/sigProcLib.h

@@ -29,7 +29,6 @@
 enum CorrType{
   OFF,         ///< timeslot is off
   TSC,         ///< timeslot should contain a normal burst
-  EXT_RACH,    ///< timeslot should contain an extended access burst
   RACH,        ///< timeslot should contain an access burst
   EDGE,        ///< timeslot should contain an EDGE burst
   IDLE         ///< timeslot is an idle (or dummy) burst

Transceiver52M/signalVector.cpp

@@ -1,20 +1,20 @@
 #include "signalVector.h"
 
-signalVector::signalVector(size_t size, vector_alloc_func wAllocFunc, vector_free_func wFreeFunc)
-	: Vector<complex>(size, wAllocFunc, wFreeFunc),
+signalVector::signalVector(size_t size)
+	: Vector<complex>(size),
 	  real(false), aligned(false), symmetry(NONE)
 {
 }
 
-signalVector::signalVector(size_t size, size_t start, vector_alloc_func wAllocFunc, vector_free_func wFreeFunc)
-	: Vector<complex>(size + start, wAllocFunc, wFreeFunc),
+signalVector::signalVector(size_t size, size_t start)
+	: Vector<complex>(size + start),
 	  real(false), aligned(false), symmetry(NONE)
 {
 	mStart = mData + start;
 }
 
-signalVector::signalVector(complex *data, size_t start, size_t span, vector_alloc_func wAllocFunc, vector_free_func wFreeFunc)
-	: Vector<complex>(data, data + start, data + start + span, wAllocFunc, wFreeFunc),
+signalVector::signalVector(complex *data, size_t start, size_t span)
+	: Vector<complex>(NULL, data + start, data + start + span),
 	  real(false), aligned(false), symmetry(NONE)
 {
 }
@@ -41,14 +41,7 @@ signalVector::signalVector(const signalVector &vector,
 void signalVector::operator=(const signalVector& vector)
 {
 	resize(vector.size() + vector.getStart());
-
-	unsigned int i;
-	complex *dst = mData;
-	complex *src = vector.mData;
-	for (i = 0; i < size(); i++, src++, dst++)
-		*dst = *src;
-	/* TODO: optimize for non non-trivially copyable types: */
-	/*memcpy(mData, vector.mData, bytes()); */
+	memcpy(mData, vector.mData, bytes());
 	mStart = mData + vector.getStart();
 }
 
@@ -65,13 +58,8 @@ size_t signalVector::getStart() const
 size_t signalVector::updateHistory()
 {
 	size_t num = getStart();
-	unsigned int i;
-	complex *dst = mData;
-	complex *src = mStart + this->size() - num;
-	for (i = 0; i < num; i++, src++, dst++)
-		*dst = *src;
-	/* TODO: optimize for non non-trivially copyable types: */
-	/*memmove(mData, mStart + this->size() - num, num * sizeof(complex)); */
+
+	memmove(mData, mStart + this->size() - num, num * sizeof(complex));
 
 	return num;
 }

Transceiver52M/signalVector.h

@@ -13,13 +13,13 @@ enum Symmetry {
 class signalVector: public Vector<complex> {
 public:
 	/** Default constructor */
-	signalVector(size_t size = 0, vector_alloc_func wAllocFunc = NULL, vector_free_func wFreeFunc = NULL);
+	signalVector(size_t size = 0);
 
 	/** Construct with head room */
-	signalVector(size_t size, size_t start, vector_alloc_func wAllocFunc = NULL, vector_free_func wFreeFunc = NULL);
+	signalVector(size_t size, size_t start);
 
 	/** Construct from existing buffer data (buffer not managed) */
-	signalVector(complex *data, size_t start, size_t span, vector_alloc_func wAllocFunc = NULL, vector_free_func wFreeFunc = NULL);
+	signalVector(complex *data, size_t start, size_t span);
 
 	/** Construct by from existing vector */
 	signalVector(const signalVector &vector);

configure.ac

@@ -49,7 +49,6 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_PATH_PROG([RM_PROG], [rm])
-AC_LANG([C++])
 
 dnl check for pkg-config (explained in detail in libosmocore/configure.ac)
 AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no)
@@ -91,25 +90,6 @@ then
 	LDFLAGS="$LDFLAGS -fsanitize=address -fsanitize=undefined"
 fi
 
-AC_ARG_ENABLE(werror,
-	[AS_HELP_STRING(
-		[--enable-werror],
-		[Turn all compiler warnings into errors, with exceptions:
-		 a) deprecation (allow upstream to mark deprecation without breaking builds);
-		 b) "#warning" pragmas (allow to remind ourselves of errors without breaking builds)
-		]
-	)],
-	[werror=$enableval], [werror="no"])
-if test x"$werror" = x"yes"
-then
-	WERROR_FLAGS="-Werror"
-	WERROR_FLAGS+=" -Wno-error=deprecated -Wno-error=deprecated-declarations"
-	WERROR_FLAGS+=" -Wno-error=cpp" # "#warning"
-	CFLAGS="$CFLAGS $WERROR_FLAGS"
-	CPPFLAGS="$CPPFLAGS $WERROR_FLAGS"
-fi
-
-
 AC_ARG_WITH(uhd, [
     AS_HELP_STRING([--with-uhd],
         [enable UHD based transceiver])
@@ -122,7 +102,7 @@ AC_ARG_WITH(usrp1, [
 
 AC_ARG_WITH(lms, [
     AS_HELP_STRING([--with-lms],
-        [enable LimeSuite based transceiver])
+        [enable LimeSuite gnuradio based transceiver])
 ])
 
 AC_ARG_WITH(singledb, [
@@ -155,8 +135,6 @@ AS_IF([test "x$with_neon_vfpv4" = "xyes"], [
 ])
 
 AS_IF([test "x$with_usrp1" = "xyes"], [
-    AC_CHECK_HEADER([boost/config.hpp],[],
-        [AC_MSG_ERROR([boost/config.hpp not found, install e.g. libboost-dev])])
     PKG_CHECK_MODULES(USRP, usrp >= 3.3)
 ])
 
@@ -222,63 +200,8 @@ AM_CONDITIONAL(ARCH_ARM_A15, [test "x$with_neon_vfpv4" = "xyes"])
 PKG_CHECK_MODULES(LIBUSB, libusb-1.0)
 PKG_CHECK_MODULES(FFTWF, fftw3f)
 
-# Generate manuals
-AC_ARG_ENABLE(manuals,
-	[AS_HELP_STRING(
-		[--enable-manuals],
-		[Generate manual PDFs [default=no]],
-	)],
-	[osmo_ac_build_manuals=$enableval], [osmo_ac_build_manuals="no"])
-AM_CONDITIONAL([BUILD_MANUALS], [test x"$osmo_ac_build_manuals" = x"yes"])
-AC_ARG_VAR(OSMO_GSM_MANUALS_DIR, [path to common osmo-gsm-manuals files, overriding pkg-config and "../osmo-gsm-manuals"
-	fallback])
-if test x"$osmo_ac_build_manuals" = x"yes"
-then
-	# Find OSMO_GSM_MANUALS_DIR (env, pkg-conf, fallback)
-	if test -n "$OSMO_GSM_MANUALS_DIR"; then
-		echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (from env)"
-	else
-		OSMO_GSM_MANUALS_DIR="$($PKG_CONFIG osmo-gsm-manuals --variable=osmogsmmanualsdir 2>/dev/null)"
-		if test -n "$OSMO_GSM_MANUALS_DIR"; then
-			echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (from pkg-conf)"
-		else
-			OSMO_GSM_MANUALS_DIR="../osmo-gsm-manuals"
-			echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (fallback)"
-		fi
-	fi
-	if ! test -d "$OSMO_GSM_MANUALS_DIR"; then
-		AC_MSG_ERROR("OSMO_GSM_MANUALS_DIR does not exist! Install osmo-gsm-manuals or set OSMO_GSM_MANUALS_DIR.")
-	fi
-
-	# Find and run check-depends
-	CHECK_DEPENDS="$OSMO_GSM_MANUALS_DIR/check-depends.sh"
-	if ! test -x "$CHECK_DEPENDS"; then
-		CHECK_DEPENDS="osmo-gsm-manuals-check-depends"
-	fi
-	if ! $CHECK_DEPENDS; then
-		AC_MSG_ERROR("missing dependencies for --enable-manuals")
-	fi
-
-	# Put in Makefile with absolute path
-	OSMO_GSM_MANUALS_DIR="$(realpath "$OSMO_GSM_MANUALS_DIR")"
-	AC_SUBST([OSMO_GSM_MANUALS_DIR])
-fi
-
-    # https://www.freedesktop.org/software/systemd/man/daemon.html
-    AC_ARG_WITH([systemdsystemunitdir],
-         [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],,
-         [with_systemdsystemunitdir=auto])
-    AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [
-         def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
-
-         AS_IF([test "x$def_systemdsystemunitdir" = "x"],
-       [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
-        [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])])
-        with_systemdsystemunitdir=no],
-       [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
-    AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
-          [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
-    AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
+AC_CHECK_HEADER([boost/config.hpp],[],
+    [AC_MSG_ERROR([boost/config.hpp not found, install e.g. libboost-dev])])
 
 AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
 AC_MSG_RESULT([CFLAGS="$CFLAGS"])
@@ -296,18 +219,12 @@ AC_CONFIG_FILES([\
     Transceiver52M/arch/arm/Makefile \
     Transceiver52M/arch/x86/Makefile \
     Transceiver52M/device/Makefile \
-    Transceiver52M/device/common/Makefile \
     Transceiver52M/device/uhd/Makefile \
     Transceiver52M/device/usrp1/Makefile \
     Transceiver52M/device/lms/Makefile \
     tests/Makefile \
     tests/CommonLibs/Makefile \
     tests/Transceiver52M/Makefile \
-    doc/Makefile \
-    doc/examples/Makefile \
-    contrib/Makefile \
-    contrib/systemd/Makefile \
 ])
 
-AC_OUTPUT(
-	doc/manuals/Makefile)
+AC_OUTPUT

contrib/Makefile.am

@@ -1 +0,0 @@
-SUBDIRS = systemd

contrib/jenkins.sh

@@ -1,12 +1,4 @@
 #!/bin/sh
-# jenkins build helper script for osmo-trx.  This is how we build on jenkins.osmocom.org
-#
-# environment variables:
-# * INSTR: configure the CPU instruction set ("--with-sse", "--with-neon" or "--with-neon-vfpv4")
-# * WITH_MANUALS: build manual PDFs if set to "1"
-# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1")
-# * INSIDE_CHROOT: (used internally) set to "1" when the script runs with QEMU in an ARM chroot
-#
 set -ex
 
 substr() { [ -z "${2##*$1*}" ]; }
@@ -76,15 +68,6 @@ osmo-build-dep.sh libusrp
 
 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 $INSTR"
-
-# Additional configure options and depends
-if [ "$WITH_MANUALS" = "1" ]; then
-	osmo-build-dep.sh osmo-gsm-manuals
-	CONFIG="$CONFIG --enable-manuals"
-fi
 
 set +x
 echo
@@ -96,15 +79,9 @@ set -x
 
 cd "$base"
 autoreconf --install --force
-./configure $CONFIG
+./configure --enable-sanitize --with-uhd --with-usrp1 $INSTR
 $MAKE $PARALLEL_MAKE
 $MAKE check \
   || cat-testlogs.sh
-DISTCHECK_CONFIGURE_FLAGS="$CONFIG" $MAKE distcheck \
-  || cat-testlogs.sh
-
-if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
-	make -C "$base/doc/manuals" publish
-fi
 
 osmo-clean-workspace.sh

contrib/systemd/Makefile.am

@@ -1,22 +0,0 @@
-EXTRA_DIST = \
-  osmo-trx-lms.service \
-  osmo-trx-uhd.service \
-  osmo-trx-usrp1.service
-
-if HAVE_SYSTEMD
-SYSTEMD_SERVICES =
-
-if DEVICE_UHD
-SYSTEMD_SERVICES += osmo-trx-uhd.service
-endif
-
-if DEVICE_USRP1
-SYSTEMD_SERVICES += osmo-trx-usrp1.service
-endif
-
-if DEVICE_LMS
-SYSTEMD_SERVICES += osmo-trx-lms.service
-endif
-
-systemdsystemunit_DATA = $(SYSTEMD_SERVICES)
-endif # HAVE_SYSTEMD

contrib/systemd/osmo-trx-lms.service

@@ -1,11 +0,0 @@
-[Unit]
-Description=Osmocom SDR BTS L1 Transceiver (LimeSuite backend)
-
-[Service]
-Type=simple
-Restart=always
-ExecStart=/usr/bin/osmo-trx-lms -C /etc/osmocom/osmo-trx-lms.cfg
-RestartSec=2
-
-[Install]
-WantedBy=multi-user.target

contrib/systemd/osmo-trx-uhd.service

@@ -1,11 +0,0 @@
-[Unit]
-Description=Osmocom SDR BTS L1 Transceiver (UHD Backend)
-
-[Service]
-Type=simple
-Restart=always
-ExecStart=/usr/bin/osmo-trx-uhd -C /etc/osmocom/osmo-trx-uhd.cfg
-RestartSec=2
-
-[Install]
-WantedBy=multi-user.target

contrib/systemd/osmo-trx-usrp1.service

@@ -1,11 +0,0 @@
-[Unit]
-Description=Osmocom SDR BTS L1 Transceiver (libusrp backend)
-
-[Service]
-Type=simple
-Restart=always
-ExecStart=/usr/bin/osmo-trx-usrp1 -C /etc/osmocom/osmo-trx-usrp1.cfg
-RestartSec=2
-
-[Install]
-WantedBy=multi-user.target

debian/changelog

@@ -1,149 +1,3 @@
-osmo-trx (1.0.0) unstable; urgency=medium
-
-  [ Pau Espin Pedrol ]
-  * doc: examples: Add umtrx sample config
-  * UHDDevice: Fix setup failure with LimeSuite > 18.04.1
-  * examples: Set rt-prio 18 and print file basename
-  * lms: Several improvements and compilation/runtime fixes
-  * build: Add support for LimeSuite device backend
-  * LMSDevice: Set correct values for Max{Tx,Rx}Gain
-  * LMSDevice: Fix setup failure with LimeSuite > 18.04.1
-  * lms: Makefile.am: Reorder params to fix link issue
-  * lms: Check LPBFW to set is within supported range
-  * debian: Add package osmo-trx-lms
-  * contrib: Add systemd services for all backends
-  * debian: Add cfg file examples for osmo-trx-{lms,uhd}
-  * Add -V param to print version
-  * lms: Allow values diff than 34dB to be set by setRxGain()
-  * Use correct paths when installing example files
-  * debian: Enable build of osmo-trx-lms
-  * debian: Explicitly enable osmo-trx-uhd build
-  * configure.ac: Fix typo in with-lms help string
-  * vty: Fix typo in gpsdo clock reference type
-  * configure.ac: Add --enable-werror option
-  * Logger: Disable pthread cancel point inside Logger destructor
-  * cosmetic: Fix trailing whitespace
-  * radioInterface: forward errors from RadioDevice to Transceiver in recv path
-  * lms: Return error on device read timeout
-  * osmo-trx: Add osmo_signal to stop whole transceiver chain correctly on error
-  * radioInterface: Fix variable storing integer return value
-  * configure.ac: Specify default language as C++
-  * UHHDDevice: Replace deprecated header uhd/utils/thread_priority.hpp
-  * SigProcLib: Use available copyTo Vector API instead of memcopy
-  * cosmetic: Fix trailing whitespace in several files
-  * radioInterfaceMulti:pullBuffer: Sanely convert float array to complex array
-  * Vector: Copy arrays in a sane way for non-trivially copyable types
-  * jenkins.sh: Add --enable-werror flag to osmo-trx configure step
-  * Install systemd services with autotools
-  * Install sample cfg file to /etc/osmocom
-  * cosmetic: Use proper whitespace in several for loops
-  * Use pthread_setname_np to name threads
-  * CommonLibs/Makefile.am: Specify libcommon_la_LIBADD
-  * Transciever: Log values causing Tx underrun
-  * examples: Use logging level 'set-all' instead of 'all'
-  * jenkins.sh: Enable build of osmo-trx-lms
-  * ChannelizerBase: Fix ASan alloc-dealloc-mismatch
-  * UHDDevice: setRxGain on chan 0 when using multi-arfcn
-  * lms: Use LimeSuite.h log level defines instead of hardcoded values
-  * lms: Apply LMS->OSMO log level conversion
-  * Introduce OsmoTRX manual
-  * Introduce chapter trx_if.adoc and add it to OsmoTRX and OsmoBTS
-  * trx: Add reference to project wiki page in overfiew section
-  * trx: Add Hardware architecture support section
-  * trx: Add Hardware device support section
-  * osmotrx: Split Device specific section from backend one
-  * osmotrx: Write initial documentation for several supported devices
-  * osmotrx: configuration: Add section to document multi-arfcn feature
-  * osmotrx: Create a common chapter for section documenting backends
-  * osmotrx: Introduce code architecture chapter
-  * lms: Fix start after stop of device
-  * lms: Destroy streams on device stop
-  * radioInterface: Fix memleak during close()
-  * PointerFIFO: Fix memleak of ListNode
-  * lms: Make sure LMS_Close is called when Device is torn down
-  * osmo-trx: Change some lines to use libosmocore logging instead of cout
-  * lms: Close device on LMS_Init failure
-  * SigProcLib: Improve Vector buffer allocation mess
-  * lms: Allow setting Tx/RxGain for chan!=0
-  * lms: Allow setting Tx/RxFreq for lchan!=0
-  * lms: Improve Set{Rx,Tx}{Gain,Freq} logging
-  * transceiver: log chan on CTRL command received
-  * Add TRXCTRL log category
-  * transceiver: Log TRXCTRL iface responses towards osmo-bts-trx
-  * lms: Move {under,over}run checks into separate method
-  * lms: Do {under,over}run checks even if LMS_RecvStream fails
-  * Timeval: passed() returns true if time is equal
-  * Timeval: Move implementation to use clock_gettime and timespec
-  * Timeval: Move to osmo_clock_gettime
-  * TimevalTest: Make test deterministic with fake time
-  * lms: Fix build against LimeSuite > 18.10
-  * configure.ac: check boost only if USRP1 support is enabled
-
-  [ Vadim Yanitskiy ]
-  * trx_vty.c: fix: use CONFIG_NODE as parent by default
-  * device/lms/LMSDevice.cpp: fix compilation warning
-  * sigProcLib: introduce both TS1 and TS2 RACH synch. sequences
-  * sigProcLib: add a CorrType for extended (11-bit) RACH
-
-  [ Harald Welte ]
-  * Initial work towards direct LimeSuite support in OsmoTRX
-  * update .gitignore to include osmo-trx-lms
-  * LMSDevice: Call LMS_Init() before setting sample rate
-  * LMSDevice: Print sample rate range + actual sample rate after setting it
-  * LMSDevice: Typo fix: s/Internal/External
-  * LMSDevice: Set low-pass filters to smallest possible option
-  * LMSDevice: Fix initial timestamp offset of 2500
-  * LMS_Device: Set ts_offset to 0.
-  * LMSDevice: Reduce Rx logging verbosity: Only log unexpected timestamps
-  * move set_antennas() from UHD to generic radioDevice base class
-  * lms: Fix support for rx_paths / tx_paths
-  * lms: Call set_antennas() during open() method
-  * radioDevice: Move tx_sps from derived into base class
-  * radioDevice: better encapsulation in base class
-  * lms: Fix coding style
-  * lms: Fail in case of unsupported configuration
-  * usrp1: Fail in case of unsupported configuration
-  * Fix config file saving of {tx,rx}-path VTY config strings
-  * logging: Introduce new "DDEV" category for device-specific code
-  * update git-version-gen to generate proper version numbers
-  * ensure well-formed example config files
-  * SocketsTest.testReaderIP(): Zero terminate received buffer
-  * trx_validate_config(): Fix validation of rx_sps
-  * vty-ref: Update URI of docbook 5.0 schema
-  * lms: User correct scale factor for transmit samples
-  * lms: Set Rx gain to midpoint, as comment suggests.
-  * usrp1: Remove uninitialized skipRx logic
-  * usrp1: Fix formatting of log message (missing space)
-  * cosmetic: Don't call the SDR "USRP" in error message
-
-  [ Zydrunas Tamosevicius ]
-  * lms: Use same timestamp offset like when using LimeSDR via UHD
-  * lms: Reduce log level of "send buffer of len ..."
-  * lms: fix LMS_StartStream() handling for multiple channels
-  * lms: Reduce Rx gain from 47 to 34 dB
-
-  [ Alexander Couzens ]
-  * debian: add patches for debian8
-
-  [ Oliver Smith ]
-  * Add long parameters (--help, --version, ...)
-  * build manuals moved here from osmo-gsm-manuals.git
-  * Fix DISTCHECK_CONFIGURE_FLAGS override
-  * contrib/jenkins.sh: build and publish manuals
-  * jenkins.sh: run "make distcheck"
-  * contrib: fix makedistcheck with disabled systemd
-  * osmo-trx.cpp: move comma_delimited_to_vector() to Utils.cpp
-  * LMSDevice: make use of dev-args in osmo-trx.cfg
-  * LMSDeviceTest: fix link errors on OBS
-
-  [ Neels Hofmeyr ]
-  * Importing history from osmo-gsm-manuals.git
-
-  [ d0gtail ]
-  * UHDDevice: log exception information on device open failure
-
- -- Harald Welte <laforge@gnumonks.org>  Sun, 20 Jan 2019 19:35:04 +0100
-
 osmo-trx (0.4.0) unstable; urgency=medium
 
   [ Neels Hofmeyr ]

debian/control

@@ -13,7 +13,6 @@ Build-Depends: debhelper (>= 9),
                libfftw3-dev,
                libtalloc-dev,
                libusrp-dev,
-               liblimesuite-dev,
                libosmocore-dev (>= 0.10.0)
 Standards-Version: 3.9.6
 Vcs-Browser: http://cgit.osmocom.org/osmo-trx
@@ -29,7 +28,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}), ${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
 
@@ -70,22 +69,3 @@ Description: SDR transceiver that implements Layer 1 of a GSM BTS (USRP1)
  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-lms
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: SDR transceiver that implements Layer 1 of a GSM BTS (LimeSuite)
- 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)

debian/osmo-trx-lms.install

@@ -1,4 +0,0 @@
-etc/osmocom/osmo-trx-lms.cfg
-lib/systemd/system/osmo-trx-lms.service
-/usr/bin/osmo-trx-lms
-/usr/share/doc/osmo-trx/examples/osmo-trx-lms/osmo-trx-limesdr.cfg /usr/share/doc/osmo-trx/examples/osmo-trx-lms/

debian/osmo-trx-uhd.install

@@ -1,6 +1 @@
-etc/osmocom/osmo-trx-uhd.cfg
-lib/systemd/system/osmo-trx-uhd.service
 /usr/bin/osmo-trx-uhd
-/usr/share/doc/osmo-trx/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/
-/usr/share/doc/osmo-trx/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/
-/usr/share/doc/osmo-trx/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/

debian/osmo-trx-usrp1.install

@@ -1,4 +1,3 @@
-lib/systemd/system/osmo-trx-usrp1.service
 /usr/bin/osmo-trx-usrp1
 /usr/share/usrp/rev2/std_inband.rbf
 /usr/share/usrp/rev4/std_inband.rbf

debian/patches/build-for-debian8.patch

@@ -1,57 +0,0 @@
-Index: osmo-trx/debian/control
-===================================================================
---- osmo-trx.orig/debian/control
-+++ osmo-trx/debian/control
-@@ -13,7 +13,6 @@ Build-Depends: debhelper (>= 9),
-                libfftw3-dev,
-                libtalloc-dev,
-                libusrp-dev,
--               liblimesuite-dev,
-                libosmocore-dev (>= 0.10.0)
- Standards-Version: 3.9.6
- Vcs-Browser: http://cgit.osmocom.org/osmo-trx
-@@ -29,7 +28,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}), ${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
- 
-@@ -70,22 +70,3 @@ Description: SDR transceiver that implem
-  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-lms
--Architecture: any
--Depends: ${shlibs:Depends}, ${misc:Depends}
--Description: SDR transceiver that implements Layer 1 of a GSM BTS (LimeSuite)
-- 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)
-Index: osmo-trx/debian/rules
-===================================================================
---- osmo-trx.orig/debian/rules
-+++ osmo-trx/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-systemdsystemunitdir=/lib/systemd/system
-+	dh_auto_configure -- --with-uhd --with-usrp1 --with-systemdsystemunitdir=/lib/systemd/system
- 
- override_dh_strip:
- 	dh_strip --dbg-package=osmo-trx-dbg

debian/patches/series

@@ -1 +0,0 @@
-# build-for-debian8.patch

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-systemdsystemunitdir=/lib/systemd/system
+	dh_auto_configure -- --with-usrp1
 
 override_dh_strip:
 	dh_strip --dbg-package=osmo-trx-dbg

doc/Makefile.am

@@ -1,4 +0,0 @@
-SUBDIRS = \
-        examples \
-	manuals \
-        $(NULL)

doc/examples/Makefile.am

@@ -1,41 +0,0 @@
-OSMOCONF_FILES =
-osmoconfdir = $(sysconfdir)/osmocom
-
-if DEVICE_UHD
-OSMOCONF_FILES += osmo-trx-uhd/osmo-trx-uhd.cfg
-endif
-
-# if DEVICE_USRP1
-# TODO: no usrp1 sample file yet
-# OSMOCONF_FILES += osmo-trx-usrp1/osmo-trx-usrp1.cfg
-# endif
-
-if DEVICE_LMS
-OSMOCONF_FILES += osmo-trx-lms/osmo-trx-lms.cfg
-endif
-
-osmoconf_DATA = $(OSMOCONF_FILES)
-EXTRA_DIST = $(OSMOCONF_FILES)
-
-CFG_FILES = find $(srcdir) -type f -name '*.cfg*' | sed -e 's,^$(srcdir),,'
-
-dist-hook:
-	for f in $$($(CFG_FILES)); do \
-		j="$(distdir)/$$f" && \
-		mkdir -p "$$(dirname $$j)" && \
-		$(INSTALL_DATA) $(srcdir)/$$f $$j; \
-	done
-
-install-data-hook:
-	for f in $$($(CFG_FILES)); do \
-		j="$(DESTDIR)$(docdir)/examples/$$f" && \
-		mkdir -p "$$(dirname $$j)" && \
-		$(INSTALL_DATA) $(srcdir)/$$f $$j; \
-	done
-
-uninstall-hook:
-	@$(PRE_UNINSTALL)
-	for f in $$($(CFG_FILES)); do \
-		j="$(DESTDIR)$(docdir)/examples/$$f" && \
-		$(RM) $$j; \
-	done

doc/examples/osmo-trx-limesdr.cfg

@@ -1,10 +1,9 @@
 log stderr
- logging filter all 1
- logging color 1
- logging print category 1
- logging timestamp 1
- logging print file basename
- logging level set-all info
+  logging filter all 1
+  logging color 1
+  logging print category 1
+  logging timestamp 1
+  logging level all info
 !
 line vty
  no login
@@ -16,7 +15,6 @@ trx
  egprs disable
  tx-sps 4
  rx-sps 4
- rt-prio 18
  chan 0
   tx-path BAND1
   rx-path LNAW

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

@@ -1 +0,0 @@
-osmo-trx-limesdr.cfg

doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg

@@ -1,22 +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 info
-!
-line vty
- no login
-!
-trx
- bind-ip 127.0.0.1
- remote-ip 127.0.0.1
- base-port 5700
- egprs disable
- tx-sps 4
- rx-sps 4
- rt-prio 18
- chan 0
-  tx-path BAND1
-  rx-path LNAW

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

@@ -1 +0,0 @@
-osmo-trx-usrp_b200.cfg

doc/examples/osmo-trx-umtrx.cfg

@@ -1,10 +1,9 @@
 log stderr
- logging filter all 1
- logging color 1
- logging print category 1
- logging timestamp 1
- logging print file basename
- logging level set-all info
+  logging filter all 1
+  logging color 1
+  logging print category 1
+  logging timestamp 1
+  logging level all info
 !
 line vty
  no login

doc/examples/osmo-trx-usrp_b200.cfg

@@ -1,10 +1,9 @@
 log stderr
- logging filter all 1
- logging color 1
- logging print category 1
- logging timestamp 1
- logging print file basename
- logging level set-all info
+  logging filter all 1
+  logging color 1
+  logging print category 1
+  logging timestamp 1
+  logging level all info
 !
 line vty
  no login
@@ -17,6 +16,5 @@ trx
  tx-sps 4
  rx-sps 4
  clock-ref external
- rt-prio 18
  chan 0
 

doc/manuals/Makefile.am

@@ -1,16 +0,0 @@
-EXTRA_DIST = osmotrx-usermanual.adoc \
-    osmotrx-usermanual-docinfo.xml \
-    osmotrx-vty-reference.xml \
-    chapters \
-    vty
-
-if BUILD_MANUALS
-  ASCIIDOC = osmotrx-usermanual.adoc
-  ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc
-  include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
-
-  VTY_REFERENCE = osmotrx-vty-reference.xml
-  include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc
-
-  include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc
-endif

doc/manuals/chapters/code-architecture.adoc

@@ -1,141 +0,0 @@
-[[code_architecture]]
-== Code Architecture
-
-[[fig-code-architecture-general]]
-.General overview of main OsmoTRX components
-[graphviz]
-----
-digraph hierarchy {
-node[shape=record,style=filled,fillcolor=gray95]
-edge[dir=back, arrowtail=empty]
-
-2[label = "{Transceiver|+ constructor()\l+ destructor()\l+ init()\l+ numChans()\l+ receiveFIFO()\l+ setSignalHandler()}"]
-3[label = "{RadioInterface|...}"]
-4[label = "{RadioInterfaceResamp|...}"]
-5[label = "{RadioInterfaceMulti|...}"]
-6[label = "{RadioDevice|...}"]
-7[label = "{UHDDevice|...}"]
-8[label = "{LMSDevice|...}"]
-9[label = "{USRPDevice|...}"]
-
-2->3[arrowtail=odiamond]
-3->4[constraint=false]
-3->5[constraint=false]
-3->6[arrowtail=odiamond]
-6->7
-6->8
-6->9
-}
-----
-
-[[fig-code-architecture-threads]]
-.Example of thread architecture with OsmoTRX configured to use 2 logical RF channels (Trx=Transceiver, RI=RadioIface)
-[graphviz]
-----
-digraph hierarchy {
-node[shape=record,style=filled,fillcolor=gray95]
-
-trans [label="Transceiver"];
-radioiface [label="RadioInterface"];
-radiodev [label="RadioDevice"];
-
-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"];
-radioiface:e->trans:e [label="Trx.RxServiceLoop_1"];
-radioiface->radiodev[label="RI.AlignRadioServiceLoop"];
-radioiface:sw->radiodev:nw [label="Trx.TxLowerLoop"];
-radiodev:ne->radioiface:se [label="Trx.RxLowerLoop"];
-}
-----
-
-[[code_component_transceiver]]
-=== Transceiver
-
-The Transceiver is the main component managing the other components running in
-the OsmoTRX process. There's a unique instance per process.
-
-This class is quite complex from code point of view, as it starts lots of
-different threads and hence the interaction with this class from the outside is
-quite limited. Only interaction possible is to:
-
-* `Transceiver()`: Create an instance through its constructor, at this time most
-  configuration is handed to it.
-* `init()`: Start running all the threads.
-* `receiveFIFO()`: Attach a `radioInterface` channel FIFO in order to use it.
-* `setSignalHandler()`: Used to set up a callback to receive certain events
-  asynchronously from the Transceiver. No assumptions can be made about from
-  which thread is the callback being called, which means multi-thread locking
-  precautions may be required in certain cases, similar to usual signal handler
-  processing. One important event received through this path is for instance
-  when the Transceiver detected a fatal error which requires it to stop. Since
-  it cannot stop itself (see destructor below), stopping procedure must be
-  delegated to the user who created the instance.
-* `~Transceiver()`: The destructor, which stops all running threads created at
-  `init()` time. Destroying the object is the only way to stop the `Transceiver`
-  completely, and must be called from a thread not managed by the
-  `Transceiver`, otherwise it will deadlock. Usually it is stopped from the main
-  thread, the one that called the constructor during startup.
-
-During `init()` time, `Transceiver` will create a noticeable amount of threads,
-which may vary depending on the amount of RF channels requested.
-
-Static amount of Threads (1 per `Transceiver` instance):
-
-* `RxLowerLoop`: This thread is responsible for reading bursts from the
-  `RadioInterface`, storing them into its FIFO and sending Clock Indications
-  (<<trx_if_clock_ind>>) to _osmo-bts_trx_.
-* `TxLowerLoop`: Manages pushing bursts from buffers in the FIFO into the
-  `RadioInterface` at expected correct time based on the Transceiver clock.
-
-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
-  over the TRX Manager UDP socket (<<trx_if>>).
-* `TxPriorityQueueServiceLoop`: Blocks reading from one ARFCN specific TRX
-  Manager UDP socket (<<trx_if>>), and fills the `RadioInterface` with it
-  setting clock related information.
-
-[[code_component_radioiface]]
-=== RadioInterface
-
-The `RadioInterface` sits between the `Transceiver` and the `RadioDevice`,  and
-provides extra features to the pipe like channelizers, resamplers, Tx/Rx
-synchronization on some devices, etc.
-
-If the `RadioDevice` it drives requires it (only _USRP1_ so far), the
-`RadioIntercace` will start and manage a thread internally called
-`AlignRadioServiceLoop` which will align current RX and TX timestamps.
-
-Different features are offered through different `RadioInterface` subclasses
-which are selected based on configuration and device detected at runtime. Using
-these features may impact on the amount of CPU required to run the entire pipe.
-
-==== RadioInterfaceResamp
-
-This subclass of `RadioInterface` is automatically selected when some known
-specific UHD are to be used, since they require resampling to work properly.
-Some of this devices are for instance Ettus B100, USRP2 and X3XX models.
-
-==== RadioInterfaceMulti
-
-This subclass of `RadioInterface` is used when <<multiarfcn_mode>> is requested.
-
-[[code_component_radiodev]]
-=== RadioDevice
-
-The `RadioDevice` class is responsible for driving the actual Hardware device.
-It is actually only an interface, and it is implemented in each backend which in
-turn becomes a specific OsmoTRX binary, see <<trx_backends>>.

doc/manuals/chapters/configuration.adoc

@@ -1,85 +0,0 @@
-== Configuring OsmTRX
-
-OsmoTRX will read the configuration at startup time and configure the
-transceiver accordingly after validating the configuration.
-
-OsmoTRX can handle several TRX channels, but at least one must be configured in
-order to be able to start it successfully. Channels must be present in the
-configuration file in incremental order, starting from 0 and be consecutive.
-
-Example configuration files for different devices and setups can be found in
-`doc/examples/` in 'osmo-trx' git repository.
-
-=== Documented example
-
-.Example: Static GGSN/APN configuration (single catch-all GGSN)
-----
-trx
- bind-ip 127.0.0.1 <1>
- remote-ip 127.0.0.1 <2>
- base-port 5700 <3>
- egprs disable <4>
- tx-sps 4 <5>
- rx-sps 4 <6>
- chan 0 <7>
-  tx-path BAND1 <8>
-  rx-path LNAW <9>
-----
-<1> Configure the local IP address at the TRX used for the connection against `osmo-bts-trx`.
-<2> Specify the IP address of `osmo-bts-trx` to connect to.
-<3> Specify the reference base UDP port to use for communication.
-<4> Don't enable EDGE support.
-<5> Use 4 TX samples per symbol. This is device specific.
-<6> Use 4 RX samples per symbol. This is device specific.
-<7> Configure the first channel. As no other channels are specified, `osmo-trx` assumes it is using only one channel.
-<8> Configure the device to use `BAND1` Tx antenna path from all the available ones (device specific).
-<9> Configure the device to use `LNAW` Rx antenna path from all the available ones (device specific).
-
-[[multiarfcn_mode]]
-=== Multi-ARFCN mode
-
-The Multi-ARFCN feature allows to have a multi-carrier approach multiplexed on a
-single physical RF channel, which can introduce several benefits, such as lower
-cost and higher capacity support.
-
-Multi-ARFCN support is available since osmo-trx release `0.2.0`, and it was
-added specifically in commit `76764278169d252980853251daeb9f1ba0c246e1`.
-
-This feature is useful for instance if you want to run more than 1 TRX with an
-Ettus B200 device, or 2 TRX with an Ettus B210 device, since they support only 1
-and 2 physical RF channels respectively. No device from other providers or even
-other devices than B200 and B210 from Ettus are known to support this feature.
-
-With multi-ARFCN enabled, ARFCN spacing is fixed at 800 kHz or 4 GSM channels.
-So if TRX-0 is set to ARFCN 51, TRX-1 _must_ be set to 55, and so on. Up to
-three ARFCN's is supported for multi-TRX.
-
-From BTS and BSC point of view, supporting multiple TRX through multi-ARFCN
-feature in OsmoTRX doesn't make any difference from a regular multi-TRX setup,
-leaving apart of course the mentioned ARFCN limitations explained above and as a
-consequence physical installation and operational differences.
-
-.Example: osmo-bts-trx.cfg using 2 TRX against an osmo-trx driven device
-----
-phy 0
- osmotrx ip local 127.0.0.1
- osmotrx ip remote 127.0.0.1
- instance 0
- instance 1
-bts 0
- ...
- band GSM-1800
- trx 0
-  phy 0 instance 0
- trx 1
-  phy 0 instance 1
-----
-
-.Example: osmo-trx.cfg using Multi-ARFCN mode to run 2 TRX
-----
-trx
- ...
- multi-arfcn enable
- chan 0
- chan 1
-----

doc/manuals/chapters/control.adoc

@@ -1,12 +0,0 @@
-[[control]]
-== Control interface
-
-The actual protocol is described in <<common-control-if>>, the variables
-common to all programs using it are described in <<ctrl_common_vars>>. Here we
-describe variables specific to OsmoTRX.
-
-.Variables available over control interface
-[options="header",width="100%",cols="20%,5%,5%,50%,20%"]
-|===
-|Name|Access|Trap|Value|Comment
-|===

doc/manuals/chapters/counters.adoc

@@ -1,4 +0,0 @@
-[[counters]]
-== Counters
-
-include::./counters_generated.adoc[]

doc/manuals/chapters/counters_generated.adoc

@@ -1,7 +0,0 @@
-// autogenerated by show asciidoc counters
-These counters and their description based on OsmoTRX 0.2.0.61-408f (OsmoTRX).
-
-// generating tables for rate_ctr_group
-// generating tables for osmo_stat_items
-// generating tables for osmo_counters
-// there are no ungrouped osmo_counters

doc/manuals/chapters/overview.adoc

@@ -1,62 +0,0 @@
-[[chapter_introduction]]
-== Overview
-
-[[intro_overview]]
-=== About OsmoTRX
-
-OsmoTRX is a C/C++ language implementation of the GSM radio modem,
-originally developed as the 'Transceiver' part of OpenBTS. This radio
-modem offers an interface based on top of UDP streams.
-
-
-The OsmoBTS bts_model code for OsmoTRX is called
-`osmo-bts-trx`.  It implements the UDP stream interface of
-OsmoTRX, so both parts can be used together to implement a complete GSM
-BTS based on general-purpose computing SDR.
-
-As OsmoTRX is general-purpose software running on top of Linux, it is
-thus not tied to any specific physical hardware. At the time of this
-writing, OsmoTRX supports a variety of Lime Microsystems and Ettus USRP SDRs via
-the UHD driver, as well as the Fairwaves UmTRX and derived products.
-
-OsmoTRX is not a complete GSM PHY but 'just' the radio modem.  This
-means that all of the Layer 1 functionality such as scheduling,
-convolutional coding, etc. is actually also implemented inside OsmoBTS.
-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
-
-As such, the boundary between OsmoTRX and `osmo-bts-trx` is at
-a much lower interface, which is an internal interface of other more
-traditional GSM PHY implementations.
-
-Besides OsmoTRX, there are also other implementations (both Free
-Software and proprietary) that implement the same UDP stream based radio
-modem interface.
-
-[[fig-gprs-pcubts]]
-.GSM network architecture with OsmoTRX and OsmoBTS
-[graphviz]
-----
-digraph G {
-        rankdir=LR;
-        MS0 [label="MS"];
-        MS1 [label="MS"];
-        MS0->SDR[label="Um"];
-        MS1->SDR [label="Um"];
-        SDR -> OsmoTRX [label="Raw Samples"];
-        OsmoTRX->BTS [label="bursts over UDP"];
-        BTS->BSC [label="Abis"];
-        BSC->MSC [label="A"];
-        BTS->PCU [label="pcu_sock"];
-        PCU->SGSN [label="Gb"];
-        OsmoTRX [color=red];
-}
-----
-
-For more information see
-https://osmocom.org/projects/osmotrx/wiki/OsmoTRX

doc/manuals/chapters/running.adoc

@@ -1,19 +0,0 @@
-== Running OsmoTRX
-
-The OsmoTRX executable (`osmo-trx`) offers the following command-line
-options:
-
-
-=== SYNOPSIS
-
-*osmo-trx* [-h] [-C 'CONFIGFILE']
-
-
-=== OPTIONS
-
-*-h*::
-	Print a short help message about the supported options
-*-C 'CONFIGFILE'*::
-	Specify the file and path name of the configuration file to be
-	used. If none is specified, use `osmo_trx.cfg` in the current
-	working directory.

doc/manuals/chapters/trx-architectures.adoc

@@ -1,34 +0,0 @@
-[[osmotrx_arch_support]]
-== OsmoTRX hardware architecture support
-
-OsmoTRX comes out-of-the-box with several algorithms and operations
-optimized for certain instruction-set architectures, as well as non-optimized
-fall-back algorithms in case required instruction sets are not supported by the
-compiler at compile time or by the executing machine at run-time. Support for
-these optimized algorithms can be enabled and disabled by means of configure
-flags. Accelerated operations include pulse shape filtering, resampling,
-sequence correlation, and many other signal processing operations.
-
-On Intel processors, OsmoTRX makes heavy use of the Streaming SIMD Extensions
-(SSE) instruction set.  SSE3 is the minimum requirement for accelerated use.
-SSE3 is present in the majority of Intel processors since later versions of the
-Pentium 4 architecture and is also present on low power Atom processors. Support
-is automatically detected at build time. SSE4.1 instruction set is supported
-too. This feature is enabled by default unless explicitly disabled by passing
-the configure flag _--with-sse=no_. When enabled, the compiler will build an
-extra version of each of the supported algorithms using each of the supported
-mentioned instruction sets. Then, at run-time, OsmoTRX will auto-detect
-capabilities of the executing machine and enable an optimized algorithm using
-the most suitable available (previously compiled) instruction set.
-
-On ARM processors, NEON and NEON FMA are supported. Different to the x86, there
-is no auto-detection in this case, nor difference between compile and runtime.
-NEON support is disabled by default and can be enabled by passing the flag
-_--with-neon=yes_ to the configure script; the used compiler must support NEON
-instruction set and the resulting binary will only run fine on an ARM board
-supporting NEON extensions. Running OsmoTRX built with flag _--with-neon_ on a
-board without NEON instruction set support, will most probably end up in the
-process being killed with a _SIGILL_ Illegal Instruction signal by the operating
-system. NEON FMA (Fused Multiply-Add) is an extension to the NEON instruction
-set, and its use in OsmoTRX can be enabled by passing the _--with_neon_vfpv4_
-flag, which will also implicitly enable NEON support (_--with_neon_).

doc/manuals/chapters/trx-backends.adoc

@@ -1,46 +0,0 @@
-[[trx_backends]]
-== OsmoTRX backend support
-
-[[backend_uhd]]
-=== `osmo-trx-uhd` for UHD based Transceivers
-
-This OsmoTRX model uses _libuhd_ (UHD, USRP Hardware Driver) to drive the
-device, that is configuring it and reading/writing samples from/to it.
-
-So far, this backend has been mostly used to drive devices such as the Ettus
-B200 family and Fairwaves UmTRX family, and used to be the default backend used
-for legacy @osmo-trx@ binary when per-backend binaries didn't exist yet.
-
-Any device providing generic support for UHD should theoretically be able to be
-run through this backend without much effort, but pracitcal experience showed
-that some devices don't play well with it, such as the LimeSDR family of
-devices, which showed far better results when using its native interface.
-
-Related code can be found in the _Transceiver52M/device/uhd/_ directory in
-_osmo-trx.git_.
-
-[[backend_lms]]
-=== `osmo-trx-lms` for LimeSuite based Transceivers
-
-This OsmoTRX model uses LimeSuite API and library to drive the device, that is
-configuring it and reading/writing samples from/to it.
-
-This backend was developed in order to be used together with LimeSDR-USB and
-LimeSDR-mini devices, due to to the poor results obtained with the UHD backend,
-and to simplify the stack.
-
-Related code can be found in the _Transceiver52M/device/lms/_ directory in
-_osmo-trx.git_.
-
-[[backend_usrp1]]
-=== `osmo-trx-usrp1` for libusrp based Transceivers
-
-This OsmoTRX model uses the legacy libusrp driver provided in GNU Radio 3.4.2.
-
-As this code was dropped from GNU Radio at some point and was found very
-difficult to build, some work was done to create a standalone libusrp which can
-be nowadays found as a separate git repository together with other osmocom git
-repositories, in https://git.osmocom.org/libusrp/
-
-Related code can be found in the _Transceiver52M/device/usrp1/_ directory in
-_osmo-trx.git_.

doc/manuals/chapters/trx-devices.adoc

@@ -1,90 +0,0 @@
-[[osmotrx_device_support]]
-== OsmoTRX hardware device support
-
-OsmoTRX consists of a _common_ part that applies to all TRX devices as well as
-_hardware-specific_ parts for each TRX device. The hardware-specific parts are
-usually provided by vendor-specific or device-specific libraries that are then
-handled by some OsmoTRX glue code presenting a unified interface towards the
-rest of the code by means of a _RadioDevice_ class.
-
-The common part includes the core TRX architecture as well as code for
-implementing the external interfaces such as the TRX Manager UDP socket,
-control, and VTY interfaces.
-
-The hardware-specific parts include support for driving one particular
-implementation of a radio modem.  Such a physical layer
-implementation can come in many forms.  Sometimes it runs on a general
-purpose CPU, sometimes on a dedicated ARM core, a dedicated DSP, a
-combination of DSP and FPGA.
-
-Joining the common part with each of the available backends results in a
-different binary with different suffix for each backend. For instance, when
-OsmoTRX is built with UHD backend, an _osmo-trx-uhd_ binary is generated; when
-OsmoTRX is built with LimeSuite backend, an _osmo-trx-lms_ binary is generated.
-Build of different backend can be enabled and disabled by means of configure
-flags, which can be found in each subsection relative to each backend below.
-
-[[dev_ettus_usrp1]]
-=== Ettus USRP1
-
-The binary _osmo-trx-usrp1_ is used to drive this device, see <<backend_usrp1>>.
-
-[[dev_ettus_b200]]
-=== Ettus B200
-
-The binary _osmo-trx-uhd_ is used to drive this device, see <<backend_uhd>>.
-
-Comes only with 1 RF channel. It can still be used in a multi-TRX setup by using
-the <<multiarfcn_mode>> feature. By using this feature, one can drive up to 3
-TRX (with the restrictions explained there).
-
-[[dev_ettus_b200]]
-=== Ettus B210
-
-The binary _osmo-trx-uhd_ is used to drive this device, see <<backend_uhd>>.
-
-Comes with 2 RF channels, which can be used to set up a multi-TRX BTS. However,
-due to a shared local oscillator for both RF channels, ARFCN separation can be
-up about 25 MHz.
-
-This device also supports the <<multiarfcn_mode>> feature. By using this
-feature, one can drive up to 3 TRX (with the restrictions explained there).
-Please note  that the above configurations cannot be combined, which means
-maximum number of TRX one can achieve is 2 by using separate physical RF
-channels, or 3 by using multi-ARFCN method. You cannot support, for example, 6
-ARFCN operation on B210 using 3 TRX on side A and another 3 TRX on side B.
-
-[[dev_limesdr_usb]]
-=== LimeSDR-USB
-
-The binary _osmo-trx-lms_ is used to drive this device, see <<backend_lms>>.
-
-This device comes with 2 RF channels, so it should theoretically be possible to
-run a multi-TRX setup with it, but there are yet no records that this kind of
-setup was tested with this device.
-
-This device has 3 different Rx paths with different antenna connectors in the
-PCB, each with a different frequency and bandwidth range. One should make sure
-the physical antenna is connected to the correct connector matching the Rx path
-you want to use. If one wants to be able to use the device in both 900 and 1800
-MHz GSM bands and easily switch between them, then Rx Path `LNAW` should be used
-,since it is the only one covering both bands, and the antenna physically plugged
-accordingly. Following example shows how to then configure _osmo-trx-lms_ to use
-that Rx path to read samples.
-
-.Example: Configure osmo-trx-lms to use LNAW as Rx path and BAND1 as Tx Path
-----
-trx
- ...
- chan 0
-  tx-path BAND1
-  rx-path LNAW
-----
-
-[[dev_limesdr_mini]]
-=== LimeSDR-mini
-
-The binary _osmo-trx-lms_ is used to drive this device, see <<backend_lms>>.
-
-As a smaller brother of the [[dev_limesdr_usb]], this device comes only with 1
-RF channel. As a result, it can only hold 1 TRX as of today.

doc/manuals/osmotrx-usermanual-docinfo.xml

@@ -1,46 +0,0 @@
-<revhistory>
-  <revision>
-    <revnumber>1</revnumber>
-    <date>March 6, 2019</date>
-    <authorinitials>PE</authorinitials>
-    <revremark>
-      Initial version.
-    </revremark>
-  </revision>
-</revhistory>
-
-<authorgroup>
-  <author>
-    <firstname>Pau</firstname>
-    <surname>Espin Pedrol</surname>
-    <email>pespin@sysmocom.de</email>
-    <authorinitials>PE</authorinitials>
-    <affiliation>
-      <shortaffil>sysmocom</shortaffil>
-      <orgname>sysmocom - s.f.m.c. GmbH</orgname>
-      <jobtitle>Software Developer</jobtitle>
-    </affiliation>
-  </author>
-</authorgroup>
-
-<copyright>
-  <year>2018</year>
-  <holder>sysmocom - s.f.m.c. GmbH</holder>
-</copyright>
-
-<legalnotice>
-  <para>
-	Permission is granted to copy, distribute and/or modify this
-	document under the terms of the GNU Free Documentation License,
-	Version 1.3 or any later version published by the Free Software
-	Foundation; with no Invariant Sections, no Front-Cover Texts,
-	and no Back-Cover Texts.  A copy of the license is included in
-	the section entitled "GNU Free Documentation License".
-  </para>
-  <para>
-	The Asciidoc source code of this manual can be found at
-	<ulink url="http://git.osmocom.org/osmo-gsm-manuals/">
-		http://git.osmocom.org/osmo-gsm-manuals/
-	</ulink>
-  </para>
-</legalnotice>

doc/manuals/osmotrx-usermanual.adoc

@@ -1,42 +0,0 @@
-:gfdl-enabled:
-
-OsmoTRX User Manual
-====================
-Pau Espin Pedrol <pespin@sysmocom.de>
-
-
-include::./common/chapters/preface.adoc[]
-
-include::{srcdir}/chapters/overview.adoc[]
-
-include::{srcdir}/chapters/running.adoc[]
-
-include::./common/chapters/control_if.adoc[]
-
-include::{srcdir}/chapters/control.adoc[]
-
-include::./common/chapters/vty.adoc[]
-
-include::./common/chapters/logging.adoc[]
-
-include::{srcdir}/chapters/counters.adoc[]
-
-include::{srcdir}/chapters/configuration.adoc[]
-
-include::{srcdir}/chapters/trx-architectures.adoc[]
-
-include::{srcdir}/chapters/trx-devices.adoc[]
-
-include::{srcdir}/chapters/trx-backends.adoc[]
-
-include::{srcdir}/chapters/code-architecture.adoc[]
-
-include::./common/chapters/trx_if.adoc[]
-
-include::./common/chapters/port_numbers.adoc[]
-
-include::./common/chapters/bibliography.adoc[]
-
-include::./common/chapters/glossary.adoc[]
-
-include::./common/chapters/gfdl.adoc[]

doc/manuals/osmotrx-vty-reference.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ex:ts=2:sw=42sts=2:et
-  -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
--->
-<!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/docbook_vty.xml"  >
-]>
-
-<book>
-  <info>
-    <revhistory>
-        <revision>
-            <revnumber>v1</revnumber>
-            <date>6th March 2018</date>
-            <authorinitials>pe</authorinitials>
-            <revremark>Initial</revremark>
-        </revision>
-    </revhistory>
-
-    <title>OsmoTRX VTY Reference</title>
-
-    <copyright>
-      <year>2018</year>
-    </copyright>
-
-    <legalnotice>
-      <para>This work is copyright by <orgname>sysmocom - s.f.m.c. GmbH</orgname>. All rights reserved.
-      </para>
-    </legalnotice>
-  </info>
-
-  <!-- Main chapters-->
-  &chapter-vty;
-</book>

doc/manuals/vty/trx_vty_additions.xml

@@ -1,2 +0,0 @@
-<vtydoc xmlns='urn:osmocom:xml:libosmocore:vty:doc:1.0'>
-</vtydoc>

git-version-gen

@@ -93,8 +93,7 @@ if test -n "$v"
 then
     : # use $v
 elif
-       v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \
-	  || git describe --abbrev=4 HEAD 2>/dev/null` \
+       v=`git tag -l --sort=v:refname | grep "^[0-9]*.[0-9]*.[0-9]*$" | tail -n 1 2>/dev/null` \
     && case $v in
 	 [0-9]*) ;;
 	 v[0-9]*) ;;

tests/CommonLibs/Makefile.am

@@ -28,11 +28,11 @@ PRBSTest_SOURCES = PRBSTest.cpp
 
 InterthreadTest_SOURCES = InterthreadTest.cpp
 InterthreadTest_LDADD = $(COMMON_LA)
-InterthreadTest_LDFLAGS = -lpthread $(AM_LDFLAGS)
+InterthreadTest_LDFLAGS = -lpthread
 
 SocketsTest_SOURCES = SocketsTest.cpp
 SocketsTest_LDADD = $(COMMON_LA)
-SocketsTest_LDFLAGS = -lpthread $(AM_LDFLAGS)
+SocketsTest_LDFLAGS = -lpthread
 
 TimevalTest_SOURCES = TimevalTest.cpp
 TimevalTest_LDADD = $(COMMON_LA)

tests/CommonLibs/SocketsTest.cpp

@@ -47,10 +47,9 @@ void *testReaderIP(void *param)
 	readSocket->nonblocking();
 	int rc = 0;
 	while (rc<gNumToSend) {
-		char buf[MAX_UDP_LENGTH+1] = { 0 };
+		char buf[MAX_UDP_LENGTH] = { 0 };
 		int count = readSocket->read(buf, MAX_UDP_LENGTH);
 		if (count>0) {
-			buf[count] = 0;
 			CERR("read: " << buf);
 			rc++;
 		} else {