Rename tbf_alloc_ul_tbf -> ul_tbf_alloc
Use proper prefix according to the type being allocated.
Change-Id: Ic98c3c852c96c3f52f1c8f531b8d0fd28ce5aef5
diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp
index 3426f23..e124b64 100644
--- a/tests/alloc/AllocTest.cpp
+++ b/tests/alloc/AllocTest.cpp
@@ -46,7 +46,7 @@
OSMO_ASSERT(ms != NULL);
if (dir == GPRS_RLCMAC_UL_TBF)
- return tbf_alloc_ul_tbf(bts, ms, use_trx, single_slot);
+ return ul_tbf_alloc(bts, ms, use_trx, single_slot);
else
return dl_tbf_alloc(bts, ms, use_trx, single_slot);
}
@@ -221,7 +221,7 @@
ms = bts_alloc_ms(bts, ms_class, 0);
/* Avoid delaying free to avoid tons of to-be-freed ms objects queuing */
ms_set_timeout(ms, 0);
- ul_tbf = tbf_alloc_ul_tbf(bts, ms, -1, true);
+ ul_tbf = ul_tbf_alloc(bts, ms, -1, true);
if (!ul_tbf)
return false;
@@ -275,7 +275,7 @@
dump_assignment(dl_tbf, "DL", verbose);
- ul_tbf = tbf_alloc_ul_tbf(bts, ms, ms_current_trx(ms)->trx_no, false);
+ ul_tbf = ul_tbf_alloc(bts, ms, ms_current_trx(ms)->trx_no, false);
if (!ul_tbf)
return false;
@@ -318,7 +318,7 @@
ms = bts_alloc_ms(bts, ms_class, 0);
/* Avoid delaying free to avoid tons of to-be-freed ms objects queuing */
ms_set_timeout(ms, 0);
- ul_tbf = tbf_alloc_ul_tbf(bts, ms, -1, false);
+ ul_tbf = ul_tbf_alloc(bts, ms, -1, false);
if (!ul_tbf)
return false;
@@ -475,7 +475,7 @@
case TEST_MODE_UL_AND_DL:
if (ms_ul_tbf(old_ms))
tbf_free(ms_ul_tbf(old_ms));
- tbf = tbf_alloc_ul_tbf(bts, old_ms, trx_no, false);
+ tbf = ul_tbf_alloc(bts, old_ms, trx_no, false);
if (tbf == NULL) {
OSMO_ASSERT(trx_no != -1 || bts_all_pdch_allocated(bts));
ms_unref(old_ms);