Add C/I computation

Change-Id: Ib4ceec553f2e5f77bf3f6777724968456a180f5e
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>

AUTHORS

@@ -0,0 +1,127 @@
+#
+# Copyright 2008, 2009 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+David A. Burgess, dburgess@kestrelsp.com:
+    CLI/CLI.cpp
+    CLI/CLI.h
+    CommonLibs/Assert.h
+    CommonLibs/BitVector.cpp
+    CommonLibs/Interthread.h
+    CommonLibs/LinkedLists.cpp
+    CommonLibs/LinkedLists.h
+    CommonLibs/Regexp.h
+    CommonLibs/Sockets.cpp
+    CommonLibs/Sockets.h
+    CommonLibs/Threads.cpp
+    CommonLibs/Threads.h
+    CommonLibs/Timeval.cpp
+    CommonLibs/Timeval.h
+    CommonLibs/Vector.h
+    GSM/GSM610Tables.cpp
+    GSM/GSM610Tables.h
+    GSM/GSMCommon.cpp
+    GSM/GSMCommon.h
+    GSM/GSMConfig.h
+    GSM/GSML1FEC.cpp
+    GSM/GSML1FEC.h
+    GSM/GSML2LAPDm.cpp
+    GSM/GSML2LAPDm.h
+    GSM/GSML3CCElements.cpp
+    GSM/GSML3CCElements.h
+    GSM/GSML3CCMessages.cpp
+    GSM/GSML3CCMessages.h
+    GSM/GSML3CommonElements.cpp
+    GSM/GSML3CommonElements.h
+    GSM/GSML3MMElements.cpp
+    GSM/GSML3MMElements.h
+    GSM/GSML3MMMessages.cpp
+    GSM/GSML3MMMessages.h
+    GSM/GSML3Message.cpp
+    GSM/GSML3Message.h
+    GSM/GSML3RRElements.cpp
+    GSM/GSML3RRElements.h
+    GSM/GSML3RRMessages.cpp
+    GSM/GSML3RRMessages.h
+    GSM/GSMLogicalChannel.h
+    GSM/GSMTDMA.cpp
+    GSM/GSMTDMA.h
+    GSM/GSMTransfer.cpp
+    GSM/GSMTransfer.h
+    LICENSEBLOCK
+    TRXManager/TRXManager.cpp
+    Transceiver/Complex.h
+    tests/CommonLibs/BitVectorTest.cpp
+    tests/CommonLibs/InterthreadTest.cpp
+    tests/CommonLibs/SocketsTest.cpp
+    tests/CommonLibs/TimevalTest.cpp
+    tests/CommonLibs/VectorTest.cpp
+
+Harvind S. Samra, hssamra@kestrelsp.com:
+    GSM/GSMConfig.h
+    GSM/GSMTransfer.h
+    LICENSEBLOCK
+    Transceiver/ComplexTest.cpp
+    Transceiver/Transceiver.cpp
+    Transceiver/Transceiver.h
+    Transceiver/USRPDevice.cpp
+    Transceiver/USRPDevice.h
+    Transceiver/USRPping.cpp
+    Transceiver/radioInterface.cpp
+    Transceiver/radioInterface.h
+    Transceiver/rcvLPF_651.h
+    Transceiver/runTransceiver.cpp
+    Transceiver/sendLPF_961.h
+    Transceiver/sigProcLib.cpp
+    Transceiver/sigProcLib.h
+    Transceiver/sigProcLibTest.cpp
+    Transceiver/sweepGenerator.cpp
+    Transceiver/testRadio.cpp
+
+Raffi Sevlian, raffisev@gmail.com:
+    GSM/GSMCommon.h
+    GSM/GSMConfig.h
+    GSM/GSML1FEC.h
+    GSM/GSML3CCElements.cpp
+    GSM/GSML3CCElements.h
+    GSM/GSML3CCMessages.cpp
+    GSM/GSML3CCMessages.h
+    GSM/GSML3CommonElements.cpp
+    GSM/GSML3CommonElements.h
+    GSM/GSML3MMElements.cpp
+    GSM/GSML3MMElements.h
+    GSM/GSML3MMMessages.cpp
+    GSM/GSML3MMMessages.h
+    GSM/GSML3Message.cpp
+    GSM/GSML3Message.h
+    GSM/GSML3RRElements.cpp
+    GSM/GSML3RRElements.h
+    GSM/GSML3RRMessages.cpp
+    GSM/GSML3RRMessages.h
+    GSM/GSMLogicalChannel.h
+    GSM/GSMSAPMux.cpp
+    GSM/GSMSAPMux.h
+    GSM/GSMTransfer.h
+    LICENSEBLOCK
+    TRXManager/TRXManager.h
+
+Alon Levy, alonlevy1@gmail.com
+    RRLPMessages.cpp
+    RRLPMessages.h
+    RRLPTest.cpp

COPYING

@@ -666,7 +666,7 @@ For more information on this, and how to apply and follow the GNU AGPL, see
 =========================================================================
 
 This marks the end of the AGPLv3 text.  The following text is appended to the
-same file for convenience but constituting a distinct document, not part of the
+same file for convience but constituting a distinct document, not part of the
 actual AGPL text and not part of an attempt to create a deriviative work based
 on the AGPLv3 text.
 

CommonLibs/BitVector.cpp

@@ -1,7 +1,6 @@
 /*
 * Copyright 2008, 2009 Free Software Foundation, Inc.
 *
-* SPDX-License-Identifier: AGPL-3.0+
 *
 * This software is distributed under the terms of the GNU Affero Public License.
 * See the COPYING file in the main directory for details.
@@ -37,7 +36,7 @@ using namespace std;
 
 
 /**
-  Apply a Galois polymonial to a binary sequence.
+  Apply a Galois polymonial to a binary seqeunce.
   @param val The input sequence.
   @param poly The polynomial.
   @param order The order of the polynomial.

CommonLibs/BitVector.h

@@ -1,8 +1,6 @@
 /*
 * Copyright 2008, 2009 Free Software Foundation, Inc.
 *
-* SPDX-License-Identifier: AGPL-3.0+
-*
 * This software is distributed under the terms of the GNU Affero Public License.
 * See the COPYING file in the main directory for details.
 *

CommonLibs/Interthread.h

@@ -1,8 +1,6 @@
 /*
 * Copyright 2008, 2011 Free Software Foundation, Inc.
 *
-* SPDX-License-Identifier: AGPL-3.0+
-*
 * This software is distributed under the terms of the GNU Affero Public License.
 * See the COPYING file in the main directory for details.
 *
@@ -47,7 +45,7 @@
 // (pat) The elements in the queue are type T*, and
 // the Fifo class implements the underlying queue.
 // The default is class PointerFIFO, which does not place any restrictions on the type of T,
-// and is implemented by allocating auxiliary structures for the queue,
+// and is implemented by allocating auxilliary structures for the queue,
 // or SingleLinkedList, which implements the queue using an internal pointer in type T,
 // which must implement the functional interface of class SingleLinkListNode,
 // namely: functions T*next() and void setNext(T*).

CommonLibs/LinkedLists.cpp

@@ -1,7 +1,6 @@
 /*
 * Copyright 2008 Free Software Foundation, Inc.
 *
-* SPDX-License-Identifier: AGPL-3.0+
 *
 * This software is distributed under the terms of the GNU Affero Public License.
 * See the COPYING file in the main directory for details.

CommonLibs/LinkedLists.h

@@ -1,10 +1,7 @@
 /*
 * Copyright 2008 Free Software Foundation, Inc.
 *
-* SPDX-License-Identifier: AGPL-3.0+
-*
-* This software is distributed under multiple licenses; see the COPYING file in
-* the main directory for licensing information for this specific distribution.
+* This software is distributed under multiple licenses; see the COPYING file in the main directory for licensing information for this specific distribuion.
 *
 * This software is distributed under the terms of the GNU Affero Public License.
 * See the COPYING file in the main directory for details.

CommonLibs/Logger.cpp

@@ -1,7 +1,6 @@
 /*
 * Copyright (C) 2018 sysmocom - s.f.m.c. GmbH
 *
-* SPDX-License-Identifier: AGPL-3.0+
 *
 * This software is distributed under the terms of the GNU Affero Public License.
 * See the COPYING file in the main directory for details.
@@ -36,6 +35,8 @@
 
 using namespace std;
 
+Mutex gLogToLock;
+
 std::ostream& operator<<(std::ostream& os, std::ostringstream& ss)
 {
 	return os << ss.str();
@@ -44,13 +45,13 @@ 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";
-
-	/* print related function called inside a C++ destructor, use pthread_setcancelstate() APIs.
-	   See osmo-trx commit 86be40b4eb762d5c12e8e3f7388ca9f254e77b36 for more information */
-	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_state);
+	ScopedLock lock(gLogToLock);
+	// 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);
 }

CommonLibs/Logger.h

@@ -2,8 +2,6 @@
 * Copyright 2009, 2010 Free Software Foundation, Inc.
 * Copyright 2010 Kestrel Signal Processing, Inc.
 *
-* SPDX-License-Identifier: AGPL-3.0+
-*
 * This software is distributed under the terms of the GNU Affero Public License.
 * See the COPYING file in the main directory for details.
 *
@@ -58,9 +56,6 @@ extern "C" {
 #define LOGLV(category, level) \
 	Log(category, level, __BASE_FILE__, __LINE__).get() <<  "[tid=" << pthread_self() << "] "
 
-#define LOGSRC(category, level, file, line) \
-	Log(category, level, file, line).get() <<  "[tid=" << pthread_self() << "] "
-
 #define LOGCHAN(chan, category, level) \
 	Log(category, LOGL_##level, __BASE_FILE__, __LINE__).get() <<  "[tid=" << pthread_self() << "][chan=" << chan << "] "
 

CommonLibs/Makefile.am

@@ -30,11 +30,11 @@ noinst_LTLIBRARIES = libcommon.la
 libcommon_la_SOURCES = \
 	BitVector.cpp \
 	LinkedLists.cpp \
+	Sockets.cpp \
 	Threads.cpp \
 	Timeval.cpp \
 	Logger.cpp \
 	Utils.cpp \
-	trx_rate_ctr.cpp \
 	trx_vty.c \
 	debug.c
 libcommon_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS)
@@ -44,12 +44,12 @@ noinst_HEADERS = \
 	PRBS.h \
 	Interthread.h \
 	LinkedLists.h \
+	Sockets.h \
 	Threads.h \
 	Timeval.h \
 	Vector.h \
 	Logger.h \
 	Utils.h \
-	trx_rate_ctr.h \
 	trx_vty.h \
 	debug.h \
 	osmo_signal.h \

CommonLibs/PRBS.h

@@ -1,8 +1,6 @@
 /*
  * Copyright (C) 2017 Alexander Chemeris <Alexander.Chemeris@fairwaves.co>
  *
- * SPDX-License-Identifier: LGPL-2.1+
- *
  * 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

CommonLibs/Sockets.cpp

@@ -0,0 +1,287 @@
+/*
+* Copyright 2008, 2010 Free Software Foundation, Inc.
+*
+*
+* This software is distributed under the terms of the GNU Affero Public License.
+* See the COPYING file in the main directory for details.
+*
+* This use of this software may be subject to additional restrictions.
+* See the LEGAL file in the main directory for details.
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+
+#include <config.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <cstdio>
+#include <sys/select.h>
+
+#include "Threads.h"
+#include "Sockets.h"
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#include <string.h>
+#include <stdlib.h>
+
+
+
+
+
+
+bool resolveAddress(struct sockaddr_in *address, const char *hostAndPort)
+{
+	assert(address);
+	assert(hostAndPort);
+	char *copy = strdup(hostAndPort);
+	char *colon = strchr(copy,':');
+	if (!colon) return false;
+	*colon = '\0';
+	char *host = copy;
+	unsigned port = strtol(colon+1,NULL,10);
+	bool retVal = resolveAddress(address,host,port);
+	free(copy);
+	return retVal;
+}
+
+bool resolveAddress(struct sockaddr_in *address, const char *host, unsigned short port)
+{
+	assert(address);
+	assert(host);
+	// FIXME -- Need to ignore leading/trailing spaces in hostname.
+	struct hostent *hp;
+	int h_errno_local;
+#ifdef HAVE_GETHOSTBYNAME2_R
+	struct hostent hostData;
+	char tmpBuffer[2048];
+
+	// There are different flavors of gethostbyname_r(), but
+	// latest Linux use the following form:
+	if (gethostbyname2_r(host, AF_INET, &hostData, tmpBuffer, sizeof(tmpBuffer), &hp, &h_errno_local)!=0) {
+		CERR("WARNING -- gethostbyname2_r() failed for " << host << ", " << hstrerror(h_errno_local));
+		return false;
+	}
+#else
+	static Mutex sGethostbynameMutex;
+	// gethostbyname() is NOT thread-safe, so we should use a mutex here.
+	// Ideally it should be a global mutex for all non thread-safe socket
+	// operations and it should protect access to variables such as
+	// global h_errno.
+	sGethostbynameMutex.lock();
+	hp = gethostbyname(host);
+	h_errno_local = h_errno;
+	sGethostbynameMutex.unlock();
+#endif
+ 	if (hp==NULL) {
+		CERR("WARNING -- gethostbyname() failed for " << host << ", " << hstrerror(h_errno_local));
+		return false;
+	}
+	if (hp->h_addrtype != AF_INET) {
+		CERR("WARNING -- gethostbyname() resolved " << host << " to something other then AF_INET");
+ 		return false;
+ 	}
+	address->sin_family = hp->h_addrtype;
+	assert(sizeof(address->sin_addr) == hp->h_length);
+	memcpy(&(address->sin_addr), hp->h_addr_list[0], hp->h_length);
+	address->sin_port = htons(port);
+	return true;
+}
+
+
+
+DatagramSocket::DatagramSocket()
+{
+	memset(mDestination, 0, sizeof(mDestination));
+}
+
+
+
+
+
+void DatagramSocket::nonblocking()
+{
+	fcntl(mSocketFD,F_SETFL,O_NONBLOCK);
+}
+
+void DatagramSocket::blocking()
+{
+	fcntl(mSocketFD,F_SETFL,0);
+}
+
+void DatagramSocket::close()
+{
+	::close(mSocketFD);
+}
+
+
+DatagramSocket::~DatagramSocket()
+{
+	close();
+}
+
+
+
+
+
+int DatagramSocket::write( const char * message, size_t length )
+{
+	assert(length<=MAX_UDP_LENGTH);
+	int retVal = sendto(mSocketFD, message, length, 0,
+		(struct sockaddr *)mDestination, addressSize());
+	if (retVal == -1 ) perror("DatagramSocket::write() failed");
+	return retVal;
+}
+
+int DatagramSocket::writeBack( const char * message, size_t length )
+{
+	assert(length<=MAX_UDP_LENGTH);
+	int retVal = sendto(mSocketFD, message, length, 0,
+		(struct sockaddr *)mSource, addressSize());
+	if (retVal == -1 ) perror("DatagramSocket::write() failed");
+	return retVal;
+}
+
+
+
+int DatagramSocket::write( const char * message)
+{
+	size_t length=strlen(message)+1;
+	return write(message,length);
+}
+
+int DatagramSocket::writeBack( const char * message)
+{
+	size_t length=strlen(message)+1;
+	return writeBack(message,length);
+}
+
+
+
+int DatagramSocket::send(const struct sockaddr* dest, const char * message, size_t length )
+{
+	assert(length<=MAX_UDP_LENGTH);
+	int retVal = sendto(mSocketFD, message, length, 0, dest, addressSize());
+	if (retVal == -1 ) perror("DatagramSocket::send() failed");
+	return retVal;
+}
+
+int DatagramSocket::send(const struct sockaddr* dest, const char * message)
+{
+	size_t length=strlen(message)+1;
+	return send(dest,message,length);
+}
+
+int DatagramSocket::read(char* buffer, size_t length)
+{
+	socklen_t addr_len = sizeof(mSource);
+	int rd_length = recvfrom(mSocketFD, (void *) buffer, length, 0,
+		(struct sockaddr*) &mSource, &addr_len);
+
+	if ((rd_length==-1) && (errno!=EAGAIN)) {
+		perror("DatagramSocket::read() failed");
+		throw SocketError();
+	}
+	return rd_length;
+}
+
+int DatagramSocket::read(char* buffer, size_t length, unsigned timeout)
+{
+	fd_set fds;
+	FD_ZERO(&fds);
+	FD_SET(mSocketFD,&fds);
+	struct timeval tv;
+	tv.tv_sec = timeout/1000;
+	tv.tv_usec = (timeout%1000)*1000;
+	int sel = select(mSocketFD+1,&fds,NULL,NULL,&tv);
+	if (sel<0) {
+		perror("DatagramSocket::read() select() failed");
+		throw SocketError();
+	}
+	if (sel==0) return -1;
+	if (FD_ISSET(mSocketFD,&fds)) return read(buffer, length);
+	return -1;
+}
+
+
+
+
+
+
+UDPSocket::UDPSocket(const char *wSrcIP, unsigned short wSrcPort)
+	:DatagramSocket()
+{
+	open(wSrcPort, wSrcIP);
+}
+
+
+UDPSocket::UDPSocket(const char *wSrcIP, unsigned short wSrcPort,
+		     const char *wDestIP, unsigned short wDestPort)
+	:DatagramSocket()
+{
+	open(wSrcPort, wSrcIP);
+	destination(wDestPort, wDestIP);
+}
+
+
+
+void UDPSocket::destination( unsigned short wDestPort, const char * wDestIP )
+{
+	resolveAddress((sockaddr_in*)mDestination, wDestIP, wDestPort );
+}
+
+
+void UDPSocket::open(unsigned short localPort, const char *wlocalIP)
+{
+	// create
+	mSocketFD = socket(AF_INET,SOCK_DGRAM,0);
+	if (mSocketFD<0) {
+		perror("socket() failed");
+		throw SocketError();
+	}
+
+	// pat added: This lets the socket be reused immediately, which is needed if OpenBTS crashes.
+	int on = 1;
+	setsockopt(mSocketFD, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+
+
+	// bind
+	struct sockaddr_in address;
+	size_t length = sizeof(address);
+	bzero(&address,length);
+	address.sin_family = AF_INET;
+	address.sin_addr.s_addr = inet_addr(wlocalIP);
+	address.sin_port = htons(localPort);
+	if (bind(mSocketFD,(struct sockaddr*)&address,length)<0) {
+		perror("bind() failed");
+		throw SocketError();
+	}
+}
+
+
+
+unsigned short UDPSocket::port() const
+{
+	struct sockaddr_in name;
+	socklen_t nameSize = sizeof(name);
+	int retVal = getsockname(mSocketFD, (struct sockaddr*)&name, &nameSize);
+	if (retVal==-1) throw SocketError();
+	return ntohs(name.sin_port);
+}
+
+// vim:ts=4:sw=4

CommonLibs/Sockets.h

@@ -0,0 +1,173 @@
+/*
+* Copyright 2008, 2010 Free Software Foundation, Inc.
+*
+* This software is distributed under the terms of the GNU Affero Public License.
+* See the COPYING file in the main directory for details.
+*
+* This use of this software may be subject to additional restrictions.
+* See the LEGAL file in the main directory for details.
+
+	This program is 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/>.
+
+*/
+
+
+#ifndef SOCKETS_H
+#define SOCKETS_H
+
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/un.h>
+#include <errno.h>
+#include <list>
+#include <assert.h>
+#include <stdint.h>
+#include <stdio.h>
+
+
+
+
+
+#define MAX_UDP_LENGTH 1500
+
+/** A function to resolve IP host names. */
+bool resolveAddress(struct sockaddr_in *address, const char *host, unsigned short port);
+
+/** Resolve an address of the form "<host>:<port>". */
+bool resolveAddress(struct sockaddr_in *address, const char *hostAndPort);
+
+/** An exception to throw when a critical socket operation fails. */
+class SocketError {};
+#define SOCKET_ERROR {throw SocketError(); }
+
+/** Abstract class for connectionless sockets. */
+class DatagramSocket {
+
+protected:
+
+	int mSocketFD;				///< underlying file descriptor
+	char mDestination[256];		///< address to which packets are sent
+	char mSource[256];		///< return address of most recent received packet
+
+public:
+
+	/** An almost-does-nothing constructor. */
+	DatagramSocket();
+
+	virtual ~DatagramSocket();
+
+	/** Return the address structure size for this socket type. */
+	virtual size_t addressSize() const = 0;
+
+	/**
+		Send a binary packet.
+		@param buffer The data bytes to send to mDestination.
+		@param length Number of bytes to send, or strlen(buffer) if defaulted to -1.
+		@return number of bytes written, or -1 on error.
+	*/
+	int write( const char * buffer, size_t length);
+
+	/**
+		Send a C-style string packet.
+		@param buffer The data bytes to send to mDestination.
+		@return number of bytes written, or -1 on error.
+	*/
+	int write( const char * buffer);
+
+	/**
+		Send a binary packet.
+		@param buffer The data bytes to send to mSource.
+		@param length Number of bytes to send, or strlen(buffer) if defaulted to -1.
+		@return number of bytes written, or -1 on error.
+	*/
+	int writeBack(const char * buffer, size_t length);
+
+	/**
+		Send a C-style string packet.
+		@param buffer The data bytes to send to mSource.
+		@return number of bytes written, or -1 on error.
+	*/
+	int writeBack(const char * buffer);
+
+
+	/**
+		Receive a packet.
+		@param buffer A char[MAX_UDP_LENGTH] procured by the caller.
+		@return The number of bytes received or -1 on non-blocking pass.
+	*/
+	int read(char* buffer, size_t length);
+
+	/**
+		Receive a packet with a timeout.
+		@param buffer A char[MAX_UDP_LENGTH] procured by the caller.
+		@param maximum wait time in milliseconds
+		@return The number of bytes received or -1 on timeout.
+	*/
+	int read(char* buffer, size_t length, unsigned timeout);
+
+
+	/** Send a packet to a given destination, other than the default. */
+	int send(const struct sockaddr *dest, const char * buffer, size_t length);
+
+	/** Send a C-style string to a given destination, other than the default. */
+	int send(const struct sockaddr *dest, const char * buffer);
+
+	/** Make the socket non-blocking. */
+	void nonblocking();
+
+	/** Make the socket blocking (the default). */
+	void blocking();
+
+	/** Close the socket. */
+	void close();
+
+};
+
+
+
+/** UDP/IP User Datagram Socket */
+class UDPSocket : public DatagramSocket {
+
+public:
+
+	/** Open a USP socket with an OS-assigned port and no default destination. */
+	UDPSocket(const char *localIP, unsigned short localPort);
+
+	/** Given a full specification, open the socket and set the dest address. */
+	UDPSocket(const char *localIP, unsigned short localPort,
+		  const char *remoteIP, unsigned short remotePort);
+
+	/** Set the destination port. */
+	void destination( unsigned short wDestPort, const char * wDestIP );
+
+	/** Return the actual port number in use. */
+	unsigned short port() const;
+
+	/** Open and bind the UDP socket to a local port. */
+	void open(unsigned short localPort=0, const char *wlocalIP="127.0.0.1");
+
+	/** Give the return address of the most recently received packet. */
+	const struct sockaddr_in* source() const { return (const struct sockaddr_in*)mSource; }
+
+	size_t addressSize() const { return sizeof(struct sockaddr_in); }
+
+};
+
+#endif
+
+
+
+// vim:ts=4:sw=4

CommonLibs/Threads.cpp

@@ -1,7 +1,6 @@
 /*
 * Copyright 2008 Free Software Foundation, Inc.
 *
-* SPDX-License-Identifier: AGPL-3.0+
 *
 * This software is distributed under the terms of the GNU Affero Public License.
 * See the COPYING file in the main directory for details.
@@ -40,9 +39,7 @@
 
 using namespace std;
 
-#ifndef HAVE_ATOMIC_OPS
-	pthread_mutex_t atomic_ops_mutex = PTHREAD_MUTEX_INITIALIZER;
-#endif
+
 
 
 Mutex gStreamLock;		///< Global lock to control access to cout and cerr.
@@ -138,10 +135,8 @@ void Thread::start(void *(*task)(void*), void *arg)
 	// (pat) Moved initialization to constructor to avoid crash in destructor.
 	//res = pthread_attr_init(&mAttrib);
 	//assert(!res);
-	if (mStackSize != 0) {
 	res = pthread_attr_setstacksize(&mAttrib, mStackSize);
 	assert(!res);
-	}
 	res = pthread_create(&mThread, &mAttrib, task, arg);
 	assert(!res);
 }

CommonLibs/Threads.h

@@ -1,8 +1,6 @@
 /*
 * Copyright 2008, 2011 Free Software Foundation, Inc.
 *
-* SPDX-License-Identifier: AGPL-3.0+
-*
 * This software is distributed under the terms of the GNU Affero Public License.
 * See the COPYING file in the main directory for details.
 *
@@ -28,8 +26,6 @@
 #ifndef THREADS_H
 #define THREADS_H
 
-#include "config.h"
-
 #include <pthread.h>
 #include <iostream>
 #include <assert.h>
@@ -162,7 +158,7 @@ class Thread {
 	public:
 
 	/** Create a thread in a non-running state. */
-	Thread(size_t wStackSize = 0):mThread((pthread_t)0) {
+	Thread(size_t wStackSize = (65536*4)):mThread((pthread_t)0) {
 		pthread_attr_init(&mAttrib);	// (pat) moved this here.
 		mStackSize=wStackSize;
 	}
@@ -186,34 +182,12 @@ class Thread {
 		}
 	}
 
-	/** Send cancellation to thread */
+	/** Send cancelation to thread */
 	void cancel() { pthread_cancel(mThread); }
 };
 
-#ifdef HAVE_ATOMIC_OPS
-#define osmo_trx_sync_fetch_and_and(ptr, value) __sync_fetch_and_and((ptr), (value))
-#define osmo_trx_sync_or_and_fetch(ptr, value) __sync_or_and_fetch((ptr), (value))
-#else
-extern pthread_mutex_t atomic_ops_mutex;
-static inline int osmo_trx_sync_fetch_and_and(int *ptr, int value)
-{
-	pthread_mutex_lock(&atomic_ops_mutex);
-	int tmp = *ptr;
-	*ptr &= value;
-	pthread_mutex_unlock(&atomic_ops_mutex);
-	return tmp;
-}
 
-static inline int osmo_trx_sync_or_and_fetch(int *ptr, int value)
-{
-	int tmp;
-	pthread_mutex_lock(&atomic_ops_mutex);
-	*ptr |= value;
-	tmp = *ptr;
-	pthread_mutex_unlock(&atomic_ops_mutex);
-	return tmp;
-}
-#endif
+
 
 #endif
 // vim: ts=4 sw=4

CommonLibs/Timeval.cpp

@@ -1,7 +1,6 @@
 /*
 * Copyright 2008 Free Software Foundation, Inc.
 *
-* SPDX-License-Identifier: AGPL-3.0+
 *
 * This software is distributed under the terms of the GNU Affero Public License.
 * See the COPYING file in the main directory for details.
@@ -88,9 +87,8 @@ long Timeval::delta(const Timeval& other) const
 
 ostream& operator<<(ostream& os, const Timeval& tv)
 {
-	ios_base::fmtflags flags_backup = os.setf( ios::fixed, ios::floatfield );
+	os.setf( ios::fixed, ios::floatfield );
 	os << tv.seconds();
-	os.flags( flags_backup );
 	return os;
 }
 

CommonLibs/Timeval.h

@@ -1,8 +1,6 @@
 /*
 * Copyright 2008 Free Software Foundation, Inc.
 *
-* SPDX-License-Identifier: AGPL-3.0+
-*
 * This software is distributed under the terms of the GNU Affero Public License.
 * See the COPYING file in the main directory for details.
 *
@@ -84,7 +82,7 @@ class Timeval {
 	uint32_t usec() const { return mTimespec.tv_nsec / 1000; }
 	uint32_t nsec() const { return mTimespec.tv_nsec; }
 
-	/** Return difference from other (other-self), in ms. */
+	/** Return differnce from other (other-self), in ms. */
 	long delta(const Timeval& other) const;
 
 	/** Elapsed time in ms. */

CommonLibs/Utils.cpp

@@ -1,8 +1,6 @@
 /*
  * Copyright 2018 sysmocom - s.f.m.c. GmbH
  *
- * SPDX-License-Identifier: LGPL-2.1+
- *
  * 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

CommonLibs/Utils.h

@@ -1,8 +1,6 @@
 /*
  * Copyright 2018 sysmocom - s.f.m.c. GmbH
  *
- * SPDX-License-Identifier: LGPL-2.1+
- *
  * 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

CommonLibs/Vector.h

@@ -2,8 +2,6 @@
 /*
 * Copyright 2008 Free Software Foundation, Inc.
 *
-* SPDX-License-Identifier: AGPL-3.0+
-*
 * This software is distributed under the terms of the GNU Affero Public License.
 * See the COPYING file in the main directory for details.
 *
@@ -36,7 +34,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-// We can't use Logger.h in this file...
+// We cant use Logger.h in this file...
 extern int gVectorDebug;
 #define BVDEBUG(msg) if (gVectorDebug) {std::cout << msg;}
 
@@ -232,7 +230,7 @@ template <class T> class Vector {
 		assert(mStart+span<=mEnd);
 		for (i = 0; i < span; i++, src++, dst++)
 			*dst = *src;
-		/*TODO if not non-trivially copiable type class, optimize:
+		/*TODO if not non-trivially copyable type class, optimize:
 		memcpy(dst,mStart,span*sizeof(T)); */
 	}
 

CommonLibs/debug.c

@@ -1,38 +1,3 @@
-/*
- * Copyright (C) 2018-2019 sysmocom - s.f.m.c. GmbH
- * All Rights Reserved
- *
- * SPDX-License-Identifier: AGPL-3.0+
- *
- * Author: Pau Espin Pedrol <pespin@sysmocom.de>
- *
- * 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 "config.h"
-
-/* If HAVE_GETTID, then "_GNU_SOURCE" may need to be defined to use gettid() */
-#if HAVE_GETTID
-#define _GNU_SOURCE
-#endif
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/syscall.h>
-#include "config.h"
-
 #include <osmocom/core/logging.h>
 #include <osmocom/core/utils.h>
 #include "debug.h"
@@ -45,39 +10,21 @@ static const struct log_info_cat default_categories[] = {
 		.color = NULL,
 		.enabled = 1, .loglevel = LOGL_NOTICE,
 	},
-	[DTRXCLK] = {
-			.name = "DTRXCLK",
-			.description = "TRX Master Clock",
-			.color = NULL,
-			.enabled = 1, .loglevel = LOGL_NOTICE,
-	},
 	[DTRXCTRL] = {
 			.name = "DTRXCTRL",
 			.description = "TRX CTRL interface",
 			.color = "\033[1;33m",
 			.enabled = 1, .loglevel = LOGL_NOTICE,
 	},
-	[DTRXDDL] = {
-			.name = "DTRXDDL",
-			.description = "TRX Data interface Downlink",
-			.color = NULL,
-			.enabled = 1, .loglevel = LOGL_NOTICE,
-	},
-	[DTRXDUL] = {
-			.name = "DTRXDUL",
-			.description = "TRX CTRL interface Uplink",
-			.color = NULL,
-			.enabled = 1, .loglevel = LOGL_NOTICE,
-	},
 	[DDEV] = {
 		.name = "DDEV",
 		.description = "Device/Driver specific code",
 		.color = NULL,
 		.enabled = 1, .loglevel = LOGL_INFO,
 	},
