<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/17475">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">radioDevice: Drop unused RSSI param from readSamples API<br><br>The out "RSSI" parameter is only filled by USRPDevice, and not used at<br>all by any user of the API (radioInterface*.cpp).<br><br>RSSI seems to be computed nowadays in the common path in<br>Transceiver::pullRadioVector().<br><br>Change-Id: I06c2ea5a9891d170bc468f952bbf2a7e64d95784<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, 11 insertions(+), 14 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 26903e8..c504b3a 100644</span><br><span>--- a/Transceiver52M/device/common/radioDevice.h</span><br><span>+++ b/Transceiver52M/device/common/radioDevice.h</span><br><span>@@ -77,12 +77,10 @@</span><br><span> @param overrun Set if read buffer has been overrun, e.g. data not being read fast enough</span><br><span> @param timestamp The timestamp of the first samples to be read</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 style="color: hsl(0, 100%, 40%);">- @param RSSI The received signal strength of the read result</span><br><span> @return The number of samples actually read</span><br><span> */</span><br><span> virtual int readSamples(std::vector<short *> &bufs, int len, bool *overrun,</span><br><span style="color: hsl(0, 100%, 40%);">- TIMESTAMP timestamp = 0xffffffff, bool *underrun = 0,</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned *RSSI = 0) = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ TIMESTAMP timestamp = 0xffffffff, bool *underrun = 0) = 0;</span><br><span> /**</span><br><span> Write samples to the radio.</span><br><span> @param buf Contains the data to be written.</span><br><span>diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>index 884cc28..0cd8002 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -739,7 +739,7 @@</span><br><span> </span><br><span> // NOTE: Assumes sequential reads</span><br><span> int LMSDevice::readSamples(std::vector < short *>&bufs, int len, bool * overrun,</span><br><span style="color: hsl(0, 100%, 40%);">- TIMESTAMP timestamp, bool * underrun, unsigned *RSSI)</span><br><span style="color: hsl(120, 100%, 40%);">+ TIMESTAMP timestamp, bool * underrun)</span><br><span> {</span><br><span> int rc, num_smpls, expect_smpls;</span><br><span> ssize_t avail_smpls;</span><br><span>diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>index 755f6c4..c2fd2f6 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.h</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>@@ -106,12 +106,11 @@</span><br><span> @param overrun Set if read buffer has been overrun, e.g. data not being read fast enough</span><br><span> @param timestamp The timestamp of the first samples to be read</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 style="color: hsl(0, 100%, 40%);">- @param RSSI The received signal strength of the read result</span><br><span> @return The number of samples actually read</span><br><span> */</span><br><span> int readSamples(std::vector < short *>&buf, int len, bool * overrun,</span><br><span> TIMESTAMP timestamp = 0xffffffff, bool * underrun =</span><br><span style="color: hsl(0, 100%, 40%);">- NULL, unsigned *RSSI = NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ NULL);</span><br><span> /**</span><br><span> Write samples to the LMS.</span><br><span> @param buf Contains the data to be written.</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>index 5d267c8..ddb6631 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>@@ -721,7 +721,7 @@</span><br><span> }</span><br><span> </span><br><span> int uhd_device::readSamples(std::vector<short *> &bufs, int len, bool *overrun,</span><br><span style="color: hsl(0, 100%, 40%);">- TIMESTAMP timestamp, bool *underrun, unsigned *RSSI)</span><br><span style="color: hsl(120, 100%, 40%);">+ TIMESTAMP timestamp, bool *underrun)</span><br><span> {</span><br><span> ssize_t rc;</span><br><span> uhd::time_spec_t ts;</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.h b/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>index d485a8e..4809b25 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>@@ -74,7 +74,7 @@</span><br><span> enum TxWindowType getWindowType() { return tx_window; }</span><br><span> </span><br><span> int readSamples(std::vector<short *> &bufs, int len, bool *overrun,</span><br><span style="color: hsl(0, 100%, 40%);">- TIMESTAMP timestamp, bool *underrun, unsigned *RSSI);</span><br><span style="color: hsl(120, 100%, 40%);">+ TIMESTAMP timestamp, bool *underrun);</span><br><span> </span><br><span> int writeSamples(std::vector<short *> &bufs, int len, bool *underrun,</span><br><span> TIMESTAMP timestamp, bool isControl);</span><br><span>diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>index 766a228..5eaca07 100644</span><br><span>--- a/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>+++ b/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>@@ -365,7 +365,7 @@</span><br><span> </span><br><span> // NOTE: Assumes sequential reads</span><br><span> int USRPDevice::readSamples(std::vector<short *> &bufs, int len, bool *overrun,</span><br><span style="color: hsl(0, 100%, 40%);">- TIMESTAMP timestamp, bool *underrun, unsigned *RSSI)</span><br><span style="color: hsl(120, 100%, 40%);">+ TIMESTAMP timestamp, bool *underrun)</span><br><span> {</span><br><span> #ifndef SWLOOPBACK</span><br><span> if (!m_uRx)</span><br><span>@@ -433,8 +433,10 @@</span><br><span> *underrun = true;</span><br><span> LOGC(DDEV, DEBUG) << "UNDERRUN in TRX->USRP interface";</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (RSSI) *RSSI = (word0 >> 21) & 0x3f;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+#if 0</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: Do something with this ? */</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned RSSI = (word0 >> 21) & 0x3f;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> if (!isAligned) continue;</span><br><span> </span><br><span> unsigned cursorStart = pktTimestamp - timeStart + dataStart;</span><br><span>diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>index 47f2a43..0cf5ec3 100644</span><br><span>--- a/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>+++ b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>@@ -117,12 +117,10 @@</span><br><span> @param overrun Set if read buffer has been overrun, e.g. data not being read fast enough</span><br><span> @param timestamp The timestamp of the first samples to be read</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 style="color: hsl(0, 100%, 40%);">- @param RSSI The received signal strength of the read result</span><br><span> @return The number of samples actually read</span><br><span> */</span><br><span> int readSamples(std::vector<short *> &buf, int len, bool *overrun,</span><br><span style="color: hsl(0, 100%, 40%);">- TIMESTAMP timestamp = 0xffffffff, bool *underrun = NULL,</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned *RSSI = NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ TIMESTAMP timestamp = 0xffffffff, bool *underrun = NULL);</span><br><span> /**</span><br><span> Write samples to the USRP.</span><br><span> @param buf Contains the data to be written.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/17475">change 17475</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/+/17475"/><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: I06c2ea5a9891d170bc468f952bbf2a7e64d95784 </div>
<div style="display:none"> Gerrit-Change-Number: 17475 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>