<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/15521">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">radioInterfaceMulti: Override setTxGain() to avoid chan!=0 calls<br><br>Change-Id: I7e67f660c3b0b009db59b405de603f6058021802<br>---<br>M Transceiver52M/radioInterface.cpp<br>M Transceiver52M/radioInterface.h<br>M Transceiver52M/radioInterfaceMulti.cpp<br>3 files changed, 19 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/21/15521/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 9c7c044..6e49a75 100644</span><br><span>--- a/Transceiver52M/radioInterface.cpp</span><br><span>+++ b/Transceiver52M/radioInterface.cpp</span><br><span>@@ -112,7 +112,7 @@</span><br><span>   if (atten < 0.0)</span><br><span>     atten = 0.0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  rfGain = mDevice->setTxGain(mDevice->maxTxGain() - (double) atten, chan);</span><br><span style="color: hsl(120, 100%, 40%);">+  rfGain = setTxGain(mDevice->maxTxGain() - (double) atten, chan);</span><br><span>   digAtten = (double) atten - mDevice->maxTxGain() + rfGain;</span><br><span> </span><br><span>   if (digAtten < 1.0)</span><br><span>@@ -307,6 +307,11 @@</span><br><span>   return mDevice->setRxGain(dB, chan);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+double RadioInterface::setTxGain(double dB, size_t chan)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+  return mDevice->setTxGain(dB, chan);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Receive a timestamped chunk from the device */</span><br><span> int RadioInterface::pullBuffer()</span><br><span> {</span><br><span>diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h</span><br><span>index 945624a..83e00b9 100644</span><br><span>--- a/Transceiver52M/radioInterface.h</span><br><span>+++ b/Transceiver52M/radioInterface.h</span><br><span>@@ -134,6 +134,9 @@</span><br><span>   /** drive synchronization of Tx/Rx of USRP */</span><br><span>   void alignRadio();</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+  /** set transmit gain */</span><br><span style="color: hsl(120, 100%, 40%);">+  virtual double setTxGain(double dB, size_t chan = 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>   friend void *AlignRadioServiceLoopAdapter(RadioInterface*);</span><br><span> };</span><br><span> </span><br><span>@@ -157,6 +160,7 @@</span><br><span> private:</span><br><span>   bool pushBuffer();</span><br><span>   int pullBuffer();</span><br><span style="color: hsl(120, 100%, 40%);">+  virtual double setTxGain(double dB, size_t chan);</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 c41ec22..4022d3a 100644</span><br><span>--- a/Transceiver52M/radioInterfaceMulti.cpp</span><br><span>+++ b/Transceiver52M/radioInterfaceMulti.cpp</span><br><span>@@ -405,3 +405,12 @@</span><br><span>   else</span><br><span>     return mDevice->getRxGain();</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+double RadioInterfaceMulti::setTxGain(double dB, size_t chan)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+        if (chan == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+                return mDevice->setTxGain(dB);</span><br><span style="color: hsl(120, 100%, 40%);">+     else</span><br><span style="color: hsl(120, 100%, 40%);">+          return mDevice->getTxGain();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/15521">change 15521</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/+/15521"/><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: I7e67f660c3b0b009db59b405de603f6058021802 </div>
<div style="display:none"> Gerrit-Change-Number: 15521 </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-MessageType: newchange </div>