summaryrefslogtreecommitdiffstats
path: root/openbsc/src/libbsc/bsc_init.c
diff options
context:
space:
mode:
authorAndreas Eversberg <jolly@eversberg.eu>2012-10-13 07:27:47 +0200
committerHarald Welte <laforge@gnumonks.org>2012-10-18 12:01:32 +0200
commit2ee7ecddeb423dd8b2be984be58c5aee3b359a2f (patch)
tree6689954745c3e44b522a7eef8b1c01993660a32b /openbsc/src/libbsc/bsc_init.c
parent94c2b0578b4827e5535296477c3cd1d39d8f4814 (diff)
Allow setting of Control Channel Description parameters via VTY
Diffstat (limited to 'openbsc/src/libbsc/bsc_init.c')
-rw-r--r--openbsc/src/libbsc/bsc_init.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c
index 2533aa737..f5d7969ef 100644
--- a/openbsc/src/libbsc/bsc_init.c
+++ b/openbsc/src/libbsc/bsc_init.c
@@ -421,10 +421,7 @@ static int bootstrap_bts(struct gsm_bts *bts)
"GSM networks and should only be used in a RF "
"shielded environment such as a faraday cage!\n\n");
- /* Control Channel Description */
- bts->si_common.chan_desc.att = 1;
- bts->si_common.chan_desc.bs_pa_mfrms = RSL_BS_PA_MFRMS_5;
- bts->si_common.chan_desc.bs_ag_blks_res = 1;
+ /* Control Channel Description is set from vty/config */
/* T3212 is set from vty/config */
@@ -435,6 +432,9 @@ static int bootstrap_bts(struct gsm_bts *bts)
switch (n) {
case 0:
bts->si_common.chan_desc.ccch_conf = RSL_BCCH_CCCH_CONF_1_C;
+ /* Limit reserved block to 2 on combined channel */
+ if (bts->si_common.chan_desc.bs_ag_blks_res > 2)
+ bts->si_common.chan_desc.bs_ag_blks_res = 2;
break;
case 1:
bts->si_common.chan_desc.ccch_conf = RSL_BCCH_CCCH_CONF_1_NC;