<p>pespin <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/15542">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  fixeria: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move multi-ARFCN chan amount modification from UHDDevice to parent class<br><br>This way switch is applied correctly to parent structures and features<br>can be used later by other children classes (other devices).<br><br>Change-Id: I24d6c66bb3195ba2513b4a67daa14cdfbacdce6d<br>---<br>M Transceiver52M/device/common/radioDevice.h<br>M Transceiver52M/device/uhd/UHDDevice.cpp<br>2 files changed, 7 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/device/common/radioDevice.h b/Transceiver52M/device/common/radioDevice.h</span><br><span>index 1d85204..d27a52c 100644</span><br><span>--- a/Transceiver52M/device/common/radioDevice.h</span><br><span>+++ b/Transceiver52M/device/common/radioDevice.h</span><br><span>@@ -171,12 +171,17 @@</span><br><span>   std::vector<std::string> tx_paths, rx_paths;</span><br><span>   std::vector<struct device_counters> m_ctr;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  RadioDevice(size_t tx_sps, size_t rx_sps, InterfaceType type, size_t chans, double offset,</span><br><span style="color: hsl(120, 100%, 40%);">+  RadioDevice(size_t tx_sps, size_t rx_sps, InterfaceType type, 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 style="color: hsl(0, 100%, 40%);">-                tx_sps(tx_sps), rx_sps(rx_sps), iface(type), chans(chans), lo_offset(offset),</span><br><span style="color: hsl(120, 100%, 40%);">+         tx_sps(tx_sps), rx_sps(rx_sps), iface(type), chans(chan_num), lo_offset(offset),</span><br><span>             tx_paths(tx_paths), rx_paths(rx_paths)</span><br><span>       {</span><br><span style="color: hsl(120, 100%, 40%);">+             if (iface == MULTI_ARFCN) {</span><br><span style="color: hsl(120, 100%, 40%);">+                   LOGC(DDEV, INFO) << "Multi-ARFCN: "<< chan_num << " logical chans -> 1 physical chans";</span><br><span style="color: hsl(120, 100%, 40%);">+                      chans = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+            }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>          m_ctr.resize(chans);</span><br><span>                 for (size_t i = 0; i < chans; i++) {</span><br><span>                      memset(&m_ctr[i], 0, sizeof(m_ctr[i]));</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>index 809bade..604bb44 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>@@ -382,7 +382,6 @@</span><br><span>           if (dev_type != B200 && dev_type != B210)</span><br><span>                    throw std::invalid_argument("Device does not support MCBTS");</span><br><span>              dev_type = B2XX_MCBTS;</span><br><span style="color: hsl(0, 100%, 40%);">-          chans = 1;</span><br><span>   }</span><br><span> </span><br><span>        if (chans > dev_param_map.at(dev_key(dev_type, tx_sps, rx_sps)).channels)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/15542">change 15542</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/+/15542"/><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: I24d6c66bb3195ba2513b4a67daa14cdfbacdce6d </div>
<div style="display:none"> Gerrit-Change-Number: 15542 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>