<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13869">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">smpl_buf: Remove unused clk_rt variable<br><br>During 87b7d098e517470fec53ac13a28d1d0fa7b16bb4 we dropped support for<br>UHD specific functionalitites, and so clk_rt is not needed anymore.<br><br>Change-Id: I37403e085ed6a541bbdecf64f1f9a821ff2753a4<br>---<br>M Transceiver52M/device/smpl_buf.cpp<br>M Transceiver52M/device/smpl_buf.h<br>M Transceiver52M/device/uhd/UHDDevice.cpp<br>3 files changed, 7 insertions(+), 8 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/69/13869/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/device/smpl_buf.cpp b/Transceiver52M/device/smpl_buf.cpp</span><br><span>index f3fc323..e3c5af5 100644</span><br><span>--- a/Transceiver52M/device/smpl_buf.cpp</span><br><span>+++ b/Transceiver52M/device/smpl_buf.cpp</span><br><span>@@ -25,9 +25,9 @@</span><br><span> #include "smpl_buf.h"</span><br><span> #include <inttypes.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-smpl_buf::smpl_buf(size_t len, double rate)</span><br><span style="color: hsl(0, 100%, 40%);">-     : buf_len(len), clk_rt(rate),</span><br><span style="color: hsl(0, 100%, 40%);">-     time_start(0), time_end(0), data_start(0), data_end(0)</span><br><span style="color: hsl(120, 100%, 40%);">+smpl_buf::smpl_buf(size_t len)</span><br><span style="color: hsl(120, 100%, 40%);">+      : buf_len(len), time_start(0), time_end(0),</span><br><span style="color: hsl(120, 100%, 40%);">+     data_start(0), data_end(0)</span><br><span> {</span><br><span>    data = new uint32_t[len];</span><br><span> }</span><br><span>@@ -100,12 +100,12 @@</span><br><span> </span><br><span>   if (timestamp < time_end) {</span><br><span>               LOGC(DDEV, ERR) << "Overwriting old buffer data: timestamp="<<timestamp<<" time_end="<<time_end;</span><br><span style="color: hsl(0, 100%, 40%);">-            LOGC(DDEV, DEBUG) << "Requested timestamp = " << timestamp << " rate=" << clk_rt;</span><br><span style="color: hsl(120, 100%, 40%);">+         LOGC(DDEV, DEBUG) << "Requested timestamp = " << timestamp;</span><br><span>            // Do not return error here, because it's a rounding error and is not fatal</span><br><span>      }</span><br><span>    if (timestamp > time_end && time_end != 0) {</span><br><span>              LOGC(DDEV, ERR) << "Skipping buffer data: timestamp="<<timestamp<<" time_end="<<time_end;</span><br><span style="color: hsl(0, 100%, 40%);">-           LOGC(DDEV, DEBUG) << "Requested timestamp = " << timestamp << " rate=" << clk_rt;</span><br><span style="color: hsl(120, 100%, 40%);">+         LOGC(DDEV, DEBUG) << "Requested timestamp = " << timestamp;</span><br><span>            // Do not return error here, because it's a rounding error and is not fatal</span><br><span>      }</span><br><span> </span><br><span>diff --git a/Transceiver52M/device/smpl_buf.h b/Transceiver52M/device/smpl_buf.h</span><br><span>index e58eb38..e007ae5 100644</span><br><span>--- a/Transceiver52M/device/smpl_buf.h</span><br><span>+++ b/Transceiver52M/device/smpl_buf.h</span><br><span>@@ -37,10 +37,9 @@</span><br><span> public:</span><br><span>   /** Sample buffer constructor</span><br><span>            @param len number of 32-bit samples the buffer should hold</span><br><span style="color: hsl(0, 100%, 40%);">-      @param rate sample clockrate</span><br><span>         @param timestamp</span><br><span>         */</span><br><span style="color: hsl(0, 100%, 40%);">-      smpl_buf(size_t len, double rate);</span><br><span style="color: hsl(120, 100%, 40%);">+    smpl_buf(size_t len);</span><br><span>        ~smpl_buf();</span><br><span> </span><br><span>     /** Query number of samples available for reading</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>index 79e5855..4e6f49d 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>@@ -514,7 +514,7 @@</span><br><span>     // Create receive buffer</span><br><span>     size_t buf_len = SAMPLE_BUF_SZ / sizeof(uint32_t);</span><br><span>   for (size_t i = 0; i < rx_buffers.size(); i++)</span><br><span style="color: hsl(0, 100%, 40%);">-               rx_buffers[i] = new smpl_buf(buf_len, rx_rate);</span><br><span style="color: hsl(120, 100%, 40%);">+               rx_buffers[i] = new smpl_buf(buf_len);</span><br><span> </span><br><span>   // Create vector buffer</span><br><span>      pkt_bufs = std::vector<std::vector<short> >(chans, std::vector<short>(2 * rx_spp));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13869">change 13869</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/13869"/><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: I37403e085ed6a541bbdecf64f1f9a821ff2753a4 </div>
<div style="display:none"> Gerrit-Change-Number: 13869 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>