lms: Fix coding style

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

Change-Id: Ib7ddd275014f03a2eed3cddc02b1356e2b00c0bc

.gitignore

@@ -2,20 +2,22 @@
 *.o
 *.lo
 *.la
-Transceiver52M/osmo-trx
+Transceiver52M/osmo-trx-uhd
+Transceiver52M/osmo-trx-usrp1
+Transceiver52M/osmo-trx-lms
 
 # tests
-CommonLibs/BitVectorTest
-CommonLibs/ConfigurationTest
-CommonLibs/F16Test
-CommonLibs/InterthreadTest
-CommonLibs/LogTest
-CommonLibs/RegexpTest
-CommonLibs/SocketsTest
-CommonLibs/TimevalTest
-CommonLibs/URLEncodeTest
-CommonLibs/VectorTest
-CommonLibs/PRBSTest
+tests/CommonLibs/BitVectorTest
+tests/CommonLibs/F16Test
+tests/CommonLibs/InterthreadTest
+tests/CommonLibs/LogTest
+tests/CommonLibs/RegexpTest
+tests/CommonLibs/SocketsTest
+tests/CommonLibs/TimevalTest
+tests/CommonLibs/URLEncodeTest
+tests/CommonLibs/VectorTest
+tests/CommonLibs/PRBSTest
+tests/Transceiver52M/convolve_test
 
 # automake/autoconf
 *.in
@@ -41,6 +43,11 @@ ltmain.sh
 missing
 stamp-h1
 INSTALL
+tests/package.m4
+tests/testsuite
+tests/atconfig
+tests/testsuite.dir
+tests/testsuite.log
 
 # vim
 *.sw?

AUTHORS

@@ -1,18 +1,18 @@
 #
 # 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.
@@ -23,34 +23,17 @@ David A. Burgess, dburgess@kestrelsp.com:
     CLI/CLI.h
     CommonLibs/Assert.h
     CommonLibs/BitVector.cpp
-    CommonLibs/BitVectorTest.cpp
-    CommonLibs/Configuration.cpp
-    CommonLibs/Configuration.h
-    CommonLibs/ConfigurationTest.cpp
     CommonLibs/Interthread.h
-    CommonLibs/InterthreadTest.cpp
     CommonLibs/LinkedLists.cpp
     CommonLibs/LinkedLists.h
     CommonLibs/Regexp.h
-    CommonLibs/RegexpTest.cpp
     CommonLibs/Sockets.cpp
     CommonLibs/Sockets.h
-    CommonLibs/SocketsTest.cpp
     CommonLibs/Threads.cpp
     CommonLibs/Threads.h
     CommonLibs/Timeval.cpp
     CommonLibs/Timeval.h
-    CommonLibs/TimevalTest.cpp
     CommonLibs/Vector.h
-    CommonLibs/VectorTest.cpp
-    Control/CallControl.cpp
-    Control/ControlCommon.cpp
-    Control/ControlCommon.h
-    Control/FACCHDispatch.cpp
-    Control/MobilityManagement.cpp
-    Control/PagerTest.cpp
-    Control/RadioResource.cpp
-    Control/SDCCHDispatch.cpp
     GSM/GSM610Tables.cpp
     GSM/GSM610Tables.h
     GSM/GSMCommon.cpp
@@ -82,29 +65,15 @@ David A. Burgess, dburgess@kestrelsp.com:
     GSM/GSMTransfer.cpp
     GSM/GSMTransfer.h
     LICENSEBLOCK
-    SIP/SIPEngine.h
-    SIP/SIPInterface.h
-    SMS/SMSMessages.cpp
-    SMS/SMSMessages.h
-    SMS/SMSTransfer.cpp
-    SMS/SMSTransfer.h
     TRXManager/TRXManager.cpp
     Transceiver/Complex.h
-    apps/OpenBTS900.cpp
-    apps/OpenBTS850.cpp
-    apps/OpenBTS25c3.cpp
-    tests/AGCHTest.cpp
-    tests/BeaconTest.cpp
-    tests/CallTest.cpp
-    tests/CallTest2.cpp
-    tests/LAPDmTest.cpp
-    tests/LoopbackTest.cpp
-    tests/RegistrationTest.cpp
-    tests/TRXSimulator.cpp
+    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:
-    Control/PagerTest.cpp
-    Control/RadioResource.cpp
     GSM/GSMConfig.h
     GSM/GSMTransfer.h
     LICENSEBLOCK
@@ -126,13 +95,6 @@ Harvind S. Samra, hssamra@kestrelsp.com:
     Transceiver/testRadio.cpp
 
 Raffi Sevlian, raffisev@gmail.com:
-    Control/CallControl.cpp
-    Control/ControlCommon.cpp
-    Control/ControlCommon.h
-    Control/FACCHDispatch.cpp
-    Control/MobilityManagement.cpp
-    Control/PagerTest.cpp
-    Control/RadioResource.cpp
     GSM/GSMCommon.h
     GSM/GSMConfig.h
     GSM/GSML1FEC.h
@@ -157,36 +119,9 @@ Raffi Sevlian, raffisev@gmail.com:
     GSM/GSMSAPMux.h
     GSM/GSMTransfer.h
     LICENSEBLOCK
-    SIP/SIPEngine.cpp
-    SIP/SIPInterface.cpp
-    SIP/SIPInterface.h
-    SIP/SIPMessage.cpp
-    SIP/SIPMessage.h
-    SIP/SIPUtility.cpp
-    SIP/SIPUtility.h
-    SMS/CMMessage.cpp
-    SMS/CMMessage.h
-    SMS/CMProcessor.cpp
-    SMS/CMProcessor.h
-    SMS/CMTest.cpp
-    SMS/RLMessage.cpp
-    SMS/RLMessage.h
-    SMS/RLProcessor.cpp
-    SMS/RLProcessor.h
-    SMS/SMSMessages.cpp
-    SMS/SMSMessages.h
-    SMS/SMSProcessors.cpp
-    SMS/SMSProcessors.h
-    SMS/SMSTransfer.cpp
-    SMS/SMSTransfer.h
-    SMS/TLMessage.cpp
-    SMS/TLMessage.h
-    SMS/TLProcessor.cpp
-    SMS/TLProcessor.h
     TRXManager/TRXManager.h
 
 Alon Levy, alonlevy1@gmail.com
     RRLPMessages.cpp
     RRLPMessages.h
     RRLPTest.cpp
-

COPYING

@@ -673,16 +673,16 @@ on the AGPLv3 text.
 =========================================================================
 
 
-ADDITIONAL TERMS TO THE AGPLv3 LICENSE FOR OPENBTS
+ADDITIONAL TERMS TO THE AGPLv3 LICENSE FOR OsmoTRX
 
 
 Permissive Terms Supplementing the License
 
 1. Remote Interaction Through IP Networks.
 
-OpenBTS includes an implementation of the GSM network cellular air interface,
+OsmoTRX is an implementation of the GSM network cellular air interface,
 as well as other interfaces to IP networks.  The interaction of cellular
-handsets with the OpenBTS software is considered "remote network interaction"
+handsets with the OsmoTRX software is considered "remote network interaction"
 for the purposes of the Affero General Public License and cellular users are
 subject to the source code access requirements of Section 13 of AGPLv3 ("Remote
 Network Interaction; Use with the GNU General Public License").
@@ -694,17 +694,6 @@ interfaces other than the GSM air interface from the requirements of Section 13
 is an additional permission granted to you.  
 
 
-Non-Permissive Terms Supplementing The License
-
-1. Trademarks.
-
-"OpenBTS" is a trademark of Range Networks, Inc., registered with
-the US Patent and Trademark Office.  Your use of OpenBTS software under a GPL
-license does not include the right to use the OpenBTS trademark in commerce.
-This additional non-permissive term is consistent with Section 7 of the AGPLv3
-license.
-
-
 END OF ADDITIONAL TERMS
 
 
@@ -712,13 +701,8 @@ END OF ADDITIONAL TERMS
 How to comply with Section 13 of the AGPLv3 license.
 
 The recommended method for compliance with Section 13 of the AGPLv3 license is
-to deliver a text message to each handset that attaches to the OpenBTS cellular
-network.  At a minimum, that text message should include the string "OpenBTS
-AGPLv3" and a URL that can be used to access the OpenBTS source code.  This
+to deliver a text message to each handset that attaches to the cellular
+network which uses OsmoTRX.  At a minimum, that text message should include the string
+"OsmoTRX AGPLv3" and a URL that can be used to access the OsmoBTS source code.  This
 message need not be delivered to handsets that are denied registration with the
 network, since those handsets have been denied service.
-
-In OpenBTS 2.6, such text messages can be delivered with the "Welcome Message"
-feature.  See the OpenBTS.config.example file for more information on the use of
-this feature for AGPLv3 compliance.
-

CommonLibs/Configuration.h

@@ -1,422 +0,0 @@
-/*
-* Copyright 2009, 2010 Free Software Foundation, Inc.
-* Copyright 2010 Kestrel Signal Processing, Inc.
-* Copyright 2011, 2012 Range Networks, 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 CONFIGURATION_H
-#define CONFIGURATION_H
-
-
-#include "sqlite3util.h"
-
-#include <assert.h>
-#include <stdlib.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <regex.h>
-
-#include <map>
-#include <vector>
-#include <string>
-#include <sstream>
-#include <iostream>
-
-#include <Threads.h>
-#include <stdint.h>
-
-
-/** A class for configuration file errors. */
-class ConfigurationTableError {};
-extern char gCmdName[];	// Gotta be global, gotta be char*, gotta love it.
-
-/** An exception thrown when a given config key isn't found. */
-class ConfigurationTableKeyNotFound : public ConfigurationTableError {
-
-	private:
-
-	std::string mKey;
-
-	public:
-
-	ConfigurationTableKeyNotFound(const std::string& wKey)
-		:mKey(wKey)
-	{ }
-
-	const std::string& key() const { return mKey; }
-
-};
-
-
-class ConfigurationRecord {
-
-	private:
-
-	std::string mValue;
-	long mNumber;
-	bool mDefined;
-
-	public:
-
-	ConfigurationRecord(bool wDefined=true):
-		mDefined(wDefined)
-	{ }
-
-	ConfigurationRecord(const std::string& wValue):
-		mValue(wValue),
-		mNumber(strtol(wValue.c_str(),NULL,0)),
-		mDefined(true)
-	{ }
-
-	ConfigurationRecord(const char* wValue):
-		mValue(std::string(wValue)),
-		mNumber(strtol(wValue,NULL,0)),
-		mDefined(true)
-	{ }
-
-
-	const std::string& value() const { return mValue; }
-	long number() const { return mNumber; }
-	bool defined() const { return mDefined; }
-
-	float floatNumber() const;
-
-};
-
-
-/** A string class that uses a hash function for comparison. */
-class HashString : public std::string {
-
-
-	protected:
-
-	uint64_t mHash;
-
-	void computeHash();
-
-
-	public:
-
-	HashString(const char* src)
-		:std::string(src)
-	{
-		computeHash();
-	}
-
-	HashString(const std::string& src)
-		:std::string(src)
-	{
-		computeHash();
-	}
-
-	HashString()
-	{
-		mHash=0;
-	}
-
-	HashString& operator=(std::string& src)
-	{
-		std::string::operator=(src);
-		computeHash();
-		return *this;
-	}
-
-	HashString& operator=(const char* src)
-	{
-		std::string::operator=(src);
-		computeHash();
-		return *this;
-	}
-
-	bool operator==(const HashString& other)
-	{
-		return mHash==other.mHash;
-	}
-
-	bool operator<(const HashString& other)
-	{
-		return mHash<other.mHash;
-	}
-
-	bool operator>(const HashString& other)
-	{
-		return mHash<other.mHash;
-	}
-
-	uint64_t hash() const { return mHash; }
-
-};
-
-
-typedef std::map<std::string, ConfigurationRecord> ConfigurationRecordMap;
-typedef std::map<HashString, ConfigurationRecord> ConfigurationMap;
-class ConfigurationKey;
-typedef std::map<std::string, ConfigurationKey> ConfigurationKeyMap;
-
-/**
-	A class for maintaining a configuration key-value table,
-	based on sqlite3 and a local map-based cache.
-	Thread-safe, too.
-*/
-class ConfigurationTable {
-
-	private:
-
-	sqlite3* mDB;				///< database connection
-	ConfigurationMap mCache;	///< cache of recently access configuration values
-	mutable Mutex mLock;		///< control for multithreaded access to the cache
-	std::vector<std::string> (*mCrossCheck)(const std::string&);	///< cross check callback pointer
-
-	public:
-
-	ConfigurationKeyMap mSchema;///< definition of configuration default values and validation logic
-
-	ConfigurationTable(const char* filename = ":memory:", const char *wCmdName = 0, ConfigurationKeyMap wSchema = ConfigurationKeyMap());
-
-	/** Generate an up-to-date example sql file for new installs. */
-	std::string getDefaultSQL(const std::string& program, const std::string& version);
-
-	/** Generate an up-to-date TeX snippet. */
-	std::string getTeX(const std::string& program, const std::string& version);
-
-	/** Return true if the key is used in the table.  */
-	bool defines(const std::string& key);
-
-	/** Return true if the application's schema knows about this key. */
-	bool keyDefinedInSchema(const std::string& name);
-
-	/** Return true if the provided value validates correctly against the defined schema. */
-	bool isValidValue(const std::string& name, const std::string& val);
-
-	/** Return true if the provided value validates correctly against the defined schema. */
-	bool isValidValue(const std::string& name, const int val) { std::stringstream ss; ss << val; return isValidValue(name, ss.str()); }
-
-	/** Return a map of all similar keys in the defined schema. */
-	ConfigurationKeyMap getSimilarKeys(const std::string& snippet);
-
-	/** Return true if this key is identified as static. */
-	bool isStatic(const std::string& key);
-
-	/**
-		Get a string parameter from the table.
-		Throw ConfigurationTableKeyNotFound if not found.
-	*/
-	std::string getStr(const std::string& key);
-
-
-	/**
-		Get a boolean from the table.
-		Return false if NULL or 0, true otherwise.
-	*/
-	bool getBool(const std::string& key);
-
-	/**
-		Get a numeric parameter from the table.
-		Throw ConfigurationTableKeyNotFound if not found.
-	*/
-	long getNum(const std::string& key);
-
-	/**
-		Get a vector of strings from the table.
-	*/
-	std::vector<std::string> getVectorOfStrings(const std::string& key);
-
-	/**
-		Get a float from the table.
-		Throw ConfigurationTableKeyNotFound if not found.
-	*/
-	float getFloat(const std::string& key);
-
-	/**
-		Get a numeric vector from the table.
-	*/
-	std::vector<unsigned> getVector(const std::string& key);
-
-	/** Get length of a vector */
-	unsigned getVectorLength(const std::string &key) 
-		{ return getVector(key).size(); }
-
-	/** Set or change a value in the table.  */
-	bool set(const std::string& key, const std::string& value);
-
-	/** Set or change a value in the table.  */
-	bool set(const std::string& key, long value);
-
-	/** Create an entry in the table, no value though. */
-	bool set(const std::string& key);
-
-	/**
-		Remove an entry from the table.
-		Will not alter required values.
-		@param key The key of the item to be removed.
-		@return true if anything was actually removed.
-	*/
-	bool remove(const std::string& key);
-
-	/** Search the table, dumping to a stream. */
-	void find(const std::string& pattern, std::ostream&) const;
-
-	/** Return all key/value pairs stored in the ConfigurationTable */
-	ConfigurationRecordMap getAllPairs() const;
-
-	/** Define the callback to purge the cache whenever the database changes. */
-	void setUpdateHook(void(*)(void *,int ,char const *,char const *,sqlite3_int64));
-
-	/** Define the callback for cross checking. */
-	void setCrossCheckHook(std::vector<std::string> (*wCrossCheck)(const std::string&));
-
-	/** Execute the application specific value cross checking logic. */
-	std::vector<std::string> crossCheck(const std::string& key);
-
-	/** purege cache if it exceeds a certain age */
-	void checkCacheAge();
-
-	/** Delete all records from the cache. */
-	void purge();
-
-
-	private:
-
-	/**
-		Attempt to lookup a record, cache if needed.
-		Throw ConfigurationTableKeyNotFound if not found.
-		Caller should hold mLock because the returned reference points into the cache.
-	*/
-	const ConfigurationRecord& lookup(const std::string& key);
-
-};
-
-
-typedef std::map<HashString, std::string> HashStringMap;
-
-class SimpleKeyValue {
-
-	protected:
-
-	HashStringMap mMap;
-
-	public:
-
-	/** Take a C string "A=B" and set map["A"]="B". */
-	void addItem(const char*);
-
-	/** Take a C string "A=B C=D E=F ..." and add all of the pairs to the map. */
-	void addItems(const char*s);
-
-	/** Return a reference to the string at map["key"]. */
-	const char* get(const char*) const;
-};
-
-
-class ConfigurationKey {
-
-	public:
-
-	enum VisibilityLevel
-	{
-		CUSTOMER,
-		CUSTOMERSITE,
-		CUSTOMERTUNE,
-		CUSTOMERWARN,
-		DEVELOPER,
-		FACTORY
-	};
-
-	enum Type
-	{
-		BOOLEAN,
-		CHOICE_OPT,
-		CHOICE,
-		CIDR_OPT,
-		CIDR,
-		FILEPATH_OPT,
-		FILEPATH,
-		IPADDRESS_OPT,
-		IPADDRESS,
-		IPANDPORT,
-		MIPADDRESS_OPT,
-		MIPADDRESS,
-		PORT_OPT,
-		PORT,
-		REGEX_OPT,
-		REGEX,
-		STRING_OPT,
-		STRING,
-		VALRANGE
-	};
-
-	private:
-
-	std::string mName;
-	std::string mDefaultValue;
-	std::string mUnits;
-	VisibilityLevel mVisibility;
-	Type mType;
-	std::string mValidValues;
-	bool mIsStatic;
-	std::string mDescription;
-
-
-	public:
-
-	ConfigurationKey(const std::string& wName, const std::string& wDefaultValue, const std::string& wUnits, const VisibilityLevel wVisibility, const Type wType, const std::string& wValidValues, bool wIsStatic, const std::string& wDescription):
-		mName(wName),
-		mDefaultValue(wDefaultValue),
-		mUnits(wUnits),
-		mVisibility(wVisibility),
-		mType(wType),
-		mValidValues(wValidValues),
-		mIsStatic(wIsStatic),
-		mDescription(wDescription)
-	{ }
-
-	ConfigurationKey()
-	{ }
-
-	const std::string& getName() const { return mName; }
-	const std::string& getDefaultValue() const { return mDefaultValue; }
-	void updateDefaultValue(const std::string& newValue) { mDefaultValue = newValue; }
-	void updateDefaultValue(const int newValue) { std::stringstream ss; ss << newValue; updateDefaultValue(ss.str()); }
-	const std::string& getUnits() const { return mUnits; }
-	const VisibilityLevel& getVisibility() const { return mVisibility; }
-	const Type& getType() const { return mType; }
-	const std::string& getValidValues() const { return mValidValues; }
-	bool isStatic() const { return mIsStatic; }
-	const std::string& getDescription() const { return mDescription; }
-
-	static bool isValidIP(const std::string& ip);
-	static void getMinMaxStepping(const ConfigurationKey &key, std::string &min, std::string &max, std::string &stepping);
-	template<class T> static bool isInValRange(const ConfigurationKey &key, const std::string& val, const bool isInteger);
-	static const std::string visibilityLevelToString(const VisibilityLevel& visibility);
-	static const std::string typeToString(const ConfigurationKey::Type& type);
-	static void printKey(const ConfigurationKey &key, const std::string& currentValue, std::ostream& os);
-	static void printDescription(const ConfigurationKey &key, std::ostream& os);
-	static const std::string getARFCNsString();
-};
-
-
-#endif
-
-
-// vim: ts=4 sw=4

CommonLibs/ConfigurationTest.cpp

@@ -1,149 +0,0 @@
-/*
-* Copyright 2009, 2010 Free Software Foundation, Inc.
-* Copyright 2010 Kestrel Signal Processing, 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 "Configuration.h"
-#include <iostream>
-#include <string>
-
-using namespace std;
-
-ConfigurationKeyMap getConfigurationKeys();
-ConfigurationTable gConfig("exampleconfig.db","test", getConfigurationKeys());
-
-void purgeConfig(void*,int,char const*, char const*, sqlite3_int64)
-{
-	//cout << "update hook" << endl;
-	gConfig.purge();
-}
-
-
-int main(int argc, char *argv[])
-{
-
-	gConfig.setUpdateHook(purgeConfig);
-
-	const char *keys[5] = {"key1", "key2", "key3", "key4", "key5"};
-
-	for (int i=0; i<5; i++) {
-		gConfig.set(keys[i],i);
-	}
-
-	for (int i=0; i<5; i++) {
-		cout << "table[" << keys[i] << "]=" << gConfig.getStr(keys[i]) <<  endl;
-		cout << "table[" << keys[i] << "]=" << gConfig.getNum(keys[i]) <<  endl;
-	}
-
-	for (int i=0; i<5; i++) {
-		cout << "defined table[" << keys[i] << "]=" << gConfig.defines(keys[i]) <<  endl;
-	}
-
-	gConfig.set("key5","100 200 300  400 ");
-	std::vector<unsigned> vect = gConfig.getVector("key5");
-	cout << "vect length " << vect.size() << ": ";
-	for (unsigned i=0; i<vect.size(); i++) cout << " " << vect[i];
-	cout << endl;
-	std::vector<string> svect = gConfig.getVectorOfStrings("key5");
-	cout << "vect length " << svect.size() << ": ";
-	for (unsigned i=0; i<svect.size(); i++) cout << " " << svect[i] << ":";
-	cout << endl;
-
-	cout << "bool " << gConfig.getBool("booltest") << endl;
-	gConfig.set("booltest",1);
-	cout << "bool " << gConfig.getBool("booltest") << endl;
-	gConfig.set("booltest",0);
-	cout << "bool " << gConfig.getBool("booltest") << endl;
-
-	gConfig.getStr("newstring");
-	gConfig.getNum("numnumber");
-
-
-	SimpleKeyValue pairs;
-	pairs.addItems(" a=1 b=34 dd=143 ");
-	cout<< pairs.get("a") << endl;
-	cout<< pairs.get("b") << endl;
-	cout<< pairs.get("dd") << endl;
-
-	gConfig.set("fkey","123.456");
-	float fval = gConfig.getFloat("fkey");
-	cout << "fkey " << fval << endl;
-
-	cout << "search fkey:" << endl;
-	gConfig.find("fkey",cout);
-	cout << "search fkey:" << endl;
-	gConfig.find("fkey",cout);
-	gConfig.remove("fkey");
-	cout << "search fkey:" << endl;
-	gConfig.find("fkey",cout);
-
-	try {
-		gConfig.getNum("supposedtoabort");
-	} catch (ConfigurationTableKeyNotFound) {
-		cout << "ConfigurationTableKeyNotFound exception successfully caught." << endl;
-	}
-}
-
-ConfigurationKeyMap getConfigurationKeys()
-{
-	ConfigurationKeyMap map;
-	ConfigurationKey *tmp;
-
-	tmp = new ConfigurationKey("booltest","0",
-		"",
-		ConfigurationKey::DEVELOPER,
-		ConfigurationKey::BOOLEAN,
-		"",
-		false,
-		""
-	);
-	map[tmp->getName()] = *tmp;
-	free(tmp);
-
-	tmp = new ConfigurationKey("numnumber","42",
-		"",
-		ConfigurationKey::DEVELOPER,
-		ConfigurationKey::VALRANGE,
-		"0-100",
-		false,
-		""
-	);
-	map[tmp->getName()] = *tmp;
-	free(tmp);
-
-	tmp = new ConfigurationKey("newstring","new string value",
-		"",
-		ConfigurationKey::DEVELOPER,
-		ConfigurationKey::STRING,
-		"",
-		false,
-		""
-	);
-	map[tmp->getName()] = *tmp;
-	free(tmp);
-
-	return map;
-}

CommonLibs/Logger.cpp

@@ -1,7 +1,5 @@
 /*
-* Copyright 2009, 2010 Free Software Foundation, Inc.
-* Copyright 2010 Kestrel Signal Processing, Inc.
-* Copyright 2011, 2012 Range Networks, Inc.
+* Copyright (C) 2018 sysmocom - s.f.m.c. GmbH
 *
 *
 * This software is distributed under the terms of the GNU Affero Public License.
@@ -32,300 +30,32 @@
 #include <stdarg.h>
 #include <sys/time.h>	// For gettimeofday
 
-#include "Configuration.h"
 #include "Logger.h"
 #include "Threads.h"	// pat added
 
-
 using namespace std;
 
-// Switches to enable/disable logging targets
-// MUST BE DEFINED BEFORE gConfig FOR gLogEarly() TO WORK CORRECTLY
-bool gLogToConsole = true;
-bool gLogToSyslog = false;
-FILE *gLogToFile = NULL;
 Mutex gLogToLock;
 
-
-// Reference to a global config table, used all over the system.
-extern ConfigurationTable gConfig;
-
-
-/**@ The global alarms table. */
-//@{
-Mutex           alarmsLock;
-list<string>    alarmsList;
-void            addAlarm(const string&);
-//@}
-
-
-
-// (pat) If Log messages are printed before the classes in this module are inited
-// (which happens when static classes have constructors that do work)
-// the OpenBTS just crashes.
-// Prevent that by setting sLoggerInited to true when this module is inited.
-static bool sLoggerInited = 0;
-static struct CheckLoggerInitStatus {
-	CheckLoggerInitStatus() { sLoggerInited = 1; }
-} sCheckloggerInitStatus;
-
-
-
-/** Names of the logging levels. */
-const char *levelNames[] = {
-	"EMERG", "ALERT", "CRIT", "ERR", "WARNING", "NOTICE", "INFO", "DEBUG"
-};
-int numLevels = 8;
-
-
-int levelStringToInt(const string& name)
-{
-	// Reverse search, since the numerically larger levels are more common.
-	for (int i=numLevels-1; i>=0; i--) {
-		if (name == levelNames[i]) return i;
-	}
-
-	// Common substitutions.
-	if (name=="INFORMATION") return 6;
-	if (name=="WARN") return 4;
-	if (name=="ERROR") return 3;
-	if (name=="CRITICAL") return 2;
-	if (name=="EMERGENCY") return 0;
-
-	// Unknown level.
-	return -1;
-}
-
-/** Given a string, return the corresponding level name. */
-int lookupLevel(const string& key)
-{
-	string val = gConfig.getStr(key);
-	int level = levelStringToInt(val);
-
-	if (level == -1) {
-		string defaultLevel = gConfig.mSchema["Log.Level"].getDefaultValue();
-		level = levelStringToInt(defaultLevel);
-		_LOG(CRIT) << "undefined logging level (" << key << " = \"" << val << "\") defaulting to \"" << defaultLevel << ".\" Valid levels are: EMERG, ALERT, CRIT, ERR, WARNING, NOTICE, INFO or DEBUG";
-		gConfig.set(key, defaultLevel);
-	}
-
-	return level;
-}
-
-static std::string format(const char *fmt, ...)
-{
-	va_list ap;
-	char buf[300];
-	va_start(ap,fmt);
-	int n = vsnprintf(buf,300,fmt,ap);
-	va_end(ap);
-	if (n >= (300-4)) { strcpy(&buf[(300-4)],"..."); }
-	return std::string(buf);
-}
-
-const std::string timestr()
-{
-	struct timeval tv;
-	struct tm tm;
-	gettimeofday(&tv,NULL);
-	localtime_r(&tv.tv_sec,&tm);
-	unsigned tenths = tv.tv_usec / 100000;	// Rounding down is ok.
-	return format(" %02d:%02d:%02d.%1d",tm.tm_hour,tm.tm_min,tm.tm_sec,tenths);
-}
-
 std::ostream& operator<<(std::ostream& os, std::ostringstream& ss)
 {
 	return os << ss.str();
 }
 
-int getLoggingLevel(const char* filename)
-{
-	// Default level?
-	if (!filename) return lookupLevel("Log.Level");
-
-	// This can afford to be inefficient since it is not called that often.
-	const string keyName = string("Log.Level.") + string(filename);
-	if (gConfig.defines(keyName)) return lookupLevel(keyName);
-	return lookupLevel("Log.Level");
-}
-
-
-
-int gGetLoggingLevel(const char* filename)
-{
-	// This is called a lot and needs to be efficient.
-
-	static Mutex sLogCacheLock;
-	static map<uint64_t,int>  sLogCache;
-	static unsigned sCacheCount;
-	static const unsigned sCacheRefreshCount = 1000;
-
-	if (filename==NULL) return gGetLoggingLevel("");
-
-	HashString hs(filename);
-	uint64_t key = hs.hash();
-
-	sLogCacheLock.lock();
-	// Time for a cache flush?
-	if (sCacheCount>sCacheRefreshCount) {
-		sLogCache.clear();
-		sCacheCount=0;
-	}
-	// Is it cached already?
-	map<uint64_t,int>::const_iterator where = sLogCache.find(key);
-	sCacheCount++;
-	if (where!=sLogCache.end()) {
-		int retVal = where->second;
-		sLogCacheLock.unlock();
-		return retVal;
-	}
-	// Look it up in the config table and cache it.
-	// FIXME: Figure out why unlock and lock below fix the config table deadlock.
-	// (pat) Probably because getLoggingLevel may call LOG recursively via lookupLevel().
-	sLogCacheLock.unlock();
-	int level = getLoggingLevel(filename);
-	sLogCacheLock.lock();
-	sLogCache.insert(pair<uint64_t,int>(key,level));
-	sLogCacheLock.unlock();
-	return level;
-}
-
-
-
-
-
-// copies the alarm list and returns it. list supposed to be small.
-list<string> gGetLoggerAlarms()
-{
-    alarmsLock.lock();
-    list<string> ret;
-    // excuse the "complexity", but to use std::copy with a list you need
-    // an insert_iterator - copy technically overwrites, doesn't insert.
-    insert_iterator< list<string> > ii(ret, ret.begin());
-    copy(alarmsList.begin(), alarmsList.end(), ii);
-    alarmsLock.unlock();
-    return ret;
-}
-
-/** Add an alarm to the alarm list. */
-void addAlarm(const string& s)
-{
-    alarmsLock.lock();
-    alarmsList.push_back(s);
-	unsigned maxAlarms = gConfig.getNum("Log.Alarms.Max");
-    while (alarmsList.size() > maxAlarms) alarmsList.pop_front();
-    alarmsLock.unlock();
-}
-
-
 Log::~Log()
 {
-	if (mDummyInit) return;
-	// Anything at or above LOG_CRIT is an "alarm".
-	// Save alarms in the local list and echo them to stderr.
-	if (mPriority <= LOG_ERR) {
-		if (sLoggerInited) addAlarm(mStream.str().c_str());
-		cerr << mStream.str() << endl;
-	}
-	// Current logging level was already checked by the macro. So just log.
-	// Log to syslog
-	if (gLogToSyslog) {
-		syslog(mPriority, "%s", mStream.str().c_str());
-	}
-	// Log to file and console
-	if (gLogToConsole||gLogToFile) {
-		int mlen = mStream.str().size();
-		int neednl = (mlen==0 || mStream.str()[mlen-1] != '\n');
-		ScopedLock lock(gLogToLock);
-		if (gLogToConsole) {
-			// The COUT() macro prevents messages from stomping each other but adds uninteresting thread numbers,
-			// so just use std::cout.
-			std::cout << mStream.str();
-			if (neednl) std::cout<<"\n";
-		}
-		if (gLogToFile) {
-			fputs(mStream.str().c_str(),gLogToFile);
-			if (neednl) {fputc('\n',gLogToFile);}
-			fflush(gLogToFile);
-		}
-	}
+	int mlen = mStream.str().size();
+	int neednl = (mlen==0 || mStream.str()[mlen-1] != '\n');
+	const char *fmt = neednl ? "%s\n" : "%s";
+	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());
 }
 
-
-Log::Log(const char* name, const char* level, int facility)
-{
-	mDummyInit = true;
-	gLogInit(name, level, facility);
-}
-
-
 ostringstream& Log::get()
 {
-	assert(mPriority<numLevels);
-	mStream << levelNames[mPriority] <<  ' ';
 	return mStream;
 }
 
-
-
-void gLogInit(const char* name, const char* level, int facility)
-{
-	// Set the level if one has been specified.
-	if (level) {
-		gConfig.set("Log.Level",level);
-	}
-
-	// Both the transceiver and OpenBTS use this same facility, but only OpenBTS/OpenNodeB may use this log file:
-	string str = gConfig.getStr("Log.File");
-	if (gLogToFile==NULL && str.length() && 0==strncmp(gCmdName,"Open",4)) {
-		const char *fn = str.c_str();
-		if (fn && *fn && strlen(fn)>3) {	// strlen because a garbage char is getting in sometimes.
-			gLogToFile = fopen(fn,"w"); // New log file each time we start.
-			if (gLogToFile) {
-				time_t now;
-				time(&now);
-				fprintf(gLogToFile,"Starting at %s",ctime(&now));
-				fflush(gLogToFile);
-				std::cout << "Logging to file: " << fn << "\n";
-			}
-		}
-	}
-
-	// Open the log connection.
-	openlog(name,0,facility);
-}
-
-
-void gLogEarly(int level, const char *fmt, ...)
-{
-	va_list args;
-
-	va_start(args, fmt);
-
-	if (gLogToSyslog) {
-		va_list args_copy;
-		va_copy(args_copy, args);
-		vsyslog(level | LOG_USER, fmt, args_copy);
-		va_end(args_copy);
-	}
-
-	if (gLogToConsole) {
-		va_list args_copy;
-		va_copy(args_copy, args);
-		vprintf(fmt, args_copy);
-		printf("\n");
-		va_end(args_copy);
-	}
-
-	if (gLogToFile) {
-		va_list args_copy;
-		va_copy(args_copy, args);
-		vfprintf(gLogToFile, fmt, args_copy);
-		fprintf(gLogToFile, "\n");
-		va_end(args_copy);
-	}
-
-	va_end(args);
-}
-
 // vim: ts=4 sw=4

CommonLibs/Logger.h

@@ -23,71 +23,41 @@
 
 */
 
-// (pat) WARNING is stupidly defined in /usr/local/include/osipparser2/osip_const.h.
-// This must be outside the #ifndef LOGGER_H to fix it as long as Logger.h included after the above file.
-#ifdef WARNING
-#undef WARNING
-#endif
-
 #ifndef LOGGER_H
 #define LOGGER_H
 
-#include <syslog.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <sstream>
-#include <list>
-#include <map>
 #include <string>
 
