paulmataruso/openbts
1
0
Fork 0
mirror of https://github.com/RangeNetworks/openbts.git synced 2025-11-02 04:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Transceiver52M: Remove and rename oversampling variables

Browse Source 
The transceiver only uses a single integer oversampling value,
which is more simply referred to as samples-per-symbol.

mRadioOversampling --> mSPS
mTransceiverOversampling (removed)

Signed-off-by: Thomas Tsou <tom@tsou.cc>

git-svn-id: http://wush.net/svn/range/software/public/openbts/trunk@6722 19bc5d8c-e614-43d4-8b26-e1612bc8e597
This commit is contained in:
Thomas Tsou
2013-10-17 06:17:30 +00:00
parent d6515f2613
commit c9668c3d66
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Transceiver52M/radioInterface.cpp
View File

@@ -29,12 +29,11 @@ bool started = false;
RadioInterface::RadioInterface(RadioDevice *wRadio,
int wReceiveOffset,
int wRadioOversampling,
int wTransceiverOversampling,
int wSPS,
GSM::Time wStartTime)
: underrun(false), sendCursor(0), rcvCursor(0), mOn(false),
mRadio(wRadio), receiveOffset(wReceiveOffset),
samplesPerSymbol(wRadioOversampling), powerScaling(1.0),
samplesPerSymbol(wSPS), powerScaling(1.0),
loadTest(false)
{
mClock.set(wStartTime);

5
Transceiver52M/radioInterface.h
View File

@@ -52,8 +52,6 @@ private:
int samplesPerSymbol; ///< samples per GSM symbol
int receiveOffset; ///< offset b/w transmit and receive GSM timestamps, in timeslots
int mRadioOversampling;
int mTransceiverOversampling;
bool mOn; ///< indicates radio is on
@@ -86,8 +84,7 @@ public:
/** constructor */
RadioInterface(RadioDevice* wRadio = NULL,
int receiveOffset = 3,
int wRadioOversampling = SAMPSPERSYM,
int wTransceiverOversampling = SAMPSPERSYM,
int wSPS = SAMPSPERSYM,
GSM::Time wStartTime = GSM::Time(0));
/** destructor */

3
Transceiver52M/runTransceiver.cpp
View File

@@ -88,14 +88,13 @@ int main(int argc, char *argv[])
srandom(time(NULL));
int mOversamplingRate = numARFCN/2 + numARFCN;
RadioDevice *usrp = RadioDevice::make(DEVICERATE * SAMPSPERSYM, SAMPSPERSYM);
if (!usrp->open(deviceArgs)) {
LOG(ALERT) << "Transceiver exiting..." << std::endl;
return EXIT_FAILURE;
}
RadioInterface* radio = new RadioInterface(usrp,3,SAMPSPERSYM,mOversamplingRate,false);
RadioInterface* radio = new RadioInterface(usrp,3,SAMPSPERSYM,false);
Transceiver *trx = new Transceiver(gConfig.getNum("TRX.Port"),gConfig.getStr("TRX.IP").c_str(),SAMPSPERSYM,GSM::Time(3,0),radio);
trx->receiveFIFO(radio->receiveFIFO());
/*