<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/19728">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu_l1_if: cosmetic: rename both 'trx'/'ts' to 'trx_nr'/'ts_nr'<br><br>Change-Id: Id481eba9bd462e411b2ba047ee5b849ddba8ac6b<br>---<br>M src/pcu_l1_if.cpp<br>1 file changed, 23 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp</span><br><span>index 7d0345e..578e5aa 100644</span><br><span>--- a/src/pcu_l1_if.cpp</span><br><span>+++ b/src/pcu_l1_if.cpp</span><br><span>@@ -492,7 +492,7 @@</span><br><span> struct gprs_rlcmac_pdch *pdch;</span><br><span> struct in_addr ia;</span><br><span> int rc = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int trx, ts;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int trx_nr, ts_nr;</span><br><span> int i;</span><br><span> </span><br><span> if (info_ind->version != PCU_IF_VERSION) {</span><br><span>@@ -511,10 +511,10 @@</span><br><span> bssgp_failed:</span><br><span> bts->active = false;</span><br><span> /* free all TBF */</span><br><span style="color: hsl(0, 100%, 40%);">- for (trx = 0; trx < ARRAY_SIZE(bts->trx); trx++) {</span><br><span style="color: hsl(0, 100%, 40%);">- bts->trx[trx].arfcn = info_ind->trx[trx].arfcn;</span><br><span style="color: hsl(0, 100%, 40%);">- for (ts = 0; ts < ARRAY_SIZE(bts->trx[0].pdch); ts++)</span><br><span style="color: hsl(0, 100%, 40%);">- bts->trx[trx].pdch[ts].free_resources();</span><br><span style="color: hsl(120, 100%, 40%);">+ for (trx_nr = 0; trx_nr < ARRAY_SIZE(bts->trx); trx_nr++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->trx[trx_nr].arfcn = info_ind->trx[trx_nr].arfcn;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (ts_nr = 0; ts_nr < ARRAY_SIZE(bts->trx[0].pdch); ts_nr++)</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->trx[trx_nr].pdch[ts_nr].free_resources();</span><br><span> }</span><br><span> gprs_bssgp_destroy();</span><br><span> exit(0);</span><br><span>@@ -605,19 +605,19 @@</span><br><span> bts->initial_cs_ul = bts->initial_cs_dl;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for (trx = 0; trx < ARRAY_SIZE(bts->trx); trx++) {</span><br><span style="color: hsl(0, 100%, 40%);">- bts->trx[trx].arfcn = info_ind->trx[trx].arfcn;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (trx_nr = 0; trx_nr < ARRAY_SIZE(bts->trx); trx_nr++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->trx[trx_nr].arfcn = info_ind->trx[trx_nr].arfcn;</span><br><span> if ((info_ind->flags & PCU_IF_FLAG_SYSMO)</span><br><span style="color: hsl(0, 100%, 40%);">- && info_ind->trx[trx].hlayer1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ && info_ind->trx[trx_nr].hlayer1) {</span><br><span> #ifdef ENABLE_DIRECT_PHY</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1IF, LOGL_DEBUG, " TRX %d hlayer1=%x\n", trx,</span><br><span style="color: hsl(0, 100%, 40%);">- info_ind->trx[trx].hlayer1);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts->trx[trx].fl1h)</span><br><span style="color: hsl(0, 100%, 40%);">- bts->trx[trx].fl1h = l1if_open_pdch(</span><br><span style="color: hsl(0, 100%, 40%);">- trx,</span><br><span style="color: hsl(0, 100%, 40%);">- info_ind->trx[trx].hlayer1,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_DEBUG, " TRX %d hlayer1=%x\n", trx_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ info_ind->trx[trx_nr].hlayer1);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bts->trx[trx_nr].fl1h)</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->trx[trx_nr].fl1h = l1if_open_pdch(</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ info_ind->trx[trx_nr].hlayer1,</span><br><span> bts->gsmtap);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts->trx[trx].fl1h) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bts->trx[trx_nr].fl1h) {</span><br><span> LOGP(DL1IF, LOGL_FATAL, "Failed to open direct "</span><br><span> "DSP access for PDCH.\n");</span><br><span> exit(0);</span><br><span>@@ -630,26 +630,26 @@</span><br><span> #endif</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for (ts = 0; ts < ARRAY_SIZE(bts->trx[0].pdch); ts++) {</span><br><span style="color: hsl(0, 100%, 40%);">- pdch = &bts->trx[trx].pdch[ts];</span><br><span style="color: hsl(0, 100%, 40%);">- if ((info_ind->trx[trx].pdch_mask & (1 << ts))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (ts_nr = 0; ts_nr < ARRAY_SIZE(bts->trx[0].pdch); ts_nr++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ pdch = &bts->trx[trx_nr].pdch[ts_nr];</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((info_ind->trx[trx_nr].pdch_mask & (1 << ts_nr))) {</span><br><span> /* FIXME: activate dynamically at RLCMAC */</span><br><span> if (!pdch->is_enabled()) {</span><br><span> #ifdef ENABLE_DIRECT_PHY</span><br><span> if ((info_ind->flags &</span><br><span> PCU_IF_FLAG_SYSMO))</span><br><span> l1if_connect_pdch(</span><br><span style="color: hsl(0, 100%, 40%);">- bts->trx[trx].fl1h, ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->trx[trx_nr].fl1h, ts_nr);</span><br><span> #endif</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_tx_act_req(trx, ts, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_tx_act_req(trx_nr, ts_nr, 1);</span><br><span> pdch->enable();</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- pdch->tsc = info_ind->trx[trx].tsc[ts];</span><br><span style="color: hsl(120, 100%, 40%);">+ pdch->tsc = info_ind->trx[trx_nr].tsc[ts_nr];</span><br><span> LOGP(DL1IF, LOGL_INFO, "PDCH: trx=%d ts=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- trx, ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_nr, ts_nr);</span><br><span> } else {</span><br><span> if (pdch->is_enabled()) {</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_tx_act_req(trx, ts, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_tx_act_req(trx_nr, ts_nr, 0);</span><br><span> pdch->free_resources();</span><br><span> pdch->disable();</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/19728">change 19728</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/c/osmo-pcu/+/19728"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id481eba9bd462e411b2ba047ee5b849ddba8ac6b </div>
<div style="display:none"> Gerrit-Change-Number: 19728 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>