diff --git a/openbsc/doc/examples/osmo-bsc/osmo-bsc.cfg b/openbsc/doc/examples/osmo-bsc/osmo-bsc.cfg index fd4c3d726..a17127d99 100644 --- a/openbsc/doc/examples/osmo-bsc/osmo-bsc.cfg +++ b/openbsc/doc/examples/osmo-bsc/osmo-bsc.cfg @@ -69,30 +69,30 @@ network nominal power 23 max_power_red 20 rsl e1 tei 0 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - hopping enabled 0 - timeslot 1 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 2 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 3 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 4 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 5 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 6 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 7 - phys_chan_config TCH/F - hopping enabled 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 msc ip.access rtp-base 4000 timeout-ping 20 diff --git a/openbsc/doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx-hopping.cfg b/openbsc/doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx-hopping.cfg index 36065e254..673064491 100644 --- a/openbsc/doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx-hopping.cfg +++ b/openbsc/doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx-hopping.cfg @@ -60,38 +60,38 @@ network max_power_red 12 rsl e1 line 0 timeslot 1 sub-slot full rsl e1 tei 1 - timeslot 0 - phys_chan_config CCCH - hopping enabled 0 - e1 line 0 timeslot 1 sub-slot full - timeslot 1 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 2 sub-slot 1 - timeslot 2 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 2 sub-slot 2 - timeslot 3 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 2 sub-slot 3 - timeslot 4 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 3 sub-slot 0 - timeslot 5 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 3 sub-slot 1 - timeslot 6 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 3 sub-slot 2 - timeslot 7 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 3 sub-slot 3 + timeslot 0 + phys_chan_config CCCH + hopping enabled 0 + e1 line 0 timeslot 1 sub-slot full + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 3 trx 1 rf_locked 0 arfcn 119 @@ -99,66 +99,66 @@ network max_power_red 12 rsl e1 line 0 timeslot 1 sub-slot full rsl e1 tei 2 - timeslot 0 - phys_chan_config SDCCH8 - hopping enabled 1 - hopping sequence-number 0 - hopping maio 0 - hopping arfcn add 117 - hopping arfcn add 119 - timeslot 1 - phys_chan_config TCH/F - hopping enabled 1 - hopping sequence-number 0 - hopping maio 0 - hopping arfcn add 117 - hopping arfcn add 119 - e1 line 0 timeslot 4 sub-slot 1 - timeslot 2 - phys_chan_config TCH/F - hopping enabled 1 - hopping sequence-number 0 - hopping maio 0 - hopping arfcn add 117 - hopping arfcn add 119 - e1 line 0 timeslot 4 sub-slot 2 - timeslot 3 - phys_chan_config TCH/F - hopping enabled 1 - hopping sequence-number 0 - hopping maio 0 - hopping arfcn add 117 - hopping arfcn add 119 - e1 line 0 timeslot 4 sub-slot 3 - timeslot 4 - phys_chan_config TCH/F - hopping enabled 1 - hopping sequence-number 0 - hopping maio 0 - hopping arfcn add 117 - hopping arfcn add 119 - e1 line 0 timeslot 5 sub-slot 0 - timeslot 5 - phys_chan_config TCH/F - hopping enabled 1 - hopping sequence-number 0 - hopping maio 0 - hopping arfcn add 117 - hopping arfcn add 119 - e1 line 0 timeslot 5 sub-slot 1 - timeslot 6 - phys_chan_config TCH/F - hopping enabled 1 - hopping sequence-number 0 - hopping maio 0 - hopping arfcn add 117 - hopping arfcn add 119 - e1 line 0 timeslot 5 sub-slot 2 - timeslot 7 - phys_chan_config TCH/F - hopping enabled 1 - hopping sequence-number 0 - hopping maio 0 - hopping arfcn add 117 - hopping arfcn add 119 - e1 line 0 timeslot 5 sub-slot 3 + timeslot 0 + phys_chan_config SDCCH8 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 117 + hopping arfcn add 119 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 117 + hopping arfcn add 119 + e1 line 0 timeslot 4 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 117 + hopping arfcn add 119 + e1 line 0 timeslot 4 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 117 + hopping arfcn add 119 + e1 line 0 timeslot 4 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 117 + hopping arfcn add 119 + e1 line 0 timeslot 5 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 117 + hopping arfcn add 119 + e1 line 0 timeslot 5 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 117 + hopping arfcn add 119 + e1 line 0 timeslot 5 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 117 + hopping arfcn add 119 + e1 line 0 timeslot 5 sub-slot 3 diff --git a/openbsc/doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx.cfg b/openbsc/doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx.cfg index ebe6cc6cb..ca5689fd5 100644 --- a/openbsc/doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx.cfg +++ b/openbsc/doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx.cfg @@ -29,56 +29,56 @@ network max_power_red 0 rsl e1 line 0 timeslot 1 sub-slot full rsl e1 tei 1 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - e1 line 0 timeslot 1 sub-slot full - timeslot 1 - phys_chan_config SDCCH8 - e1 line 0 timeslot 2 sub-slot 1 - timeslot 2 - phys_chan_config TCH/F - e1 line 0 timeslot 2 sub-slot 2 - timeslot 3 - phys_chan_config TCH/F - e1 line 0 timeslot 2 sub-slot 3 - timeslot 4 - phys_chan_config TCH/F - e1 line 0 timeslot 3 sub-slot 0 - timeslot 5 - phys_chan_config TCH/F - e1 line 0 timeslot 3 sub-slot 1 - timeslot 6 - phys_chan_config TCH/F - e1 line 0 timeslot 3 sub-slot 2 - timeslot 7 - phys_chan_config TCH/F - e1 line 0 timeslot 3 sub-slot 3 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + e1 line 0 timeslot 1 sub-slot full + timeslot 1 + phys_chan_config SDCCH8 + e1 line 0 timeslot 2 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + e1 line 0 timeslot 2 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + e1 line 0 timeslot 2 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 3 trx 1 arfcn 123 max_power_red 0 rsl e1 line 0 timeslot 1 sub-slot full rsl e1 tei 2 - timeslot 0 - phys_chan_config TCH/F - e1 line 0 timeslot 4 sub-slot 0 - timeslot 1 - phys_chan_config TCH/F - e1 line 0 timeslot 4 sub-slot 1 - timeslot 2 - phys_chan_config TCH/F - e1 line 0 timeslot 4 sub-slot 2 - timeslot 3 - phys_chan_config TCH/F - e1 line 0 timeslot 4 sub-slot 3 - timeslot 4 - phys_chan_config TCH/F - e1 line 0 timeslot 5 sub-slot 0 - timeslot 5 - phys_chan_config TCH/F - e1 line 0 timeslot 5 sub-slot 1 - timeslot 6 - phys_chan_config TCH/F - e1 line 0 timeslot 5 sub-slot 2 - timeslot 7 - phys_chan_config TCH/F - e1 line 0 timeslot 5 sub-slot 3 + timeslot 0 + phys_chan_config TCH/F + e1 line 0 timeslot 4 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + e1 line 0 timeslot 4 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + e1 line 0 timeslot 4 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + e1 line 0 timeslot 4 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + e1 line 0 timeslot 5 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + e1 line 0 timeslot 5 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + e1 line 0 timeslot 5 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + e1 line 0 timeslot 5 sub-slot 3 diff --git a/openbsc/doc/examples/osmo-nitb/bs11/openbsc-2bts-2trx.cfg b/openbsc/doc/examples/osmo-nitb/bs11/openbsc-2bts-2trx.cfg index 9ae800342..4f194c00c 100644 --- a/openbsc/doc/examples/osmo-nitb/bs11/openbsc-2bts-2trx.cfg +++ b/openbsc/doc/examples/osmo-nitb/bs11/openbsc-2bts-2trx.cfg @@ -27,59 +27,59 @@ network max_power_red 0 rsl e1 line 0 timeslot 1 sub-slot full rsl e1 tei 1 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - e1 line 0 timeslot 1 sub-slot full - timeslot 1 - phys_chan_config TCH/F - e1 line 0 timeslot 2 sub-slot 1 - timeslot 2 - phys_chan_config TCH/F - e1 line 0 timeslot 2 sub-slot 2 - timeslot 3 - phys_chan_config TCH/F - e1 line 0 timeslot 2 sub-slot 3 - timeslot 4 - phys_chan_config TCH/F - e1 line 0 timeslot 3 sub-slot 0 - timeslot 5 - phys_chan_config TCH/F - e1 line 0 timeslot 3 sub-slot 1 - timeslot 6 - phys_chan_config TCH/F - e1 line 0 timeslot 3 sub-slot 2 - timeslot 7 - phys_chan_config TCH/F - e1 line 0 timeslot 3 sub-slot 3 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + e1 line 0 timeslot 1 sub-slot full + timeslot 1 + phys_chan_config TCH/F + e1 line 0 timeslot 2 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + e1 line 0 timeslot 2 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + e1 line 0 timeslot 2 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 3 trx 1 arfcn 123 max_power_red 0 rsl e1 line 0 timeslot 1 sub-slot full rsl e1 tei 2 - timeslot 0 - phys_chan_config TCH/F - e1 line 0 timeslot 4 sub-slot 0 - timeslot 1 - phys_chan_config TCH/F - e1 line 0 timeslot 4 sub-slot 1 - timeslot 2 - phys_chan_config TCH/F - e1 line 0 timeslot 4 sub-slot 2 - timeslot 3 - phys_chan_config TCH/F - e1 line 0 timeslot 4 sub-slot 3 - timeslot 4 - phys_chan_config TCH/F - e1 line 0 timeslot 5 sub-slot 0 - timeslot 5 - phys_chan_config TCH/F - e1 line 0 timeslot 5 sub-slot 1 - timeslot 6 - phys_chan_config TCH/F - e1 line 0 timeslot 5 sub-slot 2 - timeslot 7 - phys_chan_config TCH/F - e1 line 0 timeslot 5 sub-slot 3 + timeslot 0 + phys_chan_config TCH/F + e1 line 0 timeslot 4 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + e1 line 0 timeslot 4 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + e1 line 0 timeslot 4 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + e1 line 0 timeslot 4 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + e1 line 0 timeslot 5 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + e1 line 0 timeslot 5 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + e1 line 0 timeslot 5 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + e1 line 0 timeslot 5 sub-slot 3 bts 1 type bs11 band GSM900 @@ -93,56 +93,56 @@ network max_power_red 0 rsl e1 line 1 timeslot 6 sub-slot full rsl e1 tei 1 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - e1 line 1 timeslot 7 sub-slot 0 - timeslot 1 - phys_chan_config SDCCH8 - e1 line 1 timeslot 7 sub-slot 1 - timeslot 2 - phys_chan_config TCH/F - e1 line 1 timeslot 7 sub-slot 2 - timeslot 3 - phys_chan_config TCH/F - e1 line 1 timeslot 7 sub-slot 3 - timeslot 4 - phys_chan_config TCH/F - e1 line 1 timeslot 8 sub-slot 0 - timeslot 5 - phys_chan_config TCH/F - e1 line 1 timeslot 8 sub-slot 1 - timeslot 6 - phys_chan_config TCH/F - e1 line 1 timeslot 8 sub-slot 2 - timeslot 7 - phys_chan_config TCH/F - e1 line 1 timeslot 8 sub-slot 3 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + e1 line 1 timeslot 7 sub-slot 0 + timeslot 1 + phys_chan_config SDCCH8 + e1 line 1 timeslot 7 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + e1 line 1 timeslot 7 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + e1 line 1 timeslot 7 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + e1 line 1 timeslot 8 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + e1 line 1 timeslot 8 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + e1 line 1 timeslot 8 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + e1 line 1 timeslot 8 sub-slot 3 trx 1 arfcn 124 max_power_red 0 rsl e1 line 1 timeslot 6 sub-slot full rsl e1 tei 2 - timeslot 0 - phys_chan_config TCH/F - e1 line 1 timeslot 9 sub-slot 0 - timeslot 1 - phys_chan_config TCH/F - e1 line 1 timeslot 9 sub-slot 1 - timeslot 2 - phys_chan_config TCH/F - e1 line 1 timeslot 9 sub-slot 2 - timeslot 3 - phys_chan_config TCH/F - e1 line 1 timeslot 9 sub-slot 3 - timeslot 4 - phys_chan_config TCH/F - e1 line 1 timeslot 10 sub-slot 0 - timeslot 5 - phys_chan_config TCH/F - e1 line 1 timeslot 10 sub-slot 1 - timeslot 6 - phys_chan_config TCH/F - e1 line 1 timeslot 10 sub-slot 2 - timeslot 7 - phys_chan_config TCH/F - e1 line 1 timeslot 10 sub-slot 3 + timeslot 0 + phys_chan_config TCH/F + e1 line 1 timeslot 9 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + e1 line 1 timeslot 9 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + e1 line 1 timeslot 9 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + e1 line 1 timeslot 9 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + e1 line 1 timeslot 10 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + e1 line 1 timeslot 10 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + e1 line 1 timeslot 10 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + e1 line 1 timeslot 10 sub-slot 3 diff --git a/openbsc/doc/examples/osmo-nitb/bs11/openbsc.cfg b/openbsc/doc/examples/osmo-nitb/bs11/openbsc.cfg index 542edd6ad..6c47a902d 100644 --- a/openbsc/doc/examples/osmo-nitb/bs11/openbsc.cfg +++ b/openbsc/doc/examples/osmo-nitb/bs11/openbsc.cfg @@ -29,28 +29,28 @@ network max_power_red 0 rsl e1 line 0 timeslot 1 sub-slot full rsl e1 tei 1 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - e1 line 0 timeslot 1 sub-slot full - timeslot 1 - phys_chan_config TCH/F - e1 line 0 timeslot 2 sub-slot 1 - timeslot 2 - phys_chan_config TCH/F - e1 line 0 timeslot 2 sub-slot 2 - timeslot 3 - phys_chan_config TCH/F - e1 line 0 timeslot 2 sub-slot 3 - timeslot 4 - phys_chan_config TCH/F - e1 line 0 timeslot 3 sub-slot 0 - timeslot 5 - phys_chan_config TCH/F - e1 line 0 timeslot 3 sub-slot 1 - timeslot 6 - phys_chan_config TCH/F - e1 line 0 timeslot 3 sub-slot 2 - timeslot 7 - phys_chan_config TCH/F - e1 line 0 timeslot 3 sub-slot 3 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + e1 line 0 timeslot 1 sub-slot full + timeslot 1 + phys_chan_config TCH/F + e1 line 0 timeslot 2 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + e1 line 0 timeslot 2 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + e1 line 0 timeslot 2 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 3 diff --git a/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg b/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg index bea0b7dfc..3277bea56 100644 --- a/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg +++ b/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg @@ -59,41 +59,41 @@ network nominal power 23 max_power_red 0 rsl e1 tei 0 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - timeslot 1 - phys_chan_config SDCCH8 - timeslot 2 - phys_chan_config TCH/F - timeslot 3 - phys_chan_config TCH/F - timeslot 4 - phys_chan_config TCH/F - timeslot 5 - phys_chan_config TCH/F - timeslot 6 - phys_chan_config TCH/F - timeslot 7 - phys_chan_config TCH/F + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config SDCCH8 + timeslot 2 + phys_chan_config TCH/F + timeslot 3 + phys_chan_config TCH/F + timeslot 4 + phys_chan_config TCH/F + timeslot 5 + phys_chan_config TCH/F + timeslot 6 + phys_chan_config TCH/F + timeslot 7 + phys_chan_config TCH/F trx 1 rf_locked 0 arfcn 873 nominal power 23 max_power_red 0 rsl e1 tei 0 - timeslot 0 - phys_chan_config SDCCH8 - timeslot 1 - phys_chan_config TCH/F - timeslot 2 - phys_chan_config TCH/F - timeslot 3 - phys_chan_config TCH/F - timeslot 4 - phys_chan_config TCH/F - timeslot 5 - phys_chan_config TCH/F - timeslot 6 - phys_chan_config TCH/F - timeslot 7 - phys_chan_config TCH/F + timeslot 0 + phys_chan_config SDCCH8 + timeslot 1 + phys_chan_config TCH/F + timeslot 2 + phys_chan_config TCH/F + timeslot 3 + phys_chan_config TCH/F + timeslot 4 + phys_chan_config TCH/F + timeslot 5 + phys_chan_config TCH/F + timeslot 6 + phys_chan_config TCH/F + timeslot 7 + phys_chan_config TCH/F diff --git a/openbsc/doc/examples/osmo-nitb/nanobts/openbsc.cfg b/openbsc/doc/examples/osmo-nitb/nanobts/openbsc.cfg index 7a443087c..cfc1be6b0 100644 --- a/openbsc/doc/examples/osmo-nitb/nanobts/openbsc.cfg +++ b/openbsc/doc/examples/osmo-nitb/nanobts/openbsc.cfg @@ -59,19 +59,19 @@ network nominal power 23 max_power_red 20 rsl e1 tei 0 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - timeslot 1 - phys_chan_config SDCCH8 - timeslot 2 - phys_chan_config TCH/F - timeslot 3 - phys_chan_config TCH/F - timeslot 4 - phys_chan_config TCH/F - timeslot 5 - phys_chan_config TCH/F - timeslot 6 - phys_chan_config TCH/F - timeslot 7 - phys_chan_config TCH/F + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config SDCCH8 + timeslot 2 + phys_chan_config TCH/F + timeslot 3 + phys_chan_config TCH/F + timeslot 4 + phys_chan_config TCH/F + timeslot 5 + phys_chan_config TCH/F + timeslot 6 + phys_chan_config TCH/F + timeslot 7 + phys_chan_config TCH/F diff --git a/openbsc/doc/examples/osmo-nitb/nokia/openbsc_nokia_3trx.cfg b/openbsc/doc/examples/osmo-nitb/nokia/openbsc_nokia_3trx.cfg index f4c715c76..90386bec2 100644 --- a/openbsc/doc/examples/osmo-nitb/nokia/openbsc_nokia_3trx.cfg +++ b/openbsc/doc/examples/osmo-nitb/nokia/openbsc_nokia_3trx.cfg @@ -31,87 +31,87 @@ network max_power_red 24 rsl e1 line 0 timeslot 2 sub-slot full rsl e1 tei 1 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - e1 line 0 timeslot 6 sub-slot full - timeslot 1 - phys_chan_config SDCCH8 - e1 line 0 timeslot 6 sub-slot 1 - timeslot 2 - phys_chan_config TCH/F - e1 line 0 timeslot 6 sub-slot 2 - timeslot 3 - phys_chan_config TCH/F - e1 line 0 timeslot 6 sub-slot 3 - timeslot 4 - phys_chan_config TCH/F - e1 line 0 timeslot 7 sub-slot 0 - timeslot 5 - phys_chan_config TCH/F - e1 line 0 timeslot 7 sub-slot 1 - timeslot 6 - phys_chan_config TCH/F - e1 line 0 timeslot 7 sub-slot 2 - timeslot 7 - phys_chan_config TCH/F - e1 line 0 timeslot 7 sub-slot 3 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + e1 line 0 timeslot 6 sub-slot full + timeslot 1 + phys_chan_config SDCCH8 + e1 line 0 timeslot 6 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + e1 line 0 timeslot 6 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + e1 line 0 timeslot 6 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + e1 line 0 timeslot 7 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + e1 line 0 timeslot 7 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + e1 line 0 timeslot 7 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + e1 line 0 timeslot 7 sub-slot 3 trx 1 arfcn 870 max_power_red 24 rsl e1 line 0 timeslot 3 sub-slot full rsl e1 tei 2 - timeslot 0 - phys_chan_config TCH/F - e1 line 0 timeslot 8 sub-slot 0 - timeslot 1 - phys_chan_config TCH/F - e1 line 0 timeslot 8 sub-slot 1 - timeslot 2 - phys_chan_config TCH/F - e1 line 0 timeslot 8 sub-slot 2 - timeslot 3 - phys_chan_config TCH/F - e1 line 0 timeslot 8 sub-slot 3 - timeslot 4 - phys_chan_config TCH/F - e1 line 0 timeslot 9 sub-slot 0 - timeslot 5 - phys_chan_config TCH/F - e1 line 0 timeslot 9 sub-slot 1 - timeslot 6 - phys_chan_config TCH/F - e1 line 0 timeslot 9 sub-slot 2 - timeslot 7 - phys_chan_config TCH/F - e1 line 0 timeslot 9 sub-slot 3 + timeslot 0 + phys_chan_config TCH/F + e1 line 0 timeslot 8 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + e1 line 0 timeslot 8 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + e1 line 0 timeslot 8 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + e1 line 0 timeslot 8 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + e1 line 0 timeslot 9 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + e1 line 0 timeslot 9 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + e1 line 0 timeslot 9 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + e1 line 0 timeslot 9 sub-slot 3 trx 2 arfcn 874 max_power_red 24 rsl e1 line 0 timeslot 4 sub-slot full rsl e1 tei 3 - timeslot 0 - phys_chan_config TCH/F - e1 line 0 timeslot 10 sub-slot 0 - timeslot 1 - phys_chan_config TCH/F - e1 line 0 timeslot 10 sub-slot 1 - timeslot 2 - phys_chan_config TCH/F - e1 line 0 timeslot 10 sub-slot 2 - timeslot 3 - phys_chan_config TCH/F - e1 line 0 timeslot 10 sub-slot 3 - timeslot 4 - phys_chan_config TCH/F - e1 line 0 timeslot 11 sub-slot 0 - timeslot 5 - phys_chan_config TCH/F - e1 line 0 timeslot 11 sub-slot 1 - timeslot 6 - phys_chan_config TCH/F - e1 line 0 timeslot 11 sub-slot 2 - timeslot 7 - phys_chan_config TCH/F - e1 line 0 timeslot 11 sub-slot 3 + timeslot 0 + phys_chan_config TCH/F + e1 line 0 timeslot 10 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + e1 line 0 timeslot 10 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + e1 line 0 timeslot 10 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + e1 line 0 timeslot 10 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + e1 line 0 timeslot 11 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + e1 line 0 timeslot 11 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + e1 line 0 timeslot 11 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + e1 line 0 timeslot 11 sub-slot 3 diff --git a/openbsc/doc/examples/osmo-nitb/rbs2308/openbsc.cfg b/openbsc/doc/examples/osmo-nitb/rbs2308/openbsc.cfg index 97cd9df50..b1ebdd226 100644 --- a/openbsc/doc/examples/osmo-nitb/rbs2308/openbsc.cfg +++ b/openbsc/doc/examples/osmo-nitb/rbs2308/openbsc.cfg @@ -67,38 +67,38 @@ network max_power_red 12 rsl e1 line 0 timeslot 1 sub-slot full rsl e1 tei 0 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - hopping enabled 0 - e1 line 0 timeslot 1 sub-slot full - timeslot 1 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 2 sub-slot 1 - timeslot 2 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 2 sub-slot 2 - timeslot 3 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 2 sub-slot 3 - timeslot 4 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 3 sub-slot 0 - timeslot 5 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 3 sub-slot 1 - timeslot 6 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 3 sub-slot 2 - timeslot 7 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 3 sub-slot 3 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + e1 line 0 timeslot 1 sub-slot full + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 3 trx 1 rf_locked 0 arfcn 57 @@ -106,38 +106,38 @@ network max_power_red 12 rsl e1 line 0 timeslot 4 sub-slot full rsl e1 tei 1 - timeslot 0 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 5 sub-slot 0 - timeslot 1 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 5 sub-slot 1 - timeslot 2 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 5 sub-slot 2 - timeslot 3 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 5 sub-slot 3 - timeslot 4 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 6 sub-slot 0 - timeslot 5 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 6 sub-slot 1 - timeslot 6 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 6 sub-slot 2 - timeslot 7 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 6 sub-slot 3 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 3 trx 2 rf_locked 0 arfcn 59 @@ -145,38 +145,38 @@ network max_power_red 12 rsl e1 line 0 timeslot 7 sub-slot full rsl e1 tei 2 - timeslot 0 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 8 sub-slot 0 - timeslot 1 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 8 sub-slot 1 - timeslot 2 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 8 sub-slot 2 - timeslot 3 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 8 sub-slot 3 - timeslot 4 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 9 sub-slot 0 - timeslot 5 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 9 sub-slot 1 - timeslot 6 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 9 sub-slot 2 - timeslot 7 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 9 sub-slot 3 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 3 trx 3 rf_locked 0 arfcn 61 @@ -184,38 +184,38 @@ network max_power_red 12 rsl e1 line 0 timeslot 10 sub-slot full rsl e1 tei 3 - timeslot 0 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 11 sub-slot 0 - timeslot 1 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 11 sub-slot 1 - timeslot 2 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 11 sub-slot 2 - timeslot 3 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 11 sub-slot 3 - timeslot 4 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 12 sub-slot 0 - timeslot 5 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 12 sub-slot 1 - timeslot 6 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 12 sub-slot 2 - timeslot 7 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 12 sub-slot 3 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 3 e1_input e1_line 0 driver dahdi diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c index d3aa3a6b1..4fbf33716 100644 --- a/openbsc/src/libbsc/bsc_vty.c +++ b/openbsc/src/libbsc/bsc_vty.c @@ -374,28 +374,28 @@ static void config_write_e1_link(struct vty *vty, struct gsm_e1_subslot *e1_link static void config_write_ts_single(struct vty *vty, struct gsm_bts_trx_ts *ts) { - vty_out(vty, " timeslot %u%s", ts->nr, VTY_NEWLINE); + vty_out(vty, " timeslot %u%s", ts->nr, VTY_NEWLINE); if (ts->tsc != -1) - vty_out(vty, " training_sequence_code %u%s", ts->tsc, VTY_NEWLINE); + vty_out(vty, " training_sequence_code %u%s", ts->tsc, VTY_NEWLINE); if (ts->pchan != GSM_PCHAN_NONE) - vty_out(vty, " phys_chan_config %s%s", + vty_out(vty, " phys_chan_config %s%s", gsm_pchan_name(ts->pchan), VTY_NEWLINE); - vty_out(vty, " hopping enabled %u%s", + vty_out(vty, " hopping enabled %u%s", ts->hopping.enabled, VTY_NEWLINE); if (ts->hopping.enabled) { unsigned int i; - vty_out(vty, " hopping sequence-number %u%s", + vty_out(vty, " hopping sequence-number %u%s", ts->hopping.hsn, VTY_NEWLINE); - vty_out(vty, " hopping maio %u%s", + vty_out(vty, " hopping maio %u%s", ts->hopping.maio, VTY_NEWLINE); for (i = 0; i < ts->hopping.arfcns.data_len*8; i++) { if (!bitvec_get_bit_pos(&ts->hopping.arfcns, i)) continue; - vty_out(vty, " hopping arfcn add %u%s", + vty_out(vty, " hopping arfcn add %u%s", i, VTY_NEWLINE); } } - config_write_e1_link(vty, &ts->e1_link, " "); + config_write_e1_link(vty, &ts->e1_link, " "); if (ts->trx->bts->model->config_write_ts) ts->trx->bts->model->config_write_ts(vty, ts);