<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/25524">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lms,uhd: Allow changing band between poweroff & poweron<br><br>Before this patch, reconnecting to osmo-trx and attempting to configure it for<br>another band is not going to work without restarting the process.<br>The new variable is added in order to still allow POWEROFF followed by a<br>POWERON without need to reconfigure the device. In that case, previous<br>configuration is kept.<br><br>Change-Id: I43e5e1e4dcb36be605c6bd25dd6a5f3649e244e7<br>---<br>M Transceiver52M/device/lms/LMSDevice.cpp<br>M Transceiver52M/device/lms/LMSDevice.h<br>M Transceiver52M/device/uhd/UHDDevice.cpp<br>M Transceiver52M/device/uhd/UHDDevice.h<br>4 files changed, 16 insertions(+), 7 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 95bc41e..6e5002c 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -134,8 +134,9 @@</span><br><span> LMSDevice::LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset,</span><br><span> const std::vector<std::string>& tx_paths,</span><br><span> const std::vector<std::string>& rx_paths):</span><br><span style="color: hsl(0, 100%, 40%);">- RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths),</span><br><span style="color: hsl(0, 100%, 40%);">- m_lms_dev(NULL), started(false), band((enum gsm_band)0), m_dev_type(LMS_DEV_UNKNOWN)</span><br><span style="color: hsl(120, 100%, 40%);">+ RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths),</span><br><span style="color: hsl(120, 100%, 40%);">+ m_lms_dev(NULL), started(false), band_ass_curr_sess(false), band((enum gsm_band)0),</span><br><span style="color: hsl(120, 100%, 40%);">+ m_dev_type(LMS_DEV_UNKNOWN)</span><br><span> {</span><br><span> LOGC(DDEV, INFO) << "creating LMS device...";</span><br><span> </span><br><span>@@ -240,16 +241,17 @@</span><br><span> </span><br><span> bool LMSDevice::set_band(enum gsm_band req_band)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (band != 0 && req_band != band) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (band_ass_curr_sess && req_band != band) {</span><br><span> LOGC(DDEV, ALERT) << "Requesting band " << gsm_band_name(req_band)</span><br><span> << " different from previous band " << gsm_band_name(band);</span><br><span> return false;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (band == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (req_band != band) {</span><br><span> band = req_band;</span><br><span> assign_band_desc(band);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ band_ass_curr_sess = true;</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span>@@ -466,6 +468,8 @@</span><br><span> LMS_DestroyStream(m_lms_dev, &m_lms_stream_rx[i]);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ band_ass_curr_sess = false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> started = false;</span><br><span> return true;</span><br><span> }</span><br><span>diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>index 4ce8ed6..ab28250 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.h</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>@@ -87,6 +87,7 @@</span><br><span> TIMESTAMP ts_initial, ts_offset;</span><br><span> </span><br><span> std::vector<double> tx_gains, rx_gains;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool band_ass_curr_sess; /* true if "band" was set after last POWEROFF */</span><br><span> enum gsm_band band;</span><br><span> struct dev_band_desc band_desc;</span><br><span> </span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>index bc39a6d..f109660 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>@@ -225,7 +225,7 @@</span><br><span> const std::vector<std::string>& tx_paths,</span><br><span> const std::vector<std::string>& rx_paths)</span><br><span> : RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths),</span><br><span style="color: hsl(0, 100%, 40%);">- rx_gain_min(0.0), rx_gain_max(0.0),</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_gain_min(0.0), rx_gain_max(0.0), band_ass_curr_sess(false),</span><br><span> band((enum gsm_band)0), tx_spp(0), rx_spp(0),</span><br><span> started(false), aligned(false), drop_cnt(0),</span><br><span> prev_ts(0,0), ts_initial(0), ts_offset(0), async_event_thrd(NULL)</span><br><span>@@ -258,16 +258,17 @@</span><br><span> </span><br><span> bool uhd_device::set_band(enum gsm_band req_band)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (band != 0 && req_band != band) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (band_ass_curr_sess && req_band != band) {</span><br><span> LOGC(DDEV, ALERT) << "Requesting band " << gsm_band_name(req_band)</span><br><span> << " different from previous band " << gsm_band_name(band);</span><br><span> return false;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (band == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (req_band != band) {</span><br><span> band = req_band;</span><br><span> assign_band_desc(band);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ band_ass_curr_sess = true;</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span>@@ -795,6 +796,8 @@</span><br><span> for (size_t i = 0; i < rx_buffers.size(); i++)</span><br><span> rx_buffers[i]->reset();</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ band_ass_curr_sess = false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> started = false;</span><br><span> return true;</span><br><span> }</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.h b/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>index 995b43c..659fd18 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>@@ -160,6 +160,7 @@</span><br><span> </span><br><span> std::vector<double> tx_gains, rx_gains;</span><br><span> std::vector<double> tx_freqs, rx_freqs;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool band_ass_curr_sess; /* true if "band" was set after last POWEROFF */</span><br><span> enum gsm_band band;</span><br><span> struct dev_band_desc band_desc;</span><br><span> size_t tx_spp, rx_spp;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/25524">change 25524</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/+/25524"/><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: I43e5e1e4dcb36be605c6bd25dd6a5f3649e244e7 </div>
<div style="display:none"> Gerrit-Change-Number: 25524 </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>