commit 312e387630c6a2d6a6b0c7fc80f3661acfdfd0ed
author Thomas Tsou <tom@tsou.cc> Mon Apr 08 13:45:55 2013 -0400
committer Thomas Tsou <tom@tsou.cc> Fri Oct 18 13:03:41 2013 -0400
tree 3bbae7c97184ff5f10c5830760ac0489b277dd79
parent f2293b8cfa8167e7847cd04ce6a25cfa91abf41f

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>

Transceiver52M/radioInterface.cpp

diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp
index 65d5738..8ad72b0 100644
--- a/Transceiver52M/radioInterface.cpp
+++ b/Transceiver52M/radioInterface.cpp
@@ -29,12 +29,11 @@
 
 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);

Transceiver52M/radioInterface.h

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 @@
 
   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 @@
   /** constructor */
   RadioInterface(RadioDevice* wRadio = NULL,
 		 int receiveOffset = 3,
-		 int wRadioOversampling = SAMPSPERSYM,
-		 int wTransceiverOversampling = SAMPSPERSYM,
+		 int wSPS = SAMPSPERSYM,
 		 GSM::Time wStartTime = GSM::Time(0));
     
   /** destructor */

Transceiver52M/runTransceiver.cpp

diff --git a/Transceiver52M/runTransceiver.cpp b/Transceiver52M/runTransceiver.cpp
index ce2724d..db33251 100644
--- a/Transceiver52M/runTransceiver.cpp
+++ b/Transceiver52M/runTransceiver.cpp
@@ -88,14 +88,13 @@
 
   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());
 /*