<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13787">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lms: Remove references to ALERT loglevel<br><br>ALERT log level is not Osmocom standard level, it's just a define in<br>osmo-trx to keep compatibility with old code.<br><br>Same goes for one reference to "ERR" intead of "ERROR".<br><br>Change-Id: I0e171a8ac8a8bfa804ac97fba3d73efcfa6424b4<br>---<br>M Transceiver52M/device/lms/LMSDevice.cpp<br>1 file changed, 21 insertions(+), 21 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/87/13787/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 d0c8e19..e971ad4 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -234,7 +234,7 @@</span><br><span> </span><br><span> /* configure antennas */</span><br><span> if (!set_antennas()) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ALERT) << "LMS antenna setting failed";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, FATAL) << "LMS antenna setting failed";</span><br><span> goto out_close;</span><br><span> }</span><br><span> </span><br><span>@@ -245,7 +245,7 @@</span><br><span> return NORMAL;</span><br><span> </span><br><span> out_close:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ALERT) << "Error in LMS open, closing: " << LMS_GetLastErrorMessage();</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, FATAL) << "Error in LMS open, closing: " << LMS_GetLastErrorMessage();</span><br><span> LMS_Close(m_lms_dev);</span><br><span> m_lms_dev = NULL;</span><br><span> return -1;</span><br><span>@@ -456,7 +456,7 @@</span><br><span> rc = LMS_RecvStream(&m_lms_stream_rx[0], &buffer[0], len, &rx_metadata, 100);</span><br><span> LOGC(DDEV, DEBUG) << "Flush: Recv buffer of len " << rc << " at " << std::hex << rx_metadata.timestamp;</span><br><span> if (rc != len) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ALERT) << "Flush: Device receive timed out";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << "Flush: Device receive timed out";</span><br><span> return false;</span><br><span> }</span><br><span> </span><br><span>@@ -472,18 +472,18 @@</span><br><span> int idx;</span><br><span> </span><br><span> if (chan >= rx_paths.size()) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << "Requested non-existent channel " << chan;</span><br><span> return false;</span><br><span> }</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%);">- LOGC(DDEV, ALERT) << "Invalid Rx Antenna";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << "Invalid Rx Antenna";</span><br><span> return false;</span><br><span> }</span><br><span> </span><br><span> if (LMS_SetAntenna(m_lms_dev, LMS_CH_RX, chan, idx) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ALERT) << "Unable to set Rx Antenna";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << "Unable to set Rx Antenna";</span><br><span> }</span><br><span> </span><br><span> return true;</span><br><span>@@ -495,18 +495,18 @@</span><br><span> int idx;</span><br><span> </span><br><span> if (chan >= rx_paths.size()) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << "Requested non-existent channel " << chan;</span><br><span> return "";</span><br><span> }</span><br><span> </span><br><span> idx = LMS_GetAntenna(m_lms_dev, LMS_CH_RX, chan);</span><br><span> if (idx < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ALERT) << "Error getting Rx Antenna";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << "Error getting Rx Antenna";</span><br><span> return "";</span><br><span> }</span><br><span> </span><br><span> if (LMS_GetAntennaList(m_lms_dev, LMS_CH_RX, chan, name_list) < idx) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ALERT) << "Error getting Rx Antenna List";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << "Error getting Rx Antenna List";</span><br><span> return "";</span><br><span> }</span><br><span> </span><br><span>@@ -518,18 +518,18 @@</span><br><span> int idx;</span><br><span> </span><br><span> if (chan >= tx_paths.size()) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << "Requested non-existent channel " << chan;</span><br><span> return false;</span><br><span> }</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%);">- LOGC(DDEV, ALERT) << "Invalid Rx Antenna";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << "Invalid Rx Antenna";</span><br><span> return false;</span><br><span> }</span><br><span> </span><br><span> if (LMS_SetAntenna(m_lms_dev, LMS_CH_TX, chan, idx) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ALERT) << "Unable to set Rx Antenna";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << "Unable to set Rx Antenna";</span><br><span> }</span><br><span> </span><br><span> return true;</span><br><span>@@ -541,18 +541,18 @@</span><br><span> int idx;</span><br><span> </span><br><span> if (chan >= tx_paths.size()) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << "Requested non-existent channel " << chan;</span><br><span> return "";</span><br><span> }</span><br><span> </span><br><span> idx = LMS_GetAntenna(m_lms_dev, LMS_CH_TX, chan);</span><br><span> if (idx < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ALERT) << "Error getting Tx Antenna";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << "Error getting Tx Antenna";</span><br><span> return "";</span><br><span> }</span><br><span> </span><br><span> if (LMS_GetAntennaList(m_lms_dev, LMS_CH_TX, chan, name_list) < idx) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ALERT) << "Error getting Tx Antenna List";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << "Error getting Tx Antenna List";</span><br><span> return "";</span><br><span> }</span><br><span> </span><br><span>@@ -603,7 +603,7 @@</span><br><span> rx_metadata.timestamp = 0;</span><br><span> </span><br><span> if (bufs.size() != chans) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ALERT) << "Invalid channel combination " << bufs.size();</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << "Invalid channel combination " << bufs.size();</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span>@@ -614,12 +614,12 @@</span><br><span> rc = LMS_RecvStream(&m_lms_stream_rx[i], bufs[i], len, &rx_metadata, 100);</span><br><span> update_stream_stats(i, underrun, overrun);</span><br><span> if (rc != len) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ALERT) << "LMS: Device receive timed out (" << rc << " vs exp " << len << ").";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << "LMS: Device receive timed out (" << rc << " vs exp " << len << ").";</span><br><span> thread_enable_cancel(true);</span><br><span> return -1;</span><br><span> }</span><br><span> if (timestamp != (TIMESTAMP)rx_metadata.timestamp)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ALERT) << "chan "<< i << " recv buffer of len " << rc << " expect " << std::hex << timestamp << " got " << std::hex << (TIMESTAMP)rx_metadata.timestamp << " (" << std::hex << rx_metadata.timestamp <<") diff=" << rx_metadata.timestamp - timestamp;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << "chan "<< i << " recv buffer of len " << rc << " expect " << std::hex << timestamp << " got " << std::hex << (TIMESTAMP)rx_metadata.timestamp << " (" << std::hex << rx_metadata.timestamp <<") diff=" << rx_metadata.timestamp - timestamp;</span><br><span> thread_enable_cancel(true);</span><br><span> }</span><br><span> </span><br><span>@@ -644,12 +644,12 @@</span><br><span> tx_metadata.timestamp = timestamp - ts_offset; /* Shift Tx time by offset */</span><br><span> </span><br><span> if (isControl) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ERR) << "Control packets not supported";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << "Control packets not supported";</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span> if (bufs.size() != chans) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ALERT) << "Invalid channel combination " << bufs.size();</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << "Invalid channel combination " << bufs.size();</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span>@@ -660,7 +660,7 @@</span><br><span> thread_enable_cancel(false);</span><br><span> rc = LMS_SendStream(&m_lms_stream_tx[i], bufs[i], len, &tx_metadata, 100);</span><br><span> if (rc != len) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ALERT) << "LMS: Device send timed out";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << "LMS: Device send timed out";</span><br><span> }</span><br><span> </span><br><span> if (LMS_GetStreamStatus(&m_lms_stream_tx[i], &status) == 0) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13787">change 13787</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/13787"/><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: I0e171a8ac8a8bfa804ac97fba3d73efcfa6424b4 </div>
<div style="display:none"> Gerrit-Change-Number: 13787 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>