diff options
| author | kurtis.heimerl <kurtis.heimerl@19bc5d8c-e614-43d4-8b26-e1612bc8e597> | 2011-11-26 03:16:54 +0000 |
|---|---|---|
| committer | kurtis.heimerl <kurtis.heimerl@19bc5d8c-e614-43d4-8b26-e1612bc8e597> | 2011-11-26 03:16:54 +0000 |
| commit | 965e757c53d2abc805d927bb7d1d2b62d24bfe4a (patch) | |
| tree | bd78ce2166e17b1f494f38e1d05ac735dac661cb /Transceiver52M/USRPDevice.cpp | |
| parent | d302868b13c4abe5616d5425b1bc47420023831c (diff) | |
uhd: add 52 MHz transceiver support
These are mostly identical changes as added to the non-52MHz
implementation with the exception of sample rate.
Signed-off-by: Thomas Tsou <ttsou@vt.edu>
git-svn-id: http://wush.net/svn/range/software/public/openbts/trunk@2634 19bc5d8c-e614-43d4-8b26-e1612bc8e597
Diffstat (limited to 'Transceiver52M/USRPDevice.cpp')
| -rw-r--r-- | Transceiver52M/USRPDevice.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Transceiver52M/USRPDevice.cpp b/Transceiver52M/USRPDevice.cpp index 8455a15..ad53be7 100644 --- a/Transceiver52M/USRPDevice.cpp +++ b/Transceiver52M/USRPDevice.cpp @@ -51,7 +51,8 @@ enum dboardConfigType { const dboardConfigType dboardConfig = TXA_RXB; const double USRPDevice::masterClockRate = 52.0e6; -USRPDevice::USRPDevice (double _desiredSampleRate) +USRPDevice::USRPDevice (double _desiredSampleRate, bool skipRx) + : skipRx(skipRx) { LOG(INFO) << "creating USRP device..."; decimRate = (unsigned int) round(masterClockRate/_desiredSampleRate); @@ -66,13 +67,11 @@ USRPDevice::USRPDevice (double _desiredSampleRate) #endif } -bool USRPDevice::make(bool wSkipRx) +bool USRPDevice::open() { - skipRx = wSkipRx; - writeLock.unlock(); - LOG(INFO) << "making USRP device.."; + LOG(INFO) << "opening USRP device.."; #ifndef SWLOOPBACK string rbf = "std_inband.rbf"; //string rbf = "inband_1rxhb_1tx.rbf"; @@ -555,3 +554,8 @@ bool USRPDevice::setRxFreq(double wFreq) bool USRPDevice::setTxFreq(double wFreq) { return true;}; bool USRPDevice::setRxFreq(double wFreq) { return true;}; #endif + +RadioDevice *RadioDevice::make(double desiredSampleRate, bool skipRx) +{ + return new USRPDevice(desiredSampleRate, skipRx); +} |