diff options
| author | Harald Welte <laforge@gnumonks.org> | 2018-09-17 22:46:37 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-09-17 22:47:45 +0200 |
| commit | 9ce4d919486f7f567f9f4d6a1e34fde888fbbfd6 (patch) | |
| tree | c703bb89c6b14f1a006cbbcacf9a826e01e8be90 /src | |
| parent | b222f6666d5a7e91de477fe84112e69b1cb5b03a (diff) | |
CBCH: Some more scheduler_mframe cleanup
As the CBCH replaces SDCCH sub-slot-2 in downlink, we should mark
the uplink as IDLE, just as the associated SACCH in uplink and downlink.
Also, there are no burst_numbers in IDLE slots.
Change-Id: Ib8565d1d0080bfce5d2aec77609709a445a2171c
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/scheduler_mframe.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/common/scheduler_mframe.c b/src/common/scheduler_mframe.c index b78ffa85..b969407c 100644 --- a/src/common/scheduler_mframe.c +++ b/src/common/scheduler_mframe.c @@ -179,9 +179,9 @@ static const struct trx_sched_frame frame_bcch_sdcch4_cbch[102] = { { TRXC_BCCH, 2, TRXC_RACH, 0 }, { TRXC_BCCH, 3, TRXC_RACH, 0 }, { TRXC_CCCH, 0, TRXC_IDLE, 0 }, - { TRXC_CCCH, 1, TRXC_IDLE, 1 }, - { TRXC_CCCH, 2, TRXC_IDLE, 2 }, - { TRXC_CCCH, 3, TRXC_IDLE, 3 }, + { TRXC_CCCH, 1, TRXC_IDLE, 0 }, + { TRXC_CCCH, 2, TRXC_IDLE, 0 }, + { TRXC_CCCH, 3, TRXC_IDLE, 0 }, { TRXC_FCCH, 0, TRXC_SACCH4_3, 0 }, { TRXC_SCH, 0, TRXC_SACCH4_3, 1 }, { TRXC_CCCH, 0, TRXC_SACCH4_3, 2 }, @@ -219,10 +219,10 @@ static const struct trx_sched_frame frame_bcch_sdcch4_cbch[102] = { { TRXC_SACCH4_0, 2, TRXC_SDCCH4_1, 3 }, { TRXC_SACCH4_0, 3, TRXC_RACH, 0 }, { TRXC_SACCH4_1, 0, TRXC_RACH, 0 }, - { TRXC_SACCH4_1, 1, TRXC_RACH, 0 }, - { TRXC_SACCH4_1, 2, TRXC_RACH, 1 }, - { TRXC_SACCH4_1, 3, TRXC_RACH, 2 }, - { TRXC_IDLE, 0, TRXC_RACH, 3 }, + { TRXC_SACCH4_1, 1, TRXC_IDLE, 0 }, + { TRXC_SACCH4_1, 2, TRXC_IDLE, 0 }, + { TRXC_SACCH4_1, 3, TRXC_IDLE, 0 }, + { TRXC_IDLE, 0, TRXC_IDLE, 0 }, { TRXC_FCCH, 0, TRXC_SDCCH4_3, 0 }, { TRXC_SCH, 0, TRXC_SDCCH4_3, 1 }, @@ -267,14 +267,14 @@ static const struct trx_sched_frame frame_bcch_sdcch4_cbch[102] = { { TRXC_FCCH, 0, TRXC_SDCCH4_0, 3 }, { TRXC_SCH, 0, TRXC_SDCCH4_1, 0 }, { TRXC_IDLE, 0, TRXC_SDCCH4_1, 1 }, - { TRXC_IDLE, 1, TRXC_SDCCH4_1, 2 }, - { TRXC_IDLE, 2, TRXC_SDCCH4_1, 3 }, - { TRXC_IDLE, 3, TRXC_RACH, 0 }, + { TRXC_IDLE, 0, TRXC_SDCCH4_1, 2 }, + { TRXC_IDLE, 0, TRXC_SDCCH4_1, 3 }, + { TRXC_IDLE, 0, TRXC_RACH, 0 }, { TRXC_SACCH4_3, 0, TRXC_RACH, 0 }, - { TRXC_SACCH4_3, 1, TRXC_RACH, 0 }, - { TRXC_SACCH4_3, 2, TRXC_RACH, 1 }, - { TRXC_SACCH4_3, 3, TRXC_RACH, 2 }, - { TRXC_IDLE, 0, TRXC_SDCCH4_2, 3 }, + { TRXC_SACCH4_3, 1, TRXC_IDLE, 0 }, + { TRXC_SACCH4_3, 2, TRXC_IDLE, 0 }, + { TRXC_SACCH4_3, 3, TRXC_IDLE, 0 }, + { TRXC_IDLE, 0, TRXC_IDLE, 0 }, }; static const struct trx_sched_frame frame_sdcch8[102] = { |