diff options
author | Max <msuraev@sysmocom.de> | 2018-01-26 11:01:35 +0100 |
---|---|---|
committer | Max <msuraev@sysmocom.de> | 2018-01-26 12:55:59 +0100 |
commit | 92b7a50605793e59b233c537eb870eee3cc08e31 (patch) | |
tree | 51a2e686cb27972be420164819fd57037f344d0a /src | |
parent | e9fe0e3d0621682d18d56f89f808c819db8bb5f6 (diff) |
Simplify TS alloc: fix allocation calls
Using the semantic patch below, adjust allocation-related calls to match
updated allocator signatures.
// spatch --c++ --dir src -I src --sp-file callfix.spatch --in-place --recursive-includes
// spatch --c++ --dir tests -I src --sp-file callfix.spatch --in-place --recursive-includes
@@ expression A, B, C, D, E; @@
tbf_alloc_ul_tbf(A, B, C, D, E,
(
- 1
+ true
|
- 0
+ false
)
)
@@ expression A, B, C, D, E; @@
tbf_alloc_dl_tbf(A, B, C, D, E,
(
- 1
+ true
|
- 0
+ false
)
)
Change-Id: I43c76cb49093b40eb854d324e898e821270053dc
Related: OS#2282
Diffstat (limited to 'src')
-rw-r--r-- | src/bts.cpp | 2 | ||||
-rw-r--r-- | src/tbf.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/bts.cpp b/src/bts.cpp index 94354f2b..d652c59e 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -749,7 +749,7 @@ int BTS::rcv_rach(uint16_t ra, uint32_t Fn, int16_t qta, bool is_11bit, // Create new TBF /* FIXME: Copy and paste with other routines.. */ - tbf = tbf_alloc_ul_tbf(&m_bts, NULL, -1, 0, ms_class, 1); + tbf = tbf_alloc_ul_tbf(&m_bts, NULL, -1, 0, ms_class, true); if (!tbf) { LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource sending " diff --git a/src/tbf.cpp b/src/tbf.cpp index ea3ffe34..8cfca3a9 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -403,7 +403,8 @@ gprs_rlcmac_ul_tbf *tbf_alloc_ul(struct gprs_rlcmac_bts *bts, /* FIXME: Copy and paste with tbf_new_dl_assignment */ /* create new TBF, use same TRX as DL TBF */ /* use multislot class of downlink TBF */ - tbf = tbf_alloc_ul_tbf(bts, ms, use_trx, ms_class, egprs_ms_class, 0); + tbf = tbf_alloc_ul_tbf(bts, ms, use_trx, ms_class, egprs_ms_class, + false); if (!tbf) { LOGP(DTBF, LOGL_NOTICE, "No PDCH resource\n"); /* FIXME: send reject */ @@ -1350,7 +1351,7 @@ int gprs_rlcmac_tbf::establish_dl_tbf_on_pacch() new_tbf = tbf_alloc_dl_tbf(bts->bts_data(), ms(), this->trx->trx_no, ms_class(), - ms() ? ms()->egprs_ms_class() : 0, 0); + ms() ? ms()->egprs_ms_class() : 0, false); if (!new_tbf) { LOGP(DTBF, LOGL_NOTICE, "No PDCH resource\n"); |