<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11874">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/l1ctl.c: fix deprecated gsm_band_name() usage<br><br>Change-Id: I99bb935b7cd529c885bf10dc209b6016df8095d8<br>---<br>M src/host/trxcon/l1ctl.c<br>1 file changed, 13 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/74/11874/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c</span><br><span>index 83cdc2e..f239b30 100644</span><br><span>--- a/src/host/trxcon/l1ctl.c</span><br><span>+++ b/src/host/trxcon/l1ctl.c</span><br><span>@@ -46,6 +46,16 @@</span><br><span> #include "trx_if.h"</span><br><span> #include "sched_trx.h"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static const char *arfcn2band_name(uint16_t arfcn)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+  enum gsm_band band;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsm_arfcn2band_rc(arfcn, &band) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+               return "(invalid)";</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+       return gsm_band_name(band);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static struct msgb *l1ctl_alloc_msg(uint8_t msg_type)</span><br><span> {</span><br><span>       struct l1ctl_hdr *l1h;</span><br><span>@@ -80,7 +90,7 @@</span><br><span>           return -ENOMEM;</span><br><span> </span><br><span>  LOGP(DL1C, LOGL_DEBUG, "Send PM Conf (%s %d = %d dBm)\n",</span><br><span style="color: hsl(0, 100%, 40%);">-             gsm_band_name(gsm_arfcn2band(band_arfcn)),</span><br><span style="color: hsl(120, 100%, 40%);">+            arfcn2band_name(band_arfcn),</span><br><span>                 band_arfcn &~ ARFCN_FLAG_MASK, dbm);</span><br><span> </span><br><span>         pmc = (struct l1ctl_pm_conf *) msgb_put(msg, sizeof(*pmc));</span><br><span>@@ -331,7 +341,7 @@</span><br><span>    timeout = ntohs(fbsb->timeout);</span><br><span> </span><br><span>       LOGP(DL1C, LOGL_NOTICE, "Received FBSB request (%s %d)\n",</span><br><span style="color: hsl(0, 100%, 40%);">-            gsm_band_name(gsm_arfcn2band(band_arfcn)),</span><br><span style="color: hsl(120, 100%, 40%);">+            arfcn2band_name(band_arfcn),</span><br><span>                 band_arfcn &~ ARFCN_FLAG_MASK);</span><br><span> </span><br><span>      /* Reset scheduler and clock counter */</span><br><span>@@ -385,7 +395,7 @@</span><br><span> </span><br><span>    LOGP(DL1C, LOGL_NOTICE, "Received power measurement "</span><br><span>              "request (%s: %d -> %d)\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                gsm_band_name(gsm_arfcn2band(band_arfcn_start)),</span><br><span style="color: hsl(120, 100%, 40%);">+              arfcn2band_name(band_arfcn_start),</span><br><span>           band_arfcn_start &~ ARFCN_FLAG_MASK,</span><br><span>             band_arfcn_stop &~ ARFCN_FLAG_MASK);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11874">change 11874</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/11874"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I99bb935b7cd529c885bf10dc209b6016df8095d8 </div>
<div style="display:none"> Gerrit-Change-Number: 11874 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>