<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13810">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
tnt: Looks good to me, but someone else must approve
Vadim Yanitskiy: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">uhd: smpl_buf: Drop UHD specifics out back to UHDDevice<br><br>This way smpl_buf can be re-used later by other non-UHD drivers.<br><br>Change-Id: I94061328d46a550d4147121d85baffa29c700c45<br>---<br>M Transceiver52M/device/uhd/UHDDevice.cpp<br>M Transceiver52M/device/uhd/smpl_buf.cpp<br>M Transceiver52M/device/uhd/smpl_buf.h<br>3 files changed, 4 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>index 67b7416..40ef2a0 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>@@ -759,7 +759,7 @@</span><br><span> for (size_t i = 0; i < rx_buffers.size(); i++) {</span><br><span> rc = rx_buffers[i]->write((short *) &pkt_bufs[i].front(),</span><br><span> num_smpls,</span><br><span style="color: hsl(0, 100%, 40%);">- metadata.time_spec);</span><br><span style="color: hsl(120, 100%, 40%);">+ metadata.time_spec.to_ticks(rx_rate));</span><br><span> </span><br><span> // Continue on local overrun, exit on other errors</span><br><span> if ((rc < 0)) {</span><br><span>diff --git a/Transceiver52M/device/uhd/smpl_buf.cpp b/Transceiver52M/device/uhd/smpl_buf.cpp</span><br><span>index d8bdbc4..ae21369 100644</span><br><span>--- a/Transceiver52M/device/uhd/smpl_buf.cpp</span><br><span>+++ b/Transceiver52M/device/uhd/smpl_buf.cpp</span><br><span>@@ -47,11 +47,6 @@</span><br><span> return time_end - timestamp;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ssize_t smpl_buf::avail_smpls(uhd::time_spec_t timespec) const</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- return avail_smpls(timespec.to_ticks(clk_rt));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> ssize_t smpl_buf::read(void *buf, size_t len, TIMESTAMP timestamp)</span><br><span> {</span><br><span> int type_sz = 2 * sizeof(short);</span><br><span>@@ -93,11 +88,6 @@</span><br><span> return num_smpls;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ssize_t smpl_buf::read(void *buf, size_t len, uhd::time_spec_t ts)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- return read(buf, len, ts.to_ticks(clk_rt));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> ssize_t smpl_buf::write(void *buf, size_t len, TIMESTAMP timestamp)</span><br><span> {</span><br><span> int type_sz = 2 * sizeof(short);</span><br><span>@@ -110,14 +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%);">- uhd::time_spec_t ts = uhd::time_spec_t::from_ticks(timestamp, clk_rt);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, DEBUG) << "Requested timestamp = " << timestamp << " (real_sec=" << std::fixed << ts.get_real_secs() << " = " << ts.to_ticks(clk_rt) << ") rate=" << clk_rt;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, DEBUG) << "Requested timestamp = " << timestamp << " rate=" << clk_rt;</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%);">- uhd::time_spec_t ts = uhd::time_spec_t::from_ticks(timestamp, clk_rt);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, DEBUG) << "Requested timestamp = " << timestamp << " (real_sec=" << std::fixed << ts.get_real_secs() << " = " << ts.to_ticks(clk_rt) << ") rate=" << clk_rt;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, DEBUG) << "Requested timestamp = " << timestamp << " rate=" << clk_rt;</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>@@ -150,11 +138,6 @@</span><br><span> return len;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ssize_t smpl_buf::write(void *buf, size_t len, uhd::time_spec_t ts)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- return write(buf, len, ts.to_ticks(clk_rt));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> std::string smpl_buf::str_status(size_t ts) const</span><br><span> {</span><br><span> std::ostringstream ost("Sample buffer: ");</span><br><span>diff --git a/Transceiver52M/device/uhd/smpl_buf.h b/Transceiver52M/device/uhd/smpl_buf.h</span><br><span>index 6af97c2..cb231d3 100644</span><br><span>--- a/Transceiver52M/device/uhd/smpl_buf.h</span><br><span>+++ b/Transceiver52M/device/uhd/smpl_buf.h</span><br><span>@@ -25,13 +25,12 @@</span><br><span> #pragma once</span><br><span> </span><br><span> #include <unistd.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <uhd/types/time_spec.hpp></span><br><span> </span><br><span> #include "radioDevice.h"</span><br><span> </span><br><span> /*</span><br><span> Sample Buffer - Allows reading and writing of timed samples using osmo-trx</span><br><span style="color: hsl(0, 100%, 40%);">- or UHD style timestamps. Time conversions are handled</span><br><span style="color: hsl(120, 100%, 40%);">+ timestamps. Time conversions are handled</span><br><span> internally or accessable through the static convert calls.</span><br><span> */</span><br><span> class smpl_buf {</span><br><span>@@ -49,7 +48,6 @@</span><br><span> @return number of available samples or error</span><br><span> */</span><br><span> ssize_t avail_smpls(TIMESTAMP timestamp) const;</span><br><span style="color: hsl(0, 100%, 40%);">- ssize_t avail_smpls(uhd::time_spec_t timestamp) const;</span><br><span> </span><br><span> /** Read and write</span><br><span> @param buf pointer to buffer</span><br><span>@@ -58,9 +56,7 @@</span><br><span> @return number of actual samples read or written or error</span><br><span> */</span><br><span> ssize_t read(void *buf, size_t len, TIMESTAMP timestamp);</span><br><span style="color: hsl(0, 100%, 40%);">- ssize_t read(void *buf, size_t len, uhd::time_spec_t timestamp);</span><br><span> ssize_t write(void *buf, size_t len, TIMESTAMP timestamp);</span><br><span style="color: hsl(0, 100%, 40%);">- ssize_t write(void *buf, size_t len, uhd::time_spec_t timestamp);</span><br><span> </span><br><span> /** Buffer status string</span><br><span> @return a formatted string describing internal buffer state</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13810">change 13810</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/13810"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I94061328d46a550d4147121d85baffa29c700c45 </div>
<div style="display:none"> Gerrit-Change-Number: 13810 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: tnt <tnt@246tNt.com> </div>