diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-09-29 08:13:42 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-10-30 14:45:57 +0100 |
| commit | 11a748935eb793f94e30c2d04932251c93560dc0 (patch) | |
| tree | be7cd26754e403e48d3432fb30e61b9f6f0b22e5 /src/gprs_rlcmac_ts_alloc.cpp | |
| parent | 8481a0553d1f7289c6e63b7ab9200143b8691d96 (diff) | |
alloc: Remove the unimplemented/unfinished time constraint code
The algorithm is already complex enough. No reason to further
introduce the complexity with the branches it has.
Diffstat (limited to 'src/gprs_rlcmac_ts_alloc.cpp')
| -rw-r--r-- | src/gprs_rlcmac_ts_alloc.cpp | 58 |
1 files changed, 11 insertions, 47 deletions
diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 68f7bd6c..ee3ec799 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -218,19 +218,7 @@ int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, } Rx = ms_class->rx; -#if 0 - if (Rx > 4) { - LOGP(DRLCMAC, LOGL_DEBUG, "- Degrading max Rx slots to 4\n"); - Rx = 4; - } -#endif Tx = ms_class->tx; -#if 0 - if (Tx > 4) { - LOGP(DRLCMAC, LOGL_DEBUG, "- Degrading max Tx slots to 4\n"); - Tx = 4; - } -#endif Sum = ms_class->sum; Tta = ms_class->ta; Ttb = ms_class->tb; @@ -239,32 +227,14 @@ int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, Type = ms_class->type; /* Tta and Ttb may depend on hopping or frequency change */ - if (Ttb == MS_A) { - if (/* FIXME: hopping*/ 0) - Ttb = 1; - else - Ttb = 0; - } - if (Trb == MS_A) { - if (/* FIXME: hopping*/ 0) - Trb = 1; - else - Trb = 0; - } - if (Ttb == MS_B) { - /* FIXME: or frequency change */ - if (/* FIXME: hopping*/ 0) - Ttb = 1; - else - Ttb = 0; - } - if (Trb == MS_C) { - /* FIXME: or frequency change */ - if (/* FIXME: hopping*/ 0) - Trb = 1; - else - Trb = 0; - } + if (Ttb == MS_A) + Ttb = 0; + if (Trb == MS_A) + Trb = 0; + if (Ttb == MS_B) + Ttb = 0; + if (Trb == MS_C) + Trb = 0; LOGP(DRLCMAC, LOGL_DEBUG, "- Rx=%d Tx=%d Sum Rx+Tx=%s Tta=%s Ttb=%d " " Tra=%d Trb=%d Type=%d\n", Rx, Tx, @@ -272,15 +242,9 @@ int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, (Tta == MS_NA) ? "N/A" : digit[Tta], Ttb, Tra, Trb, Type); /* select the values for time contraints */ - if (/* FIXME: monitoring */0) { - /* applicable to type 1 and type 2 */ - Tt = Ttb; - Tr = Tra; - } else { - /* applicable to type 1 and type 2 */ - Tt = Ttb; - Tr = Trb; - } + /* applicable to type 1 and type 2 */ + Tt = Ttb; + Tr = Trb; /* select a window of Rx slots if available * The maximum allowed slots depend on RX or the window of available |