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
diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h
index dcfb67f..235d888 100644
--- a/Transceiver52M/radioInterface.h
+++ b/Transceiver52M/radioInterface.h
@@ -36,7 +36,7 @@
std::vector<VectorFIFO> mReceiveFIFO; ///< FIFO that holds receive bursts
- RadioDevice *mRadio; ///< the USRP object
+ RadioDevice *mDevice; ///< the USRP object
size_t mSPSTx;
size_t mSPSRx;
@@ -84,7 +84,7 @@
virtual void close();
/** constructor */
- RadioInterface(RadioDevice* wRadio, size_t tx_sps, size_t rx_sps,
+ RadioInterface(RadioDevice* wDevice, size_t tx_sps, size_t rx_sps,
size_t chans = 1, int receiveOffset = 3,
GSM::Time wStartTime = GSM::Time(0));
@@ -128,10 +128,10 @@
double fullScaleOutputValue();
/** get transport window type of attached device */
- enum RadioDevice::TxWindowType getWindowType() { return mRadio->getWindowType(); }
+ enum RadioDevice::TxWindowType getWindowType() { return mDevice->getWindowType(); }
/** Minimum latency that the device can achieve */
- GSM::Time minLatency() { return mRadio->minLatency(); }
+ GSM::Time minLatency() { return mDevice->minLatency(); }
protected:
/** drive synchronization of Tx/Rx of USRP */
@@ -149,7 +149,7 @@
int pullBuffer();
public:
- RadioInterfaceResamp(RadioDevice* wRadio, size_t tx_sps, size_t rx_sps);
+ RadioInterfaceResamp(RadioDevice* wDevice, size_t tx_sps, size_t rx_sps);
~RadioInterfaceResamp();
bool init(int type);