cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

chane TRX0/TS0 channel combination to not include a CBCH 

We don't support CBCH anyway, and using CBCH will reduce the number of uesable
SDCCH/4 channels to 3 on TS0
This commit is contained in:
Harald Welte 2009-08-09 22:01:26 +02:00
parent 39c7debc9c
commit 89e9d5927e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openbsc/src/bsc_hack.c
View File

@ -403,7 +403,7 @@ int nm_state_event(enum nm_evt evt, u_int8_t obj_class, void *obj,
trx = ts->trx;
if (new_state->availability == 5) {
if (ts->nr == 0 && trx == trx->bts->c0)
abis_nm_set_channel_attr(ts, NM_CHANC_BCCH_CBCH);
abis_nm_set_channel_attr(ts, NM_CHANC_BCCHComb);
else
abis_nm_set_channel_attr(ts, NM_CHANC_TCHFull);
abis_nm_opstart(trx->bts, NM_OC_CHANNEL,
@ -534,7 +534,7 @@ static void bootstrap_om_bs11(struct gsm_bts *bts)
/* Use TEI 1 for signalling */
abis_nm_establish_tei(bts, 0, 0, base_ts+1, 0xff, 0x01);
abis_nm_set_channel_attr(&trx->ts[0], NM_CHANC_SDCCH_CBCH);
abis_nm_set_channel_attr(&trx->ts[0], NM_CHANC_BCCHComb);
/* SET CHANNEL ATTRIBUTE TS1 */
abis_nm_set_channel_attr(&trx->ts[1], NM_CHANC_TCHFull);
@ -594,7 +594,7 @@ static void bootstrap_om_bs11(struct gsm_bts *bts)
abis_nm_establish_tei(bts, 1, 0, base_ts+1, 0xff, 0x02);
/* SET CHANNEL ATTRIBUTE TS0 */
abis_nm_set_channel_attr(&trx->ts[0], NM_CHANC_TCHFull);
abis_nm_set_channel_attr(&trx->ts[0], NM_CHANC_SDCCH);
/* Connect traffic of bts0/trx0/ts0 to e1_0/ts4/a */
abis_nm_conn_terr_traf(&trx->ts[0], 0, base_ts+4, 0);

10
openbsc/src/chan_alloc.c
View File

@ -80,13 +80,11 @@ struct gsm_bts_trx_ts *ts_alloc(struct gsm_bts *bts,
case GSM_PCHAN_CCCH_SDCCH4:
from = 0; to = 0;
break;
case GSM_PCHAN_SDCCH8_SACCH8C:
from = 1; to = 1;
break;
case GSM_PCHAN_TCH_F:
case GSM_PCHAN_TCH_H:
from = 2; to = 7;
from = 1; to = 7;
break;
case GSM_PCHAN_SDCCH8_SACCH8C:
default:
return NULL;
}
@ -94,9 +92,11 @@ struct gsm_bts_trx_ts *ts_alloc(struct gsm_bts *bts,
/* Every secondary TRX is configured for TCH/F
* and TCH/H only */
switch (pchan) {
case GSM_PCHAN_SDCCH8_SACCH8C:
from = 1; to = 1;
case GSM_PCHAN_TCH_F:
case GSM_PCHAN_TCH_H:
from = 0; to = 7;
from = 1; to = 7;
break;
default:
return NULL;