<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9623">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lms: Fix coding style<br><br>In Change-Id Ib2fca81b76d027b08e2891056fa076d071597783 we introduced<br>some coding style violations.  Let's make newly-added code follows<br>standard Osmocom coding style.<br><br>Change-Id: Ib7ddd275014f03a2eed3cddc02b1356e2b00c0bc<br>---<br>M Transceiver52M/device/lms/LMSDevice.cpp<br>M Transceiver52M/device/lms/LMSDevice.h<br>M Transceiver52M/device/uhd/UHDDevice.cpp<br>3 files changed, 10 insertions(+), 12 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/23/9623/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 c4d5f96..815a4c5 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -100,19 +100,19 @@</span><br><span> </span><br><span>  LMS_RegisterLogHandler(&lms_log_callback);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        if ((n = LMS_GetDeviceList(NULL)) < 0)</span><br><span style="color: hsl(0, 100%, 40%);">-            LOG(ERROR) << "LMS_GetDeviceList(NULL) failed";</span><br><span style="color: hsl(0, 100%, 40%);">-        LOG(DEBUG) << "Devices found: " << n;</span><br><span style="color: hsl(0, 100%, 40%);">-        if (n < 1)</span><br><span style="color: hsl(0, 100%, 40%);">-            return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+  if ((n = LMS_GetDeviceList(NULL)) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+             LOG(ERROR) << "LMS_GetDeviceList(NULL) failed";</span><br><span style="color: hsl(120, 100%, 40%);">+       LOG(DEBUG) << "Devices found: " << n;</span><br><span style="color: hsl(120, 100%, 40%);">+   if (n < 1)</span><br><span style="color: hsl(120, 100%, 40%);">+     return -1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        info_list = new lms_info_str_t[n];</span><br><span style="color: hsl(120, 100%, 40%);">+  info_list = new lms_info_str_t[n];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        if (LMS_GetDeviceList(info_list) < 0)                //Populate device list</span><br><span style="color: hsl(0, 100%, 40%);">-            LOG(ERROR) << "LMS_GetDeviceList(info_list) failed";</span><br><span style="color: hsl(120, 100%, 40%);">+  if (LMS_GetDeviceList(info_list) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+              LOG(ERROR) << "LMS_GetDeviceList(info_list) failed";</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        for (i = 0; i < n; i++)                     //print device list</span><br><span style="color: hsl(0, 100%, 40%);">-           LOG(DEBUG) << "Device [" << i << "]: " << info_list[i];</span><br><span style="color: hsl(120, 100%, 40%);">+      for (i = 0; i < n; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+            LOG(DEBUG) << "Device [" << i << "]: " << info_list[i];</span><br><span> </span><br><span>      rc = LMS_Open(&m_lms_dev, info_list[0], NULL);</span><br><span>   if (rc != 0) {</span><br><span>diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>index 7d8d44b..349efbb 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.h</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>@@ -46,7 +46,6 @@</span><br><span>  std::vector<uint32_t> m_last_tx_underruns;</span><br><span>     std::vector<uint32_t> m_last_tx_overruns;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     size_t chans;</span><br><span>        double actualSampleRate;        ///< the actual USRP sampling rate</span><br><span> </span><br><span>    unsigned long long samplesRead; ///< number of samples read from LMS</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>index e8cec68..4af8f87 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>@@ -282,7 +282,6 @@</span><br><span>       enum TxWindowType tx_window;</span><br><span>         enum uhd_dev_type dev_type;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- size_t rx_sps, chans;</span><br><span>        double tx_rate, rx_rate;</span><br><span> </span><br><span>         double tx_gain_min, tx_gain_max;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9623">change 9623</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/9623"/><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: Ib7ddd275014f03a2eed3cddc02b1356e2b00c0bc </div>
<div style="display:none"> Gerrit-Change-Number: 9623 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>