summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@netfilter.org>2009-08-06 17:38:10 +0200
committerHarald Welte <laforge@netfilter.org>2009-08-06 17:38:10 +0200
commit63589bef5202647c5212a5cd106c7eb615d21981 (patch)
tree697c76413d89912563cc8b6638a123395ffb9d63
parentac606dcf92f2ece21b3e272c34ca5ff8039b2f63 (diff)
add HARDCODED_BTSn_TS to define the base TS for each BTS
-rw-r--r--openbsc/include/openbsc/gsm_data.h5
-rw-r--r--openbsc/src/e1_config.c10
2 files changed, 10 insertions, 5 deletions
diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h
index 84e3c79e1..700eb73fa 100644
--- a/openbsc/include/openbsc/gsm_data.h
+++ b/openbsc/include/openbsc/gsm_data.h
@@ -54,6 +54,11 @@ enum gsm_chreq_reason_t {
#define HARDCODED_TSC 7
#define HARDCODED_BSIC 0x3f /* NCC = 7 / BCC = 7 */
+/* for multi-drop config */
+#define HARDCODED_BTS0_TS 1
+#define HARDCODED_BTS1_TS 6
+#define HARDCODED_BTS2_TS 11
+
enum gsm_hooks {
GSM_HOOK_NM_SWLOAD,
GSM_HOOK_RR_PAGING,
diff --git a/openbsc/src/e1_config.c b/openbsc/src/e1_config.c
index d7b42686f..898780374 100644
--- a/openbsc/src/e1_config.c
+++ b/openbsc/src/e1_config.c
@@ -30,15 +30,15 @@ int e1_config(struct gsm_bts *bts, int cardnr, int release_l2)
switch (bts->nr) {
case 0:
/* First BTS uses E1 TS 01,02,03,04,05 */
- base_ts = 1 - 1;
+ base_ts = HARDCODED_BTS0_TS - 1;
break;
case 1:
- /* Second BTS uses E1 TS 11,12,13,14,15 */
- base_ts = 11 - 1;
+ /* Second BTS uses E1 TS 06,07,08,09,10 */
+ base_ts = HARDCODED_BTS1_TS - 1;
break;
case 2:
- /* Third BTS uses E1 TS 21,22,23,24,25 */
- base_ts = 21 - 1;
+ /* Third BTS uses E1 TS 11,12,13,14,15 */
+ base_ts = HARDCODED_BTS2_TS - 1;
default:
return -EINVAL;
}