Change in ...osmo-trx[master]: USRPDevice: Return previous txGain if setting value failed

[pespin]

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15517


Change subject: USRPDevice: Return previous txGain if setting value failed
......................................................................

USRPDevice: Return previous txGain if setting value failed

Change-Id: I0d8fd51586ef01141d4e5896f0fc3029a22743f8
---
M Transceiver52M/device/usrp1/USRPDevice.cpp
M Transceiver52M/device/usrp1/USRPDevice.h
2 files changed, 5 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/17/15517/1

diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp
index ef3f92a..03a4f80 100644
--- a/Transceiver52M/device/usrp1/USRPDevice.cpp
+++ b/Transceiver52M/device/usrp1/USRPDevice.cpp
@@ -71,6 +71,7 @@
   decimRate = (unsigned int) round(masterClockRate/((GSMRATE) * (double) tx_sps));
   actualSampleRate = masterClockRate/decimRate;
   rxGain = 0;
+  txGain = 0;
 
   /*
    * Undetermined delay b/w ping response timestamp and true
@@ -279,10 +280,11 @@
 
   if (!m_dbTx->set_gain(dB))
     LOGC(DDEV, ERR) << "Error setting TX gain";
-
+  else
+    txGain = dB;
   writeLock.unlock();
 
-  return dB;
+  return txGain;
 }
 
 
diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h
index 4123c7d..734b361 100644
--- a/Transceiver52M/device/usrp1/USRPDevice.h
+++ b/Transceiver52M/device/usrp1/USRPDevice.h
@@ -80,6 +80,7 @@
   unsigned long lastPktTimestamp;
 
   double rxGain;
+  double txGain;
 
 #ifdef SWLOOPBACK
   short loopbackBuffer[1000000];

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15517
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I0d8fd51586ef01141d4e5896f0fc3029a22743f8
Gerrit-Change-Number: 15517
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190913/b04c607f/attachment.htm>