From e83c1196b87d650e491ae86c10571d2ef3fc8867 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Wed, 9 Oct 2019 02:05:33 +0700 Subject: 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 --- include/osmo-bts/l1sap.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index ccfcacc7..7ae5d38d 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) -- cgit v1.2.3