<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/16847">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lms: Change radiODevice constructor arg name to avoid masking instance attr<br><br>channel number mangling based on multi-arfcn feature being enabled was<br>moved to generic radioDevice() to reuse code. Hence, the generic parent<br>constructor sets this->chans to 1 if multi-arfcn feature is requested.<br>However, LMSDevice constructor argument had same name as the class<br>instance attribute, taking preference. As a result, if multi-arfcn is<br>enabled in LMSDevice, the generic constructor first sets this->chans=1<br>but afterwards LMSDEvice constructor keeps calling .resize() with the<br>argument value "chans" instead of using this->chans.<br><br>Let's rename the argument in all radioDevice child class constructors to<br>avoid potential future bugs in all of them.<br><br>Change-Id: Id6c837e9133f22783dd92a81dfcc493e51bf2d21<br>---<br>M Transceiver52M/device/lms/LMSDevice.cpp<br>M Transceiver52M/device/lms/LMSDevice.h<br>M Transceiver52M/device/uhd/UHDDevice.cpp<br>M Transceiver52M/device/uhd/UHDDevice.h<br>M Transceiver52M/device/usrp1/USRPDevice.cpp<br>M Transceiver52M/device/usrp1/USRPDevice.h<br>6 files changed, 9 insertions(+), 9 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/47/16847/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 3a10983..cb0129a 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -44,10 +44,10 @@</span><br><span> #define LMS_CALIBRATE_BW_HZ OSMO_MAX(GSM_CARRIER_BW, LMS_MIN_BW_SUPPORTED)</span><br><span> #define SAMPLE_BUF_SZ    (1 << 20) /* Size of Rx timestamp based Ring buffer, in bytes */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-LMSDevice::LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chans, double lo_offset,</span><br><span style="color: hsl(120, 100%, 40%);">+LMSDevice::LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset,</span><br><span>                  const std::vector<std::string>& tx_paths,</span><br><span>                  const std::vector<std::string>& rx_paths):</span><br><span style="color: hsl(0, 100%, 40%);">-       RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths),</span><br><span style="color: hsl(120, 100%, 40%);">+     RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths),</span><br><span>         m_lms_dev(NULL), started(false)</span><br><span> {</span><br><span>         LOGC(DDEV, INFO) << "creating LMS device...";</span><br><span>diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>index 003d064..cdba72c 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.h</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>@@ -72,7 +72,7 @@</span><br><span> public:</span><br><span> </span><br><span>    /** Object constructor */</span><br><span style="color: hsl(0, 100%, 40%);">-       LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chans, double lo_offset,</span><br><span style="color: hsl(120, 100%, 40%);">+  LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset,</span><br><span>                const std::vector<std::string>& tx_paths,</span><br><span>                  const std::vector<std::string>& rx_paths);</span><br><span>       ~LMSDevice();</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>index 8bab882..5d267c8 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>@@ -189,10 +189,10 @@</span><br><span> #endif</span><br><span> </span><br><span> uhd_device::uhd_device(size_t tx_sps, size_t rx_sps,</span><br><span style="color: hsl(0, 100%, 40%);">-                   InterfaceType iface, size_t chans, double lo_offset,</span><br><span style="color: hsl(120, 100%, 40%);">+                  InterfaceType iface, size_t chan_num, double lo_offset,</span><br><span>                      const std::vector<std::string>& tx_paths,</span><br><span>                  const std::vector<std::string>& rx_paths)</span><br><span style="color: hsl(0, 100%, 40%);">-      : RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths),</span><br><span style="color: hsl(120, 100%, 40%);">+   : RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths),</span><br><span>         tx_gain_min(0.0), tx_gain_max(0.0),</span><br><span>          rx_gain_min(0.0), rx_gain_max(0.0),</span><br><span>          tx_spp(0), rx_spp(0),</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.h b/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>index 44f7ebb..d485a8e 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>@@ -62,7 +62,7 @@</span><br><span> class uhd_device : public RadioDevice {</span><br><span> public:</span><br><span>   uhd_device(size_t tx_sps, size_t rx_sps, InterfaceType type,</span><br><span style="color: hsl(0, 100%, 40%);">-               size_t chans, double offset,</span><br><span style="color: hsl(120, 100%, 40%);">+                  size_t chan_num, double offset,</span><br><span>              const std::vector<std::string>& tx_paths,</span><br><span>                  const std::vector<std::string>& rx_paths);</span><br><span>      ~uhd_device();</span><br><span>diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>index 03a4f80..766a228 100644</span><br><span>--- a/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>+++ b/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>@@ -61,10 +61,10 @@</span><br><span> const double USRPDevice::masterClockRate = 52.0e6;</span><br><span> </span><br><span> USRPDevice::USRPDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface,</span><br><span style="color: hsl(0, 100%, 40%);">-                       size_t chans, double lo_offset,</span><br><span style="color: hsl(120, 100%, 40%);">+                       size_t chan_num, double lo_offset,</span><br><span>                   const std::vector<std::string>& tx_paths,</span><br><span>                  const std::vector<std::string>& rx_paths):</span><br><span style="color: hsl(0, 100%, 40%);">-             RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths)</span><br><span style="color: hsl(120, 100%, 40%);">+              RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths)</span><br><span> {</span><br><span>   LOGC(DDEV, INFO) << "creating USRP device...";</span><br><span> </span><br><span>diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>index 6dfa5f0..47f2a43 100644</span><br><span>--- a/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>+++ b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>@@ -95,7 +95,7 @@</span><br><span>  public:</span><br><span> </span><br><span>   /** Object constructor */</span><br><span style="color: hsl(0, 100%, 40%);">-  USRPDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chans, double lo_offset,</span><br><span style="color: hsl(120, 100%, 40%);">+  USRPDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset,</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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/16847">change 16847</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/c/osmo-trx/+/16847"/><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-Change-Id: Id6c837e9133f22783dd92a81dfcc493e51bf2d21 </div>
<div style="display:none"> Gerrit-Change-Number: 16847 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>