Simplify TS alloc: use defines for constants
* define and use constant for occupied TFI instead copying the same
magic number all over the place
* use libosmocore's define for bit pretty-printer
Change-Id: I2699ceebf0cbec01652a02fa68ccc9e9419d0293
Related: OS#2282
diff --git a/src/bts.cpp b/src/bts.cpp
index d652c59..e236f93 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -475,7 +475,7 @@
for (trx = trx_from; trx <= trx_to; trx++) {
bool trx_has_pdch = false;
- free_tfis = 0xffffffff;
+ free_tfis = NO_FREE_TFI;
for (ts = 0; ts < 8; ts++) {
pdch = &m_bts.trx[trx].pdch[ts];
diff --git a/src/bts.h b/src/bts.h
index 8d3a3cc..34326b8 100644
--- a/src/bts.h
+++ b/src/bts.h
@@ -44,6 +44,7 @@
#define LLC_CODEL_DISABLE 0
#define LLC_CODEL_USE_DEFAULT (-1)
#define MAX_GPRS_CS 9
+#define NO_FREE_TFI 0xffffffff
/* see bts->gsmtap_categ_mask */
enum pcu_gsmtap_category {
diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp
index c246676..0e8b785 100644
--- a/src/gprs_rlcmac_ts_alloc.cpp
+++ b/src/gprs_rlcmac_ts_alloc.cpp
@@ -83,7 +83,7 @@
int8_t tfi;
tfi_map = pdch->assigned_tfi(dir);
- if (tfi_map == 0xffffffffUL)
+ if (tfi_map == NO_FREE_TFI)
return -1;
/* look for USF, don't use USF=7 */
@@ -164,7 +164,7 @@
pdch->num_tbfs(GPRS_RLCMAC_UL_TBF) +
compute_usage_by_reservation(pdch, dir);
- if (pdch->assigned_tfi(reverse(dir)) == 0xffffffff)
+ if (pdch->assigned_tfi(reverse(dir)) == NO_FREE_TFI)
/* No TFI in the opposite direction, avoid it */
usage += 32;
@@ -295,10 +295,10 @@
if (!pdch->is_enabled())
continue;
- if (pdch->assigned_tfi(GPRS_RLCMAC_UL_TBF) == 0xffffffff)
+ if (pdch->assigned_tfi(GPRS_RLCMAC_UL_TBF) == NO_FREE_TFI)
continue;
- if (pdch->assigned_tfi(GPRS_RLCMAC_DL_TBF) == 0xffffffff)
+ if (pdch->assigned_tfi(GPRS_RLCMAC_DL_TBF) == NO_FREE_TFI)
continue;
return trx_no;