<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11002">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">l1sap/scheduler: Consistently print chan_nr as hex number<br><br>It's very confusing if some log messages log chan_nr as decimal, while<br>most log it as hexadecimal. Let's standardize on hex everywhere.<br><br>Change-Id: Ia6566d5bbee8124fb7c689c962ce34d714208503<br>---<br>M src/common/l1sap.c<br>M src/common/scheduler.c<br>2 files changed, 7 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/l1sap.c b/src/common/l1sap.c</span><br><span>index b29fcc7..1a7a965 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -508,7 +508,7 @@</span><br><span> lchan = get_active_lchan_by_chan_nr(trx, info_meas_ind->chan_nr);</span><br><span> if (!lchan) {</span><br><span> LOGPFN(DL1P, LOGL_ERROR, info_meas_ind->fn,</span><br><span style="color: hsl(0, 100%, 40%);">- "No lchan for MPH INFO MEAS IND (chan_nr=%u)\n", info_meas_ind->chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ "No lchan for MPH INFO MEAS IND (chan_nr=0x%02x)\n", info_meas_ind->chan_nr);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -746,7 +746,7 @@</span><br><span> } else if (!(chan_nr & 0x80)) { /* only TCH/F, TCH/H, SDCCH/4 and SDCCH/8 have C5 bit cleared */</span><br><span> lchan = get_active_lchan_by_chan_nr(trx, chan_nr);</span><br><span> if (!lchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=%u)\n", chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=0x%02x)\n", chan_nr);</span><br><span> return 0;</span><br><span> }</span><br><span> if (L1SAP_IS_LINK_SACCH(link_id)) {</span><br><span>@@ -875,7 +875,7 @@</span><br><span> </span><br><span> lchan = get_active_lchan_by_chan_nr(trx, chan_nr);</span><br><span> if (!lchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=%u)\n", chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=0x%02x)\n", chan_nr);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -1069,7 +1069,7 @@</span><br><span> </span><br><span> lchan = get_active_lchan_by_chan_nr(trx, chan_nr);</span><br><span> if (!lchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=%d\n", chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=0x%02x\n", chan_nr);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -1137,7 +1137,7 @@</span><br><span> </span><br><span> lchan = get_active_lchan_by_chan_nr(trx, chan_nr);</span><br><span> if (!lchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for TCH.ind (chan_nr=%u)\n", chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for TCH.ind (chan_nr=0x%02x)\n", chan_nr);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index 8a6c007..65ece7f 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -329,8 +329,8 @@</span><br><span> found_msg:</span><br><span> if ((chan_nr ^ (trx_chan_desc[chan].chan_nr | tn))</span><br><span> || ((link_id & 0xc0) ^ trx_chan_desc[chan].link_id)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong chan_nr=%02x link_id=%02x, "</span><br><span style="color: hsl(0, 100%, 40%);">- "expecting chan_nr=%02x link_id=%02x.\n", chan_nr, link_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong chan_nr=0x%02x link_id=%02x, "</span><br><span style="color: hsl(120, 100%, 40%);">+ "expecting chan_nr=0x%02x link_id=%02x.\n", chan_nr, link_id,</span><br><span> trx_chan_desc[chan].chan_nr | tn, trx_chan_desc[chan].link_id);</span><br><span> goto free_msg;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11002">change 11002</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/11002"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia6566d5bbee8124fb7c689c962ce34d714208503 </div>
<div style="display:none"> Gerrit-Change-Number: 11002 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>