diff options
author | Daniel Willmann <dwillmann@sysmocom.de> | 2014-08-07 15:49:21 +0200 |
---|---|---|
committer | Daniel Willmann <daniel@totalueberwachung.de> | 2014-08-07 16:12:05 +0200 |
commit | 7e994e392d9684c6deab2cac3eed162ca96f083d (patch) | |
tree | 8c282f6cc6715136b89ab6c6407773764095bb5e /src/gprs_rlcmac_ts_alloc.cpp | |
parent | 6a8a1dcda2898df78b5bc794bd64947317b453cc (diff) |
tbf, ...: Make the fields in the dl/ul struct member variables
There is no need for the union/struct anymore. Make the variable members
of the UL/DL class.
As a result gprs_rlc_dl_window gets a reset() method because
memset(&dir.dl, 0, sizeof(dir.dl)) doesn't work anymore in reuse_tbf().
Ticket: SYS#389
Sponsored by: On-Waves ehf
Diffstat (limited to 'src/gprs_rlcmac_ts_alloc.cpp')
-rw-r--r-- | src/gprs_rlcmac_ts_alloc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 038d1fe5..27b01d79 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -86,7 +86,7 @@ static inline int8_t find_free_usf(struct gprs_rlcmac_pdch *pdch) tbf = pdch->ul_tbf_by_tfi(tfi); if (!tbf) continue; - usf_map |= (1 << tbf->dir.ul.usf[pdch->ts_no]); + usf_map |= (1 << tbf->m_usf[pdch->ts_no]); } /* look for USF, don't use USF=7 */ @@ -122,7 +122,7 @@ static void assign_uplink_tbf_usf( { tbf->trx->ul_tbf[tbf->tfi()] = tbf; tbf->pdch[pdch->ts_no] = pdch; - tbf->dir.ul.usf[pdch->ts_no] = usf; + tbf->m_usf[pdch->ts_no] = usf; } static void assign_dlink_tbf( |