From 4280829dfae0620c2326ba44caa31f5205d52a91 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Thu, 6 Sep 2018 20:24:37 +0200 Subject: [sysmo,lc15]: Consider CBCH channel combinations in chan_nr_by_sapi() Whenever a CBCH is used, this results in a new physical channel combination on the relevant timeslot. The chan_nr_by_sapi() function must handle those cbch-enabled PCHAN types. Change-Id: I963909bcec8392ec445d0bcf53a2a8d7d9535444 --- src/osmo-bts-litecell15/l1_if.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/osmo-bts-litecell15') diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c index e6cdfd4b..f582bf2c 100644 --- a/src/osmo-bts-litecell15/l1_if.c +++ b/src/osmo-bts-litecell15/l1_if.c @@ -709,9 +709,11 @@ static uint8_t chan_nr_by_sapi(struct gsm_bts_trx_ts *ts, cbits = 0x02 + subCh; break; case GSM_PCHAN_CCCH_SDCCH4: + case GSM_PCHAN_CCCH_SDCCH4_CBCH: cbits = 0x04 + subCh; break; case GSM_PCHAN_SDCCH8_SACCH8C: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: cbits = 0x08 + subCh; break; default: @@ -723,9 +725,11 @@ static uint8_t chan_nr_by_sapi(struct gsm_bts_trx_ts *ts, case GsmL1_Sapi_Sdcch: switch(pchan) { case GSM_PCHAN_CCCH_SDCCH4: + case GSM_PCHAN_CCCH_SDCCH4_CBCH: cbits = 0x04 + subCh; break; case GSM_PCHAN_SDCCH8_SACCH8C: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: cbits = 0x08 + subCh; break; default: -- cgit v1.2.3