<p>pespin <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/15523">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve
  fixeria: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">radioInterface{Multi,Resamp}: Fix successful writeSamples() masking underrun from readSamples()<br><br>The only who should be setting class instance value "underrun" to false<br>is isUnderrun().<br>Similar fixes were already applied lately to radioInterface.cpp.<br><br>Change-Id: I3239b1df4536c080365106b3e4daa523b57f5dff<br>---<br>M Transceiver52M/radioInterfaceMulti.cpp<br>M Transceiver52M/radioInterfaceResamp.cpp<br>2 files changed, 6 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp</span><br><span>index 4022d3a..99f6231 100644</span><br><span>--- a/Transceiver52M/radioInterfaceMulti.cpp</span><br><span>+++ b/Transceiver52M/radioInterfaceMulti.cpp</span><br><span>@@ -309,6 +309,7 @@</span><br><span> /* Send a timestamped chunk to the device */</span><br><span> bool RadioInterfaceMulti::pushBuffer()</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+       bool local_underrun;</span><br><span>         if (sendBuffer[0]->getAvailSegments() <= 0)</span><br><span>            return false;</span><br><span> </span><br><span>@@ -341,12 +342,13 @@</span><br><span> </span><br><span>        size_t num = mDevice->writeSamples(convertSendBuffer,</span><br><span>                                       outerSendBuffer->size(),</span><br><span style="color: hsl(0, 100%, 40%);">-                                     &underrun,</span><br><span style="color: hsl(120, 100%, 40%);">+                                        &local_underrun,</span><br><span>                                         writeTimestamp);</span><br><span>   if (num != outerSendBuffer->size()) {</span><br><span>             LOG(ALERT) << "Transmit error " << num;</span><br><span>        }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ underrun |= local_underrun;</span><br><span>  writeTimestamp += num;</span><br><span> </span><br><span>   return true;</span><br><span>diff --git a/Transceiver52M/radioInterfaceResamp.cpp b/Transceiver52M/radioInterfaceResamp.cpp</span><br><span>index d6dc52c..864cdee 100644</span><br><span>--- a/Transceiver52M/radioInterfaceResamp.cpp</span><br><span>+++ b/Transceiver52M/radioInterfaceResamp.cpp</span><br><span>@@ -204,6 +204,7 @@</span><br><span> /* Send a timestamped chunk to the device */</span><br><span> bool RadioInterfaceResamp::pushBuffer()</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+   bool local_underrun;</span><br><span>         int rc;</span><br><span>      size_t numSent;</span><br><span> </span><br><span>@@ -225,12 +226,13 @@</span><br><span> </span><br><span>      numSent = mDevice->writeSamples(convertSendBuffer,</span><br><span>                                       resamp_outchunk,</span><br><span style="color: hsl(0, 100%, 40%);">-                                &underrun,</span><br><span style="color: hsl(120, 100%, 40%);">+                                &local_underrun,</span><br><span>                                 writeTimestamp);</span><br><span>      if (numSent != resamp_outchunk) {</span><br><span>            LOG(ALERT) << "Transmit error " << numSent;</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ underrun |= local_underrun;</span><br><span>  writeTimestamp += resamp_outchunk;</span><br><span> </span><br><span>       return true;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/15523">change 15523</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/+/15523"/><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: I3239b1df4536c080365106b3e4daa523b57f5dff </div>
<div style="display:none"> Gerrit-Change-Number: 15523 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>