Change in osmo-trx[master]: usrp1: Remove uninitialized skipRx logic

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12533 )

Change subject: usrp1: Remove uninitialized skipRx logic
......................................................................

usrp1: Remove uninitialized skipRx logic

There appears to have been some logic to operate a USRP1 in
transmit-only GSM mode.  This is achieved using the skipRx member
of the transceiver object.  However, there's nobody that ever
initializes it properly, and hence the feature is not possible to
use anyway.

I don't think this has any valid use case, so let's remove it.

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

Approvals:
  Jenkins Builder: Verified
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp
index 5d19514..a8f1638 100644
--- a/Transceiver52M/device/usrp1/USRPDevice.cpp
+++ b/Transceiver52M/device/usrp1/USRPDevice.cpp
@@ -100,7 +100,6 @@
   string rbf = "std_inband.rbf";
   //string rbf = "inband_1rxhb_1tx.rbf";
   m_uRx.reset();
-  if (!skipRx) {
   try {
     m_uRx = usrp_standard_rx_sptr(usrp_standard_rx::make(
                                         0, decimRate * tx_sps, 1, -1,
@@ -122,7 +121,6 @@
     m_uRx.reset();
     return -1;
   }
-  }
 
   try {
     m_uTx = usrp_standard_tx_sptr(usrp_standard_tx::make(
@@ -145,7 +143,7 @@
     return -1;
   }
 
-  if (!skipRx) m_uRx->stop();
+  m_uRx->stop();
   m_uTx->stop();
 
 #endif
@@ -188,10 +186,10 @@
 {
   LOGC(DDEV, INFO) << "starting USRP...";
 #ifndef SWLOOPBACK
-  if (!m_uRx && !skipRx) return false;
+  if (!m_uRx) return false;
   if (!m_uTx) return false;
 
-  if (!skipRx) m_uRx->stop();
+  m_uRx->stop();
   m_uTx->stop();
 
   writeLock.lock();
@@ -221,10 +219,7 @@
   isAligned = false;
 
 
-  if (!skipRx)
   started = (m_uRx->start() && m_uTx->start());
-  else
-  started = m_uTx->start();
   return started;
 #else
   gettimeofday(&lastReadTime,NULL);
diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h
index 451b5a9..521d81d 100644
--- a/Transceiver52M/device/usrp1/USRPDevice.h
+++ b/Transceiver52M/device/usrp1/USRPDevice.h
@@ -55,7 +55,6 @@
   unsigned long long samplesWritten;	///< number of samples sent to USRP
 
   bool started;			///< flag indicates USRP has started
-  bool skipRx;			///< set if USRP is transmit-only.
 
   static const unsigned int currDataSize_log2 = 21;
   static const unsigned long currDataSize = (1 << currDataSize_log2);

-- 
To view, visit https://gerrit.osmocom.org/12533
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I616193f1e9aaefbf4ceb26761657811093f28b6f
Gerrit-Change-Number: 12533
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190112/ec16a6c5/attachment.htm>