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_sched.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_sched.cpp')
| -rw-r--r-- | src/gprs_rlcmac_sched.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index 37e8d382..40a183b4 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -95,7 +95,7 @@ static uint8_t sched_select_uplink(uint8_t trx, uint8_t ts, uint32_t fn, continue; /* use this USF */ - usf = tbf->dir.ul.usf[ts]; + usf = tbf->m_usf[ts]; LOGP(DRLCMACSCHED, LOGL_DEBUG, "Received RTS for PDCH: TRX=%d " "TS=%d FN=%d block_nr=%d scheduling USF=%d for " "required uplink resource of UL TFI=%d\n", trx, ts, fn, @@ -186,7 +186,7 @@ static struct msgb *sched_select_downlink(struct gprs_rlcmac_bts *bts, continue; /* waiting for CCCH IMM.ASS confirm */ - if (tbf->dir.dl.wait_confirm) + if (tbf->m_wait_confirm) continue; LOGP(DRLCMACSCHED, LOGL_DEBUG, "Scheduling data message at " |