From 105a61e6898ae6c7ba8f4b0f73b56ba0d723bece Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 13 Jun 2018 21:55:09 +0200 Subject: 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 --- Transceiver52M/device/lms/LMSDevice.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Transceiver52M/device/lms/LMSDevice.cpp') 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& tx_paths, + const std::vector& 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); } -- cgit v1.2.3