diff options
Diffstat (limited to 'src/osmo-bts-trx')
| -rw-r--r-- | src/osmo-bts-trx/l1_if.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index b39c51fd..be4951e3 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -270,26 +270,11 @@ static uint8_t trx_set_ts_as_pchan(struct gsm_bts_trx_ts *ts, if (rc) return NM_NACK_RES_NOTAVAIL; - /* activate lchans for [CBCH/]BCCH/CCCH */ - switch (pchan) { - case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: - /* using RSL_CHAN_OSMO_CBCH4 is correct here, because the scheduler - * does not distinguish between SDCCH/4+CBCH abd SDCCH/8+CBCH. */ - trx_sched_set_lchan(&ts->lchan[CBCH_LCHAN], - RSL_CHAN_OSMO_CBCH4, LID_DEDIC, true); - break; - case GSM_PCHAN_CCCH_SDCCH4_CBCH: - trx_sched_set_lchan(&ts->lchan[CBCH_LCHAN], - RSL_CHAN_OSMO_CBCH4, LID_DEDIC, true); - /* fall-through */ - case GSM_PCHAN_CCCH_SDCCH4: - case GSM_PCHAN_CCCH: - trx_sched_set_bcch_ccch(&ts->lchan[CCCH_LCHAN], true); + /* activate lchan for CCCH */ + if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4 || + pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) { ts->lchan[CCCH_LCHAN].rel_act_kind = LCHAN_REL_ACT_OML; lchan_set_state(&ts->lchan[CCCH_LCHAN], LCHAN_S_ACTIVE); - break; - default: - break; } slottype = transceiver_chan_types[pchan]; |