<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10778">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;">trxcon: avoid arfcn / band_arfcn naming confusion<br><br>In the most cases an ARFCN value is stored together with some<br>flags (e.g. DL/UL flag, DCS flag), so it should be taken into<br>account e.g. when printing. Let's use the proper naming.<br><br>Change-Id: I0b7634c80986dbff9d0da421c6a044cd36c9fd01<br>---<br>M src/host/trxcon/l1ctl.c<br>M src/host/trxcon/trx_if.c<br>M src/host/trxcon/trx_if.h<br>3 files changed, 32 insertions(+), 32 deletions(-)<br><br></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 9d6871e..49d6a12 100644</span><br><span>--- a/src/host/trxcon/l1ctl.c</span><br><span>+++ b/src/host/trxcon/l1ctl.c</span><br><span>@@ -349,7 +349,7 @@</span><br><span> </span><br><span> static int l1ctl_rx_pm_req(struct l1ctl_link *l1l, struct msgb *msg)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t arfcn_start, arfcn_stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t band_arfcn_start, band_arfcn_stop;</span><br><span> struct l1ctl_pm_req *pmr;</span><br><span> int rc = 0;</span><br><span> </span><br><span>@@ -361,17 +361,17 @@</span><br><span> goto exit;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- arfcn_start = ntohs(pmr->range.band_arfcn_from);</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn_stop = ntohs(pmr->range.band_arfcn_to);</span><br><span style="color: hsl(120, 100%, 40%);">+ band_arfcn_start = ntohs(pmr->range.band_arfcn_from);</span><br><span style="color: hsl(120, 100%, 40%);">+ band_arfcn_stop = ntohs(pmr->range.band_arfcn_to);</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(arfcn_start)),</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn_start &~ ARFCN_FLAG_MASK,</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn_stop &~ ARFCN_FLAG_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_band_name(gsm_arfcn2band(band_arfcn_start)),</span><br><span style="color: hsl(120, 100%, 40%);">+ band_arfcn_start &~ ARFCN_FLAG_MASK,</span><br><span style="color: hsl(120, 100%, 40%);">+ band_arfcn_stop &~ ARFCN_FLAG_MASK);</span><br><span> </span><br><span> /* Send measurement request to transceiver */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = trx_if_cmd_measure(l1l->trx, arfcn_start, arfcn_stop);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = trx_if_cmd_measure(l1l->trx, band_arfcn_start, band_arfcn_stop);</span><br><span> </span><br><span> exit:</span><br><span> msgb_free(msg);</span><br><span>diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c</span><br><span>index cab5a9b..e08857c 100644</span><br><span>--- a/src/host/trxcon/trx_if.c</span><br><span>+++ b/src/host/trxcon/trx_if.c</span><br><span>@@ -310,28 +310,28 @@</span><br><span> * RSP (RX/TX)TUNE <status> <kHz></span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int trx_if_cmd_rxtune(struct trx_instance *trx, uint16_t arfcn)</span><br><span style="color: hsl(120, 100%, 40%);">+int trx_if_cmd_rxtune(struct trx_instance *trx, uint16_t band_arfcn)</span><br><span> {</span><br><span> uint16_t freq10;</span><br><span> </span><br><span> /* RX is downlink on MS side */</span><br><span style="color: hsl(0, 100%, 40%);">- freq10 = gsm_arfcn2freq10(arfcn, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ freq10 = gsm_arfcn2freq10(band_arfcn, 0);</span><br><span> if (freq10 == 0xffff) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DTRX, LOGL_ERROR, "ARFCN %d not defined\n", arfcn);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DTRX, LOGL_ERROR, "ARFCN %d not defined\n", band_arfcn);</span><br><span> return -ENOTSUP;</span><br><span> }</span><br><span> </span><br><span> return trx_ctrl_cmd(trx, 1, "RXTUNE", "%d", freq10 * 100);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int trx_if_cmd_txtune(struct trx_instance *trx, uint16_t arfcn)</span><br><span style="color: hsl(120, 100%, 40%);">+int trx_if_cmd_txtune(struct trx_instance *trx, uint16_t band_arfcn)</span><br><span> {</span><br><span> uint16_t freq10;</span><br><span> </span><br><span> /* TX is uplink on MS side */</span><br><span style="color: hsl(0, 100%, 40%);">- freq10 = gsm_arfcn2freq10(arfcn, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ freq10 = gsm_arfcn2freq10(band_arfcn, 1);</span><br><span> if (freq10 == 0xffff) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DTRX, LOGL_ERROR, "ARFCN %d not defined\n", arfcn);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DTRX, LOGL_ERROR, "ARFCN %d not defined\n", band_arfcn);</span><br><span> return -ENOTSUP;</span><br><span> }</span><br><span> </span><br><span>@@ -351,18 +351,18 @@</span><br><span> */</span><br><span> </span><br><span> int trx_if_cmd_measure(struct trx_instance *trx,</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t arfcn_start, uint16_t arfcn_stop)</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t band_arfcn_start, uint16_t band_arfcn_stop)</span><br><span> {</span><br><span> uint16_t freq10;</span><br><span> </span><br><span> /* Update ARFCN range for measurement */</span><br><span style="color: hsl(0, 100%, 40%);">- trx->pm_arfcn_start = arfcn_start;</span><br><span style="color: hsl(0, 100%, 40%);">- trx->pm_arfcn_stop = arfcn_stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->pm_band_arfcn_start = band_arfcn_start;</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->pm_band_arfcn_stop = band_arfcn_stop;</span><br><span> </span><br><span> /* Calculate a frequency for current ARFCN (DL) */</span><br><span style="color: hsl(0, 100%, 40%);">- freq10 = gsm_arfcn2freq10(arfcn_start, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ freq10 = gsm_arfcn2freq10(band_arfcn_start, 0);</span><br><span> if (freq10 == 0xffff) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DTRX, LOGL_ERROR, "ARFCN %d not defined\n", arfcn_start);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DTRX, LOGL_ERROR, "ARFCN %d not defined\n", band_arfcn_start);</span><br><span> return -ENOTSUP;</span><br><span> }</span><br><span> </span><br><span>@@ -372,7 +372,7 @@</span><br><span> static void trx_if_measure_rsp_cb(struct trx_instance *trx, char *resp)</span><br><span> {</span><br><span> unsigned int freq10;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t arfcn;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t band_arfcn;</span><br><span> int dbm;</span><br><span> </span><br><span> /* Parse freq. and power level */</span><br><span>@@ -380,22 +380,22 @@</span><br><span> freq10 /= 100;</span><br><span> </span><br><span> /* Check received ARFCN against expected */</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn = gsm_freq102arfcn((uint16_t) freq10, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (arfcn != trx->pm_arfcn_start) {</span><br><span style="color: hsl(120, 100%, 40%);">+ band_arfcn = gsm_freq102arfcn((uint16_t) freq10, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (band_arfcn != trx->pm_band_arfcn_start) {</span><br><span> LOGP(DTRX, LOGL_ERROR, "Power measurement error: "</span><br><span> "response ARFCN=%u doesn't match expected ARFCN=%u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn &~ ARFCN_FLAG_MASK,</span><br><span style="color: hsl(0, 100%, 40%);">- trx->pm_arfcn_start &~ ARFCN_FLAG_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+ band_arfcn &~ ARFCN_FLAG_MASK,</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->pm_band_arfcn_start &~ ARFCN_FLAG_MASK);</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span> /* Send L1CTL_PM_CONF */</span><br><span style="color: hsl(0, 100%, 40%);">- l1ctl_tx_pm_conf(trx->l1l, arfcn, dbm,</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn == trx->pm_arfcn_stop);</span><br><span style="color: hsl(120, 100%, 40%);">+ l1ctl_tx_pm_conf(trx->l1l, band_arfcn, dbm,</span><br><span style="color: hsl(120, 100%, 40%);">+ band_arfcn == trx->pm_band_arfcn_stop);</span><br><span> </span><br><span> /* Schedule a next measurement */</span><br><span style="color: hsl(0, 100%, 40%);">- if (arfcn != trx->pm_arfcn_stop)</span><br><span style="color: hsl(0, 100%, 40%);">- trx_if_cmd_measure(trx, ++arfcn, trx->pm_arfcn_stop);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (band_arfcn != trx->pm_band_arfcn_stop)</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_if_cmd_measure(trx, ++band_arfcn, trx->pm_band_arfcn_stop);</span><br><span> }</span><br><span> </span><br><span> /*</span><br><span>diff --git a/src/host/trxcon/trx_if.h b/src/host/trxcon/trx_if.h</span><br><span>index 6080dce..ed6bd3f 100644</span><br><span>--- a/src/host/trxcon/trx_if.h</span><br><span>+++ b/src/host/trxcon/trx_if.h</span><br><span>@@ -28,8 +28,8 @@</span><br><span> uint32_t prev_state;</span><br><span> </span><br><span> /* GSM L1 specific */</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t pm_arfcn_start;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t pm_arfcn_stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t pm_band_arfcn_start;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t pm_band_arfcn_stop;</span><br><span> uint16_t band_arfcn;</span><br><span> uint8_t tx_power;</span><br><span> uint8_t bsic;</span><br><span>@@ -66,13 +66,13 @@</span><br><span> </span><br><span> int trx_if_cmd_setta(struct trx_instance *trx, int8_t ta);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int trx_if_cmd_rxtune(struct trx_instance *trx, uint16_t arfcn);</span><br><span style="color: hsl(0, 100%, 40%);">-int trx_if_cmd_txtune(struct trx_instance *trx, uint16_t arfcn);</span><br><span style="color: hsl(120, 100%, 40%);">+int trx_if_cmd_rxtune(struct trx_instance *trx, uint16_t band_arfcn);</span><br><span style="color: hsl(120, 100%, 40%);">+int trx_if_cmd_txtune(struct trx_instance *trx, uint16_t band_arfcn);</span><br><span> </span><br><span> int trx_if_cmd_setslot(struct trx_instance *trx, uint8_t tn, uint8_t type);</span><br><span> </span><br><span> int trx_if_cmd_measure(struct trx_instance *trx,</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t arfcn_start, uint16_t arfcn_stop);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t band_arfcn_start, uint16_t band_arfcn_stop);</span><br><span> </span><br><span> int trx_if_tx_burst(struct trx_instance *trx, uint8_t tn, uint32_t fn,</span><br><span> uint8_t pwr, const ubit_t *bits);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10778">change 10778</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/10778"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I0b7634c80986dbff9d0da421c6a044cd36c9fd01 </div>
<div style="display:none"> Gerrit-Change-Number: 10778 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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: Vadim Yanitskiy <axilirator@gmail.com> </div>