aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Yanitskiy <axilirator@gmail.com>2019-10-09 02:05:33 +0700
committerVadim Yanitskiy <axilirator@gmail.com>2019-10-09 03:01:35 +0700
commite83c1196b87d650e491ae86c10571d2ef3fc8867 (patch)
tree32dc2ffebf73848e7b9396627139d1c9f389ad9c
parent1c6a56fb97fbe8cca0c0d09f4ccde686bfb1d638 (diff)
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
-rw-r--r--include/osmo-bts/l1sap.h3
1 files changed, 2 insertions, 1 deletions
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)