Change in osmo-trx[master]: lms: Fix support for rx_paths / tx_paths

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Mon Jun 18 09:40:46 UTC 2018


Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9619 )

Change subject: lms: Fix support for rx_paths / tx_paths
......................................................................

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
---
M Transceiver52M/device/lms/LMSDevice.cpp
M Transceiver52M/device/lms/LMSDevice.h
2 files changed, 10 insertions(+), 3 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



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 @@
 #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 @@
 			       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 @@
 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);

-- 
To view, visit https://gerrit.osmocom.org/9619
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie50f854abbc9dcf351cddc052d10206382e1d5d3
Gerrit-Change-Number: 9619
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180618/206351e5/attachment.htm>


More information about the gerrit-log mailing list