Change in osmocom-bb[master]: trxcon: Fix CBCH related RSL channel numbers

[Harald Welte]

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

Change subject: trxcon: Fix CBCH related RSL channel numbers
......................................................................

trxcon: Fix CBCH related RSL channel numbers

OsmoBTS, BSC and TTCN3 used cbits == 0x18 for dynamic PDCH, while
trxcon wanted to use 0x18 for CBCH on SDCCH/4.  Let's fix this and
bring everyone in agreement.

Related: OS#4027
Change-Id: Ia9a415628c659cbc2dd5dc65b875b7f935d6e211
---
M src/host/trxcon/sched_lchan_desc.c
M src/host/trxcon/sched_trx.c
2 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/host/trxcon/sched_lchan_desc.c b/src/host/trxcon/sched_lchan_desc.c
index 93639a3..ee712d5 100644
--- a/src/host/trxcon/sched_lchan_desc.c
+++ b/src/host/trxcon/sched_lchan_desc.c
@@ -304,13 +304,13 @@
 	},
 	[TRXC_SDCCH4_CBCH] = {
 		TRXC_SDCCH4_CBCH,	"SDCCH/4(CBCH)",
-		0xc0,			TRX_CH_LID_DEDIC,
+		0xc8,			TRX_CH_LID_DEDIC,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_AUTO,
 		rx_data_fn,		NULL,
 	},
 	[TRXC_SDCCH8_CBCH] = {
 		TRXC_SDCCH8_CBCH,	"SDCCH/8(CBCH)",
-		0xc8,			TRX_CH_LID_DEDIC,
+		0xd0,			TRX_CH_LID_DEDIC,
 		4 * GSM_BURST_PL_LEN,	0x00,
 		rx_data_fn,		NULL,
 	},
diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c
index 18516d3..721db02 100644
--- a/src/host/trxcon/sched_trx.c
+++ b/src/host/trxcon/sched_trx.c
@@ -536,11 +536,11 @@
 		return GSM_PCHAN_TCH_H;
 	else if ((cbits & 0x1c) == 0x04)
 		return GSM_PCHAN_CCCH_SDCCH4;
-	else if ((cbits & 0x1f) == 0x18)
-		return GSM_PCHAN_CCCH_SDCCH4_CBCH;
 	else if ((cbits & 0x18) == 0x08)
 		return GSM_PCHAN_SDCCH8_SACCH8C;
 	else if ((cbits & 0x1f) == 0x19)
+		return GSM_PCHAN_CCCH_SDCCH4_CBCH;
+	else if ((cbits & 0x1f) == 0x1a)
 		return GSM_PCHAN_SDCCH8_SACCH8C_CBCH;
 
 	return GSM_PCHAN_NONE;

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

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9a415628c659cbc2dd5dc65b875b7f935d6e211
Gerrit-Change-Number: 14202
Gerrit-PatchSet: 3
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Assignee: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>
Gerrit-CC: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-CC: fixeria <axilirator at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190527/4d32e8b6/attachment.htm>