<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12533">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Vadim Yanitskiy: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">usrp1: Remove uninitialized skipRx logic<br><br>There appears to have been some logic to operate a USRP1 in<br>transmit-only GSM mode. This is achieved using the skipRx member<br>of the transceiver object. However, there's nobody that ever<br>initializes it properly, and hence the feature is not possible to<br>use anyway.<br><br>I don't think this has any valid use case, so let's remove it.<br><br>Change-Id: I616193f1e9aaefbf4ceb26761657811093f28b6f<br>---<br>M Transceiver52M/device/usrp1/USRPDevice.cpp<br>M Transceiver52M/device/usrp1/USRPDevice.h<br>2 files changed, 3 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>index 5d19514..a8f1638 100644</span><br><span>--- a/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>+++ b/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>@@ -100,7 +100,6 @@</span><br><span> string rbf = "std_inband.rbf";</span><br><span> //string rbf = "inband_1rxhb_1tx.rbf";</span><br><span> m_uRx.reset();</span><br><span style="color: hsl(0, 100%, 40%);">- if (!skipRx) {</span><br><span> try {</span><br><span> m_uRx = usrp_standard_rx_sptr(usrp_standard_rx::make(</span><br><span> 0, decimRate * tx_sps, 1, -1,</span><br><span>@@ -122,7 +121,6 @@</span><br><span> m_uRx.reset();</span><br><span> return -1;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span> try {</span><br><span> m_uTx = usrp_standard_tx_sptr(usrp_standard_tx::make(</span><br><span>@@ -145,7 +143,7 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!skipRx) m_uRx->stop();</span><br><span style="color: hsl(120, 100%, 40%);">+ m_uRx->stop();</span><br><span> m_uTx->stop();</span><br><span> </span><br><span> #endif</span><br><span>@@ -188,10 +186,10 @@</span><br><span> {</span><br><span> LOGC(DDEV, INFO) << "starting USRP...";</span><br><span> #ifndef SWLOOPBACK</span><br><span style="color: hsl(0, 100%, 40%);">- if (!m_uRx && !skipRx) return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!m_uRx) return false;</span><br><span> if (!m_uTx) return false;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!skipRx) m_uRx->stop();</span><br><span style="color: hsl(120, 100%, 40%);">+ m_uRx->stop();</span><br><span> m_uTx->stop();</span><br><span> </span><br><span> writeLock.lock();</span><br><span>@@ -221,10 +219,7 @@</span><br><span> isAligned = false;</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!skipRx)</span><br><span> started = (m_uRx->start() && m_uTx->start());</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- started = m_uTx->start();</span><br><span> return started;</span><br><span> #else</span><br><span> gettimeofday(&lastReadTime,NULL);</span><br><span>diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>index 451b5a9..521d81d 100644</span><br><span>--- a/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>+++ b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>@@ -55,7 +55,6 @@</span><br><span> unsigned long long samplesWritten; ///< number of samples sent to USRP</span><br><span> </span><br><span> bool started; ///< flag indicates USRP has started</span><br><span style="color: hsl(0, 100%, 40%);">- bool skipRx; ///< set if USRP is transmit-only.</span><br><span> </span><br><span> static const unsigned int currDataSize_log2 = 21;</span><br><span> static const unsigned long currDataSize = (1 << currDataSize_log2);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12533">change 12533</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/12533"/><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: I616193f1e9aaefbf4ceb26761657811093f28b6f </div>
<div style="display:none"> Gerrit-Change-Number: 12533 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </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: Vadim Yanitskiy <axilirator@gmail.com> </div>