<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/15514">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">radioInterface: Rename mRadio to mDevice<br><br>Previous naming is ready confusing, because "Radio" is actually the<br>common term between radioInterface and radioDevice, and it looks like<br>it's referring to radioInterface rather than radioDevice. On the other<br>hand, mDevice cleary states it refers to the radioDevice item.<br><br>Change-Id: I708bb1992a156fb63334f5590f2c6648ca27495e<br>---<br>M Transceiver52M/radioInterface.cpp<br>M Transceiver52M/radioInterface.h<br>M Transceiver52M/radioInterfaceMulti.cpp<br>M Transceiver52M/radioInterfaceResamp.cpp<br>4 files changed, 37 insertions(+), 37 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/14/15514/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp</span><br><span>index 0d33f22..bd19b24 100644</span><br><span>--- a/Transceiver52M/radioInterface.cpp</span><br><span>+++ b/Transceiver52M/radioInterface.cpp</span><br><span>@@ -32,10 +32,10 @@</span><br><span> #define CHUNK 625</span><br><span> #define NUMCHUNKS 4</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RadioInterface::RadioInterface(RadioDevice *wRadio, size_t tx_sps,</span><br><span style="color: hsl(120, 100%, 40%);">+RadioInterface::RadioInterface(RadioDevice *wDevice, size_t tx_sps,</span><br><span> size_t rx_sps, size_t chans,</span><br><span> int wReceiveOffset, GSM::Time wStartTime)</span><br><span style="color: hsl(0, 100%, 40%);">- : mRadio(wRadio), mSPSTx(tx_sps), mSPSRx(rx_sps), mChans(chans),</span><br><span style="color: hsl(120, 100%, 40%);">+ : mDevice(wDevice), mSPSTx(tx_sps), mSPSRx(rx_sps), mChans(chans),</span><br><span> underrun(false), overrun(false), writeTimestamp(0), readTimestamp(0),</span><br><span> receiveOffset(wReceiveOffset), mOn(false)</span><br><span> {</span><br><span>@@ -93,11 +93,11 @@</span><br><span> }</span><br><span> </span><br><span> double RadioInterface::fullScaleInputValue(void) {</span><br><span style="color: hsl(0, 100%, 40%);">- return mRadio->fullScaleInputValue();</span><br><span style="color: hsl(120, 100%, 40%);">+ return mDevice->fullScaleInputValue();</span><br><span> }</span><br><span> </span><br><span> double RadioInterface::fullScaleOutputValue(void) {</span><br><span style="color: hsl(0, 100%, 40%);">- return mRadio->fullScaleOutputValue();</span><br><span style="color: hsl(120, 100%, 40%);">+ return mDevice->fullScaleOutputValue();</span><br><span> }</span><br><span> </span><br><span> int RadioInterface::setPowerAttenuation(int atten, size_t chan)</span><br><span>@@ -112,8 +112,8 @@</span><br><span> if (atten < 0.0)</span><br><span> atten = 0.0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rfGain = mRadio->setTxGain(mRadio->maxTxGain() - (double) atten, chan);</span><br><span style="color: hsl(0, 100%, 40%);">- digAtten = (double) atten - mRadio->maxTxGain() + rfGain;</span><br><span style="color: hsl(120, 100%, 40%);">+ rfGain = mDevice->setTxGain(mDevice->maxTxGain() - (double) atten, chan);</span><br><span style="color: hsl(120, 100%, 40%);">+ digAtten = (double) atten - mDevice->maxTxGain() + rfGain;</span><br><span> </span><br><span> if (digAtten < 1.0)</span><br><span> powerScaling[chan] = 1.0;</span><br><span>@@ -148,12 +148,12 @@</span><br><span> </span><br><span> bool RadioInterface::tuneTx(double freq, size_t chan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return mRadio->setTxFreq(freq, chan);</span><br><span style="color: hsl(120, 100%, 40%);">+ return mDevice->setTxFreq(freq, chan);</span><br><span> }</span><br><span> </span><br><span> bool RadioInterface::tuneRx(double freq, size_t chan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return mRadio->setRxFreq(freq, chan);</span><br><span style="color: hsl(120, 100%, 40%);">+ return mDevice->setRxFreq(freq, chan);</span><br><span> }</span><br><span> </span><br><span> /** synchronization thread loop */</span><br><span>@@ -169,7 +169,7 @@</span><br><span> }</span><br><span> </span><br><span> void RadioInterface::alignRadio() {</span><br><span style="color: hsl(0, 100%, 40%);">- mRadio->updateAlignment(writeTimestamp+ (TIMESTAMP) 10000);</span><br><span style="color: hsl(120, 100%, 40%);">+ mDevice->updateAlignment(writeTimestamp+ (TIMESTAMP) 10000);</span><br><span> }</span><br><span> </span><br><span> bool RadioInterface::start()</span><br><span>@@ -178,12 +178,12 @@</span><br><span> return true;</span><br><span> </span><br><span> LOG(INFO) << "Starting radio device";</span><br><span style="color: hsl(0, 100%, 40%);">- if (mRadio->requiresRadioAlign())</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mDevice->requiresRadioAlign())</span><br><span> mAlignRadioServiceLoopThread.start(</span><br><span> (void * (*)(void*))AlignRadioServiceLoopAdapter,</span><br><span> (void*)this);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!mRadio->start())</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!mDevice->start())</span><br><span> return false;</span><br><span> </span><br><span> for (size_t i = 0; i < mChans; i++) {</span><br><span>@@ -191,11 +191,11 @@</span><br><span> recvBuffer[i]->reset();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- writeTimestamp = mRadio->initialWriteTimestamp();</span><br><span style="color: hsl(0, 100%, 40%);">- readTimestamp = mRadio->initialReadTimestamp();</span><br><span style="color: hsl(120, 100%, 40%);">+ writeTimestamp = mDevice->initialWriteTimestamp();</span><br><span style="color: hsl(120, 100%, 40%);">+ readTimestamp = mDevice->initialReadTimestamp();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mRadio->updateAlignment(writeTimestamp-10000);</span><br><span style="color: hsl(0, 100%, 40%);">- mRadio->updateAlignment(writeTimestamp-10000);</span><br><span style="color: hsl(120, 100%, 40%);">+ mDevice->updateAlignment(writeTimestamp-10000);</span><br><span style="color: hsl(120, 100%, 40%);">+ mDevice->updateAlignment(writeTimestamp-10000);</span><br><span> </span><br><span> mOn = true;</span><br><span> LOG(INFO) << "Radio started";</span><br><span>@@ -211,7 +211,7 @@</span><br><span> */</span><br><span> bool RadioInterface::stop()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!mOn || !mRadio->stop())</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!mOn || !mDevice->stop())</span><br><span> return false;</span><br><span> </span><br><span> mOn = false;</span><br><span>@@ -304,12 +304,12 @@</span><br><span> </span><br><span> double RadioInterface::setRxGain(double dB, size_t chan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return mRadio->setRxGain(dB, chan);</span><br><span style="color: hsl(120, 100%, 40%);">+ return mDevice->setRxGain(dB, chan);</span><br><span> }</span><br><span> </span><br><span> double RadioInterface::getRxGain(size_t chan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return mRadio->getRxGain(chan);</span><br><span style="color: hsl(120, 100%, 40%);">+ return mDevice->getRxGain(chan);</span><br><span> }</span><br><span> </span><br><span> /* Receive a timestamped chunk from the device */</span><br><span>@@ -323,7 +323,7 @@</span><br><span> return -1;</span><br><span> </span><br><span> /* Outer buffer access size is fixed */</span><br><span style="color: hsl(0, 100%, 40%);">- numRecv = mRadio->readSamples(convertRecvBuffer,</span><br><span style="color: hsl(120, 100%, 40%);">+ numRecv = mDevice->readSamples(convertRecvBuffer,</span><br><span> segmentLen,</span><br><span> &overrun,</span><br><span> readTimestamp,</span><br><span>@@ -362,7 +362,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Send the all samples in the send buffer */</span><br><span style="color: hsl(0, 100%, 40%);">- numSent = mRadio->writeSamples(convertSendBuffer,</span><br><span style="color: hsl(120, 100%, 40%);">+ numSent = mDevice->writeSamples(convertSendBuffer,</span><br><span> segmentLen,</span><br><span> &local_underrun,</span><br><span> writeTimestamp);</span><br><span>diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h</span><br><span>index dcfb67f..235d888 100644</span><br><span>--- a/Transceiver52M/radioInterface.h</span><br><span>+++ b/Transceiver52M/radioInterface.h</span><br><span>@@ -36,7 +36,7 @@</span><br><span> </span><br><span> std::vector<VectorFIFO> mReceiveFIFO; ///< FIFO that holds receive bursts</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- RadioDevice *mRadio; ///< the USRP object</span><br><span style="color: hsl(120, 100%, 40%);">+ RadioDevice *mDevice; ///< the USRP object</span><br><span> </span><br><span> size_t mSPSTx;</span><br><span> size_t mSPSRx;</span><br><span>@@ -84,7 +84,7 @@</span><br><span> virtual void close();</span><br><span> </span><br><span> /** constructor */</span><br><span style="color: hsl(0, 100%, 40%);">- RadioInterface(RadioDevice* wRadio, size_t tx_sps, size_t rx_sps,</span><br><span style="color: hsl(120, 100%, 40%);">+ RadioInterface(RadioDevice* wDevice, size_t tx_sps, size_t rx_sps,</span><br><span> size_t chans = 1, int receiveOffset = 3,</span><br><span> GSM::Time wStartTime = GSM::Time(0));</span><br><span> </span><br><span>@@ -128,10 +128,10 @@</span><br><span> double fullScaleOutputValue();</span><br><span> </span><br><span> /** get transport window type of attached device */</span><br><span style="color: hsl(0, 100%, 40%);">- enum RadioDevice::TxWindowType getWindowType() { return mRadio->getWindowType(); }</span><br><span style="color: hsl(120, 100%, 40%);">+ enum RadioDevice::TxWindowType getWindowType() { return mDevice->getWindowType(); }</span><br><span> </span><br><span> /** Minimum latency that the device can achieve */</span><br><span style="color: hsl(0, 100%, 40%);">- GSM::Time minLatency() { return mRadio->minLatency(); }</span><br><span style="color: hsl(120, 100%, 40%);">+ GSM::Time minLatency() { return mDevice->minLatency(); }</span><br><span> </span><br><span> protected:</span><br><span> /** drive synchronization of Tx/Rx of USRP */</span><br><span>@@ -149,7 +149,7 @@</span><br><span> int pullBuffer();</span><br><span> </span><br><span> public:</span><br><span style="color: hsl(0, 100%, 40%);">- RadioInterfaceResamp(RadioDevice* wRadio, size_t tx_sps, size_t rx_sps);</span><br><span style="color: hsl(120, 100%, 40%);">+ RadioInterfaceResamp(RadioDevice* wDevice, size_t tx_sps, size_t rx_sps);</span><br><span> ~RadioInterfaceResamp();</span><br><span> </span><br><span> bool init(int type);</span><br><span>diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp</span><br><span>index 0208e82..7c1ee74 100644</span><br><span>--- a/Transceiver52M/radioInterfaceMulti.cpp</span><br><span>+++ b/Transceiver52M/radioInterfaceMulti.cpp</span><br><span>@@ -238,7 +238,7 @@</span><br><span> return -1;</span><br><span> </span><br><span> /* Outer buffer access size is fixed */</span><br><span style="color: hsl(0, 100%, 40%);">- num = mRadio->readSamples(convertRecvBuffer,</span><br><span style="color: hsl(120, 100%, 40%);">+ num = mDevice->readSamples(convertRecvBuffer,</span><br><span> outerRecvBuffer->size(),</span><br><span> &overrun,</span><br><span> readTimestamp,</span><br><span>@@ -339,7 +339,7 @@</span><br><span> (float *) outerSendBuffer->begin(),</span><br><span> 1.0 / (float) mChans, 2 * outerSendBuffer->size());</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- size_t num = mRadio->writeSamples(convertSendBuffer,</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t num = mDevice->writeSamples(convertSendBuffer,</span><br><span> outerSendBuffer->size(),</span><br><span> &underrun,</span><br><span> writeTimestamp);</span><br><span>@@ -368,9 +368,9 @@</span><br><span> double shift = (double) getFreqShift(mChans);</span><br><span> </span><br><span> if (!chan)</span><br><span style="color: hsl(0, 100%, 40%);">- return mRadio->setTxFreq(freq + shift * MCBTS_SPACING);</span><br><span style="color: hsl(120, 100%, 40%);">+ return mDevice->setTxFreq(freq + shift * MCBTS_SPACING);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- double center = mRadio->getTxFreq();</span><br><span style="color: hsl(120, 100%, 40%);">+ double center = mDevice->getTxFreq();</span><br><span> if (!fltcmp(freq, center + (double) (chan - shift) * MCBTS_SPACING)) {</span><br><span> LOG(NOTICE) << "Channel " << chan << " RF frequency offset is "</span><br><span> << freq / 1e6 << " MHz";</span><br><span>@@ -387,9 +387,9 @@</span><br><span> double shift = (double) getFreqShift(mChans);</span><br><span> </span><br><span> if (!chan)</span><br><span style="color: hsl(0, 100%, 40%);">- return mRadio->setRxFreq(freq + shift * MCBTS_SPACING);</span><br><span style="color: hsl(120, 100%, 40%);">+ return mDevice->setRxFreq(freq + shift * MCBTS_SPACING);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- double center = mRadio->getRxFreq();</span><br><span style="color: hsl(120, 100%, 40%);">+ double center = mDevice->getRxFreq();</span><br><span> if (!fltcmp(freq, center + (double) (chan - shift) * MCBTS_SPACING)) {</span><br><span> LOG(NOTICE) << "Channel " << chan << " RF frequency offset is "</span><br><span> << freq / 1e6 << " MHz";</span><br><span>@@ -401,7 +401,7 @@</span><br><span> double RadioInterfaceMulti::setRxGain(double db, size_t chan)</span><br><span> {</span><br><span> if (!chan)</span><br><span style="color: hsl(0, 100%, 40%);">- return mRadio->setRxGain(db);</span><br><span style="color: hsl(120, 100%, 40%);">+ return mDevice->setRxGain(db);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- return mRadio->getRxGain();</span><br><span style="color: hsl(120, 100%, 40%);">+ return mDevice->getRxGain();</span><br><span> }</span><br><span>diff --git a/Transceiver52M/radioInterfaceResamp.cpp b/Transceiver52M/radioInterfaceResamp.cpp</span><br><span>index e2f69f2..d6dc52c 100644</span><br><span>--- a/Transceiver52M/radioInterfaceResamp.cpp</span><br><span>+++ b/Transceiver52M/radioInterfaceResamp.cpp</span><br><span>@@ -59,9 +59,9 @@</span><br><span> static size_t resamp_outrate = 0;</span><br><span> static size_t resamp_outchunk = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RadioInterfaceResamp::RadioInterfaceResamp(RadioDevice *wRadio,</span><br><span style="color: hsl(120, 100%, 40%);">+RadioInterfaceResamp::RadioInterfaceResamp(RadioDevice *wDevice,</span><br><span> size_t tx_sps, size_t rx_sps)</span><br><span style="color: hsl(0, 100%, 40%);">- : RadioInterface(wRadio, tx_sps, rx_sps, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ : RadioInterface(wDevice, tx_sps, rx_sps, 1),</span><br><span> outerSendBuffer(NULL), outerRecvBuffer(NULL)</span><br><span> {</span><br><span> }</span><br><span>@@ -171,7 +171,7 @@</span><br><span> return -1;</span><br><span> </span><br><span> /* Outer buffer access size is fixed */</span><br><span style="color: hsl(0, 100%, 40%);">- num_recv = mRadio->readSamples(convertRecvBuffer,</span><br><span style="color: hsl(120, 100%, 40%);">+ num_recv = mDevice->readSamples(convertRecvBuffer,</span><br><span> resamp_outchunk,</span><br><span> &overrun,</span><br><span> readTimestamp,</span><br><span>@@ -223,7 +223,7 @@</span><br><span> (float *) outerSendBuffer->begin(),</span><br><span> powerScaling[0], 2 * resamp_outchunk);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- numSent = mRadio->writeSamples(convertSendBuffer,</span><br><span style="color: hsl(120, 100%, 40%);">+ numSent = mDevice->writeSamples(convertSendBuffer,</span><br><span> resamp_outchunk,</span><br><span> &underrun,</span><br><span> writeTimestamp);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/15514">change 15514</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-trx/+/15514"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I708bb1992a156fb63334f5590f2c6648ca27495e </div>
<div style="display:none"> Gerrit-Change-Number: 15514 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>