From 3a10dbd56428cf0e79b738f62748509bbd04aa68 Mon Sep 17 00:00:00 2001 From: Jacob Erlbeck Date: Fri, 10 Jul 2015 19:52:37 +0200 Subject: tbf: Put the TFI->TBF mapping into the PDCH objects Currently the TBFs are registered in a TFI indexed array within the TRX objects. TBFs can be searched globally by TFI and TRX number. This conflicts with the use of the same TFI for different TBF on different PDCH. This use case requires the specification of the PDCH as additional search dimension. This commit moves the TFI index TBF arrays into the PDCH objects. The related methods are updated accordingly. Ticket: #1793 Sponsored-by: On-Waves ehf --- tests/alloc/AllocTest.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'tests/alloc') diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp index e419cd25..7bc865d2 100644 --- a/tests/alloc/AllocTest.cpp +++ b/tests/alloc/AllocTest.cpp @@ -82,23 +82,17 @@ static void check_tfi_usage(BTS *the_bts) if (tbf->direction == GPRS_RLCMAC_DL_TBF) { OSMO_ASSERT(pdch->dl_tbf_by_tfi( tbf->tfi()) == tbf); - /* This assertion cannot hold with the - * current API and shared TFI */ -#if 0 OSMO_ASSERT(the_bts->dl_tbf_by_tfi( tbf->tfi(), - tbf->trx->trx_no) == tbf); -#endif + tbf->trx->trx_no, + pdch_no) == tbf); } else { OSMO_ASSERT(pdch->ul_tbf_by_tfi( tbf->tfi()) == tbf); - /* This assertion cannot hold with the - * current API and shared TFI */ -#if 0 OSMO_ASSERT(the_bts->ul_tbf_by_tfi( tbf->tfi(), - tbf->trx->trx_no) == tbf); -#endif + tbf->trx->trx_no, + pdch_no) == tbf); } *tbf_var = tbf; OSMO_ASSERT(pdch->assigned_tfi(tbf->direction) & -- cgit v1.2.3