<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9619">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lms: Fix support for rx_paths / tx_paths<br><br>Before this patch, any configuration in osmo-trx.cfg regarding the rx<br>and tx "antenna" (path) would have been completely ignored, as the<br>radioDevice::make() function would simply drop those arguments to the<br>floor.<br><br>Change-Id: Ie50f854abbc9dcf351cddc052d10206382e1d5d3<br>---<br>M Transceiver52M/device/lms/LMSDevice.cpp<br>M Transceiver52M/device/lms/LMSDevice.h<br>2 files changed, 10 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/19/9619/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>index c531a7f..b1f4519 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -40,11 +40,16 @@</span><br><span> #define LMS_MIN_BW_SUPPORTED 2.5e6 /* 2.5mHz, minimum supported by LMS */</span><br><span> #define LMS_CALIBRATE_BW_HZ OSMO_MAX(GSM_CARRIER_BW, LMS_MIN_BW_SUPPORTED)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-LMSDevice::LMSDevice(size_t sps, size_t chans):</span><br><span style="color: hsl(120, 100%, 40%);">+LMSDevice::LMSDevice(size_t sps, size_t chans,</span><br><span style="color: hsl(120, 100%, 40%);">+                   const std::vector<std::string>& tx_paths,</span><br><span style="color: hsl(120, 100%, 40%);">+                   const std::vector<std::string>& rx_paths):</span><br><span>    m_lms_dev(NULL), sps(sps), chans(chans)</span><br><span> {</span><br><span>         LOG(INFO) << "creating LMS device...";</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    this->tx_paths = tx_paths;</span><br><span style="color: hsl(120, 100%, 40%);">+ this->rx_paths = rx_paths;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>      m_lms_stream_rx.resize(chans);</span><br><span>       m_lms_stream_tx.resize(chans);</span><br><span> </span><br><span>@@ -617,5 +622,5 @@</span><br><span>                            const std::vector < std::string > &tx_paths,</span><br><span>                               const std::vector < std::string > &rx_paths)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-      return new LMSDevice(tx_sps, chans);</span><br><span style="color: hsl(120, 100%, 40%);">+  return new LMSDevice(tx_sps, chans, tx_paths, rx_paths);</span><br><span> }</span><br><span>diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>index 7b3479f..ef6d2b4 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.h</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>@@ -65,7 +65,9 @@</span><br><span> public:</span><br><span> </span><br><span>    /** Object constructor */</span><br><span style="color: hsl(0, 100%, 40%);">-       LMSDevice(size_t sps, size_t chans);</span><br><span style="color: hsl(120, 100%, 40%);">+  LMSDevice(size_t sps, size_t chans,</span><br><span style="color: hsl(120, 100%, 40%);">+             const std::vector<std::string>& tx_paths,</span><br><span style="color: hsl(120, 100%, 40%);">+           const std::vector<std::string>& rx_paths);</span><br><span> </span><br><span>   /** Instantiate the LMS */</span><br><span>   int open(const std::string &args, int ref, bool swap_channels);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9619">change 9619</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9619"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ie50f854abbc9dcf351cddc052d10206382e1d5d3 </div>
<div style="display:none"> Gerrit-Change-Number: 9619 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>