<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13829">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
tnt: Looks good to me, but someone else must approve
Vadim Yanitskiy: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: uhd: Use loglevel ERROR instead of ERR<br><br>ERR is osmo-trx legacy level, which actually converts to osmocom's<br>ERROR, so let's use that one directly.<br><br>Change-Id: I82f6f89a725bea7f7acfa455c20cf922cc3f8a00<br>---<br>M Transceiver52M/device/uhd/UHDDevice.cpp<br>1 file changed, 11 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>index 40ef2a0..34ffd57 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>@@ -149,7 +149,7 @@</span><br><span> LOGC(DDEV, WARNING) << msg;</span><br><span> break;</span><br><span> case uhd::msg::error:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ERR) << msg;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << msg;</span><br><span> break;</span><br><span> case uhd::msg::fastpath:</span><br><span> break;</span><br><span>@@ -601,7 +601,7 @@</span><br><span> LOGC(DDEV, INFO) << "Starting USRP...";</span><br><span> </span><br><span> if (started) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ERR) << "Device already started";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << "Device already started";</span><br><span> return false;</span><br><span> }</span><br><span> </span><br><span>@@ -652,7 +652,7 @@</span><br><span> int uhd_device::check_rx_md_err(uhd::rx_metadata_t &md, ssize_t num_smpls)</span><br><span> {</span><br><span> if (!num_smpls) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ERR) << str_code(md);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << str_code(md);</span><br><span> </span><br><span> switch (md.error_code) {</span><br><span> case uhd::rx_metadata_t::ERROR_CODE_TIMEOUT:</span><br><span>@@ -715,8 +715,8 @@</span><br><span> // Check that timestamp is valid</span><br><span> rc = rx_buffers[0]->avail_smpls(timestamp);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ERR) << rx_buffers[0]->str_code(rc);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ERR) << rx_buffers[0]->str_status(timestamp);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << rx_buffers[0]->str_code(rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << rx_buffers[0]->str_status(timestamp);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -763,8 +763,8 @@</span><br><span> </span><br><span> // Continue on local overrun, exit on other errors</span><br><span> if ((rc < 0)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ERR) << rx_buffers[i]->str_code(rc);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ERR) << rx_buffers[i]->str_status(timestamp);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << rx_buffers[i]->str_code(rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << rx_buffers[i]->str_status(timestamp);</span><br><span> if (rc != smpl_buf::ERROR_OVERFLOW)</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -775,8 +775,8 @@</span><br><span> for (size_t i = 0; i < rx_buffers.size(); i++) {</span><br><span> rc = rx_buffers[i]->read(bufs[i], len, timestamp);</span><br><span> if ((rc < 0) || (rc != len)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ERR) << rx_buffers[i]->str_code(rc);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ERR) << rx_buffers[i]->str_status(timestamp);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << rx_buffers[i]->str_code(rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << rx_buffers[i]->str_status(timestamp);</span><br><span> return 0;</span><br><span> }</span><br><span> }</span><br><span>@@ -797,7 +797,7 @@</span><br><span> </span><br><span> // No control packets</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>@@ -1110,7 +1110,7 @@</span><br><span> </span><br><span> if ((md.event_code != uhd::async_metadata_t::EVENT_CODE_UNDERFLOW) &&</span><br><span> (md.event_code != uhd::async_metadata_t::EVENT_CODE_TIME_ERROR)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ERR) << str_code(md);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << str_code(md);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13829">change 13829</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/13829"/><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: I82f6f89a725bea7f7acfa455c20cf922cc3f8a00 </div>
<div style="display:none"> Gerrit-Change-Number: 13829 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@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>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: tnt <tnt@246tNt.com> </div>