<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10741">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">radioInterface: forward errors from RadioDevice to Transceiver in recv path<br><br>Change-Id: Id7b08b19d6575c79b4d57db656a17ff05bb61ee9<br>---<br>M Transceiver52M/radioInterface.cpp<br>M Transceiver52M/radioInterface.h<br>M Transceiver52M/radioInterfaceMulti.cpp<br>M Transceiver52M/radioInterfaceResamp.cpp<br>4 files changed, 22 insertions(+), 18 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/41/10741/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp</span><br><span>index f74897f..b9c6672 100644</span><br><span>--- a/Transceiver52M/radioInterface.cpp</span><br><span>+++ b/Transceiver52M/radioInterface.cpp</span><br><span>@@ -218,14 +218,15 @@</span><br><span> while (pushBuffer());</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-bool RadioInterface::driveReceiveRadio()</span><br><span style="color: hsl(120, 100%, 40%);">+int RadioInterface::driveReceiveRadio()</span><br><span> {</span><br><span> radioVector *burst = NULL;</span><br><span> </span><br><span> if (!mOn)</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- pullBuffer();</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pullBuffer() < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> </span><br><span> GSM::Time rcvClock = mClock.get();</span><br><span> rcvClock.decTN(receiveOffset);</span><br><span>@@ -270,7 +271,7 @@</span><br><span> burstSize = (symbolsPerSlot + (tN % 4 == 0)) * mSPSRx;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return true;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1;</span><br><span> }</span><br><span> </span><br><span> bool RadioInterface::isUnderrun()</span><br><span>@@ -300,13 +301,13 @@</span><br><span> }</span><br><span> </span><br><span> /* Receive a timestamped chunk from the device */</span><br><span style="color: hsl(0, 100%, 40%);">-void RadioInterface::pullBuffer()</span><br><span style="color: hsl(120, 100%, 40%);">+int RadioInterface::pullBuffer()</span><br><span> {</span><br><span> bool local_underrun;</span><br><span> size_t numRecv, segmentLen = recvBuffer[0]->getSegmentLen();</span><br><span> </span><br><span> if (recvBuffer[0]->getFreeSegments() <= 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> </span><br><span> /* Outer buffer access size is fixed */</span><br><span> numRecv = mRadio->readSamples(convertRecvBuffer,</span><br><span>@@ -317,7 +318,7 @@</span><br><span> </span><br><span> if (numRecv != segmentLen) {</span><br><span> LOG(ALERT) << "Receive error " << numRecv;</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> }</span><br><span> </span><br><span> for (size_t i = 0; i < mChans; i++) {</span><br><span>@@ -328,6 +329,7 @@</span><br><span> </span><br><span> underrun |= local_underrun;</span><br><span> readTimestamp += numRecv;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> /* Send timestamped chunk to the device with arbitrary size */</span><br><span>diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h</span><br><span>index 54ffc31..f19a8dc 100644</span><br><span>--- a/Transceiver52M/radioInterface.h</span><br><span>+++ b/Transceiver52M/radioInterface.h</span><br><span>@@ -71,7 +71,7 @@</span><br><span> virtual bool pushBuffer(void);</span><br><span> </span><br><span> /** pull GSM bursts from the receive buffer */</span><br><span style="color: hsl(0, 100%, 40%);">- virtual void pullBuffer(void);</span><br><span style="color: hsl(120, 100%, 40%);">+ virtual int pullBuffer(void);</span><br><span> </span><br><span> public:</span><br><span> </span><br><span>@@ -116,8 +116,8 @@</span><br><span> void driveTransmitRadio(std::vector<signalVector *> &bursts,</span><br><span> std::vector<bool> &zeros);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /** drive reception of GSM bursts */</span><br><span style="color: hsl(0, 100%, 40%);">- bool driveReceiveRadio();</span><br><span style="color: hsl(120, 100%, 40%);">+ /** drive reception of GSM bursts. -1: Error. 0: Radio off. 1: Received something. */</span><br><span style="color: hsl(120, 100%, 40%);">+ int driveReceiveRadio();</span><br><span> </span><br><span> int setPowerAttenuation(int atten, size_t chan = 0);</span><br><span> </span><br><span>@@ -149,7 +149,7 @@</span><br><span> signalVector *outerRecvBuffer;</span><br><span> </span><br><span> bool pushBuffer();</span><br><span style="color: hsl(0, 100%, 40%);">- void pullBuffer();</span><br><span style="color: hsl(120, 100%, 40%);">+ int pullBuffer();</span><br><span> </span><br><span> public:</span><br><span> RadioInterfaceResamp(RadioDevice* wRadio, size_t tx_sps, size_t rx_sps);</span><br><span>@@ -162,7 +162,7 @@</span><br><span> class RadioInterfaceMulti : public RadioInterface {</span><br><span> private:</span><br><span> bool pushBuffer();</span><br><span style="color: hsl(0, 100%, 40%);">- void pullBuffer();</span><br><span style="color: hsl(120, 100%, 40%);">+ int pullBuffer();</span><br><span> </span><br><span> signalVector *outerSendBuffer;</span><br><span> signalVector *outerRecvBuffer;</span><br><span>diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp</span><br><span>index b3add21..67ccb25 100644</span><br><span>--- a/Transceiver52M/radioInterfaceMulti.cpp</span><br><span>+++ b/Transceiver52M/radioInterfaceMulti.cpp</span><br><span>@@ -225,14 +225,14 @@</span><br><span> }</span><br><span> </span><br><span> /* Receive a timestamped chunk from the device */</span><br><span style="color: hsl(0, 100%, 40%);">-void RadioInterfaceMulti::pullBuffer()</span><br><span style="color: hsl(120, 100%, 40%);">+int RadioInterfaceMulti::pullBuffer()</span><br><span> {</span><br><span> bool local_underrun;</span><br><span> size_t num;</span><br><span> float *buf;</span><br><span> </span><br><span> if (recvBuffer[0]->getFreeSegments() <= 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> </span><br><span> /* Outer buffer access size is fixed */</span><br><span> num = mRadio->readSamples(convertRecvBuffer,</span><br><span>@@ -242,7 +242,7 @@</span><br><span> &local_underrun);</span><br><span> if (num != channelizer->inputLen()) {</span><br><span> LOG(ALERT) << "Receive error " << num << ", " << channelizer->inputLen();</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> }</span><br><span> </span><br><span> convert_short_float((float *) outerRecvBuffer->begin(),</span><br><span>@@ -288,6 +288,7 @@</span><br><span> LOG(ALERT) << "Sample rate upsampling error";</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> /* Send a timestamped chunk to the device */</span><br><span>diff --git a/Transceiver52M/radioInterfaceResamp.cpp b/Transceiver52M/radioInterfaceResamp.cpp</span><br><span>index b0f799e..8ae4aa1 100644</span><br><span>--- a/Transceiver52M/radioInterfaceResamp.cpp</span><br><span>+++ b/Transceiver52M/radioInterfaceResamp.cpp</span><br><span>@@ -160,13 +160,13 @@</span><br><span> }</span><br><span> </span><br><span> /* Receive a timestamped chunk from the device */</span><br><span style="color: hsl(0, 100%, 40%);">-void RadioInterfaceResamp::pullBuffer()</span><br><span style="color: hsl(120, 100%, 40%);">+int RadioInterfaceResamp::pullBuffer()</span><br><span> {</span><br><span> bool local_underrun;</span><br><span> int rc, num_recv;</span><br><span> </span><br><span> if (recvBuffer[0]->getFreeSegments() <= 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> </span><br><span> /* Outer buffer access size is fixed */</span><br><span> num_recv = mRadio->readSamples(convertRecvBuffer,</span><br><span>@@ -176,7 +176,7 @@</span><br><span> &local_underrun);</span><br><span> if (num_recv != (int) resamp_outchunk) {</span><br><span> LOG(ALERT) << "Receive error " << num_recv;</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> }</span><br><span> </span><br><span> convert_short_float((float *) outerRecvBuffer->begin(),</span><br><span>@@ -196,6 +196,7 @@</span><br><span> </span><br><span> /* Set history for the next chunk */</span><br><span> outerRecvBuffer->updateHistory();</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> /* Send a timestamped chunk to the device */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10741">change 10741</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/10741"/><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: Id7b08b19d6575c79b4d57db656a17ff05bb61ee9 </div>
<div style="display:none"> Gerrit-Change-Number: 10741 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>