diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2023-04-17 19:00:04 +0200 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2023-04-20 16:17:39 +0200 |
| commit | 9da0686371214f0c1ce9d54596fa76380e8d820b (patch) | |
| tree | f7ba2d172d23612a090c8221246b8115c64bbe48 /tests/tbf | |
| parent | fe7aee9302c6778494e024b77d9a870d8624a38d (diff) | |
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
Diffstat (limited to 'tests/tbf')
| -rw-r--r-- | tests/tbf/TbfTest.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index d493e6c0..0f0960a5 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -122,7 +122,7 @@ static void test_tbf_tlli_update() /* * Make a uplink and downlink allocation */ - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); gprs_rlcmac_tbf *dl_tbf = dl_tbf_alloc(bts, ms, 0, false); OSMO_ASSERT(dl_tbf != NULL); @@ -205,7 +205,7 @@ static gprs_rlcmac_dl_tbf *create_dl_tbf(struct gprs_rlcmac_bts *bts, uint8_t ms GprsMs *ms; gprs_rlcmac_dl_tbf *dl_tbf; - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); ms_set_ms_class(ms, ms_class); ms_set_egprs_ms_class(ms, egprs_ms_class); @@ -2346,7 +2346,7 @@ static void test_tbf_ws() gprs_bssgp_init(bts, 4234, 4234, 1, 1, false, 0, 0, 0); /* Does no support EGPRS */ - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); ms_set_ms_class(ms, ms_class); dl_tbf = dl_tbf_alloc(bts, ms, 0, false); @@ -2355,7 +2355,7 @@ static void test_tbf_ws() /* EGPRS-only */ /* Does support EGPRS */ - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); ms_set_ms_class(ms, ms_class); ms_set_egprs_ms_class(ms, ms_class); dl_tbf = dl_tbf_alloc(bts, ms, 0, false); @@ -2397,7 +2397,7 @@ static void test_tbf_update_ws(void) /* EGPRS-only */ /* Does support EGPRS */ - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); ms_set_ms_class(ms, ms_class); ms_set_egprs_ms_class(ms, ms_class); dl_tbf = dl_tbf_alloc(bts, ms, 0, true); @@ -2476,7 +2476,7 @@ static void test_ms_merge_dl_tbf_different_trx(void) trx0->pdch[2].enable(); trx0->pdch[3].enable(); - second_ms = bts_alloc_ms(bts); + second_ms = ms_alloc(bts); ms_set_tlli(second_ms, new_tlli); ul_tbf = ul_tbf_alloc(bts, second_ms, 0, true); OSMO_ASSERT(ul_tbf != NULL); @@ -3335,7 +3335,7 @@ static void test_packet_access_rej_prr_no_other_tbfs() int rc = 0; - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); ms_set_tlli(ms, tlli); ul_tbf = ms_new_ul_tbf_rejected_pacch(ms, pdch); |