<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/25522">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lms,uhd: Validate band of RxFreq too<br><br>So far the validation is only done on TxFreq for all TRX. Let's also do<br>it for RxFreq.<br><br>Change-Id: I30eef2727ee96b1344aa1416edd66e2302b88964<br>---<br>M Transceiver52M/device/lms/LMSDevice.cpp<br>M Transceiver52M/device/uhd/UHDDevice.cpp<br>2 files changed, 34 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>index 30fd665..221d7e2 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -1026,8 +1026,25 @@</span><br><span> </span><br><span> bool LMSDevice::setRxFreq(double wFreq, size_t chan)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t req_arfcn;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm_band req_band;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> LOGCHAN(chan, DDEV, NOTICE) << "Setting Rx Freq to " << wFreq << " Hz";</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ req_arfcn = gsm_freq102arfcn(wFreq / 1000 / 100, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (req_arfcn == 0xffff) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGCHAN(chan, DDEV, ALERT) << "Unknown ARFCN for Rx Frequency " << wFreq / 1000 << " kHz";</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsm_arfcn2band_rc(req_arfcn, &req_band) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGCHAN(chan, DDEV, ALERT) << "Unknown GSM band for Rx Frequency " << wFreq</span><br><span style="color: hsl(120, 100%, 40%);">+ << " Hz (ARFCN " << req_arfcn << " )";</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!set_band(req_band))</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (LMS_SetLOFrequency(m_lms_dev, LMS_CH_RX, chan, wFreq) < 0) {</span><br><span> LOGCHAN(chan, DDEV, ERROR) << "Error setting Rx Freq to " << wFreq << " Hz";</span><br><span> return false;</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>index 5486822..7a8eb9b 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>@@ -1102,12 +1102,29 @@</span><br><span> </span><br><span> bool uhd_device::setRxFreq(double wFreq, size_t chan)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t req_arfcn;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm_band req_band;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (chan >= rx_freqs.size()) {</span><br><span> LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;</span><br><span> return false;</span><br><span> }</span><br><span> ScopedLock lock(tune_lock);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ req_arfcn = gsm_freq102arfcn(wFreq / 1000 / 100, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (req_arfcn == 0xffff) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGCHAN(chan, DDEV, ALERT) << "Unknown ARFCN for Rx Frequency " << wFreq / 1000 << " kHz";</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsm_arfcn2band_rc(req_arfcn, &req_band) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGCHAN(chan, DDEV, ALERT) << "Unknown GSM band for Rx Frequency " << wFreq</span><br><span style="color: hsl(120, 100%, 40%);">+ << " Hz (ARFCN " << req_arfcn << " )";</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!set_band(req_band))</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return set_freq(wFreq, chan, false);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/25522">change 25522</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/+/25522"/><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: I30eef2727ee96b1344aa1416edd66e2302b88964 </div>
<div style="display:none"> Gerrit-Change-Number: 25522 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>