Change in osmo-bsc[master]: CBCH: Fix gsm_bts_get_cbch()

[Harald Welte]

Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10851


Change subject: CBCH: Fix gsm_bts_get_cbch()
......................................................................

CBCH: Fix gsm_bts_get_cbch()

When the timeslot FSMs were introduced, the function gsm_bts_get_cbch()
was ported to use 'pchan_is'.  However, the function is called very
early, before pchan_is is actually initialized.

Let's make sure we're using the _configured_ channel combination
when resolving where the CBCH is (if any) in the BTS.

Ever since merging the timeslot FSMs and before this patch, SI4 would
never indicate the presence of a CBCH.

Change-Id: I6251b5f3e1180ad466e9349a1845e1b91f661c0b
Related: OS#3532
---
M src/osmo-bsc/gsm_data.c
1 file changed, 2 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/51/10851/1

diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c
index ac965e2..a953ce1 100644
--- a/src/osmo-bsc/gsm_data.c
+++ b/src/osmo-bsc/gsm_data.c
@@ -1204,12 +1204,12 @@
 	struct gsm_lchan *lchan = NULL;
 	struct gsm_bts_trx *trx = bts->c0;
 
-	if (trx->ts[0].pchan_is == GSM_PCHAN_CCCH_SDCCH4_CBCH)
+	if (trx->ts[0].pchan_from_config == GSM_PCHAN_CCCH_SDCCH4_CBCH)
 		lchan = &trx->ts[0].lchan[2];
 	else {
 		int i;
 		for (i = 0; i < 8; i++) {
-			if (trx->ts[i].pchan_is == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) {
+			if (trx->ts[i].pchan_from_config == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) {
 				lchan = &trx->ts[i].lchan[2];
 				break;
 			}

-- 
To view, visit https://gerrit.osmocom.org/10851
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6251b5f3e1180ad466e9349a1845e1b91f661c0b
Gerrit-Change-Number: 10851
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180909/27b0efba/attachment.htm>