diff options
| author | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-07-10 10:41:36 +0200 |
|---|---|---|
| committer | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-07-16 10:25:14 +0200 |
| commit | 5879c6493f74aecddc81abbd785065325bf2e117 (patch) | |
| tree | b5b600e88447ee2e9caefecd4d5583f14cfbe2c4 /src/bts.cpp | |
| parent | 47a57f6f869f19704bbb993fc157a86fd0c85e58 (diff) | |
tbf: Move TFI selection into alloc_algorithm
Currently the TFI and the TRX have to be determined before the actual TBF
allocation function is called, passing TFI and TRX number as
parameters. This does fit to TFI reuse for different slots, since
this were tightly coupled with the slot selection.
This commit just moves the TFI selection into the alloc_algorithm
functions. The tfi parameter is removed from the the TFI alloc
functions. The trx parameter is changed into use_trx to optionally
limit the trx selection (same semantics like in tfi_find_free).
Sponsored-by: On-Waves ehf
Diffstat (limited to 'src/bts.cpp')
| -rw-r--r-- | src/bts.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/bts.cpp b/src/bts.cpp index bd1e025e..712954ea 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -392,7 +392,6 @@ int BTS::rcv_rach(uint8_t ra, uint32_t Fn, int16_t qta) { struct gprs_rlcmac_ul_tbf *tbf = NULL; uint8_t trx_no, ts_no = 0; - int8_t tfi; /* must be signed */ uint8_t sb = 0; uint32_t sb_fn = 0; int rc; @@ -429,14 +428,8 @@ int BTS::rcv_rach(uint8_t ra, uint32_t Fn, int16_t qta) } else { // Create new TBF #warning "Copy and pate with other routines.." - tfi = tfi_find_free(GPRS_RLCMAC_UL_TBF, &trx_no, -1); - if (tfi < 0) { - LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource\n"); - /* FIXME: send reject */ - return -EBUSY; - } /* set class to 0, since we don't know the multislot class yet */ - tbf = tbf_alloc_ul_tbf(&m_bts, NULL, tfi, trx_no, 0, 1); + tbf = tbf_alloc_ul_tbf(&m_bts, NULL, -1, 0, 1); if (!tbf) { LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource\n"); /* FIXME: send reject */ |