<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/19511">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu_sock: separate trx / ts filling from pcu_tx_info_ind()<br><br>This would allow to avoid further nasting in 'for' loops.<br><br>Change-Id: Idb102c77751ccf77fd246f538e62fd7acf6ee88b<br>---<br>M src/common/pcu_sock.c<br>1 file changed, 35 insertions(+), 26 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/11/19511/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c</span><br><span>index ca8dd15..392900a 100644</span><br><span>--- a/src/common/pcu_sock.c</span><br><span>+++ b/src/common/pcu_sock.c</span><br><span>@@ -112,6 +112,39 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void info_ind_fill_trx(struct gsm_pcu_if_info_trx *trx_info,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int tn;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_info->pdch_mask = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_info->arfcn = trx->arfcn;</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_info->hlayer1 = trx_get_hlayer1(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx->mo.nm_state.operational != NM_OPSTATE_ENABLED ||</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->mo.nm_state.administrative != NM_STATE_UNLOCKED) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTRX(trx, DPCU, LOGL_INFO, "unavailable for PCU (op=%s adm=%s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ abis_nm_opstate_name(trx->mo.nm_state.operational),</span><br><span style="color: hsl(120, 100%, 40%);">+ abis_nm_admin_name(trx->mo.nm_state.administrative));</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (tn = 0; tn < 8; tn++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_bts_trx_ts *ts = &trx->ts[tn];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->mo.nm_state.operational != NM_OPSTATE_ENABLED)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ts_should_be_pdch(ts))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_info->pdch_mask |= (1 << tn);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_info->tsc[tn] = gsm_ts_tsc(ts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DPCU, LOGL_INFO, "(trx=%u,ts=%u) PDCH available (tsc=%u arfcn=%u)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->nr, ts->nr, trx_info->tsc[tn], trx->arfcn);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int pcu_tx_info_ind(void)</span><br><span> {</span><br><span> struct gsm_network *net = &bts_gsmnet;</span><br><span>@@ -122,8 +155,7 @@</span><br><span> struct gprs_rlc_cfg *rlcc;</span><br><span> struct gsm_bts_gprs_nsvc *nsvc;</span><br><span> struct gsm_bts_trx *trx;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx_ts *ts;</span><br><span style="color: hsl(0, 100%, 40%);">- int i, j;</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span> </span><br><span> LOGP(DPCU, LOGL_INFO, "Sending info\n");</span><br><span> </span><br><span>@@ -223,30 +255,7 @@</span><br><span> continue;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- info_ind->trx[trx->nr].pdch_mask = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- info_ind->trx[trx->nr].arfcn = trx->arfcn;</span><br><span style="color: hsl(0, 100%, 40%);">- info_ind->trx[trx->nr].hlayer1 = trx_get_hlayer1(trx);</span><br><span style="color: hsl(0, 100%, 40%);">- if (trx->mo.nm_state.operational != NM_OPSTATE_ENABLED ||</span><br><span style="color: hsl(0, 100%, 40%);">- trx->mo.nm_state.administrative != NM_STATE_UNLOCKED) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTRX(trx, DPCU, LOGL_INFO, "unavailable for PCU (op=%s adm=%s)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- abis_nm_opstate_name(trx->mo.nm_state.operational),</span><br><span style="color: hsl(0, 100%, 40%);">- abis_nm_admin_name(trx->mo.nm_state.administrative));</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- for (j = 0; j < 8; j++) {</span><br><span style="color: hsl(0, 100%, 40%);">- ts = &trx->ts[j];</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->mo.nm_state.operational == NM_OPSTATE_ENABLED</span><br><span style="color: hsl(0, 100%, 40%);">- && ts_should_be_pdch(ts)) {</span><br><span style="color: hsl(0, 100%, 40%);">- info_ind->trx[trx->nr].pdch_mask |= (1 << j);</span><br><span style="color: hsl(0, 100%, 40%);">- info_ind->trx[trx->nr].tsc[j] = gsm_ts_tsc(ts);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DPCU, LOGL_INFO, "trx=%d ts=%d: "</span><br><span style="color: hsl(0, 100%, 40%);">- "available (tsc=%d arfcn=%d)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- trx->nr, ts->nr,</span><br><span style="color: hsl(0, 100%, 40%);">- info_ind->trx[trx->nr].tsc[j],</span><br><span style="color: hsl(0, 100%, 40%);">- info_ind->trx[trx->nr].arfcn);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ info_ind_fill_trx(&info_ind->trx[trx->nr], trx);</span><br><span> }</span><br><span> </span><br><span> return pcu_sock_send(net, msg);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/19511">change 19511</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-bts/+/19511"/><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-Change-Id: Idb102c77751ccf77fd246f538e62fd7acf6ee88b </div>
<div style="display:none"> Gerrit-Change-Number: 19511 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>