diff options
Diffstat (limited to 'Transceiver52M/USRPDevice.cpp')
-rw-r--r-- | Transceiver52M/USRPDevice.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Transceiver52M/USRPDevice.cpp b/Transceiver52M/USRPDevice.cpp index 237c5f1..5c99003 100644 --- a/Transceiver52M/USRPDevice.cpp +++ b/Transceiver52M/USRPDevice.cpp @@ -59,11 +59,11 @@ const dboardConfigType dboardConfig = TXA_RXB; const double USRPDevice::masterClockRate = 52.0e6; -USRPDevice::USRPDevice (double _desiredSampleRate, bool skipRx) +USRPDevice::USRPDevice(int sps, bool skipRx) : skipRx(skipRx) { LOG(INFO) << "creating USRP device..."; - decimRate = (unsigned int) round(masterClockRate/_desiredSampleRate); + decimRate = (unsigned int) round(masterClockRate/((GSMRATE) * (double) sps)); actualSampleRate = masterClockRate/decimRate; rxGain = 0; @@ -75,7 +75,7 @@ USRPDevice::USRPDevice (double _desiredSampleRate, bool skipRx) #endif } -bool USRPDevice::open(const std::string &) +int USRPDevice::open(const std::string &) { writeLock.unlock(); @@ -97,7 +97,7 @@ bool USRPDevice::open(const std::string &) catch(...) { LOG(ALERT) << "make failed on Rx"; m_uRx.reset(); - return false; + return -1; } if (m_uRx->fpga_master_clock_freq() != masterClockRate) @@ -105,7 +105,7 @@ bool USRPDevice::open(const std::string &) LOG(ALERT) << "WRONG FPGA clock freq = " << m_uRx->fpga_master_clock_freq() << ", desired clock freq = " << masterClockRate; m_uRx.reset(); - return false; + return -1; } } @@ -120,7 +120,7 @@ bool USRPDevice::open(const std::string &) catch(...) { LOG(ALERT) << "make failed on Tx"; m_uTx.reset(); - return false; + return -1; } if (m_uTx->fpga_master_clock_freq() != masterClockRate) @@ -128,7 +128,7 @@ bool USRPDevice::open(const std::string &) LOG(ALERT) << "WRONG FPGA clock freq = " << m_uTx->fpga_master_clock_freq() << ", desired clock freq = " << masterClockRate; m_uTx.reset(); - return false; + return -1; } if (!skipRx) m_uRx->stop(); @@ -165,7 +165,7 @@ bool USRPDevice::open(const std::string &) samplesWritten = 0; started = false; - return true; + return NORMAL; } @@ -556,7 +556,7 @@ bool USRPDevice::setTxFreq(double wFreq) { return true;}; bool USRPDevice::setRxFreq(double wFreq) { return true;}; #endif -RadioDevice *RadioDevice::make(double desiredSampleRate, bool skipRx) +RadioDevice *RadioDevice::make(int sps, bool skipRx) { - return new USRPDevice(desiredSampleRate, skipRx); + return new USRPDevice(sps, skipRx); } |