<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/15520">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">radioDevice: Introduce getTxGain() API<br><br>It will be used in later commits by radioInterfaceMulti.<br><br>Change-Id: Ie3caca8971ed1e5370dfed6fb60716a24e7d82a5<br>---<br>M Transceiver52M/device/common/radioDevice.h<br>M Transceiver52M/device/lms/LMSDevice.h<br>M Transceiver52M/device/uhd/UHDDevice.cpp<br>M Transceiver52M/device/uhd/UHDDevice.h<br>M Transceiver52M/device/usrp1/USRPDevice.h<br>5 files changed, 25 insertions(+), 0 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/20/15520/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/device/common/radioDevice.h b/Transceiver52M/device/common/radioDevice.h</span><br><span>index b4928f2..1d85204 100644</span><br><span>--- a/Transceiver52M/device/common/radioDevice.h</span><br><span>+++ b/Transceiver52M/device/common/radioDevice.h</span><br><span>@@ -131,6 +131,9 @@</span><br><span>   /** sets the transmit chan gain, returns the gain setting **/</span><br><span>   virtual double setTxGain(double dB, size_t chan = 0) = 0;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+  /** get transmit gain */</span><br><span style="color: hsl(120, 100%, 40%);">+  virtual double getTxGain(size_t chan = 0) = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>   /** return maximum Tx Gain **/</span><br><span>   virtual double maxTxGain(void) = 0;</span><br><span> </span><br><span>diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>index 71a706c..1464c53 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.h</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>@@ -162,6 +162,11 @@</span><br><span>        /** sets the transmit chan gain, returns the gain setting **/</span><br><span>        double setTxGain(double dB, size_t chan = 0);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+     /** get transmit gain */</span><br><span style="color: hsl(120, 100%, 40%);">+      double getTxGain(size_t chan = 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+           return tx_gains[chan];</span><br><span style="color: hsl(120, 100%, 40%);">+        }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  /** return maximum Tx Gain **/</span><br><span>       double maxTxGain(void);</span><br><span> </span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>index 5b38df4..3b59291 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>@@ -310,6 +310,19 @@</span><br><span>  return rx_gains[chan];</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+double uhd_device::getTxGain(size_t chan)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (iface == MULTI_ARFCN)</span><br><span style="color: hsl(120, 100%, 40%);">+             chan = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   if (chan >= tx_gains.size()) {</span><br><span style="color: hsl(120, 100%, 40%);">+             LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;</span><br><span style="color: hsl(120, 100%, 40%);">+         return 0.0f;</span><br><span style="color: hsl(120, 100%, 40%);">+  }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   return tx_gains[chan];</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*</span><br><span>     Parse the UHD device tree and mboard name to find out what device we're</span><br><span>     dealing with. We need the window type so that the transceiver knows how to</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.h b/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>index 944578a..44f7ebb 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>@@ -96,6 +96,7 @@</span><br><span>  double minRxGain(void) { return rx_gain_min; }</span><br><span> </span><br><span>   double setTxGain(double db, size_t chan);</span><br><span style="color: hsl(120, 100%, 40%);">+     double getTxGain(size_t chan = 0);</span><br><span>   double maxTxGain(void) { return tx_gain_max; }</span><br><span>       double minTxGain(void) { return tx_gain_min; }</span><br><span> </span><br><span>diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>index 734b361..bb70648 100644</span><br><span>--- a/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>+++ b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>@@ -171,6 +171,9 @@</span><br><span>   /** sets the transmit chan gain, returns the gain setting **/</span><br><span>   double setTxGain(double dB, size_t chan = 0);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+  /** get transmit gain */</span><br><span style="color: hsl(120, 100%, 40%);">+  double getTxGain(size_t chan = 0) { return txGain; }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>   /** return maximum Tx Gain **/</span><br><span>   double maxTxGain(void);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/15520">change 15520</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/+/15520"/><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: Ie3caca8971ed1e5370dfed6fb60716a24e7d82a5 </div>
<div style="display:none"> Gerrit-Change-Number: 15520 </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>