diff options
| author | Andreas Eversberg <jolly@eversberg.eu> | 2012-07-13 14:50:57 +0200 |
|---|---|---|
| committer | Andreas Eversberg <jolly@eversberg.eu> | 2012-07-13 14:50:57 +0200 |
| commit | f298fa87b948b03ed71bc8538c14778b680612dc (patch) | |
| tree | 707e86a92d2288f38f56386cf9836b054bcf45b2 /src/gprs_rlcmac_data.cpp | |
| parent | b0c7ea72c8157f1b8124bbe105aa05c46a77a005 (diff) | |
multislot: Extracted "slot allocation algorithm" from tbf allocator
The current available algorithm only supports selecting a single slot
for downlink/uplink. (In the future, a multislot algorithm will follow.)
Diffstat (limited to 'src/gprs_rlcmac_data.cpp')
| -rw-r--r-- | src/gprs_rlcmac_data.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gprs_rlcmac_data.cpp b/src/gprs_rlcmac_data.cpp index 0e8aca3e..1b936fc7 100644 --- a/src/gprs_rlcmac_data.cpp +++ b/src/gprs_rlcmac_data.cpp @@ -207,9 +207,9 @@ uplink_request: /* FIXME: send reject */ break; } - /* FIXME: set number of downlink slots according to - * multislot class */ - ul_tbf = tbf_alloc(GPRS_RLCMAC_UL_TBF, tfi, trx, ts, 1); + /* use multislot class of downlink TBF */ + ul_tbf = tbf_alloc(GPRS_RLCMAC_UL_TBF, tfi, trx, ts, + tbf->ms_class); if (!ul_tbf) { LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH ressource\n"); /* FIXME: send reject */ @@ -825,8 +825,8 @@ int gprs_rlcmac_rcv_rach(uint8_t ra, uint32_t Fn, int16_t qta) /* FIXME: send reject */ return -EBUSY; } - /* select only one TS, since we don't know the multislot class yet */ - tbf = tbf_alloc(GPRS_RLCMAC_UL_TBF, tfi, trx, ts, 1); + /* set class to 0, since we don't know the multislot class yet */ + tbf = tbf_alloc(GPRS_RLCMAC_UL_TBF, tfi, trx, ts, 0); if (!tbf) { LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH ressource\n"); /* FIXME: send reject */ |