diff options
| author | Harald Welte <laforge@gnumonks.org> | 2019-05-27 16:53:00 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2019-05-27 23:33:42 +0200 |
| commit | 9ba051bae8bdb3866912decdfdc26ccb62ec9051 (patch) | |
| tree | b16f1d480405d65a76dc0b2660b40e20547c621f /src/host | |
| parent | 00513d65c85b31d528adbc91ad48952d9f75880f (diff) | |
trxcon: Fix CBCH related RSL channel numbers
OsmoBTS, BSC and TTCN3 used cbits == 0x18 for dynamic PDCH, while
trxcon wanted to use 0x18 for CBCH on SDCCH/4. Let's fix this and
bring everyone in agreement.
Related: OS#4027
Change-Id: Ia9a415628c659cbc2dd5dc65b875b7f935d6e211
Diffstat (limited to 'src/host')
| -rw-r--r-- | src/host/trxcon/sched_lchan_desc.c | 4 | ||||
| -rw-r--r-- | src/host/trxcon/sched_trx.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/host/trxcon/sched_lchan_desc.c b/src/host/trxcon/sched_lchan_desc.c index 93639a37..ee712d55 100644 --- a/src/host/trxcon/sched_lchan_desc.c +++ b/src/host/trxcon/sched_lchan_desc.c @@ -304,13 +304,13 @@ const struct trx_lchan_desc trx_lchan_desc[_TRX_CHAN_MAX] = { }, [TRXC_SDCCH4_CBCH] = { TRXC_SDCCH4_CBCH, "SDCCH/4(CBCH)", - 0xc0, TRX_CH_LID_DEDIC, + 0xc8, TRX_CH_LID_DEDIC, 4 * GSM_BURST_PL_LEN, TRX_CH_FLAG_AUTO, rx_data_fn, NULL, }, [TRXC_SDCCH8_CBCH] = { TRXC_SDCCH8_CBCH, "SDCCH/8(CBCH)", - 0xc8, TRX_CH_LID_DEDIC, + 0xd0, TRX_CH_LID_DEDIC, 4 * GSM_BURST_PL_LEN, 0x00, rx_data_fn, NULL, }, diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index 18516d31..721db026 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -536,11 +536,11 @@ enum gsm_phys_chan_config sched_trx_chan_nr2pchan_config(uint8_t chan_nr) return GSM_PCHAN_TCH_H; else if ((cbits & 0x1c) == 0x04) return GSM_PCHAN_CCCH_SDCCH4; - else if ((cbits & 0x1f) == 0x18) - return GSM_PCHAN_CCCH_SDCCH4_CBCH; else if ((cbits & 0x18) == 0x08) return GSM_PCHAN_SDCCH8_SACCH8C; else if ((cbits & 0x1f) == 0x19) + return GSM_PCHAN_CCCH_SDCCH4_CBCH; + else if ((cbits & 0x1f) == 0x1a) return GSM_PCHAN_SDCCH8_SACCH8C_CBCH; return GSM_PCHAN_NONE; |