cellular-infrastructure
/
osmo-pcu
mirror of https://gerrit.osmocom.org/osmo-pcu
9
0
Fork 1
Code Issues Releases Wiki Activity

Get rid of tbf tsc field 

TSC is not really a property of a TBF, so let's drop it in order to avoid
confusing and possible misuse of that accessor.

Change-Id: I105eb65d507e45631faddb23420c42bc9560e580
This commit is contained in:
Pau Espin 2021-10-18 13:35:05 +02:00
parent f5cb4acb14
commit 9c84c88259
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bts.cpp
View File

@ -871,7 +871,6 @@ int bts_rcv_rach(struct gprs_rlcmac_bts *bts, const struct rach_ind_params *rip)
struct gprs_rlcmac_trx *trx;
uint32_t sb_fn = 0;
uint8_t usf = 7;
uint8_t tsc = 0;
int plen, rc;
/* Allocate a bit-vector for RR Immediate Assignment [Reject] */
@ -924,7 +923,6 @@ int bts_rcv_rach(struct gprs_rlcmac_bts *bts, const struct rach_ind_params *rip)
pdch = sba->pdch;
sb_fn = sba->fn;
tsc = pdch->tsc;
LOGP(DRLCMAC, LOGL_DEBUG, "Allocated a single block at "
"SBFn=%u TRX=%u TS=%u\n", sb_fn, pdch->trx->trx_no, pdch->ts_no);
} else {
@ -938,14 +936,13 @@ int bts_rcv_rach(struct gprs_rlcmac_bts *bts, const struct rach_ind_params *rip)
tbf->set_ta(ta);
pdch = &tbf->trx->pdch[tbf->first_ts];
usf = tbf->m_usf[pdch->ts_no];
tsc = tbf->tsc();
}
trx = pdch->trx;
LOGP(DRLCMAC, LOGL_DEBUG, "Tx Immediate Assignment on AGCH: "
"TRX=%u (ARFCN %u) TS=%u TA=%u TSC=%u TFI=%d USF=%d\n",
trx->trx_no, trx->arfcn & ~ARFCN_FLAG_MASK,
pdch->ts_no, ta, tsc, tbf ? tbf->tfi() : -1, usf);
pdch->ts_no, ta, pdch->tsc, tbf ? tbf->tfi() : -1, usf);
plen = Encoding::write_immediate_assignment(pdch, tbf, bv,
false, rip->ra, Fn, ta, usf, false, sb_fn,
bts_get_ms_pwr_alpha(bts), bts->pcu->vty.gamma, -1,

5
src/tbf.cpp
View File

@ -758,11 +758,6 @@ void gprs_rlcmac_tbf::rotate_in_list()
llist_add(tbf_trx_list((struct gprs_rlcmac_tbf *)this), &trx->dl_tbfs);
}
uint8_t gprs_rlcmac_tbf::tsc() const
{
return trx->pdch[first_ts].tsc;
}
uint8_t gprs_rlcmac_tbf::dl_slots() const
{
uint8_t slots = 0;

2
src/tbf.h
View File

@ -180,8 +180,6 @@ struct gprs_rlcmac_tbf {
GprsMs *ms() const;
void set_ms(GprsMs *ms);
uint8_t tsc() const;
bool n_inc(enum tbf_counters n);
void n_reset(enum tbf_counters n);