aboutsummaryrefslogtreecommitdiffstats
path: root/Transceiver52M/device
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2018-06-13 21:55:09 +0200
committerHarald Welte <laforge@gnumonks.org>2018-06-13 23:46:27 +0200
commit105a61e6898ae6c7ba8f4b0f73b56ba0d723bece (patch)
treed059ccaa5c558cf49a77c86b6675a0d3a69335cc /Transceiver52M/device
parent2407314f2e7cec64b5430d29a163fc23a10f6daf (diff)
lms: Fix support for rx_paths / tx_paths
Before this patch, any configuration in osmo-trx.cfg regarding the rx and tx "antenna" (path) would have been completely ignored, as the radioDevice::make() function would simply drop those arguments to the floor. Change-Id: Ie50f854abbc9dcf351cddc052d10206382e1d5d3
Diffstat (limited to 'Transceiver52M/device')
-rw-r--r--Transceiver52M/device/lms/LMSDevice.cpp9
-rw-r--r--Transceiver52M/device/lms/LMSDevice.h4
2 files changed, 10 insertions, 3 deletions
diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp
index c531a7f..b1f4519 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -40,11 +40,16 @@ constexpr double LMSDevice::masterClockRate;
#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 sps, size_t chans):
+LMSDevice::LMSDevice(size_t sps, size_t chans,
+ const std::vector<std::string>& tx_paths,
+ const std::vector<std::string>& rx_paths):
m_lms_dev(NULL), sps(sps), chans(chans)
{
LOG(INFO) << "creating LMS device...";
+ this->tx_paths = tx_paths;
+ this->rx_paths = rx_paths;
+
m_lms_stream_rx.resize(chans);
m_lms_stream_tx.resize(chans);
@@ -617,5 +622,5 @@ RadioDevice *RadioDevice::make(size_t tx_sps, size_t rx_sps,
const std::vector < std::string > &tx_paths,
const std::vector < std::string > &rx_paths)
{
- return new LMSDevice(tx_sps, chans);
+ return new LMSDevice(tx_sps, chans, tx_paths, rx_paths);
}
diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h
index 7b3479f..ef6d2b4 100644
--- a/Transceiver52M/device/lms/LMSDevice.h
+++ b/Transceiver52M/device/lms/LMSDevice.h
@@ -65,7 +65,9 @@ private:
public:
/** Object constructor */
- LMSDevice(size_t sps, size_t chans);
+ LMSDevice(size_t sps, size_t chans,
+ 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);