From 2c673e0f3ec1853ae93afb06c22ff5af9fe3595b Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 29 Jul 2019 20:14:47 +0200 Subject: radioInterface: Clarify how underruns are handled driving a radioDevice The underrun parameter in radioDevice's readSamples() is not a "Rx Underrun" event, but rather it's used to retrieve a "Tx Underrun" which on some SDRs (like USRP1) seems to be (so far) available only at readSamples() times. Thus, underrun parameter for both readSamples() and writeSamples() is actually flagging the same event, and should be ORed in pushBuffer() as it's already done in pullBuffer(). Otherwise if implementation is setting the underrun pointer to false, it could erase the flag being marked by the counterpart function before isUnderrun() is called (which is the one responsible to clear the flag). Change-Id: Id549489fc1485e0d762818c8e682aaddd5041f1c --- Transceiver52M/radioInterface.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Transceiver52M') diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index e32848e..0d33f22 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -348,6 +348,7 @@ int RadioInterface::pullBuffer() /* Send timestamped chunk to the device with arbitrary size */ bool RadioInterface::pushBuffer() { + bool local_underrun; size_t numSent, segmentLen = sendBuffer[0]->getSegmentLen(); if (sendBuffer[0]->getAvailSegments() < 1) @@ -363,8 +364,9 @@ bool RadioInterface::pushBuffer() /* Send the all samples in the send buffer */ numSent = mRadio->writeSamples(convertSendBuffer, segmentLen, - &underrun, + &local_underrun, writeTimestamp); + underrun |= local_underrun; writeTimestamp += numSent; return true; -- cgit v1.2.3