-#define _LOG(level) \
-	Log(LOG_##level).get() << pthread_self() \
-	<< timestr() << " " __FILE__  ":"  << __LINE__ << ":" << __FUNCTION__ << ": "
+extern "C" {
+#include <osmocom/core/logging.h>
+#include "debug.h"
+}
 
-#define IS_LOG_LEVEL(wLevel) (gGetLoggingLevel(__FILE__)>=LOG_##wLevel)
-
-#ifdef NDEBUG
-#define LOG(wLevel) \
-	if (LOG_##wLevel!=LOG_DEBUG && IS_LOG_LEVEL(wLevel)) _LOG(wLevel)
-#else
-#define LOG(wLevel) \
-	if (IS_LOG_LEVEL(wLevel)) _LOG(wLevel)
+/* Translation for old log statements */
+#ifndef LOGL_ALERT
+#define LOGL_ALERT LOGL_FATAL
+#endif
+#ifndef LOGL_ERR
+#define LOGL_ERR LOGL_ERROR
+#endif
+#ifndef LOGL_WARNING
+#define LOGL_WARNING LOGL_NOTICE
 #endif
 
-// pat: And for your edification here are the 'levels' as defined in syslog.h:
-// LOG_EMERG   0  system is unusable
-// LOG_ALERT   1  action must be taken immediately
-// LOG_CRIT    2  critical conditions
-// LOG_ERR     3  error conditions
-// LOG_WARNING 4  warning conditions
-// LOG_NOTICE  5  normal, but significant, condition
-// LOG_INFO    6  informational message
-// LOG_DEBUG   7  debug-level message
+#define LOG(level) \
+	Log(DMAIN, LOGL_##level, __BASE_FILE__, __LINE__).get() <<  "[tid=" << pthread_self() << "] "
 
-// (pat) added - print out a var and its name.
-// Use like this: int descriptive_name; LOG(INFO)<<LOGVAR(descriptive_name);
-#define LOGVAR2(name,val) " " << name << "=" << (val)
-#define LOGVAR(var) (" " #var "=") << var
-#define LOGHEX(var) (" " #var "=0x") << hex << ((unsigned)var) << dec
-#define LOGHEX2(name,val) " " << name << "=0x" << hex << ((unsigned)(val)) << dec
-// These are kind of cheesy, but you can use for bitvector
-#define LOGBV2(name,val) " " << name << "=(" << val<<" size:"<<val.size()<<")"
-#define LOGBV(bv) LOGBV2(#bv,bv)
-#define LOGVARRANGE(name,cur,lo,hi) " "<<name <<"=("<<(cur) << " range:"<<(lo) << " to "<<(hi) <<")"
+#define LOGC(category, level) \
+	Log(category, LOGL_##level, __BASE_FILE__, __LINE__).get() <<  "[tid=" << pthread_self() << "] "
 
-
-#define OBJLOG(wLevel) \
-	LOG(wLevel) << "obj: " << this << ' '
-
-#define LOG_ASSERT(x) { if (!(x)) LOG(EMERG) << "assertion " #x " failed"; } assert(x);
-
-
-#include "Threads.h"		// must be after defines above, if these files are to be allowed to use LOG()
+#define LOGLV(category, level) \
+	Log(category, level, __BASE_FILE__, __LINE__).get() <<  "[tid=" << pthread_self() << "] "
 
 /**
 	A C++ stream-based thread-safe logger.
-	Derived from Dr. Dobb's Sept. 2007 issue.
-	Updated to use syslog.
 	This object is NOT the global logger;
 	every log record is an object of this class.
 */
@@ -97,45 +67,28 @@ class Log {
 
 	protected:
 
-	std::ostringstream mStream;		///< This is where we buffer up the log entry.
-	int mPriority;					///< Priority of current report.
-	bool mDummyInit;
+	std::ostringstream mStream;	///< This is where we buffer up the log entry.
+	int mCategory;			///< Priority of current report.
+	int mPriority;			///< Category of current report.
+	const char *filename;		///< Source File Name of current report.
+	int line;			///< Line number in source file of current report.
 
 	public:
 
-	Log(int wPriority)
-		:mPriority(wPriority), mDummyInit(false)
+	Log(int wCategory, int wPriority, const char* filename, int line)
+		: mCategory(wCategory), mPriority(wPriority),
+		  filename(filename), line(line)
 	{ }
 
-	Log(const char* name, const char* level=NULL, int facility=LOG_USER);
-
 	// Most of the work is in the destructor.
 	/** The destructor actually generates the log entry. */
 	~Log();
 
 	std::ostringstream& get();
 };
-extern bool gLogToConsole;	// Output log messages to stdout
-extern bool gLogToSyslog;	// Output log messages to syslog
 
-
-
-std::list<std::string> gGetLoggerAlarms();		///< Get a copy of the recent alarm list.
-
-const std::string timestr();		// A timestamp to print in messages.
 std::ostream& operator<<(std::ostream& os, std::ostringstream& ss);
 
-/**@ Global control and initialization of the logging system. */
-//@{
-/** Initialize the global logging system. */
-void gLogInit(const char* name, const char* level=NULL, int facility=LOG_USER);
-/** Get the logging level associated with a given file. */
-int gGetLoggingLevel(const char *filename=NULL);
-/** Allow early logging when still in constructors */
-void gLogEarly(int level, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
-//@}
-
-
 #endif
 
 // vim: ts=4 sw=4

CommonLibs/Makefile.am

@@ -22,11 +22,8 @@
 include $(top_srcdir)/Makefile.common
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES)
-AM_CXXFLAGS = -Wall -O3 -g -ldl -lpthread
-
-EXTRA_DIST = \
-	example.config \
-	README.common
+AM_CXXFLAGS = -Wall -O3 -g -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
+AM_CFLAGS = $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
 
 noinst_LTLIBRARIES = libcommon.la
 
@@ -37,20 +34,8 @@ libcommon_la_SOURCES = \
 	Threads.cpp \
 	Timeval.cpp \
 	Logger.cpp \
-	Configuration.cpp \
-	sqlite3util.cpp
-
-noinst_PROGRAMS = \
-	BitVectorTest \
-	PRBSTest \
-	InterthreadTest \
-	SocketsTest \
-	TimevalTest \
-	VectorTest \
-	ConfigurationTest \
-	LogTest
-
-#	ReportingTest 
+	trx_vty.c \
+	debug.c
 
 noinst_HEADERS = \
 	BitVector.h \
@@ -61,38 +46,7 @@ noinst_HEADERS = \
 	Threads.h \
 	Timeval.h \
 	Vector.h \
-	Configuration.h \
 	Logger.h \
-	sqlite3util.h
-
-BitVectorTest_SOURCES = BitVectorTest.cpp
-BitVectorTest_LDADD = libcommon.la $(SQLITE3_LIBS)
-
-PRBSTest_SOURCES = PRBSTest.cpp
-
-InterthreadTest_SOURCES = InterthreadTest.cpp
-InterthreadTest_LDADD = libcommon.la
-InterthreadTest_LDFLAGS = -lpthread
-
-SocketsTest_SOURCES = SocketsTest.cpp
-SocketsTest_LDADD = libcommon.la
-SocketsTest_LDFLAGS = -lpthread
-
-TimevalTest_SOURCES = TimevalTest.cpp
-TimevalTest_LDADD = libcommon.la
-
-VectorTest_SOURCES = VectorTest.cpp
-VectorTest_LDADD = libcommon.la $(SQLITE3_LIBS)
-
-ConfigurationTest_SOURCES = ConfigurationTest.cpp
-ConfigurationTest_LDADD = libcommon.la 	$(SQLITE3_LIBS)
-
-# ReportingTest_SOURCES = ReportingTest.cpp
-# ReportingTest_LDADD = libcommon.la $(SQLITE_LA)
-
-LogTest_SOURCES = LogTest.cpp
-LogTest_LDADD = libcommon.la $(SQLITE3_LIBS)
-
-MOSTLYCLEANFILES += testSource testDestination
-
-
+	trx_vty.h \
+	debug.h \
+	config_defs.h

CommonLibs/Sockets.cpp

@@ -223,18 +223,18 @@ int DatagramSocket::read(char* buffer, size_t length, unsigned timeout)
 
 
 
-UDPSocket::UDPSocket(unsigned short wSrcPort)
+UDPSocket::UDPSocket(const char *wSrcIP, unsigned short wSrcPort)
 	:DatagramSocket()
 {
-	open(wSrcPort);
+	open(wSrcPort, wSrcIP);
 }
 
 
-UDPSocket::UDPSocket(unsigned short wSrcPort,
-          	 const char * wDestIP, unsigned short wDestPort )
+UDPSocket::UDPSocket(const char *wSrcIP, unsigned short wSrcPort,
+		     const char *wDestIP, unsigned short wDestPort)
 	:DatagramSocket()
 {
-	open(wSrcPort);
+	open(wSrcPort, wSrcIP);
 	destination(wDestPort, wDestIP);
 }
 
@@ -246,7 +246,7 @@ void UDPSocket::destination( unsigned short wDestPort, const char * wDestIP )
 }
 
 
-void UDPSocket::open(unsigned short localPort)
+void UDPSocket::open(unsigned short localPort, const char *wlocalIP)
 {
 	// create
 	mSocketFD = socket(AF_INET,SOCK_DGRAM,0);
@@ -265,7 +265,7 @@ void UDPSocket::open(unsigned short localPort)
 	size_t length = sizeof(address);
 	bzero(&address,length);
 	address.sin_family = AF_INET;
-	address.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+	address.sin_addr.s_addr = inet_addr(wlocalIP);
 	address.sin_port = htons(localPort);
 	if (bind(mSocketFD,(struct sockaddr*)&address,length)<0) {
 		perror("bind() failed");
@@ -284,50 +284,4 @@ unsigned short UDPSocket::port() const
 	return ntohs(name.sin_port);
 }
 
-
-
-
-
-UDDSocket::UDDSocket(const char* localPath, const char* remotePath)
-	:DatagramSocket()
-{
-	if (localPath!=NULL) open(localPath);
-	if (remotePath!=NULL) destination(remotePath);
-}
-
-
-
-void UDDSocket::open(const char* localPath)
-{
-	// create
-	mSocketFD = socket(AF_UNIX,SOCK_DGRAM,0);
-	if (mSocketFD<0) {
-		perror("socket() failed");
-		throw SocketError();
-	}
-
-	// bind
-	struct sockaddr_un address;
-	size_t length = sizeof(address);
-	bzero(&address,length);
-	address.sun_family = AF_UNIX;
-	strcpy(address.sun_path,localPath);
-	unlink(localPath);
-	if (bind(mSocketFD,(struct sockaddr*)&address,length)<0) {
-		perror("bind() failed");
-		throw SocketError();
-	}
-}
-
-
-
-void UDDSocket::destination(const char* remotePath)
-{
-	struct sockaddr_un* unAddr = (struct sockaddr_un*)mDestination;
-	strcpy(unAddr->sun_path,remotePath);
-}
-
-
-
-
 // vim:ts=4:sw=4

CommonLibs/Sockets.h

@@ -144,11 +144,11 @@ class UDPSocket : public DatagramSocket {
 public:
 
 	/** Open a USP socket with an OS-assigned port and no default destination. */
-	UDPSocket( unsigned short localPort=0);
+	UDPSocket(const char *localIP, unsigned short localPort);
 
 	/** Given a full specification, open the socket and set the dest address. */
-	UDPSocket( 	unsigned short localPort, 
-			const char * remoteIP, unsigned short remotePort);
+	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 );
@@ -157,7 +157,7 @@ public:
 	unsigned short port() const;
 
 	/** Open and bind the UDP socket to a local port. */
-	void open(unsigned short localPort=0);
+	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; }
@@ -166,26 +166,6 @@ public:
 
 };
 
-
-/** Unix Domain Datagram Socket */
-class UDDSocket : public DatagramSocket {
-
-public:
-
-	UDDSocket(const char* localPath=NULL, const char* remotePath=NULL);
-
-	void destination(const char* remotePath);
-
-	void open(const char* localPath);
-
-	/** Give the return address of the most recently received packet. */
-	const struct sockaddr_un* source() const { return (const struct sockaddr_un*)mSource; }
-
-	size_t addressSize() const { return sizeof(struct sockaddr_un); }
-
-};
-
-
 #endif
 
 

CommonLibs/Vector.h

@@ -118,8 +118,8 @@ template <class T> class Vector {
 	/** Build an empty Vector of a given size. */
 	Vector(size_t wSize=0):mData(NULL) { resize(wSize); }
 
-	/** Build a Vector by shifting the data block. */
-	Vector(Vector<T>& other)
+	/** Build a Vector by moving another. */
+	Vector(Vector<T>&& other)
 		:mData(other.mData),mStart(other.mStart),mEnd(other.mEnd)
 	{ other.mData=NULL; }
 

CommonLibs/config_defs.h

@@ -0,0 +1,20 @@
+#pragma once
+
+/*
+ * This file contains structures used by both VTY (C, dir CommonLibs) and
+ * osmo-trx (CXX, dir Transceiver52)
+ */
+
+enum FillerType {
+  FILLER_DUMMY,
+  FILLER_ZERO,
+  FILLER_NORM_RAND,
+  FILLER_EDGE_RAND,
+  FILLER_ACCESS_RAND,
+};
+
+enum ReferenceType {
+  REF_INTERNAL,
+  REF_EXTERNAL,
+  REF_GPS,
+};

CommonLibs/debug.c

@@ -0,0 +1,24 @@
+#include <osmocom/core/logging.h>
+#include <osmocom/core/utils.h>
+#include "debug.h"
+
+/* default categories */
+static const struct log_info_cat default_categories[] = {
+	[DMAIN] = {
+		.name = "DMAIN",
+		.description = "Main generic category",
+		.color = NULL,
+		.enabled = 1, .loglevel = LOGL_NOTICE,
+	},
+	[DLMS] = {
+		.name = "DLMS",
+		.description = "LimeSuite category",
+		.color = NULL,
+		.enabled = 1, .loglevel = LOGL_NOTICE,
+	},
+};
+
+const struct log_info log_info = {
+	.cat = default_categories,
+	.num_cat = ARRAY_SIZE(default_categories),
+};

CommonLibs/debug.h

@@ -0,0 +1,9 @@
+#pragma once
+
+extern const struct log_info log_info;
+
+/* Debug Areas of the code */
+enum {
+	DMAIN,
+	DLMS,
+};

CommonLibs/sqlite3util.cpp

@@ -1,154 +0,0 @@
-/*
-* Copyright 2010 Kestrel Signal Processing, Inc.
-* All rights reserved.
-*/
-
-
-#include <sqlite3.h>
-#include "sqlite3util.h"
-
-#include <string.h>
-#include <unistd.h>
-#include <stdio.h>
-
-
-// Wrappers to sqlite operations.
-// These will eventually get moved to commonlibs.
-
-int sqlite3_prepare_statement(sqlite3* DB, sqlite3_stmt **stmt, const char* query)
-{
-        int src = SQLITE_BUSY;
-        while (src==SQLITE_BUSY) {
-                src = sqlite3_prepare_v2(DB,query,strlen(query),stmt,NULL);
-                if (src==SQLITE_BUSY) {
-                        usleep(100000);
-                }
-        }
-        if (src) {
-                fprintf(stderr,"sqlite3_prepare_v2 failed for \"%s\": %s\n",query,sqlite3_errmsg(DB));
-                sqlite3_finalize(*stmt);
-        }
-        return src;
-}
-
-int sqlite3_run_query(sqlite3* DB, sqlite3_stmt *stmt)
-{
-	int src = SQLITE_BUSY;
-	while (src==SQLITE_BUSY) {
-		src = sqlite3_step(stmt);
-		if (src==SQLITE_BUSY) {
-			usleep(100000);
-		}
-	}
-	if ((src!=SQLITE_DONE) && (src!=SQLITE_ROW)) {
-		fprintf(stderr,"sqlite3_run_query failed: %s: %s\n", sqlite3_sql(stmt), sqlite3_errmsg(DB));
-	}
-	return src;
-}
-
-
-bool sqlite3_exists(sqlite3* DB, const char *tableName,
-		const char* keyName, const char* keyData)
-{
-	size_t stringSize = 100 + strlen(tableName) + strlen(keyName) + strlen(keyData);
-	char query[stringSize];
-	sprintf(query,"SELECT * FROM %s WHERE %s == \"%s\"",tableName,keyName,keyData);
-	// Prepare the statement.
-	sqlite3_stmt *stmt;
-	if (sqlite3_prepare_statement(DB,&stmt,query)) return false;
-	// Read the result.
-	int src = sqlite3_run_query(DB,stmt);
-	sqlite3_finalize(stmt);
-	// Anything there?
-	return (src == SQLITE_ROW);
-}
-
-
-
-bool sqlite3_single_lookup(sqlite3* DB, const char *tableName,
-		const char* keyName, const char* keyData,
-		const char* valueName, unsigned &valueData)
-{
-	size_t stringSize = 100 + strlen(valueName) + strlen(tableName) + strlen(keyName) + strlen(keyData);
-	char query[stringSize];
-	sprintf(query,"SELECT %s FROM %s WHERE %s == \"%s\"",valueName,tableName,keyName,keyData);
-	// Prepare the statement.
-	sqlite3_stmt *stmt;
-	if (sqlite3_prepare_statement(DB,&stmt,query)) return false;
-	// Read the result.
-	int src = sqlite3_run_query(DB,stmt);
-	bool retVal = false;
-	if (src == SQLITE_ROW) {
-		valueData = (unsigned)sqlite3_column_int64(stmt,0);
-		retVal = true;
-	}
-	sqlite3_finalize(stmt);
-	return retVal;
-}
-
-
-// This function returns an allocated string that must be free'd by the caller.
-bool sqlite3_single_lookup(sqlite3* DB, const char* tableName,
-		const char* keyName, const char* keyData,
-		const char* valueName, char* &valueData)
-{
-	valueData=NULL;
-	size_t stringSize = 100 + strlen(valueName) + strlen(tableName) + strlen(keyName) + strlen(keyData);
-	char query[stringSize];
-	sprintf(query,"SELECT %s FROM %s WHERE %s == \"%s\"",valueName,tableName,keyName,keyData);
-	// Prepare the statement.
-	sqlite3_stmt *stmt;
-	if (sqlite3_prepare_statement(DB,&stmt,query)) return false;
-	// Read the result.
-	int src = sqlite3_run_query(DB,stmt);
-	bool retVal = false;
-	if (src == SQLITE_ROW) {
-		const char* ptr = (const char*)sqlite3_column_text(stmt,0);
-		if (ptr) valueData = strdup(ptr);
-		retVal = true;
-	}
-	sqlite3_finalize(stmt);
-	return retVal;
-}
-
-
-// This function returns an allocated string that must be free'd by tha caller.
-bool sqlite3_single_lookup(sqlite3* DB, const char* tableName,
-		const char* keyName, unsigned keyData,
-		const char* valueName, char* &valueData)
-{
-	valueData=NULL;
-	size_t stringSize = 100 + strlen(valueName) + strlen(tableName) + strlen(keyName) + 20;
-	char query[stringSize];
-	sprintf(query,"SELECT %s FROM %s WHERE %s == %u",valueName,tableName,keyName,keyData);
-	// Prepare the statement.
-	sqlite3_stmt *stmt;
-	if (sqlite3_prepare_statement(DB,&stmt,query)) return false;
-	// Read the result.
-	int src = sqlite3_run_query(DB,stmt);
-	bool retVal = false;
-	if (src == SQLITE_ROW) {
-		const char* ptr = (const char*)sqlite3_column_text(stmt,0);
-		if (ptr) valueData = strdup(ptr);
-		retVal = true;
-	}
-	sqlite3_finalize(stmt);
-	return retVal;
-}
-
-
-
-
-bool sqlite3_command(sqlite3* DB, const char* query)
-{
-	// Prepare the statement.
-	sqlite3_stmt *stmt;
-	if (sqlite3_prepare_statement(DB,&stmt,query)) return false;
-	// Run the query.
-	int src = sqlite3_run_query(DB,stmt);
-	sqlite3_finalize(stmt);
-	return src==SQLITE_DONE;
-}
-
-
-

CommonLibs/sqlite3util.h

@@ -1,29 +0,0 @@
-#ifndef SQLITE3UTIL_H
-#define SQLITE3UTIL_H
-
-#include <sqlite3.h>
-
-int sqlite3_prepare_statement(sqlite3* DB, sqlite3_stmt **stmt, const char* query);
-
-int sqlite3_run_query(sqlite3* DB, sqlite3_stmt *stmt);
-
-bool sqlite3_single_lookup(sqlite3* DB, const char *tableName,
-		const char* keyName, const char* keyData,
-		const char* valueName, unsigned &valueData);
-
-bool sqlite3_single_lookup(sqlite3* DB, const char* tableName,
-		const char* keyName, const char* keyData,
-		const char* valueName, char* &valueData);
-
-// This function returns an allocated string that must be free'd by the caller.
-bool sqlite3_single_lookup(sqlite3* DB, const char* tableName,
-		const char* keyName, unsigned keyData,
-		const char* valueName, char* &valueData);
-
-bool sqlite3_exists(sqlite3* DB, const char* tableName,
-		const char* keyName, const char* keyData);
-
-/** Run a query, ignoring the result; return true on success. */
-bool sqlite3_command(sqlite3* DB, const char* query);
-
-#endif

CommonLibs/trx_vty.c

@@ -0,0 +1,576 @@
+/*
+ * Copyright (C) 2012-2017 sysmocom - s.f.m.c. GmbH
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <string.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/rate_ctr.h>
+
+#include <osmocom/vty/command.h>
+#include <osmocom/vty/vty.h>
+#include <osmocom/vty/misc.h>
+
+#include "trx_vty.h"
+#include "../config.h"
+
+static struct trx_ctx* g_trx_ctx;
+
+static const struct value_string clock_ref_names[] = {
+	{ REF_INTERNAL,	"internal" },
+	{ REF_EXTERNAL,	"external" },
+	{ REF_GPS,	"gspdo" },
+	{ 0,		NULL }
+};
+
+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 }
+};
+
+struct trx_ctx *trx_from_vty(struct vty *v)
+{
+        /* It can't hurt to force callers to continue to pass the vty instance
+         * to this function, in case we'd like to retrieve the global
+         * trx instance from the vty at some point in the future. But
+         * until then, just return the global pointer, which should have been
+         * initialized by trx_vty_init().
+         */
+        OSMO_ASSERT(g_trx_ctx);
+        return g_trx_ctx;
+}
+
+enum trx_vty_node {
+	TRX_NODE = _LAST_OSMOVTY_NODE + 1,
+	CHAN_NODE,
+};
+
+static struct cmd_node trx_node = {
+	TRX_NODE,
+	"%s(config-trx)# ",
+	1,
+};
+
+static struct cmd_node chan_node = {
+	CHAN_NODE,
+	"%s(config-trx-chan)# ",
+	1,
+};
+
+DEFUN(cfg_trx, cfg_trx_cmd,
+	"trx",
+	"Configure the TRX\n")
+{
+	struct trx_ctx *trx = trx_from_vty(vty);
+
+	if (!trx)
+		return CMD_WARNING;
+
+	vty->node = TRX_NODE;
+
+	return CMD_SUCCESS;
+}
+
+DEFUN(cfg_bind_ip, cfg_bind_ip_cmd,
+	"bind-ip A.B.C.D",
+	"Set the IP address for the local bind\n"
+	"IPv4 Address\n")
+{
+	struct trx_ctx *trx = trx_from_vty(vty);
+
+	osmo_talloc_replace_string(trx, &trx->cfg.bind_addr, argv[0]);
+
+	return CMD_SUCCESS;
+}
+
+DEFUN(cfg_remote_ip, cfg_remote_ip_cmd,
+	"remote-ip A.B.C.D",
+	"Set the IP address for the remote BTS\n"
+	"IPv4 Address\n")
+{
+	struct trx_ctx *trx = trx_from_vty(vty);
+
+	osmo_talloc_replace_string(trx, &trx->cfg.remote_addr, argv[0]);
+
+	return CMD_SUCCESS;
+}
+
+DEFUN(cfg_base_port, cfg_base_port_cmd,
+	"base-port <1-65535>",
+	"Set the TRX Base Port\n"
+	"TRX Base Port\n")
+{
+	struct trx_ctx *trx = trx_from_vty(vty);
+
+	trx->cfg.base_port = atoi(argv[0]);
+
+	return CMD_SUCCESS;
+}
+
+DEFUN(cfg_dev_args, cfg_dev_args_cmd,
+	"dev-args DESC",
+	"Set the device-specific arguments to pass to the device\n"
+	"Device-specific arguments\n")
+{
+	struct trx_ctx *trx = trx_from_vty(vty);
+
+	osmo_talloc_replace_string(trx, &trx->cfg.dev_args, argv[0]);
+
+	return CMD_SUCCESS;
+}
+
+DEFUN(cfg_tx_sps, cfg_tx_sps_cmd,
+	"tx-sps (1|4)",
+	"Set the Tx Samples-per-Symbol\n"
+	"Tx Samples-per-Symbol\n")
+{
+	struct trx_ctx *trx = trx_from_vty(vty);
+
+	trx->cfg.tx_sps = atoi(argv[0]);
+
+	return CMD_SUCCESS;
+}
+
+DEFUN(cfg_rx_sps, cfg_rx_sps_cmd,
+	"rx-sps (1|4)",
+	"Set the Rx Samples-per-Symbol\n"
+	"Rx Samples-per-Symbol\n")
+{
+	struct trx_ctx *trx = trx_from_vty(vty);
+
+	trx->cfg.rx_sps = atoi(argv[0]);
+
+	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 referece (default)\n"
+	"Enable external 10 MHz reference\n"
+	"Enable GPSDO reference\n")
+{
+	struct trx_ctx *trx = trx_from_vty(vty);
+
+	trx->cfg.clock_ref = get_string_value(clock_ref_names, argv[0]);
+
+	return CMD_SUCCESS;
+}
+
+DEFUN(cfg_multi_arfcn, cfg_multi_arfcn_cmd,
+	"multi-arfcn (disable|enable)",
+	"Enable multi-ARFCN transceiver (default=disable)\n")
+{
+	struct trx_ctx *trx = trx_from_vty(vty);
+
+	if (strcmp("disable", argv[0]) == 0) {
+		trx->cfg.multi_arfcn = false;
+	} else if (strcmp("enable", argv[0]) == 0) {
+		trx->cfg.multi_arfcn = true;
+	} else {
+		return CMD_WARNING;
+	}
+
+	return CMD_SUCCESS;
+}
+
+DEFUN(cfg_offset, cfg_offset_cmd,
+	"offset FLOAT",
+	"Set the baseband frequency offset (default=0, auto)\n"
+	"Baseband Frequency Offset\n")
+{
+	struct trx_ctx *trx = trx_from_vty(vty);
+
+	trx->cfg.offset = atof(argv[0]);
+
+	return CMD_SUCCESS;
+}
+
+DEFUN(cfg_rssi_offset, cfg_rssi_offset_cmd,
+	"rssi-offset FLOAT",
+	"Set the RSSI to dBm offset in dB (default=0)\n"
+	"RSSI to dBm offset in dB\n")
+{
+	struct trx_ctx *trx = trx_from_vty(vty);
+
+	trx->cfg.rssi_offset = atof(argv[0]);
+
+	return CMD_SUCCESS;
+}
+
+DEFUN(cfg_swap_channels, cfg_swap_channels_cmd,
+	"swap-channels (disable|enable)",
+	"Swap channels (default=disable)\n")
+{
+	struct trx_ctx *trx = trx_from_vty(vty);
+
+	if (strcmp("disable", argv[0]) == 0) {
+		trx->cfg.swap_channels = false;
+	} else if (strcmp("enable", argv[0]) == 0) {
+		trx->cfg.swap_channels = true;
+	} else {
+		return CMD_WARNING;
+	}
+
+	return CMD_SUCCESS;
+}
+
+DEFUN(cfg_egprs, cfg_egprs_cmd,
+	"egprs (disable|enable)",
+	"Enable EDGE receiver (default=disable)\n")
+{
+	struct trx_ctx *trx = trx_from_vty(vty);
+
+	if (strcmp("disable", argv[0]) == 0) {
+		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;
+	}
+
+	return CMD_SUCCESS;
+}
+
+DEFUN(cfg_rt_prio, cfg_rt_prio_cmd,
+	"rt-prio <1-32>",
+	"Set the SCHED_RR real-time priority\n"
+	"Real time priority\n")
+{
+	struct trx_ctx *trx = trx_from_vty(vty);
+
+	trx->cfg.sched_rr = atoi(argv[0]);
+
+	return CMD_SUCCESS;
+}
+
+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.filler = FILLER_DUMMY;
+
+	return CMD_SUCCESS;
+}
+
+DEFUN(cfg_chan, cfg_chan_cmd,
+	"chan <0-100>",
+	"Select a channel to configure\n"
+	"Channel index\n")
+{
+	struct trx_ctx *trx = trx_from_vty(vty);
+	int idx = atoi(argv[0]);
+
+	if (idx >= TRX_CHAN_MAX) {
+		vty_out(vty, "Chan list full.%s", VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+	if (trx->cfg.num_chans < idx) { /* Unexisting or creating non-consecutive */
+		vty_out(vty, "Non-existent or non-consecutive chan %d.%s",
+				idx, VTY_NEWLINE);
+		return CMD_WARNING;
+	} else if (trx->cfg.num_chans == idx)  { /* creating it */
+		trx->cfg.num_chans++;
+		trx->cfg.chans[idx].trx = trx;
+		trx->cfg.chans[idx].idx = idx;
+	}
+
+	vty->node = CHAN_NODE;
+	vty->index = &trx->cfg.chans[idx];
+
+	return CMD_SUCCESS;
+}
+
+DEFUN(cfg_chan_rx_path, cfg_chan_rx_path_cmd,
+	"rx-path NAME",
+	"Set the Rx Path\n"
+	"Rx Path name\n")
+{
+	struct trx_chan *chan = vty->index;
+
+	osmo_talloc_replace_string(chan->trx, &chan->rx_path, argv[0]);
+
+	return CMD_SUCCESS;
+}
+
+DEFUN(cfg_chan_tx_path, cfg_chan_tx_path_cmd,
+	"tx-path NAME",
+	"Set the Tx Path\n"
+	"Tx Path name\n")
+{
+	struct trx_chan *chan = vty->index;
+
+	osmo_talloc_replace_string(chan->trx, &chan->tx_path, argv[0]);
+
+	return CMD_SUCCESS;
+}
+
+static int dummy_config_write(struct vty *v)
+{
+	return CMD_SUCCESS;
+}
+
+static int config_write_trx(struct vty *vty)
+{
+	struct trx_chan *chan;
+	int i;
+	struct trx_ctx *trx = trx_from_vty(vty);
+
+	vty_out(vty, "trx%s", VTY_NEWLINE);
+	if (trx->cfg.bind_addr)
+		vty_out(vty, " bind-ip %s%s", trx->cfg.bind_addr, VTY_NEWLINE);
+	if (trx->cfg.remote_addr)
+		vty_out(vty, " remote-ip %s%s", trx->cfg.remote_addr, VTY_NEWLINE);
+	if (trx->cfg.base_port != DEFAULT_TRX_PORT)
+		vty_out(vty, " base-port %u%s", trx->cfg.base_port, VTY_NEWLINE);
+	if (trx->cfg.dev_args)
+		vty_out(vty, " dev-args %s%s", trx->cfg.dev_args, VTY_NEWLINE);
+	if (trx->cfg.tx_sps != DEFAULT_TX_SPS)
+		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);
+	if (trx->cfg.offset != 0)
+		vty_out(vty, " offset %f%s", trx->cfg.offset, VTY_NEWLINE);
+	if (trx->cfg.rssi_offset != 0)
+		vty_out(vty, " rssi-offset %f%s", trx->cfg.rssi_offset, VTY_NEWLINE);
+	vty_out(vty, " swap-channels %s%s", trx->cfg.swap_channels ? "enable" : "disable", VTY_NEWLINE);
+	vty_out(vty, " egprs %s%s", trx->cfg.egprs ? "enable" : "disable", VTY_NEWLINE);
+	if (trx->cfg.sched_rr != 0)
+		vty_out(vty, " rt-prio %u%s", trx->cfg.sched_rr, VTY_NEWLINE);
+
+	for (i = 0; i < trx->cfg.num_chans; i++) {
+		chan = &trx->cfg.chans[i];
+		vty_out(vty, " chan %u%s", chan->idx, VTY_NEWLINE);
+		if (chan->rx_path)
+			vty_out(vty, " rx-path %s%s", chan->rx_path, VTY_NEWLINE);
+		if (chan->tx_path)
+			vty_out(vty, " tx-path %s%s", chan->tx_path, VTY_NEWLINE);
+	}
+
+	return CMD_SUCCESS;
+}
+
+static void trx_dump_vty(struct vty *vty, struct trx_ctx *trx)
+{
+	struct trx_chan *chan;
+	int i;
+	vty_out(vty, "TRX Config:%s", VTY_NEWLINE);
+	vty_out(vty, " Local IP: %s%s", trx->cfg.bind_addr, VTY_NEWLINE);
+	vty_out(vty, " Remote IP: %s%s", trx->cfg.remote_addr, VTY_NEWLINE);
+	vty_out(vty, " TRX Base Port: %u%s", trx->cfg.base_port, VTY_NEWLINE);
+	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, " 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);
+	vty_out(vty, " RSSI to dBm offset: %f%s", trx->cfg.rssi_offset, VTY_NEWLINE);
+	vty_out(vty, " Swap channels: %s%s", trx->cfg.swap_channels ? "Enabled" : "Disabled", VTY_NEWLINE);
+	vty_out(vty, " EDGE support: %s%s", trx->cfg.egprs ? "Enabled" : "Disabled", VTY_NEWLINE);
+	vty_out(vty, " Real Time Priority: %u (%s)%s", trx->cfg.sched_rr,
+		trx->cfg.sched_rr ? "Enabled" : "Disabled", VTY_NEWLINE);
+	vty_out(vty, " Channels: %u%s", trx->cfg.num_chans, VTY_NEWLINE);
+	for (i = 0; i < trx->cfg.num_chans; i++) {
+		chan = &trx->cfg.chans[i];
+		vty_out(vty, "  Channel %u:%s", chan->idx, VTY_NEWLINE);
+		if (chan->rx_path)
+			vty_out(vty, "   Rx Path: %s%s", chan->rx_path, VTY_NEWLINE);
+		if (chan->tx_path)
+			vty_out(vty, "   Tx Path: %s%s", chan->tx_path, VTY_NEWLINE);
+	}
+}
+
+DEFUN(show_trx, show_trx_cmd,
+	"show trx",
+	SHOW_STR "Display information on the TRX\n")
+{
+	struct trx_ctx *trx = trx_from_vty(vty);
+
+	trx_dump_vty(vty, trx);
+
+	return CMD_SUCCESS;
+}
+
+static int trx_vty_is_config_node(struct vty *vty, int node)
+{
+	switch (node) {
+	case TRX_NODE:
+	case CHAN_NODE:
+		return 1;
+	default:
+		return 0;
+	}
+}
+
+static int trx_vty_go_parent(struct vty *vty)
+{
+	switch (vty->node) {
+	case TRX_NODE:
+		vty->node = CONFIG_NODE;
+		vty->index = NULL;
+		vty->index_sub = NULL;
+		break;
+	case CHAN_NODE:
+		vty->node = TRX_NODE;
+		vty->index = NULL;
+		vty->index_sub = NULL;
+		break;
+	default:
+		vty->node = CONFIG_NODE;
+		vty->index = NULL;
+		vty->index_sub = NULL;
+	}
+
+	return vty->node;
+}
+
+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) 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"
+	"This is free software: you are free to change and redistribute it.\r\n"
+	"There is NO WARRANTY, to the extent permitted by law.\r\n";
+
+struct vty_app_info g_vty_info = {
+	.name		= "OsmoTRX",
+	.version	= PACKAGE_VERSION,
+	.copyright	= trx_copyright,
+	.go_parent_cb	= trx_vty_go_parent,
+	.is_config_node	= trx_vty_is_config_node,
+};
+
+struct trx_ctx *vty_trx_ctx_alloc(void *talloc_ctx)
+{
+	struct trx_ctx * trx = talloc_zero(talloc_ctx, struct trx_ctx);
+
+	trx->cfg.bind_addr =  talloc_strdup(trx, DEFAULT_TRX_IP);
+	trx->cfg.remote_addr = talloc_strdup(trx, DEFAULT_TRX_IP);
+	trx->cfg.base_port = DEFAULT_TRX_PORT;
+	trx->cfg.tx_sps = DEFAULT_TX_SPS;
+	trx->cfg.rx_sps = DEFAULT_RX_SPS;
+	trx->cfg.filler = FILLER_ZERO;
+
+	return trx;
+}
+
+int trx_vty_init(struct trx_ctx* trx)
+{
+	g_trx_ctx = trx;
+	install_element_ve(&show_trx_cmd);
+
+	install_element(CONFIG_NODE, &cfg_trx_cmd);
+
+	install_node(&trx_node, config_write_trx);
+	install_element(TRX_NODE, &cfg_bind_ip_cmd);
+	install_element(TRX_NODE, &cfg_remote_ip_cmd);
+	install_element(TRX_NODE, &cfg_base_port_cmd);
+	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);
+	install_element(TRX_NODE, &cfg_rssi_offset_cmd);
+	install_element(TRX_NODE, &cfg_swap_channels_cmd);
+	install_element(TRX_NODE, &cfg_egprs_cmd);
+	install_element(TRX_NODE, &cfg_rt_prio_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);
+
+	return 0;
+}

CommonLibs/trx_vty.h

@@ -0,0 +1,68 @@
+#pragma once
+
+#include <osmocom/vty/command.h>
+
+#include "config_defs.h"
+
+extern struct vty_app_info g_vty_info;
+
+#define TRX_CHAN_MAX 8
+
+/* Samples-per-symbol for downlink path
+ *     4 - Uses precision modulator (more computation, less distortion)
+ *     1 - Uses minimized modulator (less computation, more distortion)
+ *
+ *     Other values are invalid. Receive path (uplink) is always
+ *     downsampled to 1 sps. Default to 4 sps for all cases.
+ */
+#define DEFAULT_TX_SPS		4
+
+/*
+ * Samples-per-symbol for uplink (receiver) path
+ *     Do not modify this value. EDGE configures 4 sps automatically on
+ *     B200/B210 devices only. Use of 4 sps on the receive path for other
+ *     configurations is not supported.
+ */
+#define DEFAULT_RX_SPS		1
+
+/* Default configuration parameters */
+#define DEFAULT_TRX_PORT	5700
+#define DEFAULT_TRX_IP		"127.0.0.1"
+#define DEFAULT_CHANS		1
+
+struct trx_ctx;
+
+struct trx_chan {
+	struct trx_ctx *trx; /* backpointer */
+	unsigned int idx; /* channel index */
+	char *rx_path;
+	char *tx_path;
+};
+
+struct trx_ctx {
+	struct {
+		char *bind_addr;
+		char *remote_addr;
+		char *dev_args;
+		unsigned int base_port;
+		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;
+		double offset;
+		double rssi_offset;
+		bool swap_channels;
+		bool egprs;
+		unsigned int sched_rr;
+		unsigned int num_chans;
+		struct trx_chan chans[TRX_CHAN_MAX];
+	} cfg;
+};
+
+int trx_vty_init(struct trx_ctx* trx);
+struct trx_ctx *vty_trx_ctx_alloc(void *talloc_ctx);

INSTALLATION

@@ -2,32 +2,18 @@ Installation Requirements
 
 
 
