<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25814">View Change</a></p><div style="white-space:pre-wrap">Approvals:
dexter: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Get rid of tbf tsc field<br><br>TSC is not really a property of a TBF, so let's drop it in order to avoid<br>confusing and possible misuse of that accessor.<br><br>Change-Id: I105eb65d507e45631faddb23420c42bc9560e580<br>---<br>M src/bts.cpp<br>M src/tbf.cpp<br>M src/tbf.h<br>3 files changed, 1 insertion(+), 11 deletions(-)<br><br></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 aa713fe..50df92e 100644</span><br><span>--- a/src/bts.cpp</span><br><span>+++ b/src/bts.cpp</span><br><span>@@ -871,7 +871,6 @@</span><br><span> struct gprs_rlcmac_trx *trx;</span><br><span> uint32_t sb_fn = 0;</span><br><span> uint8_t usf = 7;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tsc = 0;</span><br><span> int plen, rc;</span><br><span> </span><br><span> /* Allocate a bit-vector for RR Immediate Assignment [Reject] */</span><br><span>@@ -924,7 +923,6 @@</span><br><span> </span><br><span> pdch = sba->pdch;</span><br><span> sb_fn = sba->fn;</span><br><span style="color: hsl(0, 100%, 40%);">- tsc = pdch->tsc;</span><br><span> LOGP(DRLCMAC, LOGL_DEBUG, "Allocated a single block at "</span><br><span> "SBFn=%u TRX=%u TS=%u\n", sb_fn, pdch->trx->trx_no, pdch->ts_no);</span><br><span> } else {</span><br><span>@@ -938,14 +936,13 @@</span><br><span> tbf->set_ta(ta);</span><br><span> pdch = &tbf->trx->pdch[tbf->first_ts];</span><br><span> usf = tbf->m_usf[pdch->ts_no];</span><br><span style="color: hsl(0, 100%, 40%);">- tsc = tbf->tsc();</span><br><span> }</span><br><span> trx = pdch->trx;</span><br><span> </span><br><span> LOGP(DRLCMAC, LOGL_DEBUG, "Tx Immediate Assignment on AGCH: "</span><br><span> "TRX=%u (ARFCN %u) TS=%u TA=%u TSC=%u TFI=%d USF=%d\n",</span><br><span> 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(120, 100%, 40%);">+ pdch->ts_no, ta, pdch->tsc, tbf ? tbf->tfi() : -1, usf);</span><br><span> plen = Encoding::write_immediate_assignment(pdch, tbf, bv,</span><br><span> false, rip->ra, Fn, ta, usf, false, sb_fn,</span><br><span> bts_get_ms_pwr_alpha(bts), bts->pcu->vty.gamma, -1,</span><br><span>diff --git a/src/tbf.cpp b/src/tbf.cpp</span><br><span>index 2343862..361e631 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -758,11 +758,6 @@</span><br><span> llist_add(tbf_trx_list((struct gprs_rlcmac_tbf *)this), &trx->dl_tbfs);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-uint8_t gprs_rlcmac_tbf::tsc() const</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- return trx->pdch[first_ts].tsc;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> uint8_t gprs_rlcmac_tbf::dl_slots() const</span><br><span> {</span><br><span> uint8_t slots = 0;</span><br><span>diff --git a/src/tbf.h b/src/tbf.h</span><br><span>index cab9364..4013ab0 100644</span><br><span>--- a/src/tbf.h</span><br><span>+++ b/src/tbf.h</span><br><span>@@ -180,8 +180,6 @@</span><br><span> GprsMs *ms() const;</span><br><span> void set_ms(GprsMs *ms);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tsc() const;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> bool n_inc(enum tbf_counters n);</span><br><span> void n_reset(enum tbf_counters n);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25814">change 25814</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/+/25814"/><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: I105eb65d507e45631faddb23420c42bc9560e580 </div>
<div style="display:none"> Gerrit-Change-Number: 25814 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </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: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>