<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12948">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Clarify write_immediate_assignment() signature<br><br>* remove unused variable<br>* use bool for boolean types<br>* add clarification comments<br><br>Change-Id: I363445063e2d873d9194b2a5924b9e59b8b7ea53<br>---<br>M src/bts.cpp<br>M src/bts.h<br>M src/encoding.cpp<br>M src/encoding.h<br>M src/tbf.cpp<br>M src/tbf_dl.cpp<br>6 files changed, 20 insertions(+), 22 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/48/12948/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 b6d0d0c..f421e2c 100644</span><br><span>--- a/src/bts.cpp</span><br><span>+++ b/src/bts.cpp</span><br><span>@@ -774,11 +774,10 @@</span><br><span> " - TRX=%d (%d) TS=%d TA=%d TSC=%d TFI=%d USF=%d\n",</span><br><span> trx_no, m_bts.trx[trx_no].arfcn, ts_no, ta, tsc,</span><br><span> tbf ? tbf->tfi() : -1, usf);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- plen = Encoding::write_immediate_assignment(</span><br><span style="color: hsl(0, 100%, 40%);">- tbf, immediate_assignment, 0, ra, Fn, ta,</span><br><span style="color: hsl(0, 100%, 40%);">- m_bts.trx[trx_no].arfcn, ts_no, tsc, usf, 0, sb_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- m_bts.alpha, m_bts.gamma, -1, burst_type, sb);</span><br><span style="color: hsl(120, 100%, 40%);">+ // N. B: if tbf == NULL than SBA is used for Imm. Ass. below</span><br><span style="color: hsl(120, 100%, 40%);">+ plen = Encoding::write_immediate_assignment(tbf, immediate_assignment, false, ra, Fn, ta,</span><br><span style="color: hsl(120, 100%, 40%);">+ m_bts.trx[trx_no].arfcn, ts_no, tsc, usf, false, sb_fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ m_bts.alpha, m_bts.gamma, -1, burst_type);</span><br><span> }</span><br><span> </span><br><span> if (plen >= 0) {</span><br><span>@@ -791,7 +790,7 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void BTS::snd_dl_ass(gprs_rlcmac_tbf *tbf, uint8_t poll, const char *imsi)</span><br><span style="color: hsl(120, 100%, 40%);">+void BTS::snd_dl_ass(gprs_rlcmac_tbf *tbf, bool poll, const char *imsi)</span><br><span> {</span><br><span> int plen;</span><br><span> unsigned int ts = tbf->first_ts;</span><br><span>@@ -804,10 +803,11 @@</span><br><span> LOGP(DRLCMAC, LOGL_DEBUG, " - TRX=%d (%d) TS=%d TA=%d pollFN=%d\n",</span><br><span> tbf->trx->trx_no, tbf->trx->arfcn,</span><br><span> ts, tbf->ta(), poll ? tbf->poll_fn : -1);</span><br><span style="color: hsl(0, 100%, 40%);">- plen = Encoding::write_immediate_assignment(tbf, immediate_assignment, 1, 125,</span><br><span style="color: hsl(0, 100%, 40%);">- (tbf->pdch[ts]->last_rts_fn + 21216) % GSM_MAX_FN, tbf->ta(),</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->trx->arfcn, ts, tbf->tsc(), 7, poll,</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->poll_fn, m_bts.alpha, m_bts.gamma, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+ plen = Encoding::write_immediate_assignment(tbf, immediate_assignment, true, 125,</span><br><span style="color: hsl(120, 100%, 40%);">+ (tbf->pdch[ts]->last_rts_fn + 21216) % GSM_MAX_FN, tbf->ta(),</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->trx->arfcn, ts, tbf->tsc(), 7, poll,</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->poll_fn, m_bts.alpha, m_bts.gamma, -1,</span><br><span style="color: hsl(120, 100%, 40%);">+ GSM_L1_BURST_TYPE_ACCESS_0);</span><br><span> if (plen >= 0) {</span><br><span> immediate_assignment_dl_tbf();</span><br><span> pcu_l1if_tx_pch(immediate_assignment, plen, imsi);</span><br><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index df81440..51760e2 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -294,7 +294,7 @@</span><br><span> int rcv_rach(uint16_t ra, uint32_t Fn, int16_t qta, bool is_11bit,</span><br><span> enum ph_burst_type burst_type);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- void snd_dl_ass(gprs_rlcmac_tbf *tbf, uint8_t poll, const char *imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ void snd_dl_ass(gprs_rlcmac_tbf *tbf, bool poll, const char *imsi);</span><br><span> </span><br><span> GprsMsStorage &ms_store();</span><br><span> GprsMs *ms_by_tlli(uint32_t tlli, uint32_t old_tlli = 0);</span><br><span>diff --git a/src/encoding.cpp b/src/encoding.cpp</span><br><span>index 1f96458..29a62e7 100644</span><br><span>--- a/src/encoding.cpp</span><br><span>+++ b/src/encoding.cpp</span><br><span>@@ -91,7 +91,7 @@</span><br><span> static int write_ia_rest_downlink(</span><br><span> gprs_rlcmac_dl_tbf *tbf,</span><br><span> bitvec * dest, unsigned& wp,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t polling, bool ta_valid, uint32_t fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ bool polling, bool ta_valid, uint32_t fn,</span><br><span> uint8_t alpha, uint8_t gamma, int8_t ta_idx)</span><br><span> {</span><br><span> if (!tbf) {</span><br><span>@@ -343,10 +343,10 @@</span><br><span> */</span><br><span> int Encoding::write_immediate_assignment(</span><br><span> struct gprs_rlcmac_tbf *tbf,</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec * dest, uint8_t downlink, uint16_t ra,</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec * dest, bool downlink, uint16_t ra,</span><br><span> uint32_t ref_fn, uint8_t ta, uint16_t arfcn, uint8_t ts, uint8_t tsc,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t usf, uint8_t polling, uint32_t fn, uint8_t alpha,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t gamma, int8_t ta_idx, enum ph_burst_type burst_type, uint8_t sb)</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t usf, bool polling, uint32_t fn, uint8_t alpha,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t gamma, int8_t ta_idx, enum ph_burst_type burst_type)</span><br><span> {</span><br><span> unsigned wp = 0;</span><br><span> int plen;</span><br><span>diff --git a/src/encoding.h b/src/encoding.h</span><br><span>index 54cb057..2309dc3 100644</span><br><span>--- a/src/encoding.h</span><br><span>+++ b/src/encoding.h</span><br><span>@@ -43,14 +43,12 @@</span><br><span> public:</span><br><span> static int write_immediate_assignment(</span><br><span> struct gprs_rlcmac_tbf *tbf,</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec * dest, uint8_t downlink, uint16_t ra,</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec * dest, bool downlink, uint16_t ra,</span><br><span> uint32_t ref_fn, uint8_t ta, uint16_t arfcn, uint8_t ts,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tsc, uint8_t usf, uint8_t polling,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tsc, uint8_t usf, bool polling,</span><br><span> uint32_t fn, uint8_t alpha, uint8_t gamma,</span><br><span> int8_t ta_idx,</span><br><span style="color: hsl(0, 100%, 40%);">- enum ph_burst_type burst_type =</span><br><span style="color: hsl(0, 100%, 40%);">- GSM_L1_BURST_TYPE_ACCESS_0,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t sb = 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ enum ph_burst_type burst_type);</span><br><span> </span><br><span> static int write_immediate_assignment_reject(</span><br><span> bitvec *dest, uint16_t ra,</span><br><span>diff --git a/src/tbf.cpp b/src/tbf.cpp</span><br><span>index 233ae91..ffe8b82 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -880,7 +880,7 @@</span><br><span> LOGPTBF(dl_tbf, LOGL_DEBUG, "Re-send dowlink assignment on PCH (IMSI=%s)\n",</span><br><span> imsi());</span><br><span> /* send immediate assignment */</span><br><span style="color: hsl(0, 100%, 40%);">- dl_tbf->bts->snd_dl_ass(dl_tbf, 0, imsi());</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_tbf->bts->snd_dl_ass(dl_tbf, false, imsi());</span><br><span> dl_tbf->m_wait_confirm = 1;</span><br><span> }</span><br><span> } else</span><br><span>diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp</span><br><span>index dd24963..0ef3032 100644</span><br><span>--- a/src/tbf_dl.cpp</span><br><span>+++ b/src/tbf_dl.cpp</span><br><span>@@ -510,7 +510,7 @@</span><br><span> TBF_SET_ASS_ON(this, GPRS_RLCMAC_FLAG_CCCH, false);</span><br><span> </span><br><span> /* send immediate assignment */</span><br><span style="color: hsl(0, 100%, 40%);">- bts->snd_dl_ass(this, 0, imsi());</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->snd_dl_ass(this, false, imsi());</span><br><span> m_wait_confirm = 1;</span><br><span> }</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12948">change 12948</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/12948"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I363445063e2d873d9194b2a5924b9e59b8b7ea53 </div>
<div style="display:none"> Gerrit-Change-Number: 12948 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>