commit a801ae5d94529f2ad8f55c776f2c8ea3ba5b9c50
author Pau Espin Pedrol <pespin@sysmocom.de> Fri Sep 13 15:59:29 2019 +0200
committer Pau Espin Pedrol <pespin@sysmocom.de> Fri Sep 13 15:59:31 2019 +0200
tree faea53d5fa129c1b6897cc21a4a5cfd7bcaf65c7
parent 923b4bc9a2d70c085d9680ba36e1e5ea9d010977

radioInterface: Rename mRadio to mDevice

Previous naming is ready confusing, because "Radio" is actually the
common term between radioInterface and radioDevice, and it looks like
it's referring to radioInterface rather than radioDevice. On the other
hand, mDevice cleary states it refers to the radioDevice item.

Change-Id: I708bb1992a156fb63334f5590f2c6648ca27495e

Transceiver52M/radioInterface.cpp

diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp
index 0d33f22..bd19b24 100644
--- a/Transceiver52M/radioInterface.cpp
+++ b/Transceiver52M/radioInterface.cpp
@@ -32,10 +32,10 @@
 #define CHUNK		625
 #define NUMCHUNKS	4
 
-RadioInterface::RadioInterface(RadioDevice *wRadio, size_t tx_sps,
+RadioInterface::RadioInterface(RadioDevice *wDevice, size_t tx_sps,
                                size_t rx_sps, size_t chans,
                                int wReceiveOffset, GSM::Time wStartTime)
-  : mRadio(wRadio), mSPSTx(tx_sps), mSPSRx(rx_sps), mChans(chans),
+  : mDevice(wDevice), mSPSTx(tx_sps), mSPSRx(rx_sps), mChans(chans),
     underrun(false), overrun(false), writeTimestamp(0), readTimestamp(0),
     receiveOffset(wReceiveOffset), mOn(false)
 {
@@ -93,11 +93,11 @@
 }
 
 double RadioInterface::fullScaleInputValue(void) {
-  return mRadio->fullScaleInputValue();
+  return mDevice->fullScaleInputValue();
 }
 
 double RadioInterface::fullScaleOutputValue(void) {
-  return mRadio->fullScaleOutputValue();
+  return mDevice->fullScaleOutputValue();
 }
 
 int RadioInterface::setPowerAttenuation(int atten, size_t chan)
@@ -112,8 +112,8 @@
   if (atten < 0.0)
     atten = 0.0;
 
-  rfGain = mRadio->setTxGain(mRadio->maxTxGain() - (double) atten, chan);
-  digAtten = (double) atten - mRadio->maxTxGain() + rfGain;
+  rfGain = mDevice->setTxGain(mDevice->maxTxGain() - (double) atten, chan);
+  digAtten = (double) atten - mDevice->maxTxGain() + rfGain;
 
   if (digAtten < 1.0)
     powerScaling[chan] = 1.0;
@@ -148,12 +148,12 @@
 
 bool RadioInterface::tuneTx(double freq, size_t chan)
 {
-  return mRadio->setTxFreq(freq, chan);
+  return mDevice->setTxFreq(freq, chan);
 }
 
 bool RadioInterface::tuneRx(double freq, size_t chan)
 {
-  return mRadio->setRxFreq(freq, chan);
+  return mDevice->setRxFreq(freq, chan);
 }
 
 /** synchronization thread loop */
@@ -169,7 +169,7 @@
 }
 
 void RadioInterface::alignRadio() {
-  mRadio->updateAlignment(writeTimestamp+ (TIMESTAMP) 10000);
+  mDevice->updateAlignment(writeTimestamp+ (TIMESTAMP) 10000);
 }
 
 bool RadioInterface::start()
@@ -178,12 +178,12 @@
     return true;
 
   LOG(INFO) << "Starting radio device";
-  if (mRadio->requiresRadioAlign())
+  if (mDevice->requiresRadioAlign())
         mAlignRadioServiceLoopThread.start(
                                 (void * (*)(void*))AlignRadioServiceLoopAdapter,
                                 (void*)this);
 
-  if (!mRadio->start())
+  if (!mDevice->start())
     return false;
 
   for (size_t i = 0; i < mChans; i++) {
@@ -191,11 +191,11 @@
     recvBuffer[i]->reset();
   }
 
-  writeTimestamp = mRadio->initialWriteTimestamp();
-  readTimestamp = mRadio->initialReadTimestamp();
+  writeTimestamp = mDevice->initialWriteTimestamp();
+  readTimestamp = mDevice->initialReadTimestamp();
 
-  mRadio->updateAlignment(writeTimestamp-10000);
-  mRadio->updateAlignment(writeTimestamp-10000);
+  mDevice->updateAlignment(writeTimestamp-10000);
+  mDevice->updateAlignment(writeTimestamp-10000);
 
   mOn = true;
   LOG(INFO) << "Radio started";
@@ -211,7 +211,7 @@
  */
 bool RadioInterface::stop()
 {
-  if (!mOn || !mRadio->stop())
+  if (!mOn || !mDevice->stop())
     return false;
 
   mOn = false;
@@ -304,12 +304,12 @@
 
 double RadioInterface::setRxGain(double dB, size_t chan)
 {
-  return mRadio->setRxGain(dB, chan);
+  return mDevice->setRxGain(dB, chan);
 }
 
 double RadioInterface::getRxGain(size_t chan)
 {
-  return mRadio->getRxGain(chan);
+  return mDevice->getRxGain(chan);
 }
 
 /* Receive a timestamped chunk from the device */
@@ -323,7 +323,7 @@
     return -1;
 
   /* Outer buffer access size is fixed */
-  numRecv = mRadio->readSamples(convertRecvBuffer,
+  numRecv = mDevice->readSamples(convertRecvBuffer,
                                 segmentLen,
                                 &overrun,
                                 readTimestamp,
@@ -362,7 +362,7 @@
   }
 
   /* Send the all samples in the send buffer */
-  numSent = mRadio->writeSamples(convertSendBuffer,
+  numSent = mDevice->writeSamples(convertSendBuffer,
                                  segmentLen,
                                  &local_underrun,
                                  writeTimestamp);