Change in osmo-bts[master]: CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo, octphy, litecell15}

[Harald Welte]

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

Change subject: CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo,octphy,litecell15}
......................................................................

CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo,octphy,litecell15}

This fixes a bug introduced in "CBCH: Move processing via L1SAP"

commit 02d99db08b13589e1417c3448a07747f8805ba88
Author: Harald Welte <laforge at gnumonks.org>
Date:   Fri Aug 24 23:37:45 2018 +0200

where the full channel number 0xc8 was used instead of the
(right-shifted) C-bits only.

Change-Id: I0fd8d7762e9cc3319a534f261e8857a1aa2220e0
---
M src/osmo-bts-litecell15/l1_if.c
M src/osmo-bts-octphy/l1_if.c
M src/osmo-bts-sysmo/l1_if.c
3 files changed, 9 insertions(+), 3 deletions(-)

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



diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c
index 82299ff..4093225 100644
--- a/src/osmo-bts-litecell15/l1_if.c
+++ b/src/osmo-bts-litecell15/l1_if.c
@@ -383,6 +383,8 @@
 		sapi = GsmL1_Sapi_Sdcch;
 	} else if (L1SAP_IS_CHAN_BCCH(chan_nr)) {
 		sapi = GsmL1_Sapi_Bcch;
+	} else if (L1SAP_IS_CHAN_CBCH(chan_nr)) {
+		sapi = GsmL1_Sapi_Cbch;
 	} else if (L1SAP_IS_CHAN_AGCH_PCH(chan_nr)) {
 		/* The sapi depends on DSP configuration, not
 		 * on the actual SYSTEM INFORMATION 3. */
@@ -700,7 +702,7 @@
 		cbits = 0x10;
 		break;
 	case GsmL1_Sapi_Cbch:
-		cbits = 0xc8; /* Osmocom extension for CBCH via L1SAP */
+		cbits = 0xc8 >> 3; /* Osmocom extension for CBCH via L1SAP */
 		break;
 	case GsmL1_Sapi_Sacch:
 		switch(pchan) {
diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c
index 35d0aa3..40d5300 100644
--- a/src/osmo-bts-octphy/l1_if.c
+++ b/src/osmo-bts-octphy/l1_if.c
@@ -357,7 +357,7 @@
 		cbits = 0x10;
 		break;
 	case cOCTVC1_GSM_SAPI_ENUM_CBCH:
-		cbits = 0xc8; /* Osmocom extension for CBCH via L1SAP */
+		cbits = 0xc8 >> 3; /* Osmocom extension for CBCH via L1SAP */
 		break;
 	case cOCTVC1_GSM_SAPI_ENUM_SACCH:
 		switch (pchan) {
@@ -517,6 +517,8 @@
 		sapi = cOCTVC1_GSM_SAPI_ENUM_SDCCH;
 	} else if (L1SAP_IS_CHAN_BCCH(chan_nr)) {
 		sapi = cOCTVC1_GSM_SAPI_ENUM_BCCH;
+	} else if (L1SAP_IS_CHAN_CBCH(chan_nr)) {
+		sapi = cOCTVC1_GSM_SAPI_ENUM_CBCH;
 	} else if (L1SAP_IS_CHAN_AGCH_PCH(chan_nr)) {
 		sapi = cOCTVC1_GSM_SAPI_ENUM_PCH_AGCH;
 	} else {
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index c0b42b4..372e332 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -380,6 +380,8 @@
 		sapi = GsmL1_Sapi_Sdcch;
 	} else if (L1SAP_IS_CHAN_BCCH(chan_nr)) {
 		sapi = GsmL1_Sapi_Bcch;
+	} else if (L1SAP_IS_CHAN_CBCH(chan_nr)) {
+		sapi = GsmL1_Sapi_Cbch;
 	} else if (L1SAP_IS_CHAN_AGCH_PCH(chan_nr)) {
 		/* The sapi depends on DSP configuration, not
 		 * on the actual SYSTEM INFORMATION 3. */
@@ -697,7 +699,7 @@
 		cbits = 0x10;
 		break;
 	case GsmL1_Sapi_Cbch:
-		cbits = 0xc8; /* Osmocom extension for CBCH via L1SAP */
+		cbits = 0xc8 >> 3; /* Osmocom extension for CBCH via L1SAP */
 		break;
 	case GsmL1_Sapi_Sacch:
 		switch(pchan) {

-- 
To view, visit https://gerrit.osmocom.org/11003
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: I0fd8d7762e9cc3319a534f261e8857a1aa2220e0
Gerrit-Change-Number: 11003
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180917/a8183f79/attachment.htm>