diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-09-13 15:59:29 +0200 |
---|---|---|
committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-09-13 15:59:31 +0200 |
commit | a801ae5d94529f2ad8f55c776f2c8ea3ba5b9c50 (patch) | |
tree | faea53d5fa129c1b6897cc21a4a5cfd7bcaf65c7 /Transceiver52M/radioInterfaceMulti.cpp | |
parent | 923b4bc9a2d70c085d9680ba36e1e5ea9d010977 (diff) |
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
Diffstat (limited to 'Transceiver52M/radioInterfaceMulti.cpp')
-rw-r--r-- | Transceiver52M/radioInterfaceMulti.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp index 0208e82..7c1ee74 100644 --- a/Transceiver52M/radioInterfaceMulti.cpp +++ b/Transceiver52M/radioInterfaceMulti.cpp @@ -238,7 +238,7 @@ int RadioInterfaceMulti::pullBuffer() return -1; /* Outer buffer access size is fixed */ - num = mRadio->readSamples(convertRecvBuffer, + num = mDevice->readSamples(convertRecvBuffer, outerRecvBuffer->size(), &overrun, readTimestamp, @@ -339,7 +339,7 @@ bool RadioInterfaceMulti::pushBuffer() (float *) outerSendBuffer->begin(), 1.0 / (float) mChans, 2 * outerSendBuffer->size()); - size_t num = mRadio->writeSamples(convertSendBuffer, + size_t num = mDevice->writeSamples(convertSendBuffer, outerSendBuffer->size(), &underrun, writeTimestamp); @@ -368,9 +368,9 @@ bool RadioInterfaceMulti::tuneTx(double freq, size_t chan) double shift = (double) getFreqShift(mChans); if (!chan) - return mRadio->setTxFreq(freq + shift * MCBTS_SPACING); + return mDevice->setTxFreq(freq + shift * MCBTS_SPACING); - double center = mRadio->getTxFreq(); + double center = mDevice->getTxFreq(); if (!fltcmp(freq, center + (double) (chan - shift) * MCBTS_SPACING)) { LOG(NOTICE) << "Channel " << chan << " RF frequency offset is " << freq / 1e6 << " MHz"; @@ -387,9 +387,9 @@ bool RadioInterfaceMulti::tuneRx(double freq, size_t chan) double shift = (double) getFreqShift(mChans); if (!chan) - return mRadio->setRxFreq(freq + shift * MCBTS_SPACING); + return mDevice->setRxFreq(freq + shift * MCBTS_SPACING); - double center = mRadio->getRxFreq(); + double center = mDevice->getRxFreq(); if (!fltcmp(freq, center + (double) (chan - shift) * MCBTS_SPACING)) { LOG(NOTICE) << "Channel " << chan << " RF frequency offset is " << freq / 1e6 << " MHz"; @@ -401,7 +401,7 @@ bool RadioInterfaceMulti::tuneRx(double freq, size_t chan) double RadioInterfaceMulti::setRxGain(double db, size_t chan) { if (!chan) - return mRadio->setRxGain(db); + return mDevice->setRxGain(db); else - return mRadio->getRxGain(); + return mDevice->getRxGain(); } |