diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-09-29 07:44:39 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-10-30 14:45:57 +0100 |
| commit | 96efa70a9e4df47f98fe6ce2450d33e0c0e27294 (patch) | |
| tree | 2e45e3c5b9fa45143168ec7c27b2b8d88d45aa4a /src/gprs_rlcmac_ts_alloc.cpp | |
| parent | 02ab4a88039804ab3d09c5936f91bb0e4650a0a9 (diff) | |
alloc: Call it trx_no and not trx as it is not trx object
Diffstat (limited to 'src/gprs_rlcmac_ts_alloc.cpp')
| -rw-r--r-- | src/gprs_rlcmac_ts_alloc.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 340eb10d..949041a1 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -103,7 +103,7 @@ static void assign_uplink_tbf_usf(struct gprs_rlcmac_bts *bts, int ts, struct gprs_rlcmac_tbf *tbf, int8_t usf) { - bts->trx[tbf->trx].ul_tbf[tbf->tfi] = tbf; + bts->trx[tbf->trx_no].ul_tbf[tbf->tfi] = tbf; pdch->ul_tbf[tbf->tfi] = tbf; tbf->pdch[ts] = pdch; tbf->dir.ul.usf[ts] = usf; @@ -126,7 +126,7 @@ int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, "%d\n", tbf->ms_class); for (ts = 0; ts < 8; ts++) { - pdch = &bts->trx[tbf->trx].pdch[ts]; + pdch = &bts->trx[tbf->trx_no].pdch[ts]; if (!pdch->enable) { LOGP(DRLCMAC, LOGL_DEBUG, "- Skipping TS %d, because " "not enabled\n", ts); @@ -151,7 +151,7 @@ int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, assign_uplink_tbf_usf(bts, pdch, ts, tbf, usf); } else { LOGP(DRLCMAC, LOGL_DEBUG, "- Assign downlink TS=%d\n", ts); - bts->trx[tbf->trx].dl_tbf[tbf->tfi] = tbf; + bts->trx[tbf->trx_no].dl_tbf[tbf->tfi] = tbf; pdch->dl_tbf[tbf->tfi] = tbf; tbf->pdch[ts] = pdch; } @@ -280,7 +280,7 @@ int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, * This must be done for uplink TBF also, because it is the basis * for calculating control slot and uplink slot(s). */ for (ts = 0, i = 0; ts < 8; ts++) { - pdch = &bts->trx[tbf->trx].pdch[ts]; + pdch = &bts->trx[tbf->trx_no].pdch[ts]; /* check if enabled */ if (!pdch->enable) { LOGP(DRLCMAC, LOGL_DEBUG, "- Skipping TS %d, because " @@ -298,7 +298,7 @@ int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, "because it has different TSC than lower TS " "of TRX. In order to allow multislot, all " "slots must be configured with the same " - "TSC!\n", ts, tbf->trx); + "TSC!\n", ts, tbf->trx_no); /* increase window for Type 1 */ if (Type == 1 && rx_window) i++; @@ -436,7 +436,7 @@ int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, * slot. */ if (tbf->direction == GPRS_RLCMAC_UL_TBF) { for (ts = tx_win_min, i = 0; i < tx_range; ts = (ts + 1) & 7) { - pdch = &bts->trx[tbf->trx].pdch[ts]; + pdch = &bts->trx[tbf->trx_no].pdch[ts]; /* check if enabled */ if (!pdch->enable) { LOGP(DRLCMAC, LOGL_DEBUG, "- Skipping TS %d, " @@ -452,7 +452,7 @@ int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, "than lower TS of TRX. In order to " "allow multislot, all slots must be " "configured with the same TSC!\n", - ts, tbf->trx); + ts, tbf->trx_no); /* increase window for Type 1 */ if (Type == 1) i++; @@ -508,7 +508,7 @@ int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, /* assign the first common ts, which is used for control or * single slot. */ for (ts = tx_win_min, i = 0; i < tx_range; ts = (ts + 1) & 7) { - pdch = &bts->trx[tbf->trx].pdch[ts]; + pdch = &bts->trx[tbf->trx_no].pdch[ts]; /* check if enabled */ if (!pdch->enable) { LOGP(DRLCMAC, LOGL_DEBUG, "- Skipping TS %d, " @@ -541,8 +541,8 @@ int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, continue; LOGP(DRLCMAC, LOGL_DEBUG, "- Assigning DL TS " "%d\n", ts); - pdch = &bts->trx[tbf->trx].pdch[ts]; - bts->trx[tbf->trx].dl_tbf[tbf->tfi] = tbf; + pdch = &bts->trx[tbf->trx_no].pdch[ts]; + bts->trx[tbf->trx_no].dl_tbf[tbf->tfi] = tbf; pdch->dl_tbf[tbf->tfi] = tbf; tbf->pdch[ts] = pdch; slotcount++; @@ -563,7 +563,7 @@ int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, if ((tx_window & (1 << ts))) { LOGP(DRLCMAC, LOGL_DEBUG, "- Assigning UL TS " "%d\n", ts); - pdch = &bts->trx[tbf->trx].pdch[ts]; + pdch = &bts->trx[tbf->trx_no].pdch[ts]; assign_uplink_tbf_usf(bts, pdch, ts, tbf, usf[ts]); slotcount++; if (slotcount == 1) |