-OpenBTS compiles to a simple Unix binary and does not require special
+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 OpenBTS, the following should be installed:
-
-	Asterisk (http://www.asterisk.org), running SIP on port 5060.
-
-	libosip2 (http://www.gnu.org/software/osip/)
-
-	libortp (http://freshmeat.net/projects/ortp/)
-
-	libusrp (http://gnuradio.org).
+To run osmo-trx, the following should be installed:
+	libuhd (https://gnuradio.org).
 	This is part of the GNURadio installation.
-	It is the only part used by OpenBTS.
-
-
-OpenBTS logs to syslogd as facility LOG_LOCAL7.  Please set your /etc/syslog.conf
-accordingly.
-
 
 For information on specific executables, see tests/README.tests and
 apps/README.apps.
 
-See http://gnuradio.org/redmine/wiki/gnuradio/OpenBTS/BuildingAndRunning for more
+See https://osmocom.org/projects/osmotrx/wiki/OsmoTRX for more
 information.
-

LEGAL

@@ -1,5 +1,8 @@
 OpenBTS
 
+The OsmoTRX project is direved from OpenBTS transceiver code. See http://openbts.org/ for details.
+
+The related copyrights:
 Most parts copyright 2008-2011 Free Software Foundation.
 Some parts copyright 2010 Kestrel Signal Processing, Inc.
 Some parts copyright 2011 Range Networks, Inc.
@@ -12,17 +15,9 @@ patented technologies.  The user of this software is required to take whatever
 actions are necessary to avoid patent infringement.
 
 
-Trademark
-
-"OpenBTS" is a registered trademark of Range Networks, Inc. (Range), a
-California corporation.  Range reserves the right to control the use of this 
-trademark.  Do not use this trademark in commerce without permission and do not
-rebrand OpenBTS under a different trademark.
-
-
 Telecom and Radio Spectrum Laws
 
-The primary function of OpenBTS is the provision of telecommunications service
+The primary function of OsmoTRX is the provision of telecommunications service
 over a radio link.  This activity is heavily regulated nearly everywhere in
 the world.  Users of this software are expected to comply with local and national
 regulations in the jurisdictions where this sortware is used with radio equipment.
@@ -39,7 +34,7 @@ The legal restrictions listed here are not necessarily exhaustive.
 
 Note to US Government Users
 
-The OpenBTS software applications and associated documentation are "Commercial
+The OsmoTRX software applications and associated documentation are "Commercial
 Item(s)," as that term is defined at 48 C.F.R. Section 2.101, consisting of
 "Commercial Computer Software" and "Commercial Computer Software Documentation,"
 as such terms are used in 48 C.F.R. 12.212 or 48 C.F.R. 227.7202, as
@@ -54,13 +49,12 @@ and AGPLv3.
 Note to US Government Contractors
 
 GPL is not compatible with "government purpose rights" (GPR).  If you receive
-OpenBTS software under a GPL and deliver it under GPR, you will be in violation
+OsmoTRX software under a GPL and deliver it under GPR, you will be in violation
 of GPL and possibly subject to enforcement actions by the original authors and
 copyright holders, including the Free Software Foundation, Inc.
 
 
 Software Licensing and Distribution
 
-A subset of OpenBTS is distributed publicly under AGPLv3.  Range reserves the right to
-distribute most of this source code other licenses as well.  See the COPYING file
+The OsmoTRX is distributed publicly under AGPLv3. See the COPYING file
 for more information on the license for this distribution.

Makefile.am

@@ -21,16 +21,17 @@
 include $(top_srcdir)/Makefile.common
 
 ACLOCAL_AMFLAGS = -I config
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(USB_INCLUDES) $(WITH_INCLUDES) $(SQLITE3_CFLAGS)
-AM_CXXFLAGS = -Wall -pthread -ldl
-#AM_CXXFLAGS = -Wall -O2 -NDEBUG -pthread -ldl
-#AM_CFLAGS = -Wall -O2 -NDEBUG -pthread -ldl
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(USB_INCLUDES) $(WITH_INCLUDES)
+AM_CXXFLAGS = -Wall -pthread
+#AM_CXXFLAGS = -Wall -O2 -NDEBUG -pthread
+#AM_CFLAGS = -Wall -O2 -NDEBUG -pthread
 
 # Order must be preserved
 SUBDIRS = \
 	CommonLibs \
 	GSM \
-	Transceiver52M
+	Transceiver52M \
+	tests
 
 EXTRA_DIST = \
 	autogen.sh \
@@ -39,6 +40,9 @@ EXTRA_DIST = \
 	COPYING \
 	README
 
+.PHONY: release
+
+@RELMAKE@
 
 dox: FORCE
 	doxygen doxconfig

Makefile.common

@@ -18,9 +18,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-top_srcdir = $(abs_top_srcdir)
-top_builddir = $(abs_top_builddir)
-
 COMMON_INCLUDEDIR = $(top_srcdir)/CommonLibs
 GSM_INCLUDEDIR = $(top_srcdir)/GSM
 
@@ -32,4 +29,10 @@ STD_DEFINES_AND_INCLUDES = \
 COMMON_LA = $(top_builddir)/CommonLibs/libcommon.la
 GSM_LA = $(top_builddir)/GSM/libGSM.la
 
+if ARCH_ARM
+ARCH_LA = $(top_builddir)/Transceiver52M/arch/arm/libarch.la
+else
+ARCH_LA = $(top_builddir)/Transceiver52M/arch/x86/libarch.la
+endif
+
 MOSTLYCLEANFILES = *~

Transceiver52M/Channelizer.cpp

@@ -25,12 +25,11 @@
 #include <string.h>
 #include <cstdio>
 
-#include "Logger.h"
 #include "Channelizer.h"
 
 extern "C" {
-#include "common/fft.h"
-#include "common/convolve.h"
+#include "fft.h"
+#include "convolve.h"
 }
 
 static void deinterleave(const float *in, size_t ilen,

Transceiver52M/ChannelizerBase.cpp

@@ -29,7 +29,7 @@
 #include "ChannelizerBase.h"
 
 extern "C" {
-#include "common/fft.h"
+#include "fft.h"
 }
 
 static float sinc(float x)

Transceiver52M/Makefile.am

@@ -21,22 +21,10 @@
 
 include $(top_srcdir)/Makefile.common
 
-AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/common
-AM_CXXFLAGS = -ldl -lpthread
+SUBDIRS = arch device
 
-SUBDIRS = arm x86
-
-if ARCH_ARM
-ARCH_LA = arm/libarch.la
-else
-ARCH_LA = x86/libarch.la
-endif
-
-if USRP1 
-AM_CPPFLAGS += $(USRP_CFLAGS)
-else
-AM_CPPFLAGS += $(UHD_CFLAGS)
-endif
+AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/arch/common -I${srcdir}/device
+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
 
 rev2dir = $(datadir)/usrp/rev2
 rev4dir = $(datadir)/usrp/rev4
@@ -44,11 +32,9 @@ rev4dir = $(datadir)/usrp/rev4
 dist_rev2_DATA = std_inband.rbf
 dist_rev4_DATA = std_inband.rbf
 
-EXTRA_DIST = \
-	README \
-	README.Talgorithm
+EXTRA_DIST = README
 
-noinst_LTLIBRARIES = libtransceiver.la
+noinst_LTLIBRARIES = libtransceiver_common.la
 
 COMMON_SOURCES = \
 	radioInterface.cpp \
@@ -60,57 +46,66 @@ COMMON_SOURCES = \
 	Transceiver.cpp \
 	ChannelizerBase.cpp \
 	Channelizer.cpp \
-	Synthesis.cpp \
-	common/fft.c
+	Synthesis.cpp
 
-libtransceiver_la_SOURCES = \
+libtransceiver_common_la_SOURCES = \
 	$(COMMON_SOURCES) \
 	Resampler.cpp \
 	radioInterfaceResamp.cpp \
 	radioInterfaceMulti.cpp
 
-bin_PROGRAMS = osmo-trx osmo-siggen
-
 noinst_HEADERS = \
 	Complex.h \
 	radioInterface.h \
 	radioVector.h \
 	radioClock.h \
-	radioDevice.h \
 	radioBuffer.h \
 	sigProcLib.h \
 	signalVector.h \
 	Transceiver.h \
-	USRPDevice.h \
 	Resampler.h \
 	ChannelizerBase.h \
 	Channelizer.h \
-	Synthesis.h \
-	common/convolve.h \
-	common/convert.h \
-	common/scale.h \
-	common/mult.h \
-	common/fft.h
+	Synthesis.h
 
-osmo_trx_SOURCES = osmo-trx.cpp
-osmo_trx_LDADD = \
-	libtransceiver.la \
+COMMON_LDADD = \
+	libtransceiver_common.la \
 	$(ARCH_LA) \
 	$(GSM_LA) \
-	$(COMMON_LA) $(SQLITE3_LIBS)
+	$(COMMON_LA) \
+	$(FFTWF_LIBS) \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOCTRL_LIBS) \
+	$(LIBOSMOVTY_LIBS)
 
-osmo_siggen_SOURCES = osmo-siggen.cpp
-osmo_siggen_LDADD = \
-	libtransceiver.la \
-	$(ARCH_LA) \
-	$(GSM_LA) \
-	$(COMMON_LA) $(SQLITE3_LIBS)
+bin_PROGRAMS =
 
-if USRP1 
-libtransceiver_la_SOURCES += USRPDevice.cpp
-osmo_trx_LDADD += $(USRP_LIBS)
-else
-libtransceiver_la_SOURCES += UHDDevice.cpp
-osmo_trx_LDADD += $(UHD_LIBS) $(FFTWF_LIBS)
-osmo_siggen_LDADD += $(UHD_LIBS) $(FFTWF_LIBS)
+if DEVICE_UHD
+bin_PROGRAMS += osmo-trx-uhd
+osmo_trx_uhd_SOURCES = osmo-trx.cpp
+osmo_trx_uhd_LDADD = \
+	$(builddir)/device/uhd/libdevice.la \
+	$(COMMON_LDADD) \
+	$(UHD_LIBS)
+osmo_trx_uhd_CPPFLAGS  = $(AM_CPPFLAGS) $(UHD_CFLAGS)
+endif
+
+if DEVICE_USRP1
+bin_PROGRAMS += osmo-trx-usrp1
+osmo_trx_usrp1_SOURCES = osmo-trx.cpp
+osmo_trx_usrp1_LDADD = \
+	$(builddir)/device/usrp1/libdevice.la \
+	$(COMMON_LDADD) \
+	$(USRP_LIBS)
+osmo_trx_usrp1_CPPFLAGS  = $(AM_CPPFLAGS) $(USRP_CFLAGS)
+endif
+
+if DEVICE_LMS
+bin_PROGRAMS += osmo-trx-lms
+osmo_trx_lms_SOURCES = osmo-trx.cpp
+osmo_trx_lms_LDADD = \
+	$(builddir)/device/lms/libdevice.la \
+	$(COMMON_LDADD) \
+	$(LMS_LIBS)
+osmo_trx_lms_CPPFLAGS  = $(AM_CPPFLAGS) $(LMS_CFLAGS)
 endif

Transceiver52M/Resampler.cpp

@@ -22,6 +22,7 @@
 #include <string.h>
 #include <malloc.h>
 #include <iostream>
+#include <algorithm>
 
 #include "Resampler.h"
 
@@ -35,6 +36,8 @@ extern "C" {
 
 #define MAX_OUTPUT_LEN		4096
 
+using namespace std;
+
 static float sinc(float x)
 {
 	if (x == 0.0)
@@ -43,32 +46,19 @@ static float sinc(float x)
 	return sin(M_PI * x) / (M_PI * x);
 }
 
-bool Resampler::initFilters(float bw)
+void Resampler::initFilters(float bw)
 {
-	size_t proto_len = p * filt_len;
-	float *proto, val, cutoff;
+	float cutoff;
 	float sum = 0.0f, scale = 0.0f;
-	float midpt = (float) (proto_len - 1.0) / 2.0;
 
 	/* 
 	 * Allocate partition filters and the temporary prototype filter
 	 * according to numerator of the rational rate. Coefficients are
 	 * real only and must be 16-byte memory aligned for SSE usage.
 	 */
-	proto = new float[proto_len];
-	if (!proto)
-		return false;
-
-	partitions = (float **) malloc(sizeof(float *) * p);
-	if (!partitions) {
-		delete[] proto;
-		return false;
-	}
-
-	for (size_t i = 0; i < p; i++) {
-		partitions[i] = (float *)
-				memalign(16, filt_len * 2 * sizeof(float));
-	}
+	auto proto = vector<float>(p * filt_len);
+	for (auto &part : partitions)
+		part = (complex<float> *) memalign(16, filt_len * sizeof(complex<float>));
 
 	/* 
 	 * Generate the prototype filter with a Blackman-harris window.
@@ -85,47 +75,26 @@ bool Resampler::initFilters(float bw)
 	else
 		cutoff = (float) q;
 
-	for (size_t i = 0; i < proto_len; i++) {
+	float midpt = (proto.size() - 1) / 2.0;
+	for (size_t i = 0; i < proto.size(); i++) {
 		proto[i] = sinc(((float) i - midpt) / cutoff * bw);
 		proto[i] *= a0 -
-			    a1 * cos(2 * M_PI * i / (proto_len - 1)) +
-			    a2 * cos(4 * M_PI * i / (proto_len - 1)) -
-			    a3 * cos(6 * M_PI * i / (proto_len - 1));
+			    a1 * cos(2 * M_PI * i / (proto.size() - 1)) +
+			    a2 * cos(4 * M_PI * i / (proto.size() - 1)) -
+			    a3 * cos(6 * M_PI * i / (proto.size() - 1));
 		sum += proto[i];
 	}
 	scale = p / sum;
 
 	/* Populate filter partitions from the prototype filter */
 	for (size_t i = 0; i < filt_len; i++) {
-		for (size_t n = 0; n < p; n++) {
-			partitions[n][2 * i + 0] = proto[i * p + n] * scale;
-			partitions[n][2 * i + 1] = 0.0f;
-		}
+		for (size_t n = 0; n < p; n++)
+			partitions[n][i] = complex<float>(proto[i * p + n] * scale);
 	}
 
-	/* For convolution, we store the filter taps in reverse */ 
-	for (size_t n = 0; n < p; n++) {
-		for (size_t i = 0; i < filt_len / 2; i++) {
-			val = partitions[n][2 * i];
-			partitions[n][2 * i] = partitions[n][2 * (filt_len - 1 - i)];
-			partitions[n][2 * (filt_len - 1 - i)] = val;
-		}
-	}
-
-	delete[] proto;
-
-	return true;
-}
-
-void Resampler::releaseFilters()
-{
-	if (partitions) {
-		for (size_t i = 0; i < p; i++)
-			free(partitions[i]);
-	}
-
-	free(partitions);
-	partitions = NULL;
+	/* Store filter taps in reverse */
+	for (auto &part : partitions)
+		reverse(&part[0], &part[filt_len]);
 }
 
 static bool check_vec_len(int in_len, int out_len, int p, int q)
@@ -159,14 +128,6 @@ static bool check_vec_len(int in_len, int out_len, int p, int q)
 	return true;
 }
 
-void Resampler::computePath()
-{
-	for (int i = 0; i < MAX_OUTPUT_LEN; i++) {
-		in_index[i] = (q * i) / p;
-		out_path[i] = (q * i) % p;
-	}
-}
-
 int Resampler::rotate(const float *in, size_t in_len, float *out, size_t out_len)
 {
 	int n, path;
@@ -180,8 +141,8 @@ int Resampler::rotate(const float *in, size_t in_len, float *out, size_t out_len
 		path = out_path[i]; 
 
 		convolve_real(in, in_len,
-			      partitions[path], filt_len,
-			      &out[2 * i], out_len - i,
+			      reinterpret_cast<float *>(partitions[path]),
+			      filt_len, &out[2 * i], out_len - i,
 			      n, 1, 1, 0);
 	}
 
@@ -190,14 +151,18 @@ int Resampler::rotate(const float *in, size_t in_len, float *out, size_t out_len
 
 bool Resampler::init(float bw)
 {
+	if (p == 0 || q == 0 || filt_len == 0) return false;
+
 	/* Filterbank filter internals */
-	if (!initFilters(bw))
-		return false;
+	initFilters(bw);
 
 	/* Precompute filterbank paths */
-	in_index = new size_t[MAX_OUTPUT_LEN];
-	out_path = new size_t[MAX_OUTPUT_LEN];
-	computePath();
+	int i = 0;
+	for (auto &index : in_index)
+		index = (q * i++) / p;
+	i = 0;
+	for (auto &path : out_path)
+		path = (q * i++) % p;
 
 	return true;
 }
@@ -208,7 +173,7 @@ size_t Resampler::len()
 }
 
 Resampler::Resampler(size_t p, size_t q, size_t filt_len)
-	: in_index(NULL), out_path(NULL), partitions(NULL)
+	: in_index(MAX_OUTPUT_LEN), out_path(MAX_OUTPUT_LEN), partitions(p)
 {
 	this->p = p;
 	this->q = q;
@@ -217,8 +182,6 @@ Resampler::Resampler(size_t p, size_t q, size_t filt_len)
 
 Resampler::~Resampler()
 {
-	releaseFilters();
-
-	delete in_index;
-	delete out_path;
+	for (auto &part : partitions)
+		free(part);
 }

Transceiver52M/Resampler.h

@@ -20,6 +20,9 @@
 #ifndef _RESAMPLER_H_
 #define _RESAMPLER_H_
 
+#include <vector>
+#include <complex>
+
 class Resampler {
 public:
 	/* Constructor for rational sample rate conversion
@@ -63,14 +66,11 @@ private:
 	size_t p;
 	size_t q;
 	size_t filt_len;
-	size_t *in_index;
-	size_t *out_path;
+	std::vector<size_t> in_index;
+	std::vector<size_t> out_path;
+	std::vector<std::complex<float> *> partitions;
 
-	float **partitions;
-
-	bool initFilters(float bw);
-	void releaseFilters();
-	void computePath();
+	void initFilters(float bw);
 };
 
 #endif /* _RESAMPLER_H_ */

Transceiver52M/Synthesis.cpp

@@ -24,13 +24,13 @@
 #include <assert.h>
 #include <string.h>
 #include <cstdio>
+#include <iostream>
 
-#include "Logger.h"
 #include "Synthesis.h"
 
 extern "C" {
-#include "common/fft.h"
-#include "common/convolve.h"
+#include "fft.h"
+#include "convolve.h"
 }
 
 static void interleave(float **in, size_t ilen,

Transceiver52M/Transceiver.cpp

@@ -35,12 +35,6 @@ using namespace GSM;
 
 #define USB_LATENCY_INTRVL		10,0
 
-#if USE_UHD
-#  define USB_LATENCY_MIN		6,7
-#else
-#  define USB_LATENCY_MIN		1,1
-#endif
-
 /* Number of running values use in noise average */
 #define NOISE_CNT			20
 
@@ -71,7 +65,7 @@ TransceiverState::~TransceiverState()
   }
 }
 
-bool TransceiverState::init(int filler, size_t sps, float scale, size_t rtsc, unsigned rach_delay)
+bool TransceiverState::init(FillerType filler, size_t sps, float scale, size_t rtsc, unsigned rach_delay)
 {
   signalVector *burst;
 
@@ -81,19 +75,19 @@ bool TransceiverState::init(int filler, size_t sps, float scale, size_t rtsc, un
   for (size_t n = 0; n < 8; n++) {
     for (size_t i = 0; i < 102; i++) {
       switch (filler) {
-      case Transceiver::FILLER_DUMMY:
+      case FILLER_DUMMY:
         burst = generateDummyBurst(sps, n);
         break;
-      case Transceiver::FILLER_NORM_RAND:
+      case FILLER_NORM_RAND:
         burst = genRandNormalBurst(rtsc, sps, n);
         break;
-      case Transceiver::FILLER_EDGE_RAND:
+      case FILLER_EDGE_RAND:
         burst = generateEdgeBurst(rtsc);
         break;
-      case Transceiver::FILLER_ACCESS_RAND:
+      case FILLER_ACCESS_RAND:
         burst = genRandAccessBurst(rach_delay, sps, n);
         break;
-      case Transceiver::FILLER_ZERO:
+      case FILLER_ZERO:
       default:
         burst = generateEmptyBurst(sps, n);
       }
@@ -102,8 +96,8 @@ bool TransceiverState::init(int filler, size_t sps, float scale, size_t rtsc, un
       fillerTable[i][n] = burst;
     }
 
-    if ((filler == Transceiver::FILLER_NORM_RAND) ||
-        (filler == Transceiver::FILLER_EDGE_RAND)) {
+    if ((filler == FILLER_NORM_RAND) ||
+        (filler == FILLER_EDGE_RAND)) {
         chanType[n] = TSC;
     }
   }
@@ -112,16 +106,17 @@ bool TransceiverState::init(int filler, size_t sps, float scale, size_t rtsc, un
 }
 
 Transceiver::Transceiver(int wBasePort,
-                         const char *wTRXAddress,
+                         const char *TRXAddress,
+                         const char *GSMcoreAddress,
                          size_t tx_sps, size_t rx_sps, size_t chans,
                          GSM::Time wTransmitLatency,
                          RadioInterface *wRadioInterface,
                          double wRssiOffset)
-  : mBasePort(wBasePort), mAddr(wTRXAddress),
-    mClockSocket(wBasePort, wTRXAddress, mBasePort + 100),
+  : mBasePort(wBasePort), mLocalAddr(TRXAddress), mRemoteAddr(GSMcoreAddress),
+    mClockSocket(TRXAddress, wBasePort, GSMcoreAddress, wBasePort + 100),
     mTransmitLatency(wTransmitLatency), mRadioInterface(wRadioInterface),
     rssiOffset(wRssiOffset),
-    mSPSTx(tx_sps), mSPSRx(rx_sps), mChans(chans), mEdge(false), mOn(false),
+    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)
 {
@@ -160,7 +155,7 @@ Transceiver::~Transceiver()
  * are still expected to report clock indications through control channel
  * activity.
  */
-bool Transceiver::init(int filler, size_t rtsc, unsigned rach_delay, bool edge)
+bool Transceiver::init(FillerType filler, size_t rtsc, unsigned rach_delay, bool edge)
 {
   int d_srcport, d_dstport, c_srcport, c_dstport;
 
@@ -197,8 +192,8 @@ bool Transceiver::init(int filler, size_t rtsc, unsigned rach_delay, bool edge)
     d_srcport = mBasePort + 2 * i + 2;
     d_dstport = mBasePort + 2 * i + 102;
 
-    mCtrlSockets[i] = new UDPSocket(c_srcport, mAddr.c_str(), c_dstport);
-    mDataSockets[i] = new UDPSocket(d_srcport, mAddr.c_str(), d_dstport);
+    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 */
@@ -273,7 +268,7 @@ bool Transceiver::start()
                             TxUpperLoopAdapter, (void*) chan);
   }
 
-  writeClockInterface();
+  mForceClockInterface = true;
   mOn = true;
   return true;
 }
@@ -297,6 +292,10 @@ void Transceiver::stop()
   LOG(NOTICE) << "Stopping the transceiver";
   mTxLowerLoopThread->cancel();
   mRxLowerLoopThread->cancel();
+  mTxLowerLoopThread->join();
+  mRxLowerLoopThread->join();
+  delete mTxLowerLoopThread;
+  delete mRxLowerLoopThread;
 
   for (size_t i = 0; i < mChans; i++) {
     mRxServiceLoopThreads[i]->cancel();
@@ -315,11 +314,6 @@ void Transceiver::stop()
     mTxPriorityQueues[i].clear();
   }
 
-  mTxLowerLoopThread->join();
-  mRxLowerLoopThread->join();
-  delete mTxLowerLoopThread;
-  delete mRxLowerLoopThread;
-
   mOn = false;
   LOG(NOTICE) << "Transceiver stopped";
 }
@@ -379,7 +373,8 @@ void Transceiver::pushRadioVector(GSM::Time &nowTime)
     state = &mStates[i];
 
     while ((burst = mTxPriorityQueues[i].getStaleBurst(nowTime))) {
-      LOG(NOTICE) << "dumping STALE burst in TRX->USRP interface";
+      LOG(NOTICE) << "chan " << i << " dumping STALE burst in TRX->USRP interface ("
+                  << burst->getTime() <<" vs " << nowTime << "), retrans=" << state->mRetrans;
       if (state->mRetrans)
         updateFillerTable(i, burst);
       delete burst;
@@ -430,7 +425,7 @@ void Transceiver::setModulus(size_t timeslot, size_t chan)
   case V:
     state->fillerModulus[timeslot] = 51;
     break;
-    //case V: 
+    //case V:
   case VII:
     state->fillerModulus[timeslot] = 102;
     break;
@@ -545,7 +540,7 @@ 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. 
+ * and burst correlation type. Equalzation is currently disabled.
  */
 SoftVector *Transceiver::pullRadioVector(GSM::Time &wTime, double &RSSI, bool &isRssiValid,
                                          double &timingOffset, double &noise,
@@ -656,42 +651,67 @@ void Transceiver::reset()
     mTxPriorityQueues[i].clear();
 }
 
-  
-void Transceiver::driveControl(size_t chan)
+
+#define MAX_PACKET_LENGTH 100
+
+/**
+ * Matches a buffer with a command.
+ * @param  buf    a buffer to look command in
+ * @param  cmd    a command to look in buffer
+ * @param  params pointer to arguments, or NULL
+ * @return        true if command matches, otherwise false
+ */
+static bool match_cmd(char *buf,
+  const char *cmd, char **params)
 {
-  int MAX_PACKET_LENGTH = 100;
+  size_t cmd_len = strlen(cmd);
 
-  // check control socket
-  char buffer[MAX_PACKET_LENGTH];
-  int msgLen = -1;
-  buffer[0] = '\0';
+  /* Check a command itself */
+  if (strncmp(buf, cmd, cmd_len))
+    return false;
 
-  msgLen = mCtrlSockets[chan]->read(buffer, sizeof(buffer));
+  /* A command has arguments */
+  if (params != NULL) {
+    /* Make sure there is a space */
+    if (buf[cmd_len] != ' ')
+      return false;
 
-  if (msgLen < 1) {
-    return;
+    /* Update external pointer */
+    *params = buf + cmd_len + 1;
   }
 
-  char cmdcheck[4];
-  char command[MAX_PACKET_LENGTH];
-  char response[MAX_PACKET_LENGTH];
+  return true;
+}
 
-  sscanf(buffer,"%3s %s",cmdcheck,command);
+void Transceiver::driveControl(size_t chan)
+{
+  char buffer[MAX_PACKET_LENGTH + 1];
+  char response[MAX_PACKET_LENGTH + 1];
+  char *command, *params;
+  int msgLen;
 
-  if (!chan)
-    writeClockInterface();
+  /* Attempt to read from control socket */
+  msgLen = mCtrlSockets[chan]->read(buffer, MAX_PACKET_LENGTH);
+  if (msgLen < 1)
+    return;
 
-  if (strcmp(cmdcheck,"CMD")!=0) {
+  /* Zero-terminate received string */
+  buffer[msgLen] = '\0';
+
+  /* Verify a command signature */
+  if (strncmp(buffer, "CMD ", 4)) {
     LOG(WARNING) << "bogus message on control interface";
     return;
   }
-  LOG(INFO) << "command is " << buffer;
 
-  if (strcmp(command,"POWEROFF")==0) {
+  /* Set command pointer */
+  command = buffer + 4;
+  LOG(INFO) << "command is " << command;
+
+  if (match_cmd(command, "POWEROFF", NULL)) {
     stop();
     sprintf(response,"RSP POWEROFF 0");
-  }
-  else if (strcmp(command,"POWERON")==0) {
+  } else if (match_cmd(command, "POWERON", NULL)) {
     if (!start()) {
       sprintf(response,"RSP POWERON 1");
     } else {
@@ -701,41 +721,43 @@ void Transceiver::driveControl(size_t chan)
           mHandover[i][j] = false;
       }
     }
-  }
-  else if (strcmp(command,"HANDOVER")==0){
-    int ts=0,ss=0;
-    sscanf(buffer,"%3s %s %d %d",cmdcheck,command,&ts,&ss);
-    mHandover[ts][ss] = true;
-    sprintf(response,"RSP HANDOVER 0 %d %d",ts,ss);
-  }
-  else if (strcmp(command,"NOHANDOVER")==0){
-    int ts=0,ss=0;
-    sscanf(buffer,"%3s %s %d %d",cmdcheck,command,&ts,&ss);
-    mHandover[ts][ss] = false;
-    sprintf(response,"RSP NOHANDOVER 0 %d %d",ts,ss);
-  }
-  else if (strcmp(command,"SETMAXDLY")==0) {
+  } else if (match_cmd(command, "HANDOVER", &params)) {
+    unsigned ts = 0, ss = 0;
+    sscanf(params, "%u %u", &ts, &ss);
+    if (ts > 7 || ss > 7) {
+      sprintf(response, "RSP NOHANDOVER 1 %u %u", ts, ss);
+    } else {
+      mHandover[ts][ss] = true;
+      sprintf(response, "RSP HANDOVER 0 %u %u", ts, ss);
+    }
+  } else if (match_cmd(command, "NOHANDOVER", &params)) {
+    unsigned ts = 0, ss = 0;
+    sscanf(params, "%u %u", &ts, &ss);
+    if (ts > 7 || ss > 7) {
+      sprintf(response, "RSP NOHANDOVER 1 %u %u", ts, ss);
+    } else {
+      mHandover[ts][ss] = false;
+      sprintf(response, "RSP NOHANDOVER 0 %u %u", ts, ss);
+    }
+  } else if (match_cmd(command, "SETMAXDLY", &params)) {
     //set expected maximum time-of-arrival
     int maxDelay;
-    sscanf(buffer,"%3s %s %d",cmdcheck,command,&maxDelay);
+    sscanf(params, "%d", &maxDelay);
     mMaxExpectedDelayAB = maxDelay; // 1 GSM symbol is approx. 1 km
     sprintf(response,"RSP SETMAXDLY 0 %d",maxDelay);
-  }
-  else if (strcmp(command,"SETMAXDLYNB")==0) {
+  } else if (match_cmd(command, "SETMAXDLYNB", &params)) {
     //set expected maximum time-of-arrival
     int maxDelay;
-    sscanf(buffer,"%3s %s %d",cmdcheck,command,&maxDelay);
+    sscanf(params, "%d", &maxDelay);
     mMaxExpectedDelayNB = maxDelay; // 1 GSM symbol is approx. 1 km
     sprintf(response,"RSP SETMAXDLYNB 0 %d",maxDelay);
-  }
-  else if (strcmp(command,"SETRXGAIN")==0) {
+  } else if (match_cmd(command, "SETRXGAIN", &params)) {
     //set expected maximum time-of-arrival
     int newGain;
-    sscanf(buffer,"%3s %s %d",cmdcheck,command,&newGain);
+    sscanf(params, "%d", &newGain);
     newGain = mRadioInterface->setRxGain(newGain, chan);
     sprintf(response,"RSP SETRXGAIN 0 %d",newGain);
-  }
-  else if (strcmp(command,"NOISELEV")==0) {
+  } else if (match_cmd(command, "NOISELEV", NULL)) {
     if (mOn) {
       float lev = mStates[chan].mNoiseLev;
       sprintf(response,"RSP NOISELEV 0 %d",
@@ -744,26 +766,23 @@ void Transceiver::driveControl(size_t chan)
     else {
       sprintf(response,"RSP NOISELEV 1  0");
     }
-  }
-  else if (!strcmp(command, "SETPOWER")) {
+  } else if (match_cmd(command, "SETPOWER", &params)) {
     int power;
-    sscanf(buffer, "%3s %s %d", cmdcheck, command, &power);
+    sscanf(params, "%d", &power);
     power = mRadioInterface->setPowerAttenuation(power, chan);
     mStates[chan].mPower = power;
     sprintf(response, "RSP SETPOWER 0 %d", power);
-  }
-  else if (!strcmp(command,"ADJPOWER")) {
+  } else if (match_cmd(command, "ADJPOWER", &params)) {
     int power, step;
-    sscanf(buffer, "%3s %s %d", cmdcheck, command, &step);
+    sscanf(params, "%d", &step);
     power = mStates[chan].mPower + step;
     power = mRadioInterface->setPowerAttenuation(power, chan);
     mStates[chan].mPower = power;
     sprintf(response, "RSP ADJPOWER 0 %d", power);
-  }
-  else if (strcmp(command,"RXTUNE")==0) {
+  } else if (match_cmd(command, "RXTUNE", &params)) {
     // tune receiver
     int freqKhz;
-    sscanf(buffer,"%3s %s %d",cmdcheck,command,&freqKhz);
+    sscanf(params, "%d", &freqKhz);
     mRxFreq = freqKhz * 1e3;
     if (!mRadioInterface->tuneRx(mRxFreq, chan)) {
        LOG(ALERT) << "RX failed to tune";
@@ -771,11 +790,10 @@ void Transceiver::driveControl(size_t chan)
     }
     else
        sprintf(response,"RSP RXTUNE 0 %d",freqKhz);
-  }
-  else if (strcmp(command,"TXTUNE")==0) {
+  } else if (match_cmd(command, "TXTUNE", &params)) {
     // tune txmtr
     int freqKhz;
-    sscanf(buffer,"%3s %s %d",cmdcheck,command,&freqKhz);
+    sscanf(params, "%d", &freqKhz);
     mTxFreq = freqKhz * 1e3;
     if (!mRadioInterface->tuneTx(mTxFreq, chan)) {
        LOG(ALERT) << "TX failed to tune";
@@ -783,11 +801,10 @@ void Transceiver::driveControl(size_t chan)
     }
     else
        sprintf(response,"RSP TXTUNE 0 %d",freqKhz);
-  }
-  else if (!strcmp(command,"SETTSC")) {
+  } else if (match_cmd(command, "SETTSC", &params)) {
     // set TSC
     unsigned TSC;
-    sscanf(buffer, "%3s %s %d", cmdcheck, command, &TSC);
+    sscanf(params, "%u", &TSC);
     if (TSC > 7) {
       sprintf(response, "RSP SETTSC 1 %d", TSC);
     } else {
@@ -795,31 +812,27 @@ void Transceiver::driveControl(size_t chan)
       mTSC = TSC;
       sprintf(response,"RSP SETTSC 0 %d", TSC);
     }
-  }
-  else if (strcmp(command,"SETSLOT")==0) {
+  } else if (match_cmd(command, "SETSLOT", &params)) {
     // set slot type
     int  corrCode;
     int  timeslot;
-    sscanf(buffer,"%3s %s %d %d",cmdcheck,command,&timeslot,&corrCode);
+    sscanf(params, "%d %d", &timeslot, &corrCode);
     if ((timeslot < 0) || (timeslot > 7)) {
       LOG(WARNING) << "bogus message on control interface";
       sprintf(response,"RSP SETSLOT 1 %d %d",timeslot,corrCode);
       return;
-    }     
+    }
     mStates[chan].chanType[timeslot] = (ChannelCombination) corrCode;
     setModulus(timeslot, chan);
     sprintf(response,"RSP SETSLOT 0 %d %d",timeslot,corrCode);
-
-  }
-  else if (strcmp(command,"_SETBURSTTODISKMASK")==0) {
+  } else if (match_cmd(command, "_SETBURSTTODISKMASK", &params)) {
     // debug command! may change or disapear without notice
     // set a mask which bursts to dump to disk
     int mask;
-    sscanf(buffer,"%3s %s %d",cmdcheck,command,&mask);
+    sscanf(params, "%d", &mask);
     mWriteBurstToDiskMask = mask;
     sprintf(response,"RSP _SETBURSTTODISKMASK 0 %d",mask);
-  }
-  else {
+  } else {
     LOG(WARNING) << "bogus command " << command << " on control interface.";
     sprintf(response,"RSP ERR 1");
   }
@@ -853,14 +866,14 @@ bool Transceiver::driveTxPriorityQueue(size_t chan)
     frameNum = (frameNum << 8) | (0x0ff & buffer[i+1]);
 
   LOG(DEBUG) << "rcvd. burst at: " << GSM::Time(frameNum,timeSlot);
-  
+
   int RSSI = (int) buffer[5];
   BitVector newBurst(burstLen);
   BitVector::iterator itr = newBurst.begin();
   char *bufferItr = buffer+6;
-  while (itr < newBurst.end()) 
+  while (itr < newBurst.end())
     *itr++ = *bufferItr++;
-  
+
   GSM::Time currTime = GSM::Time(frameNum,timeSlot);
 
   addRadioVector(chan, newBurst, RSSI, currTime);
@@ -874,9 +887,9 @@ void Transceiver::driveReceiveRadio()
 {
   if (!mRadioInterface->driveReceiveRadio()) {
     usleep(100000);
-  } else {
-    if (mTransmitDeadlineClock > mLastClockUpdateTime + GSM::Time(216,0))
-      writeClockInterface();
+  } else if (mForceClockInterface || mTransmitDeadlineClock > mLastClockUpdateTime + GSM::Time(216,0)) {
+    mForceClockInterface = false;
+    writeClockInterface();
   }
 }
 
@@ -946,7 +959,7 @@ void Transceiver::driveTxFIFO()
 {
 
   /**
-      Features a carefully controlled latency mechanism, to 
+      Features a carefully controlled latency mechanism, to
       assure that transmit packets arrive at the radio/USRP
       before they need to be transmitted.
 
@@ -957,7 +970,7 @@ void Transceiver::driveTxFIFO()
 
 
   RadioClock *radioClock = (mRadioInterface->getClock());
-  
+
   if (mOn) {
     //radioClock->wait(); // wait until clock updates
     LOG(DEBUG) << "radio clock " << radioClock->get();
@@ -976,7 +989,7 @@ void Transceiver::driveTxFIFO()
         else {
           // if underrun hasn't occurred in the last sec (216 frames) drop
           //    transmit latency by a timeslot
-          if (mTransmitLatency > GSM::Time(USB_LATENCY_MIN)) {
+          if (mTransmitLatency > mRadioInterface->minLatency()) {
               if (radioClock->get() > mLatencyUpdateTime + GSM::Time(216,0)) {
               mTransmitLatency.decTN();
               LOG(INFO) << "reduced latency: " << mTransmitLatency;

Transceiver52M/Transceiver.h

@@ -30,6 +30,10 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
+extern "C" {
+#include "config_defs.h"
+}
+
 class Transceiver;
 
 /** Channel descriptor for transceiver object and channel number pair */
@@ -54,7 +58,7 @@ struct TransceiverState {
   ~TransceiverState();
 
   /* Initialize a multiframe slot in the filler table */
-  bool init(int filler, size_t sps, float scale, size_t rtsc, unsigned rach_delay);
+  bool init(FillerType filler, size_t sps, float scale, size_t rtsc, unsigned rach_delay);
 
   int chanType[8];
 
@@ -89,15 +93,17 @@ struct TransceiverState {
 /** The Transceiver class, responsible for physical layer of basestation */
 class Transceiver {
 public:
-  /** Transceiver constructor 
+  /** Transceiver constructor
       @param wBasePort base port number of UDP sockets
-      @param TRXAddress IP address of the TRX manager, as a string
+      @param TRXAddress IP address of the TRX, as a string
+      @param GSMcoreAddress IP address of the GSM core, as a string
       @param wSPS number of samples per GSM symbol
       @param wTransmitLatency initial setting of transmit latency
       @param radioInterface associated radioInterface object
   */
   Transceiver(int wBasePort,
               const char *TRXAddress,
+              const char *GSMcoreAddress,
               size_t tx_sps, size_t rx_sps, size_t chans,
               GSM::Time wTransmitLatency,
               RadioInterface *wRadioInterface,
@@ -107,7 +113,7 @@ public:
   ~Transceiver();
 
   /** Start the control loop */
-  bool init(int filler, size_t rtsc, unsigned rach_delay, bool edge);
+  bool init(FillerType filler, size_t rtsc, unsigned rach_delay, bool edge);
 
   /** attach the radioInterface receive FIFO */
   bool receiveFIFO(VectorFIFO *wFIFO, size_t chan)
@@ -142,17 +148,10 @@ public:
     LOOPBACK            ///< similar go VII, used in loopback testing
   } ChannelCombination;
 
-  enum FillerType {
-    FILLER_DUMMY,
-    FILLER_ZERO,
-    FILLER_NORM_RAND,
-    FILLER_EDGE_RAND,
-    FILLER_ACCESS_RAND,
-  };
-
 private:
   int mBasePort;
-  std::string mAddr;
+  std::string mLocalAddr;
+  std::string mRemoteAddr;
 
   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
@@ -169,7 +168,7 @@ private:
 
   GSM::Time mTransmitLatency;             ///< latency between basestation clock and transmit deadline clock
   GSM::Time mLatencyUpdateTime;           ///< last time latency was updated
-  GSM::Time mTransmitDeadlineClock;       ///< deadline for pushing bursts into transmit FIFO 
+  GSM::Time mTransmitDeadlineClock;       ///< deadline for pushing bursts into transmit FIFO
   GSM::Time mLastClockUpdateTime;         ///< last time clock update was sent up to core
 
   RadioInterface *mRadioInterface;	  ///< associated radioInterface object
@@ -208,6 +207,7 @@ private:
 
   bool mEdge;
   bool mOn;	                           ///< flag to indicate that transceiver is powered on
+  bool mForceClockInterface;           ///< flag to indicate whether IND CLOCK shall be sent unconditionally after transceiver is started
   bool mHandover[8][8];                ///< expect handover to the timeslot/subslot
   double mTxFreq;                      ///< the transmit frequency
   double mRxFreq;                      ///< the receive frequency
@@ -275,4 +275,3 @@ void *ControlServiceLoopAdapter(TransceiverChannel *);
 
 /** transmit queueing thread loop */
 void *TxUpperLoopAdapter(TransceiverChannel *);
-

Transceiver52M/arch/Makefile.am

@@ -0,0 +1,8 @@
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS = common
+if ARCH_ARM
+SUBDIRS += arm
+else
+SUBDIRS += x86
+endif

Transceiver52M/arch/arm/Makefile.am

@@ -1,17 +1,17 @@
-if ARCH_ARM
 if ARCH_ARM_A15
 ARCH_FLAGS = -mfpu=neon-vfpv4
 else
 ARCH_FLAGS = -mfpu=neon
 endif
 
-AM_CFLAGS = -Wall $(ARCH_FLAGS) -std=gnu99 -I../common
+AM_CFLAGS = -Wall $(ARCH_FLAGS) -std=gnu99 -I${srcdir}/../common
 AM_CCASFLAGS = $(ARCH_FLAGS)
 
 noinst_LTLIBRARIES = libarch.la
 
+libarch_la_LIBADD = $(top_builddir)/Transceiver52M/arch/common/libarch_common.la
+
 libarch_la_SOURCES = \
-	../common/convolve_base.c \
 	convert.c \
 	convert_neon.S \
 	convolve.c \
@@ -20,4 +20,3 @@ libarch_la_SOURCES = \
 	scale_neon.S \
 	mult.c \
 	mult_neon.S
-endif

Transceiver52M/arch/arm/convert.c

@@ -28,6 +28,9 @@
 void neon_convert_ps_si16_4n(short *, const float *, const float *, int);
 void neon_convert_si16_ps_4n(float *, const short *, int);
 
+void convert_init(void) {
+}
+
 /* 4*N 16-bit signed integer conversion with remainder */
 static void neon_convert_si16_ps(float *out,
 				 const short *in,
@@ -54,7 +57,6 @@ static void neon_convert_ps_si16(short *out,
 	for (int i = 0; i < len % 4; i++)
 		out[start + i] = (short) (in[start + i] * (*scale));
 }
-#endif
 
 void convert_float_short(short *out, const float *in, float scale, int len)
 {

Transceiver52M/arch/common/Makefile.am

@@ -0,0 +1,15 @@
+AM_CFLAGS = -Wall -std=gnu99
+
+noinst_LTLIBRARIES = libarch_common.la
+
+noinst_HEADERS = \
+        convolve.h \
+        convert.h \
+        scale.h \
+        mult.h \
+        fft.h
+
+libarch_common_la_SOURCES = \
+        convolve_base.c \
+        convert_base.c \
+        fft.c

Transceiver52M/arch/x86/Makefile.am

@@ -1,11 +1,15 @@
-if !ARCH_ARM
 AM_CFLAGS = -Wall -std=gnu99 -I${srcdir}/../common
 
 noinst_LTLIBRARIES = libarch.la
 noinst_LTLIBRARIES += libarch_sse_3.la
 noinst_LTLIBRARIES += libarch_sse_4_1.la
 
-libarch_la_LIBADD =
+noinst_HEADERS = \
+	convert_sse_3.h \
+	convert_sse_4_1.h \
+	convolve_sse_3.h
+
+libarch_la_LIBADD = $(top_builddir)/Transceiver52M/arch/common/libarch_common.la
 
 # SSE 3 specific code
 if HAVE_SSE3
@@ -25,8 +29,5 @@ libarch_la_LIBADD += libarch_sse_4_1.la
 endif
 
 libarch_la_SOURCES = \
-	../common/convolve_base.c \
-	../common/convert_base.c \
 	convert.c \
 	convolve.c
-endif

Transceiver52M/device/Makefile.am

@@ -0,0 +1,17 @@
+include $(top_srcdir)/Makefile.common
+
+noinst_HEADERS = radioDevice.h
+
+SUBDIRS =
+
+if DEVICE_USRP1
+SUBDIRS += usrp1
+endif
+
+if DEVICE_UHD
+SUBDIRS += uhd
+endif
+
+if DEVICE_LMS
+SUBDIRS += lms
+endif

Transceiver52M/device/lms/LMSDevice.cpp

@@ -0,0 +1,629 @@
+/*
+* Copyright 2018 sysmocom - s.f.m.c. GmbH
+*
+	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 <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include "Logger.h"
+#include "Threads.h"
+#include "LMSDevice.h"
+
+#include <lime/LimeSuite.h>
+
+#include <osmocom/core/utils.h>
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+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)
+
+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, chans, lo_offset, tx_paths, rx_paths),
+	m_lms_dev(NULL)
+{
+	LOG(INFO) << "creating LMS device...";
+
+	m_lms_stream_rx.resize(chans);
+	m_lms_stream_tx.resize(chans);
+
+	m_last_rx_underruns.resize(chans, 0);
+	m_last_rx_overruns.resize(chans, 0);
+	m_last_tx_underruns.resize(chans, 0);
+	m_last_tx_overruns.resize(chans, 0);
+}
+
+static void lms_log_callback(int lvl, const char *msg)
+{
+	/* map lime specific log levels */
+	static const int lvl_map[5] = {
+		[0] = LOGL_FATAL,
+		[1] = LOGL_ERROR,
+		[2] = LOGL_NOTICE,
+		[3] = LOGL_INFO,
+		[4] = LOGL_DEBUG,
+	};
+	/* protect against future higher log level values (lower importance) */
+	if ((unsigned int) lvl >= ARRAY_SIZE(lvl_map))
+		lvl = ARRAY_SIZE(lvl_map)-1;
+
+	LOGLV(DLMS, lvl) << msg;
+}
+
+static void thread_enable_cancel(bool cancel)
+{
+	cancel ? pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) :
+		 pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
+}
+
+static void print_range(const char* name, lms_range_t *range)
+{
+	LOG(DEBUG) << name << ": Min=" << range->min << " Max=" << range->max
+		   << " Step=" << range->step;
+}
+
+int LMSDevice::open(const std::string &args, int ref, bool swap_channels)
+{
+	//lms_info_str_t dev_str;
+	lms_info_str_t* info_list;
+	lms_range_t range_lpfbw_rx, range_lpfbw_tx, range_sr;
+	float_type sr_host, sr_rf, lpfbw_rx, lpfbw_tx;
+	uint16_t dac_val;
+	unsigned int i, n;
+	int rc;
+
+	LOG(INFO) << "Opening LMS device..";
+
+	LMS_RegisterLogHandler(&lms_log_callback);
+
+	if ((n = LMS_GetDeviceList(NULL)) < 0)
+		LOG(ERROR) << "LMS_GetDeviceList(NULL) failed";
+	LOG(DEBUG) << "Devices found: " << n;
+	if (n < 1)
+	    return -1;
+
+	info_list = new lms_info_str_t[n];
+
+	if (LMS_GetDeviceList(info_list) < 0)
+		LOG(ERROR) << "LMS_GetDeviceList(info_list) failed";
+
+	for (i = 0; i < n; i++)
+		LOG(DEBUG) << "Device [" << i << "]: " << info_list[i];
+
+	rc = LMS_Open(&m_lms_dev, info_list[0], NULL);
+	if (rc != 0) {
+		LOG(ERROR) << "LMS_GetDeviceList() failed)";
+		delete [] info_list;
+		return -1;
+	}
+
+	delete [] info_list;
+
+	LOG(INFO) << "Init LMS device";
+	if (LMS_Init(m_lms_dev) != 0) {
+		LOG(ERROR) << "LMS_Init() failed";
+		return -1;
+	}
+
+	if (LMS_GetSampleRateRange(m_lms_dev, LMS_CH_RX, &range_sr))
+		goto out_close;
+	print_range("Sample Rate", &range_sr);
+
+	LOG(DEBUG) << "Setting sample rate to " << GSMRATE*tx_sps << " " << tx_sps;
+	if (LMS_SetSampleRate(m_lms_dev, GSMRATE*tx_sps, 32) < 0)
+		goto out_close;
+
+	if (LMS_GetSampleRate(m_lms_dev, LMS_CH_RX, 0, &sr_host, &sr_rf))
+		goto out_close;
+	LOG(DEBUG) << "Sample Rate: Host=" << sr_host << " RF=" << sr_rf;
+
+	/* FIXME: make this device/model dependent, like UHDDevice:dev_param_map! */
+	ts_offset = static_cast<TIMESTAMP>(8.9e-5 * GSMRATE * tx_sps); /* time * sample_rate */
+
+	switch (ref) {
+	case REF_INTERNAL:
+		LOG(DEBUG) << "Setting Internal clock reference";
+		/* Ugly API: Selecting clock source implicit by writing to VCTCXO DAC ?!? */
+		if (LMS_VCTCXORead(m_lms_dev, &dac_val) < 0)
+			goto out_close;
+		LOG(DEBUG) << "Setting VCTCXO to " << dac_val;
+		if (LMS_VCTCXOWrite(m_lms_dev, dac_val) < 0)
+			goto out_close;
+		break;
+	case REF_EXTERNAL:
+		LOG(DEBUG) << "Setting External clock reference to " << 10000000.0;
+		/* Assume an external 10 MHz reference clock */
+		if (LMS_SetClockFreq(m_lms_dev, LMS_CLOCK_EXTREF, 10000000.0) < 0)
+			goto out_close;
+		break;
+	default:
+		LOG(ALERT) << "Invalid reference type";
+		goto out_close;
+	}
+
+	if (LMS_GetLPFBWRange(m_lms_dev, LMS_CH_RX, &range_lpfbw_rx))
+		goto out_close;
+	print_range("LPFBWRange Rx", &range_lpfbw_rx);
+	if (LMS_GetLPFBWRange(m_lms_dev, LMS_CH_RX, &range_lpfbw_tx))
+		goto out_close;
+	print_range("LPFBWRange Tx", &range_lpfbw_tx);
+	lpfbw_rx = OSMO_MIN(OSMO_MAX(1.4001e6, range_lpfbw_rx.min), range_lpfbw_rx.max);
+	lpfbw_tx = OSMO_MIN(OSMO_MAX(5.2e6, range_lpfbw_tx.min), range_lpfbw_tx.max);
+
+	LOG(DEBUG) << "LPFBW: Rx=" << lpfbw_rx << " Tx=" << lpfbw_tx;
+
+	if (!set_antennas()) {
+		LOG(ALERT) << "LMS antenna setting failed";
+		return -1;
+	}
+
+	/* Perform Rx and Tx calibration */
+	for (i=0; i<chans; i++) {
+		LOG(INFO) << "Setting LPFBW chan " << i;
+		if (LMS_SetLPFBW(m_lms_dev, LMS_CH_RX, i, lpfbw_rx) < 0)
+			goto out_close;
+		if (LMS_SetLPFBW(m_lms_dev, LMS_CH_TX, i, lpfbw_tx) < 0)
+			goto out_close;
+		LOG(INFO) << "Calibrating chan " << i;
+		if (LMS_Calibrate(m_lms_dev, LMS_CH_RX, i, LMS_CALIBRATE_BW_HZ, 0) < 0)
+			goto out_close;
+		if (LMS_Calibrate(m_lms_dev, LMS_CH_TX, i, LMS_CALIBRATE_BW_HZ, 0) < 0)
+			goto out_close;
+	}
+
+	samplesRead = 0;
+	samplesWritten = 0;
+	started = false;
+
+	return NORMAL;
+
+out_close:
+	LOG(ALERT) << "Error in LMS open, closing: " << LMS_GetLastErrorMessage();
+	LMS_Close(m_lms_dev);
+	return -1;
+}
+
+bool LMSDevice::start()
+{
+	LOG(INFO) << "starting LMS...";
+
+	unsigned int i;
+
+	/* configure the channels/streams */
+	for (i=0; i<chans; i++) {
+		if (LMS_EnableChannel(m_lms_dev, LMS_CH_RX, i, true) < 0)
+			return false;
+
+		if (LMS_EnableChannel(m_lms_dev, LMS_CH_TX, i, true) < 0)
+			return false;
+
+		// Set gains to midpoint
+		setTxGain((minTxGain() + maxTxGain()) / 2, i);
+		setRxGain((minRxGain() + maxRxGain()) / 2, i);
+
+		m_lms_stream_rx[i] = {};
+		m_lms_stream_rx[i].isTx = false;
+		m_lms_stream_rx[i].channel = i;
+		m_lms_stream_rx[i].fifoSize = 1024 * 1024;
+		m_lms_stream_rx[i].throughputVsLatency = 0.3;
+		m_lms_stream_rx[i].dataFmt = lms_stream_t::LMS_FMT_I16;
+
+		m_lms_stream_tx[i] = {};
+		m_lms_stream_tx[i].isTx = true;
+		m_lms_stream_tx[i].channel = i;
+		m_lms_stream_tx[i].fifoSize = 1024 * 1024;
+		m_lms_stream_tx[i].throughputVsLatency = 0.3;
+		m_lms_stream_tx[i].dataFmt = lms_stream_t::LMS_FMT_I16;
+
+		if (LMS_SetupStream(m_lms_dev, &m_lms_stream_rx[i]) < 0)
+			return false;
+
+		if (LMS_SetupStream(m_lms_dev, &m_lms_stream_tx[i]) < 0)
+			return false;
+	}
+
+	/* now start the streams in a second loop, as we can no longer call
+	 * LMS_SetupStream() after LMS_StartStream() of the first stream */
+	for (i = 0; i < chans; i++) {
+		if (LMS_StartStream(&m_lms_stream_rx[i]) < 0)
+			return false;
+
+		if (LMS_StartStream(&m_lms_stream_tx[i]) < 0)
+			return false;
+	}
+
+	flush_recv(10);
+
+	started = true;
+	return true;
+}
+
+bool LMSDevice::stop()
+{
+	unsigned int i;
+
+	if (!started)
+		return true;
+
+	for (i=0; i<chans; i++) {
+		LMS_StopStream(&m_lms_stream_tx[i]);
+		LMS_StopStream(&m_lms_stream_rx[i]);
+
+		LMS_EnableChannel(m_lms_dev, LMS_CH_RX, i, false);
+		LMS_EnableChannel(m_lms_dev, LMS_CH_TX, i, false);
+	}
+
+	return true;
+}
+
+double LMSDevice::maxTxGain()
+{
+	return 73.0;
+}
+
+double LMSDevice::minTxGain()
+{
+	return 0.0;
+}
+
+double LMSDevice::maxRxGain()
+{
+	return 73.0;
+}
+
+double LMSDevice::minRxGain()
+{
+	return 0.0;
+}
+
+double LMSDevice::setTxGain(double dB, size_t chan)
+{
+	if (chan) {
+		LOG(ALERT) << "Invalid channel " << chan;
+		return 0.0;
+	}
+
+	if (dB > maxTxGain())
+		dB = maxTxGain();
+	if (dB < minTxGain())
+		dB = minTxGain();
+
+	LOG(NOTICE) << "Setting TX gain to " << dB << " dB.";
+
+	if (LMS_SetGaindB(m_lms_dev, LMS_CH_TX, chan, dB) < 0)
+		LOG(ERR) << "Error setting TX gain";
+
+	return dB;
+}
+
+double LMSDevice::setRxGain(double dB, size_t chan)
+{
+	if (chan) {
+		LOG(ALERT) << "Invalid channel " << chan;
+		return 0.0;
+	}
+
+	dB = 34.0;
+
+	if (dB > maxRxGain())
+		dB = maxRxGain();
+	if (dB < minRxGain())
+		dB = minRxGain();
+
+	LOG(NOTICE) << "Setting RX gain to " << dB << " dB.";
+
+	if (LMS_SetGaindB(m_lms_dev, LMS_CH_RX, chan, dB) < 0)
+		LOG(ERR) << "Error setting RX gain";
+
+	return dB;
+}
+
+int LMSDevice::get_ant_idx(const std::string & name, bool dir_tx, size_t chan)
+{
+	lms_name_t name_list[MAX_ANTENNA_LIST_SIZE]; /* large enough list for antenna names. */
+	const char* c_name = name.c_str();
+	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 (!strcmp(c_name, name_list[i]))
+			return i;
+	}
+	return -1;
+}
+
+bool LMSDevice::flush_recv(size_t num_pkts)
+{
+	#define CHUNK 625
+	int len = CHUNK * tx_sps;
+	short *buffer = new short[len * 2];
+	int rc;
+	lms_stream_meta_t rx_metadata = {};
+	rx_metadata.flushPartialPacket = false;
+	rx_metadata.waitForTimestamp = false;
+
+	ts_initial = 0;
+
+	while (!ts_initial || (num_pkts-- > 0)) {
+		rc = LMS_RecvStream(&m_lms_stream_rx[0], &buffer[0], len, &rx_metadata, 100);
+		LOG(DEBUG) << "Flush: Recv buffer of len " << rc << " at " << std::hex << rx_metadata.timestamp;
+		if (rc != len) {
+			LOG(ALERT) << "LMS: Device receive timed out";
+			delete[] buffer;
+			return false;
+		}
+
+		ts_initial = rx_metadata.timestamp + len;
+	}
+
+	LOG(INFO) << "Initial timestamp " << ts_initial << std::endl;
+	delete[] buffer;
+	return true;
+}
+
+bool LMSDevice::setRxAntenna(const std::string & ant, size_t chan)
+{
+	int idx;
+
+	if (chan >= rx_paths.size()) {
+		LOG(ALERT) << "Requested non-existent channel " << chan;
+		return false;
+	}
+
+	idx = get_ant_idx(ant, LMS_CH_RX, chan);
+	if (idx < 0) {
+		LOG(ALERT) << "Invalid Rx Antenna";
+		return false;
+	}
+
+	if (LMS_SetAntenna(m_lms_dev, LMS_CH_RX, chan, idx) < 0) {
+		LOG(ALERT) << "Unable to set Rx Antenna";
+	}
+
+	return true;
+}
+
+std::string LMSDevice::getRxAntenna(size_t chan)
+{
+	lms_name_t name_list[MAX_ANTENNA_LIST_SIZE]; /* large enough list for antenna names. */
+	int idx;
+
+	if (chan >= rx_paths.size()) {
+		LOG(ALERT) << "Requested non-existent channel " << chan;
+		return "";
+	}
+
+	idx = LMS_GetAntenna(m_lms_dev, LMS_CH_RX, chan);
+	if (idx < 0) {
+		LOG(ALERT) << "Error getting Rx Antenna";
+		return "";
+	}
+
+	if (LMS_GetAntennaList(m_lms_dev, LMS_CH_RX, chan, name_list) < idx) {
+		LOG(ALERT) << "Error getting Rx Antenna List";
+		return "";
+	}
+
+	return name_list[idx];
+}
+
+bool LMSDevice::setTxAntenna(const std::string & ant, size_t chan)
+{
+	int idx;
+
+	if (chan >= tx_paths.size()) {
+		LOG(ALERT) << "Requested non-existent channel " << chan;
+		return false;
+	}
+
+	idx = get_ant_idx(ant, LMS_CH_TX, chan);
+	if (idx < 0) {
+		LOG(ALERT) << "Invalid Rx Antenna";
+		return false;
+	}
+
+	if (LMS_SetAntenna(m_lms_dev, LMS_CH_TX, chan, idx) < 0) {
+		LOG(ALERT) << "Unable to set Rx Antenna";
+	}
+
+	return true;
+}
+
+std::string LMSDevice::getTxAntenna(size_t chan)
+{
+	lms_name_t name_list[MAX_ANTENNA_LIST_SIZE]; /* large enough list for antenna names. */
+	int idx;
+
+	if (chan >= tx_paths.size()) {
+		LOG(ALERT) << "Requested non-existent channel " << chan;
+		return "";
+	}
+
+	idx = LMS_GetAntenna(m_lms_dev, LMS_CH_TX, chan);
+	if (idx < 0) {
+		LOG(ALERT) << "Error getting Tx Antenna";
+		return "";
+	}
+
+	if (LMS_GetAntennaList(m_lms_dev, LMS_CH_TX, chan, name_list) < idx) {
+		LOG(ALERT) << "Error getting Tx Antenna List";
+		return "";
+	}
+
+	return name_list[idx];
+}
+
+bool LMSDevice::requiresRadioAlign()
+{
+	return false;
+}
+
+GSM::Time LMSDevice::minLatency() {
+	/* Empirical data from a handful of
+	relatively recent machines shows that the B100 will underrun when
+	the transmit threshold is reduced to a time of 6 and a half frames,
+	so we set a minimum 7 frame threshold. */
+	return GSM::Time(6,7);
+}
+
+// NOTE: Assumes sequential reads
+int LMSDevice::readSamples(std::vector < short *>&bufs, int len, bool * overrun,
+			   TIMESTAMP timestamp, bool * underrun, unsigned *RSSI)
+{
+	int rc = 0;
+	unsigned int i;
+	lms_stream_status_t status;
+	lms_stream_meta_t rx_metadata = {};
+	rx_metadata.flushPartialPacket = false;
+	rx_metadata.waitForTimestamp = false;
+	rx_metadata.timestamp = 0;
+
+	if (bufs.size() != chans) {
+		LOG(ALERT) << "Invalid channel combination " << bufs.size();
+		return -1;
+	}
+
+	*overrun = false;
+	*underrun = false;
+	for (i = 0; i<chans; i++) {
+		thread_enable_cancel(false);
+		rc = LMS_RecvStream(&m_lms_stream_rx[i], bufs[i], len, &rx_metadata, 100);
+		if (timestamp != (TIMESTAMP)rx_metadata.timestamp)
+			LOG(ALERT) << "chan "<< i << " recv buffer of len " << rc << " expect " << std::hex << timestamp << " got " << std::hex << (TIMESTAMP)rx_metadata.timestamp << " (" << std::hex << rx_metadata.timestamp <<") diff=" << rx_metadata.timestamp - timestamp;
+		if (rc != len) {
+			LOG(ALERT) << "LMS: Device receive timed out";
+		}
+
+		if (LMS_GetStreamStatus(&m_lms_stream_rx[i], &status) == 0) {
+			if (status.underrun > m_last_rx_underruns[i])
+				*underrun = true;
+			m_last_rx_underruns[i] = status.underrun;
+
+			if (status.overrun > m_last_rx_overruns[i])
+				*overrun = true;
+			m_last_rx_overruns[i] = status.overrun;
+		}
+		thread_enable_cancel(true);
+	}
+
+	samplesRead += rc;
+
+	if (((TIMESTAMP) rx_metadata.timestamp) < timestamp)
+		rc = 0;
+
+	return rc;
+}
+
+int LMSDevice::writeSamples(std::vector < short *>&bufs, int len,
+			    bool * underrun, unsigned long long timestamp,
+			    bool isControl)
+{
+	int rc;
+	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) {
+		LOG(ERR) << "Control packets not supported";
+		return 0;
+	}
+
+	if (bufs.size() != chans) {
+		LOG(ALERT) << "Invalid channel combination " << bufs.size();
+		return -1;
+	}
+
+	*underrun = false;
+
+	for (i = 0; i<chans; i++) {
+		LOG(DEBUG) << "chan "<< i << " send buffer of len " << len << " timestamp " << std::hex << tx_metadata.timestamp;
+		thread_enable_cancel(false);
+		rc = LMS_SendStream(&m_lms_stream_tx[i], bufs[i], len, &tx_metadata, 100);
+		if (rc != len) {
+			LOG(ALERT) << "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);
+	}
+
+	samplesWritten += rc;
+
+	return rc;
+}
+
+bool LMSDevice::updateAlignment(TIMESTAMP timestamp)
+{
+	return true;
+}
+
+bool LMSDevice::setTxFreq(double wFreq, size_t chan)
+{
+
+	if (chan) {
+		LOG(ALERT) << "Invalid channel " << chan;
+		return false;
+	}
+
+	if (LMS_SetLOFrequency(m_lms_dev, LMS_CH_TX, chan, wFreq) < 0) {
+		LOG(ALERT) << "set Tx: " << wFreq << " failed!";
+		return false;
+	}
+
+	return true;
+}
+
+bool LMSDevice::setRxFreq(double wFreq, size_t chan)
+{
+	if (chan) {
+		LOG(ALERT) << "Invalid channel " << chan;
+		return false;
+	}
+
+	if (LMS_SetLOFrequency(m_lms_dev, LMS_CH_RX, chan, wFreq) < 0) {
+		LOG(ALERT) << "set Rx: " << wFreq << " failed!";
+		return false;
+	}
+
+	return true;
+}
+
+RadioDevice *RadioDevice::make(size_t tx_sps, size_t rx_sps,
+			       InterfaceType iface, size_t chans, double lo_offset,
+			       const std::vector < std::string > &tx_paths,
+			       const std::vector < std::string > &rx_paths)
+{
+	return new LMSDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths);
+}

Transceiver52M/device/lms/LMSDevice.h

@@ -0,0 +1,202 @@
+/*
+* Copyright 2018 sysmocom - s.f.m.c. GmbH
+*
+* 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.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+*/
+
+#ifndef _LMS_DEVICE_H_
+#define _LMS_DEVICE_H_
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "radioDevice.h"
+
+#include <sys/time.h>
+#include <math.h>
+#include <limits.h>
+#include <string>
+#include <iostream>
+#include <lime/LimeSuite.h>
+
+#define LIMESDR_TX_AMPL  0.3
+
+/** 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_tx_underruns;
+	std::vector<uint32_t> m_last_tx_overruns;
+
+	double actualSampleRate;	///< the actual USRP sampling rate
+
+	unsigned long long samplesRead;	///< number of samples read from LMS
+	unsigned long long samplesWritten;	///< number of samples sent to LMS
+
+	bool started;		///< flag indicates LMS has started
+	bool skipRx;		///< set if LMS is transmit-only.
+
+	TIMESTAMP ts_initial, ts_offset;
+
+	double rxGain;
+
+	int get_ant_idx(const std::string & name, bool dir_tx, size_t chan);
+	bool flush_recv(size_t num_pkts);
+
+public:
+
+	/** Object constructor */
+	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);
+
+	/** Instantiate the LMS */
+	int open(const std::string &args, int ref, bool swap_channels);
+
+	/** Start the LMS */
+	bool start();
+
+	/** Stop the LMS */
+	bool stop();
+
+	/** Set priority not supported */
+	void setPriority(float prio = 0.5) {
+	}
+
+	enum TxWindowType getWindowType() {
+		return TX_WINDOW_LMS1;
+	}
+
+	/**
+	Read samples from the LMS.
+	@param buf preallocated buf to contain read result
+	@param len number of samples desired
+	@param overrun Set if read buffer has been overrun, e.g. data not being read fast enough
+	@param timestamp The timestamp of the first samples to be read
+	@param underrun Set if 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, 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, bool isControl =
+			 false);
+
+	/** Update the alignment between the read and write timestamps */
+	bool updateAlignment(TIMESTAMP timestamp);
+
+	/** Set the transmitter frequency */
+	bool setTxFreq(double wFreq, size_t chan = 0);
+
+	/** Set the receiver frequency */
+	bool setRxFreq(double wFreq, size_t chan = 0);
+
+	/** Returns the starting write Timestamp*/
+	TIMESTAMP initialWriteTimestamp(void) {
+		return ts_initial;
+	}
+
+	/** Returns the starting read Timestamp*/
+	TIMESTAMP initialReadTimestamp(void) {
+		return ts_initial;
+	}
+
+	/** returns the full-scale transmit amplitude **/
+	double fullScaleInputValue() {
+		return(double) SHRT_MAX * LIMESDR_TX_AMPL;
+	}
+
+	/** returns the full-scale receive amplitude **/
+	double fullScaleOutputValue() {
+		return (double) SHRT_MAX;
+	}
+
+	/** sets the receive chan gain, returns the gain setting **/
+	double setRxGain(double dB, size_t chan = 0);
+
+	/** get the current receive gain */
+	double getRxGain(size_t chan = 0) {
+		return rxGain;
+	}
+
+	/** return maximum Rx Gain **/
+	double maxRxGain(void);
+
+	/** return minimum Rx Gain **/
+	double minRxGain(void);
+
+	/** sets the transmit chan gain, returns the gain setting **/
+	double setTxGain(double dB, size_t chan = 0);
+
+	/** return maximum Tx Gain **/
+	double maxTxGain(void);
+
+	/** return minimum Rx Gain **/
+	double minTxGain(void);
+
+	/** sets the RX path to use, returns true if successful and false otherwise */
+	bool setRxAntenna(const std::string & ant, size_t chan = 0);
+
+	/* return the used RX path */
+	std::string getRxAntenna(size_t chan = 0);
+
+	/** sets the RX path to use, returns true if successful and false otherwise */
+	bool setTxAntenna(const std::string & ant, size_t chan = 0);
+
+	/* return the used RX path */
+	std::string getTxAntenna(size_t chan = 0);
+
+	/** return whether user drives synchronization of Tx/Rx of USRP */
+        bool requiresRadioAlign();
+
+        /** return whether user drives synchronization of Tx/Rx of USRP */
+        virtual GSM::Time minLatency();
+
+	/** Return internal status values */
+	inline double getTxFreq(size_t chan = 0) {
+		return 0;
+	}
+	inline double getRxFreq(size_t chan = 0) {
+		return 0;
+	}
+	inline double getSampleRate() {
+		return actualSampleRate;
+	}
+	inline double numberRead() {
+		return samplesRead;
+	}
+	inline double numberWritten() {
+		return samplesWritten;
+	}
+};
+
+#endif // _LMS_DEVICE_H_

Transceiver52M/device/lms/Makefile.am

@@ -0,0 +1,10 @@
+include $(top_srcdir)/Makefile.common
+
+AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/..
+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LMS_CFLAGS)
+
+noinst_HEADERS = LMSDevice.h
+
+noinst_LTLIBRARIES = libdevice.la
+
+libdevice_la_SOURCES = LMSDevice.cpp

Transceiver52M/device/radioDevice.h

@@ -18,6 +18,13 @@
 #include <string>
 #include <vector>
 
+#include "GSMCommon.h"
+#include "Logger.h"
+
+extern "C" {
+#include "config_defs.h"
+}
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -33,7 +40,7 @@ class RadioDevice {
 
   public:
   /* Available transport bus types */
-  enum TxWindowType { TX_WINDOW_USRP1, TX_WINDOW_FIXED };
+  enum TxWindowType { TX_WINDOW_USRP1, TX_WINDOW_FIXED, TX_WINDOW_LMS1 };
 
   /* Radio interface types */
   enum InterfaceType {
@@ -43,22 +50,25 @@ class RadioDevice {
     MULTI_ARFCN,
   };
 
-  enum ReferenceType {
-    REF_INTERNAL,
-    REF_EXTERNAL,
-    REF_GPS,
-  };
-
   static RadioDevice *make(size_t tx_sps, size_t rx_sps, InterfaceType type,
-                           size_t chans = 1, double offset = 0.0);
+                           size_t chans = 1, double offset = 0.0,
+                           const std::vector<std::string>& tx_paths = std::vector<std::string>(1, ""),
+                           const std::vector<std::string>& rx_paths = std::vector<std::string>(1, ""));
 
   /** Initialize the USRP */
   virtual int open(const std::string &args, int ref, bool swap_channels)=0;
 
+  RadioDevice(size_t tx_sps, size_t rx_sps, InterfaceType type, size_t chans, double offset,
+              const std::vector<std::string>& tx_paths,
+              const std::vector<std::string>& rx_paths):
+		tx_sps(tx_sps), rx_sps(rx_sps), iface(type), chans(chans), lo_offset(offset),
+		tx_paths(tx_paths), rx_paths(rx_paths)
+	{ }
+
   virtual ~RadioDevice() { }
 
   /** Start the USRP */
-  virtual bool start(bool txOnly = false)=0;
+  virtual bool start()=0;
 
   /** Stop the USRP */
   virtual bool stop()=0;
@@ -91,7 +101,6 @@ class RadioDevice {
         @param isControl Set if data is a control packet, e.g. a ping command
         @return The number of samples actually written
   */
-  virtual void triggerGPIO(TIMESTAMP timestamp) = 0;
   virtual int writeSamples(std::vector<short *> &bufs, int len, bool *underrun,
                            TIMESTAMP timestamp, bool isControl = false) = 0;
 
@@ -137,6 +146,24 @@ class RadioDevice {
   /** return minimum Tx Gain **/
   virtual double minTxGain(void) = 0;
 
+  /** sets the RX path to use, returns true if successful and false otherwise */
+  virtual bool setRxAntenna(const std::string &ant, size_t chan = 0) = 0;
+
+  /** return the used RX path */
+  virtual std::string getRxAntenna(size_t chan = 0) = 0;
+
+  /** sets the RX path to use, returns true if successful and false otherwise */
+  virtual bool setTxAntenna(const std::string &ant, size_t chan = 0) = 0;
+
+  /** return the used RX path */
+  virtual std::string getTxAntenna(size_t chan = 0) = 0;
+
+  /** return whether user drives synchronization of Tx/Rx of USRP */
+  virtual bool requiresRadioAlign() = 0;
+
+  /** Minimum latency that the device can achieve */
+  virtual GSM::Time minLatency() = 0;
+
   /** Return internal status values */
   virtual double getTxFreq(size_t chan = 0) = 0;
   virtual double getRxFreq(size_t chan = 0) = 0;
@@ -144,6 +171,39 @@ class RadioDevice {
   virtual double numberRead()=0;
   virtual double numberWritten()=0;
 
+  protected:
+  size_t tx_sps, rx_sps;
+  InterfaceType iface;
+  size_t chans;
+  double lo_offset;
+  std::vector<std::string> tx_paths, rx_paths;
+  bool set_antennas() {
+	unsigned int i;
+
+	for (i = 0; i < tx_paths.size(); i++) {
+		if (tx_paths[i] == "")
+			continue;
+		LOG(DEBUG) << "Configuring channel " << i << " with antenna " << tx_paths[i];
+		if (!setTxAntenna(tx_paths[i], i)) {
+			LOG(ALERT) << "Failed configuring channel " << i << " with antenna " << tx_paths[i];
+			return false;
+		}
+	}
+
+	for (i = 0; i < rx_paths.size(); i++) {
+		if (rx_paths[i] == "")
+			continue;
+		LOG(DEBUG) << "Configuring channel " << i << " with antenna " << rx_paths[i];
+		if (!setRxAntenna(rx_paths[i], i)) {
+			LOG(ALERT) << "Failed configuring channel " << i << " with antenna " << rx_paths[i];
+			return false;
+		}
+	}
+	LOG(INFO) << "Antennas configured successfully";
+	return true;
+  }
+
+
 };
 
 #endif

Transceiver52M/device/uhd/Makefile.am

@@ -0,0 +1,8 @@
+include $(top_srcdir)/Makefile.common
+
+AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/..
+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(UHD_CFLAGS)
+
+noinst_LTLIBRARIES = libdevice.la
+
+libdevice_la_SOURCES = UHDDevice.cpp

Transceiver52M/device/uhd/UHDDevice.cpp

@@ -1,5 +1,5 @@
 /*
- * Device support for Ettus Research UHD driver 
+ * Device support for Ettus Research UHD driver
  *
  * Copyright 2010,2011 Free Software Foundation, Inc.
  * Copyright (C) 2015 Ettus Research LLC
@@ -130,7 +130,7 @@ static const std::map<dev_key, dev_desc> dev_param_map {
 	{ std::make_tuple(UMTRX, 1, 1), { 2, 0.0,  GSMRATE, 9.9692e-5,  "UmTRX 1 SPS"        } },
 	{ std::make_tuple(UMTRX, 4, 1), { 2, 0.0,  GSMRATE, 7.3846e-5,  "UmTRX 4/1 Tx/Rx SPS"} },
 	{ 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, 16.5/GSMRATE, "STREAM/LimeSDR (4 SPS TX/RX)" } },
+	{ 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" } },
 };
 
@@ -143,8 +143,8 @@ class smpl_buf {
 public:
 	/** Sample buffer constructor
 	    @param len number of 32-bit samples the buffer should hold
-	    @param rate sample clockrate 
-	    @param timestamp 
+	    @param rate sample clockrate
+	    @param timestamp
 	*/
 	smpl_buf(size_t len, double rate);
 	~smpl_buf();
@@ -172,7 +172,7 @@ public:
 	*/
 	std::string str_status(size_t ts) const;
 
-	/** Formatted error string 
+	/** Formatted error string
 	    @param code an error code
 	    @return a formatted error string
 	*/
@@ -208,11 +208,13 @@ private:
 class uhd_device : public RadioDevice {
 public:
 	uhd_device(size_t tx_sps, size_t rx_sps, InterfaceType type,
-		   size_t chans, double offset);
+		   size_t chans, double offset,
+		   const std::vector<std::string>& tx_paths,
+		   const std::vector<std::string>& rx_paths);
 	~uhd_device();
 
 	int open(const std::string &args, int ref, bool swap_channels);
-	bool start(bool tx_only);
+	bool start();
 	bool stop();
 	bool restart();
 	void setPriority(float prio);
@@ -224,7 +226,6 @@ public:
 	int writeSamples(std::vector<short *> &bufs, int len, bool *underrun,
 			 TIMESTAMP timestamp, bool isControl);
 
-	void triggerGPIO(TIMESTAMP ts);
 	bool updateAlignment(TIMESTAMP timestamp);
 
 	bool setTxFreq(double wFreq, size_t chan);
@@ -249,6 +250,15 @@ public:
 	double getRxFreq(size_t chan);
 	double getRxFreq();
 
+	bool setRxAntenna(const std::string &ant, size_t chan);
+	std::string getRxAntenna(size_t chan);
+	bool setTxAntenna(const std::string &ant, size_t chan);
+	std::string getTxAntenna(size_t chan);
+
+	bool requiresRadioAlign();
+
+	GSM::Time minLatency();
+
 	inline double getSampleRate() { return tx_rate; }
 	inline double numberRead() { return rx_pkt_cnt; }
 	inline double numberWritten() { return 0; }
@@ -272,12 +282,10 @@ private:
 	enum TxWindowType tx_window;
 	enum uhd_dev_type dev_type;
 
-	size_t tx_sps, rx_sps, chans;
 	double tx_rate, rx_rate;
 
 	double tx_gain_min, tx_gain_max;
 	double rx_gain_min, rx_gain_max;
-	double offset;
 
 	std::vector<double> tx_gains, rx_gains;
 	std::vector<double> tx_freqs, rx_freqs;
@@ -307,7 +315,6 @@ private:
 	bool set_freq(double freq, size_t chan, bool tx);
 
 	Thread *async_event_thrd;
-	InterfaceType iface;
 	Mutex tune_lock;
 };
 
@@ -354,18 +361,16 @@ static void thread_enable_cancel(bool cancel)
 }
 
 uhd_device::uhd_device(size_t tx_sps, size_t rx_sps,
-		       InterfaceType iface, size_t chans, double offset)
-	: tx_gain_min(0.0), tx_gain_max(0.0),
+		       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, 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),
 	  started(false), aligned(false), rx_pkt_cnt(0), drop_cnt(0),
-	  prev_ts(0,0), ts_initial(0), ts_offset(0)
+	  prev_ts(0,0), ts_initial(0), ts_offset(0), async_event_thrd(NULL)
 {
-	this->tx_sps = tx_sps;
-	this->rx_sps = rx_sps;
-	this->chans = chans;
-	this->offset = offset;
-	this->iface = iface;
 }
 
 uhd_device::~uhd_device()
@@ -438,7 +443,7 @@ void uhd_device::set_rates()
 	tx_rate = usrp_dev->get_tx_rate();
 	rx_rate = usrp_dev->get_rx_rate();
 
-	ts_offset = (TIMESTAMP) desc.offset * rx_rate;
+	ts_offset = static_cast<TIMESTAMP>(desc.offset * rx_rate);
 	LOG(INFO) << "Rates configured for " << desc.str;
 }
 
@@ -520,6 +525,7 @@ bool uhd_device::parse_dev_type()
 		{ "B100",     { B100,    TX_WINDOW_USRP1 } },
 		{ "B200",     { B200,    TX_WINDOW_USRP1 } },
 		{ "B200mini", { B200,    TX_WINDOW_USRP1 } },
+		{ "B205mini", { B200,    TX_WINDOW_USRP1 } },
 		{ "B210",     { B210,    TX_WINDOW_USRP1 } },
 		{ "E100",     { E1XX,    TX_WINDOW_FIXED } },
 		{ "E110",     { E1XX,    TX_WINDOW_FIXED } },
@@ -527,25 +533,25 @@ bool uhd_device::parse_dev_type()
 		{ "E3XX",     { E3XX,    TX_WINDOW_FIXED } },
 		{ "X300",     { X3XX,    TX_WINDOW_FIXED } },
 		{ "X310",     { X3XX,    TX_WINDOW_FIXED } },
+		{ "USRP2",    { USRP2,   TX_WINDOW_FIXED } },
 		{ "UmTRX",    { UMTRX,   TX_WINDOW_FIXED } },
-		{ "STREAM",   { LIMESDR, TX_WINDOW_USRP1 } },
+		{ "LimeSDR",  { LIMESDR, TX_WINDOW_FIXED } },
 	};
 
 	// Compare UHD motherboard and device strings */
-	std::string found;
-	if (devStringMap.find(devString) != devStringMap.end())
-		found = devString;
-	else if (devStringMap.find(mboardString) != devStringMap.end())
-		found = mboardString;
-
-	if (found.empty()) {
-		LOG(ALERT) << "Unsupported device " << devString;
-		return false;
+	auto mapIter = devStringMap.begin();
+	while (mapIter != devStringMap.end()) {
+		if (devString.find(mapIter->first) != std::string::npos ||
+		    mboardString.find(mapIter->first) != std::string::npos) {
+			dev_type = std::get<0>(mapIter->second);
+			tx_window = std::get<1>(mapIter->second);
+			return true;
+		}
+		mapIter++;
 	}
 
-	dev_type = devStringMap.at(found).first;
-	tx_window = devStringMap.at(found).second;
-	return true;
+	LOG(ALERT) << "Unsupported device " << devString;
+	return false;
 }
 
 /*
@@ -577,7 +583,7 @@ void uhd_device::set_channels(bool swap)
 		chans = 1;
 	}
 
-	if (chans > dev_param_map.at(dev_key(dev_type, 1, 1)).channels)
+	if (chans > dev_param_map.at(dev_key(dev_type, tx_sps, rx_sps)).channels)
 		throw std::invalid_argument("Device does not support number of requested channels");
 
 	std::string subdev_string;
@@ -644,6 +650,11 @@ int uhd_device::open(const std::string &args, int ref, bool swap_channels)
 		return -1;
 	}
 
+	if (!set_antennas()) {
+		LOG(ALERT) << "UHD antenna setting failed";
+		return -1;
+	}
+
 	tx_freqs.resize(chans);
 	rx_freqs.resize(chans);
 	tx_gains.resize(chans);
@@ -683,8 +694,8 @@ int uhd_device::open(const std::string &args, int ref, bool swap_channels)
 		}
 	} else if (dev_type == LIMESDR) {
 		for (size_t i = 0; i < chans; i++) {
-			usrp_dev->set_tx_bandwidth(5e6, i);
-			usrp_dev->set_rx_bandwidth(5e6, i);
+			usrp_dev->set_tx_bandwidth(5.2e6, i);
+			usrp_dev->set_rx_bandwidth(1.4001e6, i);
 		}
 	}
 
@@ -705,7 +716,7 @@ int uhd_device::open(const std::string &args, int ref, bool swap_channels)
 	for (size_t i = 0; i < rx_buffers.size(); i++)
 		rx_buffers[i] = new smpl_buf(buf_len, rx_rate);
 
-	// Initialize and shadow gain values 
+	// Initialize and shadow gain values
 	init_gains();
 
 	// Print configuration
@@ -785,7 +796,7 @@ bool uhd_device::restart()
 	return flush_recv(10);
 }
 
-bool uhd_device::start(bool tx_only)
+bool uhd_device::start()
 {
 	LOG(INFO) << "Starting USRP...";
 
@@ -803,21 +814,12 @@ bool uhd_device::start(bool tx_only)
 	async_event_thrd->start((void * (*)(void*))async_event_loop, (void*)this);
 
 	// Start streaming
-	if (!tx_only && !restart())
+	if (!restart())
 		return false;
 
-	// Setup GPIO
-        usrp_dev->set_gpio_attr("FP0", "CTRL", 0x00);
-        usrp_dev->set_gpio_attr("FP0", "DDR", 0x01);
-
 	// Display usrp time
-	auto now = usrp_dev->get_time_now();
-	LOG(INFO) << "The current time is " << now.get_real_secs() << " seconds";
-
-	if (tx_only) {
-		auto start = uhd::time_spec_t(now.get_real_secs() + 1.0);
-		ts_initial = start.to_ticks(tx_rate);
-	}
+	double time_now = usrp_dev->get_time_now().get_real_secs();
+	LOG(INFO) << "The current time is " << time_now << " seconds";
 
 	started = true;
 	return true;
@@ -935,7 +937,7 @@ int uhd_device::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
 
 		rx_pkt_cnt++;
 
-		// Check for errors 
+		// Check for errors
 		rc = check_rx_md_err(metadata, num_smpls);
 		switch (rc) {
 		case ERROR_UNRECOVERABLE:
@@ -982,27 +984,6 @@ int uhd_device::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
 	return len;
 }
 
-#define GSM_FRAME_PERIOD	(120e-3/26)
-#define GPIO_FRAME_ADVANCE	5
-#define GPIO_ON_PERIOD		(GSM_FRAME_PERIOD / 2)
-
-/*
- * Trigger GPIO a handful of frames ahead of the current sample timestamp.
- * This extends the number of GPIO triggers in the device side command
- * queue and prevents late packet and underrun errors on the RF sample path.
- */
-void uhd_device::triggerGPIO(TIMESTAMP ticks)
-{
-	auto ts = uhd::time_spec_t::from_ticks(ticks, tx_rate);
-	auto adv = uhd::time_spec_t(GPIO_FRAME_ADVANCE * GSM_FRAME_PERIOD);
-	auto per = uhd::time_spec_t(GPIO_ON_PERIOD);
-
-	usrp_dev->set_command_time(ts - adv);
-	usrp_dev->set_gpio_attr("FP0", "OUT", 0x01);
-	usrp_dev->set_command_time(ts - adv + per);
-	usrp_dev->set_gpio_attr("FP0", "OUT", 0x00);
-}
-
 int uhd_device::writeSamples(std::vector<short *> &bufs, int len, bool *underrun,
 			     unsigned long long timestamp,bool isControl)
 {
@@ -1012,7 +993,13 @@ int uhd_device::writeSamples(std::vector<short *> &bufs, int len, bool *underrun
 	metadata.end_of_burst = false;
 	metadata.time_spec = uhd::time_spec_t::from_ticks(timestamp, tx_rate);
 
-	if (underrun) *underrun = false;
+	*underrun = false;
+
+	// No control packets
+	if (isControl) {
+		LOG(ERR) << "Control packets not supported";
+		return 0;
+	}
 
 	if (bufs.size() != chans) {
 		LOG(ALERT) << "Invalid channel combination " << bufs.size();
@@ -1022,9 +1009,10 @@ int uhd_device::writeSamples(std::vector<short *> &bufs, int len, bool *underrun
 	// Drop a fixed number of packets (magic value)
 	if (!aligned) {
 		drop_cnt++;
+
 		if (drop_cnt == 1) {
 			LOG(DEBUG) << "Aligning transmitter: stop burst";
-			if (underrun) *underrun = true;
+			*underrun = true;
 			metadata.end_of_burst = true;
 		} else if (drop_cnt < 30) {
 			LOG(DEBUG) << "Aligning transmitter: packet advance";
@@ -1038,7 +1026,7 @@ int uhd_device::writeSamples(std::vector<short *> &bufs, int len, bool *underrun
 	}
 
 	thread_enable_cancel(false);
-	size_t num_smpls = tx_stream->send(bufs, len, metadata, 1.0);
+	size_t num_smpls = tx_stream->send(bufs, len, metadata);
 	thread_enable_cancel(true);
 
 	if (num_smpls != (unsigned) len) {
@@ -1060,8 +1048,8 @@ uhd::tune_request_t uhd_device::select_freq(double freq, size_t chan, bool tx)
 	uhd::tune_request_t treq(freq);
 
 	if (dev_type == UMTRX) {
-		if (offset != 0.0)
-			return uhd::tune_request_t(freq, offset);
+		if (lo_offset != 0.0)
+			return uhd::tune_request_t(freq, lo_offset);
 
 		// Don't use DSP tuning, because LMS6002D PLL steps are small enough.
 		// We end up with DSP tuning just for 2-3Hz, which is meaningless and
@@ -1073,10 +1061,10 @@ uhd::tune_request_t uhd_device::select_freq(double freq, size_t chan, bool tx)
 		treq.dsp_freq = 0.0;
 		return treq;
 	} else if (chans == 1) {
-		if (offset == 0.0)
+		if (lo_offset == 0.0)
 			return treq;
 
-		return uhd::tune_request_t(freq, offset);
+		return uhd::tune_request_t(freq, lo_offset);
 	} else if ((dev_type != B210) || (chans > 2) || (chan > 1)) {
 		LOG(ALERT) << chans << " channels unsupported";
 		return treq;
@@ -1093,7 +1081,7 @@ uhd::tune_request_t uhd_device::select_freq(double freq, size_t chan, bool tx)
 
 	/* Find center frequency between channels */
 	rf_spread = fabs(freqs[!chan] - freq);
-	if (rf_spread > dev_param_map.at(dev_key(B210, 1, 1)).mcr) {
+	if (rf_spread > dev_param_map.at(dev_key(B210, tx_sps, rx_sps)).mcr) {
 		LOG(ALERT) << rf_spread << "Hz tuning spread not supported\n";
 		return treq;
 	}
@@ -1188,6 +1176,91 @@ double uhd_device::getRxFreq(size_t chan)
 	return rx_freqs[chan];
 }
 
+bool uhd_device::setRxAntenna(const std::string &ant, size_t chan)
+{
+	std::vector<std::string> avail;
+	if (chan >= rx_paths.size()) {
+		LOG(ALERT) << "Requested non-existent channel " << chan;
+		return false;
+	}
+
+	avail = usrp_dev->get_rx_antennas(chan);
+	if (std::find(avail.begin(), avail.end(), ant) == avail.end()) {
+		LOG(ALERT) << "Requested non-existent Rx antenna " << ant << " on channel " << chan;
+		LOG(INFO) << "Available Rx antennas: ";
+		for (std::vector<std::string>::const_iterator i = avail.begin(); i != avail.end(); ++i)
+			LOG(INFO) << "- '" << *i << "'";
+		return false;
+	}
+	usrp_dev->set_rx_antenna(ant, chan);
+	rx_paths[chan] = usrp_dev->get_rx_antenna(chan);
+
+	if (ant != rx_paths[chan]) {
+		LOG(ALERT) << "Failed setting antenna " << ant << " on channel " << chan << ", got instead " << rx_paths[chan];
+		return false;
+	}
+
+	return true;
+}
+
+std::string uhd_device::getRxAntenna(size_t chan)
+{
+	if (chan >= rx_paths.size()) {
+		LOG(ALERT) << "Requested non-existent channel " << chan;
+		return "";
+	}
+	return usrp_dev->get_rx_antenna(chan);
+}
+
+bool uhd_device::setTxAntenna(const std::string &ant, size_t chan)
+{
+	std::vector<std::string> avail;
+	if (chan >= tx_paths.size()) {
+		LOG(ALERT) << "Requested non-existent channel " << chan;
+		return false;
+	}
+
+	avail = usrp_dev->get_tx_antennas(chan);
+	if (std::find(avail.begin(), avail.end(), ant) == avail.end()) {
+		LOG(ALERT) << "Requested non-existent Tx antenna " << ant << " on channel " << chan;
+		LOG(INFO) << "Available Tx antennas: ";
+		for (std::vector<std::string>::const_iterator i = avail.begin(); i != avail.end(); ++i)
+			LOG(INFO) << "- '" << *i << "'";
+		return false;
+	}
+	usrp_dev->set_tx_antenna(ant, chan);
+	tx_paths[chan] = usrp_dev->get_tx_antenna(chan);
+
+	if (ant != tx_paths[chan]) {
+		LOG(ALERT) << "Failed setting antenna " << ant << " on channel " << chan << ", got instead " << tx_paths[chan];
+		return false;
+	}
+
+	return true;
+}
+
+std::string uhd_device::getTxAntenna(size_t chan)
+{
+	if (chan >= tx_paths.size()) {
+		LOG(ALERT) << "Requested non-existent channel " << chan;
+		return "";
+	}
+	return usrp_dev->get_tx_antenna(chan);
+}
+
+bool uhd_device::requiresRadioAlign()
+{
+	return false;
+}
+
+GSM::Time uhd_device::minLatency() {
+	/* Empirical data from a handful of
+	relatively recent machines shows that the B100 will underrun when
+	the transmit threshold is reduced to a time of 6 and a half frames,
+	so we set a minimum 7 frame threshold. */
+	return GSM::Time(6,7);
+}
+
 /*
  * Only allow sampling the Rx path lower than Tx and not vice-versa.
  * Using Tx with 4 SPS and Rx at 1 SPS is the only allowed mixed
@@ -1209,7 +1282,7 @@ TIMESTAMP uhd_device::initialReadTimestamp()
 double uhd_device::fullScaleInputValue()
 {
 	if (dev_type == LIMESDR)
-		return (double) 2047 * LIMESDR_TX_AMPL;
+		return (double) SHRT_MAX * LIMESDR_TX_AMPL;
 	if (dev_type == UMTRX)
 		return (double) SHRT_MAX * UMTRX_TX_AMPL;
 	else
@@ -1218,7 +1291,6 @@ double uhd_device::fullScaleInputValue()
 
 double uhd_device::fullScaleOutputValue()
 {
-	if (dev_type == LIMESDR) return (double) 2047;
 	return (double) SHRT_MAX;
 }
 
@@ -1475,7 +1547,9 @@ std::string smpl_buf::str_code(ssize_t code)
 }
 
 RadioDevice *RadioDevice::make(size_t tx_sps, size_t rx_sps,
-			       InterfaceType iface, size_t chans, double offset)
+			       InterfaceType iface, size_t chans, double lo_offset,
+			       const std::vector<std::string>& tx_paths,
+			       const std::vector<std::string>& rx_paths)
 {
-	return new uhd_device(tx_sps, rx_sps, iface, chans, offset);
+	return new uhd_device(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths);
 }

Transceiver52M/device/usrp1/Makefile.am

@@ -0,0 +1,10 @@
+include $(top_srcdir)/Makefile.common
+
+AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/..
+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(USRP_CFLAGS)
+
+noinst_HEADERS = USRPDevice.h
+
+noinst_LTLIBRARIES = libdevice.la
+
+libdevice_la_SOURCES = USRPDevice.cpp

Transceiver52M/device/usrp1/USRPDevice.cpp

@@ -27,17 +27,16 @@
 	Compilation Flags
 
 	SWLOOPBACK	compile for software loopback testing
-*/ 
+*/
 
 
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
+#include "Logger.h"
 #include "Threads.h"
 #include "USRPDevice.h"
 
-#include <Logger.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -59,12 +58,15 @@ const dboardConfigType dboardConfig = TXA_RXB;
 
 const double USRPDevice::masterClockRate = 52.0e6;
 
-USRPDevice::USRPDevice(size_t sps)
+USRPDevice::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):
+		RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths)
 {
   LOG(INFO) << "creating USRP device...";
 
-  this->sps = sps;
-  decimRate = (unsigned int) round(masterClockRate/((GSMRATE) * (double) sps));
+  decimRate = (unsigned int) round(masterClockRate/((GSMRATE) * (double) tx_sps));
   actualSampleRate = masterClockRate/decimRate;
   rxGain = 0;
 
@@ -74,14 +76,14 @@ USRPDevice::USRPDevice(size_t sps)
    * split sample rate Tx/Rx - 4/1 sps we need to need to
    * compensate for advance rather than delay.
    */
-  if (sps == 1)
+  if (tx_sps == 1)
     pingOffset = 272;
-  else if (sps == 4)
+  else if (tx_sps == 4)
     pingOffset = 269 - 7500;
   else
     pingOffset = 0;
 
-#ifdef SWLOOPBACK 
+#ifdef SWLOOPBACK
   samplePeriod = 1.0e6/actualSampleRate;
   loopbackBufferSize = 0;
   gettimeofday(&lastReadTime,NULL);
@@ -94,14 +96,14 @@ int USRPDevice::open(const std::string &, int, bool)
   writeLock.unlock();
 
   LOG(INFO) << "opening USRP device..";
-#ifndef SWLOOPBACK 
+#ifndef SWLOOPBACK
   string rbf = "std_inband.rbf";
-  //string rbf = "inband_1rxhb_1tx.rbf"; 
+  //string rbf = "inband_1rxhb_1tx.rbf";
   m_uRx.reset();
   if (!skipRx) {
   try {
     m_uRx = usrp_standard_rx_sptr(usrp_standard_rx::make(
-                                        0, decimRate * sps, 1, -1,
+                                        0, decimRate * tx_sps, 1, -1,
                                         usrp_standard_rx::FPGA_MODE_NORMAL,
                                         1024, 16 * 8, rbf));
     m_uRx->set_fpga_master_clock_freq(masterClockRate);
@@ -145,7 +147,7 @@ int USRPDevice::open(const std::string &, int, bool)
 
   if (!skipRx) m_uRx->stop();
   m_uTx->stop();
-  
+
 #endif
 
   switch (dboardConfig) {
@@ -176,19 +178,19 @@ int USRPDevice::open(const std::string &, int, bool)
   samplesRead = 0;
   samplesWritten = 0;
   started = false;
-  
+
   return NORMAL;
 }
 
 
 
-bool USRPDevice::start() 
+bool USRPDevice::start()
 {
   LOG(INFO) << "starting USRP...";
-#ifndef SWLOOPBACK 
+#ifndef SWLOOPBACK
   if (!m_uRx && !skipRx) return false;
   if (!m_uTx) return false;
-  
+
   if (!skipRx) m_uRx->stop();
   m_uTx->stop();
 
@@ -218,8 +220,8 @@ bool USRPDevice::start()
   hi32Timestamp = 0;
   isAligned = false;
 
- 
-  if (!skipRx) 
+
+  if (!skipRx)
   started = (m_uRx->start() && m_uTx->start());
   else
   started = m_uTx->start();
@@ -230,14 +232,14 @@ bool USRPDevice::start()
 #endif
 }
 
-bool USRPDevice::stop() 
+bool USRPDevice::stop()
 {
-#ifndef SWLOOPBACK 
+#ifndef SWLOOPBACK
   if (!m_uRx) return false;
   if (!m_uTx) return false;
-  
+
   delete[] currData;
-  
+
   started = !(m_uRx->stop() && m_uTx->stop());
   return !started;
 #else
@@ -258,7 +260,7 @@ double USRPDevice::minTxGain()
 double USRPDevice::maxRxGain()
 {
   return m_dbRx->gain_max();
-} 
+}
 
 double USRPDevice::minRxGain()
 {
@@ -314,28 +316,76 @@ double USRPDevice::setRxGain(double dB, size_t chan)
   return dB;
 }
 
+bool USRPDevice::setRxAntenna(const std::string &ant, size_t chan)
+{
+	if (chan >= rx_paths.size()) {
+		LOG(ALERT) << "Requested non-existent channel " << chan;
+		return false;
+	}
+	LOG(ALERT) << "Not implemented";
+	return true;
+}
+
+std::string USRPDevice::getRxAntenna(size_t chan)
+{
+	if (chan >= rx_paths.size()) {
+		LOG(ALERT) << "Requested non-existent channel " << chan;
+		return "";
+	}
+	LOG(ALERT) << "Not implemented";
+	return "";
+}
+
+bool USRPDevice::setTxAntenna(const std::string &ant, size_t chan)
+{
+	if (chan >= tx_paths.size()) {
+		LOG(ALERT) << "Requested non-existent channel " << chan;
+		return false;
+	}
+	LOG(ALERT) << "Not implemented";
+	return true;
+}
+
+std::string USRPDevice::getTxAntenna(size_t chan)
+{
+	if (chan >= tx_paths.size()) {
+		LOG(ALERT) << "Requested non-existent channel " << chan;
+		return "";
+	}
+	LOG(ALERT) << "Not implemented";
+	return "";
+}
+
+bool USRPDevice::requiresRadioAlign()
+{
+	return true;
+}
+
+GSM::Time USRPDevice::minLatency() {
+	return GSM::Time(1,1);
+}
 
 // NOTE: Assumes sequential reads
 int USRPDevice::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
                             TIMESTAMP timestamp, bool *underrun, unsigned *RSSI)
 {
-#ifndef SWLOOPBACK 
+#ifndef SWLOOPBACK
   if (!m_uRx)
     return 0;
 
   short *buf = bufs[0];
 
   timestamp += timestampOffset;
-  
+
   if (timestamp + len < timeStart) {
     memset(buf,0,len*2*sizeof(short));
     return len;
   }
 
   if (underrun) *underrun = false;
- 
+
   uint32_t readBuf[2000];
- 
+
   while (1) {
     //guestimate USB read size
     int readLen=0;
@@ -345,7 +395,7 @@ int USRPDevice::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
       readLen = 512 * ((int) ceil((float) numSamplesNeeded/126.0));
       if (readLen > 8000) readLen= (8000/512)*512;
     }
-    
+
     // read USRP packets, parse and save A/D data as needed
     readLen = m_uRx->read((void *)readBuf,readLen,overrun);
     for(int pktNum = 0; pktNum < (readLen/512); pktNum++) {
@@ -382,13 +432,13 @@ int USRPDevice::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
 	continue;
       }
       if ((word0 >> 28) & 0x04) {
-	if (underrun) *underrun = true; 
+	if (underrun) *underrun = true;
 	LOG(DEBUG) << "UNDERRUN in TRX->USRP interface";
       }
       if (RSSI) *RSSI = (word0 >> 21) & 0x3f;
-      
+
       if (!isAligned) continue;
-      
+
       unsigned cursorStart = pktTimestamp - timeStart + dataStart;
       while (cursorStart*2 > currDataSize) {
 	cursorStart -= currDataSize/2;
@@ -401,17 +451,17 @@ int USRPDevice::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
       else {
 	memcpy(data+cursorStart*2,tmpBuf+2,payloadSz);
       }
-      if (pktTimestamp + payloadSz/2/sizeof(short) > timeEnd) 
+      if (pktTimestamp + payloadSz/2/sizeof(short) > timeEnd)
 	timeEnd = pktTimestamp+payloadSz/2/sizeof(short);
 
       LOG(DEBUG) << "timeStart: " << timeStart << ", timeEnd: " << timeEnd << ", pktTimestamp: " << pktTimestamp;
 
-    }	
-  }     
- 
+    }
+  }
+
   // copy desired data to buf
   unsigned bufStart = dataStart+(timestamp-timeStart);
-  if (bufStart + len < currDataSize/2) { 
+  if (bufStart + len < currDataSize/2) {
     LOG(DEBUG) << "bufStart: " << bufStart;
     memcpy(buf,data+bufStart*2,len*2*sizeof(short));
     memset(data+bufStart*2,0,len*2*sizeof(short));
@@ -429,21 +479,21 @@ int USRPDevice::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
   timeStart = timestamp + len;
 
   return len;
-  
+
 #else
   if (loopbackBufferSize < 2) return 0;
   int numSamples = 0;
   struct timeval currTime;
   gettimeofday(&currTime,NULL);
-  double timeElapsed = (currTime.tv_sec - lastReadTime.tv_sec)*1.0e6 + 
+  double timeElapsed = (currTime.tv_sec - lastReadTime.tv_sec)*1.0e6 +
     (currTime.tv_usec - lastReadTime.tv_usec);
   if (timeElapsed < samplePeriod) {return 0;}
   int numSamplesToRead = (int) floor(timeElapsed/samplePeriod);
   if (numSamplesToRead < len) return 0;
-  
+
   if (numSamplesToRead > len) numSamplesToRead = len;
   if (numSamplesToRead > loopbackBufferSize/2) {
-    firstRead =false; 
+    firstRead =false;
     numSamplesToRead = loopbackBufferSize/2;
   }
   memcpy(buf,loopbackBuffer,sizeof(short)*2*numSamplesToRead);
@@ -461,7 +511,7 @@ int USRPDevice::readSamples(std::vector<short *> &bufs, int len, bool *overrun,
     firstRead = true;
   }
   samplesRead += numSamples;
-  
+
   return numSamples;
 #endif
 }
@@ -472,7 +522,7 @@ int USRPDevice::writeSamples(std::vector<short *> &bufs, int len,
 {
   writeLock.lock();
 
-#ifndef SWLOOPBACK 
+#ifndef SWLOOPBACK
   if (!m_uTx)
     return 0;
 
@@ -519,14 +569,14 @@ int USRPDevice::writeSamples(std::vector<short *> &bufs, int len,
   memcpy(loopbackBuffer+loopbackBufferSize,buf,sizeof(short)*2*len);
   samplesWritten += retVal;
   loopbackBufferSize += retVal*2;
-   
+
   return retVal;
 #endif
 }
 
-bool USRPDevice::updateAlignment(TIMESTAMP timestamp) 
+bool USRPDevice::updateAlignment(TIMESTAMP timestamp)
 {
-#ifndef SWLOOPBACK 
+#ifndef SWLOOPBACK
   short data[] = {0x00,0x02,0x00,0x00};
   uint32_t *wordPtr = (uint32_t *) data;
   *wordPtr = host_to_usrp_u32(*wordPtr);
@@ -543,7 +593,7 @@ bool USRPDevice::updateAlignment(TIMESTAMP timestamp)
 #endif
 }
 
-#ifndef SWLOOPBACK 
+#ifndef SWLOOPBACK
 bool USRPDevice::setTxFreq(double wFreq, size_t chan)
 {
   usrp_tune_result result;
@@ -601,7 +651,9 @@ bool USRPDevice::setRxFreq(double wFreq) { return true;};
 #endif
 
 RadioDevice *RadioDevice::make(size_t tx_sps, size_t rx_sps,
-			       size_t chans, double)
+			       InterfaceType iface, size_t chans, double lo_offset,
+			       const std::vector<std::string>& tx_paths,
+			       const std::vector<std::string>& rx_paths)
 {
-	return new USRPDevice(tx_sps);
+	return new USRPDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths);
 }

Transceiver52M/device/usrp1/USRPDevice.h

@@ -48,7 +48,6 @@ private:
   usrp_subdev_spec rxSubdevSpec;
   usrp_subdev_spec txSubdevSpec;
 
-  int sps;
   double actualSampleRate;	///< the actual USRP sampling rate
   unsigned int decimRate;	///< the USRP decimation rate
 
@@ -83,10 +82,10 @@ private:
 
   double rxGain;
 
-#ifdef SWLOOPBACK 
+#ifdef SWLOOPBACK
   short loopbackBuffer[1000000];
   int loopbackBufferSize;
-  double samplePeriod; 
+  double samplePeriod;
 
   struct timeval startTime;
   struct timeval lastReadTime;
@@ -96,7 +95,9 @@ private:
  public:
 
   /** Object constructor */
-  USRPDevice(size_t sps);
+  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);
 
   /** Instantiate the USRP */
   int open(const std::string &, int, bool);
@@ -179,14 +180,30 @@ private:
   /** return minimum Rx Gain **/
   double minTxGain(void);
 
+  /** sets the RX path to use, returns true if successful and false otherwise */
+  bool setRxAntenna(const std::string &ant, size_t chan = 0);
+
+  /* return the used RX path */
+  std::string getRxAntenna(size_t chan = 0);
+
+  /** sets the RX path to use, returns true if successful and false otherwise */
+  bool setTxAntenna(const std::string &ant, size_t chan = 0);
+
+  /* return the used RX path */
+  std::string getTxAntenna(size_t chan = 0);
+
+  /** return whether user drives synchronization of Tx/Rx of USRP */
+  bool requiresRadioAlign();
+
+  /** return whether user drives synchronization of Tx/Rx of USRP */
+  virtual GSM::Time minLatency();
+
   /** Return internal status values */
   inline double getTxFreq(size_t chan = 0) { return 0; }
   inline double getRxFreq(size_t chan = 0) { return 0; }
   inline double getSampleRate() { return actualSampleRate; }
   inline double numberRead() { return samplesRead; }
   inline double numberWritten() { return samplesWritten; }
-
 };
 
 #endif // _USRP_DEVICE_H_
-

Transceiver52M/osmo-siggen.cpp

@@ -1,490 +0,0 @@
-/*
- * GSM Signal Generator 
- *
- * Copyright (C) 2017 Ettus Research LLC
- *
- * 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.
- *
- * Author: Tom Tsou <tom.tsou@ettus.com>
- */
-
-#include <limits.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <algorithm>
-#include <functional>
-#include <memory>
-#include <map>
-#include <GSMCommon.h>
-#include <Logger.h>
-#include <Configuration.h>
-#include <GSMCommon.h>
-#include "sigProcLib.h"
-#include "radioDevice.h"
-
-extern "C" {
-#include "convolve.h"
-#include "convert.h"
-}
-
-ConfigurationTable gConfig;
-
-#define DEFAULT_TX_SPS   4
-#define DEFAULT_TX_AMPL  0.5
-#define DEFAULT_TX_GAIN  50
-#define DEFAULT_TX_FREQ  1e9
-#define DEFAULT_OFFSET   0.0
-
-using namespace std;
-
-enum GsmModType {
-  MOD_LAURENT4,
-  MOD_LAURENT2,
-  MOD_LAURENT1,
-  MOD_NCO,
-  NUM_MODS,
-};
-
-enum BurstType {
-  BURST_NORMAL,
-  BURST_ACCESS,
-  BURST_FREQ,
-  BURST_SYNC,
-  BURST_EDGE,
-  NUM_BURSTS,
-};
-
-enum BurstTSC {
-  TSC0, TSC1, TSC2, TSC3, TSC4, TSC5, TSC6, TSC7,
-};
-
-struct Config {
-  string args     = "";
-  string logl     = "NOTICE";
-  unsigned sps    = DEFAULT_TX_SPS;
-  double offset   = DEFAULT_OFFSET;
-  bool swap       = false;
-  float ampl      = DEFAULT_TX_AMPL;
-  double freq     = DEFAULT_TX_FREQ;
-  double gain     = DEFAULT_TX_GAIN;
-  BurstTSC tsc    = TSC0;
-  GsmModType mod  = MOD_LAURENT2;
-  BurstType burst = BURST_NORMAL;
-  RadioDevice::ReferenceType ref = RadioDevice::REF_INTERNAL;
-};
-
-static shared_ptr<signalVector> modulateGMSK(BitVector &bits, GsmModType modType)
-{
-  switch (modType) {
-  case MOD_LAURENT4: return shared_ptr<signalVector>(modulateBurstLaurent4(bits));
-  case MOD_LAURENT2: return shared_ptr<signalVector>(modulateBurstLaurent2(bits));
-  case MOD_LAURENT1: return shared_ptr<signalVector>(modulateBurstLaurent1(bits));
-  case MOD_NCO:      return shared_ptr<signalVector>(modulateBurstNCO(bits));
-  default:           return shared_ptr<signalVector>(modulateBurstLaurent2(bits));
-  };
-}
-
-static shared_ptr<signalVector> generateNormalBurst(BurstTSC tsc, GsmModType modType)
-{
-  auto tail  = vector<char>(3, 0);
-  auto data0 = vector<char>(57);
-  auto data1 = vector<char>(57);
-  auto steal = vector<char>(1, 0);
-  auto train = vector<char>(26);
-
-  auto ti = begin(GSM::gTrainingSequence[tsc]);
-  for (auto &t : train) t = *ti++;
-  for (auto &d : data0) d = rand() % 2;
-  for (auto &d : data1) d = rand() % 2;
-
-  auto bits = BitVector(NORMAL_BURST_NBITS);
-  auto bi = bits.begin();
-
-  for (auto t : tail)  *bi++ = t;
-  for (auto d : data0) *bi++ = d;
-  for (auto s : steal) *bi++ = s;
-  for (auto t : train) *bi++ = t;
-  for (auto s : steal) *bi++ = s;
-  for (auto d : data1) *bi++ = d;
-  for (auto t : tail)  *bi++ = t;
-
-  return modulateGMSK(bits, modType);
-}
-
-static shared_ptr<signalVector> generateRABurst(GsmModType modType)
-{
-  auto tail0  = vector<char>(8, 0);
-  auto train  = vector<char>(41);
-  auto data   = vector<char>(36);
-  auto tail1  = vector<char>(3, 0);
-
-  auto ti = begin(GSM::gRACHBurst);
-  for (auto &t : train) t = *ti++;
-  for (auto &d : data)  d = rand() % 2;
-
-  auto bits = BitVector(88);
-  auto bi = bits.begin();
-
-  for (auto t : tail0) *bi++ = t;
-  for (auto t : train) *bi++ = t;
-  for (auto d : data)  *bi++ = d;
-  for (auto t : tail1) *bi++ = t;
-
-  return modulateGMSK(bits, modType);
-}
-
-static shared_ptr<signalVector> generateFreqBurst(GsmModType modType)
-{
-  auto tail  = vector<char>(3, 0);
-  auto fixed = vector<char>(142);
-
-  auto bits = BitVector(148);
-  auto bi = bits.begin();
-
-  for (auto t : tail)  *bi++ = t;
-  for (auto f : fixed) *bi++ = f;
-  for (auto t : tail)  *bi++ = t;
-
-  return modulateGMSK(bits, modType);
-}
-
-static shared_ptr<signalVector> generateSyncBurst(GsmModType modType)
-{
-  auto tail  = vector<char>(3, 0);
-  auto data0 = vector<char>(39);
-  auto data1 = vector<char>(39);
-
-  /* 64 length synchronization sequence */
-  vector<char> train {
-    1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 0,
-    0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
-    0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1,
-    0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1,
-  };
-  for (auto &d : data0) d = rand() % 2;
-  for (auto &d : data1) d = rand() % 2;
-
-  auto bits = BitVector(148);
-  auto bi = bits.begin();
-
-  for (auto t : tail)  *bi++ = t;
-  for (auto d : data0) *bi++ = d;
-  for (auto t : train) *bi++ = t;
-  for (auto d : data1) *bi++ = d;
-  for (auto t : tail)  *bi++ = t;
-
-  return modulateGMSK(bits, modType);
-}
-
-static shared_ptr<signalVector> generateEDGEBurst(BurstTSC tsc)
-{
-  auto tail =  vector<Complex<float>>(3);
-  auto data0 = vector<Complex<float>>(58);
-  auto train = vector<Complex<float>>(26);
-  auto data1 = vector<Complex<float>>(58);
-
-  extern const Complex<float> psk8_table[8];
-  for (auto &t : tail)  t = psk8_table[0b111];
-  for (auto &d : data0) d = psk8_table[rand() % 8];
-  for (auto &d : data1) d = psk8_table[rand() % 8];
-
-  auto ti = begin(GSM::gEdgeTrainingSequence[tsc]);
-  for (auto &t : train) {
-    unsigned i = (*(ti + 0) & 0b001) << 0 |
-                 (*(ti + 1) & 0b001) << 1 |
-                 (*(ti + 2) & 0b001) << 2;
-    t = psk8_table[i];
-    ti += 3;
-  }
-
-  /* NBITS refers to 148 symbols in this case */
-  auto burst = signalVector(NORMAL_BURST_NBITS);
-  auto bi = burst.begin();
-
-  for (auto t : tail)  *bi++ = t;
-  for (auto d : data0) *bi++ = d;
-  for (auto t : train) *bi++ = t;
-  for (auto d : data1) *bi++ = d;
-  for (auto t : tail)  *bi++ = t;
-
-  return shared_ptr<signalVector>(shapeEdgeBurst(burst));
-}
-
-/* Perform float-integer conversion and write to the device */
-static void sendBurst(shared_ptr<RadioDevice> usrp, TIMESTAMP &ts,
-                      shared_ptr<signalVector> sv, float ampl)
-{
-  auto buffer = vector<Complex<short>>(sv->size());
-
-  transform(sv->begin(), sv->end(), buffer.begin(), [ampl](Complex<float> x) {
-    const float scale = SHRT_MAX * ampl;
-    return Complex<short>(x.real()*scale, x.imag()*scale);
-  });
-
-  auto buffers = vector<short *>(1, reinterpret_cast<short *>(&buffer.front()));
-  ts += usrp->writeSamples(buffers, buffer.size(), nullptr, ts, true);
-}
-
-static void print_help()
-{
-  fprintf(stdout, "Options:\n"
-    "  -h, --help     This text\n"
-    "  -a, --args     UHD device args\n"
-    "  -l  --log      Logging level (%s)\n"
-    "  -b, --burst    Burst type (%s)\n"
-    "  -r, --ref      Frequency reference (%s)\n"
-    "  -f, --freq     Tx RF frequency\n"
-    "  -g, --gain     Tx RF gain\n"
-    "  -s, --sps      Tx samples-per-symbol (only 4 supported)\n"
-    "  -m, --mod      GSMK modulator type (%s)\n"
-    "  -p, --ampl     Tx amplitude (0.0 - 1.0)\n"
-    "  -o, --offset   Baseband frequency offset\n"
-    "  -t, --tsc      Normal and EDGE burst training sequence (0-7)\n"
-    "  -S, --swap     Swap channels\n\n",
-    "'err', 'warn', 'notice', 'info', 'debug'",
-    "'normal', 'access', 'freq', 'sync', 'edge'",
-    "'internal', 'external', 'gps'",
-    "'laurent4', 'laurent2', 'laurent1', 'nco'"
-  );
-}
-
-static void print_config(Config &config)
-{
-  const map<GsmModType, string> modMap = {
-    { MOD_LAURENT4, "Laurent-4" },
-    { MOD_LAURENT2, "Laurent-2" },
-    { MOD_LAURENT1, "Laurent-1" },
-    { MOD_NCO,      "NCO"       },
-  };
-
-  const map<BurstType, string> burstMap = {
-    { BURST_NORMAL, "Normal"          },
-    { BURST_ACCESS, "Access"          },
-    { BURST_FREQ,   "Frequency"       },
-    { BURST_SYNC,   "Synchronization" },
-    { BURST_EDGE,   "EDGE"            },
-  };
-
-  const map<RadioDevice::ReferenceType, string> refMap = {
-    { RadioDevice::REF_INTERNAL, "Internal" },
-    { RadioDevice::REF_EXTERNAL, "External" },
-    { RadioDevice::REF_GPS,      "GPS"      },
-  };
-
-  auto yesno = [](bool x) { return x ? "yes" : "no"; };
-
-  ostringstream ost("");
-  ost << "Config Settings" << endl;
-  ost << "   Log level............... " << config.logl << std::endl;
-  ost << "   Device args............. " << "\"" << config.args << "\"" << endl;
-  ost << "   Samples-per-Symbol...... " << config.sps << endl;
-  ost << "   RF frequency............ " << config.freq/1e9 << " GHz" << endl;
-  ost << "   RF gain................. " << config.gain << " dB" << endl;
-  ost << "   Reference............... " << refMap.at(config.ref) << endl;
-  ost << "   Burst type.............. " << burstMap.at(config.burst) << endl;
-  ost << "   Modulator type.......... " << modMap.at(config.mod) << endl;
-  ost << "   Baseband offset......... " << config.offset/1e6 << " MHz" << endl;
-  ost << "   Swap channels........... " << yesno(config.swap) << endl;
-  cout << ost << endl;
-}
-
-static bool handle_options(int argc, char **argv, Config &config)
-{
-  int option;
-
-  const struct option longopts[] = {
-    { "help",     0, nullptr, 'h' },
-    { "log",      1, nullptr, 'l' },
-    { "args",     1, nullptr, 'a' },
-    { "ref" ,     1, nullptr, 'r' },
-    { "freq",     1, nullptr, 'f' },
-    { "gain",     1, nullptr, 'g' },
-    { "mod",      1, nullptr, 'm' },
-    { "offset",   1, nullptr, 'o' },
-    { "sps",      1, nullptr, 's' },
-    { "ampl",     1, nullptr, 'p' },
-    { "tsc",      1, nullptr, 'r' },
-    { "burst",    1, nullptr, 'b' },
-    { "swap",     1, nullptr, 'w' },
-  };
-
-  const map<string, string> logMap = {
-    { "emerg",  "EMERG"   },
-    { "EMERG",  "EMERG"   },
-    { "alert",  "ALERT"   },
-    { "ALERT",  "ALERT"   },
-    { "err",    "ERR"     },
-    { "ERR",    "ERR"     },
-    { "warn",   "WARNING" },
-    { "WARN",   "WARNING" },
-    { "notice", "NOTICE"  },
-    { "NOTICE", "NOTICE"  },
-    { "info",   "INFO"    },
-    { "INFO",   "INFO"    },
-    { "debug",  "DEBUG"   },
-    { "DEBUG",  "DEBUG"   },
-  };
-
-  const map<string, GsmModType> modMap = {
-    { "laurent4", MOD_LAURENT4 },
-    { "laurent2", MOD_LAURENT2 },
-    { "laurent1", MOD_LAURENT1 },
-    { "nco",      MOD_NCO      },
-  };
-
-  const map<string, BurstType> burstMap = {
-    { "normal",   BURST_NORMAL },
-    { "access",   BURST_ACCESS },
-    { "freq",     BURST_FREQ   },
-    { "sync",     BURST_SYNC   },
-    { "edge",     BURST_EDGE   },
-  };
-
-  const map<string, RadioDevice::ReferenceType> refMap = {
-    { "internal", RadioDevice::REF_INTERNAL },
-    { "external", RadioDevice::REF_EXTERNAL },
-    { "gpsdo",    RadioDevice::REF_GPS      },
-    { "gps",      RadioDevice::REF_GPS      },
-  };
-
-  while ((option = getopt_long(argc, argv, "ha:l:r:f:g:m:o:s:p:t:b:w", longopts, nullptr)) != -1) {
-    switch (option) {
-    case 'a':
-      config.args = optarg;
-      break;
-    case 'f':
-      config.freq = atof(optarg);
-      break;
-    case 'g':
-      config.gain = atof(optarg);
-      break;
-    case 'o':
-      config.offset = atof(optarg);
-      break;
-    case 's':
-      if (atoi(optarg) != 4) {
-        printf("Unsupported SPS = %i\n", atoi(optarg));
-        return false;
-      }
-      break;
-    case 'p':
-      config.ampl = atof(optarg);
-      break;
-    case 't':
-      if (atoi(optarg) < TSC0 || atoi(optarg) > TSC7) {
-        printf("Invalid training sequence %i", atoi(optarg));
-        return false;
-      }
-      config.tsc = static_cast<BurstTSC>(atoi(optarg));
-      break;
-    case 'w':
-      config.swap = true;
-      break;
-    case 'l':
-      if (logMap.count(optarg) > 0) {
-        config.logl = logMap.at(optarg);
-      } else {
-        printf("Invalid log parameter '%s'\n\n", optarg);
-        return false;
-      }
-      break;
-    case 'r':
-      if (refMap.count(optarg) > 0) {
-        config.ref = refMap.at(optarg);
-      } else {
-        printf("Invalid reference parameter '%s'\n\n", optarg);
-        return false;
-      }
-      break;
-    case 'm':
-      if (modMap.count(optarg) > 0) {
-        config.mod = modMap.at(optarg);
-      } else {
-        printf("Invalid modulation parameter '%s'\n\n", optarg);
-        return false;
-      }
-      break;
-    case 'b':
-      if (burstMap.count(optarg) > 0) {
-        config.burst = burstMap.at(optarg);
-      } else {
-        printf("Invalid burst type parameter '%s'\n\n", optarg);
-        return false;
-      }
-      break;
-    case 'h':
-    default:
-      return false;
-    }
-  }
-
-  return true;
-}
-
-int main(int argc, char **argv)
-{
-  Config config;
-  if (!handle_options(argc, argv, config)) {
-    print_help();
-    return -EINVAL;
-  }
-
-  print_config(config);
-
-  gLogInit("osmo-siggen", config.logl.c_str(), LOG_LOCAL7);
-
-  convolve_init();
-  convert_init();
-  sigProcLibSetup();
-
-  /* Device setup */
-  shared_ptr<RadioDevice> usrp(RadioDevice::make(config.sps, config.sps, RadioDevice::NORMAL, 1, config.offset));
-  usrp->open(config.args, config.ref, config.swap);
-  usrp->setTxFreq(config.freq);
-  usrp->setTxGain(config.gain);
-  usrp->start(true);
-  usrp->setPriority(0.5);
-
-  /* Bind all burst-modulator configurations */
-  auto makeBurstGenerator = [&config]()->function<shared_ptr<signalVector>()> {
-    switch (config.burst) {
-    case BURST_EDGE:   return bind(generateEDGEBurst, config.tsc);
-    case BURST_ACCESS: return bind(generateRABurst, config.mod);
-    case BURST_FREQ:   return bind(generateFreqBurst, config.mod);
-    case BURST_SYNC:   return bind(generateSyncBurst, config.mod);
-    case BURST_NORMAL:
-    default:           return bind(generateNormalBurst, config.tsc, config.mod);
-    }
-  };
-
-  auto burstGenerator = makeBurstGenerator();
-  auto ts = usrp->initialWriteTimestamp();
-  auto frameTrigger = []() {
-    static int tn = 0;
-    return ++tn % 8 == 0;
-  };
-
-  while (1) {
-    try {
-      if (frameTrigger()) usrp->triggerGPIO(ts);
-      sendBurst(usrp, ts, burstGenerator(), config.ampl);
-    } catch (const exception &e) {
-      cout << e.what() << endl;
-      break;
-    }
-  }
-
-  sigProcLibDestroy();
-}

Transceiver52M/osmo-trx.cpp

@@ -27,126 +27,49 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <sched.h>
+#include <vector>
+#include <string>
+#include <sstream>
+#include <iostream>
 
 #include <GSMCommon.h>
 #include <Logger.h>
-#include <Configuration.h>
 
 extern "C" {
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/application.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/stats.h>
+#include <osmocom/vty/logging.h>
+#include <osmocom/vty/ports.h>
+#include <osmocom/vty/misc.h>
+#include <osmocom/vty/telnet_interface.h>
+#include <osmocom/ctrl/control_vty.h>
+#include <osmocom/ctrl/ports.h>
+#include <osmocom/ctrl/control_if.h>
+#include <osmocom/vty/stats.h>
 #include "convolve.h"
 #include "convert.h"
+#include "trx_vty.h"
+#include "debug.h"
 }
 
-/* Samples-per-symbol for downlink path
- *     4 - Uses precision modulator (more computation, less distortion)
- *     1 - Uses minimized modulator (less computation, more distortion)
- *
- *     Other values are invalid. Receive path (uplink) is always
- *     downsampled to 1 sps. Default to 4 sps for all cases.
- */
-#define DEFAULT_TX_SPS		4
+#define DEFAULT_CONFIG_FILE	"osmo-trx.cfg"
 
-/*
- * Samples-per-symbol for uplink (receiver) path
- *     Do not modify this value. EDGE configures 4 sps automatically on
- *     B200/B210 devices only. Use of 4 sps on the receive path for other
- *     configurations is not supported.
- */
-#define DEFAULT_RX_SPS		1
+#define charp2str(a) ((a) ? std::string(a) : std::string(""))
 
-/* Default configuration parameters */
-#define DEFAULT_TRX_PORT	5700
-#define DEFAULT_TRX_IP		"127.0.0.1"
-#define DEFAULT_CHANS		1
-
-struct trx_config {
-	std::string log_level;
-	std::string addr;
-	std::string dev_args;
-	unsigned port;
-	unsigned tx_sps;
-	unsigned rx_sps;
-	unsigned chans;
-	unsigned rtsc;
-	unsigned rach_delay;
-	bool extref;
-	bool gpsref;
-	Transceiver::FillerType filler;
-	bool mcbts;
-	double offset;
-	double rssi_offset;
-	bool swap_channels;
-	bool edge;
-};
-
-ConfigurationTable gConfig;
+static char* config_file = (char*)DEFAULT_CONFIG_FILE;
 
 volatile bool gshutdown = false;
 
-/* Setup configuration values
- *     Don't query the existence of the Log.Level because it's a
- *     mandatory value. That is, if it doesn't exist, the configuration
- *     table will crash or will have already crashed. Everything else we
- *     can survive without and use default values if the database entries
- *     are empty.
- */
-bool trx_setup_config(struct trx_config *config)
-{
-	std::string refstr, fillstr, divstr, mcstr, edgestr;
+static void *tall_trx_ctx;
+static struct trx_ctx *g_trx_ctx;
+static struct ctrl_handle *g_ctrlh;
 
-	if (config->mcbts && config->chans > 5) {
-		std::cout << "Unsupported number of channels" << std::endl;
-		return false;
-	}
-
-	edgestr = config->edge ? "Enabled" : "Disabled";
-	mcstr = config->mcbts ? "Enabled" : "Disabled";
-
-	if (config->extref)
-		refstr = "External";
-	else if (config->gpsref)
-		refstr = "GPS";
-	else
-		refstr = "Internal";
-
-	switch (config->filler) {
-	case Transceiver::FILLER_DUMMY:
-		fillstr = "Dummy bursts";
-		break;
-	case Transceiver::FILLER_ZERO:
-		fillstr = "Disabled";
-		break;
-	case Transceiver::FILLER_NORM_RAND:
-		fillstr = "Normal busrts with random payload";
-		break;
-	case Transceiver::FILLER_EDGE_RAND:
-		fillstr = "EDGE busrts with random payload";
-		break;
-	case Transceiver::FILLER_ACCESS_RAND:
-		fillstr = "Access busrts with random payload";
-		break;
-	}
-
-	std::ostringstream ost("");
-	ost << "Config Settings" << std::endl;
-	ost << "   Log Level............... " << config->log_level << std::endl;
-	ost << "   Device args............. " << config->dev_args << std::endl;
-	ost << "   TRX Base Port........... " << config->port << std::endl;
-	ost << "   TRX Address............. " << config->addr << std::endl;
-	ost << "   Channels................ " << config->chans << std::endl;
-	ost << "   Tx Samples-per-Symbol... " << config->tx_sps << std::endl;
-	ost << "   Rx Samples-per-Symbol... " << config->rx_sps << std::endl;
-	ost << "   EDGE support............ " << edgestr << std::endl;
-	ost << "   Reference............... " << refstr << std::endl;
-	ost << "   C0 Filler Table......... " << fillstr << std::endl;
-	ost << "   Multi-Carrier........... " << mcstr << std::endl;
-	ost << "   Tuning offset........... " << config->offset << std::endl;
-	ost << "   RSSI to dBm offset...... " << config->rssi_offset << std::endl;
-	ost << "   Swap channels........... " << config->swap_channels << std::endl;
-	std::cout << ost << std::endl;
-
-	return true;
-}
+static RadioDevice *usrp;
+static RadioInterface *radio;
+static Transceiver *transceiver;
 
 /* Create radio interface
  *     The interface consists of sample rate changes, frequency shifts,
@@ -155,24 +78,24 @@ bool trx_setup_config(struct trx_config *config)
  *     The radio interface connects the main transceiver with the device
  *     object, which may be operating some other rate.
  */
-RadioInterface *makeRadioInterface(struct trx_config *config,
+RadioInterface *makeRadioInterface(struct trx_ctx *trx,
                                    RadioDevice *usrp, int type)
 {
 	RadioInterface *radio = NULL;
 
 	switch (type) {
 	case RadioDevice::NORMAL:
-		radio = new RadioInterface(usrp, config->tx_sps,
-					   config->rx_sps, config->chans);
+		radio = new RadioInterface(usrp, trx->cfg.tx_sps,
+					   trx->cfg.rx_sps, trx->cfg.num_chans);
 		break;
 	case RadioDevice::RESAMP_64M:
 	case RadioDevice::RESAMP_100M:
-		radio = new RadioInterfaceResamp(usrp, config->tx_sps,
-						 config->rx_sps);
+		radio = new RadioInterfaceResamp(usrp, trx->cfg.tx_sps,
+						 trx->cfg.rx_sps);
 		break;
 	case RadioDevice::MULTI_ARFCN:
-		radio = new RadioInterfaceMulti(usrp, config->tx_sps,
-						config->rx_sps, config->chans);
+		radio = new RadioInterfaceMulti(usrp, trx->cfg.tx_sps,
+						trx->cfg.rx_sps, trx->cfg.num_chans);
 		break;
 	default:
 		LOG(ALERT) << "Unsupported radio interface configuration";
@@ -193,190 +116,224 @@ RadioInterface *makeRadioInterface(struct trx_config *config,
  *     and decoding schemes. Also included are the socket interfaces for
  *     connecting to the upper layer stack.
  */
-Transceiver *makeTransceiver(struct trx_config *config, RadioInterface *radio)
+int makeTransceiver(struct trx_ctx *trx, RadioInterface *radio)
 {
-	Transceiver *trx;
 	VectorFIFO *fifo;
 
-	trx = new Transceiver(config->port, config->addr.c_str(),
-			      config->tx_sps, config->rx_sps, config->chans,
-			      GSM::Time(3,0), radio, config->rssi_offset);
-	if (!trx->init(config->filler, config->rtsc,
-		       config->rach_delay, config->edge)) {
+	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);
+	if (!transceiver->init(trx->cfg.filler, trx->cfg.rtsc,
+		       trx->cfg.rach_delay, trx->cfg.egprs)) {
 		LOG(ALERT) << "Failed to initialize transceiver";
-		delete trx;
-		return NULL;
+		return -1;
 	}
 
-	for (size_t i = 0; i < config->chans; i++) {
+	for (size_t i = 0; i < trx->cfg.num_chans; i++) {
 		fifo = radio->receiveFIFO(i);
-		if (fifo && trx->receiveFIFO(fifo, i))
+		if (fifo && transceiver->receiveFIFO(fifo, i))
 			continue;
 
 		LOG(ALERT) << "Could not attach FIFO to channel " << i;
-		delete trx;
-		return NULL;
+		return -1;
 	}
-
-	return trx;
+	return 0;
 }
 
 static void sig_handler(int signo)
 {
-	fprintf(stdout, "Received shutdown signal");
-	gshutdown = true;
+	fprintf(stdout, "signal %d received\n", signo);
+	switch (signo) {
+	case SIGINT:
+	case SIGTERM:
+		fprintf(stdout, "shutting down\n");
+		gshutdown = true;
+		break;
+	case SIGABRT:
+	case SIGUSR1:
+		talloc_report(tall_trx_ctx, stderr);
+		talloc_report_full(tall_trx_ctx, stderr);
+		break;
+	case SIGUSR2:
+		talloc_report_full(tall_trx_ctx, stderr);
+		break;
+	default:
+		break;
+	}
 }
 
 static void setup_signal_handlers()
 {
-	if (signal(SIGINT, sig_handler) == SIG_ERR) {
-		fprintf(stderr, "Failed to install SIGINT signal handler\n");
-		exit(EXIT_FAILURE);
-	}
-	if (signal(SIGTERM, sig_handler) == SIG_ERR) {
-		fprintf(stderr, "Couldn't install SIGTERM signal handler\n");
-		exit( EXIT_FAILURE);
+	/* Handle keyboard interrupt SIGINT */
+	signal(SIGINT, &sig_handler);
+	signal(SIGTERM, &sig_handler);
+	signal(SIGABRT, &sig_handler);
+	signal(SIGUSR1, &sig_handler);
+	signal(SIGUSR2, &sig_handler);
+	osmo_init_ignore_signals();
+}
+
+static std::vector<std::string> comma_delimited_to_vector(char* opt)
+{
+	std::string str = std::string(opt);
+	std::vector<std::string> result;
+	std::stringstream ss(str);
+
+	while( ss.good() )
+	{
+	    std::string substr;
+	    getline(ss, substr, ',');
+	    result.push_back(substr);
 	}
+	return result;
 }
 
 static void print_help()
 {
 	fprintf(stdout, "Options:\n"
 		"  -h    This text\n"
-		"  -a    UHD device args\n"
-		"  -l    Logging level (%s)\n"
-		"  -i    IP address of GSM core\n"
-		"  -p    Base port number\n"
-		"  -e    Enable EDGE receiver\n"
-		"  -m    Enable multi-ARFCN transceiver (default=disabled)\n"
-		"  -x    Enable external 10 MHz reference\n"
-		"  -g    Enable GPSDO reference\n"
-		"  -s    Tx samples-per-symbol (1 or 4)\n"
-		"  -b    Rx samples-per-symbol (1 or 4)\n"
-		"  -c    Number of ARFCN channels (default=1)\n"
-		"  -f    Enable C0 filler table\n"
-		"  -o    Set baseband frequency offset (default=auto)\n"
-		"  -r    Random Normal Burst test mode with TSC\n"
-		"  -A    Random Access Burst test mode with delay\n"
-		"  -R    RSSI to dBm offset in dB (default=0)\n"
-		"  -S    Swap channels (UmTRX only)\n",
-		"EMERG, ALERT, CRT, ERR, WARNING, NOTICE, INFO, DEBUG");
+		"  -C    Filename The config file to use\n"
+		);
 }
 
-static void handle_options(int argc, char **argv, struct trx_config *config)
+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 overriden by VTY options if set.";
+}
+
+static void handle_options(int argc, char **argv, struct trx_ctx* trx)
 {
 	int option;
+	unsigned int i;
+	std::vector<std::string> rx_paths, tx_paths;
+	bool rx_paths_set = false, tx_paths_set = false;
 
-	config->log_level = "NOTICE";
-	config->addr = DEFAULT_TRX_IP;
-	config->port = DEFAULT_TRX_PORT;
-	config->tx_sps = DEFAULT_TX_SPS;
-	config->rx_sps = DEFAULT_RX_SPS;
-	config->chans = DEFAULT_CHANS;
-	config->rtsc = 0;
-	config->rach_delay = 0;
-	config->extref = false;
-	config->gpsref = false;
-	config->filler = Transceiver::FILLER_ZERO;
-	config->mcbts = false;
-	config->offset = 0.0;
-	config->rssi_offset = 0.0;
-	config->swap_channels = false;
-	config->edge = false;
-
-	while ((option = getopt(argc, argv, "ha:l:i:p:c:dmxgfo:s:b:r:A:R:Se")) != -1) {
+	while ((option = getopt(argc, argv, "ha:l:i:j:p:c:dmxgfo:s:b:r:A:R:Set:y:z:C:")) != -1) {
 		switch (option) {
 		case 'h':
 			print_help();
 			exit(0);
 			break;
 		case 'a':
-			config->dev_args = optarg;
+			print_deprecated(option);
+			osmo_talloc_replace_string(trx, &trx->cfg.dev_args, optarg);
 			break;
 		case 'l':
-			config->log_level = optarg;
+			print_deprecated(option);
+			log_set_log_level(osmo_stderr_target, atoi(optarg));
 			break;
 		case 'i':
-			config->addr = optarg;
+			print_deprecated(option);
+			osmo_talloc_replace_string(trx, &trx->cfg.remote_addr, optarg);
+			break;
+		case 'j':
+			print_deprecated(option);
+			osmo_talloc_replace_string(trx, &trx->cfg.bind_addr, optarg);
 			break;
 		case 'p':
-			config->port = atoi(optarg);
+			print_deprecated(option);
+			trx->cfg.base_port = atoi(optarg);
 			break;
 		case 'c':
-			config->chans = atoi(optarg);
+			print_deprecated(option);
+			trx->cfg.num_chans = atoi(optarg);
 			break;
 		case 'm':
-			config->mcbts = true;
+			print_deprecated(option);
+			trx->cfg.multi_arfcn = true;
 			break;
 		case 'x':
-			config->extref = true;
+			print_deprecated(option);
+			trx->cfg.clock_ref = REF_EXTERNAL;
 			break;
 		case 'g':
-			config->gpsref = true;
+			print_deprecated(option);
+			trx->cfg.clock_ref = REF_GPS;
 			break;
 		case 'f':
-			config->filler = Transceiver::FILLER_DUMMY;
+			print_deprecated(option);
+			trx->cfg.filler = FILLER_DUMMY;
 			break;
 		case 'o':
-			config->offset = atof(optarg);
+			print_deprecated(option);
+			trx->cfg.offset = atof(optarg);
 			break;
 		case 's':
-			config->tx_sps = atoi(optarg);
+			print_deprecated(option);
+			trx->cfg.tx_sps = atoi(optarg);
 			break;
 		case 'b':
-			config->rx_sps = atoi(optarg);
+			print_deprecated(option);
+			trx->cfg.rx_sps = atoi(optarg);
 			break;
 		case 'r':
-			config->rtsc = atoi(optarg);
-			config->filler = Transceiver::FILLER_NORM_RAND;
+			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':
-			config->rach_delay = atoi(optarg);
-			config->filler = Transceiver::FILLER_ACCESS_RAND;
+			print_deprecated(option);
+			trx->cfg.rach_delay_set = true;
+			trx->cfg.rach_delay = atoi(optarg);
+			trx->cfg.filler = FILLER_ACCESS_RAND;
 			break;
 		case 'R':
-			config->rssi_offset = atof(optarg);
+			print_deprecated(option);
+			trx->cfg.rssi_offset = atof(optarg);
 			break;
 		case 'S':
-			config->swap_channels = true;
+			print_deprecated(option);
+			trx->cfg.swap_channels = true;
 			break;
 		case 'e':
-			config->edge = true;
+			print_deprecated(option);
+			trx->cfg.egprs = true;
+			break;
+		case 't':
+			print_deprecated(option);
+			trx->cfg.sched_rr = atoi(optarg);
+			break;
+		case 'y':
+			print_deprecated(option);
+			tx_paths = comma_delimited_to_vector(optarg);
+			tx_paths_set = true;
+			break;
+		case 'z':
+			print_deprecated(option);
+			rx_paths = comma_delimited_to_vector(optarg);
+			rx_paths_set = true;
+			break;
+		case 'C':
+			config_file = optarg;
 			break;
 		default:
-			print_help();
-			exit(0);
+			goto bad_config;
 		}
 	}
 
-	/* Force 4 SPS for EDGE or multi-ARFCN configurations */
-	if ((config->edge) || (config->mcbts)) {
-		config->tx_sps = 4;
-		config->rx_sps = 4;
-	}
+	/* Cmd line option specific validation & setup */
 
-	if (config->gpsref && config->extref) {
-		printf("External and GPSDO references unavailable at the same time\n\n");
+	if (trx->cfg.num_chans > TRX_CHAN_MAX) {
+		LOG(ERROR) << "Too many channels requested, maximum is " <<  TRX_CHAN_MAX;
 		goto bad_config;
 	}
-
-	if (config->edge && (config->filler == Transceiver::FILLER_NORM_RAND))
-		config->filler = Transceiver::FILLER_EDGE_RAND;
-
-	if ((config->tx_sps != 1) && (config->tx_sps != 4) &&
-	    (config->rx_sps != 1) && (config->rx_sps != 4)) {
-		printf("Unsupported samples-per-symbol %i\n\n", config->tx_sps);
+	if ((tx_paths_set && tx_paths.size() != trx->cfg.num_chans) ||
+	    (rx_paths_set && rx_paths.size() != trx->cfg.num_chans)) {
+		LOG(ERROR) << "Num of channels and num of Rx/Tx Antennas doesn't match";
 		goto bad_config;
 	}
-
-	if (config->rtsc > 7) {
-		printf("Invalid training sequence %i\n\n", config->rtsc);
-		goto bad_config;
-	}
-
-	if (config->rach_delay > 68) {
-		printf("RACH delay is too big %i\n\n", config->rach_delay);
-		goto bad_config;
+	for (i = 0; i < trx->cfg.num_chans; i++) {
+		trx->cfg.chans[i].trx = trx;
+		trx->cfg.chans[i].idx = i;
+		if (tx_paths_set)
+			osmo_talloc_replace_string(trx, &trx->cfg.chans[i].tx_path, tx_paths[i].c_str());
+		if (rx_paths_set)
+			osmo_talloc_replace_string(trx, &trx->cfg.chans[i].rx_path, rx_paths[i].c_str());
 	}
 
 	return;
@@ -386,14 +343,141 @@ bad_config:
 	exit(0);
 }
 
+int trx_validate_config(struct trx_ctx *trx)
+{
+	if (trx->cfg.multi_arfcn && trx->cfg.num_chans > 5) {
+		LOG(ERROR) << "Unsupported number of channels";
+		return -1;
+	}
+
+	/* Force 4 SPS for EDGE or multi-ARFCN configurations */
+	if ((trx->cfg.egprs || trx->cfg.multi_arfcn) &&
+	    (trx->cfg.tx_sps!=4 || trx->cfg.tx_sps!=4)) {
+		LOG(ERROR) << "EDGE and Multi-Carrier options require 4 tx and rx sps. Check you config.";
+		return -1;
+	}
+
+	return 0;
+}
+
+static int set_sched_rr(unsigned int prio)
+{
+	struct sched_param param;
+	int rc;
+	memset(&param, 0, sizeof(param));
+	param.sched_priority = prio;
+	printf("Setting SCHED_RR priority(%d)\n", param.sched_priority);
+	rc = sched_setscheduler(getpid(), SCHED_RR, &param);
+	if (rc != 0) {
+		LOG(ERROR) << "Config: Setting SCHED_RR failed";
+		return -1;
+	}
+	return 0;
+}
+
+static void print_config(struct trx_ctx *trx)
+{
+	unsigned int i;
+	std::ostringstream ost("");
+
+	ost << "Config Settings" << std::endl;
+	ost << "   Log Level............... " << (unsigned int) osmo_stderr_target->loglevel << std::endl;
+	ost << "   Device args............. " << charp2str(trx->cfg.dev_args) << std::endl;
+	ost << "   TRX Base Port........... " << trx->cfg.base_port << std::endl;
+	ost << "   TRX Address............. " << charp2str(trx->cfg.bind_addr) << std::endl;
+	ost << "   GSM BTS Address......... " << charp2str(trx->cfg.remote_addr) << std::endl;
+	ost << "   Channels................ " << trx->cfg.num_chans << std::endl;
+	ost << "   Tx Samples-per-Symbol... " << trx->cfg.tx_sps << std::endl;
+	ost << "   Rx Samples-per-Symbol... " << trx->cfg.rx_sps << std::endl;
+	ost << "   EDGE support............ " << trx->cfg.egprs << std::endl;
+	ost << "   Reference............... " << trx->cfg.clock_ref << std::endl;
+	ost << "   C0 Filler Table......... " << trx->cfg.filler << std::endl;
+	ost << "   Multi-Carrier........... " << trx->cfg.multi_arfcn << std::endl;
+	ost << "   Tuning offset........... " << trx->cfg.offset << std::endl;
+	ost << "   RSSI to dBm offset...... " << trx->cfg.rssi_offset << std::endl;
+	ost << "   Swap channels........... " << trx->cfg.swap_channels << std::endl;
+	ost << "   Tx Antennas.............";
+	for (i = 0; i < trx->cfg.num_chans; i++) {
+		std::string p = charp2str(trx->cfg.chans[i].tx_path);
+		ost << " '" << ((p != "") ? p : "<default>") <<  "'";
+	}
+	ost << std::endl;
+	ost << "   Rx Antennas.............";
+	for (i = 0; i < trx->cfg.num_chans; i++) {
+		std::string p = charp2str(trx->cfg.chans[i].rx_path);
+		ost << " '" << ((p != "") ? p : "<default>") <<  "'";
+	}
+	ost << std::endl;
+
+	std::cout << ost << std::endl;
+}
+
+static void trx_stop()
+{
+	std::cout << "Shutting down transceiver..." << std::endl;
+
+	delete transceiver;
+	delete radio;
+	delete usrp;
+}
+
+static int trx_start(struct trx_ctx *trx)
+{
+	int type, chans;
+	unsigned int i;
+	std::vector<std::string> rx_paths, tx_paths;
+	RadioDevice::InterfaceType iface = RadioDevice::NORMAL;
+
+	/* Create the low level device object */
+	if (trx->cfg.multi_arfcn)
+		iface = RadioDevice::MULTI_ARFCN;
+
+	/* Generate vector of rx/tx_path: */
+	for (i = 0; i < trx->cfg.num_chans; i++) {
+		rx_paths.push_back(charp2str(trx->cfg.chans[i].rx_path));
+		tx_paths.push_back(charp2str(trx->cfg.chans[i].tx_path));
+	}
+
+	usrp = RadioDevice::make(trx->cfg.tx_sps, trx->cfg.rx_sps, iface,
+				 trx->cfg.num_chans, trx->cfg.offset,
+				 tx_paths, rx_paths);
+	type = usrp->open(charp2str(trx->cfg.dev_args), trx->cfg.clock_ref, trx->cfg.swap_channels);
+	if (type < 0) {
+		LOG(ALERT) << "Failed to create radio device" << std::endl;
+		goto shutdown;
+	}
+
+	/* Setup the appropriate device interface */
+	radio = makeRadioInterface(trx, usrp, type);
+	if (!radio)
+		goto shutdown;
+
+	/* Create the transceiver core */
+	if (makeTransceiver(trx, radio) < 0)
+		goto shutdown;
+
+	chans = transceiver->numChans();
+	std::cout << "-- Transceiver active with "
+		  << chans << " channel(s)" << std::endl;
+
+	return 0;
+
+shutdown:
+	trx_stop();
+	return -1;
+}
+
 int main(int argc, char *argv[])
 {
-	int type, chans, ref;
-	RadioDevice *usrp;
-	RadioInterface *radio = NULL;
-	Transceiver *trx = NULL;
-	RadioDevice::InterfaceType iface = RadioDevice::NORMAL;
-	struct trx_config config;
+	int rc;
+
+	tall_trx_ctx = talloc_named_const(NULL, 0, "OsmoTRX");
+	msgb_talloc_ctx_init(tall_trx_ctx, 0);
+	g_vty_info.tall_ctx = tall_trx_ctx;
+
+	setup_signal_handlers();
+
+	g_trx_ctx = vty_trx_ctx_alloc(tall_trx_ctx);
 
 #ifdef HAVE_SSE3
 	printf("Info: SSE3 support compiled in");
@@ -422,62 +506,68 @@ int main(int argc, char *argv[])
 	convolve_init();
 	convert_init();
 
-	handle_options(argc, argv, &config);
+	osmo_init_logging2(tall_trx_ctx, &log_info);
+	osmo_stats_init(tall_trx_ctx);
+	vty_init(&g_vty_info);
+	ctrl_vty_init(tall_trx_ctx);
+	trx_vty_init(g_trx_ctx);
 
-	setup_signal_handlers();
+	logging_vty_add_cmds();
+	osmo_talloc_vty_add_cmds();
+	osmo_stats_vty_add_cmds();
 
-	/* Check database sanity */
-	if (!trx_setup_config(&config)) {
-		std::cerr << "Config: Database failure - exiting" << std::endl;
+	handle_options(argc, argv, g_trx_ctx);
+
+	rate_ctr_init(tall_trx_ctx);
+
+	rc = vty_read_config_file(config_file, NULL);
+	if (rc < 0) {
+		fprintf(stderr, "Failed to open config file: '%s'\n", config_file);
+		exit(2);
+	}
+
+	rc = telnet_init_dynif(tall_trx_ctx, NULL, vty_get_bind_addr(), OSMO_VTY_PORT_TRX);
+	if (rc < 0)
+		exit(1);
+
+	g_ctrlh = ctrl_interface_setup(NULL, OSMO_CTRL_PORT_TRX, NULL);
+	if (!g_ctrlh) {
+		fprintf(stderr, "Failed to create CTRL interface.\n");
+		exit(1);
+	}
+
+	/* Backward compatibility: Hack to have 1 channel allocated by default.
+	 * Can be Dropped once we * get rid of "-c" cmdline param */
+	if (g_trx_ctx->cfg.num_chans == 0) {
+		g_trx_ctx->cfg.num_chans = 1;
+		g_trx_ctx->cfg.chans[0].trx = g_trx_ctx;
+		g_trx_ctx->cfg.chans[0].idx = 0;
+		LOG(ERROR) << "No explicit channel config found. Make sure you" \
+			" configure channels in VTY config. Using 1 channel as default," \
+			" but expect your config to break in the future.";
+	}
+
+	print_config(g_trx_ctx);
+
+	if (trx_validate_config(g_trx_ctx) < 0) {
+		LOG(ERROR) << "Config failure - exiting";
 		return EXIT_FAILURE;
 	}
 
-	gLogInit("transceiver", config.log_level.c_str(), LOG_LOCAL7);
+	if (g_trx_ctx->cfg.sched_rr) {
+		if (set_sched_rr(g_trx_ctx->cfg.sched_rr) < 0)
+			return EXIT_FAILURE;
+	}
 
 	srandom(time(NULL));
 
-	/* Create the low level device object */
-	if (config.mcbts)
-		iface = RadioDevice::MULTI_ARFCN;
-
-	if (config.extref)
-		ref = RadioDevice::REF_EXTERNAL;
-	else if (config.gpsref)
-		ref = RadioDevice::REF_GPS;
-	else
-		ref = RadioDevice::REF_INTERNAL;
-
-	usrp = RadioDevice::make(config.tx_sps, config.rx_sps, iface,
-				 config.chans, config.offset);
-	type = usrp->open(config.dev_args, ref, config.swap_channels);
-	if (type < 0) {
-		LOG(ALERT) << "Failed to create radio device" << std::endl;
-		goto shutdown;
-	}
-
-	/* Setup the appropriate device interface */
-	radio = makeRadioInterface(&config, usrp, type);
-	if (!radio)
-		goto shutdown;
-
-	/* Create the transceiver core */
-	trx = makeTransceiver(&config, radio);
-	if (!trx)
-		goto shutdown;
-
-	chans = trx->numChans();
-	std::cout << "-- Transceiver active with "
-		  << chans << " channel(s)" << std::endl;
+	if(trx_start(g_trx_ctx) < 0)
+		return EXIT_FAILURE;
 
 	while (!gshutdown)
-		sleep(1);
+		osmo_select_main(0);
 
-shutdown:
-	std::cout << "Shutting down transceiver..." << std::endl;
-
-	delete trx;
-	delete radio;
-	delete usrp;
+	trx_stop();
 
 	return 0;
 }

Transceiver52M/radioInterface.cpp

@@ -145,16 +145,31 @@ bool RadioInterface::tuneRx(double freq, size_t chan)
   return mRadio->setRxFreq(freq, chan);
 }
 
+/** synchronization thread loop */
+void *AlignRadioServiceLoopAdapter(RadioInterface *radioInterface)
+{
+  while (1) {
+    sleep(60);
+    radioInterface->alignRadio();
+    pthread_testcancel();
+  }
+  return NULL;
+}
+
+void RadioInterface::alignRadio() {
+  mRadio->updateAlignment(writeTimestamp+ (TIMESTAMP) 10000);
+}
+
 bool RadioInterface::start()
 {
   if (mOn)
     return true;
 
   LOG(INFO) << "Starting radio device";
-#ifdef USRP1
-  mAlignRadioServiceLoopThread.start((void * (*)(void*))AlignRadioServiceLoopAdapter,
-                                     (void*)this);
-#endif
+  if (mRadio->requiresRadioAlign())
+        mAlignRadioServiceLoopThread.start(
+                                (void * (*)(void*))AlignRadioServiceLoopAdapter,
+                                (void*)this);
 
   if (!mRadio->start())
     return false;
@@ -191,22 +206,6 @@ bool RadioInterface::stop()
   return true;
 }
 
-#ifdef USRP1
-void *AlignRadioServiceLoopAdapter(RadioInterface *radioInterface)
-{
-  while (1) {
-    radioInterface->alignRadio();
-    pthread_testcancel();
-  }
-  return NULL;
-}
-
-void RadioInterface::alignRadio() {
-  sleep(60);
-  mRadio->updateAlignment(writeTimestamp+ (TIMESTAMP) 10000);
-}
-#endif
-
 void RadioInterface::driveTransmitRadio(std::vector<signalVector *> &bursts,
                                         std::vector<bool> &zeros)
 {

Transceiver52M/radioInterface.h

@@ -133,21 +133,16 @@ public:
   /** get transport window type of attached device */ 
   enum RadioDevice::TxWindowType getWindowType() { return mRadio->getWindowType(); }
 
-#if USRP1
-protected:
+  /** Minimum latency that the device can achieve */
+  GSM::Time minLatency()  { return mRadio->minLatency(); }
 
+protected:
   /** drive synchronization of Tx/Rx of USRP */
   void alignRadio();
 
   friend void *AlignRadioServiceLoopAdapter(RadioInterface*);
-#endif
 };
 
-#if USRP1
-/** synchronization thread loop */
-void *AlignRadioServiceLoopAdapter(RadioInterface*);
-#endif
-
 class RadioInterfaceResamp : public RadioInterface {
 private:
   signalVector *outerSendBuffer;

Transceiver52M/sigProcLib.cpp

@@ -46,14 +46,10 @@ using namespace GSM;
 #define CLIP_THRESH		30000.0f
 
 /** Lookup tables for trigonometric approximation */
-static float cosTable[TABLESIZE+1]; // add 1 element for wrap around
-static float sinTable[TABLESIZE+1];
-static float sincTable[TABLESIZE+1];
+static float sincTable[TABLESIZE+1]; // add 1 element for wrap around
 
 /** Constants */
 static const float M_PI_F = (float)M_PI;
-static const float M_2PI_F = (float)(2.0*M_PI);
-static const float M_1_2PI_F = 1/M_2PI_F;
 
 /* Precomputed rotation vectors */
 static signalVector *GMSKRotation4 = NULL;
@@ -64,7 +60,7 @@ static signalVector *GMSKReverseRotation1 = NULL;
 /* Precomputed fractional delay filters */
 static signalVector *delayFilters[DELAYFILTS];
 
-extern const Complex<float> psk8_table[8] = {
+static const Complex<float> psk8_table[8] = {
    Complex<float>(-0.70710678,  0.70710678),
    Complex<float>( 0.0, -1.0),
    Complex<float>( 0.0,  1.0),
@@ -110,9 +106,8 @@ struct CorrelationSequence {
  * for SSE instructions.
  */
 struct PulseSequence {
-  PulseSequence() : c0(NULL), c1(NULL), c2(NULL), c3(NULL), c0_inv(NULL), empty(NULL),
-                    c0_buffer(NULL), c1_buffer(NULL), c2_buffer(NULL),
-                    c3_buffer(NULL), c0_inv_buffer(NULL), g(NULL)
+  PulseSequence() : c0(NULL), c1(NULL), c0_inv(NULL), empty(NULL),
+		    c0_buffer(NULL), c1_buffer(NULL), c0_inv_buffer(NULL)
   {
   }
 
@@ -120,29 +115,19 @@ struct PulseSequence {
   {
     delete c0;
     delete c1;
-    delete c2;
-    delete c3;
     delete c0_inv;
     delete empty;
-    delete g;
     free(c0_buffer);
     free(c1_buffer);
-    free(c2_buffer);
-    free(c3_buffer);
   }
 
   signalVector *c0;
   signalVector *c1;
-  signalVector *c2;
-  signalVector *c3;
   signalVector *c0_inv;
   signalVector *empty;
   void *c0_buffer;
   void *c1_buffer;
-  void *c2_buffer;
-  void *c3_buffer;
   void *c0_inv_buffer;
-  signalVector *g;
 };
 
 static CorrelationSequence *gMidambles[] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};
@@ -193,29 +178,6 @@ static float vectorNorm2(const signalVector &x)
   return Energy;
 }
 
-/** compute e^(-jx) via lookup table. */
-static complex expjLookup(float x)
-{
-  float arg = x*M_1_2PI_F;
-  while (arg > 1.0F) arg -= 1.0F;
-  while (arg < 0.0F) arg += 1.0F;
-
-  const float argT = arg*((float)TABLESIZE);
-  const int argI = (int)argT;
-  const float delta = argT-argI;
-  const float iDelta = 1.0F-delta;
-   return complex(iDelta*cosTable[argI] + delta*cosTable[argI+1],
-		   iDelta*sinTable[argI] + delta*sinTable[argI+1]);
-}
-
-/** Library setup functions */
-static void initTrigTables() {
-  for (int i = 0; i < TABLESIZE+1; i++) {
-    cosTable[i] = cos(2.0*M_PI*i/TABLESIZE);
-    sinTable[i] = sin(2.0*M_PI*i/TABLESIZE);
-  }
-}
-
 /*
  * Initialize 4 sps and 1 sps rotation tables
  */
@@ -227,11 +189,11 @@ static void initGMSKRotationTables()
   GMSKReverseRotation4 = new signalVector(len4);
   signalVector::iterator rotPtr = GMSKRotation4->begin();
   signalVector::iterator revPtr = GMSKReverseRotation4->begin();
-  float phase = 0.0;
+  auto phase = 0.0;
   while (rotPtr != GMSKRotation4->end()) {
-    *rotPtr++ = expjLookup(phase);
-    *revPtr++ = expjLookup(-phase);
-    phase += M_PI_F / 2.0F / 4.0;
+    *rotPtr++ = complex(cos(phase), sin(phase));
+    *revPtr++ = complex(cos(-phase), sin(-phase));
+    phase += M_PI / 2.0 / 4.0;
   }
 
   GMSKRotation1 = new signalVector(len1);
@@ -240,9 +202,9 @@ static void initGMSKRotationTables()
   revPtr = GMSKReverseRotation1->begin();
   phase = 0.0;
   while (rotPtr != GMSKRotation1->end()) {
-    *rotPtr++ = expjLookup(phase);
-    *revPtr++ = expjLookup(-phase);
-    phase += M_PI_F / 2.0F;
+    *rotPtr++ = complex(cos(phase), sin(phase));
+    *revPtr++ = complex(cos(-phase), sin(-phase));
+    phase += M_PI / 2.0;
   }
 }
 
@@ -453,121 +415,6 @@ static bool generateInvertC0Pulse(PulseSequence *pulse)
   return true;
 }
 
-static bool generateGPulse(int sps, PulseSequence *pulse)
-{
-  int len;
-
-  if (!pulse)
-    return false;
-
-  switch (sps) {
-  case 4:
-    len = 12;
-    break;
-  default:
-    return false;
-  }
-
-  pulse->g = new signalVector(len);
-  pulse->g->isReal(true);
-
-  /* Enable alignment for SSE usage */
-  pulse->c3->setAligned(true);
-
-  signalVector::iterator xP = pulse->g->begin();
-
-  switch (sps) {
-  case 4:
-    *xP++ = 9.36941412e-03;
-    *xP++ = 3.08922969e-02;
-    *xP++ = 7.76167091e-02;
-    *xP++ = 1.50953651e-01;
-    *xP++ = 2.31509315e-01;
-    *xP++ = 2.85056778e-01;
-    *xP++ = 2.85056778e-01;
-    *xP++ = 2.31509315e-01;
-    *xP++ = 1.50953651e-01;
-    *xP++ = 7.76167091e-02;
-    *xP++ = 3.08922969e-02;
-    *xP++ = 9.36941412e-03;
-    break;
-  }
-
-  return true;
-}
-
-static bool generateC3Pulse(int sps, PulseSequence *pulse)
-{
-  int len;
-
-  if (!pulse)
-    return false;
-
-  switch (sps) {
-  case 4:
-    len = 4;
-    break;
-  default:
-    return false;
-  }
-
-  pulse->c3_buffer = convolve_h_alloc(len);
-  pulse->c3 = new signalVector((complex *) pulse->c3_buffer, 0, len);
-  pulse->c3->isReal(true);
-
-  /* Enable alignment for SSE usage */
-  pulse->c3->setAligned(true);
-
-  signalVector::iterator xP = pulse->c3->begin();
-
-  switch (sps) {
-  case 4:
-    /* BT = 0.30 */
-    *xP++ = 0.0;
-    *xP++ = 9.66809925e-04;
-    *xP++ = 1.14560468e-03;
-    *xP++ = 5.28599308e-04;
-  }
-
-  return true;
-}
-
-static bool generateC2Pulse(int sps, PulseSequence *pulse)
-{
-  int len;
-
-  if (!pulse)
-    return false;
-
-  switch (sps) {
-  case 4:
-    len = 4;
-    break;
-  default:
-    return false;
-  }
-
-  pulse->c2_buffer = convolve_h_alloc(len);
-  pulse->c2 = new signalVector((complex *) pulse->c2_buffer, 0, len);
-  pulse->c2->isReal(true);
-
-  /* Enable alignment for SSE usage */
-  pulse->c2->setAligned(true);
-
-  signalVector::iterator xP = pulse->c2->begin();
-
-  switch (sps) {
-  case 4:
-    /* BT = 0.30 */
-    *xP++ = 0.0;
-    *xP++ = 5.28599308e-04;
-    *xP++ = 1.14560468e-03;
-    *xP++ = 9.66809925e-04;
-  }
-
-  return true;
-}
-
 static bool generateC1Pulse(int sps, PulseSequence *pulse)
 {
   int len;
@@ -666,9 +513,6 @@ static PulseSequence *generateGSMPulse(int sps)
     *xP++ = 2.84385729e-02;
     *xP++ = 4.46348606e-03;
     generateC1Pulse(sps, pulse);
-    generateC2Pulse(sps, pulse);
-    generateC3Pulse(sps, pulse);
-    generateGPulse(sps, pulse);
   } else {
     center = (float) (len - 1.0) / 2.0;
 
@@ -714,7 +558,7 @@ static signalVector *rotateBurst(const BitVector &wBurst,
                                  int guardPeriodLength, int sps)
 {
   int burst_len;
-  signalVector *pulse, rotated, *shaped;
+  signalVector *pulse, rotated;
   signalVector::iterator itr;
 
   pulse = GSMPulse1->empty;
@@ -731,11 +575,7 @@ static signalVector *rotateBurst(const BitVector &wBurst,
   rotated.isReal(false);
 
   /* Dummy filter operation */
-  shaped = convolve(&rotated, pulse, NULL, START_ONLY);
-  if (!shaped)
-    return NULL;
-
-  return shaped;
+  return convolve(&rotated, pulse, NULL, START_ONLY);
 }
 
 static void rotateBurst2(signalVector &burst, double phase)
@@ -746,85 +586,32 @@ static void rotateBurst2(signalVector &burst, double phase)
     burst[i] = burst[i] * rot;
 }
 
-signalVector *modulateBurstNCO(const BitVector &bits)
-{
-  auto sps = 4;
-  auto burst = signalVector(625);
-  auto it = burst.begin();
-  burst.isReal(true);
-
-  /* Leading differential bit */
-  *it = 2.0 * (bits[0] & 0x01) - 1.0;
-  it += sps;
-
-   /* Main burst bits */
-  for (size_t i = 1; i < bits.size(); i++) {
-    *it = 2.0 * ((bits[i-1] & 0x01) ^ (bits[i] & 0x01)) - 1.0;
-    it += sps;
-  }
-
-  /* Trailing differential bit */
-  *it = 2.0 * (bits[bits.size()-1] & 0x01) - 1.0;
-
-  auto shaped = convolve(&burst, GSMPulse4->g, NULL, START_ONLY);
-  auto rotate = new signalVector(shaped->size());
-
-  auto itr = rotate->begin();
-  auto its = shaped->begin();
-  double accum = 0.0;
-  while (itr != rotate->end()) {
-    *itr++ = Complex<float>(cos(accum), sin(accum));
-    accum -= its++->real();
-  }
-
-  /*
-   * Hack off guard interval at start and end
-   *   These values make E4406A happy with TSC detection
-   */
-  itr = rotate->end() - 25;
-  while (itr != rotate->end())
-    *itr++ = Complex<float>(0, 0);
-
-  itr = rotate->begin();
-  while (itr != rotate->begin() + 1)
-    *itr++ = Complex<float>(0, 0);
-
-  delete shaped;
-  return rotate;
-}
-
 /*
  * Ignore the guard length argument in the GMSK modulator interface
  * because it results in 624/628 sized bursts instead of the preferred
  * burst length of 625. Only 4 SPS is supported.
  */
-signalVector *modulateBurstLaurent4(const BitVector &bits)
+static signalVector *modulateBurstLaurent(const BitVector &bits)
 {
   int burst_len, sps = 4;
   float phase;
-  signalVector *c0_pulse, *c1_pulse, *c2_pulse, *c3_pulse,
-               *c0_shaped, *c1_shaped, *c2_shaped, *c3_shaped;
-  signalVector::iterator c0_itr, c1_itr, c2_itr, c3_itr;
+  signalVector *c0_pulse, *c1_pulse, *c0_shaped, *c1_shaped;
+  signalVector::iterator c0_itr, c1_itr;
 
   c0_pulse = GSMPulse4->c0;
   c1_pulse = GSMPulse4->c1;
-  c2_pulse = GSMPulse4->c2;
-  c3_pulse = GSMPulse4->c3;
 
   if (bits.size() > 156)
     return NULL;
 
   burst_len = 625;
 
-  auto c0_burst = signalVector(burst_len, c0_pulse->size());
-  auto c1_burst = signalVector(burst_len, c1_pulse->size());
-  auto c2_burst = signalVector(burst_len, c2_pulse->size());
-  auto c3_burst = signalVector(burst_len, c3_pulse->size());
-
+  signalVector c0_burst(burst_len, c0_pulse->size());
+  c0_burst.isReal(true);
   c0_itr = c0_burst.begin();
+
+  signalVector c1_burst(burst_len, c1_pulse->size());
   c1_itr = c1_burst.begin();
-  c2_itr = c2_burst.begin();
-  c3_itr = c3_burst.begin();
 
   /* Padded differential tail bits */
   *c0_itr = 2.0 * (0x00 & 0x01) - 1.0;
@@ -843,132 +630,9 @@ signalVector *modulateBurstLaurent4(const BitVector &bits)
   GMSKRotate(c0_burst, sps);
   c0_burst.isReal(false);
 
-  /* Generate C1, C2, C3 phase coefficients */
   c0_itr = c0_burst.begin();
   c0_itr += sps * 2;
   c1_itr += sps * 2;
-  c2_itr += sps * 2;
-  c3_itr += sps * 2;
-
-  /* Bit 0 */
-  auto p1 = bits[0] & 0x01;
-  auto p2 = 0;
-  auto p3 = p1 ^ p2;
-
-  *c1_itr = *c0_itr * Complex<float>(0, 2.0 * p1 - 1.0);
-  *c2_itr = *c0_itr * Complex<float>(0, 2.0 * p2 - 1.0);
-  *c3_itr = *c0_itr * Complex<float>(2.0 * p3 - 1.0, 0);
-
-  c0_itr += sps;
-  c1_itr += sps;
-  c2_itr += sps;
-  c3_itr += sps;
-
-  /* Bit 1 */
-  p1 = (bits[1] & 0x01) ^ (bits[0] & 0x01);
-  p2 = (bits[0] & 0x01);
-  p3 = p1 ^ p2;
-
-  *c1_itr = *c0_itr * Complex<float>(0, 2.0 * p1 - 1.0);
-  *c2_itr = *c0_itr * Complex<float>(0, 2.0 * p2 - 1.0);
-  *c3_itr = *c0_itr * Complex<float>(2.0 * p3 - 1.0, 0);
-
-  c0_itr += sps;
-  c1_itr += sps;
-  c2_itr += sps;
-  c3_itr += sps;
-
-  /* Bit 2 - end */
-  for (size_t i = 3; i < bits.size(); i++) {
-    p1 = (bits[i-1] & 0x01) ^ (bits[i-2] & 0x01);
-    p2 = (bits[i-2] & 0x01) ^ (bits[i-3] & 0x01);
-    p3 = p1 ^ p2;
-
-    *c1_itr = *c0_itr * Complex<float>(0, 2.0 * p1 - 1.0);
-    *c2_itr = *c0_itr * Complex<float>(0, 2.0 * p2 - 1.0);
-    *c3_itr = *c0_itr * Complex<float>(2.0 * p3 - 1.0, 0);
-
-    c0_itr += sps;
-    c1_itr += sps;
-    c2_itr += sps;
-    c3_itr += sps;
-  }
-
-  /* Residual bits (unfinished) */
-  int i = bits.size();
-  phase = 2.0 * ((bits[i-1] & 0x01) ^ (bits[i-2] & 0x01)) - 1.0;
-  *c1_itr = *c0_itr * Complex<float>(0, phase);
-
-  /* Pulse shape all component functions */
-  c0_shaped = convolve(&c0_burst, c0_pulse, NULL, START_ONLY);
-  c1_shaped = convolve(&c1_burst, c1_pulse, NULL, START_ONLY);
-  c2_shaped = convolve(&c2_burst, c2_pulse, NULL, START_ONLY);
-  c3_shaped = convolve(&c3_burst, c3_pulse, NULL, START_ONLY);
-
-  /* Combine shaped outputs into C0 */
-  c0_itr = c0_shaped->begin();
-  c1_itr = c1_shaped->begin();
-  c2_itr = c2_shaped->begin();
-  c3_itr = c3_shaped->begin();
-  for (unsigned i = 0; i < c0_shaped->size(); i++ )
-    *c0_itr++ += *c1_itr++ + *c2_itr++ + *c3_itr++;
-
-  delete c1_shaped;
-  delete c2_shaped;
-  delete c3_shaped;
-
-  return c0_shaped;
-}
-
-/*
- * Ignore the guard length argument in the GMSK modulator interface
- * because it results in 624/628 sized bursts instead of the preferred
- * burst length of 625. Only 4 SPS is supported.
- */
-signalVector *modulateBurstLaurent2(const BitVector &bits)
-{
-  int burst_len, sps = 4;
-  float phase;
-  signalVector *c0_pulse, *c1_pulse, *c0_burst;
-  signalVector *c1_burst, *c0_shaped, *c1_shaped;
-  signalVector::iterator c0_itr, c1_itr;
-
-  c0_pulse = GSMPulse4->c0;
-  c1_pulse = GSMPulse4->c1;
-
-  if (bits.size() > 156)
-    return NULL;
-
-  burst_len = 625;
-
-  c0_burst = new signalVector(burst_len, c0_pulse->size());
-  c0_burst->isReal(true);
-  c0_itr = c0_burst->begin();
-
-  c1_burst = new signalVector(burst_len, c1_pulse->size());
-  c1_burst->isReal(true);
-  c1_itr = c1_burst->begin();
-
-  /* Padded differential tail bits */
-  *c0_itr = 2.0 * (0x00 & 0x01) - 1.0;
-  c0_itr += sps;
-
-  /* Main burst bits */
-  for (unsigned i = 0; i < bits.size(); i++) {
-    *c0_itr = 2.0 * (bits[i] & 0x01) - 1.0;
-    c0_itr += sps;
-  }
-
-  /* Padded differential tail bits */
-  *c0_itr = 2.0 * (0x00 & 0x01) - 1.0;
-
-  /* Generate C0 phase coefficients */
-  GMSKRotate(*c0_burst, sps);
-  c0_burst->isReal(false);
-
-  c0_itr = c0_burst->begin();
-  c0_itr += sps * 2;
-  c1_itr += sps * 2;
 
   /* Start magic */
   phase = 2.0 * ((0x01 & 0x01) ^ (0x01 & 0x01)) - 1.0;
@@ -991,8 +655,8 @@ signalVector *modulateBurstLaurent2(const BitVector &bits)
   *c1_itr = *c0_itr * Complex<float>(0, phase);
 
   /* Primary (C0) and secondary (C1) pulse shaping */
-  c0_shaped = convolve(c0_burst, c0_pulse, NULL, START_ONLY);
-  c1_shaped = convolve(c1_burst, c1_pulse, NULL, START_ONLY);
+  c0_shaped = convolve(&c0_burst, c0_pulse, NULL, START_ONLY);
+  c1_shaped = convolve(&c1_burst, c1_pulse, NULL, START_ONLY);
 
   /* Sum shaped outputs into C0 */
   c0_itr = c0_shaped->begin();
@@ -1000,48 +664,10 @@ signalVector *modulateBurstLaurent2(const BitVector &bits)
   for (unsigned i = 0; i < c0_shaped->size(); i++ )
     *c0_itr++ += *c1_itr++;
 
-  delete c0_burst;
-  delete c1_burst;
   delete c1_shaped;
-
   return c0_shaped;
 }
 
-signalVector *modulateBurstLaurent1(const BitVector &bits)
-{
-  if (bits.size() > 156) return NULL;
-
-  int sps = 4;
-  auto burst = signalVector(625, GSMPulse4->c0->size());
-  auto itr = burst.begin();
-  burst.isReal(true);
-
-  /* Padded differential tail bits */
-  *itr = -1.0;
-  itr += sps;
-
-  /* Main burst bits */
-  for (unsigned i = 0; i < bits.size(); i++) {
-    *itr = 2.0 * (bits[i] & 0x01) - 1.0;
-    itr += sps;
-  }
-
-  /* Padded differential tail bits */
-  *itr = -1.0;
-
-  /* Generate C0 phase coefficients */
-  GMSKRotate(burst, sps);
-  burst.isReal(false);
-
-  /* Pulse shaping */
-  return convolve(&burst, GSMPulse4->c0, NULL, START_ONLY);
-}
-
-signalVector *modulateBurstLaurent(const BitVector &bits)
-{
-  return modulateBurstLaurent2(bits);
-}
-
 static signalVector *rotateEdgeBurst(const signalVector &symbols, int sps)
 {
   signalVector *burst;
@@ -1109,10 +735,9 @@ static signalVector *mapEdgeSymbols(const BitVector &bits)
  * pulse filter combination of the GMSK Laurent represenation whereas 8-PSK
  * uses a single pulse linear filter.
  */
-signalVector *shapeEdgeBurst(const signalVector &symbols)
+static signalVector *shapeEdgeBurst(const signalVector &symbols)
 {
   size_t nsyms, nsamps = 625, sps = 4;
-  signalVector *burst, *shape;
   signalVector::iterator burst_itr;
 
   nsyms = symbols.size();
@@ -1120,10 +745,10 @@ signalVector *shapeEdgeBurst(const signalVector &symbols)
   if (nsyms * sps > nsamps)
     nsyms = 156;
 
-  burst = new signalVector(nsamps, GSMPulse4->c0->size());
+  signalVector burst(nsamps, GSMPulse4->c0->size());
 
   /* Delay burst by 1 symbol */
-  burst_itr = burst->begin() + sps;
+  burst_itr = burst.begin() + sps;
   for (size_t i = 0; i < nsyms; i++) {
     float phase = i * 3.0f * M_PI / 8.0f;
     Complex<float> rot = Complex<float>(cos(phase), sin(phase));
@@ -1133,10 +758,7 @@ signalVector *shapeEdgeBurst(const signalVector &symbols)
   }
 
   /* Single Gaussian pulse approximation shaping */
-  shape = convolve(burst, GSMPulse4->c0, NULL, START_ONLY);
-  delete burst;
-
-  return shape;
+  return convolve(&burst, GSMPulse4->c0, NULL, START_ONLY);
 }
 
 /*
@@ -1150,40 +772,36 @@ signalVector *genRandNormalBurst(int tsc, int sps, int tn)
     return NULL;
 
   int i = 0;
-  BitVector *bits = new BitVector(148);
-  signalVector *burst;
+  BitVector bits(148);
 
   /* Tail bits */
   for (; i < 3; i++)
-    (*bits)[i] = 0;
+    bits[i] = 0;
 
   /* Random bits */
   for (; i < 60; i++)
-    (*bits)[i] = rand() % 2;
+    bits[i] = rand() % 2;
 
   /* Stealing bit */
-  (*bits)[i++] = 0;
+  bits[i++] = 0;
 
   /* Training sequence */
   for (int n = 0; i < 87; i++, n++)
-    (*bits)[i] = gTrainingSequence[tsc][n];
+    bits[i] = gTrainingSequence[tsc][n];
 
   /* Stealing bit */
-  (*bits)[i++] = 0;
+  bits[i++] = 0;
 
   /* Random bits */
   for (; i < 145; i++)
-    (*bits)[i] = rand() % 2;
+    bits[i] = rand() % 2;
 
   /* Tail bits */
   for (; i < 148; i++)
-    (*bits)[i] = 0;
+    bits[i] = 0;
 
   int guard = 8 + !(tn % 4);
-  burst = modulateBurst(*bits, guard, sps);
-  delete bits;
-
-  return burst;
+  return modulateBurst(bits, guard, sps);
 }
 
 /*
@@ -1199,30 +817,26 @@ signalVector *genRandAccessBurst(int delay, int sps, int tn)
     return NULL;
 
   int i = 0;
-  BitVector *bits = new BitVector(88+delay);
-  signalVector *burst;
+  BitVector bits(88 + delay);
 
   /* delay */
   for (; i < delay; i++)
-    (*bits)[i] = 0;
+    bits[i] = 0;
 
   /* head and synch bits */
   for (int n = 0; i < 49+delay; i++, n++)
-    (*bits)[i] = gRACHBurst[n];
+    bits[i] = gRACHBurst[n];
 
   /* Random bits */
   for (; i < 85+delay; i++)
-    (*bits)[i] = rand() % 2;
+    bits[i] = rand() % 2;
 
   /* Tail bits */
   for (; i < 88+delay; i++)
-    (*bits)[i] = 0;
+    bits[i] = 0;
 
   int guard = 68-delay + !(tn % 4);
-  burst = modulateBurst(*bits, guard, sps);
-  delete bits;
-
-  return burst;
+  return modulateBurst(bits, guard, sps);
 }
 
 signalVector *generateEmptyBurst(int sps, int tn)
@@ -1259,17 +873,17 @@ signalVector *generateEdgeBurst(int tsc)
   if ((tsc < 0) || (tsc > 7))
     return NULL;
 
-  signalVector *shape, *burst = new signalVector(148);
+  signalVector burst(148);
   const BitVector *midamble = &gEdgeTrainingSequence[tsc];
 
   /* Tail */
   int n, i = 0;
   for (; i < tail; i++)
-    (*burst)[i] = psk8_table[7];
+    burst[i] = psk8_table[7];
 
   /* Body */
   for (; i < tail + data; i++)
-    (*burst)[i] = psk8_table[rand() % 8];
+    burst[i] = psk8_table[rand() % 8];
 
   /* TSC */
   for (n = 0; i < tail + data + train; i++, n++) {
@@ -1277,21 +891,18 @@ signalVector *generateEdgeBurst(int tsc)
                      (((unsigned) (*midamble)[3 * n + 1] & 0x01) << 1) |
                      (((unsigned) (*midamble)[3 * n + 2] & 0x01) << 2);
 
-    (*burst)[i] = psk8_table[index];
+    burst[i] = psk8_table[index];
   }
 
   /* Body */
   for (; i < tail + data + train + data; i++)
-    (*burst)[i] = psk8_table[rand() % 8];
+    burst[i] = psk8_table[rand() % 8];
 
   /* Tail */
   for (; i < tail + data + train + data + tail; i++)
-    (*burst)[i] = psk8_table[7];
+    burst[i] = psk8_table[7];
 
-  shape = shapeEdgeBurst(*burst);
-  delete burst;
-
-  return shape;
+  return shapeEdgeBurst(burst);
 }
 
 /*
@@ -1327,7 +938,7 @@ static signalVector *modulateBurstBasic(const BitVector &bits,
 					int guard_len, int sps)
 {
   int burst_len;
-  signalVector *pulse, *burst, *shaped;
+  signalVector *pulse;
   signalVector::iterator burst_itr;
 
   if (sps == 1)
@@ -1337,9 +948,9 @@ static signalVector *modulateBurstBasic(const BitVector &bits,
 
   burst_len = sps * (bits.size() + guard_len);
 
-  burst = new signalVector(burst_len, pulse->size());
-  burst->isReal(true);
-  burst_itr = burst->begin();
+  signalVector burst(burst_len, pulse->size());
+  burst.isReal(true);
+  burst_itr = burst.begin();
 
   /* Raw bits are not differentially encoded */
   for (unsigned i = 0; i < bits.size(); i++) {
@@ -1347,15 +958,11 @@ static signalVector *modulateBurstBasic(const BitVector &bits,
     burst_itr += sps;
   }
 
-  GMSKRotate(*burst, sps);
-  burst->isReal(false);
+  GMSKRotate(burst, sps);
+  burst.isReal(false);
 
   /* Single Gaussian pulse approximation shaping */
-  shaped = convolve(burst, pulse, NULL, START_ONLY);
-
-  delete burst;
-
-  return shaped;
+  return convolve(&burst, pulse, NULL, START_ONLY);
 }
 
 /* Assume input bits are not differentially encoded */
@@ -1372,16 +979,10 @@ signalVector *modulateBurst(const BitVector &wBurst, int guardPeriodLength,
 
 static void generateSincTable()
 {
-  float x;
-
   for (int i = 0; i < TABLESIZE; i++) {
-    x = (float) i / TABLESIZE * 8 * M_PI;
-    if (fabs(x) < 0.01) {
-      sincTable[i] = 1.0f;
-      continue;
-    }
-
-    sincTable[i] = sinf(x) / x;
+    auto x = (double) i / TABLESIZE * 8 * M_PI;
+    auto y = sin(x) / x;
+    sincTable[i] = std::isnan(y) ? 1.0 : y;
   }
 }
 
@@ -1854,19 +1455,16 @@ float energyDetect(const signalVector &rxBurst, unsigned windowLength)
 
 static signalVector *downsampleBurst(const signalVector &burst)
 {
-  signalVector *in, *out;
+  signalVector in(DOWNSAMPLE_IN_LEN, dnsampler->len());
+  signalVector *out = new signalVector(DOWNSAMPLE_OUT_LEN);
+  memcpy(in.begin(), burst.begin(), DOWNSAMPLE_IN_LEN * 2 * sizeof(float));
 
-  in = new signalVector(DOWNSAMPLE_IN_LEN, dnsampler->len());
-  out = new signalVector(DOWNSAMPLE_OUT_LEN);
-  memcpy(in->begin(), burst.begin(), DOWNSAMPLE_IN_LEN * 2 * sizeof(float));
-
-  if (dnsampler->rotate((float *) in->begin(), DOWNSAMPLE_IN_LEN,
+  if (dnsampler->rotate((float *) in.begin(), DOWNSAMPLE_IN_LEN,
                         (float *) out->begin(), DOWNSAMPLE_OUT_LEN) < 0) {
     delete out;
     out = NULL;
   }
 
-  delete in;
   return out;
 };
 
@@ -1959,7 +1557,6 @@ static int detectGeneralBurst(const signalVector &rxBurst,
 {
   int rc, start, len;
   bool clipping = false;
-  signalVector *corr;
 
   if ((sps != 1) && (sps != 4))
     return -SIGERR_UNSUPPORTED;
@@ -1975,12 +1572,10 @@ static int detectGeneralBurst(const signalVector &rxBurst,
 
   start = target - head - 1;
   len = head + tail;
-  corr = new signalVector(len);
+  signalVector corr(len);
 
-  rc = detectBurst(rxBurst, *corr, sync,
+  rc = detectBurst(rxBurst, corr, sync,
                    thresh, sps, &amp, &toa, start, len);
-  delete corr;
-
   if (rc < 0) {
     return -SIGERR_INTERNAL;
   } else if (!rc) {
@@ -2259,7 +1854,6 @@ SoftVector *demodAnyBurst(const signalVector &burst, int sps, complex amp,
 
 bool sigProcLibSetup()
 {
-  initTrigTables();
   generateSincTable();
   initGMSKRotationTables();
 

Transceiver52M/sigProcLib.h

@@ -65,18 +65,12 @@ signalVector *modulateBurst(const BitVector &wBurst,
                             int guardPeriodLength,
                             int sps, bool emptyPulse = false);
 
-signalVector *modulateBurstLaurent4(const BitVector &wBurst);
-signalVector *modulateBurstLaurent2(const BitVector &wBurst);
-signalVector *modulateBurstLaurent1(const BitVector &wBurst);
-signalVector *modulateBurstNCO(const BitVector &wBurst);
-
 /** 8-PSK modulate a burst of bits */
 signalVector *modulateEdgeBurst(const BitVector &bits,
                                 int sps, bool emptyPulse = false);
 
 /** Generate a EDGE burst with random payload - 4 SPS (625 samples) only */
 signalVector *generateEdgeBurst(int tsc);
-signalVector *shapeEdgeBurst(const signalVector &symbols);
 
 /** Generate an empty burst - 4 or 1 SPS */
 signalVector *generateEmptyBurst(int sps, int tn);

configure.ac

@@ -18,12 +18,15 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 dnl
 
-AC_INIT(openbts,P2.8TRUNK)
+AC_INIT([osmo-trx],
+	m4_esyscmd([./git-version-gen .tarball-version]),
+	[openbsc@lists.osmocom.org])
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([Transceiver52M/Makefile.am])
-AC_CONFIG_AUX_DIR([.])	
+AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_MACRO_DIR([config])
 AM_CONFIG_HEADER(config.h)
+AC_CONFIG_TESTDIR(tests)
 
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
@@ -34,7 +37,12 @@ AM_INIT_AUTOMAKE([subdir-objects])
 dnl Linux kernel KBuild style compile messages
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
+dnl include release helper
+RELMAKE='-include osmo-release.mk'
+AC_SUBST([RELMAKE])
+
 AM_PROG_AS
+AC_PROG_CC
 AC_PROG_CXX
 AX_CXX_COMPILE_STDCXX_11
 AC_PROG_LN_S
@@ -42,6 +50,13 @@ AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_PATH_PROG([RM_PROG], [rm])
 
+dnl check for pkg-config (explained in detail in libosmocore/configure.ac)
+AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no)
+if test "x$PKG_CONFIG_INSTALLED" = "xno"; then
+        AC_MSG_WARN([You need to install pkg-config])
+fi
+PKG_PROG_PKG_CONFIG([0.20])
+
 AC_LIBTOOL_WIN32_DLL
 AC_ENABLE_SHARED	dnl do build shared libraries
 AC_DISABLE_STATIC	dnl don't build static libraries
@@ -59,11 +74,37 @@ AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_C_BIGENDIAN
 
+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(
+		[--enable-sanitize],
+		[Compile with address sanitizer enabled],
+	)],
+	[sanitize=$enableval], [sanitize="no"])
+if test x"$sanitize" = x"yes"
+then
+	CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined"
+	LDFLAGS="$LDFLAGS -fsanitize=address -fsanitize=undefined"
+fi
+
+AC_ARG_WITH(uhd, [
+    AS_HELP_STRING([--with-uhd],
+        [enable UHD based transceiver])
+])
+
 AC_ARG_WITH(usrp1, [
     AS_HELP_STRING([--with-usrp1],
         [enable USRP1 gnuradio based transceiver])
 ])
 
+AC_ARG_WITH(lms, [
+    AS_HELP_STRING([--with-lms],
+        [enable LimeSuite gnuradio based transceiver])
+])
+
 AC_ARG_WITH(singledb, [
     AS_HELP_STRING([--with-singledb],
         [enable single daughterboard use on USRP1])
@@ -97,7 +138,11 @@ AS_IF([test "x$with_usrp1" = "xyes"], [
     PKG_CHECK_MODULES(USRP, usrp >= 3.3)
 ])
 
-AS_IF([test "x$with_usrp1" != "xyes"],[
+AS_IF([test "x$with_lms" = "xyes"], [
+    PKG_CHECK_MODULES(LMS, LimeSuite)
+])
+
+AS_IF([test "x$with_uhd" != "xno"],[
     PKG_CHECK_MODULES(UHD, uhd >= 003.011,
         [AC_DEFINE(USE_UHD_3_11, 1, UHD version 3.11.0 or higher)],
         [PKG_CHECK_MODULES(UHD, uhd >= 003.009,
@@ -105,8 +150,6 @@ AS_IF([test "x$with_usrp1" != "xyes"],[
             [PKG_CHECK_MODULES(UHD, uhd >= 003.005)]
         )]
     )
-    AC_DEFINE(USE_UHD, 1, All UHD versions)
-    PKG_CHECK_MODULES(FFTWF, fftw3f)
 ])
 
 AS_IF([test "x$with_singledb" = "xyes"], [
@@ -148,26 +191,40 @@ dnl Check if the compiler supports runtime SIMD detection
 CHECK_BUILTIN_SUPPORT([__builtin_cpu_supports],
   [Runtime SIMD detection will be disabled])
 
-AM_CONDITIONAL(USRP1, [test "x$with_usrp1" = "xyes"])
+AM_CONDITIONAL(DEVICE_UHD, [test "x$with_uhd" != "xno"])
+AM_CONDITIONAL(DEVICE_USRP1, [test "x$with_usrp1" = "xyes"])
+AM_CONDITIONAL(DEVICE_LMS, [test "x$with_lms" = "xyes"])
 AM_CONDITIONAL(ARCH_ARM, [test "x$with_neon" = "xyes" || test "x$with_neon_vfpv4" = "xyes"])
 AM_CONDITIONAL(ARCH_ARM_A15, [test "x$with_neon_vfpv4" = "xyes"])
 
-AC_CHECK_LIB(sqlite3, sqlite3_open, , AC_MSG_ERROR(sqlite3 is not available))
-
 PKG_CHECK_MODULES(LIBUSB, libusb-1.0)
-PKG_CHECK_MODULES(SQLITE3, sqlite3)
+PKG_CHECK_MODULES(FFTWF, fftw3f)
 
 AC_CHECK_HEADER([boost/config.hpp],[],
     [AC_MSG_ERROR([boost/config.hpp not found, install e.g. libboost-dev])])
 
+AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
+AC_MSG_RESULT([CFLAGS="$CFLAGS"])
+AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"])
+AC_MSG_RESULT([LDFLAGS="$LDFLAGS"])
+
 dnl Output files
 AC_CONFIG_FILES([\
     Makefile \
     CommonLibs/Makefile \
     GSM/Makefile \
     Transceiver52M/Makefile \
-    Transceiver52M/arm/Makefile \
-    Transceiver52M/x86/Makefile \
+    Transceiver52M/arch/Makefile \
+    Transceiver52M/arch/common/Makefile \
+    Transceiver52M/arch/arm/Makefile \
+    Transceiver52M/arch/x86/Makefile \
+    Transceiver52M/device/Makefile \
+    Transceiver52M/device/uhd/Makefile \
+    Transceiver52M/device/usrp1/Makefile \
+    Transceiver52M/device/lms/Makefile \
+    tests/Makefile \
+    tests/CommonLibs/Makefile \
+    tests/Transceiver52M/Makefile \
 ])
 
 AC_OUTPUT

contrib/jenkins.sh

@@ -1,7 +1,87 @@
 #!/bin/sh
 set -ex
+
+substr() { [ -z "${2##*$1*}" ]; }
+
+#apt-get install qemu qemu-user-static qemu-system-arm debootstrap fakeroot proot
+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 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 "$@"
+}
+
+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
+
+                OSMOTRX_DIR="$PWD" # we assume we are called as contrib/jenkins.sh
+                ROOTFS_PREFIX="${ROOTFS_PREFIX:-$HOME}"
+                ROOTFS="${ROOTFS_PREFIX}/qemu-img"
+                mkdir -p "${ROOTFS_PREFIX}"
+
+                # Prepare chroot:
+                if [ ! -d "$ROOTFS" ]; then
+                        mkdir -p "$ROOTFS"
+                        if [ "x${USE_DEBOOTSTRAP}" = "x1" ]; then
+                                fakeroot qemu-debootstrap --foreign --include="linux-image-armmp-lpae" --arch=armhf stretch "$ROOTFS" http://ftp.de.debian.org/debian/
+                                # Hack to avoid debootstrap trying to mount /proc, as it will fail with "no permissions" and anyway proot takes care of it:
+                                sed -i "s/setup_proc//g" "$ROOTFS/debootstrap/suite-script"
+                                mychroot /debootstrap/debootstrap --second-stage --verbose http://ftp.de.debian.org/debian/
+                        else
+                                YESTERDAY=$(python -c 'import datetime ; print((datetime.datetime.now() - datetime.timedelta(days=1)).strftime("%Y%m%d"))')
+                                wget -nc -q "https://uk.images.linuxcontainers.org/images/debian/stretch/armhf/default/${YESTERDAY}_22:42/rootfs.tar.xz"
+                                tar -xf rootfs.tar.xz -C "$ROOTFS/" || true
+                                echo "nameserver 8.8.8.8" > "$ROOTFS/etc/resolv.conf"
+                        fi
+                        mychroot -b /dev apt-get update
+                        mychroot apt-get -y install build-essential dh-autoreconf pkg-config libuhd-dev libusb-1.0-0-dev libusb-dev git libtalloc-dev libgnutls28-dev stow
+                fi
+                # Run jenkins.sh inside the chroot:
+                INSIDE_CHROOT=1 mychroot_nocwd \
+                 -w /osmo-trx \
+                 -b "$OSMOTRX_DIR:/osmo-trx" \
+                 -b "$(which osmo-clean-workspace.sh):/usr/bin/osmo-clean-workspace.sh" \
+                 -b "$(which osmo-build-dep.sh):/usr/bin/osmo-build-dep.sh" \
+                 -b "$(which osmo-deps.sh):/usr/bin/osmo-deps.sh" \
+                  ./contrib/jenkins.sh
+                exit 0
+        fi
+fi
+
+mkdir "$deps" || true
+
+osmo-build-dep.sh libosmocore "" "--enable-sanitize --disable-doxygen --disable-pcsc"
+osmo-build-dep.sh libusrp
+
+export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
+export LD_LIBRARY_PATH="$inst/lib"
+
+set +x
+echo
+echo
+echo
+echo " =============================== osmo-trx ==============================="
+echo
+set -x
+
+cd "$base"
 autoreconf --install --force
-./configure
+./configure --enable-sanitize --with-uhd --with-usrp1 $INSTR
 $MAKE $PARALLEL_MAKE
 $MAKE check \
   || cat-testlogs.sh
+
+osmo-clean-workspace.sh

debian/changelog

@@ -1,3 +1,292 @@
+osmo-trx (0.4.0) unstable; urgency=medium
+
+  [ Neels Hofmeyr ]
+  * jenkins: use osmo-clean-workspace.sh before and after build
+
+  [ Harald Welte ]
+  * SocketsTest: Fix printing of non-nul-terminated string
+  * Revert "debian: Remove osmo-trx-usrp1 until we can build libusrp1.deb"
+  * debian/control: Remove "Maintainer" from binary package section
+  * debian/rules: Make sure we always require libusrp
+  * debian: Ensure USRP1 firmware is part of osmo-trx-usrp1
+  * debian/control: Add build dependency to libusrp-dev
+  * update .gitignore for new executable names
+  * osmo-trx: s/GSM Core Address/GSM BTS Address/
+
+  [ Piotr Krysik ]
+  * UHDDevice.cpp: add USRP B205mini support
+
+  [ Max ]
+  * Mark release target as virtual
+  * Remove outdated references to OpenBTS
+  * Remove unused headers
+  * Update installation instructions
+  * Update legal disclaimer
+  * Update license notes
+  * tests: null-terminate buffer
+
+  [ Pau Espin Pedrol ]
+  * cosmetic: Remove trailing whitespace
+  * Logger: Stop using Log.Alarms.Max from config
+  * Logger: Stop using Log.File and Log.Level from config
+  * Drop use of ConfigurationTable gConfig
+  * Remove Configuration module and libsqlite dependency
+  * cosmetic: AUTHORS: fix trailing whitespace
+  * Set up GNU Autotest infrastructure
+  * tests: InterThread: adapt to have reproducible output and enable autotest
+  * tests: Timeval: adapt to have reproducible output and enable autotest
+  * tests: Log: adapt to have reproducible output and enable autotest
+  * Sockets.cpp: Fix initialization of UDD socket
+  * tests: Sockets: adapt to have reproducible output and enable autotest
+  * utils/convolvtest: Remove uneeded libosmocore dependency
+  * Move ARCH_LA to Makefile.common
+  * tests: Migrate convtest util to autotest infrastructure
+  * arm/convert.c: Fix compilation error
+  * arm/convert.c: Add missing convert_init implementation
+  * .gitignore: Add missing test related files
+  * Remove UDDSocket class
+  * tests: SocketTests: Pick OS-assigned instead of setting one manually
+  * tests: SocketsTest: Avoid hang forever if test fails
+  * tests: SocketsTest: Fail test on write fail
+  * tests: TimevalTest: refactor and avoid double comparison
+  * contrib/jenkins.sh: Use qemu+proot+debootstrap to run tests with ARM instruction set
+  * tests: convolve: Disable due to difference in output in different archs
+  * Remove unneeded libdl dependency
+  * Fix whitespace
+  * Add support to set Rx/TxAntenna
+  * UHDDevice: Initialize async_event_thrd in constructor
+  * Logger: Drop unused gLogEarly
+  * Logger: Remove unused logging macros
+  * Logger: get rid of alarm APIs
+  * Logger: Drop syslog support
+  * Logger: Drop support to log into file
+  * Logger: Remove unused includes
+  * Logger: Remove gLogToConsole flag
+  * configure.ac: Check for pkg-config
+  * Depend on libosmocore
+  * osmo-trx: set up signals using libosmocore helpers
+  * osmo-trx: Set up talloc ctx
+  * debian: Depend on libtalloc and libosmocore
+  * Add initial support for logging, vty, ctrl
+  * Logger: Use libosmocore logging system
+  * osmo-trx.cpp: Move trx start and stop to helper functions
+  * Move enums required by VTY to a separate header
+  * vty: Implement VTY cfg parsing for current parameters
+  * doc: Add sample cfg file for LimeSDR
+  * osmo-trx: Use VTY cfg structures while still allowing cmd line options
+  * osmo-trx: Re-introduce -l cmd line parameter
+  * Makefile.am: Avoid using subdir if arch is not required
+  * Build Transceiver52M/common as an .la lib
+  * use osmo_init_logging2()
+  * tests: Makefile.am: Fix typo in include path
+  * configure.ac: Add --enable-sanitize option
+  * Move arch specific fiels to arch subdir
+  * Move device specific files to device subdir
+  * Change configure define USRP1 to DEVICE_USRP1
+  * Move device specific code out of radioInterface
+  * Transceiver: Move device specific code to radioDevice class
+  * Build one osmo-trx binary for each device support enabled
+  * Logger: Print correct source file and line number
+  * Transceiver: log timing info of stale bursts
+  * build: Fix make distcheck
+  * build: More OBS build failure fixes
+  * jenkins.sh: Enable build of osmo-trx-usrp1
+  * debian: Remove osmo-trx-usrp1 until we can build libusrp1.deb
+  * debian: Fix OBS build
+  * build: Fix OBS build for ARM
+  * git-version-gen: Take into account tags not in master
+
+  [ Alexander Huemer ]
+  * Unbreak `./configure --with-usrp1` build
+  * Fix USRP1 build with support for setting Rx/TxAntenna
+
+  [ Alexander Couzens ]
+  * jenkins.sh: fix the download url if the qemu image wasn't setup
+  * jenkins.sh: cleanup always the workspace
+  * jenkins.sh: change qemu-img default location to $HOME/qemu-img instead of /opt/qemu-img
+
+  [ Vadim Yanitskiy ]
+  * Transceiver.cpp: use a define for the MAX_PACKET_LENGTH
+  * Transceiver.cpp: properly zero-terminate received commands
+  * Transceiver.cpp: use pointer arithmetics for CMD parsing
+  * Transceiver.cpp: fix incorrect format string for SETTSC
+  * Transceiver.cpp: prevent out-of-range array access
+
+  [ Martin Hauke ]
+  * configure.ac: Fix typo
+
+  [ Philipp Maier ]
+  * doc: add example config for usrp B200 series
+
+ -- Pau Espin Pedrol <pespin@sysmocom.de>  Thu, 03 May 2018 16:23:29 +0200
+
+osmo-trx (0.2.0) unstable; urgency=medium
+
+  [ Alexander Chemeris ]
+  * EDGE: Add support for UmTRX.
+  * Common: Get rid of a compilation warning.
+  * Common: Make sure gLogEarly() log to the same facilities as the normal log.
+  * transceiver: Properly handle MAXDLY.
+  * transceiver: Add an option to generate random Access Bursts.
+  * osmo-trx: Output Rx SPS as a part of configuration output.
+  * transceiver: Do not pass transceiver state struct to function where it's not used.
+  * makefile: Fix build from an external path.
+  * radioDevice: GSMRATE macro must have parentheses around its definition.
+  * uhd: Fix comment.
+  * radioInterface: Initialize power scale with a meaningful default.
+  * transceiver: Log channel number in DEBUG output of demoded bursts.
+  * transceiver: Add an option to emulate a RACH delay in random filler mode.
+  * UHD: Initial LimeSDR support.
+  * CommonLibs: Remove unused files.
+  * sigProcLib: Typo sybols -> symbols
+  * radioBuffer: Remove extra ; at the end of inline function definitions.
+  * sigProcLib: Fix documentation, sync argument names in .cpp and .h files.
+  * sigProcLib: make energyDetect() simpler by returning actual energy.
+  * sigProcLib: Rename demodulateBurst() to demodGmskBurst() for clarity.
+  * sigProcLib: Slice SoftVector instead of signalVector for GMSK demod.
+  * Call vectorSlicer() right before packing bits for transmission to osmo-bts.
+  * CommonLibs: Print soft bits with less confidence to console when printing a soft vector.
+  * BitVector: Remove convolutional codec - we don't use it in osmo-trx.
+  * BitVector: Convert SoftVector from 0..1 to -1..+1 soft bits.
+  * signalVector: Implement segment().
+  * vector: Introduce segmentMove() method to move data inside of a vector.
+  * vector: Introduce shrink() function to shrink vector size without loosing data.
+  * Move CorrType type from Transceiver to sigProcLib.
+  * sigProcLib: rename signalError type to SignalError.
+  * Move Transceiver::detectBurst() to sigProcLib to make it reusable.
+  * Move BURST_THRESH from Transceiver.cpp to sigProcLib.h to make it reusable.
+  * sigProcLib: Add operator<< to print CorrType to a string.
+  * sigProcLib.h: Fix whitespaces. No non-whitespace changes.
+  * Move Transceiver::demodulate() to sigProcLib to make it reusable.
+  * sigProcLib: constify signalVector arguments for detectBurst() functions.
+  * sigProcLib: Constify demodulation functions burst argument.
+  * sigProcLib: Fix number of tail bits in random Normal Bursts and zero Stealing Bits.
+  * Configuration: Variables allocated with 'new' must be freed with 'delete'.
+  * BitVector: Remove Generator class.
+  * PRBS: a Pseudo-random binary sequence (PRBS) generator class.
+
+  [ Tom Tsou ]
+  * EDGE: Fix USRP B210 device support
+  * uhd: Correct timing alignment in 8-PSK and GMSK downlink bursts
+  * EDGE: Fix demodulation slicer input
+  * common: Restrict UDP binding to localhost only
+  * common: Add mandatory length field to UDP receive calls
+  * uhd: Update default E3XX settings
+  * uhd: Set default Tx sampling to 4 sps
+  * uhd: Make device offset check a private method
+  * uhd: Set minimum UHD version requirement for E3XX
+  * sigproc: Expand RACH, TSC, and EDGE correlation windows
+  * transceiver: Do not report error on SETTSC when radio is on
+  * transceiver: Add Rx samples-per-symbol option
+  * radioInterface: Convert diversity argument to general type
+  * iface: Add inner ring-buffer implementation
+  * mcbts: Add multi-ARFCN channelizing filters
+  * mcbts: Add multi-ARFCN radio support
+  * sigproc: Adjust burst detection threshold criteria
+  * egprs: Enable 8-PSK length vectors on the Tx interface
+  * egprs: Enable 8-PSK burst detection when EDGE is enabled
+  * transceiver: Remove HANDOVER warnings
+  * mcbts: Allow out of order channel setup
+  * radioInterface: Fix multi-channel buffer index bug
+  * uhd: Add command line option for GPS reference
+  * transceiver: Fix mixed GSMK / 8-PSK transmission
+  * transceiver: Fix 4 SPS receive TOA value
+  * sigproc: Fix missing 8-PSK tail symbols
+  * uhd: Update USRP2/N200/N210 for 4 SPS Rx
+  * sigproc: Match differential GMSK start/end bits to tail bits
+  * uhd: Add missing B200 sample timing for 4 SPS receive
+  * transceiver: Fix command build warning
+  * uhd: Set minimum supported version to 3.9.0
+  * uhd: Add X300 sample timing for 4 SPS
+  * Revert "uhd: Set minimum supported version to 3.9.0"
+  * uhd: Add support for UHD-3.11 logging control
+  * uhd: Increase MC-BTS FPGA clock rate to 51.2 MHz
+  * Resampler: Fix initialization return checking
+  * sigProcLib: Remove unreachable code and no-effect checks
+  * sigProcLib: Check return status on downsampling
+  * sigProcLib: Fix negative value check on unsigned value
+  * Resampler: Fix non-array delete for filter taps
+  * Transceiver: Remove unsigned negative compares
+  * Configuration: Fix const and signedness compile warnings
+  * config: Remove OpenBTS style sqlite configuration
+  * radioInterface: Remove UmTRX 'diversity' option
+  * build: Require and check for gcc C++11 support
+  * uhd: Use map container for for device parameter access
+  * sigProcLib: Remove unused functions from public interface
+  * uhd: Add non-UmTRX channel swap support
+  * uhd: Fix Tx-RX timing offset setting
+  * uhd: Fix USRP2/N200/N210 device detection
+  * transceiver: Fix POWEROFF crash on USRP2/N200/X300 devices
+  * sigProcLib: Fix complex/real vector flag in Laurent modulator
+  * sigProcLib: Remove heap based signal vector allocations
+  * common: Declare explicit Vector move constructor
+  * sigProcLib: Remove trigonometric tables
+  * sigProcLib: Use explicit NaN check in sinc table generation
+  * sigProcLib: Replace dynamically allocated resampling buffers
+  * sigProcLib: Specify standard namespace for isnan()
+  * uhd: Always specify samples-per-symbol for device lookup
+  * LimeSDR: set approximate tx offset value to make GSM work
+
+  [ Neels Hofmeyr ]
+  * add basic .gitignore
+  * configure.ac: check for boost/config.hpp header
+  * The INSTALL file is being overwritten by autoreconf, but it is committed as empty file. As a result, the INSTALL file always shows as modified. Instead, remove INSTALL from git and ignore it.
+  * add contrib/jenkins.sh, for gerrit build bot
+
+  [ pierre.baudry ]
+  * transceiver: Fix mismatched allocations and deallocations
+
+  [ Holger Hans Peter Freyther ]
+  * debian: Require fftw3 header files for osmo-trx
+
+  [ Max ]
+  * Add gerrit settings
+  * Integrate Debian packaging changes
+  * Remove embedded sqlite3
+  * Fix building against sqlite3
+  * Add autoconf-archive to dependencies
+  * debian: remove obsolete dependency
+  * deb: remove unused dependency
+  * Remove redundant explicit dependency
+  * Use release helper from libosmocore
+
+  [ Ruben Undheim ]
+  * Do not embed sqlite3 when building
+
+  [ Philipp Maier ]
+  * buildenv: Turn off native architecture builds
+  * cosmetic: Make parameter lists uniform
+  * Add test program to verify convolution implementation
+  * ssedetect: Add runtime CPU detection
+  * cosmetic: remove code duplication
+  * buildenv: Make build CPU invariant
+  * buildenv: Split up SSE3 and SSE4.1 code
+  * cosmetic: Add info about SSE support
+
+  [ Vadim Yanitskiy ]
+  * buildenv: correct the ax_sse macro description
+  * buildenv: actually strip unused cpuid functionality
+  * buildenv: fix build on systems without SIMD support
+  * buildenv: cosmetic changes
+  * buildenv: check for __builtin_cpu_supports call support
+  * ssedetect: call __builtin_cpu_supports() only if supported
+
+  [ Pau Espin Pedrol ]
+  * cosmetic: transciever: Remove trailing whitespaces
+  * transceiver: Avoid sending clock indications when trx is not powered on
+  * Add -j option to bind to specific address
+
+  [ ignasj ]
+  * LimeSDR: Change device detection to work with USB and PCIe versions
+  * LimeSDR: change tx window type to TX_WINDOW_FIXED
+  * LimeSDR: Fix sample value range
+
+  [ Harald Welte ]
+  * Add '-t' command line option to enable SCHED_RR
+  * Import git-version-gen and update AC_INIT()
+
+ -- Harald Welte <laforge@gnumonks.org>  Sat, 28 Oct 2017 17:52:32 +0200
+
 osmo-trx (0.1.9) trusty; urgency=medium
 
   * Ask Ivan, really

debian/control

@@ -5,23 +5,37 @@ Maintainer: Ivan Klyuchnikov <ivan.kluchnikov@fairwaves.ru>
 Build-Depends: debhelper (>= 9),
                autotools-dev,
                autoconf-archive,
-               libdbd-sqlite3,
-               libsqlite3-dev,
                pkg-config,
                dh-autoreconf,
                libuhd-dev,
                libusb-1.0-0-dev,
                libboost-all-dev,
-               libfftw3-dev
+               libfftw3-dev,
+               libtalloc-dev,
+               libusrp-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
 Homepage: https://projects.osmocom.org/projects/osmotrx
 
 Package: osmo-trx
+Depends: osmo-trx-uhd
+Architecture: all
+Description: Metapackage for osmo-trx-uhd
+
+Package: osmo-trx-dbg
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libdbd-sqlite3
-Description: SDR transceiver that implements Layer 1 of a GSM BTS
+Section: debug
+Priority: extra
+Depends: osmo-trx-uhd (= ${binary:Version}), osmo-trx-usrp1 (= ${binary:Version}), ${misc:Depends}
+Description: Debug symbols for the osmo-trx-*
+ Make debugging possible
+
+Package: osmo-trx-uhd
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: SDR transceiver that implements Layer 1 of a GSM BTS (UHD)
  OsmoTRX is a software-defined radio transceiver that implements the Layer 1
  physical layer of a BTS comprising the following 3GPP specifications:
  .
@@ -37,10 +51,21 @@ Description: SDR transceiver that implements Layer 1 of a GSM BTS
  between different telecommunication associations for developing new
  generations of mobile phone networks. (post-2G/GSM)
 
-Package: osmo-trx-dbg
+Package: osmo-trx-usrp1
 Architecture: any
-Section: debug
-Priority: extra
-Depends: osmo-trx (= ${binary:Version}), ${misc:Depends}
-Description: Debug symbols for the osmo-trx
- Make debugging possible
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: SDR transceiver that implements Layer 1 of a GSM BTS (USRP1)
+ OsmoTRX is a software-defined radio transceiver that implements the Layer 1
+ physical layer of a BTS comprising the following 3GPP specifications:
+ .
+ TS 05.01 "Physical layer on the radio path"
+ TS 05.02 "Multiplexing and Multiple Access on the Radio Path"
+ TS 05.04 "Modulation"
+ TS 05.10 "Radio subsystem synchronization"
+ .
+ In this context, BTS is "Base transceiver station". It's the stations that
+ connect mobile phones to the mobile network.
+ .
+ 3GPP is the "3rd Generation Partnership Project" which is the collaboration
+ between different telecommunication associations for developing new
+ generations of mobile phone networks. (post-2G/GSM)

debian/copyright

@@ -52,20 +52,6 @@ Copyright: 2005-2009 United States Government as represented by
                      the U.S. Army Research Laboratory.
 License: BSD-3-clause
 
-Files: CommonLibs/sqlite3util.cpp
-Copyright: 2010 Kestrel Signal Processing Inc.
-License: none
- No license described for file.
-Comment: In the previous version of the file in the git repository
- at upstream it is written:
-   Written by David A. Burgess, Kestrel Signal Processing, Inc., 2010
-   The author disclaims copyright to this source code.
- In the git log, this is written:
-   I do not claim any copyright over this change, as it's very basic.
-   Looking forward to see it merged into mainline.
- See revision e766abbf82f02473038a83fd2f78befd08544cab at
- https://github.com/osmocom/osmo-trx
-
 Files: debian/*
 Copyright: 2015 Ruben Undheim <ruben.undheim@gmail.com>
 License: GPL-3+

debian/osmo-trx-uhd.install

@@ -0,0 +1 @@
+/usr/bin/osmo-trx-uhd

debian/osmo-trx-usrp1.install

@@ -0,0 +1,3 @@
+/usr/bin/osmo-trx-usrp1
+/usr/share/usrp/rev2/std_inband.rbf
+/usr/share/usrp/rev4/std_inband.rbf

debian/osmo-trx.install

@@ -1 +0,0 @@
-/usr/bin/osmo-trx

debian/rules

@@ -8,5 +8,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
 
+override_dh_auto_configure:
+	dh_auto_configure -- --with-usrp1
+
 override_dh_strip:
 	dh_strip --dbg-package=osmo-trx-dbg

doc/examples/osmo-trx-limesdr.cfg

@@ -0,0 +1,20 @@
+log stderr
+  logging filter all 1
+  logging color 1
+  logging print category 1
+  logging timestamp 1
+  logging level all info
+!
+line vty
+ no login
+!
+trx
+ bind-ip 127.0.0.1
+ remote-ip 127.0.0.1
+ base-port 5700
+ egprs disable
+ tx-sps 4
+ rx-sps 4
+ chan 0
+  tx-path BAND1
+  rx-path LNAW

doc/examples/osmo-trx-umtrx.cfg

@@ -0,0 +1,22 @@
+log stderr
+  logging filter all 1
+  logging color 1
+  logging print category 1
+  logging timestamp 1
+  logging level all info
+!
+line vty
+ no login
+!
+trx
+ bind-ip 127.0.0.1
+ remote-ip 127.0.0.1
+ base-port 5700
+ dev-args addr=192.168.10.2,pa=NONE,pa_power_max_dbm=23,fifo_ctrl_window=0,status_port=12345
+ egprs disable
+ tx-sps 4
+ rx-sps 4
+ rssi-offset 38
+ rt-prio 18
+ chan 0
+ chan 1

doc/examples/osmo-trx-usrp_b200.cfg

@@ -0,0 +1,20 @@
+log stderr
+  logging filter all 1
+  logging color 1
+  logging print category 1
+  logging timestamp 1
+  logging level all info
+!
+line vty
+ no login
+!
+trx
+ bind-ip 127.0.0.1
+ remote-ip 127.0.0.1
+ base-port 5700
+ egprs disable
+ tx-sps 4
+ rx-sps 4
+ clock-ref external
+ chan 0
+

git-version-gen

@@ -0,0 +1,150 @@
+#!/bin/sh
+# Print a version string.
+scriptversion=2010-01-28.01
+
+# Copyright (C) 2007-2010 Free Software Foundation, Inc.
+#
+# 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 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
+# It may be run two ways:
+# - from a git repository in which the "git describe" command below
+#   produces useful output (thus requiring at least one signed tag)
+# - from a non-git-repo directory containing a .tarball-version file, which
+#   presumes this script is invoked like "./git-version-gen .tarball-version".
+
+# In order to use intra-version strings in your project, you will need two
+# separate generated version string files:
+#
+# .tarball-version - present only in a distribution tarball, and not in
+#   a checked-out repository.  Created with contents that were learned at
+#   the last time autoconf was run, and used by git-version-gen.  Must not
+#   be present in either $(srcdir) or $(builddir) for git-version-gen to
+#   give accurate answers during normal development with a checked out tree,
+#   but must be present in a tarball when there is no version control system.
+#   Therefore, it cannot be used in any dependencies.  GNUmakefile has
+#   hooks to force a reconfigure at distribution time to get the value
+#   correct, without penalizing normal development with extra reconfigures.
+#
+# .version - present in a checked-out repository and in a distribution
+#   tarball.  Usable in dependencies, particularly for files that don't
+#   want to depend on config.h but do want to track version changes.
+#   Delete this file prior to any autoconf run where you want to rebuild
+#   files to pick up a version string change; and leave it stale to
+#   minimize rebuild time after unrelated changes to configure sources.
+#
+# It is probably wise to add these two files to .gitignore, so that you
+# don't accidentally commit either generated file.
+#
+# Use the following line in your configure.ac, so that $(VERSION) will
+# automatically be up-to-date each time configure is run (and note that
+# since configure.ac no longer includes a version string, Makefile rules
+# should not depend on configure.ac for version updates).
+#
+# AC_INIT([GNU project],
+#         m4_esyscmd([build-aux/git-version-gen .tarball-version]),
+#         [bug-project@example])
+#
+# Then use the following lines in your Makefile.am, so that .version
+# will be present for dependencies, and so that .tarball-version will
+# exist in distribution tarballs.
+#
+# BUILT_SOURCES = $(top_srcdir)/.version
+# $(top_srcdir)/.version:
+#	echo $(VERSION) > $@-t && mv $@-t $@
+# dist-hook:
+#	echo $(VERSION) > $(distdir)/.tarball-version
+
+case $# in
+    1) ;;
+    *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;;
+esac
+
+tarball_version_file=$1
+nl='
+'
+
+# First see if there is a tarball-only version file.
+# then try "git describe", then default.
+if test -f $tarball_version_file
+then
+    v=`cat $tarball_version_file` || exit 1
+    case $v in
+	*$nl*) v= ;; # reject multi-line output
+	[0-9]*) ;;
+	*) v= ;;
+    esac
+    test -z "$v" \
+	&& echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2
+fi
+
+if test -n "$v"
+then
+    : # use $v
+elif
+       v=`git tag -l --sort=v:refname | grep "^[0-9]*.[0-9]*.[0-9]*$" | tail -n 1 2>/dev/null` \
+    && case $v in
+	 [0-9]*) ;;
+	 v[0-9]*) ;;
+	 *) (exit 1) ;;
+       esac
+then
+    # Is this a new git that lists number of commits since the last
+    # tag or the previous older version that did not?
+    #   Newer: v6.10-77-g0f8faeb
+    #   Older: v6.10-g0f8faeb
+    case $v in
+	*-*-*) : git describe is okay three part flavor ;;
+	*-*)
+	    : git describe is older two part flavor
+	    # Recreate the number of commits and rewrite such that the
+	    # result is the same as if we were using the newer version
+	    # of git describe.
+	    vtag=`echo "$v" | sed 's/-.*//'`
+	    numcommits=`git rev-list "$vtag"..HEAD | wc -l`
+	    v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
+	    ;;
+    esac
+
+    # Change the first '-' to a '.', so version-comparing tools work properly.
+    # Remove the "g" in git describe's output string, to save a byte.
+    v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
+else
+    v=UNKNOWN
+fi
+
+v=`echo "$v" |sed 's/^v//'`
+
+# Don't declare a version "dirty" merely because a time stamp has changed.
+git status > /dev/null 2>&1
+
+dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
+case "$dirty" in
+    '') ;;
+    *) # Append the suffix only if there isn't one already.
+	case $v in
+	  *-dirty) ;;
+	  *) v="$v-dirty" ;;
+	esac ;;
+esac
+
+# Omit the trailing newline, so that m4_esyscmd can use the result directly.
+echo "$v" | tr -d '\012'
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:

tests/CommonLibs/BitVectorTest.ok

@@ -0,0 +1,8 @@
+15 15 240
+000011110000
+101011110000
+175
+111101010000
+ts=abcdefgh
+tp=0110000101100010011000110110010001100101011001100110011101101000000000
+ts=abcdefgh

tests/CommonLibs/InterthreadTest.cpp

@@ -35,14 +35,20 @@ using namespace std;
 InterthreadQueue<int> gQ;
 InterthreadMap<int,int> gMap;
 
+int q_last_read_val = -1;
+int q_last_write_val;
+int m_last_read_val;
+int m_last_write_val;
+
 void* qWriter(void*)
 {
 	int *p;
 	for (int i=0; i<20; i++) {
 		p = new int;
 		*p = i;
-		COUT("queue write " << *p);
+		CERR("queue write " << *p);
 		gQ.write(p);
+		q_last_write_val = i;
 		if (random()%2) sleep(1);
 	}
 	p = new int;
@@ -56,8 +62,14 @@ void* qReader(void*)
 	bool done = false;
 	while (!done) {
 		int *p = gQ.read();
-		COUT("queue read " << *p);
-		if (*p<0) done=true;
+		CERR("queue read " << *p);
+		if (*p<0) {
+			assert(q_last_read_val == 19 && *p == -1);
+			done = true;
+		} else {
+			assert(q_last_read_val == *p - 1);
+			q_last_read_val = *p;
+		}
 		delete p;
 	}
 	return NULL;
@@ -70,8 +82,9 @@ void* mapWriter(void*)
 	for (int i=0; i<20; i++) {
 		p = new int;
 		*p = i;
-		COUT("map write " << *p);
+		CERR("map write " << *p);
 		gMap.write(i,p);
+		m_last_write_val = i;
 		if (random()%2) sleep(1);
 	}
 	return NULL;
@@ -81,7 +94,9 @@ void* mapReader(void*)
 {
 	for (int i=0; i<20; i++) {
 		int *p = gMap.read(i);
-		COUT("map read " << *p);
+		CERR("map read " << *p);
+		assert(*p == i);
+		m_last_read_val = *p;
 		// InterthreadMap will delete the pointers
 		// delete p;
 	}
@@ -109,6 +124,13 @@ int main(int argc, char *argv[])
 	qWriterThread.join();
 	mapReaderThread.join();
 	mapWriterThread.join();
+
+	assert(q_last_write_val == 19);
+	assert(q_last_read_val == 19);
+	assert(m_last_write_val == 19);
+	assert(m_last_read_val == 19);
+
+	printf("Done\n");
 }
 
 

tests/CommonLibs/InterthreadTest.ok

@@ -0,0 +1 @@
+Done

tests/CommonLibs/LogTest.cpp

@@ -28,42 +28,42 @@
 #include <iterator>
 
 #include "Logger.h"
-#include "Configuration.h"
-
-ConfigurationTable gConfig;
-//ConfigurationTable gConfig("example.config");
-
-void printAlarms()
-{
-    std::ostream_iterator<std::string> output( std::cout, "\n" );
-    std::list<std::string> alarms = gGetLoggerAlarms();
-    std::cout << "# alarms = " << alarms.size() << std::endl;
-    std::copy( alarms.begin(), alarms.end(), output );
+extern "C" {
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/application.h>
+#include <osmocom/core/utils.h>
+#include "debug.h"
 }
 
+#define MYCAT 0
+
 int main(int argc, char *argv[])
 {
-	gLogInit("LogTest","NOTICE",LOG_LOCAL7);
+	struct log_info_cat categories[1];
+	struct log_info linfo;
+	categories[MYCAT] = {
+		"MYCAT",
+		NULL,
+		"Whatever",
+		LOGL_NOTICE,
+		1,
+	};
+	linfo.cat = categories;
+	linfo.num_cat = ARRAY_SIZE(categories);
 
-	LOG(EMERG) << " testing the logger.";
-	LOG(ALERT) << " testing the logger.";
-	LOG(CRIT) << " testing the logger.";
-	LOG(ERR) << " testing the logger.";
-	LOG(WARNING) << " testing the logger.";
-	LOG(NOTICE) << " testing the logger.";
-	LOG(INFO) << " testing the logger.";
-	LOG(DEBUG) << " testing the logger.";
-    std::cout << "\n\n\n";
-    std::cout << "testing Alarms\n";
-    std::cout << "you should see three lines:" << std::endl;
-    printAlarms();
-    std::cout << "----------- generating 20 alarms ----------" << std::endl;
-    for (int i = 0 ; i < 20 ; ++i) {
-        LOG(ALERT) << i;
-    }
-    std::cout << "you should see ten lines with the numbers 10..19:" << std::endl;
-    printAlarms();
+	void *tall_ctx = talloc_named_const(NULL, 1, "OsmoTRX context");
+	msgb_talloc_ctx_init(tall_ctx, 0);
+
+	osmo_init_logging2(tall_ctx, &linfo);
+
+	log_set_use_color(osmo_stderr_target, 0);
+	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_level(osmo_stderr_target, 1);
+
+	Log(MYCAT, LOGL_FATAL, __BASE_FILE__, __LINE__).get() << "testing the logger.";
+	Log(MYCAT, LOGL_ERROR, __BASE_FILE__, __LINE__).get() << "testing the logger.";
+	Log(MYCAT, LOGL_NOTICE, __BASE_FILE__, __LINE__).get() << "testing the logger.";
+	Log(MYCAT, LOGL_INFO, __BASE_FILE__, __LINE__).get() << "testing the logger.";
+	Log(MYCAT, LOGL_DEBUG, __BASE_FILE__, __LINE__).get() << "testing the logger.";
 }
-
-
-

tests/CommonLibs/LogTest.err

@@ -0,0 +1,3 @@
+FATAL testing the logger.
+ERROR testing the logger.
+NOTICE testing the logger.

tests/CommonLibs/Makefile.am

@@ -0,0 +1,46 @@
+include $(top_srcdir)/Makefile.common
+
+AM_CPPFLAGS = -Wall -I$(top_srcdir)/CommonLibs $(STD_DEFINES_AND_INCLUDES) $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) -g
+AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS)
+
+EXTRA_DIST = BitVectorTest.ok \
+             PRBSTest.ok \
+             InterthreadTest.ok \
+             SocketsTest.ok \
+             TimevalTest.ok \
+             VectorTest.ok \
+             LogTest.ok \
+             LogTest.err
+
+noinst_PROGRAMS = \
+	BitVectorTest \
+	PRBSTest \
+	InterthreadTest \
+	SocketsTest \
+	TimevalTest \
+	VectorTest \
+	LogTest
+
+BitVectorTest_SOURCES = BitVectorTest.cpp
+BitVectorTest_LDADD = $(COMMON_LA)
+
+PRBSTest_SOURCES = PRBSTest.cpp
+
+InterthreadTest_SOURCES = InterthreadTest.cpp
+InterthreadTest_LDADD = $(COMMON_LA)
+InterthreadTest_LDFLAGS = -lpthread
+
+SocketsTest_SOURCES = SocketsTest.cpp
+SocketsTest_LDADD = $(COMMON_LA)
+SocketsTest_LDFLAGS = -lpthread
+
+TimevalTest_SOURCES = TimevalTest.cpp
+TimevalTest_LDADD = $(COMMON_LA)
+
+VectorTest_SOURCES = VectorTest.cpp
+VectorTest_LDADD = $(COMMON_LA)
+
+LogTest_SOURCES = LogTest.cpp
+LogTest_LDADD = $(COMMON_LA)
+
+MOSTLYCLEANFILES += testSource testDestination

tests/CommonLibs/SocketsTest.cpp

@@ -30,21 +30,27 @@
 #include "Threads.h"
 #include <stdio.h>
 #include <stdlib.h>
-
+#include <unistd.h>
+#include <signal.h>
 
 static const int gNumToSend = 10;
 
-
-void *testReaderIP(void *)
+static void sigalarm_handler(int foo)
 {
-	UDPSocket readSocket(5934, "localhost", 5061);
-	readSocket.nonblocking();
+	printf("FAIL: test did not run successfully\n");
+	exit(EXIT_FAILURE);
+}
+
+void *testReaderIP(void *param)
+{
+	UDPSocket *readSocket = (UDPSocket *)param;
+	readSocket->nonblocking();
 	int rc = 0;
 	while (rc<gNumToSend) {
-		char buf[MAX_UDP_LENGTH];
-		int count = readSocket.read(buf, MAX_UDP_LENGTH);
+		char buf[MAX_UDP_LENGTH] = { 0 };
+		int count = readSocket->read(buf, MAX_UDP_LENGTH);
 		if (count>0) {
-			COUT("read: " << buf);
+			CERR("read: " << buf);
 			rc++;
 		} else {
 			sleep(2);
@@ -53,51 +59,42 @@ void *testReaderIP(void *)
 	return NULL;
 }
 
-
-
-void *testReaderUnix(void *)
-{
-	UDDSocket readSocket("testDestination");
-	readSocket.nonblocking();
-	int rc = 0;
-	while (rc<gNumToSend) {
-		char buf[MAX_UDP_LENGTH];
-		int count = readSocket.read(buf, MAX_UDP_LENGTH);
-		if (count>0) {
-			COUT("read: " << buf);
-			rc++;
-		} else {
-			sleep(2);
-		}
-	}
-	return NULL;
-}
-
-
 int main(int argc, char * argv[] )
 {
+  int count;
+
+  if (signal(SIGALRM, sigalarm_handler) == SIG_ERR) {
+    perror("signal");
+    exit(EXIT_FAILURE);
+  }
+
+  /* If the test takes longer than 2*gNumToSend seconds, abort it */
+  alarm(2* gNumToSend);
+
+  UDPSocket readSocket("127.0.0.1", 0);
+  UDPSocket socket1("127.0.0.1", 0, "localhost", readSocket.port());
+
+  CERR("socket1: " << socket1.port() << ", readSocket: " << readSocket.port());
 
   Thread readerThreadIP;
-  readerThreadIP.start(testReaderIP,NULL);
-  Thread readerThreadUnix;
-  readerThreadUnix.start(testReaderUnix,NULL);
-
-  UDPSocket socket1(5061, "127.0.0.1",5934);
-  UDDSocket socket1U("testSource","testDestination");
-  
-  COUT("socket1: " << socket1.port());
+  readerThreadIP.start(testReaderIP, &readSocket);
 
   // give the readers time to open
   sleep(1);
 
   for (int i=0; i<gNumToSend; i++) {
-    socket1.write("Hello IP land");	
-	socket1U.write("Hello Unix domain");
-	sleep(1);
+    CERR("write");
+    count = socket1.write("Hello IP land");
+    if (count < 0) {
+      COUT("FAIL: write");
+      exit(EXIT_FAILURE);
+    }
+    sleep(1);
   }
 
   readerThreadIP.join();
-  readerThreadUnix.join();
+
+  printf("Done\n");
 }
 
 // vim: ts=4 sw=4

tests/CommonLibs/SocketsTest.ok

@@ -0,0 +1 @@
+Done