<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11873">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;">Fix deprecated gsm_arfcn2band(), use gsm_arfcn2band_rc()<br><br>Change-Id: I45aae70f4bc3f4f85d267dafb757debdef1bb7d7<br>---<br>M src/osmo-bts-litecell15/utils.c<br>M src/osmo-bts-oc2g/oml.c<br>M src/osmo-bts-oc2g/utils.c<br>M src/osmo-bts-sysmo/utils.c<br>M src/osmo-bts-trx/loops.c<br>5 files changed, 26 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-litecell15/utils.c b/src/osmo-bts-litecell15/utils.c</span><br><span>index 8c3eb5a..8d980ba 100644</span><br><span>--- a/src/osmo-bts-litecell15/utils.c</span><br><span>+++ b/src/osmo-bts-litecell15/utils.c</span><br><span>@@ -82,6 +82,7 @@</span><br><span> {</span><br><span> enum gsm_band band;</span><br><span> struct gsm_bts *bts = trx->bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span> </span><br><span> if (!bts->auto_band)</span><br><span> return band_osmo2lc15(trx, bts->band);</span><br><span>@@ -89,7 +90,9 @@</span><br><span> /*</span><br><span> * We need to check what will happen now.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- band = gsm_arfcn2band(arfcn);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm_arfcn2band_rc(arfcn, &band);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc) /* wrong ARFCN, give up */</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> </span><br><span> /* if we are already on the right band return */</span><br><span> if (band == bts->band)</span><br><span>diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c</span><br><span>index 65ebc1c..f76de92 100644</span><br><span>--- a/src/osmo-bts-oc2g/oml.c</span><br><span>+++ b/src/osmo-bts-oc2g/oml.c</span><br><span>@@ -398,7 +398,7 @@</span><br><span> struct msgb *msg;</span><br><span> GsmL1_MphInitReq_t *mi_req;</span><br><span> GsmL1_DeviceParam_t *dev_par;</span><br><span style="color: hsl(0, 100%, 40%);">- int oc2g_band;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc, oc2g_band;</span><br><span> </span><br><span> if (!gsm_abis_mo_check_attr(&trx->mo, trx_rqd_attr,</span><br><span> ARRAY_SIZE(trx_rqd_attr))) {</span><br><span>@@ -409,7 +409,13 @@</span><br><span> }</span><br><span> </span><br><span> /* Update TRX band */</span><br><span style="color: hsl(0, 100%, 40%);">- trx->bts->band = gsm_arfcn2band(trx->arfcn);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm_arfcn2band_rc(trx->arfcn, &trx->bts->band);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: abort initialization? */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1C, LOGL_ERROR, "Could not pick GSM band "</span><br><span style="color: hsl(120, 100%, 40%);">+ "for ARFCN %u\n", trx->arfcn);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->bts->band = 0x00;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> oc2g_band = oc2gbts_select_oc2g_band(trx, trx->arfcn);</span><br><span> if (oc2g_band < 0) {</span><br><span>diff --git a/src/osmo-bts-oc2g/utils.c b/src/osmo-bts-oc2g/utils.c</span><br><span>index 2894439..cb65f45 100644</span><br><span>--- a/src/osmo-bts-oc2g/utils.c</span><br><span>+++ b/src/osmo-bts-oc2g/utils.c</span><br><span>@@ -82,13 +82,17 @@</span><br><span> {</span><br><span> enum gsm_band band;</span><br><span> struct gsm_bts *bts = trx->bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (!bts->auto_band)</span><br><span> return band_osmo2oc2g(trx, bts->band);</span><br><span> </span><br><span> /*</span><br><span> * We need to check what will happen now.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- band = gsm_arfcn2band(arfcn);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm_arfcn2band_rc(arfcn, &band);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc) /* wrong ARFCN, give up */</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> </span><br><span> /* if we are already on the right band return */</span><br><span> if (band == bts->band)</span><br><span>diff --git a/src/osmo-bts-sysmo/utils.c b/src/osmo-bts-sysmo/utils.c</span><br><span>index 7d1aca7..0e3ef27 100644</span><br><span>--- a/src/osmo-bts-sysmo/utils.c</span><br><span>+++ b/src/osmo-bts-sysmo/utils.c</span><br><span>@@ -80,6 +80,7 @@</span><br><span> {</span><br><span> enum gsm_band band;</span><br><span> struct gsm_bts *bts = trx->bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span> </span><br><span> if (!bts->auto_band)</span><br><span> return band_osmo2femto(trx, bts->band);</span><br><span>@@ -87,7 +88,9 @@</span><br><span> /*</span><br><span> * We need to check what will happen now.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- band = gsm_arfcn2band(arfcn);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm_arfcn2band_rc(arfcn, &band);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc) /* wrong ARFCN, give up */</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> </span><br><span> /* if we are already on the right band return */</span><br><span> if (band == bts->band)</span><br><span>diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c</span><br><span>index a959a71..926b4c6 100644</span><br><span>--- a/src/osmo-bts-trx/loops.c</span><br><span>+++ b/src/osmo-bts-trx/loops.c</span><br><span>@@ -33,8 +33,6 @@</span><br><span> #include "l1_if.h"</span><br><span> #include "loops.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define MS_PWR_DBM(arfcn, lvl) ms_pwr_dbm(gsm_arfcn2band(arfcn), lvl)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /*</span><br><span> * MS Power loop</span><br><span> */</span><br><span>@@ -42,6 +40,7 @@</span><br><span> static int ms_power_diff(struct gsm_lchan *lchan, uint8_t chan_nr, int8_t diff)</span><br><span> {</span><br><span> struct gsm_bts_trx *trx = lchan->ts->trx;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm_band band = trx->bts->band;</span><br><span> uint16_t arfcn = trx->arfcn;</span><br><span> int8_t new_power;</span><br><span> </span><br><span>@@ -72,7 +71,7 @@</span><br><span> LOGP(DLOOP, LOGL_INFO, "Keeping MS new_power of trx=%u "</span><br><span> "chan_nr=0x%02x at control level %d (%d dBm)\n",</span><br><span> trx->nr, chan_nr, new_power,</span><br><span style="color: hsl(0, 100%, 40%);">- MS_PWR_DBM(arfcn, new_power));</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_pwr_dbm(band, new_power));</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -81,8 +80,8 @@</span><br><span> "control level %d (%d dBm) to %d (%d dBm)\n",</span><br><span> (diff > 0) ? "Raising" : "Lowering",</span><br><span> trx->nr, chan_nr, lchan->ms_power_ctrl.current,</span><br><span style="color: hsl(0, 100%, 40%);">- MS_PWR_DBM(arfcn, lchan->ms_power_ctrl.current), new_power,</span><br><span style="color: hsl(0, 100%, 40%);">- MS_PWR_DBM(arfcn, new_power));</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_pwr_dbm(band, lchan->ms_power_ctrl.current), new_power,</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_pwr_dbm(band, new_power));</span><br><span> </span><br><span> lchan->ms_power_ctrl.current = new_power;</span><br><span> </span><br><span>@@ -158,7 +157,7 @@</span><br><span> LOGP(DLOOP, LOGL_DEBUG, "Lowest RSSI: %d Target RSSI: %d Current "</span><br><span> "MS power: %d (%d dBm) of trx=%u chan_nr=0x%02x\n", rssi,</span><br><span> pinst->phy_link->u.osmotrx.trx_target_rssi, lchan->ms_power_ctrl.current,</span><br><span style="color: hsl(0, 100%, 40%);">- MS_PWR_DBM(trx->arfcn, lchan->ms_power_ctrl.current),</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_pwr_dbm(trx->bts->band, lchan->ms_power_ctrl.current),</span><br><span> trx->nr, chan_nr);</span><br><span> ms_power_diff(lchan, chan_nr, pinst->phy_link->u.osmotrx.trx_target_rssi - rssi);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11873">change 11873</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/11873"/><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: I45aae70f4bc3f4f85d267dafb757debdef1bb7d7 </div>
<div style="display:none"> Gerrit-Change-Number: 11873 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </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>