<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25813">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts_rcv_rach(): Split code paths for Ass and Ass Rej<br><br>The function becomes a bit more long but it's a lot easier to follow.<br><br>Change-Id: I80e554315d36a515a7edc9ae51057ce31eb9110d<br>---<br>M src/bts.cpp<br>1 file changed, 28 insertions(+), 26 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/13/25813/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bts.cpp b/src/bts.cpp</span><br><span>index 8d98fe4..aa713fe 100644</span><br><span>--- a/src/bts.cpp</span><br><span>+++ b/src/bts.cpp</span><br><span>@@ -867,13 +867,17 @@</span><br><span> struct chan_req_params chan_req = { 0 };</span><br><span> struct gprs_rlcmac_ul_tbf *tbf = NULL;</span><br><span> struct gprs_rlcmac_sba *sba;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_pdch *pdch = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_trx *trx = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_pdch *pdch;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_trx *trx;</span><br><span> uint32_t sb_fn = 0;</span><br><span> uint8_t usf = 7;</span><br><span> uint8_t tsc = 0;</span><br><span> int plen, rc;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Allocate a bit-vector for RR Immediate Assignment [Reject] */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bitvec *bv = bitvec_alloc(22, tall_pcu_ctx); /* without plen */</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_unhex(bv, DUMMY_VEC); /* standard '2B'O padding */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> bts_do_rate_ctr_inc(bts, CTR_RACH_REQUESTS);</span><br><span> </span><br><span> if (rip->is_11bit)</span><br><span>@@ -938,36 +942,34 @@</span><br><span> }</span><br><span> trx = pdch->trx;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-send_imm_ass_rej:</span><br><span style="color: hsl(0, 100%, 40%);">- /* Allocate a bit-vector for RR Immediate Assignment [Reject] */</span><br><span style="color: hsl(0, 100%, 40%);">- struct bitvec *bv = bitvec_alloc(22, tall_pcu_ctx); /* without plen */</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_unhex(bv, DUMMY_VEC); /* standard '2B'O padding */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRLCMAC, LOGL_DEBUG, "Tx Immediate Assignment Reject on AGCH\n");</span><br><span style="color: hsl(0, 100%, 40%);">- plen = Encoding::write_immediate_assignment_reject(</span><br><span style="color: hsl(0, 100%, 40%);">- bv, rip->ra, Fn, rip->burst_type,</span><br><span style="color: hsl(0, 100%, 40%);">- (uint8_t)osmo_tdef_get(bts->T_defs_bts, 3142, OSMO_TDEF_S, -1));</span><br><span style="color: hsl(0, 100%, 40%);">- bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_REJ);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRLCMAC, LOGL_DEBUG, "Tx Immediate Assignment on AGCH: "</span><br><span style="color: hsl(120, 100%, 40%);">+ "TRX=%u (ARFCN %u) TS=%u TA=%u TSC=%u TFI=%d USF=%d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->trx_no, trx->arfcn & ~ARFCN_FLAG_MASK,</span><br><span style="color: hsl(120, 100%, 40%);">+ pdch->ts_no, ta, tsc, tbf ? tbf->tfi() : -1, usf);</span><br><span style="color: hsl(120, 100%, 40%);">+ plen = Encoding::write_immediate_assignment(pdch, tbf, bv,</span><br><span style="color: hsl(120, 100%, 40%);">+ false, rip->ra, Fn, ta, usf, false, sb_fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_get_ms_pwr_alpha(bts), bts->pcu->vty.gamma, -1,</span><br><span style="color: hsl(120, 100%, 40%);">+ rip->burst_type);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_UL_TBF);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (plen >= 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_l1if_tx_agch(bts, bv, plen);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = 0;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRLCMAC, LOGL_DEBUG, "Tx Immediate Assignment on AGCH: "</span><br><span style="color: hsl(0, 100%, 40%);">- "TRX=%u (ARFCN %u) TS=%u TA=%u TSC=%u TFI=%d USF=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- trx->trx_no, trx->arfcn & ~ARFCN_FLAG_MASK,</span><br><span style="color: hsl(0, 100%, 40%);">- pdch->ts_no, ta, tsc, tbf ? tbf->tfi() : -1, usf);</span><br><span style="color: hsl(0, 100%, 40%);">- plen = Encoding::write_immediate_assignment(pdch, tbf, bv,</span><br><span style="color: hsl(0, 100%, 40%);">- false, rip->ra, Fn, ta, usf, false, sb_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- bts_get_ms_pwr_alpha(bts), bts->pcu->vty.gamma, -1,</span><br><span style="color: hsl(0, 100%, 40%);">- rip->burst_type);</span><br><span style="color: hsl(0, 100%, 40%);">- bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_UL_TBF);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = plen;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_free(bv);</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+send_imm_ass_rej:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRLCMAC, LOGL_DEBUG, "Tx Immediate Assignment Reject on AGCH\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ plen = Encoding::write_immediate_assignment_reject(</span><br><span style="color: hsl(120, 100%, 40%);">+ bv, rip->ra, Fn, rip->burst_type,</span><br><span style="color: hsl(120, 100%, 40%);">+ (uint8_t)osmo_tdef_get(bts->T_defs_bts, 3142, OSMO_TDEF_S, -1));</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_REJ);</span><br><span> if (plen >= 0)</span><br><span> pcu_l1if_tx_agch(bts, bv, plen);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- rc = plen;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> bitvec_free(bv);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ /* rc was already properly set before goto */</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25813">change 25813</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/+/25813"/><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: I80e554315d36a515a7edc9ae51057ce31eb9110d </div>
<div style="display:none"> Gerrit-Change-Number: 25813 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>