Clarify write_immediate_assignment() signature
* remove unused variable
* use bool for boolean types
* add clarification comments
Change-Id: I363445063e2d873d9194b2a5924b9e59b8b7ea53
diff --git a/src/bts.cpp b/src/bts.cpp
index b6d0d0c..1804c52 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -774,11 +774,10 @@
" - TRX=%d (%d) TS=%d TA=%d TSC=%d TFI=%d USF=%d\n",
trx_no, m_bts.trx[trx_no].arfcn, ts_no, ta, tsc,
tbf ? tbf->tfi() : -1, usf);
-
- plen = Encoding::write_immediate_assignment(
- tbf, immediate_assignment, 0, ra, Fn, ta,
- m_bts.trx[trx_no].arfcn, ts_no, tsc, usf, 0, sb_fn,
- m_bts.alpha, m_bts.gamma, -1, burst_type, sb);
+ // N. B: if tbf == NULL then SBA is used for Imm. Ass. below
+ plen = Encoding::write_immediate_assignment(tbf, immediate_assignment, false, ra, Fn, ta,
+ m_bts.trx[trx_no].arfcn, ts_no, tsc, usf, false, sb_fn,
+ m_bts.alpha, m_bts.gamma, -1, burst_type);
}
if (plen >= 0) {
@@ -791,7 +790,7 @@
return rc;
}
-void BTS::snd_dl_ass(gprs_rlcmac_tbf *tbf, uint8_t poll, const char *imsi)
+void BTS::snd_dl_ass(gprs_rlcmac_tbf *tbf, bool poll, const char *imsi)
{
int plen;
unsigned int ts = tbf->first_ts;
@@ -804,10 +803,11 @@
LOGP(DRLCMAC, LOGL_DEBUG, " - TRX=%d (%d) TS=%d TA=%d pollFN=%d\n",
tbf->trx->trx_no, tbf->trx->arfcn,
ts, tbf->ta(), poll ? tbf->poll_fn : -1);
- plen = Encoding::write_immediate_assignment(tbf, immediate_assignment, 1, 125,
- (tbf->pdch[ts]->last_rts_fn + 21216) % GSM_MAX_FN, tbf->ta(),
- tbf->trx->arfcn, ts, tbf->tsc(), 7, poll,
- tbf->poll_fn, m_bts.alpha, m_bts.gamma, -1);
+ plen = Encoding::write_immediate_assignment(tbf, immediate_assignment, true, 125,
+ (tbf->pdch[ts]->last_rts_fn + 21216) % GSM_MAX_FN, tbf->ta(),
+ tbf->trx->arfcn, ts, tbf->tsc(), 7, poll,
+ tbf->poll_fn, m_bts.alpha, m_bts.gamma, -1,
+ GSM_L1_BURST_TYPE_ACCESS_0);
if (plen >= 0) {
immediate_assignment_dl_tbf();
pcu_l1if_tx_pch(immediate_assignment, plen, imsi);