commit d24cc2cd9647c56c0103490c3a0bfc1dd13d6cd2
author Thomas Tsou <tom@tsou.cc> Tue Aug 20 15:41:45 2013 -0400
committer Thomas Tsou <tom@tsou.cc> Fri Oct 18 13:04:15 2013 -0400
tree 4a4476a77a240903a41bd424b3ff4e83beb63f89
parent ddd6defb431ddca2d6f1293082fadcd7a044910a

Transceiver52M: Rename samples-per-symbol variable names

Because repeatedly typing mSamplesPerSymbol is giving me
carpal tunnel syndrome. Replace with the much shorter,
easier to type, and just as clear name of 'sps'.

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

Transceiver52M/radioInterface.cpp

diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp
index 93d2ff3..e3fa2a4 100644
--- a/Transceiver52M/radioInterface.cpp
+++ b/Transceiver52M/radioInterface.cpp
@@ -55,7 +55,7 @@
 			       GSM::Time wStartTime)
   : underrun(false), sendCursor(0), rcvCursor(0), mOn(false),
     mRadio(wRadio), receiveOffset(wReceiveOffset),
-    samplesPerSymbol(wSPS), powerScaling(1.0),
+    sps(wSPS), powerScaling(1.0),
     loadTest(false)
 {
   mClock.set(wStartTime);
@@ -150,8 +150,8 @@
   mRadio->updateAlignment(writeTimestamp-10000); 
   mRadio->updateAlignment(writeTimestamp-10000);
 
-  sendBuffer = new float[2*2*INCHUNK*samplesPerSymbol];
-  rcvBuffer = new float[2*2*OUTCHUNK*samplesPerSymbol];
+  sendBuffer = new float[2*2*INCHUNK*sps];
+  rcvBuffer = new float[2*2*OUTCHUNK*sps];
  
   mOn = true;
 
@@ -202,8 +202,8 @@
   // while there's enough data in receive buffer, form received 
   //    GSM bursts and pass up to Transceiver
   // Using the 157-156-156-156 symbols per timeslot format.
-  while (rcvSz > (symbolsPerSlot + (tN % 4 == 0))*samplesPerSymbol) {
-    signalVector rxVector((symbolsPerSlot + (tN % 4 == 0))*samplesPerSymbol);
+  while (rcvSz > (symbolsPerSlot + (tN % 4 == 0)) * sps) {
+    signalVector rxVector((symbolsPerSlot + (tN % 4 == 0)) * sps);
     unRadioifyVector(rcvBuffer+readSz*2,rxVector);
     GSM::Time tmpTime = rcvClock;
     if (rcvClock.FN() >= 0) {
@@ -223,8 +223,8 @@
     rcvClock.incTN();
     //if (mReceiveFIFO.size() >= 16) mReceiveFIFO.wait(8);
     //LOG(DEBUG) << "receiveFIFO: wrote radio vector at time: " << mClock.get() << ", new size: " << mReceiveFIFO.size() ;
-    readSz += (symbolsPerSlot+(tN % 4 == 0))*samplesPerSymbol;
-    rcvSz -= (symbolsPerSlot+(tN % 4 == 0))*samplesPerSymbol;
+    readSz += (symbolsPerSlot+(tN % 4 == 0)) * sps;
+    rcvSz -= (symbolsPerSlot+(tN % 4 == 0)) * sps;
 
     tN = rcvClock.TN();
   }