-	[DDEVDRV] = {
-		.name = "DDEVDRV",
-		.description = "Logging from external device driver library implementing lower level specifics",
+	[DLMS] = {
+		.name = "DLMS",
+		.description = "Logging from within LimeSuite itself",
 		.color = NULL,
 		.enabled = 1, .loglevel = LOGL_NOTICE,
 	},
@@ -87,15 +34,3 @@ const struct log_info log_info = {
 	.cat = default_categories,
 	.num_cat = ARRAY_SIZE(default_categories),
 };
-
-pid_t my_gettid(void)
-{
-#if HAVE_GETTID
-	return gettid();
-#elif defined(LINUX) && defined(__NR_gettid)
-	return (pid_t) syscall(__NR_gettid);
-#else
-	#pragma message ("use pid as tid")
-	return getpid();
-#endif
-}

CommonLibs/debug.h

@@ -1,29 +1,11 @@
 #pragma once
 
-#include <stdbool.h>
-#include <sys/types.h>
-
-#include <osmocom/core/logging.h>
-
 extern const struct log_info log_info;
 
 /* Debug Areas of the code */
 enum {
 	DMAIN,
-	DTRXCLK,
 	DTRXCTRL,
-	DTRXDDL,
-	DTRXDUL,
 	DDEV,
-	DDEVDRV,
+	DLMS,
 };
-
-pid_t my_gettid(void);
-
-#define CLOGC(category, level, fmt, args...) do { \
-	LOGP(category, level, "[tid=%ld] " fmt, (long int) my_gettid(), ##args);  \
-} while(0)
-
-#define CLOGCHAN(chan, category, level, fmt, args...) do { \
-	LOGP(category, level, "[tid=%ld][chan=%zu] " fmt, (long int) my_gettid(), chan, ##args);  \
-} while(0)

CommonLibs/osmo_signal.h

@@ -5,8 +5,6 @@
  *
  * All Rights Reserved
  *
- * SPDX-License-Identifier: AGPL-3.0+
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -28,30 +26,10 @@
 
 /* Signalling subsystems */
 enum signal_subsystems {
-	SS_MAIN,
-	SS_DEVICE,
+	SS_TRANSC,
 };
 
-/* SS_MAIN signals */
-enum SS_MAIN {
-	S_MAIN_STOP_REQUIRED, /* TRX fatal error, it should be stopped */
-};
-
-/* SS_DEVICE signals */
-enum SS_DEVICE {
-	/* Device internal counters changed. Counters are provided as cb data
-	   (struct device_counters). Must be sent with PTHREAD_CANCEL_DISABLE
-	   to avoid deadlocks in case osmo-trx process is asked to exit. */
-	S_DEVICE_COUNTER_CHANGE,
-};
-
-/* signal cb for signal <SS_DEVICE,S_DEVICE_COUNTER_CHANGE> */
-struct device_counters {
-	size_t chan;
-	unsigned int rx_overruns;
-	unsigned int tx_underruns;
-	unsigned int rx_dropped_events;
-	unsigned int rx_dropped_samples;
-	unsigned int tx_dropped_events;
-	unsigned int tx_dropped_samples;
+/* SS_TRANSC signals */
+enum SS_TRANSC {
+	S_TRANSC_STOP_REQUIRED, /* Transceiver fatal error, it should be stopped */
 };

CommonLibs/trx_rate_ctr.cpp

@@ -1,336 +0,0 @@
-/*
- * Copyright (C) 2019 sysmocom - s.f.m.c. GmbH
- * All Rights Reserved
- *
- * SPDX-License-Identifier: AGPL-3.0+
- *
- * Author: Pau Espin Pedrol <pespin@sysmocom.de>
- *
- * 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.
- */
-
-/*
- * rate_ctr API uses several osmocom select loop features, and as a result,
- * calls to it must be done through the main thread (the one running the osmocom
- * loop in osmo-trx).
- * Since read/write from/to SDR is done in separate threads (even read and write
- * each use a different thread), we must use some sort of message passing system
- * between main thread feeding rate_ctr structures and the Rx/Tx threads
- * generating the events.
- * The idea is that upon read/write issues, lower layers (SDR APIs) provide us with
- * underrun/overrun/droppedPackets information, and in that case we pass that up
- * the stack through signal <SS_DEVICE,S_DEVICE_COUNTER_CHANGE> with signal_cb
- * being a pointer to a "struct device_counters" structure, which contains
- * device (implementation agnostic) statful counters for different kind of
- * statistics.
- * That signal is processed here in device_sig_cb, where a copy of the "struct
- * device_counters" structure is held and the main thread is instructed through
- * a timerfd to update rate_ctr APIs against this copy. All this is done inside
- * a mutex to avoid different race conditions (between Rx andTx threads, and
- * between Rx/Tx and main thread). For the same reason, callers of signal
- * <SS_DEVICE,S_DEVICE_COUNTER_CHANGE> (device_sig_cb), that is Rx/Tx threads,
- * must do so with PTHREAD_CANCEL_DISABLE, in order to avoid possible deadlocks
- * in case the main thread decides to cancel other threads due to a shutdown
- * operation (fi SIGKILL received)
- */
-
-#include <string.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-extern "C" {
-#include <osmocom/core/talloc.h>
-#include <osmocom/core/utils.h>
-#include <osmocom/core/rate_ctr.h>
-#include <osmocom/core/select.h>
-#include <osmocom/core/stats.h>
-#include <osmocom/core/timer.h>
-
-#include "osmo_signal.h"
-#include "trx_vty.h"
-#include "trx_rate_ctr.h"
-}
-#include "Threads.h"
-#include "Logger.h"
-
-/* Used in ctrs_pending, when set it means that channel slot contains unused
-   (non-pending) counter data */
-#define PENDING_CHAN_NONE SIZE_MAX
-
-static void *trx_rate_ctr_ctx;
-
-static struct rate_ctr_group** rate_ctrs;
-static struct device_counters* ctrs_pending;
-static size_t chan_len;
-static struct osmo_fd rate_ctr_timerfd;
-static Mutex rate_ctr_mutex;
-
-struct osmo_timer_list threshold_timer;
-static LLIST_HEAD(threshold_list);
-static int threshold_timer_sched_secs;
-static bool threshold_initied;
-
-const struct value_string rate_ctr_intv[] = {
-	{ RATE_CTR_INTV_SEC,	"per-second" },
-	{ RATE_CTR_INTV_MIN,	"per-minute" },
-	{ RATE_CTR_INTV_HOUR,	"per-hour" },
-	{ RATE_CTR_INTV_DAY, 	"per-day" },
-	{ 0, NULL }
-};
-
-const struct value_string trx_chan_ctr_names[] = {
-	{ TRX_CTR_RX_OVERRUNS,	"rx_overruns" },
-	{ TRX_CTR_TX_UNDERRUNS,	"tx_underruns" },
-	{ TRX_CTR_RX_DROP_EV,	"rx_drop_events" },
-	{ TRX_CTR_RX_DROP_SMPL,	"rx_drop_samples" },
-	{ TRX_CTR_TX_DROP_EV,	"tx_drop_events" },
-	{ TRX_CTR_TX_DROP_SMPL,	"tx_drop_samples" },
-	{ 0, NULL }
-};
-
-static const struct rate_ctr_desc trx_chan_ctr_desc[] = {
-	[TRX_CTR_RX_OVERRUNS]		= { "device:rx_overruns",	"Number of Rx overruns in FIFO queue" },
-	[TRX_CTR_TX_UNDERRUNS]		= { "device:tx_underruns",	"Number of Tx underruns in FIFO queue" },
-	[TRX_CTR_RX_DROP_EV]		= { "device:rx_drop_events",	"Number of times Rx samples were dropped by HW" },
-	[TRX_CTR_RX_DROP_SMPL]		= { "device:rx_drop_samples",	"Number of Rx samples dropped by HW" },
-	[TRX_CTR_TX_DROP_EV]		= { "device:tx_drop_events",	"Number of times Tx samples were dropped by HW" },
-	[TRX_CTR_TX_DROP_SMPL]		= { "device:tx_drop_samples",	"Number of Tx samples dropped by HW" }
-};
-
-static const struct rate_ctr_group_desc trx_chan_ctr_group_desc = {
-	.group_name_prefix		= "trx:chan",
-	.group_description		= "osmo-trx statistics",
-	.class_id			= OSMO_STATS_CLASS_GLOBAL,
-	.num_ctr			= ARRAY_SIZE(trx_chan_ctr_desc),
-	.ctr_desc			= trx_chan_ctr_desc,
-};
-
-static int rate_ctr_timerfd_cb(struct osmo_fd *ofd, unsigned int what) {
-	size_t chan;
-	struct rate_ctr *ctr;
-	LOGC(DMAIN, NOTICE) << "Main thread is updating counters";
-	rate_ctr_mutex.lock();
-	for (chan = 0; chan < chan_len; chan++) {
-		if (ctrs_pending[chan].chan == PENDING_CHAN_NONE)
-			continue;
-		LOGCHAN(chan, DMAIN, INFO) << "rate_ctr update";
-		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_RX_OVERRUNS];
-		rate_ctr_add(ctr, ctrs_pending[chan].rx_overruns - ctr->current);
-		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TX_UNDERRUNS];
-		rate_ctr_add(ctr, ctrs_pending[chan].tx_underruns - ctr->current);
-		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_RX_DROP_EV];
-		rate_ctr_add(ctr, ctrs_pending[chan].rx_dropped_events - ctr->current);
-		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_RX_DROP_SMPL];
-		rate_ctr_add(ctr, ctrs_pending[chan].rx_dropped_samples - ctr->current);
-		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TX_DROP_EV];
-		rate_ctr_add(ctr, ctrs_pending[chan].tx_dropped_events - ctr->current);
-		ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TX_DROP_SMPL];
-		rate_ctr_add(ctr, ctrs_pending[chan].tx_dropped_samples - ctr->current);
-
-		/* Mark as done */
-		ctrs_pending[chan].chan = PENDING_CHAN_NONE;
-	}
-	if (osmo_timerfd_disable(&rate_ctr_timerfd) < 0)
-		LOGC(DMAIN, ERROR) << "Failed to disable timerfd";
-	rate_ctr_mutex.unlock();
-	return 0;
-}
-
-/* Callback function to be called every time we receive a signal from DEVICE */
-static int device_sig_cb(unsigned int subsys, unsigned int signal,
-			 void *handler_data, void *signal_data)
-{
-	struct device_counters *ctr;
-	/* Delay sched around 20 ms, in case we receive several calls from several
-	 * channels batched */
-	struct timespec next_sched = {.tv_sec = 0, .tv_nsec = 20*1000*1000};
-	/* no automatic re-trigger */
-	struct timespec intv_sched = {.tv_sec = 0, .tv_nsec = 0};
-
-	switch (signal) {
-	case S_DEVICE_COUNTER_CHANGE:
-		ctr = (struct device_counters *)signal_data;
-		LOGCHAN(ctr->chan, DMAIN, NOTICE) << "Received counter change from radioDevice";
-		rate_ctr_mutex.lock();
-		ctrs_pending[ctr->chan] = *ctr;
-		if (osmo_timerfd_schedule(&rate_ctr_timerfd, &next_sched, &intv_sched) < 0) {
-			LOGC(DMAIN, ERROR) << "Failed to schedule timerfd: " << errno << " = "<< strerror(errno);
-		}
-		rate_ctr_mutex.unlock();
-		break;
-	default:
-		break;
-	}
-	return 0;
-}
-
-/************************************
- * ctr_threshold  APIs
- ************************************/
-static const char* ctr_threshold_2_vty_str(struct ctr_threshold *ctr)
-{
-	static char buf[256];
-	int rc = 0;
-	rc += snprintf(buf, sizeof(buf), "ctr-error-threshold %s", get_value_string(trx_chan_ctr_names, ctr->ctr_id));
-	rc += snprintf(buf + rc, sizeof(buf) - rc, " %d %s", ctr->val, get_value_string(rate_ctr_intv, ctr->intv));
-	return buf;
-}
-
-static void threshold_timer_cb(void *data)
-{
-	struct ctr_threshold *ctr_thr;
-	struct rate_ctr *rate_ctr;
-	size_t chan;
-	LOGC(DMAIN, DEBUG) << "threshold_timer_cb fired!";
-
-	llist_for_each_entry(ctr_thr, &threshold_list, list) {
-		for (chan = 0; chan < chan_len; chan++) {
-			rate_ctr = &rate_ctrs[chan]->ctr[ctr_thr->ctr_id];
-			LOGCHAN(chan, DMAIN, INFO) << "checking threshold: " << ctr_threshold_2_vty_str(ctr_thr)
-						   << " ("<< rate_ctr->intv[ctr_thr->intv].rate << " vs " << ctr_thr->val << ")";
-			if (rate_ctr->intv[ctr_thr->intv].rate >= ctr_thr->val) {
-				LOGCHAN(chan, DMAIN, FATAL) << "threshold reached, stopping! " << ctr_threshold_2_vty_str(ctr_thr)
-							   << " ("<< rate_ctr->intv[ctr_thr->intv].rate << " vs " << ctr_thr->val << ")";
-				osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL);
-				return;
-			}
-		}
-	}
-	osmo_timer_schedule(&threshold_timer, threshold_timer_sched_secs, 0);
-}
-
-static size_t ctr_threshold_2_seconds(struct ctr_threshold *ctr)
-{
-	size_t mult = 0;
-	switch (ctr->intv) {
-	case RATE_CTR_INTV_SEC:
-		mult = 1;
-		break;
-	case RATE_CTR_INTV_MIN:
-		mult = 60;
-		break;
-	case RATE_CTR_INTV_HOUR:
-		mult = 60*60;
-		break;
-	case RATE_CTR_INTV_DAY:
-		mult = 60*60*24;
-		break;
-	default:
-		OSMO_ASSERT(false);
-	}
-	return mult;
-}
-
-static void threshold_timer_update_intv() {
-	struct ctr_threshold *ctr, *min_ctr;
-	size_t secs, min_secs;
-
-	/* Avoid scheduling timer until itself and other structures are prepared
-	   by trx_rate_ctr_init */
-	if (!threshold_initied)
-		return;
-
-	if (llist_empty(&threshold_list)) {
-		if (osmo_timer_pending(&threshold_timer))
-			osmo_timer_del(&threshold_timer);
-		return;
-	}
-
-	min_ctr = llist_first_entry(&threshold_list, struct ctr_threshold, list);
-	min_secs = ctr_threshold_2_seconds(min_ctr);
-
-	llist_for_each_entry(ctr, &threshold_list, list) {
-		secs = ctr_threshold_2_seconds(ctr);
-		if( min_secs > secs)
-			min_secs = secs;
-	}
-
-
-	threshold_timer_sched_secs = OSMO_MAX(min_secs / 2 - 1, 1);
-	LOGC(DMAIN, INFO) << "New ctr-error-threshold check interval: "
-			  << threshold_timer_sched_secs << " seconds";
-	osmo_timer_schedule(&threshold_timer, threshold_timer_sched_secs, 0);
-}
-
-/* Init rate_ctr subsystem. Expected to be called during process start by main thread before VTY is ready */
-void trx_rate_ctr_init(void *ctx, struct trx_ctx* trx_ctx)
-{
-	size_t  i;
-	trx_rate_ctr_ctx = ctx;
-	chan_len = trx_ctx->cfg.num_chans;
-	ctrs_pending = (struct device_counters*) talloc_zero_size(ctx, chan_len * sizeof(struct device_counters));
-	rate_ctrs = (struct rate_ctr_group**) talloc_zero_size(ctx, chan_len * sizeof(struct rate_ctr_group*));
-
-	for (i = 0; i < chan_len; i++) {
-		ctrs_pending[i].chan = PENDING_CHAN_NONE;
-		rate_ctrs[i] = rate_ctr_group_alloc(ctx, &trx_chan_ctr_group_desc, i);
-		if (!rate_ctrs[i]) {
-			LOGCHAN(i, DMAIN, ERROR) << "Failed to allocate rate ctr";
-			exit(1);
-		}
-	}
-	rate_ctr_timerfd.fd = -1;
-	if (osmo_timerfd_setup(&rate_ctr_timerfd, rate_ctr_timerfd_cb, NULL) < 0) {
-		LOGC(DMAIN, ERROR) << "Failed to setup timerfd";
-		exit(1);
-	}
-	osmo_signal_register_handler(SS_DEVICE, device_sig_cb, NULL);
-
-	/* Now set up threshold checks */
-	threshold_initied = true;
-	osmo_timer_setup(&threshold_timer, threshold_timer_cb, NULL);
-	threshold_timer_update_intv();
-}
-
-void trx_rate_ctr_threshold_add(struct ctr_threshold *ctr)
-{
-	struct ctr_threshold *new_ctr;
-
-	new_ctr = talloc_zero(trx_rate_ctr_ctx, struct ctr_threshold);
-	*new_ctr = *ctr;
-	LOGC(DMAIN, NOTICE) << "Adding new threshold check: " << ctr_threshold_2_vty_str(new_ctr);
-	llist_add(&new_ctr->list, &threshold_list);
-	threshold_timer_update_intv();
-}
-
-int trx_rate_ctr_threshold_del(struct ctr_threshold *del_ctr)
-{
-	struct ctr_threshold *ctr;
-
-	llist_for_each_entry(ctr, &threshold_list, list) {
-		if (ctr->intv != del_ctr->intv ||
-		    ctr->ctr_id != del_ctr->ctr_id ||
-		    ctr->val != del_ctr->val)
-			continue;
-
-		LOGC(DMAIN, NOTICE) << "Deleting threshold check: " << ctr_threshold_2_vty_str(del_ctr);
-		llist_del(&ctr->list);
-		talloc_free(ctr);
-		threshold_timer_update_intv();
-		return 0;
-	}
-	return -1;
-}
-
-void trx_rate_ctr_threshold_write_config(struct vty *vty, char *indent_prefix)
-{
-	struct ctr_threshold *ctr;
-
-	llist_for_each_entry(ctr, &threshold_list, list) {
-		vty_out(vty, "%s%s%s", indent_prefix, ctr_threshold_2_vty_str(ctr), VTY_NEWLINE);
-	}
-}

CommonLibs/trx_rate_ctr.h

@@ -1,30 +0,0 @@
-#pragma once
-
-#include <osmocom/core/rate_ctr.h>
-#include <osmocom/vty/command.h>
-
-enum TrxCtr {
-	TRX_CTR_RX_OVERRUNS,
-	TRX_CTR_TX_UNDERRUNS,
-	TRX_CTR_RX_DROP_EV,
-	TRX_CTR_RX_DROP_SMPL,
-	TRX_CTR_TX_DROP_EV,
-	TRX_CTR_TX_DROP_SMPL,
-};
-
-struct ctr_threshold {
-	/*! Linked list of all counter groups in the system */
-	struct llist_head list;
-	enum rate_ctr_intv intv;
-	enum TrxCtr ctr_id;
-	uint32_t val;
-};
-
-extern const struct value_string rate_ctr_intv[];
-extern const struct value_string trx_chan_ctr_names[];
-
-struct trx_ctx;
-void trx_rate_ctr_init(void *ctx, struct trx_ctx* trx_ctx);
-void trx_rate_ctr_threshold_add(struct ctr_threshold *ctr);
-int trx_rate_ctr_threshold_del(struct ctr_threshold *del_ctr);
-void trx_rate_ctr_threshold_write_config(struct vty *vty, char *indent_prefix);

CommonLibs/trx_vty.c

