Change in osmo-bts[master]: CBCH: Fix CBCH implementation for osmo-bts-trx

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11005 )

Change subject: CBCH: Fix CBCH implementation for osmo-bts-trx
......................................................................

CBCH: Fix CBCH implementation for osmo-bts-trx

Unfortunately the code in Icc15603079a1709ec094f400a9bcf0008211890f
was incomplete as it missed a few spots where the CBCH-enabled channel
types weren't yet covered.

Using this patch I can both still perform RACH / Location Update as
well as actually receive SMSCB messages on an attached phone (Galaxy S5).

Change-Id: I311b141668549ef37054cbe74be66bf17ac1d7e6
Closes: OS#1617
Closes: OS#3559
---
M src/osmo-bts-trx/l1_if.c
1 file changed, 6 insertions(+), 2 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c
index 2b4f5c8..faff3a0 100644
--- a/src/osmo-bts-trx/l1_if.c
+++ b/src/osmo-bts-trx/l1_if.c
@@ -48,9 +48,11 @@
 	[GSM_PCHAN_NONE]                = 8,
 	[GSM_PCHAN_CCCH]                = 4,
 	[GSM_PCHAN_CCCH_SDCCH4]         = 5,
+	[GSM_PCHAN_CCCH_SDCCH4_CBCH]    = 5,
 	[GSM_PCHAN_TCH_F]               = 1,
 	[GSM_PCHAN_TCH_H]               = 3,
 	[GSM_PCHAN_SDCCH8_SACCH8C]      = 7,
+	[GSM_PCHAN_SDCCH8_SACCH8C_CBCH] = 7,
 	[GSM_PCHAN_PDCH]                = 13,
 	/* [GSM_PCHAN_TCH_F_PDCH] not needed here, see trx_set_ts_as_pchan() */
 	[GSM_PCHAN_UNKNOWN]             = 0,
@@ -268,7 +270,8 @@
 	trx_sched_reset(&l1h->l1s);
 
 	/* deactivate lchan for CCCH */
-	if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4) {
+	if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4 ||
+	    pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) {
 		lchan_set_state(&trx->ts[0].lchan[CCCH_LCHAN], LCHAN_S_INACTIVE);
 	}
 
@@ -378,7 +381,8 @@
 		return NM_NACK_RES_NOTAVAIL;
 
 	/* activate lchan for CCCH */
-	if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4) {
+	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);
 	}

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I311b141668549ef37054cbe74be66bf17ac1d7e6
Gerrit-Change-Number: 11005
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180917/10be8720/attachment.htm>