<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/18919">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Drop old TxGain APIs from parent radioDevice abstract class<br><br>All radioDevice subclasses except USRPDevice have already been reworked<br>to use the new SetPowerAttenuation() methods, hence we can drop the<br>compatibility layer that was added to transition from the old API to the<br>new one, and move those functions to USRPDevice.<br><br>This way we simplify the parent abstract class with methods not needed<br>by most devices and not used anymore by external users of those classes.<br><br>Change-Id: Ice005cd0a07c49b6e212c06f1228ef93c24db727<br>---<br>M Transceiver52M/device/common/radioDevice.h<br>M Transceiver52M/device/lms/LMSDevice.h<br>M Transceiver52M/device/uhd/UHDDevice.h<br>M Transceiver52M/device/usrp1/USRPDevice.cpp<br>M Transceiver52M/device/usrp1/USRPDevice.h<br>5 files changed, 20 insertions(+), 50 deletions(-)<br><br></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 e51527d..cfe65da 100644</span><br><span>--- a/Transceiver52M/device/common/radioDevice.h</span><br><span>+++ b/Transceiver52M/device/common/radioDevice.h</span><br><span>@@ -151,17 +151,8 @@</span><br><span> virtual double getRxFreq(size_t chan = 0) = 0;</span><br><span> virtual double getSampleRate()=0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Default backward-compatible implementation based on TxGain APIs. New</span><br><span style="color: hsl(0, 100%, 40%);">- implementations should be based on getNominalTxPower() once implemented for</span><br><span style="color: hsl(0, 100%, 40%);">- the specific backend. */</span><br><span style="color: hsl(0, 100%, 40%);">- virtual double setPowerAttenuation(int atten, size_t chan) {</span><br><span style="color: hsl(0, 100%, 40%);">- double rfGain;</span><br><span style="color: hsl(0, 100%, 40%);">- rfGain = setTxGain(maxTxGain() - atten, chan);</span><br><span style="color: hsl(0, 100%, 40%);">- return maxTxGain() - rfGain;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- virtual double getPowerAttenuation(size_t chan=0) {</span><br><span style="color: hsl(0, 100%, 40%);">- return maxTxGain() - getTxGain(chan);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ virtual double setPowerAttenuation(int atten, size_t chan) = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ virtual double getPowerAttenuation(size_t chan=0) = 0;</span><br><span> </span><br><span> protected:</span><br><span> size_t tx_sps, rx_sps;</span><br><span>@@ -171,15 +162,6 @@</span><br><span> std::vector<std::string> tx_paths, rx_paths;</span><br><span> std::vector<struct device_counters> m_ctr;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /** sets the transmit chan gain, returns the gain setting **/</span><br><span style="color: hsl(0, 100%, 40%);">- virtual double setTxGain(double dB, size_t chan = 0) = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /** get transmit gain */</span><br><span style="color: hsl(0, 100%, 40%);">- virtual double getTxGain(size_t chan = 0) = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /** return maximum Tx Gain **/</span><br><span style="color: hsl(0, 100%, 40%);">- virtual double maxTxGain(void) = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> RadioDevice(size_t tx_sps, size_t rx_sps, InterfaceType type, size_t chan_num, double offset,</span><br><span> const std::vector<std::string>& tx_paths,</span><br><span> const std::vector<std::string>& rx_paths):</span><br><span>diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>index b6a6ab9..7af09e2 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.h</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>@@ -86,10 +86,6 @@</span><br><span> bool do_clock_src_freq(enum ReferenceType ref, double freq);</span><br><span> void get_dev_band_desc(dev_band_desc& desc);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- double setTxGain(double db, size_t chan) {OSMO_ASSERT(false); return 0.0f; }</span><br><span style="color: hsl(0, 100%, 40%);">- double getTxGain(size_t chan = 0) { OSMO_ASSERT(false); return 0.0f; };</span><br><span style="color: hsl(0, 100%, 40%);">- double maxTxGain(void) { OSMO_ASSERT(false); return 0.0f; };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> public:</span><br><span> </span><br><span> /** Object constructor */</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.h b/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>index 2c428ca..22a0948 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>@@ -134,10 +134,6 @@</span><br><span> };</span><br><span> </span><br><span> private:</span><br><span style="color: hsl(0, 100%, 40%);">- double setTxGain(double db, size_t chan) {OSMO_ASSERT(false); return 0.0f; }</span><br><span style="color: hsl(0, 100%, 40%);">- double getTxGain(size_t chan = 0) { OSMO_ASSERT(false); return 0.0f; };</span><br><span style="color: hsl(0, 100%, 40%);">- double maxTxGain(void) { OSMO_ASSERT(false); return 0.0f; };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> uhd::usrp::multi_usrp::sptr usrp_dev;</span><br><span> uhd::tx_streamer::sptr tx_stream;</span><br><span> uhd::rx_streamer::sptr rx_stream;</span><br><span>diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>index 73117d2..5c40aa8 100644</span><br><span>--- a/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>+++ b/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>@@ -205,8 +205,8 @@</span><br><span> writeLock.unlock();</span><br><span> </span><br><span> // Set gains to midpoint</span><br><span style="color: hsl(0, 100%, 40%);">- setTxGain((minTxGain() + maxTxGain()) / 2);</span><br><span style="color: hsl(0, 100%, 40%);">- setRxGain((minRxGain() + maxRxGain()) / 2);</span><br><span style="color: hsl(120, 100%, 40%);">+ setTxGain((m_dbTx->gain_min() + m_dbTx->gain_max()) / 2);</span><br><span style="color: hsl(120, 100%, 40%);">+ setRxGain((m_dbTx->gain_min() + m_dbTx->gain_max()) / 2);</span><br><span> </span><br><span> data = new short[currDataSize];</span><br><span> dataStart = 0;</span><br><span>@@ -243,16 +243,6 @@</span><br><span> #endif</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-double USRPDevice::maxTxGain()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- return m_dbTx->gain_max();</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-double USRPDevice::minTxGain()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- return m_dbTx->gain_min();</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> double USRPDevice::maxRxGain()</span><br><span> {</span><br><span> return m_dbRx->gain_max();</span><br><span>@@ -271,10 +261,10 @@</span><br><span> }</span><br><span> </span><br><span> writeLock.lock();</span><br><span style="color: hsl(0, 100%, 40%);">- if (dB > maxTxGain())</span><br><span style="color: hsl(0, 100%, 40%);">- dB = maxTxGain();</span><br><span style="color: hsl(0, 100%, 40%);">- if (dB < minTxGain())</span><br><span style="color: hsl(0, 100%, 40%);">- dB = minTxGain();</span><br><span style="color: hsl(120, 100%, 40%);">+ if (dB > m_dbTx->gain_max())</span><br><span style="color: hsl(120, 100%, 40%);">+ dB = m_dbTx->gain_max();</span><br><span style="color: hsl(120, 100%, 40%);">+ if (dB < m_dbTx->gain_min())</span><br><span style="color: hsl(120, 100%, 40%);">+ dB = m_dbTx->gain_min();</span><br><span> </span><br><span> LOGC(DDEV, NOTICE) << "Setting TX gain to " << dB << " dB.";</span><br><span> </span><br><span>@@ -314,6 +304,15 @@</span><br><span> return rxGain;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+double USRPDevice::setPowerAttenuation(int atten, size_t chan) {</span><br><span style="color: hsl(120, 100%, 40%);">+ double rfGain;</span><br><span style="color: hsl(120, 100%, 40%);">+ rfGain = setTxGain(m_dbTx->gain_max() - atten, chan);</span><br><span style="color: hsl(120, 100%, 40%);">+ return m_dbTx->gain_max() - rfGain;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+double USRPDevice::getPowerAttenuation(size_t chan) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return m_dbTx->gain_max() - getTxGain(chan);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int USRPDevice::getNominalTxPower(size_t chan)</span><br><span> {</span><br><span> /* TODO: return value based on some experimentally generated table depending on</span><br><span>diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>index 1c1b3be..f761dc0 100644</span><br><span>--- a/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>+++ b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>@@ -91,12 +91,6 @@</span><br><span> /** get transmit gain */</span><br><span> double getTxGain(size_t chan = 0) { return txGain; }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /** return maximum Tx Gain **/</span><br><span style="color: hsl(0, 100%, 40%);">- double maxTxGain(void);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /** return minimum Rx Gain **/</span><br><span style="color: hsl(0, 100%, 40%);">- double minTxGain(void);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #ifdef SWLOOPBACK</span><br><span> short loopbackBuffer[1000000];</span><br><span> int loopbackBufferSize;</span><br><span>@@ -180,6 +174,9 @@</span><br><span> /** return minimum Rx Gain **/</span><br><span> double minRxGain(void);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ double setPowerAttenuation(int atten, size_t chan);</span><br><span style="color: hsl(120, 100%, 40%);">+ double getPowerAttenuation(size_t chan=0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int getNominalTxPower(size_t chan = 0);</span><br><span> </span><br><span> /** sets the RX path to use, returns true if successful and false otherwise */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/18919">change 18919</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/+/18919"/><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: Ice005cd0a07c49b6e212c06f1228ef93c24db727 </div>
<div style="display:none"> Gerrit-Change-Number: 18919 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>