@@ -1,24 +1,20 @@
 /*
- * Copyright (C) 2018-2019 sysmocom - s.f.m.c. GmbH
+ * Copyright (C) 2012-2017 sysmocom - s.f.m.c. GmbH
  * All Rights Reserved
  *
- * SPDX-License-Identifier: AGPL-3.0+
- *
- * Author: Pau Espin Pedrol <pespin@sysmocom.de>
- *
- * 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
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Affero General Public License
+ * You should have received a copy of the GNU 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 <string.h>
@@ -32,42 +28,30 @@
 #include <osmocom/core/rate_ctr.h>
 
 #include <osmocom/vty/command.h>
-#include <osmocom/vty/logging.h>
 #include <osmocom/vty/vty.h>
 #include <osmocom/vty/misc.h>
 
-#include "trx_rate_ctr.h"
 #include "trx_vty.h"
 #include "../config.h"
 
 static struct trx_ctx* g_trx_ctx;
 
-const struct value_string clock_ref_names[] = {
+static const struct value_string clock_ref_names[] = {
 	{ REF_INTERNAL,	"internal" },
 	{ REF_EXTERNAL,	"external" },
 	{ REF_GPS,	"gpsdo" },
 	{ 0,		NULL }
 };
 
-const struct value_string filler_names[] = {
-	{ FILLER_DUMMY,		"Dummy bursts (C0 only)" },
-	{ FILLER_ZERO,		"Empty bursts" },
-	{ FILLER_NORM_RAND,	"GMSK Normal Bursts with random payload" },
-	{ FILLER_EDGE_RAND,	"8-PSK Normal Bursts with random payload" },
-	{ FILLER_ACCESS_RAND,	"Access Bursts with random payload" },
+static const struct value_string filler_names[] = {
+	{ FILLER_DUMMY,		"Dummy bursts" },
+	{ FILLER_ZERO,		"Disabled" },
+	{ FILLER_NORM_RAND,	"Normal bursts with random payload" },
+	{ FILLER_EDGE_RAND,	"EDGE bursts with random payload" },
+	{ FILLER_ACCESS_RAND,	"Access bursts with random payload" },
 	{ 0,			NULL }
 };
 
-static const struct value_string filler_types[] = {
-	{ FILLER_DUMMY,		"dummy" },
-	{ FILLER_ZERO,		"zero" },
-	{ FILLER_NORM_RAND,	"random-nb-gmsk" },
-	{ FILLER_EDGE_RAND,	"random-nb-8psk" },
-	{ FILLER_ACCESS_RAND,	"random-ab" },
-	{ 0,			NULL }
-};
-
-
 struct trx_ctx *trx_from_vty(struct vty *v)
 {
         /* It can't hurt to force callers to continue to pass the vty instance
@@ -183,10 +167,57 @@ DEFUN(cfg_rx_sps, cfg_rx_sps_cmd,
 	return CMD_SUCCESS;
 }
 
+DEFUN(cfg_test_rtsc, cfg_test_rtsc_cmd,
+	"test rtsc <0-7>",
+	"Set the Random Normal Burst test mode with TSC\n"
+	"TSC\n")
+{
+	struct trx_ctx *trx = trx_from_vty(vty);
+
+	if (trx->cfg.rach_delay_set) {
+		vty_out(vty, "rach-delay and rtsc options are mutual-exclusive%s",
+			VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	trx->cfg.rtsc_set = true;
+	trx->cfg.rtsc = atoi(argv[0]);
+	if (!trx->cfg.egprs) /* Don't override egprs which sets different filler */
+		trx->cfg.filler = FILLER_NORM_RAND;
+
+	return CMD_SUCCESS;
+}
+
+DEFUN(cfg_test_rach_delay, cfg_test_rach_delay_cmd,
+	"test rach-delay <0-68>",
+	"Set the Random Access Burst test mode with delay\n"
+	"RACH delay\n")
+{
+	struct trx_ctx *trx = trx_from_vty(vty);
+
+	if (trx->cfg.rtsc_set) {
+		vty_out(vty, "rach-delay and rtsc options are mutual-exclusive%s",
+			VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	if (trx->cfg.egprs) {
+		vty_out(vty, "rach-delay and egprs options are mutual-exclusive%s",
+			VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	trx->cfg.rach_delay_set = true;
+	trx->cfg.rach_delay = atoi(argv[0]);
+	trx->cfg.filler = FILLER_ACCESS_RAND;
+
+	return CMD_SUCCESS;
+}
+
 DEFUN(cfg_clock_ref, cfg_clock_ref_cmd,
 	"clock-ref (internal|external|gpsdo)",
 	"Set the Reference Clock\n"
-	"Enable internal reference (default)\n"
+	"Enable internal referece (default)\n"
 	"Enable external 10 MHz reference\n"
 	"Enable GPSDO reference\n")
 {
@@ -269,6 +300,7 @@ DEFUN(cfg_egprs, cfg_egprs_cmd,
 		trx->cfg.egprs = false;
 	} else if (strcmp("enable", argv[0]) == 0) {
 		trx->cfg.egprs = true;
+		trx->cfg.filler = FILLER_EDGE_RAND;
 	} else {
 		return CMD_WARNING;
 	}
@@ -303,171 +335,14 @@ DEFUN(cfg_rt_prio, cfg_rt_prio_cmd,
 	return CMD_SUCCESS;
 }
 
-DEFUN(cfg_stack_size, cfg_stack_size_cmd,
-	"stack-size <0-2147483647>",
-	"Set the stack size per thread in BYTE, 0 = OS default\n"
-	"Stack size per thread in BYTE\n")
+DEFUN(cfg_filler, cfg_filler_cmd,
+	"filler dummy",
+	"Enable C0 filler table\n"
+	"Dummy method\n")
 {
 	struct trx_ctx *trx = trx_from_vty(vty);
 
-	trx->cfg.stack_size = atoi(argv[0]);
-
-	return CMD_SUCCESS;
-}
-
-DEFUN(cfg_filler, cfg_filler_type_cmd,
-	"filler type (zero|dummy|random-nb-gmsk|random-nb-8psk|random-ab)",
-	"Filler burst settings\n"
-	"Filler burst type (default=zero)\n"
-	"Send an empty burst when there is nothing to send (default)\n"
-	"Send a dummy burst when there is nothing to send on C0 (TRX0) and empty burst on other channels."
-	" Use for OpenBTS compatibility only, don't use with OsmoBTS as it breaks encryption.\n"
-	"Send a GMSK modulated Normal Burst with random bits when there is nothing to send."
-	" Use for spectrum mask testing. Configure 'filler tsc' to set training sequence.\n"
-	"Send an 8-PSK modulated Normal Burst with random bits when there is nothing to send."
-	" Use for spectrum mask testing. Configure 'filler tsc' to set training sequence.\n"
-	"Send an Access Burst with random bits when there is nothing to send. Use for Rx/Tx alignment."
-	" Configure 'filler access-burst-delay' to introduce artificial delay.\n"
-)
-{
-	struct trx_ctx *trx = trx_from_vty(vty);
-	// trx->cfg.filler is unsigned, so we need an interim int var to detect errors
-	int type = get_string_value(filler_types, argv[0]);
-
-	if (type < 0) {
-		trx->cfg.filler = FILLER_ZERO;
-		return CMD_WARNING;
-	}
-	trx->cfg.filler = type;
-
-	return CMD_SUCCESS;
-}
-
-DEFUN(cfg_test_rtsc, cfg_filler_tsc_cmd,
-	"filler tsc <0-7>",
-	"Filler burst settings\n"
-	"Set the TSC for GMSK/8-PSK Normal Burst random fillers. Used only with 'random-nb-gmsk' and"
-	" 'random-nb-8psk' filler types. (default=0)\n"
-	"TSC\n")
-{
-	struct trx_ctx *trx = trx_from_vty(vty);
-
-	trx->cfg.rtsc = atoi(argv[0]);
-
-	return CMD_SUCCESS;
-}
-
-DEFUN(cfg_test_rach_delay, cfg_filler_rach_delay_cmd,
-	"filler access-burst-delay <0-68>",
-	"Filler burst settings\n"
-	"Set the delay for Access Burst random fillers. Used only with 'random-ab' filler type. (default=0)\n"
-	"RACH delay in symbols\n")
-{
-	struct trx_ctx *trx = trx_from_vty(vty);
-
-	trx->cfg.rach_delay = atoi(argv[0]);
-
-	return CMD_SUCCESS;
-}
-
-static int vty_ctr_name_2_id(const char* str) {
-	size_t i;
-	for (i = 0; trx_chan_ctr_names[i].str; i++) {
-		if (strstr(trx_chan_ctr_names[i].str, str)) {
-			return i;
-		}
-	}
-	return -1;
-}
-
-static int vty_intv_name_2_id(const char* str) {
-	size_t i;
-	for (i = 0; rate_ctr_intv[i].str; i++) {
-		if (strcmp(rate_ctr_intv[i].str, str) == 0) {
-			return i;
-		}
-	}
-	return -1;
-}
-
-#define THRESHOLD_ARGS "(rx_overruns|tx_underruns|rx_drop_events|rx_drop_samples|tx_drop_events|tx_drop_samples)"
-#define THRESHOLD_STR_VAL(s) "Set threshold value for rate_ctr device:" OSMO_STRINGIFY_VAL(s) "\n"
-#define THRESHOLD_STRS \
-	THRESHOLD_STR_VAL(rx_overruns) \
-	THRESHOLD_STR_VAL(tx_underruns) \
-	THRESHOLD_STR_VAL(rx_drop_events) \
-	THRESHOLD_STR_VAL(rx_drop_samples) \
-	THRESHOLD_STR_VAL(tx_drop_events) \
-	THRESHOLD_STR_VAL(tx_drop_samples)
-#define INTV_ARGS "(per-second|per-minute|per-hour|per-day)"
-#define INTV_STR_VAL(s) "Threshold value sampled " OSMO_STRINGIFY_VAL(s) "\n"
-#define INTV_STRS \
-	INTV_STR_VAL(per-second) \
-	INTV_STR_VAL(per-minute) \
-	INTV_STR_VAL(per-hour) \
-	INTV_STR_VAL(per-day)
-
-DEFUN(cfg_ctr_error_threshold, cfg_ctr_error_threshold_cmd,
-	"ctr-error-threshold " THRESHOLD_ARGS " <0-65535> " INTV_ARGS,
-	"Threshold rate for error counter\n"
-	THRESHOLD_STRS
-	"Value to set for threshold\n"
-	INTV_STRS)
-{
-	int rc;
-	struct ctr_threshold ctr;
-
-	struct trx_ctx *trx = trx_from_vty(vty);
-	rc = vty_ctr_name_2_id(argv[0]);
-	if (rc < 0) {
-		vty_out(vty, "No valid ctr_name found for ctr-error-threshold %s%s",
-			argv[0], VTY_NEWLINE);
-		return CMD_WARNING;
-	}
-	ctr.ctr_id = (enum TrxCtr)rc;
-	ctr.val = atoi(argv[1]);
-	rc = vty_intv_name_2_id(argv[2]);
-	if (rc < 0) {
-		vty_out(vty, "No valid time frame found for ctr-error-threshold %s %d %s%s",
-			argv[0], ctr.val, argv[2], VTY_NEWLINE);
-		return CMD_WARNING;
-	}
-	ctr.intv = (enum rate_ctr_intv) rc;
-	trx_rate_ctr_threshold_add(&ctr);
-
-	return CMD_SUCCESS;
-}
-
-DEFUN(cfg_no_ctr_error_threshold, cfg_no_ctr_error_threshold_cmd,
-	"no ctr-error-threshold " THRESHOLD_ARGS " <0-65535> " INTV_ARGS,
-	NO_STR "Threshold rate for error counter\n"
-	THRESHOLD_STRS
-	"Value to set for threshold\n"
-	INTV_STRS)
-{
-	int rc;
-	struct ctr_threshold ctr;
-
-	struct trx_ctx *trx = trx_from_vty(vty);
-	rc = vty_ctr_name_2_id(argv[0]);
-	if (rc < 0) {
-		vty_out(vty, "No valid ctr_name found for ctr-error-threshold %s%s",
-			argv[0], VTY_NEWLINE);
-		return CMD_WARNING;
-	}
-	ctr.ctr_id = (enum TrxCtr)rc;
-	ctr.val = atoi(argv[1]);
-	rc = vty_intv_name_2_id(argv[2]);
-	if (rc < 0) {
-		vty_out(vty, "No valid time frame found for ctr-error-threshold %s %d %s%s",
-			argv[0], ctr.val, argv[2], VTY_NEWLINE);
-		return CMD_WARNING;
-	}
-	ctr.intv = (enum rate_ctr_intv) rc;
-	if (trx_rate_ctr_threshold_del(&ctr) < 0) {
-		vty_out(vty, "no ctr-error-threshold: Entry to delete not found%s", VTY_NEWLINE);
-		return CMD_WARNING;
-	}
+	trx->cfg.filler = FILLER_DUMMY;
 
 	return CMD_SUCCESS;
 }
@@ -553,6 +428,10 @@ static int config_write_trx(struct vty *vty)
 		vty_out(vty, " tx-sps %u%s", trx->cfg.tx_sps, VTY_NEWLINE);
 	if (trx->cfg.rx_sps != DEFAULT_RX_SPS)
 		vty_out(vty, " rx-sps %u%s", trx->cfg.rx_sps, VTY_NEWLINE);
+	if (trx->cfg.rtsc_set)
+		vty_out(vty, " test rtsc %u%s", trx->cfg.rtsc, VTY_NEWLINE);
+	if (trx->cfg.rach_delay_set)
+		vty_out(vty, " test rach-delay %u%s", trx->cfg.rach_delay, VTY_NEWLINE);
 	if (trx->cfg.clock_ref != REF_INTERNAL)
 		vty_out(vty, " clock-ref %s%s", get_value_string(clock_ref_names, trx->cfg.clock_ref), VTY_NEWLINE);
 	vty_out(vty, " multi-arfcn %s%s", trx->cfg.multi_arfcn ? "enable" : "disable", VTY_NEWLINE);
@@ -565,15 +444,6 @@ static int config_write_trx(struct vty *vty)
 	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);
-	if (trx->cfg.filler != FILLER_ZERO)
-		vty_out(vty, " filler type %s%s", get_value_string(filler_types, trx->cfg.filler), VTY_NEWLINE);
-	if (trx->cfg.rtsc > 0)
-		vty_out(vty, " filler tsc %u%s", trx->cfg.rtsc, VTY_NEWLINE);
-	if (trx->cfg.rach_delay > 0)
-		vty_out(vty, " filler access-burst-delay %u%s", trx->cfg.rach_delay, VTY_NEWLINE);
-	if (trx->cfg.stack_size != 0)
-		vty_out(vty, " stack-size %u%s", trx->cfg.stack_size, VTY_NEWLINE);
-	trx_rate_ctr_threshold_write_config(vty, " ");
 
 	for (i = 0; i < trx->cfg.num_chans; i++) {
 		chan = &trx->cfg.chans[i];
@@ -598,9 +468,11 @@ static void trx_dump_vty(struct vty *vty, struct trx_ctx *trx)
 	vty_out(vty, " Device args: %s%s", trx->cfg.dev_args, VTY_NEWLINE);
 	vty_out(vty, " Tx Samples-per-Symbol: %u%s", trx->cfg.tx_sps, VTY_NEWLINE);
 	vty_out(vty, " Rx Samples-per-Symbol: %u%s", trx->cfg.rx_sps, VTY_NEWLINE);
-	vty_out(vty, " Filler Burst Type: %s%s", get_value_string(filler_names, trx->cfg.filler), VTY_NEWLINE);
-	vty_out(vty, " Filler Burst TSC: %u%s", trx->cfg.rtsc, VTY_NEWLINE);
-	vty_out(vty, " Filler Burst RACH Delay: %u%s", trx->cfg.rach_delay, VTY_NEWLINE);
+	vty_out(vty, " Test Mode: TSC: %u (%s)%s", trx->cfg.rtsc,
+		trx->cfg.rtsc_set ? "Enabled" : "Disabled", VTY_NEWLINE);
+	vty_out(vty, " Test Mode: RACH Delay: %u (%s)%s", trx->cfg.rach_delay,
+		trx->cfg.rach_delay_set ? "Enabled" : "Disabled", VTY_NEWLINE);
+	vty_out(vty, " C0 Filler Table: %s%s", get_value_string(filler_names, trx->cfg.filler), VTY_NEWLINE);
 	vty_out(vty, " Clock Reference: %s%s", get_value_string(clock_ref_names, trx->cfg.clock_ref), VTY_NEWLINE);
 	vty_out(vty, " Multi-Carrier: %s%s", trx->cfg.multi_arfcn ? "Enabled" : "Disabled", VTY_NEWLINE);
 	vty_out(vty, " Tuning offset: %f%s", trx->cfg.offset, VTY_NEWLINE);
@@ -610,7 +482,6 @@ static void trx_dump_vty(struct vty *vty, struct trx_ctx *trx)
 	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, " Stack size per Thread in BYTE (0 = OS default): %u%s", trx->cfg.stack_size, VTY_NEWLINE);
 	vty_out(vty, " Channels: %u%s", trx->cfg.num_chans, VTY_NEWLINE);
 	for (i = 0; i < trx->cfg.num_chans; i++) {
 		chan = &trx->cfg.chans[i];
@@ -669,7 +540,6 @@ static int trx_vty_go_parent(struct vty *vty)
 static const char trx_copyright[] =
 	"Copyright (C) 2007-2014 Free Software Foundation, Inc.\r\n"
 	"Copyright (C) 2013 Thomas Tsou <tom@tsou.cc>\r\n"
-	"Copyright (C) 2013-2019 Fairwaves, Inc.\r\n"
 	"Copyright (C) 2015 Ettus Research LLC\r\n"
 	"Copyright (C) 2017-2018 by sysmocom s.f.m.c. GmbH <info@sysmocom.de>\r\n"
 	"License AGPLv3+: GNU AGPL version 3 or later <http://gnu.org/licenses/agpl-3.0.html>\r\n"
@@ -712,6 +582,8 @@ int trx_vty_init(struct trx_ctx* trx)
 	install_element(TRX_NODE, &cfg_dev_args_cmd);
 	install_element(TRX_NODE, &cfg_tx_sps_cmd);
 	install_element(TRX_NODE, &cfg_rx_sps_cmd);
+	install_element(TRX_NODE, &cfg_test_rtsc_cmd);
+	install_element(TRX_NODE, &cfg_test_rach_delay_cmd);
 	install_element(TRX_NODE, &cfg_clock_ref_cmd);
 	install_element(TRX_NODE, &cfg_multi_arfcn_cmd);
 	install_element(TRX_NODE, &cfg_offset_cmd);
@@ -720,19 +592,12 @@ int trx_vty_init(struct trx_ctx* trx)
 	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_type_cmd);
-	install_element(TRX_NODE, &cfg_filler_tsc_cmd);
-	install_element(TRX_NODE, &cfg_filler_rach_delay_cmd);
-	install_element(TRX_NODE, &cfg_ctr_error_threshold_cmd);
-	install_element(TRX_NODE, &cfg_no_ctr_error_threshold_cmd);
-	install_element(TRX_NODE, &cfg_stack_size_cmd);
+	install_element(TRX_NODE, &cfg_filler_cmd);
 
 	install_element(TRX_NODE, &cfg_chan_cmd);
 	install_node(&chan_node, dummy_config_write);
 	install_element(CHAN_NODE, &cfg_chan_rx_path_cmd);
 	install_element(CHAN_NODE, &cfg_chan_tx_path_cmd);
 
-	logging_vty_add_deprecated_subsys(g_trx_ctx, "lms");
-
 	return 0;
 }

CommonLibs/trx_vty.h

@@ -5,8 +5,6 @@
 #include "config_defs.h"
 
 extern struct vty_app_info g_vty_info;
-extern const struct value_string clock_ref_names[];
-extern const struct value_string filler_names[];
 
 /* Maximum number of physical RF channels */
 #define TRX_CHAN_MAX 8
@@ -53,7 +51,9 @@ struct trx_ctx {
 		unsigned int tx_sps;
 		unsigned int rx_sps;
 		unsigned int rtsc;
+		bool rtsc_set;
 		unsigned int rach_delay;
+		bool rach_delay_set;
 		enum ReferenceType clock_ref;
 		enum FillerType filler;
 		bool multi_arfcn;
@@ -63,7 +63,6 @@ struct trx_ctx {
 		bool ext_rach;
 		bool egprs;
 		unsigned int sched_rr;
-		unsigned int stack_size;
 		unsigned int num_chans;
 		struct trx_chan chans[TRX_CHAN_MAX];
 	} cfg;

GSM/GSMCommon.cpp

@@ -2,8 +2,6 @@
 * Copyright 2008 Free Software Foundation, Inc.
 * Copyright 2011 Range Networks, Inc.
 *
-* SPDX-License-Identifier: AGPL-3.0+
-*
 * This software is distributed under the terms of the GNU Affero Public License.
 * See the COPYING file in the main directory for details.
 *

GSM/GSMCommon.h

@@ -2,8 +2,6 @@
 /*
 * Copyright 2008-2011 Free Software Foundation, Inc.
 *
-* SPDX-License-Identifier: AGPL-3.0+
-*
 * This software is distributed under the terms of the GNU Affero Public License.
 * See the COPYING file in the main directory for details.
 *

INSTALLATION

@@ -0,0 +1,19 @@
+Installation Requirements
+
+
+
+osmo-trx compiles to a simple Unix binary and does not require special
+installation.
+
+One some systems (Ubuntu), you will need to define LIBS = -lpthread prior to
+running configure.
+
+To run osmo-trx, the following should be installed:
+	libuhd (https://gnuradio.org).
+	This is part of the GNURadio installation.
+
+For information on specific executables, see tests/README.tests and
+apps/README.apps.
+
+See https://osmocom.org/projects/osmotrx/wiki/OsmoTRX for more
+information.

Makefile.am

@@ -36,9 +36,11 @@ SUBDIRS = \
 	tests
 
 EXTRA_DIST = \
+	autogen.sh \
+	INSTALLATION \
 	LEGAL \
 	COPYING \
-	README.md
+	README
 
 AM_DISTCHECK_CONFIGURE_FLAGS = \
 	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)

README

@@ -0,0 +1,116 @@
+This is the interface to the transcevier.
+
+Each TRX Manager UDP socket interface represents a single ARFCN.
+Each of these per-ARFCN interfaces is a pair of UDP sockets, one for control and one for data.
+Give a base port B (5700), the master clock interface is at port P=B.
+The TRX-side control interface for C(N) is on  port P=B+2N+1 and the data interface is on an odd numbered port P=B+2N+2.
+The corresponding core-side interface for every socket is at P+100.
+For any given build, the number of ARFCN interfaces can be fixed.
+
+
+
+Indications on the Master Clock Interface
+
+The master clock interface is output only (from the radio).
+Messages are "indications".
+
+CLOCK gives the current value of the transceiver clock to be used by the core.
+This message is sent whenever a trasmission packet arrives that is too late or too early.  The clock value is NOT the current transceiver time.  It is a time setting the the core should use to give better packet arrival times.
+IND CLOCK <totalFrames>
+
+
+
+Commands on the Per-ARFCN Control Interface
+
+The per-ARFCN control interface uses a command-reponse protocol.
+Commands are NULL-terminated ASCII strings, one per UDP socket.
+Each command has a corresponding response.
+Every command is of the form:
+
+CMD <cmdtype> [params]
+
+The <cmdtype> is the actual command.
+Parameters are optional depending on the commands type.
+Every response is of the form:
+
+RSP <cmdtype> <status> [result]
+
+The <status> is 0 for success and a non-zero error code for failure.
+Successful responses may include results, depending on the command type.
+
+
+Power Control
+
+POWEROFF shuts off transmitter power and stops the demodulator.
+CMD POWEROFF
+RSP POWEROFF <status>
+
+POWERON starts the transmitter and starts the demodulator.  Initial power level is very low.
+This command fails if the transmitter and receiver are not yet tuned.
+This command fails if the transmit or receive frequency creates a conflict with another ARFCN that is already runnng.
+If the transceiver is already on, it response with success to this command.
+CMD POWERON
+RSP POWERON <status>
+
+SETPOWER sets output power in dB wrt full scale.
+This command fails if the transmitter and receiver are not running.
+CMD SETPOWER <dB>
+RSP SETPOWER <status> <dB>
+
+ADJPOWER adjusts power by the given dB step.  Response returns resulting power level wrt full scale.
+This command fails if the transmitter and receiver are not running.
+CMD ADJPOWER <dBStep>
+RSP ADJPOWER <status> <dBLevel>
+
+
+Tuning Control
+
+RXTUNE tunes the receiver to a given frequency in kHz.
+This command fails if the receiver is already running.
+(To re-tune you stop the radio, re-tune, and restart.)
+This command fails if the transmit or receive frequency creates a conflict with another ARFCN that is already runnng.
+CMD RXTUNE <kHz>
+RSP RXTUNE <status> <kHz>
+
+TXTUNE tunes the transmitter to a given frequency in kHz.
+This command fails if the transmitter is already running.
+(To re-tune you stop the radio, re-tune, and restart.)
+This command fails if the transmit or receive frequency creates a conflict with another ARFCN that is already runnng.
+CMD TXTUNE <kHz>
+RSP TXTUNE <status> <kHz>
+
+
+Timeslot Control
+
+SETSLOT sets the format of the uplink timeslots in the ARFCN.
+The <timeslot> indicates the timeslot of interest.
+The <chantype> indicates the type of channel that occupies the timeslot.
+A chantype of zero indicates the timeslot is off.
+CMD SETSLOT <timeslot> <chantype>
+RSP SETSLOT <status> <timeslot> <chantype>
+
+
+Messages on the per-ARFCN Data Interface
+
+Messages on the data interface carry one radio burst per UDP message.
+
+
+Received Data Burst
+
+1 byte timeslot index
+4 bytes GSM frame number, big endian
+1 byte RSSI in -dBm
+2 bytes correlator timing offset in 1/256 symbol steps, 2's-comp, big endian
+148 bytes soft symbol estimates, 0 -> definite "0", 255 -> definite "1"
+
+
+Transmit Data Burst
+
+1 byte timeslot index
+4 bytes GSM frame number, big endian
+1 byte transmit level wrt ARFCN max, -dB (attenuation)
+148 bytes output symbol values, 0 & 1
+
+
+
+

README.md

@@ -1,66 +0,0 @@
-About OsmTRX
-============
-
-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"
-
-OsmoTRX is based on the transceiver code from the
-[OpenBTS](https://osmocom.org/projects/osmobts/wiki/OpenBTS) project, but setup
-to operate independently with the purpose of using with non-OpenBTS software and
-projects, while still maintaining backwards compatibility with OpenBTS when
-possible. Currently there are numerous features contained in OsmoTRX that extend
-the functionality of the OpenBTS transceiver. These features include enhanced
-support for various embedded platforms - notably ARM - and dual channel
-diversity support for the Fairwaves umtrx.
-
-Homepage
---------
-
-The official homepage of the project is
-<https://osmocom.org/projects/osmotrx/wiki/OsmoTRX>
-
-GIT Repository
---------------
-
-You can clone from the official osmo-trx.git repository using
-
-        git clone git://git.osmocom.org/osmo-trx.git
-
-There is a cgit interface at <http://git.osmocom.org/osmo-trx/>
-
-Documentation
--------------
-
-Doxygen-generated API documentation is generated during the build process, but
-also available online for each of the sub-libraries at User Manual for OsmoTRX
-can be generated during the build process, and is also available online at
-<http://ftp.osmocom.org/docs/latest/osmotrx-usermanual.pdf>.
-
-Mailing List
-------------
-
-Discussions related to OsmoTRX are happening on the openbsc@lists.osmocom.org
-mailing list, please see <https://lists.osmocom.org/mailman/listinfo/openbsc>
-for subscription options and the list archive.
-
-Please observe the [Osmocom Mailing List
-Rules](https://osmocom.org/projects/cellular-infrastructure/wiki/Mailing_List_Rules)
-when posting.
-
-Contributing
-------------
-
-Our coding standards are described at
-<https://osmocom.org/projects/cellular-infrastructure/wiki/Coding_standards>
-
-We us a gerrit based patch submission/review process for managing contributions.
-Please see <https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit>
-for more details
-
-The current patch queue for OsmoTRX can be seen at
-<https://gerrit.osmocom.org/q/project:osmo-trx+status:open>

Transceiver52M/Channelizer.cpp

@@ -4,8 +4,6 @@
  * Copyright (C) 2012-2014 Tom Tsou <tom@tsou.cc>
  * Copyright (C) 2015 Ettus Research LLC
  *
- * SPDX-License-Identifier: AGPL-3.0+
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -98,7 +96,7 @@ bool Channelizer::rotate(const float *in, size_t len)
 	return true;
 }
 
-/* Setup channelizer parameters */
+/* Setup channelizer paramaters */
 Channelizer::Channelizer(size_t m, size_t blockLen, size_t hLen)
 	: ChannelizerBase(m, blockLen, hLen)
 {

Transceiver52M/ChannelizerBase.cpp

@@ -4,8 +4,6 @@
  * Copyright (C) 2012-2014 Tom Tsou <tom@tsou.cc>
  * Copyright (C) 2015 Ettus Research LLC 
  *
- * SPDX-License-Identifier: AGPL-3.0+
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -225,11 +223,10 @@ bool ChannelizerBase::checkLen(size_t innerLen, size_t outerLen)
 }
 
 /* 
- * Setup channelizer parameters
+ * Setup channelizer paramaters
  */
 ChannelizerBase::ChannelizerBase(size_t m, size_t blockLen, size_t hLen)
-	: subFilters(NULL), hInputs(NULL), hOutputs(NULL), hist(NULL),
-	  fftInput(NULL), fftOutput(NULL), fftHandle(NULL)
+	: fftInput(NULL), fftOutput(NULL), fftHandle(NULL)
 {
 	this->m = m;
 	this->hLen = hLen;

Transceiver52M/ChannelizerBase.h

@@ -32,7 +32,7 @@ protected:
 	/* Buffer length validity checking */
 	bool checkLen(size_t innerLen, size_t outerLen);
 public:
-	/* Initialize channelizer/synthesis filter internals */
+	/* Initilize channelizer/synthesis filter internals */
 	bool init();
 };
 

Transceiver52M/Complex.h

@@ -5,7 +5,7 @@ unlike the built-in complex<> templates, these inline most operations for speed
 /*
 * Copyright 2008 Free Software Foundation, Inc.
 *
-* This software is distributed under multiple licenses; see the COPYING file in the main directory for licensing information for this specific distribution.
+* This software is distributed under multiple licenses; see the COPYING file in the main directory for licensing information for this specific distribuion.
 *
 * This use of this software may be subject to additional restrictions.
 * See the LEGAL file in the main directory for details.

Transceiver52M/Makefile.am

@@ -25,7 +25,14 @@ SUBDIRS = arch device
 
 AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/arch/common -I${srcdir}/device/common
 AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
-AM_CFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
+
+rev2dir = $(datadir)/usrp/rev2
+rev4dir = $(datadir)/usrp/rev4
+
+dist_rev2_DATA = std_inband.rbf
+dist_rev4_DATA = std_inband.rbf
+
+EXTRA_DIST = README
 
 noinst_LTLIBRARIES = libtransceiver_common.la
 
@@ -39,8 +46,7 @@ COMMON_SOURCES = \
 	Transceiver.cpp \
 	ChannelizerBase.cpp \
 	Channelizer.cpp \
-	Synthesis.cpp \
-	proto_trxd.c
+	Synthesis.cpp
 
 libtransceiver_common_la_SOURCES = \
 	$(COMMON_SOURCES) \
@@ -60,8 +66,7 @@ noinst_HEADERS = \
 	Resampler.h \
 	ChannelizerBase.h \
 	Channelizer.h \
-	Synthesis.h \
-	proto_trxd.h
+	Synthesis.h
 
 COMMON_LDADD = \
 	libtransceiver_common.la \

Transceiver52M/README

@@ -0,0 +1,35 @@
+The Transceiver
+
+The transceiver consists of three modules:
+   --- transceiver
+   --- radioInterface
+   --- USRPDevice
+
+The USRPDevice module is basically a driver that reads/writes
+packets to a USRP with two RFX900 daughterboards, board 
+A is the Tx chain and board B is the Rx chain.  
+
+The radioInterface module is basically an interface b/w the
+transceiver and the USRP.   It operates the basestation clock
+based upon the sample count of received USRP samples.  Packets 
+from the USRP are queued and segmented into GSM bursts that are
+passed up to the transceiver; bursts from the transceiver are
+passed down to the USRP. 
+
+The transceiver basically operates "layer 0" of the GSM stack,
+performing the modulation, detection, and demodulation of GSM 
+bursts.  It communicates with the GSM stack via three UDP sockets,
+one socket for data, one for control messages, and one socket to
+pass clocking information.  The transceiver contains a priority
+queue to sort to-be-transmitted bursts, and a filler table to fill
+in timeslots that do not have bursts in the priority queue.  The
+transceiver tries to stay ahead of the basestation clock, adapting 
+its latency when underruns are reported by the radioInterface/USRP.
+Received bursts (from the radioInterface) pass through a simple 
+energy detector, a RACH or midamble correlator, and a DFE-based demodulator.
+
+NOTE: There's a SWLOOPBACK #define statement, where the USRP is replaced
+with a memory buffer.  In this mode, data written to the USRP is actually stored 
+in a buffer, and read commands to the USRP simply pull data from this buffer.
+This was very useful in early testing, and still may be useful in testing basic
+Transceiver and radioInterface functionality. 

Transceiver52M/Resampler.cpp

@@ -2,8 +2,6 @@
  * Rational Sample Rate Conversion
  * Copyright (C) 2012, 2013  Thomas Tsou <tom@tsou.cc>
  *
- * SPDX-License-Identifier: LGPL-2.1+
- *
  * 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

Transceiver52M/Resampler.h

@@ -2,8 +2,6 @@
  * Rational Sample Rate Conversion
  * Copyright (C) 2012, 2013  Thomas Tsou <tom@tsou.cc>
  *
- * SPDX-License-Identifier: LGPL-2.1+
- *
  * 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
@@ -35,12 +33,12 @@ public:
 	Resampler(size_t p, size_t q, size_t filt_len = 16);
 	~Resampler();
 
-	/* Initialize resampler filterbank.
+	/* Initilize resampler filterbank.
 	 *   @param bw bandwidth factor on filter generation (pre-window)
 	 *   @return false on error, zero otherwise
 	 *
 	 * Automatic setting is to compute the filter to prevent aliasing with
-	 * a Blackman-Harris window. Adjustment is made through a bandwidth
+	 * a Blackman-Harris window. Adjustment is made through a bandwith
 	 * factor to shift the cutoff and/or the constituent filter lengths.
 	 * Calculation of specific rolloff factors or 3-dB cutoff points is
 	 * left as an excersize for the reader.

Transceiver52M/Synthesis.cpp

@@ -4,8 +4,6 @@
  * Copyright (C) 2012-2014 Tom Tsou <tom@tsou.cc>
  * Copyright (C) 2015 Ettus Research LLC
  *
- * SPDX-License-Identifier: AGPL-3.0+
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or

Transceiver52M/Transceiver.cpp

@@ -1,8 +1,6 @@
 /*
 * Copyright 2008, 2009, 2010 Free Software Foundation, Inc.
 *
-* SPDX-License-Identifier: GPL-3.0+
-*
 * This software is distributed under the terms of the GNU Public License.
 * See the COPYING file in the main directory for details.
 *
@@ -24,7 +22,6 @@
 */
 
 #include <stdio.h>
-#include <netinet/in.h>
 #include <iomanip>      // std::setprecision
 #include <fstream>
 #include "Transceiver.h"
@@ -32,11 +29,6 @@
 
 extern "C" {
 #include "osmo_signal.h"
-#include "proto_trxd.h"
-
-#include <osmocom/core/utils.h>
-#include <osmocom/core/socket.h>
-#include <osmocom/core/bits.h>
 }
 
 #ifdef HAVE_CONFIG_H
@@ -123,12 +115,12 @@ Transceiver::Transceiver(int wBasePort,
                          size_t tx_sps, size_t rx_sps, size_t chans,
                          GSM::Time wTransmitLatency,
                          RadioInterface *wRadioInterface,
-                         double wRssiOffset, int wStackSize)
+                         double wRssiOffset)
   : mBasePort(wBasePort), mLocalAddr(TRXAddress), mRemoteAddr(GSMcoreAddress),
-    mClockSocket(-1), mTransmitLatency(wTransmitLatency), mRadioInterface(wRadioInterface),
-    rssiOffset(wRssiOffset), stackSize(wStackSize),
-    mSPSTx(tx_sps), mSPSRx(rx_sps), mChans(chans), mExtRACH(false), mEdge(false),
-    mOn(false), mForceClockInterface(false),
+    mClockSocket(TRXAddress, wBasePort, GSMcoreAddress, wBasePort + 100),
+    mTransmitLatency(wTransmitLatency), mRadioInterface(wRadioInterface),
+    rssiOffset(wRssiOffset), sig_cbfn(NULL),
+    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)
 {
@@ -147,21 +139,14 @@ Transceiver::~Transceiver()
 
   sigProcLibDestroy();
 
-  if (mClockSocket >= 0)
-    close(mClockSocket);
-
   for (size_t i = 0; i < mChans; i++) {
-    if (mControlServiceLoopThreads[i]) {
     mControlServiceLoopThreads[i]->cancel();
     mControlServiceLoopThreads[i]->join();
     delete mControlServiceLoopThreads[i];
-    }
 
     mTxPriorityQueues[i].clear();
-    if (mCtrlSockets[i] >= 0)
-      close(mCtrlSockets[i]);
-    if (mDataSockets[i] >= 0)
-      close(mDataSockets[i]);
+    delete mCtrlSockets[i];
+    delete mDataSockets[i];
   }
 }
 
@@ -180,20 +165,20 @@ bool Transceiver::init(FillerType filler, size_t rtsc, unsigned rach_delay,
   int d_srcport, d_dstport, c_srcport, c_dstport;
 
   if (!mChans) {
-    LOG(FATAL) << "No channels assigned";
+    LOG(ALERT) << "No channels assigned";
     return false;
   }
 
   if (!sigProcLibSetup()) {
-    LOG(FATAL) << "Failed to initialize signal processing library";
+    LOG(ALERT) << "Failed to initialize signal processing library";
     return false;
   }
 
   mExtRACH = ext_rach;
   mEdge = edge;
 
-  mDataSockets.resize(mChans, -1);
-  mCtrlSockets.resize(mChans, -1);
+  mDataSockets.resize(mChans);
+  mCtrlSockets.resize(mChans);
   mControlServiceLoopThreads.resize(mChans);
   mTxPriorityQueueServiceLoopThreads.resize(mChans);
   mRxServiceLoopThreads.resize(mChans);
@@ -201,39 +186,20 @@ bool Transceiver::init(FillerType filler, size_t rtsc, unsigned rach_delay,
   mTxPriorityQueues.resize(mChans);
   mReceiveFIFO.resize(mChans);
   mStates.resize(mChans);
-  mVersionTRXD.resize(mChans);
 
   /* Filler table retransmissions - support only on channel 0 */
   if (filler == FILLER_DUMMY)
     mStates[0].mRetrans = true;
 
   /* Setup sockets */
-  mClockSocket = osmo_sock_init2(AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP,
-				    mLocalAddr.c_str(), mBasePort,
-				    mRemoteAddr.c_str(), mBasePort + 100,
-				    OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT);
-  if (mClockSocket < 0)
-    return false;
-
   for (size_t i = 0; i < mChans; i++) {
     c_srcport = mBasePort + 2 * i + 1;
     c_dstport = mBasePort + 2 * i + 101;
     d_srcport = mBasePort + 2 * i + 2;
     d_dstport = mBasePort + 2 * i + 102;
 
-    mCtrlSockets[i] = osmo_sock_init2(AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP,
-                                      mLocalAddr.c_str(), c_srcport,
-                                      mRemoteAddr.c_str(), c_dstport,
-				      OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT);
-    if (mCtrlSockets[i] < 0)
-      return false;
-
-    mDataSockets[i] = osmo_sock_init2(AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP,
-                                      mLocalAddr.c_str(), d_srcport,
-                                      mRemoteAddr.c_str(), d_dstport,
-				      OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT);
-    if (mCtrlSockets[i] < 0)
-      return false;
+    mCtrlSockets[i] = new UDPSocket(mLocalAddr.c_str(), c_srcport, mRemoteAddr.c_str(), c_dstport);
+    mDataSockets[i] = new UDPSocket(mLocalAddr.c_str(), d_srcport, mRemoteAddr.c_str(), d_dstport);
   }
 
   /* Randomize the central clock */
@@ -245,12 +211,10 @@ bool Transceiver::init(FillerType filler, size_t rtsc, unsigned rach_delay,
 
   /* Start control threads */
   for (size_t i = 0; i < mChans; i++) {
-    TrxChanThParams *params = (TrxChanThParams *)malloc(sizeof(struct TrxChanThParams));
-    params->trx = this;
-    params->num = i;
-    mControlServiceLoopThreads[i] = new Thread(stackSize);
+    TransceiverChannel *chan = new TransceiverChannel(this, i);
+    mControlServiceLoopThreads[i] = new Thread(32768);
     mControlServiceLoopThreads[i]->start((void * (*)(void*))
-                                 ControlServiceLoopAdapter, (void*) params);
+                                 ControlServiceLoopAdapter, (void*) chan);
 
     if (i && filler == FILLER_DUMMY)
       filler = FILLER_ZERO;
@@ -261,6 +225,17 @@ 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
  *
@@ -285,13 +260,13 @@ bool Transceiver::start()
   mLatencyUpdateTime = time;
 
   if (!mRadioInterface->start()) {
-    LOG(FATAL) << "Device failed to start";
+    LOG(ALERT) << "Device failed to start";
     return false;
   }
 
   /* Device is running - launch I/O threads */
-  mRxLowerLoopThread = new Thread(stackSize);
-  mTxLowerLoopThread = new Thread(stackSize);
+  mRxLowerLoopThread = new Thread(32768);
+  mTxLowerLoopThread = new Thread(32768);
   mTxLowerLoopThread->start((void * (*)(void*))
                             TxLowerLoopAdapter,(void*) this);
   mRxLowerLoopThread->start((void * (*)(void*))
@@ -299,19 +274,15 @@ bool Transceiver::start()
 
   /* Launch uplink and downlink burst processing threads */
   for (size_t i = 0; i < mChans; i++) {
-    TrxChanThParams *params = (TrxChanThParams *)malloc(sizeof(struct TrxChanThParams));
-    params->trx = this;
-    params->num = i;
-    mRxServiceLoopThreads[i] = new Thread(stackSize);
+    TransceiverChannel *chan = new TransceiverChannel(this, i);
+    mRxServiceLoopThreads[i] = new Thread(32768);
     mRxServiceLoopThreads[i]->start((void * (*)(void*))
-                            RxUpperLoopAdapter, (void*) params);
+                            RxUpperLoopAdapter, (void*) chan);
 
-    params = (TrxChanThParams *)malloc(sizeof(struct TrxChanThParams));
-    params->trx = this;
-    params->num = i;
-    mTxPriorityQueueServiceLoopThreads[i] = new Thread(stackSize);
+    chan = new TransceiverChannel(this, i);
+    mTxPriorityQueueServiceLoopThreads[i] = new Thread(32768);
     mTxPriorityQueueServiceLoopThreads[i]->start((void * (*)(void*))
-                            TxUpperLoopAdapter, (void*) params);
+                            TxUpperLoopAdapter, (void*) chan);
   }
 
   mForceClockInterface = true;
@@ -371,12 +342,12 @@ void Transceiver::addRadioVector(size_t chan, BitVector &bits,
   radioVector *radio_burst;
 
   if (chan >= mTxPriorityQueues.size()) {
-    LOGCHAN(chan, DTRXDDL, FATAL) << "Invalid channel";
+    LOG(ALERT) << "Invalid channel " << chan;
     return;
   }
 
   if (wTime.TN() > 7) {
-    LOGCHAN(chan, DTRXDDL, FATAL) << "Received burst with invalid slot " << wTime.TN();
+    LOG(ALERT) << "Received burst with invalid slot " << wTime.TN();
     return;
   }
 
@@ -419,7 +390,7 @@ void Transceiver::pushRadioVector(GSM::Time &nowTime)
     state = &mStates[i];
 
     while ((burst = mTxPriorityQueues[i].getStaleBurst(nowTime))) {
-      LOGCHAN(i, DTRXDDL, NOTICE) << "dumping STALE burst in TRX->SDR interface ("
+      LOGCHAN(i, DMAIN, NOTICE) << "dumping STALE burst in TRX->SDR interface ("
                   << burst->getTime() <<" vs " << nowTime << "), retrans=" << state->mRetrans;
       if (state->mRetrans)
         updateFillerTable(i, burst);
@@ -558,8 +529,8 @@ CorrType Transceiver::expectedCorrType(GSM::Time currTime,
       return mExtRACH ? EXT_RACH : RACH;
     else if ((mod52 == 25) || (mod52 == 51))
       return IDLE;
-    else /* Enable 8-PSK burst detection if EDGE is enabled */
-      return mEdge ? EDGE : TSC;
+    else
+      return TSC;
     break;
   }
   case LOOPBACK:
@@ -587,57 +558,44 @@ void writeToFile(radioVector *radio_burst, size_t chan)
 /*
  * Pull bursts from the FIFO and handle according to the slot
  * and burst correlation type. Equalzation is currently disabled.
- * returns 0 on success (bi filled), negative on error (bi content undefined):
- *        -ENOENT: timeslot is off (fn and tn in bi are filled),
- *        -EIO: read error
  */
-int Transceiver::pullRadioVector(size_t chan, struct trx_ul_burst_ind *bi)
+SoftVector *Transceiver::pullRadioVector(GSM::Time &wTime, double &RSSI, bool &isRssiValid,
+                                         double &timingOffset, double &noise,
+                                         size_t chan)
 {
   int rc;
-  struct estim_burst_params ebp;
-  float max = -1.0, avg = 0.0;
-  unsigned max_toa;
+  complex amp;
+  float toa, max = -1.0, avg = 0.0;
   int max_i = -1;
   signalVector *burst;
-  GSM::Time burstTime;
-  SoftVector *rxBurst;
+  SoftVector *bits = NULL;
   TransceiverState *state = &mStates[chan];
+  isRssiValid = false;
 
   /* Blocking FIFO read */
   radioVector *radio_burst = mReceiveFIFO[chan]->read();
-  if (!radio_burst) {
-    LOGCHAN(chan, DTRXDUL, ERROR) << "ReceiveFIFO->read() returned no burst";
-    return -EIO;
-  }
+  if (!radio_burst)
+    return NULL;
 
   /* Set time and determine correlation type */
-  burstTime = radio_burst->getTime();
-  CorrType type = expectedCorrType(burstTime, chan);
+  GSM::Time time = radio_burst->getTime();
+  CorrType type = expectedCorrType(time, chan);
 
-  /* Initialize struct bi */
-  bi->nbits = 0;
-  bi->fn = burstTime.FN();
-  bi->tn = burstTime.TN();
-  bi->rssi = 0.0;
-  bi->toa = 0.0;
-  bi->noise = 0.0;
-  bi->idle = false;
-  bi->modulation = MODULATION_GMSK;
-  bi->tss = 0; /* TODO: we only support tss 0 right now */
-  bi->tsc = 0;
-  bi->ci = 0.0;
+  /* Enable 8-PSK burst detection if EDGE is enabled */
+  if (mEdge && (type == TSC))
+    type = EDGE;
 
   /* Debug: dump bursts to disk */
   /* bits 0-7  - chan 0 timeslots
    * bits 8-15 - chan 1 timeslots */
-  if (mWriteBurstToDiskMask & ((1<<bi->tn) << (8*chan)))
+  if (mWriteBurstToDiskMask & ((1<<time.TN()) << (8*chan)))
     writeToFile(radio_burst, chan);
 
   /* No processing if the timeslot is off.
    * Not even power level or noise calculation. */
   if (type == OFF) {
     delete radio_burst;
-    return -ENOENT;
+    return NULL;
   }
 
   /* Select the diversity channel with highest energy */
@@ -651,65 +609,59 @@ int Transceiver::pullRadioVector(size_t chan, struct trx_ul_burst_ind *bi)
   }
 
   if (max_i < 0) {
-    LOGCHAN(chan, DTRXDUL, FATAL) << "Received empty burst";
-    goto ret_idle;
+    LOG(ALERT) << "Received empty burst";
+    delete radio_burst;
+    return NULL;
   }
 
   /* Average noise on diversity paths and update global levels */
   burst = radio_burst->getVector(max_i);
   avg = sqrt(avg / radio_burst->chans());
 
+  wTime = time;
+  RSSI = 20.0 * log10(rxFullScale / avg);
+
+  /* RSSI estimation are valid */
+  isRssiValid = true;
+
   if (type == IDLE) {
     /* Update noise levels */
     state->mNoises.insert(avg);
     state->mNoiseLev = state->mNoises.avg();
+    noise = 20.0 * log10(rxFullScale / state->mNoiseLev);
+
+    delete radio_burst;
+    return NULL;
+  } else {
+    /* Do not update noise levels */
+    noise = 20.0 * log10(rxFullScale / state->mNoiseLev);
   }
 
-  bi->rssi = 20.0 * log10(rxFullScale / avg) + rssiOffset;
-  bi->noise = 20.0 * log10(rxFullScale / state->mNoiseLev) + rssiOffset;
-
-  if (type == IDLE)
-    goto ret_idle;
-
-  max_toa = (type == RACH || type == EXT_RACH) ?
+  unsigned max_toa = (type == RACH || type == EXT_RACH) ?
                       mMaxExpectedDelayAB : mMaxExpectedDelayNB;
 
   /* Detect normal or RACH bursts */
-  rc = detectAnyBurst(*burst, mTSC, BURST_THRESH, mSPSRx, type, max_toa, &ebp);
-  if (rc <= 0) {
-    if (rc == -SIGERR_CLIP)
-      LOGCHAN(chan, DTRXDUL, NOTICE) << "Clipping detected on received RACH or Normal Burst";
-    else if (rc != SIGERR_NONE)
-      LOGCHAN(chan, DTRXDUL, NOTICE) << "Unhandled RACH or Normal Burst detection error";
-    goto ret_idle;
-  }
+  rc = detectAnyBurst(*burst, mTSC, BURST_THRESH, mSPSRx, type, amp, toa, max_toa);
 
+  if (rc > 0) {
     type = (CorrType) rc;
-  bi->toa = ebp.toa;
-  bi->tsc = ebp.tsc;
-  bi->ci = ebp.ci;
-  rxBurst = demodAnyBurst(*burst, mSPSRx, ebp.amp, ebp.toa, type);
-
-  /* EDGE demodulator returns 444 (gSlotLen * 3) bits */
-  if (rxBurst->size() == EDGE_BURST_NBITS) {
-    bi->modulation = MODULATION_8PSK;
-    bi->nbits = EDGE_BURST_NBITS;
-  } else { /* size() here is actually gSlotLen + 8, due to guard periods */
-    bi->modulation = MODULATION_GMSK;
-    bi->nbits = gSlotLen;
+  } else if (rc <= 0) {
+    if (rc == -SIGERR_CLIP) {
+      LOG(WARNING) << "Clipping detected on received RACH or Normal Burst";
+    } else if (rc != SIGERR_NONE) {
+      LOG(WARNING) << "Unhandled RACH or Normal Burst detection error";
     }
 
-  // Convert -1..+1 soft bits to 0..1 soft bits
-  vectorSlicer(bi->rx_burst, rxBurst->begin(), bi->nbits);
-
-  delete rxBurst;
     delete radio_burst;
-  return 0;
+    return NULL;
+  }
+
+  timingOffset = toa;
+
+  bits = demodAnyBurst(*burst, mSPSRx, amp, toa, type);
 
-ret_idle:
-  bi->idle = true;
   delete radio_burst;
-  return 0;
+  return bits;
 }
 
 void Transceiver::reset()
@@ -750,7 +702,7 @@ static bool match_cmd(char *buf,
   return true;
 }
 
-bool Transceiver::driveControl(size_t chan)
+void Transceiver::driveControl(size_t chan)
 {
   char buffer[MAX_PACKET_LENGTH + 1];
   char response[MAX_PACKET_LENGTH + 1];
@@ -758,19 +710,17 @@ bool Transceiver::driveControl(size_t chan)
   int msgLen;
 
   /* Attempt to read from control socket */
-  msgLen = read(mCtrlSockets[chan], buffer, MAX_PACKET_LENGTH);
-  if (msgLen <= 0) {
-    LOGCHAN(chan, DTRXCTRL, NOTICE) << "mCtrlSockets read(" << mCtrlSockets[chan] << ") failed: " << msgLen;
-    return false;
-  }
+  msgLen = mCtrlSockets[chan]->read(buffer, MAX_PACKET_LENGTH);
+  if (msgLen < 1)
+    return;
 
   /* Zero-terminate received string */
   buffer[msgLen] = '\0';
 
   /* Verify a command signature */
   if (strncmp(buffer, "CMD ", 4)) {
-    LOGCHAN(chan, DTRXCTRL, NOTICE) << "bogus message on control interface";
-    return false;
+    LOGC(DTRXCTRL, WARNING) << "bogus message on control interface";
+    return;
   }
 
   /* Set command pointer */
@@ -794,7 +744,7 @@ bool Transceiver::driveControl(size_t chan)
     unsigned ts = 0, ss = 0;
     sscanf(params, "%u %u", &ts, &ss);
     if (ts > 7 || ss > 7) {
-      sprintf(response, "RSP HANDOVER 1 %u %u", ts, ss);
+      sprintf(response, "RSP NOHANDOVER 1 %u %u", ts, ss);
     } else {
       mHandover[ts][ss] = true;
       sprintf(response, "RSP HANDOVER 0 %u %u", ts, ss);
@@ -854,7 +804,7 @@ bool Transceiver::driveControl(size_t chan)
     sscanf(params, "%d", &freqKhz);
     mRxFreq = freqKhz * 1e3;
     if (!mRadioInterface->tuneRx(mRxFreq, chan)) {
-       LOGCHAN(chan, DTRXCTRL, FATAL) << "RX failed to tune";
+       LOGC(DTRXCTRL, ALERT) << "RX failed to tune";
        sprintf(response,"RSP RXTUNE 1 %d",freqKhz);
     }
     else
@@ -865,7 +815,7 @@ bool Transceiver::driveControl(size_t chan)
     sscanf(params, "%d", &freqKhz);
     mTxFreq = freqKhz * 1e3;
     if (!mRadioInterface->tuneTx(mTxFreq, chan)) {
-       LOGCHAN(chan, DTRXCTRL, FATAL) << "TX failed to tune";
+       LOGC(DTRXCTRL, ALERT) << "TX failed to tune";
        sprintf(response,"RSP TXTUNE 1 %d",freqKhz);
     }
     else
@@ -887,173 +837,146 @@ bool Transceiver::driveControl(size_t chan)
     int  timeslot;
     sscanf(params, "%d %d", &timeslot, &corrCode);
     if ((timeslot < 0) || (timeslot > 7)) {
-      LOGCHAN(chan, DTRXCTRL, NOTICE) << "bogus message on control interface";
+      LOGC(DTRXCTRL, WARNING) << "bogus message on control interface";
       sprintf(response,"RSP SETSLOT 1 %d %d",timeslot,corrCode);
-      return true;
+      return;
     }
     mStates[chan].chanType[timeslot] = (ChannelCombination) corrCode;
     setModulus(timeslot, chan);
     sprintf(response,"RSP SETSLOT 0 %d %d",timeslot,corrCode);
-  } else if (match_cmd(command, "SETFORMAT", &params)) {
-    // set TRXD protocol version
-    unsigned version_recv;
-    sscanf(params, "%u", &version_recv);
-    LOGCHAN(chan, DTRXCTRL, INFO) << "BTS requests TRXD version switch: " << version_recv;
-    if (version_recv > TRX_DATA_FORMAT_VER) {
-      LOGCHAN(chan, DTRXCTRL, INFO) << "rejecting TRXD version " << version_recv
-                                    << "in favor of " <<  TRX_DATA_FORMAT_VER;
-      sprintf(response, "RSP SETFORMAT %u %u", TRX_DATA_FORMAT_VER, version_recv);
-    } else {
-      LOGCHAN(chan, DTRXCTRL, NOTICE) << "switching to TRXD version " << version_recv;
-      mVersionTRXD[chan] = version_recv;
-      sprintf(response, "RSP SETFORMAT %u %u", version_recv, version_recv);
-    }
   } else if (match_cmd(command, "_SETBURSTTODISKMASK", &params)) {
-    // debug command! may change or disappear without notice
+    // debug command! may change or disapear without notice
     // set a mask which bursts to dump to disk
     int mask;
     sscanf(params, "%d", &mask);
     mWriteBurstToDiskMask = mask;
     sprintf(response,"RSP _SETBURSTTODISKMASK 0 %d",mask);
   } else {
-    LOGCHAN(chan, DTRXCTRL, NOTICE) << "bogus command " << command << " on control interface.";
+    LOGC(DTRXCTRL, WARNING) << "bogus command " << command << " on control interface.";
     sprintf(response,"RSP ERR 1");
   }
 
   LOGCHAN(chan, DTRXCTRL, INFO) << "response is '" << response << "'";
-  msgLen = write(mCtrlSockets[chan], response, strlen(response) + 1);
-  if (msgLen <= 0) {
-    LOGCHAN(chan, DTRXCTRL, NOTICE) << "mCtrlSockets write(" << mCtrlSockets[chan] << ") failed: " << msgLen;
-    return false;
-  }
-  return true;
+  mCtrlSockets[chan]->write(response, strlen(response) + 1);
 }
 
 bool Transceiver::driveTxPriorityQueue(size_t chan)
 {
-  int msgLen;
   int burstLen;
-  struct trxd_hdr_v01_dl *dl;
-  char buffer[sizeof(*dl) + EDGE_BURST_NBITS];
-  uint32_t fn;
+  char buffer[EDGE_BURST_NBITS + 50];
 
   // check data socket
-  msgLen = read(mDataSockets[chan], buffer, sizeof(buffer));
-  if (msgLen <= 0) {
-    LOGCHAN(chan, DTRXDDL, NOTICE) << "mDataSockets read(" << mCtrlSockets[chan] << ") failed: " << msgLen;
-    return false;
-  }
+  size_t msgLen = mDataSockets[chan]->read(buffer, sizeof(buffer));
 
-  switch (msgLen) {
-    case sizeof(*dl) + gSlotLen: /* GSM burst */
+  if (msgLen == gSlotLen + 1 + 4 + 1) {
     burstLen = gSlotLen;
-      break;
-    case sizeof(*dl) + EDGE_BURST_NBITS: /* EDGE burst */
-      if (mSPSTx != 4) {
-        LOGCHAN(chan, DTRXDDL, ERROR) << "EDGE burst received but SPS is set to " << mSPSTx;
+  } else if (msgLen == EDGE_BURST_NBITS + 1 + 4 + 1) {
+    if (mSPSTx != 4)
       return false;
-      }
+
     burstLen = EDGE_BURST_NBITS;
-      break;
-    default:
-      LOGCHAN(chan, DTRXDDL, ERROR) << "badly formatted packet on GSM->TRX interface (len="<< msgLen << ")";
+  } else {
+    LOG(ERR) << "badly formatted packet on GSM->TRX interface";
     return false;
   }
 
-  dl = (struct trxd_hdr_v01_dl *) buffer;
+  int timeSlot = (int) buffer[0];
+  uint64_t frameNum = 0;
+  for (int i = 0; i < 4; i++)
+    frameNum = (frameNum << 8) | (0x0ff & buffer[i+1]);
 
-  /* Convert TDMA FN to the host endianness */
-  fn = osmo_load32be(&dl->common.fn);
-
-  /* Make sure we support the received header format */
-  switch (dl->common.version) {
-  case 0:
-  /* Version 1 has the same format */
-  case 1:
-    break;
-  default:
-    LOGCHAN(chan, DTRXDDL, ERROR) << "Rx TRXD message with unknown header version " << unsigned(dl->common.version);
-    return false;
-  }
-
-  LOGCHAN(chan, DTRXDDL, DEBUG) << "Rx TRXD message (hdr_ver=" << unsigned(dl->common.version)
-    << "): fn=" << fn << ", tn=" << unsigned(dl->common.tn) << ", burst_len=" << burstLen;
+  LOG(DEBUG) << "rcvd. burst at: " << GSM::Time(frameNum,timeSlot);
 
+  int RSSI = (int) buffer[5];
   BitVector newBurst(burstLen);
   BitVector::iterator itr = newBurst.begin();
-  uint8_t *bufferItr = dl->soft_bits;
+  char *bufferItr = buffer+6;
   while (itr < newBurst.end())
     *itr++ = *bufferItr++;
 
-  GSM::Time currTime = GSM::Time(fn, dl->common.tn);
+  GSM::Time currTime = GSM::Time(frameNum,timeSlot);
 
-  addRadioVector(chan, newBurst, dl->tx_att, currTime);
+  addRadioVector(chan, newBurst, RSSI, currTime);
 
   return true;
+
+
 }
 
-bool Transceiver::driveReceiveRadio()
+void Transceiver::driveReceiveRadio()
 {
   int rc = mRadioInterface->driveReceiveRadio();
   if (rc == 0) {
     usleep(100000);
-    return true;
-  }
-  if (rc < 0)
-    return false;
-
-  if (mForceClockInterface || mTransmitDeadlineClock > mLastClockUpdateTime + GSM::Time(216,0)) {
+  } 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;
-    return writeClockInterface();
+    writeClockInterface();
   }
-  return true;
 }
 
-void Transceiver::logRxBurst(size_t chan, const struct trx_ul_burst_ind *bi)
+void Transceiver::logRxBurst(size_t chan, SoftVector *burst, GSM::Time time, double dbm,
+                             double rssi, double noise, double toa)
 {
-  std::ostringstream os;
-  for (size_t i=0; i < bi->nbits; i++) {
-    if (bi->rx_burst[i] > 0.5) os << "1";
-    else if (bi->rx_burst[i] > 0.25) os << "|";
-    else if (bi->rx_burst[i] > 0.0) os << "'";
-    else os << "-";
-  }
-
-  LOGCHAN(chan, DTRXDUL, DEBUG) << std::fixed << std::right
-    << " time: "   << unsigned(bi->tn) << ":" << bi->fn
-    << " RSSI: "   << std::setw(5) << std::setprecision(1) << (bi->rssi - rssiOffset)
-                   << "dBFS/" << std::setw(6) << -bi->rssi << "dBm"
-    << " noise: "  << std::setw(5) << std::setprecision(1) << (bi->noise - rssiOffset)
-                   << "dBFS/" << std::setw(6) << -bi->noise << "dBm"
-    << " TOA: "    << std::setw(5) << std::setprecision(2) << bi->toa
-    << " C/I: "    << std::setw(5) << std::setprecision(2) << bi->ci << "dB"
-    << " bits: "   << os;
+  LOG(DEBUG) << std::fixed << std::right
+    << " chan: "   << chan
+    << " time: "   << time
+    << " RSSI: "   << std::setw(5) << std::setprecision(1) << rssi
+                   << "dBFS/" << std::setw(6) << -dbm << "dBm"
+    << " noise: "  << std::setw(5) << std::setprecision(1) << noise
+                   << "dBFS/" << std::setw(6) << -(noise + rssiOffset) << "dBm"
+    << " TOA: "    << std::setw(5) << std::setprecision(2) << toa
+    << " bits: "   << *burst;
 }
 
-bool Transceiver::driveReceiveFIFO(size_t chan)
+void Transceiver::driveReceiveFIFO(size_t chan)
 {
-  struct trx_ul_burst_ind bi;
-  int rc;
+  SoftVector *rxBurst = NULL;
+  double RSSI; // in dBFS
+  double dBm;  // in dBm
+  double TOA;  // in symbols
+  int TOAint;  // in 1/256 symbols
+  double noise; // noise level in dBFS
+  GSM::Time burstTime;
+  bool isRssiValid; // are RSSI, noise and burstTime valid
+  unsigned nbits = gSlotLen;
 
-  if ((rc = pullRadioVector(chan, &bi)) < 0) {
-    if (rc == -ENOENT) { /* timeslot off, continue processing */
-      LOGCHAN(chan, DTRXDUL, DEBUG) << unsigned(bi.tn) << ":" << bi.fn << " timeslot is off";
-      return true;
-    }
-    return false; /* other errors: we want to stop the process */
-  }
+  rxBurst = pullRadioVector(burstTime, RSSI, isRssiValid, TOA, noise, chan);
+  if (!rxBurst)
+    return;
 
-  if (!bi.idle)
-    logRxBurst(chan, &bi);
+  // Convert -1..+1 soft bits to 0..1 soft bits
+  vectorSlicer(rxBurst);
 
-  switch (mVersionTRXD[chan]) {
-    case 0:
-      return trxd_send_burst_ind_v0(chan, mDataSockets[chan], &bi);
-    case 1:
-      return trxd_send_burst_ind_v1(chan, mDataSockets[chan], &bi);
-    default:
-      OSMO_ASSERT(false);
-  }
+  /*
+   * EDGE demodulator returns 444 (148 * 3) bits
+   */
+  if (rxBurst->size() == gSlotLen * 3)
+    nbits = gSlotLen * 3;
+
+  dBm = RSSI + rssiOffset;
+  logRxBurst(chan, rxBurst, burstTime, dBm, RSSI, noise, TOA);
+
+  TOAint = (int) (TOA * 256.0 + 0.5); // round to closest integer
+
+  char burstString[nbits + 10];
+  burstString[0] = burstTime.TN();
+  for (int i = 0; i < 4; i++)
+    burstString[1+i] = (burstTime.FN() >> ((3-i)*8)) & 0x0ff;
+  burstString[5] = (int)dBm;
+  burstString[6] = (TOAint >> 8) & 0x0ff;
+  burstString[7] = TOAint & 0x0ff;
+  SoftVector::iterator burstItr = rxBurst->begin();
+
+  for (unsigned i = 0; i < nbits; i++)
+    burstString[8 + i] = (char) round((*burstItr++) * 255.0);
+
+  burstString[nbits + 9] = '\0';
+  delete rxBurst;
+
+  mDataSockets[chan]->write(burstString, nbits + 10);
 }
 
 void Transceiver::driveTxFIFO()
@@ -1074,7 +997,7 @@ void Transceiver::driveTxFIFO()
 
   if (mOn) {
     //radioClock->wait(); // wait until clock updates
-    LOGC(DTRXCLK, DEBUG) << "radio clock " << radioClock->get();
+    LOG(DEBUG) << "radio clock " << radioClock->get();
     while (radioClock->get() + mTransmitLatency > mTransmitDeadlineClock) {
       // if underrun, then we're not providing bursts to radio/USRP fast
       //   enough.  Need to increase latency by one GSM frame.
@@ -1083,9 +1006,8 @@ 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);
-            LOGC(DTRXCLK, INFO) << "new latency: " << mTransmitLatency << " (underrun "
-                                << radioClock->get() << " vs "
-                                << mLatencyUpdateTime + GSM::Time(USB_LATENCY_INTRVL) << ")";
+            LOG(INFO) << "new latency: " << mTransmitLatency << " (underrun "
+                      << radioClock->get() << " vs " << mLatencyUpdateTime + GSM::Time(USB_LATENCY_INTRVL) << ")";
             mLatencyUpdateTime = radioClock->get();
           }
         }
@@ -1095,7 +1017,7 @@ void Transceiver::driveTxFIFO()
           if (mTransmitLatency > mRadioInterface->minLatency()) {
               if (radioClock->get() > mLatencyUpdateTime + GSM::Time(216,0)) {
               mTransmitLatency.decTN();
-              LOGC(DTRXCLK, INFO) << "reduced latency: " << mTransmitLatency;
+              LOG(INFO) << "reduced latency: " << mTransmitLatency;
               mLatencyUpdateTime = radioClock->get();
             }
           }
@@ -1112,42 +1034,35 @@ void Transceiver::driveTxFIFO()
 
 
 
-bool Transceiver::writeClockInterface()
+void Transceiver::writeClockInterface()
 {
-  int msgLen;
   char command[50];
   // FIXME -- This should be adaptive.
   sprintf(command,"IND CLOCK %llu",(unsigned long long) (mTransmitDeadlineClock.FN()+2));
 
-  LOGC(DTRXCLK, INFO) << "sending " << command;
+  LOG(INFO) << "ClockInterface: sending " << command;
 
-  msgLen = write(mClockSocket, command, strlen(command) + 1);
-  if (msgLen <= 0) {
-    LOGC(DTRXCLK, ERROR) << "mClockSocket write(" << mClockSocket << ") failed: " << msgLen;
-    return false;
-  }
+  mClockSocket.write(command, strlen(command) + 1);
 
   mLastClockUpdateTime = mTransmitDeadlineClock;
-  return true;
+
 }
 
-void *RxUpperLoopAdapter(TrxChanThParams *params)
+void *RxUpperLoopAdapter(TransceiverChannel *chan)
 {
   char thread_name[16];
-  Transceiver *trx = params->trx;
-  size_t num = params->num;
+  Transceiver *trx = chan->trx;
+  size_t num = chan->num;
 
-  free(params);
+  delete chan;
 
   snprintf(thread_name, 16, "RxUpper%zu", num);
   set_selfthread_name(thread_name);
 
+  trx->setPriority(0.42);
+
   while (1) {
-    if (!trx->driveReceiveFIFO(num)) {
-      LOGCHAN(num, DTRXDUL, FATAL) << "Something went wrong in thread " << thread_name << ", requesting stop";
-      osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL);
-      break;
-    }
+    trx->driveReceiveFIFO(num);
     pthread_testcancel();
   }
   return NULL;
@@ -1157,12 +1072,10 @@ void *RxLowerLoopAdapter(Transceiver *transceiver)
 {
   set_selfthread_name("RxLower");
 
+  transceiver->setPriority(0.45);
+
   while (1) {
-    if (!transceiver->driveReceiveRadio()) {
-      LOGC(DTRXDUL, FATAL) << "Something went wrong in thread RxLower, requesting stop";
-      osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL);
-      break;
-    }
+    transceiver->driveReceiveRadio();
     pthread_testcancel();
   }
   return NULL;
@@ -1172,6 +1085,8 @@ void *TxLowerLoopAdapter(Transceiver *transceiver)
 {
   set_selfthread_name("TxLower");
 
+  transceiver->setPriority(0.44);
+
   while (1) {
     transceiver->driveTxFIFO();
     pthread_testcancel();
@@ -1179,45 +1094,39 @@ void *TxLowerLoopAdapter(Transceiver *transceiver)
   return NULL;
 }
 
-void *ControlServiceLoopAdapter(TrxChanThParams *params)
+void *ControlServiceLoopAdapter(TransceiverChannel *chan)
 {
   char thread_name[16];
-  Transceiver *trx = params->trx;
-  size_t num = params->num;
+  Transceiver *trx = chan->trx;
+  size_t num = chan->num;
 
-  free(params);
+  delete chan;
 
   snprintf(thread_name, 16, "CtrlService%zu", num);
   set_selfthread_name(thread_name);
 
   while (1) {
-    if (!trx->driveControl(num)) {
-      LOGCHAN(num, DTRXCTRL, FATAL) << "Something went wrong in thread " << thread_name << ", requesting stop";
-      osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL);
-      break;
-    }
+    trx->driveControl(num);
     pthread_testcancel();
   }
   return NULL;
 }
 
-void *TxUpperLoopAdapter(TrxChanThParams *params)
+void *TxUpperLoopAdapter(TransceiverChannel *chan)
 {
   char thread_name[16];
-  Transceiver *trx = params->trx;
-  size_t num = params->num;
+  Transceiver *trx = chan->trx;
+  size_t num = chan->num;
 
-  free(params);
+  delete chan;
 
   snprintf(thread_name, 16, "TxUpper%zu", num);
   set_selfthread_name(thread_name);
 
+  trx->setPriority(0.40);
+
   while (1) {
-    if (!trx->driveTxPriorityQueue(num)) {
-      LOGCHAN(num, DTRXDDL, FATAL) << "Something went wrong in thread " << thread_name << ", requesting stop";
-      osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL);
-      break;
-    }
+    trx->driveTxPriorityQueue(num);
     pthread_testcancel();
   }
   return NULL;

Transceiver52M/Transceiver.h

@@ -1,8 +1,6 @@
 /*
 * Copyright 2008 Free Software Foundation, Inc.
 *
-* SPDX-License-Identifier: GPL-3.0+
-*
 * This software is distributed under the terms of the GNU Public License.
 * See the COPYING file in the main directory for details.
 *
@@ -27,6 +25,7 @@
 #include "radioInterface.h"
 #include "Interthread.h"
 #include "GSMCommon.h"
+#include "Sockets.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -39,7 +38,17 @@ extern "C" {
 class Transceiver;
 
 /** Channel descriptor for transceiver object and channel number pair */
-struct TrxChanThParams {
+struct TransceiverChannel {
+  TransceiverChannel(Transceiver *trx, int num)
+  {
+    this->trx = trx;
+    this->num = num;
+  }
+
+  ~TransceiverChannel()
+  {
+  }
+
   Transceiver *trx;
   size_t num;
 };
@@ -99,7 +108,7 @@ public:
               size_t tx_sps, size_t rx_sps, size_t chans,
               GSM::Time wTransmitLatency,
               RadioInterface *wRadioInterface,
-              double wRssiOffset, int stackSize);
+              double wRssiOffset);
 
   /** Destructor */
   ~Transceiver();
@@ -121,6 +130,8 @@ 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
@@ -146,9 +157,9 @@ private:
   std::string mLocalAddr;
   std::string mRemoteAddr;
 
-  std::vector<int> mDataSockets;  ///< socket for writing to/reading from GSM core
-  std::vector<int> mCtrlSockets;  ///< socket for writing/reading control commands from GSM core
-  int mClockSocket;               ///< socket for writing clock updates to GSM core
+  std::vector<UDPSocket *> mDataSockets;  ///< socket for writing to/reading from GSM core
+  std::vector<UDPSocket *> mCtrlSockets;  ///< socket for writing/reading control commands from GSM core
+  UDPSocket mClockSocket;                 ///< socket for writing clock updates to GSM core
 
   std::vector<VectorQueue> mTxPriorityQueues;   ///< priority queue of transmit bursts received from GSM core
   std::vector<VectorFIFO *>  mReceiveFIFO;      ///< radioInterface FIFO of receive bursts
@@ -169,7 +180,8 @@ private:
   double rxFullScale;                     ///< full scale output to radio
 
   double rssiOffset;                      ///< RSSI to dBm conversion offset
-  int stackSize;                      ///< stack size for threads, 0 = OS default
+
+  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,
@@ -182,7 +194,9 @@ private:
   void pushRadioVector(GSM::Time &nowTime);
 
   /** Pull and demodulate a burst from the receive FIFO */
-  int pullRadioVector(size_t chan, struct trx_ul_burst_ind *ind);
+  SoftVector *pullRadioVector(GSM::Time &wTime, double &RSSI, bool &isRssiValid,
+                              double &timingOffset, double &noise,
+                              size_t chan = 0);
 
   /** Set modulus for specific timeslot */
   void setModulus(size_t timeslot, size_t chan);
@@ -191,7 +205,7 @@ private:
   CorrType expectedCorrType(GSM::Time currTime, size_t chan);
 
   /** send messages over the clock socket */
-  bool writeClockInterface(void);
+  void writeClockInterface(void);
 
   int mSPSTx;                          ///< number of samples per Tx symbol
   int mSPSRx;                          ///< number of samples per Rx symbol
@@ -209,28 +223,27 @@ private:
   unsigned mMaxExpectedDelayNB;        ///< maximum expected time-of-arrival offset in GSM symbols for Normal Bursts
   unsigned mWriteBurstToDiskMask;      ///< debug: bitmask to indicate which timeslots to dump to disk
 
-  std::vector<unsigned> mVersionTRXD;  ///< Format version to use for TRXD protocol communication, per channel
   std::vector<TransceiverState> mStates;
 
   /** Start and stop I/O threads through the control socket API */
   bool start();
   void stop();
 
-  /** Protect destructor accessible stop call */
+  /** Protect destructor accessable stop call */
   Mutex mLock;
 
 protected:
   /** drive lower receive I/O and burst generation */
-  bool driveReceiveRadio();
+  void driveReceiveRadio();
 
   /** drive demodulation of GSM bursts */
-  bool driveReceiveFIFO(size_t chan);
+  void driveReceiveFIFO(size_t chan);
 
   /** drive transmission of GSM bursts */
   void driveTxFIFO();
 
   /** drive handling of control messages from GSM core */
-  bool driveControl(size_t chan);
+  void driveControl(size_t chan);
 
   /**
     drive modulation and sorting of GSM bursts from GSM core
@@ -238,26 +251,34 @@ protected:
   */
   bool driveTxPriorityQueue(size_t chan);
 
-  friend void *RxUpperLoopAdapter(TrxChanThParams *params);
-  friend void *TxUpperLoopAdapter(TrxChanThParams *params);
-  friend void *RxLowerLoopAdapter(Transceiver *transceiver);
-  friend void *TxLowerLoopAdapter(Transceiver *transceiver);
-  friend void *ControlServiceLoopAdapter(TrxChanThParams *params);
+  friend void *RxUpperLoopAdapter(TransceiverChannel *);
+
+  friend void *TxUpperLoopAdapter(TransceiverChannel *);
+
+  friend void *RxLowerLoopAdapter(Transceiver *);
+
+  friend void *TxLowerLoopAdapter(Transceiver *);
+
+  friend void *ControlServiceLoopAdapter(TransceiverChannel *);
 
 
   void reset();
 
-  void logRxBurst(size_t chan, const struct trx_ul_burst_ind *bi);
+  /** set priority on current thread */
+  void setPriority(float prio = 0.5) { mRadioInterface->setPriority(prio); }
+
+  void logRxBurst(size_t chan, SoftVector *burst, GSM::Time time, double dbm,
+                  double rssi, double noise, double toa);
 };
 
-void *RxUpperLoopAdapter(TrxChanThParams *params);
+void *RxUpperLoopAdapter(TransceiverChannel *);
 
 /** Main drive threads */
-void *RxLowerLoopAdapter(Transceiver *transceiver);
-void *TxLowerLoopAdapter(Transceiver *transceiver);
+void *RxLowerLoopAdapter(Transceiver *);
+void *TxLowerLoopAdapter(Transceiver *);
 
 /** control message handler thread loop */
-void *ControlServiceLoopAdapter(TrxChanThParams *params);
+void *ControlServiceLoopAdapter(TransceiverChannel *);
 
 /** transmit queueing thread loop */
-void *TxUpperLoopAdapter(TrxChanThParams *params);
+void *TxUpperLoopAdapter(TransceiverChannel *);

Transceiver52M/arch/arm/convert.c

@@ -2,8 +2,6 @@
  * NEON type conversions
  * Copyright (C) 2012, 2013 Thomas Tsou <tom@tsou.cc>
  *
- * SPDX-License-Identifier: LGPL-2.1+
- *
  * 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

Transceiver52M/arch/arm/convert_neon.S

@@ -2,8 +2,6 @@
  * NEON type conversions
  * Copyright (C) 2012, 2013 Thomas Tsou <tom@tsou.cc>
  *
- * SPDX-License-Identifier: LGPL-2.1+
- *
  * 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

Transceiver52M/arch/arm/convolve.c

@@ -2,8 +2,6 @@
  * NEON Convolution
  * Copyright (C) 2012, 2013 Thomas Tsou <tom@tsou.cc>
  *
- * SPDX-License-Identifier: LGPL-2.1+
- *
  * 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
@@ -58,7 +56,7 @@ static void neon_conv_cmplx_4n(float *x, float *h, float *y, int h_len, int len)
 }
 #endif
 
-/* API: Initialize convolve module */
+/* API: Initalize convolve module */
 void convolve_init(void)
 {
 	/* Stub */

Transceiver52M/arch/arm/convolve_neon.S

@@ -2,8 +2,6 @@
  * NEON Convolution
  * Copyright (C) 2012, 2013 Thomas Tsou <tom@tsou.cc>
  *
- * SPDX-License-Identifier: LGPL-2.1+
- *
  * 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

Transceiver52M/arch/arm/mult.c

@@ -2,8 +2,6 @@
  * NEON scaling
  * Copyright (C) 2012,2013 Thomas Tsou <tom@tsou.cc>
  *
- * SPDX-License-Identifier: LGPL-2.1+
- *
  * 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

Transceiver52M/arch/arm/mult_neon.S

@@ -2,8 +2,6 @@
  * NEON complex multiplication 
  * Copyright (C) 2012,2013 Thomas Tsou <tom@tsou.cc>
  *
- * SPDX-License-Identifier: LGPL-2.1+
- *
  * 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

Transceiver52M/arch/arm/scale.c

@@ -2,8 +2,6 @@
  * NEON scaling
  * Copyright (C) 2012,2013 Thomas Tsou <tom@tsou.cc>
  *
- * SPDX-License-Identifier: LGPL-2.1+
- *
  * 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

Transceiver52M/arch/arm/scale_neon.S

@@ -2,8 +2,6 @@
  * ARM NEON Scaling
  * Copyright (C) 2013 Thomas Tsou <tom@tsou.cc>
  *
- * SPDX-License-Identifier: LGPL-2.1+
- *
  * 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

Transceiver52M/arch/common/convert_base.c

@@ -2,8 +2,6 @@
  * Conversion
  * Copyright (C) 2012, 2013 Thomas Tsou <tom@tsou.cc>
  *
- * SPDX-License-Identifier: LGPL-2.1+
- *
  * 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
@@ -33,3 +31,4 @@ void base_convert_short_float(float *out, const short *in, int len)
 	for (int i = 0; i < len; i++)
 		out[i] = in[i];
 }
+

Transceiver52M/arch/common/convolve_base.c

@@ -2,8 +2,6 @@
  * Convolution
  * Copyright (C) 2012, 2013 Thomas Tsou <tom@tsou.cc>
  *
- * SPDX-License-Identifier: LGPL-2.1+
- *
  * 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

Transceiver52M/arch/common/fft.c

@@ -3,8 +3,6 @@
  *
  * Copyright (C) 2012 Tom Tsou <tom@tsou.cc>
  * 
- * SPDX-License-Identifier: LGPL-2.1+
- *
  * 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
@@ -103,7 +101,7 @@ void free_fft(struct fft_hdl *hdl)
 }
 
 /*! \brief Run multiple DFT operations with the initialized plan
- *  \param[in] hdl handle to an initialized fft struct
+ *  \param[in] hdl handle to an intitialized fft struct
  *
  * Input and output buffers are configured with init_fft().
  */

Transceiver52M/arch/x86/convert.c

@@ -27,7 +27,7 @@
 #include "config.h"
 #endif
 
-/* Architecture dependent function pointers */
+/* Architecture dependant function pointers */
 struct convert_cpu_context {
 	void (*convert_si16_ps_16n) (float *, const short *, int);
 	void (*convert_si16_ps) (float *, const short *, int);

Transceiver52M/arch/x86/convolve.c

@@ -27,7 +27,7 @@
 #include "config.h"
 #endif
 
-/* Architecture dependent function pointers */
+/* Architecture dependant function pointers */
 struct convolve_cpu_context {
 	void (*conv_cmplx_4n) (const float *, int, const float *, int, float *,
 			       int, int, int);
@@ -66,7 +66,7 @@ int _base_convolve_complex(const float *x, int x_len,
 int bounds_check(int x_len, int h_len, int y_len,
 		 int start, int len);
 
-/* API: Initialize convolve module */
+/* API: Initalize convolve module */
 void convolve_init(void)
 {
 	c.conv_cmplx_4n = (void *)_base_convolve_complex;

Transceiver52M/device/common/radioDevice.h

@@ -1,7 +1,7 @@
 /*
 * Copyright 2008 Free Software Foundation, Inc.
 *
-* This software is distributed under multiple licenses; see the COPYING file in the main directory for licensing information for this specific distribution.
+* This software is distributed under multiple licenses; see the COPYING file in the main directory for licensing information for this specific distribuion.
 *
 * This use of this software may be subject to additional restrictions.
 * See the LEGAL file in the main directory for details.
@@ -23,7 +23,6 @@
 
 extern "C" {
 #include "config_defs.h"
-#include "osmo_signal.h"
 }
 
 #ifdef HAVE_CONFIG_H
@@ -70,6 +69,9 @@ class RadioDevice {
   /** Get the Tx window type */
   virtual enum TxWindowType getWindowType()=0;
 
+  /** Enable thread priority */
+  virtual void setPriority(float prio = 0.5) = 0;
+
   /**
 	Read samples from the radio.
 	@param buf preallocated buf to contain read result
@@ -77,20 +79,23 @@ class RadioDevice {
 	@param overrun Set if read buffer has been overrun, e.g. data not being read fast enough
 	@param timestamp The timestamp of the first samples to be read
 	@param underrun Set if radio does not have data to transmit, e.g. data not being sent fast enough
+	@param RSSI The received signal strength of the read result
 	@return The number of samples actually read
   */
   virtual int readSamples(std::vector<short *> &bufs, int len, bool *overrun,
-                          TIMESTAMP timestamp = 0xffffffff, bool *underrun = 0) = 0;
+                          TIMESTAMP timestamp = 0xffffffff, bool *underrun = 0,
+                          unsigned *RSSI = 0) = 0;
   /**
         Write samples to the radio.
         @param buf Contains the data to be written.
         @param len number of samples to write.
         @param underrun Set if radio does not have data to transmit, e.g. data not being sent fast enough
         @param timestamp The timestamp of the first sample of the data buffer.
+        @param isControl Set if data is a control packet, e.g. a ping command
         @return The number of samples actually written
   */
   virtual int writeSamples(std::vector<short *> &bufs, int len, bool *underrun,
-                           TIMESTAMP timestamp) = 0;
+                           TIMESTAMP timestamp, bool isControl = false) = 0;
 
   /** Update the alignment between the read and write timestamps */
   virtual bool updateAlignment(TIMESTAMP timestamp)=0;
@@ -128,9 +133,6 @@ class RadioDevice {
   /** sets the transmit chan gain, returns the gain setting **/
   virtual double setTxGain(double dB, size_t chan = 0) = 0;
 
-  /** get transmit gain */
-  virtual double getTxGain(size_t chan = 0) = 0;
-
   /** return maximum Tx Gain **/
   virtual double maxTxGain(void) = 0;
 
@@ -166,25 +168,13 @@ class RadioDevice {
   size_t chans;
   double lo_offset;
   std::vector<std::string> tx_paths, rx_paths;
-  std::vector<struct device_counters> m_ctr;
 
-  RadioDevice(size_t tx_sps, size_t rx_sps, InterfaceType type, size_t chan_num, double offset,
+  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(chan_num), lo_offset(offset),
+		tx_sps(tx_sps), rx_sps(rx_sps), iface(type), chans(chans), lo_offset(offset),
 		tx_paths(tx_paths), rx_paths(rx_paths)
-	{
-		if (iface == MULTI_ARFCN) {
-			LOGC(DDEV, INFO) << "Multi-ARFCN: "<< chan_num << " logical chans -> 1 physical chans";
-			chans = 1;
-		}
-
-		m_ctr.resize(chans);
-		for (size_t i = 0; i < chans; i++) {
-			memset(&m_ctr[i], 0, sizeof(m_ctr[i]));
-			m_ctr[i].chan = i;
-		}
-	}
+	{ }
 
   bool set_antennas() {
 	unsigned int i;
@@ -192,9 +182,9 @@ class RadioDevice {
 	for (i = 0; i < tx_paths.size(); i++) {
 		if (tx_paths[i] == "")
 			continue;
-		LOGCHAN(i, DDEV, DEBUG) << "Configuring Tx antenna " << tx_paths[i];
+		LOG(DEBUG) << "Configuring channel " << i << " with antenna " << tx_paths[i];
 		if (!setTxAntenna(tx_paths[i], i)) {
-			LOGCHAN(i, DDEV, ALERT) << "Failed configuring Tx antenna " << tx_paths[i];
+			LOG(ALERT) << "Failed configuring channel " << i << " with antenna " << tx_paths[i];
 			return false;
 		}
 	}
@@ -202,9 +192,9 @@ class RadioDevice {
 	for (i = 0; i < rx_paths.size(); i++) {
 		if (rx_paths[i] == "")
 			continue;
-		LOGCHAN(i, DDEV, DEBUG) << "Configuring Rx antenna " << rx_paths[i];
+		LOG(DEBUG) << "Configuring channel " << i << " with antenna " << rx_paths[i];
 		if (!setRxAntenna(rx_paths[i], i)) {
-			LOGCHAN(i, DDEV, ALERT) << "Failed configuring Rx antenna " << rx_paths[i];
+			LOG(ALERT) << "Failed configuring channel " << i << " with antenna " << rx_paths[i];
 			return false;
 		}
 	}

Transceiver52M/device/common/smpl_buf.cpp

@@ -7,8 +7,6 @@
  *
  * Author: Tom Tsou <tom.tsou@ettus.com>
  *
- * SPDX-License-Identifier: AGPL-3.0+
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -154,7 +152,7 @@ std::string smpl_buf::str_status(TIMESTAMP timestamp) const
 	return ost.str();
 }
 
-std::string smpl_buf::str_code(int code)
+std::string smpl_buf::str_code(ssize_t code)
 {
 	switch (code) {
 	case ERROR_TIMESTAMP:
@@ -166,8 +164,6 @@ std::string smpl_buf::str_code(int code)
 	case ERROR_OVERFLOW:
 		return "Sample buffer: Overrun";
 	default:
-		std::stringstream ss;
-		ss << "Sample buffer: Unknown error " << code;
-		return ss.str();
+		return "Sample buffer: Unknown error";
 	}
 }

Transceiver52M/device/common/smpl_buf.h

@@ -7,8 +7,6 @@
  *
  * Author: Tom Tsou <tom.tsou@ettus.com>
  *
- * SPDX-License-Identifier: AGPL-3.0+
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -33,7 +31,7 @@
 /*
     Sample Buffer - Allows reading and writing of timed samples using osmo-trx
                     timestamps. Time conversions are handled
-                    internally or accessible through the static convert calls.
+                    internally or accessable through the static convert calls.
 */
 class smpl_buf {
 public:
@@ -68,7 +66,7 @@ public:
 	    @param code an error code
 	    @return a formatted error string
 	*/
-	static std::string str_code(int code);
+	static std::string str_code(ssize_t code);
 
 	enum err_code {
 		ERROR_TIMESTAMP = -1,

Transceiver52M/device/lms/LMSDevice.cpp

@@ -1,7 +1,5 @@
 /*
 * Copyright 2018 sysmocom - s.f.m.c. GmbH
-*
-* SPDX-License-Identifier: AGPL-3.0+
 *
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published by
@@ -20,10 +18,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
-
-#include <map>
-
-#include "trx_vty.h"
 #include "Logger.h"
 #include "Threads.h"
 #include "LMSDevice.h"
@@ -31,10 +25,7 @@
 
 #include <lime/LimeSuite.h>
 
-extern "C" {
-#include "osmo_signal.h"
 #include <osmocom/core/utils.h>
-}
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -42,89 +33,32 @@ extern "C" {
 
 using namespace std;
 
+constexpr double LMSDevice::masterClockRate;
+
 #define MAX_ANTENNA_LIST_SIZE 10
+#define LMS_SAMPLE_RATE GSMRATE*32
 #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 */
 
-
-/* Device Name Prefixes as presented by LimeSuite API LMS_GetDeviceInfo(): */
-#define LMS_DEV_SDR_USB_PREFIX_NAME "LimeSDR-USB"
-#define LMS_DEV_SDR_MINI_PREFIX_NAME "LimeSDR-Mini"
-#define LMS_DEV_NET_MICRO_PREFIX_NAME "LimeNET-Micro"
-
-/* Device parameter descriptor */
-struct dev_desc {
-	/* Does LimeSuite allow switching the clock source for this device?
-	 * LimeSDR-Mini does not have switches but needs soldering to select
-	 * external/internal clock. Any call to LMS_SetClockFreq() will fail.
-	 */
-	bool clock_src_switchable;
-	/* Does LimeSuite allow using REF_INTERNAL for this device?
-	 * LimeNET-Micro does not like selecting internal clock
-	 */
-	bool clock_src_int_usable;
-	/* Device specific maximum tx levels selected by phasenoise measurements, in dB */
-	double max_tx_gain;
-	/* Sample rate coef (without having TX/RX samples per symbol into account) */
-	double rate;
-	/* Sample rate coef (without having TX/RX samples per symbol into account), if multi-arfcn is enabled */
-	double rate_multiarfcn;
-	/* Coefficient multiplied by TX sample rate in order to shift Tx time */
-	double ts_offset_coef;
-	/* Coefficient multiplied by TX sample rate in order to shift Tx time, if multi-arfcn is enabled */
-	double ts_offset_coef_multiarfcn;
-	/* Device Name Prefix as presented by LimeSuite API LMS_GetDeviceInfo() */
-	std::string name_prefix;
-};
-
-static const std::map<enum lms_dev_type, struct dev_desc> dev_param_map {
-	{ LMS_DEV_SDR_USB,   { true,  true,  73.0, GSMRATE, MCBTS_SPACING, 8.9e-5, 7.9e-5, LMS_DEV_SDR_USB_PREFIX_NAME } },
-	{ LMS_DEV_SDR_MINI,  { false, true,  66.0, GSMRATE, MCBTS_SPACING, 8.9e-5, 8.2e-5, LMS_DEV_SDR_MINI_PREFIX_NAME } },
-	{ LMS_DEV_NET_MICRO, { true,  false, 71.0, GSMRATE, MCBTS_SPACING, 8.9e-5, 7.9e-5, LMS_DEV_NET_MICRO_PREFIX_NAME } },
-	{ LMS_DEV_UNKNOWN,   { true,  true,  73.0, GSMRATE, MCBTS_SPACING, 8.9e-5, 7.9e-5, "UNKNOWN" } },
-};
-
-static enum lms_dev_type parse_dev_type(lms_device_t *m_lms_dev)
-{
-	std::map<enum lms_dev_type, struct dev_desc>::const_iterator it = dev_param_map.begin();
-
-	const lms_dev_info_t* device_info = LMS_GetDeviceInfo(m_lms_dev);
-
-	while (it != dev_param_map.end())
-	{
-		enum lms_dev_type dev_type = it->first;
-		struct dev_desc desc = it->second;
-
-		if (strncmp(device_info->deviceName, desc.name_prefix.c_str(), desc.name_prefix.length()) == 0) {
-			LOGC(DDEV, INFO) << "Device identified as " << desc.name_prefix;
-			return dev_type;
-		}
-		it++;
-	}
-	return LMS_DEV_UNKNOWN;
-}
-
-LMSDevice::LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset,
+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,
 		     const std::vector<std::string>& rx_paths):
-	RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths),
-	m_lms_dev(NULL), started(false), m_dev_type(LMS_DEV_UNKNOWN)
+	RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths),
+	m_lms_dev(NULL)
 {
 	LOGC(DDEV, INFO) << "creating LMS device...";
 
 	m_lms_stream_rx.resize(chans);
 	m_lms_stream_tx.resize(chans);
-	rx_gains.resize(chans);
-	tx_gains.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);
-
-	/* 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));
-
 }
 
 LMSDevice::~LMSDevice()
@@ -159,7 +93,7 @@ static void lms_log_callback(int lvl, const char *msg)
 	if ((unsigned int) lvl >= ARRAY_SIZE(lvl_map))
 		lvl = ARRAY_SIZE(lvl_map)-1;
 
-	LOGLV(DDEVDRV, lvl_map[lvl]) << msg;
+	LOGLV(DLMS, lvl_map[lvl]) << msg;
 }
 
 static void print_range(const char* name, lms_range_t *range)
@@ -176,7 +110,7 @@ static void print_range(const char* name, lms_range_t *range)
 int info_list_find(lms_info_str_t* info_list, unsigned int count, const std::string &args)
 {
 	unsigned int i, j;
-	std::vector<string> filters;
+	vector<string> filters;
 
 	filters = comma_delimited_to_vector(args.c_str());
 
@@ -200,11 +134,11 @@ int info_list_find(lms_info_str_t* info_list, unsigned int count, const std::str
 int LMSDevice::open(const std::string &args, int ref, bool swap_channels)
 {
 	lms_info_str_t* info_list;
+	const lms_dev_info_t* device_info;
 	lms_range_t range_sr;
 	float_type sr_host, sr_rf;
 	unsigned int i, n;
 	int rc, dev_id;
-	struct dev_desc dev_desc;
 
 	LOGC(DDEV, INFO) << "Opening LMS device..";
 
@@ -241,20 +175,19 @@ int LMSDevice::open(const std::string &args, int ref, bool swap_channels)
 
 	delete [] info_list;
 
-	m_dev_type = parse_dev_type(m_lms_dev);
-	dev_desc = dev_param_map.at(m_dev_type);
+	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 */
+	/* 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";
-		/* FIXME: Assume an external 10 MHz reference clock. make
-		   external reference frequency configurable */
-		if (!do_clock_src_freq(REF_EXTERNAL, 10000000.0))
+		/* Assume an external 10 MHz reference clock */
+		if (LMS_SetClockFreq(m_lms_dev, LMS_CLOCK_EXTREF, 10000000.0) < 0)
 			goto out_close;
 	}
 
@@ -264,13 +197,22 @@ int LMSDevice::open(const std::string &args, int ref, bool swap_channels)
 		goto out_close;
 	}
 
-	/* if reference clock is internal, setup must happen _after_ calling LMS_Init */
+	/* 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";
-		/* Internal freq param is not used */
-		if (!do_clock_src_freq(REF_INTERNAL, 0))
+			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++) {
@@ -285,22 +227,16 @@ int LMSDevice::open(const std::string &args, int ref, bool swap_channels)
 		goto out_close;
 	print_range("Sample Rate", &range_sr);
 
-	if (iface == MULTI_ARFCN)
-		sr_host = dev_desc.rate_multiarfcn * tx_sps;
-	else
-		sr_host = dev_desc.rate * tx_sps;
-	LOGC(DDEV, INFO) << "Setting sample rate to " << sr_host << " " << tx_sps;
-	if (LMS_SetSampleRate(m_lms_dev, sr_host, 32) < 0)
+	LOGC(DDEV, INFO) << "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;
 
-	if (iface == MULTI_ARFCN)
-		ts_offset = static_cast<TIMESTAMP>(dev_desc.ts_offset_coef_multiarfcn * sr_host);
-	else
-		ts_offset = static_cast<TIMESTAMP>(dev_desc.ts_offset_coef * sr_host);
+	/* 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()) {
@@ -308,7 +244,13 @@ int LMSDevice::open(const std::string &args, int ref, bool swap_channels)
 		goto out_close;
 	}
 
-	return iface == MULTI_ARFCN ? MULTI_ARFCN : NORMAL;
+	/* 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));
+
+	started = false;
+
+	return NORMAL;
 
 out_close:
 	LOGC(DDEV, FATAL) << "Error in LMS open, closing: " << LMS_GetLastErrorMessage();
@@ -402,43 +344,6 @@ bool LMSDevice::stop()
 	return true;
 }
 
-bool LMSDevice::do_clock_src_freq(enum ReferenceType ref, double freq)
-{
-	struct dev_desc dev_desc = dev_param_map.at(m_dev_type);
-	size_t lms_clk_id;
-
-	switch (ref) {
-	case REF_EXTERNAL:
-		lms_clk_id = LMS_CLOCK_EXTREF;
-		break;
-	case REF_INTERNAL:
-		if (!dev_desc.clock_src_int_usable) {
-			LOGC(DDEV, ERROR) << "Device type " << dev_desc.name_prefix
-					  << " doesn't support internal reference clock";
-			return false;
-		}
-		/* According to lms using LMS_CLOCK_EXTREF with a
-		   frequency <= 0 is the correct way to set clock to
-		   internal reference */
-		lms_clk_id = LMS_CLOCK_EXTREF;
-		freq = -1;
-		break;
-	default:
-		LOGC(DDEV, ERROR) << "Invalid reference type " << get_value_string(clock_ref_names, ref);
-		return false;
-	}
-
-	if (dev_desc.clock_src_switchable) {
-		if (LMS_SetClockFreq(m_lms_dev, lms_clk_id, freq) < 0)
-			return false;
-	} else {
-		LOGC(DDEV, INFO) << "Device type " << dev_desc.name_prefix
-				 << " doesn't support switching clock source through SW";
-	}
-
-	return true;
-}
-
 /* do rx/tx calibration - depends on gain, freq and bw */
 bool LMSDevice::do_calib(size_t chan)
 {
@@ -480,7 +385,7 @@ bool LMSDevice::do_filters(size_t chan)
 
 double LMSDevice::maxTxGain()
 {
-	return dev_param_map.at(m_dev_type).max_tx_gain;
+	return maxTxGainClamp;
 }
 
 double LMSDevice::minTxGain()
@@ -509,9 +414,8 @@ double LMSDevice::setTxGain(double dB, size_t chan)
 
 	if (LMS_SetGaindB(m_lms_dev, LMS_CH_TX, chan, dB) < 0)
 		LOGCHAN(chan, DDEV, ERR) << "Error setting TX gain to " << dB << " dB";
-	else
-		tx_gains[chan] = dB;
-	return tx_gains[chan];
+
+	return dB;
 }
 
 double LMSDevice::setRxGain(double dB, size_t chan)
@@ -525,23 +429,8 @@ double LMSDevice::setRxGain(double dB, size_t chan)
 
 	if (LMS_SetGaindB(m_lms_dev, LMS_CH_RX, chan, dB) < 0)
 		LOGCHAN(chan, DDEV, ERR) << "Error setting RX gain to " << dB << " dB";
-	else
-		rx_gains[chan] = dB;
-	return rx_gains[chan];
-}
 
-void LMSDevice::log_ant_list(bool dir_tx, size_t chan, std::ostringstream& os)
-{
-	lms_name_t name_list[MAX_ANTENNA_LIST_SIZE]; /* large enough list for antenna names. */
-	int num_names;
-	int i;
-
-	num_names = LMS_GetAntennaList(m_lms_dev, dir_tx, chan, name_list);
-	for (i = 0; i < num_names; i++) {
-		if (i)
-			os << ", ";
-		os << "'" << name_list[i] << "'";
-	}
+	return dB;
 }
 
 int LMSDevice::get_ant_idx(const std::string & name, bool dir_tx, size_t chan)
@@ -597,10 +486,7 @@ bool LMSDevice::setRxAntenna(const std::string & ant, size_t chan)
 
 	idx = get_ant_idx(ant, LMS_CH_RX, chan);
 	if (idx < 0) {
-		std::ostringstream os;
-		LOGCHAN(chan, DDEV, ERROR) << "Invalid Rx Antenna: " << ant;
-		log_ant_list(LMS_CH_RX, chan, os);
-		LOGCHAN(chan, DDEV, NOTICE) << "Available Rx Antennas: " << os;
+		LOGCHAN(chan, DDEV, ERROR) << "Invalid Rx Antenna";
 		return false;
 	}
 
@@ -646,10 +532,7 @@ bool LMSDevice::setTxAntenna(const std::string & ant, size_t chan)
 
 	idx = get_ant_idx(ant, LMS_CH_TX, chan);
 	if (idx < 0) {
-		std::ostringstream os;
-		LOGCHAN(chan, DDEV, ERROR) << "Invalid Tx Antenna: " << ant;
-		log_ant_list(LMS_CH_TX, chan, os);
-		LOGCHAN(chan, DDEV, NOTICE) << "Available Tx Antennas: " << os;
+		LOGCHAN(chan, DDEV, ERROR) << "Invalid Rx Antenna";
 		return false;
 	}
 
@@ -693,53 +576,39 @@ GSM::Time LMSDevice::minLatency() {
 	/* UNUSED on limesdr (only used on usrp1/2) */
 	return GSM::Time(0,0);
 }
-/*!
- * Issue tracking description of several events: https://github.com/myriadrf/LimeSuite/issues/265
- */
-void LMSDevice::update_stream_stats_rx(size_t chan, bool *overrun)
+
+void LMSDevice::update_stream_stats(size_t chan, bool * underrun, bool * overrun)
 {
 	lms_stream_status_t status;
-	bool changed = false;
-
-	if (LMS_GetStreamStatus(&m_lms_stream_rx[chan], &status) != 0) {
-		LOGCHAN(chan, DDEV, ERROR) << "Rx LMS_GetStreamStatus failed";
-		return;
+	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;
 
-	/* FIFO overrun is counted when Rx FIFO is full but new data comes from
-	   the board and oldest samples in FIFO are overwritte. Value count
-	   since the last call to LMS_GetStreamStatus(stream). */
-	if (status.overrun) {
-		changed = true;
+		if (status.overrun > m_last_rx_overruns[chan]) {
 			*overrun = true;
-		LOGCHAN(chan, DDEV, ERROR) << "Rx Overrun! ("
-					   << m_ctr[chan].rx_overruns << " -> "
+			LOGCHAN(chan, DDEV, ERROR) << "recv Overrun! ("
+						   << m_last_rx_overruns[chan] << " -> "
 						   << status.overrun << ")";
 		}
-	m_ctr[chan].rx_overruns += status.overrun;
+		m_last_rx_overruns[chan] = status.overrun;
 
-	/* Dropped packets in Rx are counted when gaps in Rx timestamps are
-	   detected (likely because buffer overflow in hardware). Value count
-	   since the last call to LMS_GetStreamStatus(stream). */
-	if (status.droppedPackets) {
-		changed = true;
-		LOGCHAN(chan, DDEV, ERROR) << "Rx Dropped packets by HW! ("
-					   << m_ctr[chan].rx_dropped_samples << " -> "
-					   << m_ctr[chan].rx_dropped_samples +
-					      status.droppedPackets
-					   << ")";
-		m_ctr[chan].rx_dropped_events++;
+		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];
 	}
-	m_ctr[chan].rx_dropped_samples += status.droppedPackets;
-
-	if (changed)
-		osmo_signal_dispatch(SS_DEVICE, S_DEVICE_COUNTER_CHANGE, &m_ctr[chan]);
-
 }
 
 // NOTE: Assumes sequential reads
 int LMSDevice::readSamples(std::vector < short *>&bufs, int len, bool * overrun,
-			   TIMESTAMP timestamp, bool * underrun)
+			   TIMESTAMP timestamp, bool * underrun, unsigned *RSSI)
 {
 	int rc, num_smpls, expect_smpls;
 	ssize_t avail_smpls;
@@ -771,7 +640,7 @@ int LMSDevice::readSamples(std::vector < short *>&bufs, int len, bool * overrun,
 		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_rx(i, overrun);
+			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 << ").";
@@ -806,9 +675,8 @@ int LMSDevice::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)) {
-			LOGCHAN(i, DDEV, ERROR) << rx_buffers[i]->str_code(rc) << ". "
-						<< rx_buffers[i]->str_status(timestamp)
-						<< ", (len=" << len << ")";
+			LOGC(DDEV, ERROR) << rx_buffers[i]->str_code(rc);
+			LOGC(DDEV, ERROR) << rx_buffers[i]->str_status(timestamp);
 			return 0;
 		}
 	}
@@ -816,57 +684,23 @@ int LMSDevice::readSamples(std::vector < short *>&bufs, int len, bool * overrun,
 	return len;
 }
 
-void LMSDevice::update_stream_stats_tx(size_t chan, bool *underrun)
-{
-	lms_stream_status_t status;
-	bool changed = false;
-
-	if (LMS_GetStreamStatus(&m_lms_stream_tx[chan], &status) != 0) {
-		LOGCHAN(chan, DDEV, ERROR) << "Tx LMS_GetStreamStatus failed";
-		return;
-	}
-
-	/* FIFO underrun is counted when Tx is running but FIFO is empty for
-	   >100 ms (500ms in older versions). Value count since the last call to
-	   LMS_GetStreamStatus(stream). */
-	if (status.underrun) {
-		changed = true;
-		*underrun = true;
-		LOGCHAN(chan, DDEV, ERROR) << "Tx Underrun! ("
-					   << m_ctr[chan].tx_underruns << " -> "
-					   << status.underrun << ")";
-	}
-	m_ctr[chan].tx_underruns += status.underrun;
-
-	/* Dropped packets in Tx are counted only when timestamps are enabled
-	   and SDR drops packet because of late timestamp. Value count since the
-	   last call to LMS_GetStreamStatus(stream). */
-	if (status.droppedPackets) {
-		changed = true;
-		LOGCHAN(chan, DDEV, ERROR) << "Tx Dropped packets by HW! ("
-					   << m_ctr[chan].tx_dropped_samples << " -> "
-					   << m_ctr[chan].tx_dropped_samples +
-					      status.droppedPackets
-					   << ")";
-		m_ctr[chan].tx_dropped_events++;
-	}
-	m_ctr[chan].tx_dropped_samples += status.droppedPackets;
-
-	if (changed)
-		osmo_signal_dispatch(SS_DEVICE, S_DEVICE_COUNTER_CHANGE, &m_ctr[chan]);
-
-}
-
 int LMSDevice::writeSamples(std::vector < short *>&bufs, int len,
-			    bool * underrun, unsigned long long timestamp)
+			    bool * underrun, unsigned long long timestamp,
+			    bool isControl)
 {
 	int rc = 0;
 	unsigned int i;
+	lms_stream_status_t status;
 	lms_stream_meta_t tx_metadata = {};
 	tx_metadata.flushPartialPacket = false;
 	tx_metadata.waitForTimestamp = true;
 	tx_metadata.timestamp = timestamp - ts_offset;	/* Shift Tx time by offset */
 
+	if (isControl) {
+		LOGC(DDEV, ERROR) << "Control packets not supported";
+		return 0;
+	}
+
 	if (bufs.size() != chans) {
 		LOGC(DDEV, ERROR) << "Invalid channel combination " << bufs.size();
 		return -1;
@@ -878,12 +712,16 @@ int LMSDevice::writeSamples(std::vector < short *>&bufs, int len,
 		LOGCHAN(i, DDEV, DEBUG) << "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);
-		update_stream_stats_tx(i, underrun);
-		thread_enable_cancel(true);
 		if (rc != len) {
-			LOGCHAN(i, DDEV, ERROR) << "LMS: Device Tx timed out (" << rc << " vs exp " << len << ").";
-			return -1;
+			LOGCHAN(i, DDEV, ERROR) << "LMS: Device send timed out";
 		}
+
+		if (LMS_GetStreamStatus(&m_lms_stream_tx[i], &status) == 0) {
+			if (status.underrun > m_last_tx_underruns[i])
+				*underrun = true;
+			m_last_tx_underruns[i] = status.underrun;
+		}
+		thread_enable_cancel(true);
 	}
 
 	return rc;

Transceiver52M/device/lms/LMSDevice.h

@@ -1,10 +1,7 @@
 /*
 * Copyright 2018 sysmocom - s.f.m.c. GmbH
 *
-* SPDX-License-Identifier: AGPL-3.0+
-*
-* This software is distributed under multiple licenses; see the COPYING file in
-* the main directory for licensing information for this specific distribution.
+* This software is distributed under multiple licenses; see the COPYING file in the main directory for licensing information for this specific distribuion.
 *
 * This use of this software may be subject to additional restrictions.
 * See the LEGAL file in the main directory for details.
@@ -41,21 +38,22 @@
  * 	A^2 = 1 */
 #define LIMESDR_TX_AMPL  0.707
 
-enum lms_dev_type {
-	LMS_DEV_SDR_USB,   /* LimeSDR-USB */
-	LMS_DEV_SDR_MINI,  /* LimeSDR-Mini */
-	LMS_DEV_NET_MICRO, /* LimeNet-micro */
-	LMS_DEV_UNKNOWN,
-};
-
 /** A class to handle a LimeSuite supported device */
 class LMSDevice:public RadioDevice {
 
 private:
+
+	static constexpr double masterClockRate = 52.0e6;
+
 	lms_device_t *m_lms_dev;
 	std::vector<lms_stream_t> m_lms_stream_rx;
 	std::vector<lms_stream_t> m_lms_stream_tx;
 
+	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;
 
 	double actualSampleRate;	///< the actual USRP sampling rate
@@ -65,23 +63,19 @@ private:
 
 	TIMESTAMP ts_initial, ts_offset;
 
-	std::vector<double> tx_gains, rx_gains;
-
-	enum lms_dev_type m_dev_type;
+	double rxGain;
+	double maxTxGainClamp;
 
 	bool do_calib(size_t chan);
 	bool do_filters(size_t chan);
-	void log_ant_list(bool dir_tx, size_t chan, std::ostringstream& os);
 	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_rx(size_t chan, bool *overrun);
-	void update_stream_stats_tx(size_t chan, bool *underrun);
-	bool do_clock_src_freq(enum ReferenceType ref, double freq);
+	void update_stream_stats(size_t chan, bool * underrun, bool * overrun);
 
 public:
 
 	/** Object constructor */
-	LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset,
+	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();
@@ -95,6 +89,10 @@ public:
 	/** Stop the LMS */
 	bool stop();
 
+	/** Set priority not supported */
+	void setPriority(float prio = 0.5) {
+	}
+
 	enum TxWindowType getWindowType() {
 		return TX_WINDOW_LMS1;
 	}
@@ -106,21 +104,24 @@ public:
 	@param overrun Set if read buffer has been overrun, e.g. data not being read fast enough
 	@param timestamp The timestamp of the first samples to be read
 	@param underrun Set if LMS does not have data to transmit, e.g. data not being sent fast enough
+	@param RSSI The received signal strength of the read result
 	@return The number of samples actually read
 	*/
 	int readSamples(std::vector < short *>&buf, int len, bool * overrun,
 			TIMESTAMP timestamp = 0xffffffff, bool * underrun =
-			NULL);
+			NULL, unsigned *RSSI = NULL);
 	/**
 	Write samples to the LMS.
 	@param buf Contains the data to be written.
 	@param len number of samples to write.
 	@param underrun Set if LMS does not have data to transmit, e.g. data not being sent fast enough
 	@param timestamp The timestamp of the first sample of the data buffer.
+	@param isControl Set if data is a control packet, e.g. a ping command
 	@return The number of samples actually written
 	*/
 	int writeSamples(std::vector < short *>&bufs, int len, bool * underrun,
-			 TIMESTAMP timestamp = 0xffffffff);
+			 TIMESTAMP timestamp = 0xffffffff, bool isControl =
+			 false);
 
 	/** Update the alignment between the read and write timestamps */
 	bool updateAlignment(TIMESTAMP timestamp);
@@ -156,7 +157,7 @@ public:
 
 	/** get the current receive gain */
 	double getRxGain(size_t chan = 0) {
-		return rx_gains[chan];
+		return rxGain;
 	}
 
 	/** return maximum Rx Gain **/
@@ -168,11 +169,6 @@ public:
 	/** sets the transmit chan gain, returns the gain setting **/
 	double setTxGain(double dB, size_t chan = 0);
 
-	/** get transmit gain */
-	double getTxGain(size_t chan = 0) {
-		return tx_gains[chan];
-	}
-
 	/** return maximum Tx Gain **/
 	double maxTxGain(void);
 

Transceiver52M/device/uhd/UHDDevice.cpp

@@ -6,8 +6,6 @@
  *
  * Author: Tom Tsou <tom.tsou@ettus.com>
  *
- * SPDX-License-Identifier: AGPL-3.0+
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -33,12 +31,11 @@
 #include "config.h"
 #endif
 
-#ifdef USE_UHD_3_11
-#include <uhd/utils/log_add.hpp>
-#include <uhd/utils/thread.hpp>
-#else
+#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
@@ -121,13 +118,12 @@ static const std::map<dev_key, dev_desc> dev_param_map {
 	{ std::make_tuple(UMTRX, 4, 4), { 2, 0.0,  GSMRATE, 5.1503e-5,  "UmTRX 4 SPS"        } },
 	{ std::make_tuple(LIMESDR, 4, 4), { 1, GSMRATE*32, GSMRATE, 8.9e-5, "LimeSDR 4 SPS"  } },
 	{ std::make_tuple(B2XX_MCBTS, 4, 4), { 1, 51.2e6, MCBTS_SPACING*4, B2XX_TIMING_MCBTS, "B200/B210 4 SPS Multi-ARFCN" } },
-	{ std::make_tuple(OCR01, 4, 1), { 2, 26e6, GSMRATE, B2XX_TIMING_4SPS, "OCR01 4/1 Tx/Rx SPS"} },
-	{ std::make_tuple(OCR01, 4, 4), { 2, 26e6, GSMRATE, B2XX_TIMING_4_4SPS, "OCR01 4/4 Tx/Rx SPS"} },
 };
 
 void *async_event_loop(uhd_device *dev)
 {
 	set_selfthread_name("UHDAsyncEvent");
+	dev->setPriority(0.43);
 
 	while (1) {
 		dev->recv_async_msg();
@@ -137,52 +133,23 @@ void *async_event_loop(uhd_device *dev)
 	return NULL;
 }
 
-#ifdef USE_UHD_3_11
-static void uhd_log_handler(const uhd::log::logging_info &info)
-{
-	int level;
-
-	switch (info.verbosity)
-	{
-	case uhd::log::trace:
-	case uhd::log::debug:
-		level = LOGL_DEBUG;
-		break;
-	case uhd::log::info:
-		level = LOGL_INFO;
-		break;
-	case uhd::log::warning:
-		level = LOGL_NOTICE;
-		break;
-	case uhd::log::error:
-		level = LOGL_ERROR;
-		break;
-	case uhd::log::fatal:
-		level = LOGL_FATAL;
-		break;
-	default:
-		level = LOGL_NOTICE;
-	}
-
-	LOGSRC(DDEVDRV, level, info.file.c_str(), info.line) << "[" << info.component << "] " << info.message;
-}
-#else
+#ifndef USE_UHD_3_11
 /*
     Catch and drop underrun 'U' and overrun 'O' messages from stdout
     since we already report using the logging facility. Direct
     everything else appropriately.
  */
-static void uhd_msg_handler(uhd::msg::type_t type, const std::string &msg)
+void uhd_msg_handler(uhd::msg::type_t type, const std::string &msg)
 {
 	switch (type) {
 	case uhd::msg::status:
-		LOGC(DDEVDRV, INFO) << msg;
+		LOGC(DDEV, INFO) << msg;
 		break;
 	case uhd::msg::warning:
-		LOGC(DDEVDRV, NOTICE) << msg;
+		LOGC(DDEV, WARNING) << msg;
 		break;
 	case uhd::msg::error:
-		LOGC(DDEVDRV, ERROR) << msg;
+		LOGC(DDEV, ERROR) << msg;
 		break;
 	case uhd::msg::fastpath:
 		break;
@@ -191,10 +158,10 @@ static void uhd_msg_handler(uhd::msg::type_t type, const std::string &msg)
 #endif
 
 uhd_device::uhd_device(size_t tx_sps, size_t rx_sps,
-		       InterfaceType iface, size_t chan_num, double lo_offset,
+		       InterfaceType iface, size_t chans, double lo_offset,
 		       const std::vector<std::string>& tx_paths,
 		       const std::vector<std::string>& rx_paths)
-	: RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths),
+	: RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths),
 	  tx_gain_min(0.0), tx_gain_max(0.0),
 	  rx_gain_min(0.0), rx_gain_max(0.0),
 	  tx_spp(0), rx_spp(0),
@@ -279,6 +246,9 @@ void uhd_device::set_rates()
 
 double uhd_device::setTxGain(double db, size_t chan)
 {
+	if (iface == MULTI_ARFCN)
+		chan = 0;
+
 	if (chan >= tx_gains.size()) {
 		LOGC(DDEV, ALERT) << "Requested non-existent channel" << chan;
 		return 0.0f;
@@ -310,6 +280,9 @@ double uhd_device::setTxGain(double db, size_t 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;
 		return 0.0f;
@@ -325,6 +298,9 @@ double uhd_device::setRxGain(double db, size_t chan)
 
 double uhd_device::getRxGain(size_t chan)
 {
+	if (iface == MULTI_ARFCN)
+		chan = 0;
+
 	if (chan >= rx_gains.size()) {
 		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
 		return 0.0f;
@@ -333,16 +309,6 @@ double uhd_device::getRxGain(size_t chan)
 	return rx_gains[chan];
 }
 
-double uhd_device::getTxGain(size_t chan)
-{
-	if (chan >= tx_gains.size()) {
-		LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
-		return 0.0f;
-	}
-
-	return tx_gains[chan];
-}
-
 /*
     Parse the UHD device tree and mboard name to find out what device we're
     dealing with. We need the window type so that the transceiver knows how to
@@ -370,7 +336,6 @@ bool uhd_device::parse_dev_type()
 		{ "USRP2",    { USRP2,   TX_WINDOW_FIXED } },
 		{ "UmTRX",    { UMTRX,   TX_WINDOW_FIXED } },
 		{ "LimeSDR",  { LIMESDR, TX_WINDOW_FIXED } },
-		{ "OCR01",    { OCR01,   TX_WINDOW_USRP1 } },
 	};
 
 	// Compare UHD motherboard and device strings */
@@ -412,9 +377,10 @@ static bool uhd_e3xx_version_chk()
 void uhd_device::set_channels(bool swap)
 {
 	if (iface == MULTI_ARFCN) {
-		if (dev_type != B200 && dev_type != B210 && dev_type != OCR01)
+		if (dev_type != B200 && dev_type != B210)
 			throw std::invalid_argument("Device does not support MCBTS");
 		dev_type = B2XX_MCBTS;
+		chans = 1;
 	}
 
 	if (chans > dev_param_map.at(dev_key(dev_type, tx_sps, rx_sps)).channels)
@@ -424,7 +390,6 @@ void uhd_device::set_channels(bool swap)
 	switch (dev_type) {
 	case B210:
 	case E3XX:
-	case OCR01:
 		if (chans == 1)
 			subdev_string = swap ? "A:B" : "A:A";
 		else if (chans == 2)
@@ -452,16 +417,6 @@ int uhd_device::open(const std::string &args, int ref, bool swap_channels)
 {
 	const char *refstr;
 
-	/* Register msg handler. Different APIs depending on UHD version */
-#ifdef USE_UHD_3_11
-	uhd::log::add_logger("OsmoTRX", &uhd_log_handler);
-	uhd::log::set_log_level(uhd::log::debug);
-	uhd::log::set_console_level(uhd::log::off);
-	uhd::log::set_logger_level("OsmoTRX", uhd::log::debug);
-#else
-	uhd::msg::register_handler(&uhd_msg_handler);
-#endif
-
 	// Find UHD devices
 	uhd::device_addr_t addr(args);
 	uhd::device_addrs_t dev_addrs = uhd::device::find(addr);
@@ -570,7 +525,7 @@ int uhd_device::open(const std::string &args, int ref, bool swap_channels)
 	init_gains();
 
 	// Print configuration
-	LOGC(DDEV, INFO) << "Device configuration: " << usrp_dev->get_pp_string();
+	LOGC(DDEV, INFO) << "\n" << usrp_dev->get_pp_string();
 
 	if (iface == MULTI_ARFCN)
 		return MULTI_ARFCN;
@@ -586,7 +541,6 @@ int uhd_device::open(const std::string &args, int ref, bool swap_channels)
 	case E1XX:
 	case E3XX:
 	case LIMESDR:
-	case OCR01:
 	default:
 		break;
 	}
@@ -649,6 +603,10 @@ bool uhd_device::start()
 		return false;
 	}
 
+#ifndef USE_UHD_3_11
+	// Register msg handler
+	uhd::msg::register_handler(&uhd_msg_handler);
+#endif
 	// Start asynchronous event (underrun check) loop
 	async_event_thrd = new Thread();
 	async_event_thrd->start((void * (*)(void*))async_event_loop, (void*)this);
@@ -683,6 +641,12 @@ bool uhd_device::stop()
 	return true;
 }
 
+void uhd_device::setPriority(float prio)
+{
+	uhd::set_thread_priority_safe(prio);
+	return;
+}
+
 int uhd_device::check_rx_md_err(uhd::rx_metadata_t &md, ssize_t num_smpls)
 {
 	if (!num_smpls) {
@@ -726,7 +690,7 @@ int uhd_device::check_rx_md_err(uhd::rx_metadata_t &md, ssize_t num_smpls)
 }
 
 int uhd_device::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
-			    TIMESTAMP timestamp, bool *underrun)
+			    TIMESTAMP timestamp, bool *underrun, unsigned *RSSI)
 {
 	ssize_t rc;
 	uhd::time_spec_t ts;
@@ -783,7 +747,7 @@ 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]->write((short *) &pkt_bufs[i].front(),
 						  num_smpls,
-						  ts.to_ticks(rx_rate));
+						  metadata.time_spec.to_ticks(rx_rate));
 
 			// Continue on local overrun, exit on other errors
 			if ((rc < 0)) {
@@ -809,7 +773,7 @@ int uhd_device::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
 }
 
 int uhd_device::writeSamples(std::vector<short *> &bufs, int len, bool *underrun,
-			     unsigned long long timestamp)
+			     unsigned long long timestamp,bool isControl)
 {
 	uhd::tx_metadata_t metadata;
 	metadata.has_time_spec = true;
@@ -819,6 +783,12 @@ int uhd_device::writeSamples(std::vector<short *> &bufs, int len, bool *underrun
 
 	*underrun = false;
 
+	// No control packets
+	if (isControl) {
+		LOGC(DDEV, ERROR) << "Control packets not supported";
+		return 0;
+	}
+
 	if (bufs.size() != chans) {
 		LOGC(DDEV, ALERT) << "Invalid channel combination " << bufs.size();
 		return -1;
@@ -918,18 +888,15 @@ bool uhd_device::set_freq(double freq, size_t chan, bool tx)
 	std::vector<double> freqs;
 	uhd::tune_result_t tres;
 	uhd::tune_request_t treq = select_freq(freq, chan, tx);
-	std::string str_dir;
 
 	if (tx) {
 		tres = usrp_dev->set_tx_freq(treq, chan);
 		tx_freqs[chan] = usrp_dev->get_tx_freq(chan);
-		str_dir = "Tx";
 	} else {
 		tres = usrp_dev->set_rx_freq(treq, chan);
 		rx_freqs[chan] = usrp_dev->get_rx_freq(chan);
-		str_dir = "Rx";
 	}
-	LOGCHAN(chan, DDEV, INFO) << "set_freq(" << freq << ", " << str_dir << "): " << tres.to_pp_string() << std::endl;
+	LOGC(DDEV, INFO) << "\n" << tres.to_pp_string() << std::endl;
 
 	if ((chans == 1) || ((chans == 2) && dev_type == UMTRX))
 		return true;
@@ -949,7 +916,7 @@ bool uhd_device::set_freq(double freq, size_t chan, bool tx)
 			rx_freqs[!chan] = usrp_dev->get_rx_freq(!chan);
 
 		}
-		LOGCHAN(chan, DDEV, INFO) << "set_freq(" << freq << ", " << str_dir << "): " << tres.to_pp_string() << std::endl;
+		LOGC(DDEV, INFO) << "\n" << tres.to_pp_string() << std::endl;
 	}
 
 	return true;

Transceiver52M/device/uhd/UHDDevice.h

@@ -7,8 +7,6 @@
  *
  * Author: Tom Tsou <tom.tsou@ettus.com>
  *
- * SPDX-License-Identifier: AGPL-3.0+
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -50,7 +48,6 @@ enum uhd_dev_type {
 	X3XX,
 	UMTRX,
 	LIMESDR,
-	OCR01,
 };
 
 /*
@@ -63,7 +60,7 @@ enum uhd_dev_type {
 class uhd_device : public RadioDevice {
 public:
 	uhd_device(size_t tx_sps, size_t rx_sps, InterfaceType type,
-		   size_t chan_num, double offset,
+		   size_t chans, double offset,
 		   const std::vector<std::string>& tx_paths,
 		   const std::vector<std::string>& rx_paths);
 	~uhd_device();
@@ -72,13 +69,14 @@ public:
 	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);
+			TIMESTAMP timestamp, bool *underrun, unsigned *RSSI);
 
 	int writeSamples(std::vector<short *> &bufs, int len, bool *underrun,
-			 TIMESTAMP timestamp);
+			 TIMESTAMP timestamp, bool isControl);
 
 	bool updateAlignment(TIMESTAMP timestamp);
 
@@ -97,7 +95,6 @@ public:
 	double minRxGain(void) { return rx_gain_min; }
 
 	double setTxGain(double db, size_t chan);
-	double getTxGain(size_t chan = 0);
 	double maxTxGain(void) { return tx_gain_max; }
 	double minTxGain(void) { return tx_gain_min; }
 

Transceiver52M/device/usrp1/Makefile.am

@@ -3,12 +3,6 @@ include $(top_srcdir)/Makefile.common
 AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common
 AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(USRP_CFLAGS)
 
-rev2dir = $(datadir)/usrp/rev2
-rev4dir = $(datadir)/usrp/rev4
-
-dist_rev2_DATA = std_inband.rbf
-dist_rev4_DATA = std_inband.rbf
-
 noinst_HEADERS = USRPDevice.h
 
 noinst_LTLIBRARIES = libdevice.la

Transceiver52M/device/usrp1/USRPDevice.cpp

@@ -1,8 +1,6 @@
 /*
 * Copyright 2008, 2009 Free Software Foundation, Inc.
 *
-* SPDX-License-Identifier: AGPL-3.0+
-*
 * This software is distributed under the terms of the GNU Affero Public License.
 * See the COPYING file in the main directory for details.
 *
@@ -61,17 +59,16 @@ const dboardConfigType dboardConfig = TXA_RXB;
 const double USRPDevice::masterClockRate = 52.0e6;
 
 USRPDevice::USRPDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface,
-		       size_t chan_num, double lo_offset,
+		       size_t chans, double lo_offset,
 		       const std::vector<std::string>& tx_paths,
 		       const std::vector<std::string>& rx_paths):
-		RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths)
+		RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths)
 {
   LOGC(DDEV, INFO) << "creating USRP device...";
 
   decimRate = (unsigned int) round(masterClockRate/((GSMRATE) * (double) tx_sps));
   actualSampleRate = masterClockRate/decimRate;
   rxGain = 0;
-  txGain = 0;
 
   /*
    * Undetermined delay b/w ping response timestamp and true
@@ -280,11 +277,10 @@ double USRPDevice::setTxGain(double dB, size_t chan)
 
   if (!m_dbTx->set_gain(dB))
     LOGC(DDEV, ERR) << "Error setting TX gain";
-  else
-    txGain = dB;
+
   writeLock.unlock();
 
-  return txGain;
+  return dB;
 }
 
 
@@ -307,11 +303,10 @@ double USRPDevice::setRxGain(double dB, size_t chan)
 
   if (!m_dbRx->set_gain(dB))
     LOGC(DDEV, ERR) << "Error setting RX gain";
-  else
-    rxGain = dB;
+
   writeLock.unlock();
 
-  return rxGain;
+  return dB;
 }
 
 bool USRPDevice::setRxAntenna(const std::string &ant, size_t chan)
@@ -365,7 +360,7 @@ GSM::Time USRPDevice::minLatency() {
 
 // NOTE: Assumes sequential reads
 int USRPDevice::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
-                            TIMESTAMP timestamp, bool *underrun)
+                            TIMESTAMP timestamp, bool *underrun, unsigned *RSSI)
 {
 #ifndef SWLOOPBACK
   if (!m_uRx)
@@ -380,7 +375,7 @@ int USRPDevice::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
     return len;
   }
 
-  *underrun = false;
+  if (underrun) *underrun = false;
 
   uint32_t readBuf[2000];
 
@@ -430,13 +425,11 @@ int USRPDevice::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
 	continue;
       }
       if ((word0 >> 28) & 0x04) {
-	*underrun = true;
+	if (underrun) *underrun = true;
 	LOGC(DDEV, DEBUG) << "UNDERRUN in TRX->USRP interface";
       }
-#if 0
-      /* FIXME: Do something with this ? */
-      unsigned RSSI = (word0 >> 21) & 0x3f;
-#endif
+      if (RSSI) *RSSI = (word0 >> 21) & 0x3f;
+
       if (!isAligned) continue;
 
       unsigned cursorStart = pktTimestamp - timeStart + dataStart;
@@ -515,8 +508,9 @@ int USRPDevice::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
 #endif
 }
 
-int USRPDevice::writeSamplesControl(std::vector<short *> &bufs, int len,
-                             bool *underrun, unsigned long long timestamp, bool isControl)
+int USRPDevice::writeSamples(std::vector<short *> &bufs, int len,
+                             bool *underrun, unsigned long long timestamp,
+                             bool isControl)
 {
   writeLock.lock();
 
@@ -570,12 +564,6 @@ int USRPDevice::writeSamplesControl(std::vector<short *> &bufs, int len,
 #endif
 }
 
-int USRPDevice::writeSamples(std::vector<short *> &bufs, int len,
-                             bool *underrun, unsigned long long timestamp)
-{
-  return writeSamplesControl(bufs, len, underrun, timestamp, false);
-}
-
 bool USRPDevice::updateAlignment(TIMESTAMP timestamp)
 {
 #ifndef SWLOOPBACK
@@ -585,7 +573,7 @@ bool USRPDevice::updateAlignment(TIMESTAMP timestamp)
   bool tmpUnderrun;
 
   std::vector<short *> buf(1, data);
-  if (writeSamplesControl(buf, 1, &tmpUnderrun, timestamp & 0x0ffffffffll, true)) {
+  if (writeSamples(buf, 1, &tmpUnderrun, timestamp & 0x0ffffffffll, true)) {
     pingTimestamp = timestamp;
     return true;
   }

Transceiver52M/device/usrp1/USRPDevice.h

@@ -1,10 +1,7 @@
 /*
 * Copyright 2008 Free Software Foundation, Inc.
 *
-* SPDX-License-Identifier: AGPL-3.0+
-*
-* This software is distributed under multiple licenses; see the COPYING file in
-* the main directory for licensing information for this specific distribution.
+* This software is distributed under multiple licenses; see the COPYING file in the main directory for licensing information for this specific distribuion.
 *
 * This use of this software may be subject to additional restrictions.
 * See the LEGAL file in the main directory for details.
@@ -80,10 +77,6 @@ private:
   unsigned long lastPktTimestamp;
 
   double rxGain;
-  double txGain;
-
-  int writeSamplesControl(std::vector<short *> &bufs, int len, bool *underrun,
-                   TIMESTAMP timestamp = 0xffffffff, bool isControl = false);
 
 #ifdef SWLOOPBACK
   short loopbackBuffer[1000000];
@@ -98,7 +91,7 @@ private:
  public:
 
   /** Object constructor */
-  USRPDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset,
+  USRPDevice(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);
 
@@ -111,6 +104,9 @@ private:
   /** Stop the USRP */
   bool stop();
 
+  /** Set priority not supported */
+  void setPriority(float prio = 0.5) { }
+
   enum TxWindowType getWindowType() { return TX_WINDOW_USRP1; }
 
   /**
@@ -120,20 +116,23 @@ private:
 	@param overrun Set if read buffer has been overrun, e.g. data not being read fast enough
 	@param timestamp The timestamp of the first samples to be read
 	@param underrun Set if USRP does not have data to transmit, e.g. data not being sent fast enough
+	@param RSSI The received signal strength of the read result
 	@return The number of samples actually read
   */
   int readSamples(std::vector<short *> &buf, int len, bool *overrun,
-                  TIMESTAMP timestamp = 0xffffffff, bool *underrun = NULL);
+                  TIMESTAMP timestamp = 0xffffffff, bool *underrun = NULL,
+                  unsigned *RSSI = NULL);
   /**
         Write samples to the USRP.
         @param buf Contains the data to be written.
         @param len number of samples to write.
         @param underrun Set if USRP does not have data to transmit, e.g. data not being sent fast enough
         @param timestamp The timestamp of the first sample of the data buffer.
+        @param isControl Set if data is a control packet, e.g. a ping command
         @return The number of samples actually written
   */
   int writeSamples(std::vector<short *> &bufs, int len, bool *underrun,
-                   TIMESTAMP timestamp = 0xffffffff);
+                   TIMESTAMP timestamp = 0xffffffff, bool isControl = false);
 
   /** Update the alignment between the read and write timestamps */
   bool updateAlignment(TIMESTAMP timestamp);
@@ -171,9 +170,6 @@ private:
   /** sets the transmit chan gain, returns the gain setting **/
   double setTxGain(double dB, size_t chan = 0);
 
-  /** get transmit gain */
-  double getTxGain(size_t chan = 0) { return txGain; }
-
   /** return maximum Tx Gain **/
   double maxTxGain(void);
 

Transceiver52M/inband-signaling-usb

@@ -0,0 +1,314 @@
+This file specifies the format of USB packets used for in-band data
+transmission and signaling on the USRP.  All packets are 512-byte long,
+and are transfered using USB "bulk" transfers.
+
+IN packets are sent towards the host.
+OUT packets are sent away from the host.
+
+The layout is 32-bits wide.  All data is transmitted in little-endian
+format across the USB.
+
+
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |O|U|D|S|E|   RSSI    |  Chan   | mbz |  Tag  |   Payload Len   |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |                           Timestamp                           |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |                                                               |
+   +                                                               +
+   |                            Payload                            |
+   .                                                               .
+   .                                                               .
+   .                                                               .
+   |                                                               |
+   +             +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |      ...    |                                                 .
+   +-+-+-+-+-+-+-+                                                 .
+   .                                                               .
+   .                            Padding                            .
+   .                                                               .
+   |                                                               |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   
+
+  mbz   Must be Zero: these bits must be zero in both IN and OUT packets.
+
+  O     Overrun Flag: set in an IN packet if an overrun condition was
+        detected.  Must be zero in OUT packets.  Overrun occurs when
+        the FPGA has data to transmit to the host and there is no
+        buffer space available.  This generally indicates a problem on
+        the host.  Either it is not keeping up, or it has configured
+        the FPGA to transmit data at a higher rate than the transport
+        (USB) can support.
+
+  U     Underrun Flag: set in an IN packet if an underrun condition
+        was detected.  Must be zero in OUT packets.  Underrun occurs
+        when the FPGA runs out of samples, and it's not between
+        bursts.  See the "End of Burst flag" below.
+
+  D     Dropped Packet Flag: Set in an IN packet if the FPGA
+	discarded an OUT packet because its timestamp had already
+	passed.
+
+  S     Start of Burst Flag:  Set in an OUT packet if the data is the
+        first segment of what is logically a continuous burst of data.
+        Must be zero in IN packets.
+
+  E     End of Burst Flag:  Set in an OUT packet if the data is the
+        last segment of what is logically a continuous burst of data.
+        Must be zero in IN packets.  Underruns are not reported
+        when the FPGA runs out of samples between bursts.
+
+
+  RSSI  6-bit Received Strength Signal Indicator:  Must be zero in OUT
+        packets.  In IN packets, indicates RSSI as reported by front end.
+	FIXME The format and interpretation are to be determined.
+
+  Chan  5-bit logical channel number.  Channel number 0x1f is reserved
+        for control information.  See "Control Channel" below.  Other
+        channels are "data channels."  Each data channel is logically
+        independent of the others.  A data channel payload field
+        contains a sequence of homogeneous samples.  The format of the
+        samples is determined by the configuration associated with the
+        given channel.  It is often the case that the payload field
+        contains 32-bit complex samples, each containing 16-bit real
+        and imaginary components.
+
+  Tag   4-bit tag for matching IN packets with OUT packets.
+        [FIXME, write more...]
+
+  Payload Len: 9-bit field that specifies the length of the payload
+        field in bytes.  Must be in the range 0 to 504 inclusive.
+
+  Timestamp: 32-bit timestamp.
+	On IN packets, the timestamp indicates the time at which the
+	first sample of the packet was produced by the A/D converter(s)
+        for that channel.  On OUT packets, the timestamp specifies the
+        time at which the first sample in the packet should go out the
+        D/A converter(s) for that channel.  If a packet reaches the
+	head of the transmit queue, and the current time is later than
+	the timestamp, an error is assumed to have occurred and the
+	packet is discarded.  As a special case, the timestamp
+	0xffffffff is interpreted as "Now".
+
+	The time base is a free running 32-bit counter that is
+	incremented by the A/D sample-clock.
+
+  Payload: Variable length field.  Length is specified by the
+        Payload Len field.
+
+  Padding: This field is 504 - Payload Len bytes long, and its content
+        is unspecified.  This field pads the packet out to a constant
+        512 bytes.
+
+
+
+"Data Channel" payload format:
+-------------------------------
+
+If Chan != 0x1f, the packet is a "data packet" and the payload is a
+sequence of homogeneous samples.  The format of the samples is
+determined by the configuration associated with the given channel.  
+It is often the case that the payload field contains 32-bit complex
+samples, each containing 16-bit real and imaginary components.
+
+
+"Control Channel" payload format:
+---------------------------------
+
+If Chan == 0x1f, the packet is a "control packet".  The control channel
+payload consists of a sequence of 0 or more sub-packets.
+
+Each sub-packet starts on a 32-bit boundary, and consists of an 8-bit
+Opcode field, an 8-bit Length field, Length bytes of arguments, and 0,
+1, 2 or 3 bytes of padding to align the tail of the sub-packet to
+a 32-bit boundary.
+
+Control channel packets shall be processed at the head of the queue,
+and shall observe the timestamp semantics described above.
+
+
+General sub-packet format:
+--------------------------
+
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-//-+-+-+-+-+-+-+-+
+   |     Opcode    |    Length     |        <length bytes> ...    |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-//-+-+-+-+-+-+-+-+
+
+
+Specific sub-packet formats:
+----------------------------
+
+  RID: 6-bit Request-ID. Copied from request sub-packet into corresponding
+       reply sub-packet.  RID allows the host to match requests and replies.
+
+  Reg Number: 10-bit Register Number.
+
+
+
+Ping Fixed Length:
+
+    Opcode:	OP_PING_FIXED
+
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |     Opcode    |       2       |    RID    |     Ping Value    |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+Ping Fixed Length Reply:
+
+    Opcode:	OP_PING_FIXED_REPLY
+
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |     Opcode    |       2       |    RID    |     Ping Value    |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+Write Register:
+
+    Opcode:	OP_WRITE_REG
+
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |     Opcode    |       6       |    mbz    |     Reg Number    |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |                        Register Value                         |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+Write Register Masked:
+
+    Opcode:	OP_WRITE_REG_MASKED
+
+    REG[Num] = (REG[Num] & ~Mask) | (Value & Mask)
+
+    That is, only the register bits that correspond to 1's in the
+    mask are written with the new value.
+
+
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |     Opcode    |      10       |    mbz    |     Reg Number    |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |                         Register Value                        |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |                           Mask Value                          |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+Read Register:
+
+    Opcode:	OP_READ_REG
+
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |     Opcode    |       2       |    RID    |     Reg Number    |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+Read Register Reply:
+
+    Opcode:	OP_READ_REG_REPLY
+
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |     Opcode    |       6       |    RID    |     Reg Number    |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |                        Register Value                         |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+I2C Write:
+
+    Opcode:	OP_I2C_WRITE
+    I2C Addr:   7-bit I2C address
+    Data:	The bytes to write to the I2C bus
+    Length:     Length of Data + 2
+
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |     Opcode    |    Length     |       mbz       |   I2C Addr  |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |    Data ...			                           .
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+I2C Read:
+
+    Opcode:	OP_I2C_READ
+    I2C Addr:	7-bit I2C address
+    Nbytes:	Number of bytes to read from I2C bus
+
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |     Opcode    |       3       |    RID    | mbz |   I2C Addr  |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |     Nbytes    |              unspecified padding              |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+I2C Read Reply:
+
+    Opcode:	OP_I2C_READ_REPLY
+    I2C Addr:	7-bit I2C address
+    Data:	Length - 2 bytes of data read from I2C bus.
+
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |     Opcode    |     Length    |    RID    | mbz |   I2C Addr  |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |    Data ...			                           .
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+SPI Write:
+
+    Opcode:	      OP_SPI_WRITE
+    Enables:	      Which SPI enables to assert (mask)
+    Format:	      Specifies format of SPI data and Opt Header Bytes
+    Opt Header Bytes: 2-byte field containing optional Tx bytes; see Format
+    Data:	      The bytes to write to the SPI bus
+    Length:	      Length of Data + 6
+
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |     Opcode    |    Length     |              mbz              |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |    Enables    |    Format     |        Opt Header Bytes       |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |    Data ...			                           .
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+SPI Read:
+
+    Opcode:	      OP_SPI_READ
+    Enables:	      Which SPI enables to assert (mask)
+    Format:	      Specifies format of SPI data and Opt Header Bytes
+    Opt Header Bytes: 2-byte field containing optional Tx bytes; see Format
+    Nbytes:	      Number of bytes to read from SPI bus.
+
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |     Opcode    |       7       |    RID    |        mbz        |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |    Enables    |    Format     |        Opt Header Bytes       |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |     Nbytes    |              unspecified padding              |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+SPI Read Reply:
+
+    Opcode:   OP_SPI_READ_REPLY
+    Data:     Length - 2 bytes of data read from SPI bus.
+
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |     Opcode    |     Length    |    RID    |        mbz        |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |    Data ...			                           .
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+Delay:
+
+    Opcode:	OP_DELAY
+    Ticks:	16-bit unsigned delay count
+
+    Delay Ticks clock ticks before executing next operation.
+
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |     Opcode    |       2       |            Ticks              |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+

Transceiver52M/osmo-trx.cpp

@@ -1,8 +1,6 @@
 /*
  * Copyright (C) 2013 Thomas Tsou <tom@tsou.cc>
  *
- * SPDX-License-Identifier: LGPL-2.1+
- *
  * 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
@@ -61,7 +59,6 @@ extern "C" {
 #include "trx_vty.h"
 #include "debug.h"
 #include "osmo_signal.h"
-#include "trx_rate_ctr.h"
 }
 
 #define DEFAULT_CONFIG_FILE	"osmo-trx.cfg"
@@ -125,7 +122,7 @@ static int transc_sig_cb(unsigned int subsys, unsigned int signal,
 		     void *handler_data, void *signal_data)
 {
 	switch (signal) {
-	case S_MAIN_STOP_REQUIRED:
+	case S_TRANSC_STOP_REQUIRED:
 		gshutdown = true;
                 break;
 	default:
@@ -147,13 +144,15 @@ int makeTransceiver(struct trx_ctx *trx, RadioInterface *radio)
 	transceiver = new Transceiver(trx->cfg.base_port, trx->cfg.bind_addr,
 			      trx->cfg.remote_addr, trx->cfg.tx_sps,
 			      trx->cfg.rx_sps, trx->cfg.num_chans, GSM::Time(3,0),
-			      radio, trx->cfg.rssi_offset, trx->cfg.stack_size);
+			      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)) {
 		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))
@@ -173,11 +172,11 @@ static void sig_handler(int signo)
 		   action like printing */
 		return;
 
-	fprintf(stderr, "signal %d received\n", signo);
+	fprintf(stdout, "signal %d received\n", signo);
 	switch (signo) {
 	case SIGINT:
 	case SIGTERM:
-		fprintf(stderr, "shutting down\n");
+		fprintf(stdout, "shutting down\n");
 		gshutdown = true;
 		break;
 	case SIGABRT:
@@ -257,7 +256,7 @@ static void print_deprecated(char opt)
 {
 	LOG(WARNING) << "Cmd line option '" << opt << "' is deprecated and will be soon removed."
 		<< " Please use VTY cfg option instead."
-		<< " All cmd line options are already being overridden by VTY options if set.";
+		<< " All cmd line options are already being overriden by VTY options if set.";
 }
 
 static void handle_options(int argc, char **argv, struct trx_ctx* trx)
@@ -334,12 +333,14 @@ static void handle_options(int argc, char **argv, struct trx_ctx* trx)
 			break;
 		case 'r':
 			print_deprecated(option);
+			trx->cfg.rtsc_set = true;
 			trx->cfg.rtsc = atoi(optarg);
 			if (!trx->cfg.egprs) /* Don't override egprs which sets different filler */
 				trx->cfg.filler = FILLER_NORM_RAND;
 			break;
 		case 'A':
 			print_deprecated(option);
+			trx->cfg.rach_delay_set = true;
 			trx->cfg.rach_delay = atoi(optarg);
 			trx->cfg.filler = FILLER_ACCESS_RAND;
 			break;
@@ -381,11 +382,6 @@ static void handle_options(int argc, char **argv, struct trx_ctx* trx)
 		}
 	}
 
-	if (argc > optind) {
-		LOG(ERROR) << "Unsupported positional arguments on command line";
-		goto bad_config;
-	}
-
 	/* Cmd line option specific validation & setup */
 
 	if (trx->cfg.num_chans > TRX_CHAN_MAX) {
@@ -462,9 +458,7 @@ static void print_config(struct trx_ctx *trx)
 	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 << "   Filler Burst Type....... " << get_value_string(filler_names, trx->cfg.filler) << std::endl;
-	ost << "   Filler Burst TSC........ " << trx->cfg.rtsc << std::endl;
-	ost << "   Filler Burst RACH Delay. " << trx->cfg.rach_delay << std::endl;
+	ost << "   C0 Filler Table......... " << trx->cfg.filler << std::endl;
 	ost << "   Multi-Carrier........... " << trx->cfg.multi_arfcn << std::endl;
 	ost << "   Tuning offset........... " << trx->cfg.offset << std::endl;
 	ost << "   RSSI to dBm offset...... " << trx->cfg.rssi_offset << std::endl;
@@ -576,22 +570,16 @@ int main(int argc, char *argv[])
 #endif
 #endif
 
-#ifndef HAVE_ATOMIC_OPS
-#pragma message ("Built without atomic operation support. Using Mutex, it may affect performance!")
-	printf("Built without atomic operation support. Using Mutex, it may affect performance!\n");
-#endif
-
 	convolve_init();
 	convert_init();
 
 	osmo_init_logging2(tall_trx_ctx, &log_info);
-	log_enable_multithread();
 	osmo_stats_init(tall_trx_ctx);
 	vty_init(&g_vty_info);
-	logging_vty_add_cmds();
 	ctrl_vty_init(tall_trx_ctx);
 	trx_vty_init(g_trx_ctx);
 
+	logging_vty_add_cmds();
 	osmo_talloc_vty_add_cmds();
 	osmo_stats_vty_add_cmds();
 
@@ -609,7 +597,7 @@ int main(int argc, char *argv[])
 	if (rc < 0)
 		exit(1);
 
-	g_ctrlh = ctrl_interface_setup_dynip(NULL, ctrl_vty_get_bind_addr(), OSMO_CTRL_PORT_TRX, NULL);
+	g_ctrlh = ctrl_interface_setup(NULL, OSMO_CTRL_PORT_TRX, NULL);
 	if (!g_ctrlh) {
 		LOG(ERROR) << "Failed to create CTRL interface.\n";
 		exit(1);
@@ -638,9 +626,6 @@ int main(int argc, char *argv[])
 			return EXIT_FAILURE;
 	}
 
-	osmo_signal_register_handler(SS_MAIN, transc_sig_cb, NULL);
-	trx_rate_ctr_init(tall_trx_ctx, g_trx_ctx);
-
 	srandom(time(NULL));
 
 	if(trx_start(g_trx_ctx) < 0)
@@ -653,6 +638,5 @@ int main(int argc, char *argv[])
 
 	osmo_fd_unregister(&signal_ofd);
 	osmo_fd_close(&signal_ofd);
-	osmo_signal_unregister_handler(SS_MAIN, transc_sig_cb, NULL);
 	return 0;
 }

Transceiver52M/proto_trxd.c

@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2019 sysmocom - s.f.m.c. GmbH
- * All Rights Reserved
- *
- * SPDX-License-Identifier: AGPL-3.0+
- *
- * Author: Pau Espin Pedrol <pespin@sysmocom.de>
- *
- * 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 "proto_trxd.h"
-
-#include <osmocom/core/bits.h>
-
-static void trxd_fill_common(struct trxd_hdr_common *common, const struct trx_ul_burst_ind *bi, uint8_t version)
-{
-	common->version = version & 0b1111;
-	common->reserved = 0;
-	common->tn = bi->tn;
-	osmo_store32be(bi->fn, &common->fn);
-}
-
-static void trxd_fill_v0_specific(struct trxd_hdr_v0_specific *v0, const struct trx_ul_burst_ind *bi)
-{
-	int toa_int;
-
-	/* in 1/256 symbols, round to closest integer */
-	toa_int = (int) (bi->toa * 256.0 + 0.5);
-	v0->rssi = bi->rssi;
-	osmo_store16be(toa_int, &v0->toa);
-}
-
-static void trxd_fill_v1_specific(struct trxd_hdr_v1_specific *v1, const struct trx_ul_burst_ind *bi)
-{
-	int16_t ci_int_cB;
-
-	/* deciBels->centiBels, round to closest integer */
-	ci_int_cB = (int16_t)((bi->ci * 10) + 0.5);
-
-	v1->idle = !!bi->idle;
-	v1->modulation = (bi->modulation == MODULATION_GMSK) ?
-					TRXD_MODULATION_GMSK(bi->tss) :
-					TRXD_MODULATION_8PSK(bi->tss);
-	v1->tsc = bi->tsc;
-	osmo_store16be(ci_int_cB, &v1->ci);
-}
-
-static void trxd_fill_burst_normalized255(uint8_t* soft_bits, const struct trx_ul_burst_ind *bi)
-{
-	unsigned i;
-	for (i = 0; i < bi->nbits; i++)
-		soft_bits[i] = (char) round(bi->rx_burst[i] * 255.0);
-}
-
-bool trxd_send_burst_ind_v0(size_t chan, int fd, const struct trx_ul_burst_ind *bi) {
-	int rc;
-
-	/* v0 doesn't support idle frames, they are simply dropped, not sent */
-	if(bi->idle)
-		return true;
-
-	/* +2: Historically (OpenBTS times), two extra non-used bytes are sent appended to each burst */
-	char buf[sizeof(struct trxd_hdr_v0) + bi->nbits + 2];
-	struct trxd_hdr_v0* pkt = (struct trxd_hdr_v0*)buf;
-
-	trxd_fill_common(&pkt->common, bi, 0);
-	trxd_fill_v0_specific(&pkt->v0, bi);
-	trxd_fill_burst_normalized255(&pkt->soft_bits[0], bi);
-
-	/* +1: Historical reason. There's an uninitizalied byte in there: pkt->soft_bits[bi->nbits] */
-	pkt->soft_bits[bi->nbits + 1] = '\0';
-
-	rc = write(fd, buf, sizeof(struct trxd_hdr_v0) + bi->nbits + 2);
-	if (rc <= 0) {
-		CLOGCHAN(chan, DMAIN, LOGL_NOTICE, "mDataSockets write(%d) failed: %d\n", fd, rc);
-		return false;
-	}
-	return true;
-}
-
-bool trxd_send_burst_ind_v1(size_t chan, int fd, const struct trx_ul_burst_ind *bi) {
-	int rc;
-	size_t buf_len;
-
-	buf_len = sizeof(struct trxd_hdr_v1);
-	if (!bi->idle)
-		buf_len += bi->nbits;
-	char buf[buf_len];
-
-	struct trxd_hdr_v1* pkt = (struct trxd_hdr_v1*)buf;
-	trxd_fill_common(&pkt->common, bi, 1);
-	trxd_fill_v0_specific(&pkt->v0, bi);
-	trxd_fill_v1_specific(&pkt->v1, bi);
-
-	if (!bi->idle)
-		trxd_fill_burst_normalized255(&pkt->soft_bits[0], bi);
-
-	rc = write(fd, buf, buf_len);
-	if (rc <= 0) {
-		CLOGCHAN(chan, DMAIN, LOGL_NOTICE, "mDataSockets write(%d) failed: %d\n", fd, rc);
-		return false;
-	}
-	return true;
-}

Transceiver52M/proto_trxd.h

@@ -1,101 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <unistd.h>
-#include <math.h>
-
-#include <osmocom/core/endian.h>
-
-#include "debug.h"
-
-#define MAX_RX_BURST_BUF_SIZE 444 /* 444 = EDGE_BURST_NBITS */
-
-enum Modulation {
-	MODULATION_GMSK,
-	MODULATION_8PSK,
-/* Not supported yet:
-	MODULATION_AQPSK,
-	MODULATION_16QAM,
-	MODULATION_32QAM
-*/
-};
-
-struct trx_ul_burst_ind {
-	float rx_burst[MAX_RX_BURST_BUF_SIZE]; /* soft bits normalized 0..1 */
-	unsigned nbits; // number of symbols per slot in rxBurst, not counting guard periods
-	uint32_t fn; // TDMA frame number
-	uint8_t tn; // TDMA time-slot number
-	double rssi; // in dBFS
-	double toa;  // in symbols
-	double noise; // noise level in dBFS
-	bool idle; // true if no valid burst is included
-	enum Modulation modulation; // modulation type
-	uint8_t tss; // training sequence set
-	uint8_t tsc; // training sequence code
-	float ci; // Carrier-to-Interference ratio, in dB
-};
-
-bool trxd_send_burst_ind_v0(size_t chan, int fd, const struct trx_ul_burst_ind *bi);
-bool trxd_send_burst_ind_v1(size_t chan, int fd, const struct trx_ul_burst_ind *bi);
-
-/* The latest supported TRXD header format version */
-#define TRX_DATA_FORMAT_VER    1
-
-struct trxd_hdr_common {
-#if OSMO_IS_LITTLE_ENDIAN
-	uint8_t tn:3,
-		reserved:1,
-		version:4;
-#elif OSMO_IS_BIG_ENDIAN
-	uint8_t version:4,
-		reserved:1,
-		tn:3;
-#endif
-	uint32_t fn; /* big endian */
-} __attribute__ ((packed));
-
-struct trxd_hdr_v0_specific {
-	uint8_t rssi;
-	uint16_t toa; /* big endian */
-} __attribute__ ((packed));
-
-struct trxd_hdr_v0 {
-	struct trxd_hdr_common common;
-	struct trxd_hdr_v0_specific v0;
-	uint8_t soft_bits[0];
-} __attribute__ ((packed));
-
-/* Downlink burst (BTS->TRX), v0 anf v1 use same format */
-struct trxd_hdr_v01_dl {
-	struct trxd_hdr_common common;
-	uint8_t tx_att; /* Tx Attentuation */
-	uint8_t soft_bits[0];
-} __attribute__ ((packed));
-
-
-#define TRXD_MODULATION_GMSK(ts_set) (0b0000 | (ts_set & 0b0011))
-#define TRXD_MODULATION_8PSK(ts_set) (0b0100 | (ts_set & 0b0001))
-#define TRXD_MODULATION_AQPSK(ts_set) (0b0110 | (ts_set & 0b0001))
-#define TRXD_MODULATION_16QAM(ts_set) (0b1000 | (ts_set & 0b0001))
-#define TRXD_MODULATION_32QAM(ts_set) (0b1010 | (ts_set & 0b0001))
-
-struct trxd_hdr_v1_specific {
-#if OSMO_IS_LITTLE_ENDIAN
-	uint8_t tsc:3,
-		modulation:4,
-		idle:1;
-#elif OSMO_IS_BIG_ENDIAN
-	uint8_t idle:1,
-		modulation:4,
-		tsc:3;
-#endif
-	int16_t ci;  /* big endian, in centiBels */
-} __attribute__ ((packed));
-
-struct trxd_hdr_v1 {
-	struct trxd_hdr_common common;
-	struct trxd_hdr_v0_specific v0;
-	struct trxd_hdr_v1_specific v1;
-	uint8_t soft_bits[0];
-} __attribute__ ((packed));

Transceiver52M/radioBuffer.cpp

@@ -5,8 +5,6 @@
  *
  * Author: Tom Tsou <tom@tsou.cc>
  *
- * SPDX-License-Identifier: AGPL-3.0+
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or

Transceiver52M/radioClock.cpp

@@ -4,8 +4,6 @@
  *
  * Copyright 2011 Free Software Foundation, Inc.
  *
- * SPDX-License-Identifier: AGPL-3.0+
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or

Transceiver52M/radioClock.h

@@ -4,8 +4,6 @@
  *
  * Copyright 2011 Free Software Foundation, Inc.
  *
- * SPDX-License-Identifier: AGPL-3.0+
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or

Transceiver52M/radioInterface.cpp

@@ -4,8 +4,6 @@
  * Copyright (C) 2008-2014 Free Software Foundation, Inc.
  * Copyright (C) 2015 Ettus Research LLC
  *
- * SPDX-License-Identifier: AGPL-3.0+
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -24,7 +22,6 @@
 #include "radioInterface.h"
 #include "Resampler.h"
 #include <Logger.h>
-#include <Threads.h>
 
 extern "C" {
 #include "convert.h"
@@ -33,12 +30,11 @@ extern "C" {
 #define CHUNK		625
 #define NUMCHUNKS	4
 
-RadioInterface::RadioInterface(RadioDevice *wDevice, size_t tx_sps,
+RadioInterface::RadioInterface(RadioDevice *wRadio, size_t tx_sps,
                                size_t rx_sps, size_t chans,
                                int wReceiveOffset, GSM::Time wStartTime)
-  : mDevice(wDevice), mSPSTx(tx_sps), mSPSRx(rx_sps), mChans(chans),
-    underrun(false), overrun(false), writeTimestamp(0), readTimestamp(0),
-    receiveOffset(wReceiveOffset), mOn(false)
+  : mRadio(wRadio), mSPSTx(tx_sps), mSPSRx(rx_sps), mChans(chans),
+    underrun(false), overrun(false), receiveOffset(wReceiveOffset), mOn(false)
 {
   mClock.set(wStartTime);
 }
@@ -94,11 +90,11 @@ void RadioInterface::close()
 }
 
 double RadioInterface::fullScaleInputValue(void) {
-  return mDevice->fullScaleInputValue();
+  return mRadio->fullScaleInputValue();
 }
 
 double RadioInterface::fullScaleOutputValue(void) {
-  return mDevice->fullScaleOutputValue();
+  return mRadio->fullScaleOutputValue();
 }
 
 int RadioInterface::setPowerAttenuation(int atten, size_t chan)
@@ -113,8 +109,8 @@ int RadioInterface::setPowerAttenuation(int atten, size_t chan)
   if (atten < 0.0)
     atten = 0.0;
 
-  rfGain = setTxGain(mDevice->maxTxGain() - (double) atten, chan);
-  digAtten = (double) atten - mDevice->maxTxGain() + rfGain;
+  rfGain = mRadio->setTxGain(mRadio->maxTxGain() - (double) atten, chan);
+  digAtten = (double) atten - mRadio->maxTxGain() + rfGain;
 
   if (digAtten < 1.0)
     powerScaling[chan] = 1.0;
@@ -149,12 +145,12 @@ int RadioInterface::unRadioifyVector(signalVector *newVector, size_t chan)
 
 bool RadioInterface::tuneTx(double freq, size_t chan)
 {
-  return mDevice->setTxFreq(freq, chan);
+  return mRadio->setTxFreq(freq, chan);
 }
 
 bool RadioInterface::tuneRx(double freq, size_t chan)
 {
-  return mDevice->setRxFreq(freq, chan);
+  return mRadio->setRxFreq(freq, chan);
 }
 
 /** synchronization thread loop */
@@ -170,7 +166,7 @@ void *AlignRadioServiceLoopAdapter(RadioInterface *radioInterface)
 }
 
 void RadioInterface::alignRadio() {
-  mDevice->updateAlignment(writeTimestamp+ (TIMESTAMP) 10000);
+  mRadio->updateAlignment(writeTimestamp+ (TIMESTAMP) 10000);
 }
 
 bool RadioInterface::start()
@@ -179,12 +175,12 @@ bool RadioInterface::start()
     return true;
 
   LOG(INFO) << "Starting radio device";
-  if (mDevice->requiresRadioAlign())
+  if (mRadio->requiresRadioAlign())
         mAlignRadioServiceLoopThread.start(
                                 (void * (*)(void*))AlignRadioServiceLoopAdapter,
                                 (void*)this);
 
-  if (!mDevice->start())
+  if (!mRadio->start())
     return false;
 
   for (size_t i = 0; i < mChans; i++) {
@@ -192,11 +188,11 @@ bool RadioInterface::start()
     recvBuffer[i]->reset();
   }
 
-  writeTimestamp = mDevice->initialWriteTimestamp();
-  readTimestamp = mDevice->initialReadTimestamp();
+  writeTimestamp = mRadio->initialWriteTimestamp();
+  readTimestamp = mRadio->initialReadTimestamp();
 
-  mDevice->updateAlignment(writeTimestamp-10000);
-  mDevice->updateAlignment(writeTimestamp-10000);
+  mRadio->updateAlignment(writeTimestamp-10000);
+  mRadio->updateAlignment(writeTimestamp-10000);
 
   mOn = true;
   LOG(INFO) << "Radio started";
@@ -212,7 +208,7 @@ bool RadioInterface::start()
  */
 bool RadioInterface::stop()
 {
-  if (!mOn || !mDevice->stop())
+  if (!mOn || !mRadio->stop())
     return false;
 
   mOn = false;
@@ -289,9 +285,9 @@ int RadioInterface::driveReceiveRadio()
 
 bool RadioInterface::isUnderrun()
 {
-  bool retVal;
-  /* atomically get previous value of "underrun" and set the var to false */
-  retVal = osmo_trx_sync_fetch_and_and(&underrun, false);
+  bool retVal = underrun;
+  underrun = false;
+
   return retVal;
 }
 
@@ -305,12 +301,12 @@ VectorFIFO* RadioInterface::receiveFIFO(size_t chan)
 
 double RadioInterface::setRxGain(double dB, size_t chan)
 {
-  return mDevice->setRxGain(dB, chan);
+  return mRadio->setRxGain(dB, chan);
 }
 
-double RadioInterface::setTxGain(double dB, size_t chan)
+double RadioInterface::getRxGain(size_t chan)
 {
-  return mDevice->setTxGain(dB, chan);
+  return mRadio->getRxGain(chan);
 }
 
 /* Receive a timestamped chunk from the device */
@@ -324,7 +320,7 @@ int RadioInterface::pullBuffer()
     return -1;
 
   /* Outer buffer access size is fixed */
-  numRecv = mDevice->readSamples(convertRecvBuffer,
+  numRecv = mRadio->readSamples(convertRecvBuffer,
                                 segmentLen,
                                 &overrun,
                                 readTimestamp,
@@ -341,7 +337,7 @@ int RadioInterface::pullBuffer()
 			segmentLen * 2);
   }
 
-  osmo_trx_sync_or_and_fetch(&underrun, local_underrun);
+  underrun |= local_underrun;
   readTimestamp += numRecv;
   return 0;
 }
@@ -349,7 +345,6 @@ int RadioInterface::pullBuffer()
 /* Send timestamped chunk to the device with arbitrary size */
 bool RadioInterface::pushBuffer()
 {
-  bool local_underrun;
   size_t numSent, segmentLen = sendBuffer[0]->getSegmentLen();
 
   if (sendBuffer[0]->getAvailSegments() < 1)
@@ -363,11 +358,10 @@ bool RadioInterface::pushBuffer()
   }
 
   /* Send the all samples in the send buffer */
-  numSent = mDevice->writeSamples(convertSendBuffer,
+  numSent = mRadio->writeSamples(convertSendBuffer,
                                  segmentLen,
-                                 &local_underrun,
+                                 &underrun,
                                  writeTimestamp);
-  osmo_trx_sync_or_and_fetch(&underrun, local_underrun);
   writeTimestamp += numSent;
 
   return true;

Transceiver52M/radioInterface.h

@@ -1,7 +1,7 @@
 /*
 * Copyright 2008 Free Software Foundation, Inc.
 *
-* This software is distributed under multiple licenses; see the COPYING file in the main directory for licensing information for this specific distribution.
+* This software is distributed under multiple licenses; see the COPYING file in the main directory for licensing information for this specific distribuion.
 *
 * This use of this software may be subject to additional restrictions.
 * See the LEGAL file in the main directory for details.
@@ -36,7 +36,7 @@ protected:
 
   std::vector<VectorFIFO>  mReceiveFIFO;      ///< FIFO that holds receive  bursts
 
-  RadioDevice *mDevice;			      ///< the USRP object
+  RadioDevice *mRadio;			      ///< the USRP object
 
   size_t mSPSTx;
   size_t mSPSRx;
@@ -48,7 +48,7 @@ protected:
   std::vector<short *> convertRecvBuffer;
   std::vector<short *> convertSendBuffer;
   std::vector<float> powerScaling;
-  int underrun;			              ///< indicates writes to USRP are too slow
+  bool underrun;			      ///< indicates writes to USRP are too slow
   bool overrun;				      ///< indicates reads from USRP are too slow
   TIMESTAMP writeTimestamp;		      ///< sample timestamp of next packet written to USRP
   TIMESTAMP readTimestamp;		      ///< sample timestamp of next packet read from USRP
@@ -79,12 +79,12 @@ public:
   bool start();
   bool stop();
 
-  /** initialization */
+  /** intialization */
   virtual bool init(int type);
   virtual void close();
 
   /** constructor */
-  RadioInterface(RadioDevice* wDevice, size_t tx_sps, size_t rx_sps,
+  RadioInterface(RadioDevice* wRadio, size_t tx_sps, size_t rx_sps,
                  size_t chans = 1, int receiveOffset = 3,
                  GSM::Time wStartTime = GSM::Time(0));
 
@@ -107,7 +107,10 @@ public:
   virtual bool tuneRx(double freq, size_t chan = 0);
 
   /** set receive gain */
-  virtual double setRxGain(double dB, size_t chan = 0);
+  double setRxGain(double dB, size_t chan = 0);
+
+  /** get receive gain */
+  double getRxGain(size_t chan = 0);
 
   /** drive transmission of GSM bursts */
   void driveTransmitRadio(std::vector<signalVector *> &bursts,
@@ -124,19 +127,19 @@ public:
   /** returns the full-scale receive amplitude **/
   double fullScaleOutputValue();
 
+  /** set thread priority on current thread */
+  void setPriority(float prio = 0.5) { mRadio->setPriority(prio); }
+
   /** get transport window type of attached device */
-  enum RadioDevice::TxWindowType getWindowType() { return mDevice->getWindowType(); }
+  enum RadioDevice::TxWindowType getWindowType() { return mRadio->getWindowType(); }
 
   /** Minimum latency that the device can achieve */
-  GSM::Time minLatency()  { return mDevice->minLatency(); }
+  GSM::Time minLatency()  { return mRadio->minLatency(); }
 
 protected:
   /** drive synchronization of Tx/Rx of USRP */
   void alignRadio();
 
-  /** set transmit gain */
-  virtual double setTxGain(double dB, size_t chan = 0);
-
   friend void *AlignRadioServiceLoopAdapter(RadioInterface*);
 };
 
@@ -149,31 +152,22 @@ private:
   int pullBuffer();
 
 public:
-  RadioInterfaceResamp(RadioDevice* wDevice, size_t tx_sps, size_t rx_sps);
+  RadioInterfaceResamp(RadioDevice* wRadio, size_t tx_sps, size_t rx_sps);
   ~RadioInterfaceResamp();
 
   bool init(int type);
   void close();
 };
 
-struct freq_cfg_state {
-  bool set;
-  double freq_hz;
-};
-
 class RadioInterfaceMulti : public RadioInterface {
 private:
   bool pushBuffer();
   int pullBuffer();
-  bool verify_arfcn_consistency(double freq, size_t chan, bool tx);
-  virtual double setTxGain(double dB, size_t chan);
 
   signalVector *outerSendBuffer;
   signalVector *outerRecvBuffer;
   std::vector<signalVector *> history;
   std::vector<bool> active;
-  std::vector<struct freq_cfg_state> rx_freq_state;
-  std::vector<struct freq_cfg_state> tx_freq_state;
 
   Resampler *dnsampler;
   Resampler *upsampler;
@@ -190,5 +184,5 @@ public:
 
   bool tuneTx(double freq, size_t chan);
   bool tuneRx(double freq, size_t chan);
-  virtual double setRxGain(double dB, size_t chan);
+  double setRxGain(double dB, size_t chan);
 };

Transceiver52M/radioInterfaceMulti.cpp

@@ -5,8 +5,6 @@
  *
  * Author: Tom Tsou <tom.tsou@ettus.com>
  *
- * SPDX-License-Identifier: AGPL-3.0+
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -73,8 +71,6 @@ void RadioInterfaceMulti::close()
 	powerScaling.resize(0);
 	history.resize(0);
 	active.resize(0);
-	rx_freq_state.resize(0);
-	tx_freq_state.resize(0);
 
 	RadioInterface::close();
 }
@@ -150,8 +146,6 @@ bool RadioInterfaceMulti::init(int type)
 	mReceiveFIFO.resize(mChans);
 	powerScaling.resize(mChans);
 	history.resize(mChans);
-	rx_freq_state.resize(mChans);
-	tx_freq_state.resize(mChans);
 	active.resize(MCHANS, false);
 
 	inchunk = RESAMP_INRATE * 4;
@@ -242,7 +236,7 @@ int RadioInterfaceMulti::pullBuffer()
 		return -1;
 
 	/* Outer buffer access size is fixed */
-	num = mDevice->readSamples(convertRecvBuffer,
+	num = mRadio->readSamples(convertRecvBuffer,
 				  outerRecvBuffer->size(),
 				  &overrun,
 				  readTimestamp,
@@ -255,7 +249,7 @@ int RadioInterfaceMulti::pullBuffer()
 	convert_short_float((float *) outerRecvBuffer->begin(),
 			    convertRecvBuffer[0], 2 * outerRecvBuffer->size());
 
-	osmo_trx_sync_or_and_fetch(&underrun, local_underrun);
+	underrun |= local_underrun;
 	readTimestamp += num;
 
 	channelizer->rotate((float *) outerRecvBuffer->begin(),
@@ -292,7 +286,7 @@ int RadioInterfaceMulti::pullBuffer()
 		complex *dst = history[lchan]->begin();
 		float *fsrc = &buf[2 * (cLen - hLen)];
 		for (i = 0; i < hLen; i++) {
-			*dst = complex(fsrc[0], fsrc[1]);
+			*dst = complex(fdst[0], fdst[1]);
 			fsrc += 2;
 			dst++;
 		}
@@ -313,7 +307,6 @@ int RadioInterfaceMulti::pullBuffer()
 /* Send a timestamped chunk to the device */
 bool RadioInterfaceMulti::pushBuffer()
 {
-	bool local_underrun;
 	if (sendBuffer[0]->getAvailSegments() <= 0)
 		return false;
 
@@ -344,15 +337,14 @@ bool RadioInterfaceMulti::pushBuffer()
 			    (float *) outerSendBuffer->begin(),
 			    1.0 / (float) mChans, 2 * outerSendBuffer->size());
 
-	size_t num = mDevice->writeSamples(convertSendBuffer,
+	size_t num = mRadio->writeSamples(convertSendBuffer,
 					  outerSendBuffer->size(),
-					  &local_underrun,
+					  &underrun,
 					  writeTimestamp);
 	if (num != outerSendBuffer->size()) {
 		LOG(ALERT) << "Transmit error " << num;
 	}
 
-	osmo_trx_sync_or_and_fetch(&underrun, local_underrun);
 	writeTimestamp += num;
 
 	return true;
@@ -366,46 +358,20 @@ static bool fltcmp(double a, double b)
 	return fabs(a - b) < FREQ_DELTA_LIMIT ? true : false;
 }
 
-bool RadioInterfaceMulti::verify_arfcn_consistency(double freq, size_t chan, bool tx)
-{
-	double freq_i;
-	std::string str_dir = tx ? "Tx" : "Rx";
-	std::vector<struct freq_cfg_state> &v = tx ? tx_freq_state : rx_freq_state;
-
-	for (size_t i = 0; i < mChans; i++) {
-		if (i == chan)
-			continue;
-		if (!v[i].set)
-			continue;
-
-		freq_i = v[i].freq_hz + (double) ((int)chan - (int)i) * MCBTS_SPACING;
-		if (!fltcmp(freq, freq_i)) {
-			LOGCHAN(chan, DMAIN, ERROR)
-				<< "Setting " << str_dir << " frequency " << freq
-				<< " is incompatible: already configured channel "
-				<< i << " uses frequency " << v[i].freq_hz
-				<< " (expected " << freq_i << ")";
-			return false;
-		}
-	}
-	v[chan].set = true;
-	v[chan].freq_hz = freq;
-	return true;
-}
-
 bool RadioInterfaceMulti::tuneTx(double freq, size_t chan)
 {
-	double shift;
-
   if (chan >= mChans)
     return false;
 
-	if (!verify_arfcn_consistency(freq, chan, true))
-		return false;
+  double shift = (double) getFreqShift(mChans);
 
-	if (chan == 0) {
-		shift = (double) getFreqShift(mChans);
-		return mDevice->setTxFreq(freq + shift * MCBTS_SPACING);
+  if (!chan)
+    return mRadio->setTxFreq(freq + shift * MCBTS_SPACING);
+
+  double center = mRadio->getTxFreq();
+  if (!fltcmp(freq, center + (double) (chan - shift) * MCBTS_SPACING)) {
+    LOG(NOTICE) << "Channel " << chan << " RF frequency offset is "
+                << freq / 1e6 << " MHz";
   }
 
   return true;
@@ -413,17 +379,18 @@ bool RadioInterfaceMulti::tuneTx(double freq, size_t chan)
 
 bool RadioInterfaceMulti::tuneRx(double freq, size_t chan)
 {
-	double shift;
-
   if (chan >= mChans)
     return false;
 
-	if (!verify_arfcn_consistency(freq, chan, false))
-		return false;
+  double shift = (double) getFreqShift(mChans);
 
-	if (chan == 0) {
-		shift = (double) getFreqShift(mChans);
-		return mDevice->setRxFreq(freq + shift * MCBTS_SPACING);
+  if (!chan)
+    return mRadio->setRxFreq(freq + shift * MCBTS_SPACING);
+
+  double center = mRadio->getRxFreq();
+  if (!fltcmp(freq, center + (double) (chan - shift) * MCBTS_SPACING)) {
+    LOG(NOTICE) << "Channel " << chan << " RF frequency offset is "
+                << freq / 1e6 << " MHz";
   }
 
   return true;
@@ -431,17 +398,8 @@ bool RadioInterfaceMulti::tuneRx(double freq, size_t chan)
 
 double RadioInterfaceMulti::setRxGain(double db, size_t chan)
 {
-  if (chan == 0)
-    return mDevice->setRxGain(db);
+  if (!chan)
+    return mRadio->setRxGain(db);
   else
-    return mDevice->getRxGain();
-}
-
-double RadioInterfaceMulti::setTxGain(double dB, size_t chan)
-{
-	if (chan == 0)
-		return mDevice->setTxGain(dB);
-	else
-		return mDevice->getTxGain();
-
+    return mRadio->getRxGain();
 }

Transceiver52M/radioInterfaceResamp.cpp

@@ -6,8 +6,6 @@
  *
  * Author: Tom Tsou <tom@tsou.cc>
  *
- * SPDX-License-Identifier: AGPL-3.0+
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -59,9 +57,9 @@ static size_t resamp_inchunk = 0;
 static size_t resamp_outrate = 0;
 static size_t resamp_outchunk = 0;
 
-RadioInterfaceResamp::RadioInterfaceResamp(RadioDevice *wDevice,
+RadioInterfaceResamp::RadioInterfaceResamp(RadioDevice *wRadio,
 					   size_t tx_sps, size_t rx_sps)
-	: RadioInterface(wDevice, tx_sps, rx_sps, 1),
+	: RadioInterface(wRadio, tx_sps, rx_sps, 1),
 	  outerSendBuffer(NULL), outerRecvBuffer(NULL)
 {
 }
@@ -171,7 +169,7 @@ int RadioInterfaceResamp::pullBuffer()
 		return -1;
 
 	/* Outer buffer access size is fixed */
-	num_recv = mDevice->readSamples(convertRecvBuffer,
+	num_recv = mRadio->readSamples(convertRecvBuffer,
 				       resamp_outchunk,
 				       &overrun,
 				       readTimestamp,
@@ -184,7 +182,7 @@ int RadioInterfaceResamp::pullBuffer()
 	convert_short_float((float *) outerRecvBuffer->begin(),
 			    convertRecvBuffer[0], 2 * resamp_outchunk);
 
-	osmo_trx_sync_or_and_fetch(&underrun, local_underrun);
+	underrun |= local_underrun;
 	readTimestamp += (TIMESTAMP) resamp_outchunk;
 
 	/* Write to the end of the inner receive buffer */
@@ -204,7 +202,6 @@ int RadioInterfaceResamp::pullBuffer()
 /* Send a timestamped chunk to the device */
 bool RadioInterfaceResamp::pushBuffer()
 {
-	bool local_underrun;
 	int rc;
 	size_t numSent;
 
@@ -224,15 +221,14 @@ bool RadioInterfaceResamp::pushBuffer()
 			    (float *) outerSendBuffer->begin(),
 			    powerScaling[0], 2 * resamp_outchunk);
 
-	numSent = mDevice->writeSamples(convertSendBuffer,
+	numSent = mRadio->writeSamples(convertSendBuffer,
 				       resamp_outchunk,
-				       &local_underrun,
+				       &underrun,
 				       writeTimestamp);
 	if (numSent != resamp_outchunk) {
 		LOG(ALERT) << "Transmit error " << numSent;
 	}
 
-	osmo_trx_sync_or_and_fetch(&underrun, local_underrun);
 	writeTimestamp += resamp_outchunk;
 
 	return true;

Transceiver52M/radioVector.cpp

@@ -4,8 +4,6 @@
  *
  * Copyright 2011 Free Software Foundation, Inc.
  *
- * SPDX-License-Identifier: AGPL-3.0+
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or

Transceiver52M/radioVector.h

@@ -4,8 +4,6 @@
  *
  * Copyright 2011 Free Software Foundation, Inc.
  *
- * SPDX-License-Identifier: AGPL-3.0+
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or

Transceiver52M/sigProcLib.cpp

@@ -1,8 +1,6 @@
 /*
 * Copyright 2008, 2011 Free Software Foundation, Inc.
 *
-* SPDX-License-Identifier: AGPL-3.0+
-*
 * This software is distributed under the terms of the GNU Affero Public License.
 * See the COPYING file in the main directory for details.
 *
@@ -86,7 +84,7 @@ static Resampler *dnsampler = NULL;
  * perform 16-byte memory alignment required by many SSE instructions.
  */
 struct CorrelationSequence {
-  CorrelationSequence() : sequence(NULL), buffer(NULL), toa(0.0)
+  CorrelationSequence() : sequence(NULL)
   {
   }
 
@@ -345,7 +343,7 @@ static signalVector *convolve(const signalVector *x, const signalVector *h,
     _x = x;
 
   /*
-   * Four convolve types:
+   * Four convovle types:
    *   1. Complex-Real (aligned)
    *   2. Complex-Complex (aligned)
    *   3. Complex-Real (!aligned)
@@ -532,17 +530,19 @@ static PulseSequence *generateGSMPulse(int sps)
   return pulse;
 }
 
-/* Convert -1..+1 soft bits to 0..1 soft bits */
-void vectorSlicer(float *dest, const float *src, size_t len)
+bool vectorSlicer(SoftVector *x)
 {
-	size_t i;
-	for (i = 0; i < len; i++) {
-		dest[i] = 0.5 * (src[i] + 1.0f);
-		if (dest[i] > 1.0)
-			dest[i] = 1.0;
-		else if (dest[i] < 0.0)
-			dest[i] = 0.0;
+  SoftVector::iterator xP = x->begin();
+  SoftVector::iterator xPEnd = x->end();
+  while (xP < xPEnd) {
+    *xP = 0.5 * (*xP + 1.0f);
+    if (*xP > 1.0)
+      *xP = 1.0;
+    if (*xP < 0.0)
+      *xP = 0.0;
+    xP++;
   }
+  return true;
 }
 
 static signalVector *rotateBurst(const BitVector &wBurst,
@@ -723,7 +723,7 @@ static signalVector *mapEdgeSymbols(const BitVector &bits)
  *
  * Delay the EDGE downlink bursts by one symbol in order to match GMSK pulse
  * shaping group delay. The difference in group delay arises from the dual
- * pulse filter combination of the GMSK Laurent representation whereas 8-PSK
+ * pulse filter combination of the GMSK Laurent represenation whereas 8-PSK
  * uses a single pulse linear filter.
  */
 static signalVector *shapeEdgeBurst(const signalVector &symbols)
@@ -1455,11 +1455,6 @@ static signalVector *downsampleBurst(const signalVector &burst)
   return out;
 };
 
-/*
- * Computes C/I (Carrier-to-Interference ratio) in dB (deciBels).
- * It is computed from the training sequence of each received burst,
- * by comparing the "ideal" training sequence with the actual one.
- */
 static float computeCI(const signalVector *burst, CorrelationSequence *sync,
                        float toa, int start, complex xcorr)
 {
@@ -1492,13 +1487,12 @@ static float computeCI(const signalVector *burst, CorrelationSequence *sync,
  */
 static int detectBurst(const signalVector &burst,
                        signalVector &corr, CorrelationSequence *sync,
-                       float thresh, int sps, int start, int len,
-                       struct estim_burst_params *ebp)
+                       float thresh, int sps, complex *amp, float *toa,
+                       int start, int len)
 {
   const signalVector *corr_in;
   signalVector *dec = NULL;
   complex xcorr;
-  int rc = 1;
 
   if (sps == 4) {
     dec = downsampleBurst(burst);
@@ -1511,42 +1505,38 @@ static int detectBurst(const signalVector &burst,
   /* Correlate */
   if (!convolve(corr_in, sync->sequence, &corr,
                 CUSTOM, start, len)) {
-    rc = -1;
-    goto del_ret;
+    delete dec;
+    return -1;
   }
 
+  delete dec;
+
   /* Running at the downsampled rate at this point */
   sps = 1;
 
   /* Peak detection - place restrictions at correlation edges */
-  ebp->amp = fastPeakDetect(corr, &ebp->toa);
+  *amp = fastPeakDetect(corr, toa);
 
-  if ((ebp->toa < 3 * sps) || (ebp->toa > len - 3 * sps)) {
-    rc = 0;
-    goto del_ret;
-  }
+  if ((*toa < 3 * sps) || (*toa > len - 3 * sps))
+    return 0;
 
   /* Peak-to-average ratio */
-  if (computePeakRatio(&corr, sps, ebp->toa, ebp->amp) < thresh) {
-    rc = 0;
-    goto del_ret;
-  }
+  if (computePeakRatio(&corr, sps, *toa, *amp) < thresh)
+    return 0;
 
   /* Refine TOA and correlation value */
-  xcorr = peakDetect(corr, &ebp->toa, NULL);
+  xcorr = peakDetect(corr, toa, NULL);
 
   /* Compute C/I */
-  ebp->ci = computeCI(corr_in, sync, ebp->toa, start, xcorr);
+  float CI = computeCI(corr_in, sync, *toa, start, xcorr);
 
   /* Normalize our channel gain */
-  ebp->amp = xcorr / sync->gain;
+  *amp = xcorr / sync->gain;
 
   /* Compensate for residuate time lag */
-  ebp->toa = ebp->toa - sync->toa;
+  *toa = *toa - sync->toa;
 
-del_ret:
-  delete dec;
-  return rc;
+  return 1;
 }
 
 static float maxAmplitude(const signalVector &burst)
@@ -1570,10 +1560,13 @@ static float maxAmplitude(const signalVector &burst)
  *   head: Search symbols before target
  *   tail: Search symbols after target
  */
-static int detectGeneralBurst(const signalVector &rxBurst, float thresh, int sps,
+static int detectGeneralBurst(const signalVector &rxBurst,
+                              float thresh,
+                              int sps,
+                              complex &amp,
+                              float &toa,
                               int target, int head, int tail,
-                              CorrelationSequence *sync,
-                              struct estim_burst_params *ebp)
+                              CorrelationSequence *sync)
 {
   int rc, start, len;
   bool clipping = false;
@@ -1595,18 +1588,17 @@ static int detectGeneralBurst(const signalVector &rxBurst, float thresh, int sps
   signalVector corr(len);
 
   rc = detectBurst(rxBurst, corr, sync,
-                   thresh, sps, start, len, ebp);
+                   thresh, sps, &amp, &toa, start, len);
   if (rc < 0) {
     return -SIGERR_INTERNAL;
   } else if (!rc) {
-    ebp->amp = 0.0f;
-    ebp->toa = 0.0f;
-    ebp->ci = 0.0f;
+    amp = 0.0f;
+    toa = 0.0f;
     return clipping?-SIGERR_CLIP:SIGERR_NONE;
   }
 
   /* Subtract forward search bits from delay */
-  ebp->toa -= head;
+  toa -= head;
 
   return 1;
 }
@@ -1621,7 +1613,7 @@ static int detectGeneralBurst(const signalVector &rxBurst, float thresh, int sps
  *   tail: Search 8 symbols + maximum expected delay
  */
 static int detectRACHBurst(const signalVector &burst, float threshold, int sps,
-                           unsigned max_toa, bool ext, struct estim_burst_params *ebp)
+                           complex &amplitude, float &toa, unsigned max_toa, bool ext)
 {
   int rc, target, head, tail;
   int i, num_seq;
@@ -1632,13 +1624,11 @@ static int detectRACHBurst(const signalVector &burst, float threshold, int sps,
   num_seq = ext ? 3 : 1;
 
   for (i = 0; i < num_seq; i++) {
-    rc = detectGeneralBurst(burst, threshold, sps, target, head, tail,
-                            gRACHSequences[i], ebp);
-    if (rc > 0) {
-      ebp->tsc = i;
+    rc = detectGeneralBurst(burst, threshold, sps, amplitude, toa,
+                            target, head, tail, gRACHSequences[i]);
+    if (rc > 0)
       break;
   }
-  }
 
   return rc;
 }
@@ -1652,7 +1642,7 @@ static int detectRACHBurst(const signalVector &burst, float threshold, int sps,
  *   tail: Search 6 symbols + maximum expected delay
  */
 static int analyzeTrafficBurst(const signalVector &burst, unsigned tsc, float threshold,
-                               int sps, unsigned max_toa, struct estim_burst_params *ebp)
+                               int sps, complex &amplitude, float &toa, unsigned max_toa)
 {
   int rc, target, head, tail;
   CorrelationSequence *sync;
@@ -1665,13 +1655,13 @@ static int analyzeTrafficBurst(const signalVector &burst, unsigned tsc, float th
   tail = 6 + max_toa;
   sync = gMidambles[tsc];
 
-  ebp->tsc = tsc;
-  rc = detectGeneralBurst(burst, threshold, sps, target, head, tail, sync, ebp);
+  rc = detectGeneralBurst(burst, threshold, sps, amplitude, toa,
+                          target, head, tail, sync);
   return rc;
 }
 
 static int detectEdgeBurst(const signalVector &burst, unsigned tsc, float threshold,
-                           int sps, unsigned max_toa, struct estim_burst_params *ebp)
+                           int sps, complex &amplitude, float &toa, unsigned max_toa)
 {
   int rc, target, head, tail;
   CorrelationSequence *sync;
@@ -1684,31 +1674,33 @@ static int detectEdgeBurst(const signalVector &burst, unsigned tsc, float thresh
   tail = 6 + max_toa;
   sync = gEdgeMidambles[tsc];
 
-  ebp->tsc = tsc;
-  rc = detectGeneralBurst(burst, threshold, sps,
-                          target, head, tail, sync, ebp);
+  rc = detectGeneralBurst(burst, threshold, sps, amplitude, toa,
+                          target, head, tail, sync);
   return rc;
 }
 
 int detectAnyBurst(const signalVector &burst, unsigned tsc, float threshold,
-                   int sps, CorrType type, unsigned max_toa,
-                   struct estim_burst_params *ebp)
+                   int sps, CorrType type, complex &amp, float &toa,
+                   unsigned max_toa)
 {
   int rc = 0;
 
   switch (type) {
   case EDGE:
-    rc = detectEdgeBurst(burst, tsc, threshold, sps, max_toa, ebp);
+    rc = detectEdgeBurst(burst, tsc, threshold, sps,
+                         amp, toa, max_toa);
     if (rc > 0)
       break;
     else
       type = TSC;
   case TSC:
-    rc = analyzeTrafficBurst(burst, tsc, threshold, sps, max_toa, ebp);
+    rc = analyzeTrafficBurst(burst, tsc, threshold, sps,
+                             amp, toa, max_toa);
     break;
   case EXT_RACH:
   case RACH:
-    rc = detectRACHBurst(burst, threshold, sps, max_toa, type == EXT_RACH, ebp);
+    rc = detectRACHBurst(burst, threshold, sps, amp, toa,
+                         max_toa, type == EXT_RACH);
     break;
   default:
     LOG(ERR) << "Invalid correlation type";

Transceiver52M/sigProcLib.h

@@ -1,7 +1,7 @@
 /*
 * Copyright 2008 Free Software Foundation, Inc.
 *
-* This software is distributed under multiple licenses; see the COPYING file in the main directory for licensing information for this specific distribution.
+* This software is distributed under multiple licenses; see the COPYING file in the main directory for licensing information for this specific distribuion.
 *
 * This use of this software may be subject to additional restrictions.
 * See the LEGAL file in the main directory for details.
@@ -59,7 +59,7 @@ bool sigProcLibSetup();
 void sigProcLibDestroy(void);
 
 /** Operate soft slicer on a soft-bit vector */
-void vectorSlicer(float *dest, const float *src, size_t len);
+bool vectorSlicer(SoftVector *x);
 
 /** GMSK modulate a GSM burst of bits */
 signalVector *modulateBurst(const BitVector &wBurst,
@@ -101,26 +101,15 @@ void scaleVector(signalVector &x,
 */
 float energyDetect(const signalVector &rxBurst,
                    unsigned windowLength);
-
-/** Struct used to fill out parameters in detectAnyBurst(): estimated burst parameters
-@param amplitude The estimated amplitude of received TSC burst.
-@param toa The estimated time-of-arrival of received TSC burst (in symbols).
-@param tsc The TSC used to detect the burst.
-*/
-struct estim_burst_params {
-        complex amp;
-        float toa;
-        uint8_t tsc;
-        float ci;
-};
 /**
         8-PSK/GMSK/RACH burst detector
         @param burst The received GSM burst of interest
         @param tsc Midamble type (0..7) also known as TSC
         @param threshold The threshold that the received burst's post-correlator SNR is compared against to determine validity.
         @param sps The number of samples per GSM symbol.
+        @param amplitude The estimated amplitude of received TSC burst.
+        @param toa The estimate time-of-arrival of received TSC burst (in symbols).
         @param max_toa The maximum expected time-of-arrival (in symbols).
-        @param ebp The estimated parameters of the detected burst.
         @return positive value (CorrType) if threshold value is reached,
                 negative value (-SignalError) on error,
                 zero (SIGERR_NONE) if no burst is detected
@@ -130,8 +119,9 @@ int detectAnyBurst(const signalVector &burst,
                    float threshold,
                    int sps,
                    CorrType type,
-                   unsigned max_toa,
-                   struct estim_burst_params *ebp);
+                   complex &amp,
+                   float &toa,
+                   unsigned max_toa);
 
 /** Demodulate burst basde on type and output soft bits */
 SoftVector *demodAnyBurst(const signalVector &burst, int sps,

Transceiver52M/signalVector.cpp

@@ -47,7 +47,7 @@ void signalVector::operator=(const signalVector& vector)
 	complex *src = vector.mData;
 	for (i = 0; i < size(); i++, src++, dst++)
 		*dst = *src;
-	/* TODO: optimize for non non-trivially copiable types: */
+	/* TODO: optimize for non non-trivially copyable types: */
 	/*memcpy(mData, vector.mData, bytes()); */
 	mStart = mData + vector.getStart();
 }
@@ -70,7 +70,7 @@ size_t signalVector::updateHistory()
 	complex *src = mStart + this->size() - num;
 	for (i = 0; i < num; i++, src++, dst++)
 		*dst = *src;
-	/* TODO: optimize for non non-trivially copiable types: */
+	/* TODO: optimize for non non-trivially copyable types: */
 	/*memmove(mData, mStart + this->size() - num, num * sizeof(complex)); */
 
 	return num;

configure.ac

@@ -32,7 +32,7 @@ AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-AM_INIT_AUTOMAKE([foreign subdir-objects])
+AM_INIT_AUTOMAKE([subdir-objects])
 
 dnl Linux kernel KBuild style compile messages
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -65,7 +65,7 @@ AC_PROG_LIBTOOL
 
 dnl Checks for header files.
 AC_HEADER_STDC
-dnl This is required for GnuRadio includes to understand endianness correctly:
+dnl This is required for GnuRadio includes to understand endianess correctly:
 AC_CHECK_HEADERS([byteswap.h])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -75,18 +75,9 @@ AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_C_BIGENDIAN
 
-# Check if gettid is available (despite not being documented in glibc doc, it requires __USE_GNU on some systems)
-# C compiler is used since __USE_GNU seems to be always defined for g++.
-save_CPPFLAGS=$CPPFLAGS
-AC_LANG_PUSH(C)
-CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-AC_CHECK_FUNCS([gettid])
-AC_LANG_POP(C)
-CPPFLAGS=$save_CPPFLAGS
-
-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0)
-PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0)
-PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.3.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0)
+PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0)
+PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0)
 
 AC_ARG_ENABLE(sanitize,
 	[AS_HELP_STRING(
@@ -199,39 +190,29 @@ dnl Check if the compiler supports specified GCC's built-in function
 AC_DEFUN([CHECK_BUILTIN_SUPPORT], [
   AC_CACHE_CHECK(
     [whether ${CC} has $1 built-in],
-    [osmo_cv_cc_has_$1], [
+    [osmo_cv_cc_has_builtin], [
       AC_LINK_IFELSE([
         AC_LANG_PROGRAM([], [
-          $2
+          __builtin_cpu_supports("sse");
         ])
       ],
-      [AS_VAR_SET([osmo_cv_cc_has_$1], [yes])],
-      [AS_VAR_SET([osmo_cv_cc_has_$1], [no])])
+      [AS_VAR_SET([osmo_cv_cc_has_builtin], [yes])],
+      [AS_VAR_SET([osmo_cv_cc_has_builtin], [no])])
     ]
   )
 
-  AS_IF([test yes = AS_VAR_GET([osmo_cv_cc_has_$1])], [
+  AS_IF([test yes = AS_VAR_GET([osmo_cv_cc_has_builtin])], [
     AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$1), 1,
       [Define to 1 if compiler has the '$1' built-in function])
   ], [
-    AC_MSG_WARN($3)
+    AC_MSG_WARN($2)
   ])
 ])
 
 dnl Check if the compiler supports runtime SIMD detection
-CHECK_BUILTIN_SUPPORT([__builtin_cpu_supports], [__builtin_cpu_supports("sse");],
+CHECK_BUILTIN_SUPPORT([__builtin_cpu_supports],
   [Runtime SIMD detection will be disabled])
 
-dnl Check for __sync_fetch_and_add().
-CHECK_BUILTIN_SUPPORT([__sync_fetch_and_and], [int x;__sync_fetch_and_and(&x,1);],
-  [Atomic operation not available, will use mutex])
-dnl Check for __sync_or_and_fetch().
-CHECK_BUILTIN_SUPPORT([__sync_or_and_fetch], [int x;__sync_or_and_fetch(&x,1);],
-  [Atomic operation not available, will use mutex])
-AS_IF([test "x$osmo_cv_cc_has___sync_fetch_and_and" = "xyes" && test "x$osmo_cv_cc_has___sync_or_and_fetch" = "xyes"], [
-    AC_DEFINE(HAVE_ATOMIC_OPS, 1, [Support all required atomic operations], [AC_MSG_WARN("At least one aotmic operation missing, will use mutex")])
-])
-
 AM_CONDITIONAL(DEVICE_UHD, [test "x$with_uhd" != "xno"])
 AM_CONDITIONAL(DEVICE_USRP1, [test "x$with_usrp1" = "xyes"])
 AM_CONDITIONAL(DEVICE_LMS, [test "x$with_lms" = "xyes"])

contrib/jenkins.sh

@@ -15,7 +15,7 @@ substr() { [ -z "${2##*$1*}" ]; }
 mychroot_nocwd() {
         # LC_ALL + LANGUAGE set to avoid lots of print errors due to locale not being set inside container
         # PATH is needed to be able to reach binaries like ldconfig without logging in to root, which adds the paths to PATH.
-        # PROOT_NO_SECCOMP is required due to proot bug #106
+        # PROOT_NO_SECCOMP is requried due to proot bug #106
         LC_ALL=C LANGUAGE=C PATH="$PATH:/usr/sbin:/sbin" PROOT_NO_SECCOMP=1 proot -r "$ROOTFS" -w / -b /proc --root-id -q qemu-arm-static "$@"
 }
 
@@ -23,8 +23,15 @@ mychroot() {
         mychroot_nocwd -w / "$@"
 }
 
+base="$PWD"
+deps="$base/deps"
+inst="$deps/install"
+export deps inst
+
 if [ -z "${INSIDE_CHROOT}" ]; then
 
+        osmo-clean-workspace.sh
+
         # Only use ARM chroot if host is not ARM and the target is ARM:
         if ! $(substr "arm" "$(uname -m)") && [ "x${INSTR}" = "x--with-neon" -o "x${INSTR}" = "x--with-neon-vfpv4" ]; then
 
@@ -62,24 +69,10 @@ if [ -z "${INSIDE_CHROOT}" ]; then
         fi
 fi
 
-set -ex
-
-if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then
-	echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !"
-	exit 2
-fi
-
-base="$PWD"
-deps="$base/deps"
-inst="$deps/install"
-export deps inst
-
-osmo-clean-workspace.sh
-
 mkdir "$deps" || true
 
 osmo-build-dep.sh libosmocore "" "--enable-sanitize --disable-doxygen --disable-pcsc"
-PARALLEL_MAKE="" osmo-build-dep.sh libusrp
+osmo-build-dep.sh libusrp
 
 export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
 export LD_LIBRARY_PATH="$inst/lib"
@@ -114,5 +107,4 @@ if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
 	make -C "$base/doc/manuals" publish
 fi
 
-$MAKE maintainer-clean
 osmo-clean-workspace.sh

debian/changelog

@@ -1,187 +1,3 @@
-osmo-trx (1.2.0) unstable; urgency=medium
-
-  [ Pau Espin Pedrol ]
-  * osmo-trx: log to stderr on signal received
-  * Drop old setPriority related code
-  * Transceiver: fix segfault during init if IP addr binding fails
-  * Transceiver: Check return value when binding IP addr for clock socket
-  * Transceiver: Clean up receival of downlink bursts
-  * Transceiver: Fix idle ul burst indications being dropped
-  * Transceiver: exit process when BTS drops connection
-  * Transceiver: Enable EDGE detection only on PDCH timeslots
-  * lms: Log available antennas if requested antenna fails
-  * device: Use LOGCHAN in set_antennas()
-  * Transceiver: Fix logging TN and version
-  * Transceiver: Use LOGCHAN in logRxBurst to unify log format
-  * Transceiver: Log error condition no burst in pullRadioVector()
-  * Transceiver: pullRadioVector(): Fix use of uninitialized value bi->tn
-  * Transceiver: Don't stop TRX if pulling from OFF timeslot
-  * radioInterface: Rename mRadio to mDevice
-  * radioInterfaceMulti: Check equals zero explicitly
-  * USRPDevice: Fix setRxGain return on error and getRxGain() returning always 0
-  * USRPDevice: Return previous txGain if setting value failed
-  * LMSDevice: Return previous txGain/rxGain if setting value failed
-  * radioInterface: Remove unusued getRxGain()
-  * radioDevice: Introduce getTxGain() API
-  * radioInterfaceMulti: Override setTxGain() to avoid chan!=0 calls
-  * UHDDevice: Drop unneeded MULTI_ARFCN checks
-  * radioInterface{Multi,Resamp}: Fix successful writeSamples() masking underrun from readSamples()
-  * radioInterface: Mark setRxGain as virtual
-  * Move multi-ARFCN chan amount modification from UHDDevice to parent class
-  * radioInterface: Atomically fetch and change underrun variable
-  * radioInterfaceMulti: write frequency offset direction (rx/tx) in log line
-  * Use new libosmocore logging lock API
-  * Transceiver: Fix wrong response upon CMD HANDOVER failure
-  * uhd: use value already cached in tmp variable
-  * Transceiver.cpp: Introduce and use new logging categories
-
-  [ Timo Jacobus ]
-  * Transceiver: Fixed copying of history into and from channelizer buffer.
-
-  [ Alexander Chemeris ]
-  * vty: Don't enable random filler bursts automatically with EDGE.
-  * vty: Simplify filler burst settings and improve help and readability.
-
-  [ Martin Hauke ]
-  * Fix common misspellings and typos
-
-  [ Harald Welte ]
-  * trx: exit() on unsupported positional arguments on command line
-
- -- Pau Espin Pedrol <pespin@sysmocom.de>  Fri, 03 Jan 2020 19:54:00 +0100
-
-osmo-trx (1.1.1) unstable; urgency=medium
-
-  * UNRELEASED
-
- -- Pau Espin Pedrol <pespin@sysmocom.de>  Thu, 08 Aug 2019 13:00:05 +0200
-
-osmo-trx (1.1.0) unstable; urgency=medium
-
-  [ Sylvain Munaut ]
-  * arm/convolve: Fix the vfp4 real convolution for h_len=12
-  * convolve: Remove support for step, offset parameters
-  * tests: Rework the convolve_test
-  * tests: Re-enable the convolve_test by default
-  * sigProcLib: Add C/I (Carrier-to-Interference ratio) computation
-
-  [ Vadim Yanitskiy ]
-  * VTY: add extended (11-bit) RACH detection toggle
-  * doc/configuration.adoc: fix incorrect number of physical RF channels for B210
-  * driveTxPriorityQueue(): cosmetic: use proper type for TDMA TN
-  * driveTxPriorityQueue(): use trxd_hdr_common for message parsing
-  * driveTxPriorityQueue(): check if message header format is supported
-  * driveTxPriorityQueue(): enrich logging message
-  * trxd_fill_common(): fix TRXD header version coding
-  * manuals/configuration.adoc: fix copy-paste error in config example
-
-  [ Pau Espin Pedrol ]
-  * osmo-trx: Avoid handling signals after shutdown triggered
-  * osmo-trx: Use signalfd to serialize signals in main thread ctx
-  * osmo-trx: Check return code of osmo_fd_register
-  * lms: flush_recv: alloc buf on stack instead of heap
-  * lms: Improve log during flush recv error
-  * cosmetic: Threads.h: Remove trailing whitespace
-  * Move duplicated thread_enable_cancel to CommonLibs
-  * lms: Log underrun/overrun events
-  * lms: Remove references to ALERT loglevel
-  * lms: Remove unused var m_last_tx_overruns
-  * lms: Catch and log dropped packets by HW during recv
-  * cosmetic: uhd: Move smpl_buf out of UHDDevice, move UHDDevice class definition to .h
-  * uhd: smpl_buf: Drop UHD specifics out back to UHDDevice
-  * uhd: smpl_buf: Use TIMESTAMP type in str_status
-  * cosmetic: uhd: Use loglevel ERROR instead of ERR
-  * uhd: Avoid reallocation of buffers every read
-  * Move smpl_buf out of uhd dir to re-use it in other devices
-  * device: Drop unused numberRead/numberWritten APIs
-  * smpl_buf: Remove unused clk_rt variable
-  * smpl_buf: Remove unused clk_rt variable (fixup)
-  * smpl_buf: Remove dbg log line with duplicated info
-  * Introduce LOGCHAN macro to standarize logging channel info
-  * smpl_buf: Move it to device/common and create libdevice_common.la
-  * lms: Use smpl_buf to recover from timestamp jumps
-  * lms: Fix stream_stats checks with droppedPackets
-  * Add rate_ctr support to store/retrieve SDR errors through VTY
-  * Rename and move STOP signal from Transceiver to main
-  * doc: vty: Update trx_vty_reference.xml
-  * lms: Drop unusued variable masterClockRate
-  * lms: Fix stream_stats checks with overrun/underrun
-  * Add VTY commands to set error ctr thresholds
-  * Remove AUTHORS file
-  * trx_{vty,rate_ctr}: Set proper license AGPLv3+
-  * Introduce structs to encode TRXD packets
-  * Transceiver: refactor: gather uplink burst parameters in struct
-  * Transceiver: Drop unused rssi_valid struct field
-  * Transceiver: Move nbits burst size calculation to pullRadioVector()
-  * Transceiver: Move calculation of normalized values (rssiOffset) to pullRadioVector()
-  * Transceiver: Move soft bits normalization to pullRadioVector()
-  * Transceiver: Drop use of GSM::Time from trx_ul_burst_ind
-  * Transceiver: Get rid of SoftVector in struct trx_ul_burst_ind
-  * Transceiver: replace UDPSocket with libosmocore socket API
-  * Transceiver: Avoid noise calculation formula in 2 branches in pullRadioVector
-  * Transceiver: Simplify code on early error return when calling detectAnyBurst
-  * Transceiver: pullRadioVector(): Move initialization of var to start of function
-  * Transceiver: Support pulling idle frames in pullRadioVector()
-  * sigProcLib: detectAnyBurst() family: Use struct to gather all out params
-  * sigProcLib: detectAnyBurst(): make TSC used to detect burst available to caller
-  * Logger: global Log mutex is now available from C code
-  * Transceiver: Move out TRXD socket send code to prepare for TRXDv1
-  * Transceiver: Support SETFORMAT command
-  * Transceiver: Support TRXD v1
-  * Transceiver: Initialize mExtRACH in constructor
-  * debian/copyright: Remove non existent radioInterfaceDiversity.cpp from list
-  * debian/copyright: Update wrong paths in license list
-  * debian/copyright: Add missing file Utils.* to LGPL-2.1+ list
-  * cosmetic: Fix trailing whitespace in several files
-  * Add SPDX annotation
-  * Bind CTRL port to IP addr specified in VTY config
-  * Transceiver: Store TRXD version per channel
-  * Transceiver: Clean up code passing parameters to threads
-  * Remove empty ChangeLog fnd NEWS files
-  * Remove unused autogen.sh
-  * radioInterface: Clarify how underruns are handled driving a radioDevice
-  * usrp1: don't check for non-null underrun pointer
-  * jenkins.sh: Workaround libusrp build race conditon
-  * lms: Drop rx_underruns rate ctr, add tx_drop_* rate ctr
-  * Move inband-signaling-usb documentation to UserManual
-  * Move matlab files under utils/matlab
-  * Move Transceiver52/README to UserManual
-  * Move README.DFEsymbolspaced to utils/matlab
-  * Move std_inband.rbf under device/usrp1/ dir
-  * Drop old README information, provide new updated README
-  * Transceiver: Add missing include netinet/in.h
-  * Require newer version of libosmocore to avoid build failure
-
-  [ Tom Tsou ]
-  * multi-ARFCN: fix maximum number of carriers limitation
-
-  [ Harald Welte ]
-  * use BSC_FD_READ and not OSMO_FD_READ
-  * proto_trxd.c: Use bit-wise AND, not boolean AND
-  * Timeval: Restore output stream flags after changing them
-  * ChannelizerBase: fix initialization of class members
-  * CorrelationSequence: fix initialization of class members
-  * radioInterface.cpp: Fix missing member initialization of RadioInterface()
-
-  [ Joachim Steiger ]
-  * lms: Remove wrong unused code copied from -uhd
-  * lms: move LMS_EnableChannel from Start/Stop to Open/Close device
-  * lms: move LMS_GetLPFBWRange and LMS_Calibrate calls from open to start
-  * lms: add device type detection and device specific gains
-  * lms: properly call close if set_antennas() fails, add some comments
-
-  [ Oliver Smith ]
-  * debian: create -doc subpackage with pdf manuals
-  * contrib/jenkins.sh: run "make maintainer-clean"
-
-  [ Eric Wild ]
-  * Add option to set stack size in config file, default == 0 == OS default
-
-  [ Ruben Undheim ]
-  * Fix spelling discovered by lintian
-
- -- Pau Espin Pedrol <pespin@sysmocom.de>  Wed, 07 Aug 2019 21:12:56 +0200
-
 osmo-trx (1.0.0) unstable; urgency=medium
 
   [ Pau Espin Pedrol ]

debian/control

@@ -14,8 +14,7 @@ Build-Depends: debhelper (>= 9),
                libtalloc-dev,
                libusrp-dev,
                liblimesuite-dev,
-               libosmocore-dev (>= 1.3.0),
-               osmo-gsm-manuals-dev
+               libosmocore-dev (>= 0.10.0)
 Standards-Version: 3.9.6
 Vcs-Browser: http://cgit.osmocom.org/osmo-trx
 Vcs-Git: git://git.osmocom.org/osmo-trx
@@ -90,12 +89,3 @@ Description: SDR transceiver that implements Layer 1 of a GSM BTS (LimeSuite)
  3GPP is the "3rd Generation Partnership Project" which is the collaboration
  between different telecommunication associations for developing new
  generations of mobile phone networks. (post-2G/GSM)
-
-Package: osmo-trx-doc
-Architecture: all
-Section: doc
-Priority: optional
-Depends: ${misc:Depends}
-Description: ${misc:Package} PDF documentation
- Various manuals: user manual, VTY reference manual and/or
- protocol/interface manuals.

debian/copyright

@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: OsmoTRX
 Source: http://cgit.osmocom.org/osmo-trx/
-Files-Excluded: Transceiver52M/device/usrp1/std_inband.rbf
+Files-Excluded: Transceiver52M/std_inband.rbf
 
 Files: *
 Copyright: 2008-2013 Free Software Foundation
@@ -9,14 +9,13 @@ Copyright: 2008-2013 Free Software Foundation
            2010-2012 Range Networks, Inc.
 License: AGPL-3+
 
-Files: Transceiver52M/arch/arm/*
-       Transceiver52M/arch/x86/*
-       Transceiver52M/arch/common/*
+Files: Transceiver52M/arm/*
+       Transceiver52M/x86/*
+       Transceiver52M/common/*
        Transceiver52M/Resampler.cpp
        Transceiver52M/Resampler.h
-       Transceiver52M/Utils.cpp
-       Transceiver52M/Utils.h
        Transceiver52M/osmo-trx.cpp
+       Transceiver52M/radioInterfaceDiversity.cpp
 Copyright: 2012-2013 Thomas Tsou <tom@tsou.cc>
 License: LGPL-2.1+
 
@@ -48,6 +47,11 @@ Copyright: 2008-2010 Free Software Foundation
            2010-2012 Range Networks, Inc.
 License: GPL-3+
 
+Files: autogen.sh
+Copyright: 2005-2009 United States Government as represented by
+                     the U.S. Army Research Laboratory.
+License: BSD-3-clause
+
 Files: debian/*
 Copyright: 2015 Ruben Undheim <ruben.undheim@gmail.com>
 License: GPL-3+

debian/osmo-trx-doc.install

@@ -1 +0,0 @@
-usr/share/doc/osmo-trx-doc/*.pdf

debian/patches/build-for-debian8.patch

@@ -1,16 +1,16 @@
-diff --git a/debian/control b/debian/control
-index 8ff59f0..126c16a 100644
---- a/debian/control
-+++ b/debian/control
+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 (>= 1.3.0),
-                osmo-gsm-manuals-dev
+                libosmocore-dev (>= 0.10.0)
  Standards-Version: 3.9.6
-@@ -30,7 +29,7 @@ Package: osmo-trx-dbg
+ Vcs-Browser: http://cgit.osmocom.org/osmo-trx
+@@ -29,7 +28,7 @@ Package: osmo-trx-dbg
  Architecture: any
  Section: debug
  Priority: extra
@@ -19,10 +19,11 @@ index 8ff59f0..126c16a 100644
  Description: Debug symbols for the osmo-trx-*
   Make debugging possible
  
-@@ -72,25 +71,6 @@ Description: SDR transceiver that implements Layer 1 of a GSM BTS (USRP1)
+@@ -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}
@@ -41,20 +42,16 @@ index 8ff59f0..126c16a 100644
 - 3GPP is the "3rd Generation Partnership Project" which is the collaboration
 - between different telecommunication associations for developing new
 - generations of mobile phone networks. (post-2G/GSM)
--
- Package: osmo-trx-doc
- Architecture: all
- Section: doc
-diff --git a/debian/rules b/debian/rules
-index 627c0c8..d9285e2 100755
---- a/debian/rules
-+++ b/debian/rules
+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 --enable-manuals
-+	dh_auto_configure -- --with-uhd --with-usrp1 --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals
+-	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/rules

@@ -9,11 +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 --enable-manuals
+	dh_auto_configure -- --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system
 
 override_dh_strip:
 	dh_strip --dbg-package=osmo-trx-dbg
-
-# Don't create .pdf.gz files (barely saves space and they can't be opened directly by most pdf readers)
-override_dh_compress:
-	dh_compress -X.pdf

doc/manuals/Makefile.am

@@ -12,6 +12,5 @@ if BUILD_MANUALS
   VTY_REFERENCE = osmotrx-vty-reference.xml
   include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc
 
-  OSMO_REPOSITORY = osmo-trx
   include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc
 endif

doc/manuals/chapters/configuration.adoc

@@ -12,7 +12,7 @@ Example configuration files for different devices and setups can be found in
 
 === Documented example
 
-.Example: Single carrier configuration
+.Example: Static GGSN/APN configuration (single catch-all GGSN)
 ----
 trx
  bind-ip 127.0.0.1 <1>
@@ -46,16 +46,15 @@ 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 more than 2 TRXs 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.
+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 TRXs through multi-ARFCN
+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.