aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Maier <pmaier@sysmocom.de>2021-10-12 14:50:41 +0200
committerPhilipp Maier <pmaier@sysmocom.de>2021-10-13 11:27:02 +0200
commit314167c7992a5824ad728d63dbbba7638e1f0b4a (patch)
tree711d501f30fba7d6bfa4c2d1b10d567cc4063042
parent409718e5908f6027e7dc6df5086cc1b1da73a72e (diff)
bts: set R99 MSC flag in SI13 in bts_alloc
At the moment we set the R99 flag from bootstrap_bts() in osmo_bsc_main.c. However this constant flag should be set together with the many preinitalized chan_desc values in bts_alloc Change-Id: I5b78c4e25616ab552c37ba8b7c9948cf7052bad4
-rw-r--r--src/osmo-bsc/bts.c1
-rw-r--r--src/osmo-bsc/osmo_bsc_main.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c
index 1e202dff1..dc835d51f 100644
--- a/src/osmo-bsc/bts.c
+++ b/src/osmo-bsc/bts.c
@@ -266,6 +266,7 @@ struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, struct gsm_bts_sm *bts_sm
bts->si_common.rach_control.tx_integer = 9; /* 12 slots spread - 217/115 slots delay */
bts->si_common.rach_control.max_trans = 3; /* 7 retransmissions */
bts->si_common.rach_control.t2 = 4; /* no emergency calls */
+ bts->si_common.chan_desc.mscr = 1; /* Indicate R99 MSC in SI3 */
bts->si_common.chan_desc.att = 1; /* attachment required */
bts->si_common.chan_desc.bs_pa_mfrms = RSL_BS_PA_MFRMS_5; /* paging frames */
bts->si_common.chan_desc.bs_ag_blks_res = 1; /* reserved AGCH blocks */
diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c
index dfd055fe5..2931dcf26 100644
--- a/src/osmo-bsc/osmo_bsc_main.c
+++ b/src/osmo-bsc/osmo_bsc_main.c
@@ -490,9 +490,6 @@ static int bootstrap_bts(struct gsm_bts *bts)
/* Control Channel Description is set from vty/config */
- /* Indicate R99 MSC in SI3 */
- bts->si_common.chan_desc.mscr = 1;
-
/* Determine the value of CCCH_CONF. Is TS0/C0 combined? */
if (bts->c0->ts[0].pchan_from_config != GSM_PCHAN_CCCH) {
bts->si_common.chan_desc.ccch_conf = RSL_BCCH_CCCH_CONF_1_C;