fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15934 )
Change subject: osmo_bsc_main.c: fix CCCH_CONF computation: use pchan_from_config ...................................................................... osmo_bsc_main.c: fix CCCH_CONF computation: use pchan_from_config Change-Id: I8f9d7aa27f24b55732a4de933bc834ed930806fd --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/15934/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index abfb1bb..893124f 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -462,7 +462,7 @@ bts->si_common.chan_desc.mscr = 1; /* Determine the value of CCCH_CONF. Is TS0/C0 combined? */ - if (bts->c0->ts[0].pchan_is != GSM_PCHAN_CCCH) { + if (bts->c0->ts[0].pchan_from_config != GSM_PCHAN_CCCH) { bts->si_common.chan_desc.ccch_conf = RSL_BCCH_CCCH_CONF_1_C; /* Limit reserved block to 2 on combined channel according to @@ -475,9 +475,9 @@ } } else { /* Non-combined TS0/C0 configuration */ /* There can be additional CCCHs on even timeslot numbers */ - n += (bts->c0->ts[2].pchan_is == GSM_PCHAN_CCCH); - n += (bts->c0->ts[4].pchan_is == GSM_PCHAN_CCCH); - n += (bts->c0->ts[6].pchan_is == GSM_PCHAN_CCCH); + n += (bts->c0->ts[2].pchan_from_config == GSM_PCHAN_CCCH); + n += (bts->c0->ts[4].pchan_from_config == GSM_PCHAN_CCCH); + n += (bts->c0->ts[6].pchan_from_config == GSM_PCHAN_CCCH); bts->si_common.chan_desc.ccch_conf = (n << 1); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8f9d7aa27f24b55732a4de933bc834ed930806fd Gerrit-Change-Number: 15934 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <axilira...@gmail.com> Gerrit-MessageType: newchange