diff options
| author | Thomas Tsou <tom@tsou.cc> | 2013-04-08 13:45:55 -0400 |
|---|---|---|
| committer | Alexander Chemeris <Alexander.Chemeris@gmail.com> | 2013-06-24 01:46:34 +0400 |
| commit | 801ce60d4af876badb7beed09e9ee24674f310ea (patch) | |
| tree | e468b1862717c8ac29a625d000be5a6204c4cea3 | |
| parent | ed64e799bc051e7cffe71ead0b76bf8bcd9c6f4c (diff) | |
Transceiver52M: Remove and rename oversampling variables
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>
| -rw-r--r-- | Transceiver52M/radioInterface.cpp | 5 | ||||
| -rw-r--r-- | Transceiver52M/radioInterface.h | 5 | ||||
| -rw-r--r-- | Transceiver52M/runTransceiver.cpp | 3 |
3 files changed, 4 insertions, 9 deletions
diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index e7230d8..95b8ab6 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -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); diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h index d1131c6..216cf3e 100644 --- a/Transceiver52M/radioInterface.h +++ b/Transceiver52M/radioInterface.h @@ -54,8 +54,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 @@ -88,8 +86,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 */ diff --git a/Transceiver52M/runTransceiver.cpp b/Transceiver52M/runTransceiver.cpp index 81119b3..43ee82e 100644 --- a/Transceiver52M/runTransceiver.cpp +++ b/Transceiver52M/runTransceiver.cpp @@ -89,7 +89,6 @@ 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; @@ -109,7 +108,7 @@ int main(int argc, char *argv[]) LOG(INFO) << "transceiver using transmit antenna " << usrp->getRxAntenna(); LOG(INFO) << "transceiver using receive antenna " << usrp->getTxAntenna(); - 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()); |