fixeria has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-bts/+/15708 )

Change subject: L1SAP: also consider RSL_CHAN_OSMO_CBCH8 as CBCH
......................................................................

L1SAP: also consider RSL_CHAN_OSMO_CBCH8 as CBCH

Currently we don't distinguish between CBCH on BCCH+SDCCH/4 and
CBCH on SDCCH/8, but in libosmogsm we have two independent
(non-standard) RSL channel number values for them. Maybe some day
we will, so let's extend the definition of L1SAP_IS_CHAN_CBCH.

Change-Id: I2f6d501a29edaf89dfb17d5d64f930cdb1943630
---
M include/osmo-bts/l1sap.h
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h
index ccfcacc..7ae5d38 100644
--- a/include/osmo-bts/l1sap.h
+++ b/include/osmo-bts/l1sap.h
@@ -35,7 +35,8 @@
 #define L1SAP_IS_CHAN_PDCH(chan_nr) \
        ((chan_nr & 0xf8) == RSL_CHAN_OSMO_PDCH)
 #define L1SAP_IS_CHAN_CBCH(chan_nr) \
-       ((chan_nr & 0xf8) == RSL_CHAN_OSMO_CBCH4)
+       ((chan_nr & 0xf8) == RSL_CHAN_OSMO_CBCH4) \
+       || ((chan_nr & 0xf8) == RSL_CHAN_OSMO_CBCH8)

 /* rach type from ra */
 #define L1SAP_IS_PACKET_RACH(ra) ((ra & 0xf0) == 0x70 && (ra & 0x0f) != 0x0f)

--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15708
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I2f6d501a29edaf89dfb17d5d64f930cdb1943630
Gerrit-Change-Number: 15708
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <axilira...@gmail.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <axilira...@gmail.com>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged

Reply via email to