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

alloc: Factor out the routine to find an enabled PDCH

This commit is contained in:
Holger Hans Peter Freyther 2013-09-29 08:18:17 +02:00
parent 11a748935e
commit b0a0075845
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/gprs_rlcmac_ts_alloc.cpp
View File

@ -97,6 +97,23 @@ static inline int8_t find_free_usf(struct gprs_rlcmac_pdch *pdch, uint8_t ts)
return -1;
}
static int find_enabled_pdch(struct gprs_rlcmac_trx *trx, const uint8_t start_ts)
{
int ts;
for (ts = start_ts; ts < 8; ts++) {
struct gprs_rlcmac_pdch *pdch;
pdch = &trx->pdch[ts];
if (!pdch->enable) {
LOGP(DRLCMAC, LOGL_DEBUG, "- Skipping TS %d, because "
"not enabled\n", ts);
continue;
}
return ts;
}
return 8;
}
static void assign_uplink_tbf_usf(
struct gprs_rlcmac_pdch *pdch,
@ -135,18 +152,11 @@ int alloc_algorithm_a(struct gprs_rlcmac_bts *bts,
LOGP(DRLCMAC, LOGL_DEBUG, "Slot Allocation (Algorithm A) for class "
"%d\n", tbf->ms_class);
for (ts = 0; ts < 8; ts++) {
pdch = &tbf->trx->pdch[ts];
if (!pdch->enable) {
LOGP(DRLCMAC, LOGL_DEBUG, "- Skipping TS %d, because "
"not enabled\n", ts);
continue;
}
break;
}
ts = find_enabled_pdch(tbf->trx, 0);
if (ts == 8)
return -EINVAL;
pdch = &tbf->trx->pdch[ts];
tbf->tsc = pdch->tsc;
if (tbf->direction == GPRS_RLCMAC_UL_TBF) {
/* if USF available */