<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/17476">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">radioDevice: Drop unused isControl param from WriteSamples API<br><br>The out "isControl" parameter is only used by internal callers of<br>USRPDevice, and not used at all by any user of the generic API<br>(radioInterface*.cpp). Hence, we can get rid of it and keep it as a flag<br>for an internal API of USRPDevice.<br><br>Change-Id: I843384e24b76cdd28a95f9ee4e95e6157098e4a3<br>---<br>M Transceiver52M/device/common/radioDevice.h<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>7 files changed, 18 insertions(+), 26 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/76/17476/1</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 c504b3a..0dc38d5 100644</span><br><span>--- a/Transceiver52M/device/common/radioDevice.h</span><br><span>+++ b/Transceiver52M/device/common/radioDevice.h</span><br><span>@@ -87,11 +87,10 @@</span><br><span> @param len number of samples to write.</span><br><span> @param underrun Set if radio does not have data to transmit, e.g. data not being sent fast enough</span><br><span> @param timestamp The timestamp of the first sample of the data buffer.</span><br><span style="color: hsl(0, 100%, 40%);">- @param isControl Set if data is a control packet, e.g. a ping command</span><br><span> @return The number of samples actually written</span><br><span> */</span><br><span> virtual int writeSamples(std::vector<short *> &bufs, int len, bool *underrun,</span><br><span style="color: hsl(0, 100%, 40%);">- TIMESTAMP timestamp, bool isControl = false) = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ TIMESTAMP timestamp) = 0;</span><br><span> </span><br><span> /** Update the alignment between the read and write timestamps */</span><br><span> virtual bool updateAlignment(TIMESTAMP timestamp)=0;</span><br><span>diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>index 0cd8002..932817d 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -858,8 +858,7 @@</span><br><span> }</span><br><span> </span><br><span> int LMSDevice::writeSamples(std::vector < short *>&bufs, int len,</span><br><span style="color: hsl(0, 100%, 40%);">- bool * underrun, unsigned long long timestamp,</span><br><span style="color: hsl(0, 100%, 40%);">- bool isControl)</span><br><span style="color: hsl(120, 100%, 40%);">+ bool * underrun, unsigned long long timestamp)</span><br><span> {</span><br><span> int rc = 0;</span><br><span> unsigned int i;</span><br><span>@@ -868,11 +867,6 @@</span><br><span> tx_metadata.waitForTimestamp = true;</span><br><span> tx_metadata.timestamp = timestamp - ts_offset; /* Shift Tx time by offset */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (isControl) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ERROR) << "Control packets not supported";</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (bufs.size() != chans) {</span><br><span> LOGC(DDEV, ERROR) << "Invalid channel combination " << bufs.size();</span><br><span> return -1;</span><br><span>diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>index c2fd2f6..5b6330a 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.h</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>@@ -117,12 +117,10 @@</span><br><span> @param len number of samples to write.</span><br><span> @param underrun Set if LMS does not have data to transmit, e.g. data not being sent fast enough</span><br><span> @param timestamp The timestamp of the first sample of the data buffer.</span><br><span style="color: hsl(0, 100%, 40%);">- @param isControl Set if data is a control packet, e.g. a ping command</span><br><span> @return The number of samples actually written</span><br><span> */</span><br><span> int writeSamples(std::vector < short *>&bufs, int len, bool * underrun,</span><br><span style="color: hsl(0, 100%, 40%);">- TIMESTAMP timestamp = 0xffffffff, bool isControl =</span><br><span style="color: hsl(0, 100%, 40%);">- false);</span><br><span style="color: hsl(120, 100%, 40%);">+ TIMESTAMP timestamp = 0xffffffff);</span><br><span> </span><br><span> /** Update the alignment between the read and write timestamps */</span><br><span> bool updateAlignment(TIMESTAMP timestamp);</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>index ddb6631..ad56250 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>@@ -804,7 +804,7 @@</span><br><span> }</span><br><span> </span><br><span> int uhd_device::writeSamples(std::vector<short *> &bufs, int len, bool *underrun,</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned long long timestamp,bool isControl)</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned long long timestamp)</span><br><span> {</span><br><span> uhd::tx_metadata_t metadata;</span><br><span> metadata.has_time_spec = true;</span><br><span>@@ -814,12 +814,6 @@</span><br><span> </span><br><span> *underrun = false;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- // No control packets</span><br><span style="color: hsl(0, 100%, 40%);">- if (isControl) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ERROR) << "Control packets not supported";</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (bufs.size() != chans) {</span><br><span> LOGC(DDEV, ALERT) << "Invalid channel combination " << bufs.size();</span><br><span> return -1;</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.h b/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>index 4809b25..1e66246 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>@@ -77,7 +77,7 @@</span><br><span> TIMESTAMP timestamp, bool *underrun);</span><br><span> </span><br><span> int writeSamples(std::vector<short *> &bufs, int len, bool *underrun,</span><br><span style="color: hsl(0, 100%, 40%);">- TIMESTAMP timestamp, bool isControl);</span><br><span style="color: hsl(120, 100%, 40%);">+ TIMESTAMP timestamp);</span><br><span> </span><br><span> bool updateAlignment(TIMESTAMP timestamp);</span><br><span> </span><br><span>diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>index 5eaca07..1a9a7e1 100644</span><br><span>--- a/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>+++ b/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>@@ -515,9 +515,8 @@</span><br><span> #endif</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int USRPDevice::writeSamples(std::vector<short *> &bufs, int len,</span><br><span style="color: hsl(0, 100%, 40%);">- bool *underrun, unsigned long long timestamp,</span><br><span style="color: hsl(0, 100%, 40%);">- bool isControl)</span><br><span style="color: hsl(120, 100%, 40%);">+int USRPDevice::writeSamplesControl(std::vector<short *> &bufs, int len,</span><br><span style="color: hsl(120, 100%, 40%);">+ bool *underrun, unsigned long long timestamp, bool isControl)</span><br><span> {</span><br><span> writeLock.lock();</span><br><span> </span><br><span>@@ -571,6 +570,12 @@</span><br><span> #endif</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int USRPDevice::writeSamples(std::vector<short *> &bufs, int len,</span><br><span style="color: hsl(120, 100%, 40%);">+ bool *underrun, unsigned long long timestamp)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return writeSamplesControl(bufs, len, underrun, timestamp, false);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> bool USRPDevice::updateAlignment(TIMESTAMP timestamp)</span><br><span> {</span><br><span> #ifndef SWLOOPBACK</span><br><span>@@ -580,7 +585,7 @@</span><br><span> bool tmpUnderrun;</span><br><span> </span><br><span> std::vector<short *> buf(1, data);</span><br><span style="color: hsl(0, 100%, 40%);">- if (writeSamples(buf, 1, &tmpUnderrun, timestamp & 0x0ffffffffll, true)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (writeSamplesControl(buf, 1, &tmpUnderrun, timestamp & 0x0ffffffffll, true)) {</span><br><span> pingTimestamp = timestamp;</span><br><span> return true;</span><br><span> }</span><br><span>diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>index 0cf5ec3..a4a0886 100644</span><br><span>--- a/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>+++ b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>@@ -82,6 +82,9 @@</span><br><span> double rxGain;</span><br><span> double txGain;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ int writeSamplesControl(std::vector<short *> &bufs, int len, bool *underrun,</span><br><span style="color: hsl(120, 100%, 40%);">+ TIMESTAMP timestamp = 0xffffffff, bool isControl = false);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #ifdef SWLOOPBACK</span><br><span> short loopbackBuffer[1000000];</span><br><span> int loopbackBufferSize;</span><br><span>@@ -127,11 +130,10 @@</span><br><span> @param len number of samples to write.</span><br><span> @param underrun Set if USRP does not have data to transmit, e.g. data not being sent fast enough</span><br><span> @param timestamp The timestamp of the first sample of the data buffer.</span><br><span style="color: hsl(0, 100%, 40%);">- @param isControl Set if data is a control packet, e.g. a ping command</span><br><span> @return The number of samples actually written</span><br><span> */</span><br><span> int writeSamples(std::vector<short *> &bufs, int len, bool *underrun,</span><br><span style="color: hsl(0, 100%, 40%);">- TIMESTAMP timestamp = 0xffffffff, bool isControl = false);</span><br><span style="color: hsl(120, 100%, 40%);">+ TIMESTAMP timestamp = 0xffffffff);</span><br><span> </span><br><span> /** Update the alignment between the read and write timestamps */</span><br><span> bool updateAlignment(TIMESTAMP timestamp);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/17476">change 17476</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/+/17476"/><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: I843384e24b76cdd28a95f9ee4e95e6157098e4a3 </div>
<div style="display:none"> Gerrit-Change-Number: 17476 </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>