<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13661">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Pau Espin Pedrol: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lms: move LMS_EnableChannel from Start/Stop to Open/Close device<br><br>move enable: it is important that channels are actually enabled before applying any configuration (besides external clock)<br>move disable: move to close, so channels are not disabled and not enabled again while osmotrx is active.<br><br>Change-Id: I82878913254ce15a85db8d006e13d5eb639793e9<br>---<br>M Transceiver52M/device/lms/LMSDevice.cpp<br>1 file changed, 14 insertions(+), 8 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 33e3cbd..45427cf 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -78,8 +78,14 @@</span><br><span> </span><br><span> LMSDevice::~LMSDevice()</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span> LOGC(DDEV, INFO) << "Closing LMS device";</span><br><span> if (m_lms_dev) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* disable all channels */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i=0; i<chans; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LMS_EnableChannel(m_lms_dev, LMS_CH_RX, i, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ LMS_EnableChannel(m_lms_dev, LMS_CH_TX, i, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> LMS_Close(m_lms_dev);</span><br><span> m_lms_dev = NULL;</span><br><span> }</span><br><span>@@ -194,6 +200,14 @@</span><br><span> goto out_close;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* enable all used channels */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i=0; i<chans; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (LMS_EnableChannel(m_lms_dev, LMS_CH_RX, i, true) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto out_close;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (LMS_EnableChannel(m_lms_dev, LMS_CH_TX, i, true) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto out_close;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (LMS_GetSampleRateRange(m_lms_dev, LMS_CH_RX, &range_sr))</span><br><span> goto out_close;</span><br><span> print_range("Sample Rate", &range_sr);</span><br><span>@@ -286,12 +300,6 @@</span><br><span> </span><br><span> /* configure the channels/streams */</span><br><span> for (i=0; i<chans; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (LMS_EnableChannel(m_lms_dev, LMS_CH_RX, i, true) < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (LMS_EnableChannel(m_lms_dev, LMS_CH_TX, i, true) < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> // Set gains to midpoint</span><br><span> setTxGain((minTxGain() + maxTxGain()) / 2, i);</span><br><span> setRxGain((minRxGain() + maxRxGain()) / 2, i);</span><br><span>@@ -348,8 +356,6 @@</span><br><span> for (i=0; i<chans; i++) {</span><br><span> LMS_DestroyStream(m_lms_dev, &m_lms_stream_tx[i]);</span><br><span> LMS_DestroyStream(m_lms_dev, &m_lms_stream_rx[i]);</span><br><span style="color: hsl(0, 100%, 40%);">- LMS_EnableChannel(m_lms_dev, LMS_CH_RX, i, false);</span><br><span style="color: hsl(0, 100%, 40%);">- LMS_EnableChannel(m_lms_dev, LMS_CH_TX, i, false);</span><br><span> }</span><br><span> </span><br><span> started = false;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13661">change 13661</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/13661"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I82878913254ce15a85db8d006e13d5eb639793e9 </div>
<div style="display:none"> Gerrit-Change-Number: 13661 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: roh <jsteiger@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>