edge: Support EGPRS multislot class handling in tbf_alloc
Add an egprs_ms_class argument to the allocation functions and
set/pass it where necessary.
Sponsored-by: On-Waves ehf
diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp
index 92679bc..5ec9357 100644
--- a/tests/tbf/TbfTest.cpp
+++ b/tests/tbf/TbfTest.cpp
@@ -90,14 +90,14 @@
*/
gprs_rlcmac_tbf *dl_tbf = tbf_alloc_dl_tbf(the_bts.bts_data(),
NULL,
- 0, 0, 0);
+ 0, 0, 0, 0);
OSMO_ASSERT(dl_tbf != NULL);
dl_tbf->update_ms(0x2342, GPRS_RLCMAC_DL_TBF);
dl_tbf->set_ta(4);
gprs_rlcmac_tbf *ul_tbf = tbf_alloc_ul_tbf(the_bts.bts_data(),
dl_tbf->ms(),
- 0, 0, 0);
+ 0, 0, 0, 0);
OSMO_ASSERT(ul_tbf != NULL);
ul_tbf->update_ms(0x2342, GPRS_RLCMAC_UL_TBF);
@@ -174,7 +174,7 @@
tfi = the_bts->tfi_find_free(GPRS_RLCMAC_DL_TBF, &trx_no, -1);
OSMO_ASSERT(tfi >= 0);
- dl_tbf = tbf_alloc_dl_tbf(bts, NULL, trx_no, ms_class, 1);
+ dl_tbf = tbf_alloc_dl_tbf(bts, NULL, trx_no, ms_class, 0, 1);
check_tbf(dl_tbf);
/* "Establish" the DL TBF */
diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err
index 2869ffd..77366b9 100644
--- a/tests/tbf/TbfTest.err
+++ b/tests/tbf/TbfTest.err
@@ -17,7 +17,7 @@
The MS object cannot fully confirm an unexpected TLLI: 0x00002342, partly confirmed
Modifying MS object, TLLI = 0x00002342, TA 0 -> 4
********** TBF starts here **********
-Allocating UL TBF: MS_CLASS=0
+Allocating UL TBF: MS_CLASS=0/0
Slot Allocation (Algorithm A) for class 0
- Skipping TS 0, because not enabled
- Skipping TS 1, because not enabled
@@ -1371,7 +1371,7 @@
Found TFI=0.
MS requests UL TBF on RACH, so we provide one:
********** TBF starts here **********
-Allocating UL TBF: MS_CLASS=0
+Allocating UL TBF: MS_CLASS=0/0
Creating MS object, TLLI = 0x00000000
Slot Allocation (Algorithm A) for class 0
- Skipping TS 0, because not enabled
@@ -1449,7 +1449,7 @@
------------------------- RX : Uplink Control Block -------------------------
MS requests UL TBF in packet resource request of single block, so we provide one:
********** TBF starts here **********
-Allocating UL TBF: MS_CLASS=1
+Allocating UL TBF: MS_CLASS=1/0
Creating MS object, TLLI = 0x00000000
Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1
Slot Allocation (Algorithm A) for class 1
@@ -1526,7 +1526,7 @@
------------------------- RX : Uplink Control Block -------------------------
MS requests UL TBF in packet resource request of single block, so we provide one:
********** TBF starts here **********
-Allocating UL TBF: MS_CLASS=1
+Allocating UL TBF: MS_CLASS=1/0
Creating MS object, TLLI = 0x00000000
Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1
Slot Allocation (Algorithm A) for class 1
@@ -1647,7 +1647,7 @@
------------------------- RX : Uplink Control Block -------------------------
MS requests UL TBF in packet resource request of single block, so we provide one:
********** TBF starts here **********
-Allocating UL TBF: MS_CLASS=1
+Allocating UL TBF: MS_CLASS=1/0
Creating MS object, TLLI = 0x00000000
Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1
Slot Allocation (Algorithm A) for class 1
@@ -1711,7 +1711,7 @@
------------------------- RX : Uplink Control Block -------------------------
MS requests UL TBF in packet resource request of single block, so we provide one:
********** TBF starts here **********
-Allocating UL TBF: MS_CLASS=1
+Allocating UL TBF: MS_CLASS=1/0
Creating MS object, TLLI = 0x00000000
Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1
Slot Allocation (Algorithm A) for class 1
@@ -1799,7 +1799,7 @@
TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=WAIT RELEASE) restarting timer 3193 while old timer 0 pending
MS requests UL TBF in packet resource request of single block, so we provide one:
********** TBF starts here **********
-Allocating UL TBF: MS_CLASS=1
+Allocating UL TBF: MS_CLASS=1/0
Slot Allocation (Algorithm A) for class 1
- Skipping TS 0, because not enabled
- Skipping TS 1, because not enabled
@@ -1868,7 +1868,7 @@
------------------------- RX : Uplink Control Block -------------------------
MS requests UL TBF in packet resource request of single block, so we provide one:
********** TBF starts here **********
-Allocating UL TBF: MS_CLASS=1
+Allocating UL TBF: MS_CLASS=1/0
Creating MS object, TLLI = 0x00000000
Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1
Slot Allocation (Algorithm A) for class 1
@@ -1945,7 +1945,7 @@
Found TFI=0.
MS requests UL TBF on RACH, so we provide one:
********** TBF starts here **********
-Allocating UL TBF: MS_CLASS=0
+Allocating UL TBF: MS_CLASS=0/0
Creating MS object, TLLI = 0x00000000
Slot Allocation (Algorithm A) for class 0
- Skipping TS 0, because not enabled
@@ -2005,7 +2005,7 @@
------------------------- RX : Uplink Control Block -------------------------
MS requests UL TBF in packet resource request of single block, so we provide one:
********** TBF starts here **********
-Allocating UL TBF: MS_CLASS=1
+Allocating UL TBF: MS_CLASS=1/0
Creating MS object, TLLI = 0x00000000
Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1
Slot Allocation (Algorithm A) for class 1