Rename 'bts_data' leftovers to 'bts'
Before, we used tho have a BTs object split into 2 parts, a C
gprs_rlcmac_bts struct and a C++ BTS struct, and "bts_data" naming was
used to distinguish them in variable names. Nowadays the struct is
finally combined into one, so there's no point in using this "bts_data"
terminology, we use always "bts".
Change-Id: I9852bf439292d1abc70711bea65698b21bde0ee8
diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp
index f8b1c1f..4c68a87 100644
--- a/src/gprs_rlcmac_ts_alloc.cpp
+++ b/src/gprs_rlcmac_ts_alloc.cpp
@@ -239,7 +239,7 @@
attach_tbf_to_pdch(pdch, tbf);
}
-static int find_trx(const struct gprs_rlcmac_bts *bts_data, const GprsMs *ms, int8_t use_trx)
+static int find_trx(const struct gprs_rlcmac_bts *bts, const GprsMs *ms, int8_t use_trx)
{
unsigned trx_no;
unsigned ts;
@@ -252,8 +252,8 @@
return use_trx;
/* Find the first TRX that has a PDCH with a free UL and DL TFI */
- for (trx_no = 0; trx_no < ARRAY_SIZE(bts_data->trx); trx_no += 1) {
- const struct gprs_rlcmac_trx *trx = &bts_data->trx[trx_no];
+ for (trx_no = 0; trx_no < ARRAY_SIZE(bts->trx); trx_no += 1) {
+ const struct gprs_rlcmac_trx *trx = &bts->trx[trx_no];
for (ts = 0; ts < ARRAY_SIZE(trx->pdch); ts++) {
const struct gprs_rlcmac_pdch *pdch = &trx->pdch[ts];
if (!pdch->is_enabled())
@@ -272,14 +272,14 @@
return -EBUSY;
}
-static bool idle_pdch_avail(const struct gprs_rlcmac_bts *bts_data)
+static bool idle_pdch_avail(const struct gprs_rlcmac_bts *bts)
{
unsigned trx_no;
unsigned ts;
/* Find the first PDCH with an unused DL TS */
- for (trx_no = 0; trx_no < ARRAY_SIZE(bts_data->trx); trx_no += 1) {
- const struct gprs_rlcmac_trx *trx = &bts_data->trx[trx_no];
+ for (trx_no = 0; trx_no < ARRAY_SIZE(bts->trx); trx_no += 1) {
+ const struct gprs_rlcmac_trx *trx = &bts->trx[trx_no];
for (ts = 0; ts < ARRAY_SIZE(trx->pdch); ts++) {
const struct gprs_rlcmac_pdch *pdch = &trx->pdch[ts];
if (!pdch->is_enabled())