diff options
| author | Daniel Willmann <dwillmann@sysmocom.de> | 2014-08-07 15:04:57 +0200 |
|---|---|---|
| committer | Daniel Willmann <daniel@totalueberwachung.de> | 2014-08-07 16:12:05 +0200 |
| commit | cd44ec41c5b0838c1a2492427d133d813d2a5171 (patch) | |
| tree | 94aa53b9e1ee13777f02bcc73a355811e4585971 /src/gprs_rlcmac_ts_alloc.cpp | |
| parent | f55e58f5cfb585fa357d1c081718034dc3258c54 (diff) | |
gprs_rlcmac_ts_alloc: Be explicit about which TBF is used
Use UL/DL TBFs instead of the base class wherever it is clear that the
code only deals with one kind of TBF.
Ticket: SYS#389
Sponsored by: On-Waves ehf
Diffstat (limited to 'src/gprs_rlcmac_ts_alloc.cpp')
| -rw-r--r-- | src/gprs_rlcmac_ts_alloc.cpp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index b070c2e9..038d1fe5 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -77,7 +77,7 @@ static const struct gprs_ms_multislot_class gprs_ms_multislot_class[32] = { static inline int8_t find_free_usf(struct gprs_rlcmac_pdch *pdch) { - struct gprs_rlcmac_tbf *tbf; + struct gprs_rlcmac_ul_tbf *tbf; uint8_t usf_map = 0; uint8_t tfi, usf; @@ -118,7 +118,7 @@ static int find_enabled_pdch(struct gprs_rlcmac_trx *trx, const uint8_t start_ts static void assign_uplink_tbf_usf( struct gprs_rlcmac_pdch *pdch, - struct gprs_rlcmac_tbf *tbf, int8_t usf) + struct gprs_rlcmac_ul_tbf *tbf, int8_t usf) { tbf->trx->ul_tbf[tbf->tfi()] = tbf; tbf->pdch[pdch->ts_no] = pdch; @@ -127,7 +127,7 @@ static void assign_uplink_tbf_usf( static void assign_dlink_tbf( struct gprs_rlcmac_pdch *pdch, - struct gprs_rlcmac_tbf *tbf) + struct gprs_rlcmac_dl_tbf *tbf) { tbf->trx->dl_tbf[tbf->tfi()] = tbf; tbf->pdch[pdch->ts_no] = pdch; @@ -155,6 +155,7 @@ int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, pdch = &tbf->trx->pdch[ts]; if (tbf->direction == GPRS_RLCMAC_UL_TBF) { int8_t usf; /* must be signed */ + struct gprs_rlcmac_ul_tbf *ul_tbf = static_cast<gprs_rlcmac_ul_tbf *>(tbf); /* if USF available */ usf = find_free_usf(pdch); @@ -165,10 +166,11 @@ int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, } LOGP(DRLCMAC, LOGL_DEBUG, "- Assign uplink " "TS=%d USF=%d\n", ts, usf); - assign_uplink_tbf_usf(pdch, tbf, usf); + assign_uplink_tbf_usf(pdch, ul_tbf, usf); } else { + struct gprs_rlcmac_dl_tbf *dl_tbf = static_cast<gprs_rlcmac_dl_tbf *>(tbf); LOGP(DRLCMAC, LOGL_DEBUG, "- Assign downlink TS=%d\n", ts); - assign_dlink_tbf(pdch, tbf); + assign_dlink_tbf(pdch, dl_tbf); } /* the only one TS is the common TS */ tbf->first_ts = tbf->first_common_ts = ts; @@ -627,6 +629,7 @@ int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, } if (tbf->direction == GPRS_RLCMAC_DL_TBF) { + struct gprs_rlcmac_dl_tbf *dl_tbf = static_cast<gprs_rlcmac_dl_tbf *>(tbf); /* assign downlink */ if (rx_window == 0) { LOGP(DRLCMAC, LOGL_NOTICE, "No downlink slots " @@ -642,23 +645,24 @@ int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, continue; LOGP(DRLCMAC, LOGL_DEBUG, "- Assigning DL TS " "%d\n", ts); - assign_dlink_tbf(&tbf->trx->pdch[ts], tbf); + assign_dlink_tbf(&tbf->trx->pdch[ts], dl_tbf); slotcount++; if (slotcount == 1) - tbf->first_ts = ts; + dl_tbf->first_ts = ts; if (single) break; } } } else { + struct gprs_rlcmac_ul_tbf *ul_tbf = static_cast<gprs_rlcmac_ul_tbf *>(tbf); for (ts = 0; ts < 8; ts++) { if ((tx_window & (1 << ts))) { LOGP(DRLCMAC, LOGL_DEBUG, "- Assigning UL TS " "%d\n", ts); - assign_uplink_tbf_usf(&tbf->trx->pdch[ts], tbf, usf[ts]); + assign_uplink_tbf_usf(&tbf->trx->pdch[ts], ul_tbf, usf[ts]); slotcount++; if (slotcount == 1) - tbf->first_ts = ts; + ul_tbf->first_ts = ts; if (single) break; } |