<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/15292">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lms: Log available antennas if requested antenna fails<br><br>Change-Id: Icd328e85b0a75ef67f371a7ed72638053b1854f9<br>---<br>M Transceiver52M/device/lms/LMSDevice.cpp<br>M Transceiver52M/device/lms/LMSDevice.h<br>2 files changed, 23 insertions(+), 2 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/92/15292/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 f55b555..b7cb31d 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -431,6 +431,20 @@</span><br><span>         return dB;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void LMSDevice::log_ant_list(bool dir_tx, size_t chan, std::ostringstream& os)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+    lms_name_t name_list[MAX_ANTENNA_LIST_SIZE]; /* large enough list for antenna names. */</span><br><span style="color: hsl(120, 100%, 40%);">+       int num_names;</span><br><span style="color: hsl(120, 100%, 40%);">+        int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      num_names = LMS_GetAntennaList(m_lms_dev, dir_tx, chan, name_list);</span><br><span style="color: hsl(120, 100%, 40%);">+   for (i = 0; i < num_names; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+          if (i)</span><br><span style="color: hsl(120, 100%, 40%);">+                        os << ", ";</span><br><span style="color: hsl(120, 100%, 40%);">+           os << "'" << name_list[i] << "'";</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%);">+</span><br><span> int LMSDevice::get_ant_idx(const std::string & name, bool dir_tx, size_t chan)</span><br><span> {</span><br><span>    lms_name_t name_list[MAX_ANTENNA_LIST_SIZE]; /* large enough list for antenna names. */</span><br><span>@@ -484,7 +498,10 @@</span><br><span> </span><br><span>   idx = get_ant_idx(ant, LMS_CH_RX, chan);</span><br><span>     if (idx < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-               LOGCHAN(chan, DDEV, ERROR) << "Invalid Rx Antenna";</span><br><span style="color: hsl(120, 100%, 40%);">+           std::ostringstream os;</span><br><span style="color: hsl(120, 100%, 40%);">+                LOGCHAN(chan, DDEV, ERROR) << "Invalid Rx Antenna: " << ant;</span><br><span style="color: hsl(120, 100%, 40%);">+            log_ant_list(LMS_CH_RX, chan, os);</span><br><span style="color: hsl(120, 100%, 40%);">+            LOGCHAN(chan, DDEV, NOTICE) << "Available Rx Antennas: " << os;</span><br><span>                return false;</span><br><span>        }</span><br><span> </span><br><span>@@ -530,7 +547,10 @@</span><br><span> </span><br><span>     idx = get_ant_idx(ant, LMS_CH_TX, chan);</span><br><span>     if (idx < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-               LOGCHAN(chan, DDEV, ERROR) << "Invalid Rx Antenna";</span><br><span style="color: hsl(120, 100%, 40%);">+           std::ostringstream os;</span><br><span style="color: hsl(120, 100%, 40%);">+                LOGCHAN(chan, DDEV, ERROR) << "Invalid Tx Antenna: " << ant;</span><br><span style="color: hsl(120, 100%, 40%);">+            log_ant_list(LMS_CH_TX, chan, os);</span><br><span style="color: hsl(120, 100%, 40%);">+            LOGCHAN(chan, DDEV, NOTICE) << "Available Tx Antennas: " << os;</span><br><span>                return false;</span><br><span>        }</span><br><span> </span><br><span>diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>index 47bac94..ab45b08 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.h</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>@@ -63,6 +63,7 @@</span><br><span> </span><br><span>       bool do_calib(size_t chan);</span><br><span>  bool do_filters(size_t chan);</span><br><span style="color: hsl(120, 100%, 40%);">+ void log_ant_list(bool dir_tx, size_t chan, std::ostringstream& os);</span><br><span>     int get_ant_idx(const std::string & name, bool dir_tx, size_t chan);</span><br><span>     bool flush_recv(size_t num_pkts);</span><br><span>    void update_stream_stats_rx(size_t chan, bool *overrun);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/15292">change 15292</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/+/15292"/><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: Icd328e85b0a75ef67f371a7ed72638053b1854f9 </div>
<div style="display:none"> Gerrit-Change-Number: 15292 </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>