diff options
author | kurtis.heimerl <kurtis.heimerl@19bc5d8c-e614-43d4-8b26-e1612bc8e597> | 2011-11-26 03:18:30 +0000 |
---|---|---|
committer | kurtis.heimerl <kurtis.heimerl@19bc5d8c-e614-43d4-8b26-e1612bc8e597> | 2011-11-26 03:18:30 +0000 |
commit | 8aea56e15f3593e3606594fd2e55b3b0022e7c01 (patch) | |
tree | 2cc2ceed239223a8e074e5942ca6668e8c5731fc /Transceiver52M/radioInterface.cpp | |
parent | 119ca9ca07adc03f3144c84039cfcf16555af865 (diff) |
transceiver: separate radio clock and vector interfaces
Remove radio clock and vector interfaces into their own
files. This clears up and simplifies the radio interface
and, additionaly, prepares for a further split of the I/O
portion for optional resampler use.
Signed-off-by: Thomas Tsou <ttsou@vt.edu>
git-svn-id: http://wush.net/svn/range/software/public/openbts/trunk@2669 19bc5d8c-e614-43d4-8b26-e1612bc8e597
Diffstat (limited to 'Transceiver52M/radioInterface.cpp')
-rw-r--r-- | Transceiver52M/radioInterface.cpp | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index 2b56f9a..4e261f7 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -25,46 +25,6 @@ #include "radioInterface.h" #include <Logger.h> - -GSM::Time VectorQueue::nextTime() const -{ - GSM::Time retVal; - ScopedLock lock(mLock); - while (mQ.size()==0) mWriteSignal.wait(mLock); - return mQ.top()->time(); -} - -radioVector* VectorQueue::getStaleBurst(const GSM::Time& targTime) -{ - ScopedLock lock(mLock); - if ((mQ.size()==0)) { - return NULL; - } - if (mQ.top()->time() < targTime) { - radioVector* retVal = mQ.top(); - mQ.pop(); - return retVal; - } - return NULL; -} - - -radioVector* VectorQueue::getCurrentBurst(const GSM::Time& targTime) -{ - ScopedLock lock(mLock); - if ((mQ.size()==0)) { - return NULL; - } - if (mQ.top()->time() == targTime) { - radioVector* retVal = mQ.top(); - mQ.pop(); - return retVal; - } - return NULL; -} - - - RadioInterface::RadioInterface(RadioDevice *wRadio, int wReceiveOffset, int wRadioOversampling, @@ -167,10 +127,6 @@ void RadioInterface::pushBuffer(void) { INCHUNK*samplesPerSymbol, &underrun, writeTimestamp); -<<<<<<< HEAD - //LOG(DEBUG) << "writeTimestamp: " << writeTimestamp << ", samplesWritten: " << samplesWritten; -======= ->>>>>>> 957b9c5... transceiver: remove extraneous comments writeTimestamp += (TIMESTAMP) samplesWritten; |