<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13832">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">device: Drop unused numberRead/numberWritten APIs<br><br>It's really not used, so let's drop unused code and simplify work for<br>new to come device drivers implementation.<br><br>Change-Id: I0d18f9c2584771e2f7b3d5c6b016e764e02855ff<br>---<br>M Transceiver52M/device/lms/LMSDevice.cpp<br>M Transceiver52M/device/lms/LMSDevice.h<br>M Transceiver52M/device/radioDevice.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, 1 insertion(+), 33 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/32/13832/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 7071589..be51a12 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -238,8 +238,6 @@</span><br><span> goto out_close;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- samplesRead = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- samplesWritten = 0;</span><br><span> started = false;</span><br><span> </span><br><span> return NORMAL;</span><br><span>@@ -630,8 +628,6 @@</span><br><span> thread_enable_cancel(true);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- samplesRead += rc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (((TIMESTAMP) rx_metadata.timestamp) < timestamp)</span><br><span> rc = 0;</span><br><span> </span><br><span>@@ -678,8 +674,6 @@</span><br><span> thread_enable_cancel(true);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- samplesWritten += rc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span>diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>index 225839d..b0ff03b 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.h</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>@@ -55,9 +55,6 @@</span><br><span> </span><br><span> double actualSampleRate; ///< the actual USRP sampling rate</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- unsigned long long samplesRead; ///< number of samples read from LMS</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned long long samplesWritten; ///< number of samples sent to LMS</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> bool started; ///< flag indicates LMS has started</span><br><span> bool skipRx; ///< set if LMS is transmit-only.</span><br><span> </span><br><span>@@ -203,12 +200,6 @@</span><br><span> inline double getSampleRate() {</span><br><span> return actualSampleRate;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- inline double numberRead() {</span><br><span style="color: hsl(0, 100%, 40%);">- return samplesRead;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- inline double numberWritten() {</span><br><span style="color: hsl(0, 100%, 40%);">- return samplesWritten;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> };</span><br><span> </span><br><span> #endif // _LMS_DEVICE_H_</span><br><span>diff --git a/Transceiver52M/device/radioDevice.h b/Transceiver52M/device/radioDevice.h</span><br><span>index 5d001fb..30e0f43 100644</span><br><span>--- a/Transceiver52M/device/radioDevice.h</span><br><span>+++ b/Transceiver52M/device/radioDevice.h</span><br><span>@@ -161,8 +161,6 @@</span><br><span> virtual double getTxFreq(size_t chan = 0) = 0;</span><br><span> virtual double getRxFreq(size_t chan = 0) = 0;</span><br><span> virtual double getSampleRate()=0;</span><br><span style="color: hsl(0, 100%, 40%);">- virtual double numberRead()=0;</span><br><span style="color: hsl(0, 100%, 40%);">- virtual double numberWritten()=0;</span><br><span> </span><br><span> protected:</span><br><span> size_t tx_sps, rx_sps;</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>index 6214666..79e5855 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>@@ -165,7 +165,7 @@</span><br><span> tx_gain_min(0.0), tx_gain_max(0.0),</span><br><span> rx_gain_min(0.0), rx_gain_max(0.0),</span><br><span> tx_spp(0), rx_spp(0),</span><br><span style="color: hsl(0, 100%, 40%);">- started(false), aligned(false), rx_pkt_cnt(0), drop_cnt(0),</span><br><span style="color: hsl(120, 100%, 40%);">+ started(false), aligned(false), drop_cnt(0),</span><br><span> prev_ts(0,0), ts_initial(0), ts_offset(0), async_event_thrd(NULL)</span><br><span> {</span><br><span> }</span><br><span>@@ -725,8 +725,6 @@</span><br><span> metadata, 0.1, true);</span><br><span> thread_enable_cancel(true);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rx_pkt_cnt++;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> // Check for errors</span><br><span> rc = check_rx_md_err(metadata, num_smpls);</span><br><span> switch (rc) {</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.h b/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>index 2a73a2b..2a9fc02 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>@@ -103,8 +103,6 @@</span><br><span> GSM::Time minLatency();</span><br><span> </span><br><span> inline double getSampleRate() { return tx_rate; }</span><br><span style="color: hsl(0, 100%, 40%);">- inline double numberRead() { return rx_pkt_cnt; }</span><br><span style="color: hsl(0, 100%, 40%);">- inline double numberWritten() { return 0; }</span><br><span> </span><br><span> /** Receive and process asynchronous message</span><br><span> @return true if message received or false on timeout or error</span><br><span>@@ -137,7 +135,6 @@</span><br><span> bool started;</span><br><span> bool aligned;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- size_t rx_pkt_cnt;</span><br><span> size_t drop_cnt;</span><br><span> uhd::time_spec_t prev_ts;</span><br><span> </span><br><span>diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>index 2343fb6..b1d6c56 100644</span><br><span>--- a/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>+++ b/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>@@ -173,8 +173,6 @@</span><br><span> m_dbTx = m_uTx->selected_subdev(txSubdevSpec);</span><br><span> m_dbRx = m_uRx->selected_subdev(rxSubdevSpec);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- samplesRead = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- samplesWritten = 0;</span><br><span> started = false;</span><br><span> </span><br><span> return NORMAL;</span><br><span>@@ -505,7 +503,6 @@</span><br><span> gettimeofday(&lastReadTime,NULL);</span><br><span> firstRead = true;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- samplesRead += numSamples;</span><br><span> </span><br><span> return numSamples;</span><br><span> #endif</span><br><span>@@ -555,14 +552,12 @@</span><br><span> }</span><br><span> m_uTx->write((const void*) outPkt,sizeof(uint32_t)*128*numPkts,NULL);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- samplesWritten += len/2/sizeof(short);</span><br><span> writeLock.unlock();</span><br><span> </span><br><span> return len/2/sizeof(short);</span><br><span> #else</span><br><span> int retVal = len;</span><br><span> memcpy(loopbackBuffer+loopbackBufferSize,buf,sizeof(short)*2*len);</span><br><span style="color: hsl(0, 100%, 40%);">- samplesWritten += retVal;</span><br><span> loopbackBufferSize += retVal*2;</span><br><span> </span><br><span> return retVal;</span><br><span>diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>index 521d81d..c02e58c 100644</span><br><span>--- a/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>+++ b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>@@ -51,9 +51,6 @@</span><br><span> double actualSampleRate; ///< the actual USRP sampling rate</span><br><span> unsigned int decimRate; ///< the USRP decimation rate</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- unsigned long long samplesRead; ///< number of samples read from USRP</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned long long samplesWritten; ///< number of samples sent to USRP</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> bool started; ///< flag indicates USRP has started</span><br><span> </span><br><span> static const unsigned int currDataSize_log2 = 21;</span><br><span>@@ -201,8 +198,6 @@</span><br><span> inline double getTxFreq(size_t chan = 0) { return 0; }</span><br><span> inline double getRxFreq(size_t chan = 0) { return 0; }</span><br><span> inline double getSampleRate() { return actualSampleRate; }</span><br><span style="color: hsl(0, 100%, 40%);">- inline double numberRead() { return samplesRead; }</span><br><span style="color: hsl(0, 100%, 40%);">- inline double numberWritten() { return samplesWritten; }</span><br><span> };</span><br><span> </span><br><span> #endif // _USRP_DEVICE_H_</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13832">change 13832</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/13832"/><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: I0d18f9c2584771e2f7b3d5c6b016e764e02855ff </div>
<div style="display:none"> Gerrit-Change-Number: 13832 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>