<p>roh has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13667">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lms: properly call close if set_antennas() fails, add some comments<br><br>Change-Id: I9ebe986ee3a15842a15853424ee98e9a2fa6a5df<br>---<br>M Transceiver52M/device/lms/LMSDevice.cpp<br>1 file changed, 4 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/67/13667/1</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 15064e8..94160b4 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -222,6 +222,7 @@</span><br><span>                         goto out_close;</span><br><span>      }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* set samplerate */</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>@@ -237,9 +238,10 @@</span><br><span>  /* FIXME: make this device/model dependent, like UHDDevice:dev_param_map! */</span><br><span>         ts_offset = static_cast<TIMESTAMP>(8.9e-5 * GSMRATE * tx_sps); /* time * sample_rate */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+     /* configure antennas */</span><br><span>     if (!set_antennas()) {</span><br><span>               LOGC(DDEV, ALERT) << "LMS antenna setting failed";</span><br><span style="color: hsl(0, 100%, 40%);">-              return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+            goto out_close;</span><br><span>      }</span><br><span> </span><br><span>        samplesRead = 0;</span><br><span>@@ -281,6 +283,7 @@</span><br><span>               if (!do_calib(i))</span><br><span>                    return false;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+             /* configure Streams */</span><br><span>              m_lms_stream_rx[i] = {};</span><br><span>             m_lms_stream_rx[i].isTx = false;</span><br><span>             m_lms_stream_rx[i].channel = i;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13667">change 13667</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/13667"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I9ebe986ee3a15842a15853424ee98e9a2fa6a5df </div>
<div style="display:none"> Gerrit-Change-Number: 13667 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: roh <jsteiger@sysmocom.de> </div>