aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2019-01-11 21:36:34 +0100
committerHarald Welte <laforge@gnumonks.org>2019-01-11 21:46:45 +0100
commita944001873538fbad099ade61de0e5682515a32e (patch)
tree05e6d2ae4dbfdfbf360bb6221ac37f430c2323fb
parentLMSDeviceTest: fix link errors on OBS (diff)
downloadOsmoTRX-a944001873538fbad099ade61de0e5682515a32e.tar.xz
OsmoTRX-a944001873538fbad099ade61de0e5682515a32e.zip
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
-rw-r--r--Transceiver52M/device/usrp1/USRPDevice.cpp11
-rw-r--r--Transceiver52M/device/usrp1/USRPDevice.h1
2 files changed, 3 insertions, 9 deletions
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 @@ int USRPDevice::open(const std::string &, int, bool)
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 @@ int USRPDevice::open(const std::string &, int, bool)
m_uRx.reset();
return -1;
}
- }
try {
m_uTx = usrp_standard_tx_sptr(usrp_standard_tx::make(
@@ -145,7 +143,7 @@ int USRPDevice::open(const std::string &, int, bool)
return -1;
}
- if (!skipRx) m_uRx->stop();
+ m_uRx->stop();
m_uTx->stop();
#endif
@@ -188,10 +186,10 @@ bool USRPDevice::start()
{
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 @@ bool USRPDevice::start()
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 @@ private:
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);