summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax <msuraev@sysmocom.de>2016-10-18 16:19:33 +0200
committerMax <msuraev@sysmocom.de>2016-10-18 16:19:33 +0200
commit582e4f627674f46310a90d9061e82fb342051b42 (patch)
tree9db731ddb27534e5785441609e0b698bfc36847f
parentfbd96f55fd904d412c7a84c7764810f16e2ec714 (diff)
Replace magic number with define
Value 4 used as magic number by both OpenBSC and OsmoBTS so it make sense to add it to shared header. See ebb483b69a5319e522ba5f713e9cb6f68a814a6a in osmo-bts for details. Change-Id: I9c6ad68f4c6aa72d39ec7e5a6968b36ec20e79f4
-rw-r--r--openbsc/include/openbsc/gsm_data_shared.h4
-rw-r--r--openbsc/src/libcommon/gsm_data_shared.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h
index d88995970..487a3f397 100644
--- a/openbsc/include/openbsc/gsm_data_shared.h
+++ b/openbsc/include/openbsc/gsm_data_shared.h
@@ -46,6 +46,10 @@ enum gsm_chreq_reason_t {
GSM_CHREQ_REASON_OTHER,
};
+/* lchans 0..3 are SDCCH in combined channel configuration,
+ use 4 as magic number for BCCH hack - see osmo-bts-../oml.c:opstart_compl() */
+#define CCCH_LCHAN 4
+
#define TRX_NR_TS 8
#define TS_MAX_LCHAN 8
diff --git a/openbsc/src/libcommon/gsm_data_shared.c b/openbsc/src/libcommon/gsm_data_shared.c
index b8853ad69..df204feab 100644
--- a/openbsc/src/libcommon/gsm_data_shared.c
+++ b/openbsc/src/libcommon/gsm_data_shared.c
@@ -579,7 +579,7 @@ uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan,
* here. This should never be sent in an RSL message.
* See osmo-bts-xxx/oml.c:opstart_compl().
*/
- if (lchan_nr == 4)
+ if (lchan_nr == CCCH_LCHAN)
chan_nr = 0;
else
OSMO_ASSERT(lchan_nr < 4);