Merge bts_alloc_ms() and ms_alloc()
gprs_default_cb_ms_idle() is changed to have the same implementation as
previous bts_ms_idle_cb(), since that's the only one being used in
osmo-pcu code. It makes no sense to use different callback logic in unit
tests.
This is another step towards simplifying the code and getting rid of the
idle/active_cb().
Change-Id: I2a06d17588572a21dc5a14ddbde83766076b446d
diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp
index 94fc980..91b7ce4 100644
--- a/tests/types/TypesTest.cpp
+++ b/tests/types/TypesTest.cpp
@@ -688,7 +688,7 @@
the_pcu->alloc_algorithm = alloc_algorithm_a;
bts->trx[0].pdch[4].enable();
- GprsMs *ms = bts_alloc_ms(bts);
+ GprsMs *ms = ms_alloc(bts);
ms_set_ms_class(ms, 1);
ms_set_egprs_ms_class(ms, 1);
struct gprs_rlcmac_ul_tbf *tbf = ul_tbf_alloc(bts, ms, 0, true);
@@ -781,7 +781,7 @@
the_pcu->alloc_algorithm = alloc_algorithm_a;
bts->trx[0].pdch[2].enable();
bts->trx[0].pdch[3].enable();
- GprsMs *ms = bts_alloc_ms(bts);
+ GprsMs *ms = ms_alloc(bts);
ms_set_ms_class(ms, 1);
struct gprs_rlcmac_tbf *tbf = dl_tbf_alloc(bts, ms, 0, false);
@@ -808,7 +808,7 @@
bts->trx[0].pdch[4].enable();
bts->trx[0].pdch[5].enable();
- GprsMs *ms = bts_alloc_ms(bts);
+ GprsMs *ms = ms_alloc(bts);
ms_set_ms_class(ms, 1);
struct gprs_rlcmac_tbf *tbf = ul_tbf_alloc(bts, ms, 0, false);
static uint8_t res[] = { 0x06,
@@ -851,7 +851,7 @@
bts->trx[0].pdch[1].enable();
bts->trx[0].pdch[2].enable();
- GprsMs *ms = bts_alloc_ms(bts);
+ GprsMs *ms = ms_alloc(bts);
ms_set_ms_class(ms, 1);
ms_set_egprs_ms_class(ms, 1);
struct gprs_rlcmac_tbf *tbf = ul_tbf_alloc(bts, ms, 0, false);