bts: Update osmo-bsc.cfg and osmo-bts.cfg

Somebody seems to have forgotten to update the osmo-bsc.cfg file here,
as osmo-bsc wouldn't even start using the file here.

Change-Id: I8453da3bda36912ee42fb0c8d862f75b2065965f

2 files changed, 66 insertions, 27 deletions

diff --git a/bts/osmo-bsc.cfg b/bts/osmo-bsc.cfg
index 153ae11d..1df450e2 100644
--- a/bts/osmo-bsc.cfg
+++ b/bts/osmo-bsc.cfg
@@ -5,14 +5,23 @@ password foo
 !
 log gsmtap 127.0.0.10
  logging level set-all debug
+ logging filter all 1
 !
 log stderr
  logging filter all 1
- logging color 0
+ logging color 1
  logging print category 1
  logging timestamp 1
  logging print extended-timestamp 1
- logging level set-all debug
+ logging print file 1
+ logging level set-all notice
+ logging level rll info
+ logging level rsl debug
+ logging level msc debug
+ logging level filter debug
+ logging level pcu debug
+ logging level lctrl info
+ logging level lsccp info
 !
 stats interval 5
 !
@@ -139,25 +148,25 @@ network
    max_power_red 20
    rsl e1 tei 1
    timeslot 0
-    phys_chan_config SDCCH8
+    phys_chan_config TCH/F
     hopping enabled 0
    timeslot 1
-    phys_chan_config TCH/F
+    phys_chan_config SDCCH8
     hopping enabled 0
    timeslot 2
-    phys_chan_config TCH/F
+    phys_chan_config PDCH
     hopping enabled 0
    timeslot 3
-    phys_chan_config TCH/F_PDCH
+    phys_chan_config TCH/F_TCH/H_PDCH
     hopping enabled 0
    timeslot 4
-    phys_chan_config TCH/F_TCH/H_PDCH
+    phys_chan_config TCH/F_PDCH
     hopping enabled 0
    timeslot 5
-    phys_chan_config TCH/H
+    phys_chan_config SDCCH8
     hopping enabled 0
    timeslot 6
-    phys_chan_config SDCCH8
+    phys_chan_config PDCH
     hopping enabled 0
    timeslot 7
     phys_chan_config PDCH
@@ -169,25 +178,25 @@ network
    max_power_red 20
    rsl e1 tei 2
    timeslot 0
-    phys_chan_config SDCCH8
+    phys_chan_config TCH/H
     hopping enabled 0
    timeslot 1
-    phys_chan_config TCH/F
+    phys_chan_config PDCH
     hopping enabled 0
    timeslot 2
-    phys_chan_config TCH/F
+    phys_chan_config SDCCH8
     hopping enabled 0
    timeslot 3
-    phys_chan_config TCH/F_PDCH
+    phys_chan_config PDCH
     hopping enabled 0
    timeslot 4
-    phys_chan_config TCH/F_TCH/H_PDCH
+    phys_chan_config SDCCH8
     hopping enabled 0
    timeslot 5
-    phys_chan_config TCH/H
+    phys_chan_config TCH/F
     hopping enabled 0
    timeslot 6
-    phys_chan_config SDCCH8
+    phys_chan_config PDCH
     hopping enabled 0
    timeslot 7
     phys_chan_config PDCH
@@ -199,28 +208,28 @@ network
    max_power_red 20
    rsl e1 tei 3
    timeslot 0
-    phys_chan_config SDCCH8
+    phys_chan_config PDCH
     hopping enabled 0
    timeslot 1
-    phys_chan_config TCH/F
+    phys_chan_config TCH/H
     hopping enabled 0
    timeslot 2
-    phys_chan_config TCH/F
+    phys_chan_config TCH/H
     hopping enabled 0
    timeslot 3
-    phys_chan_config TCH/F_PDCH
+    phys_chan_config SDCCH8
     hopping enabled 0
    timeslot 4
-    phys_chan_config TCH/F_TCH/H_PDCH
+    phys_chan_config PDCH
     hopping enabled 0
    timeslot 5
-    phys_chan_config TCH/H
+    phys_chan_config TCH/F
     hopping enabled 0
    timeslot 6
-    phys_chan_config SDCCH8
+    phys_chan_config PDCH
     hopping enabled 0
    timeslot 7
-    phys_chan_config PDCH
+    phys_chan_config SDCCH8
     hopping enabled 0
 msc 0
  core-location-area-code 666
diff --git a/bts/osmo-bts.cfg b/bts/osmo-bts.cfg
index c2cd0bd8..ccf53db1 100644
--- a/bts/osmo-bts.cfg
+++ b/bts/osmo-bts.cfg
@@ -4,14 +4,24 @@
 !
 log gsmtap 127.0.0.10
  logging level set-all debug
+ logging filter all 1
 !
 log stderr
  logging filter all 1
- logging color 0
+ logging color 1
  logging print category 1
  logging timestamp 1
  logging print extended-timestamp 1
- logging level set-all debug
+ logging level set-all notice
+ logging level rsl info
+ logging level oml info
+ logging level meas info
+ logging level pag info
+ logging level l1c info
+ logging level dsp info
+ logging level pcu debug
+ logging level trx info
+ logging level lmib debug
 !
 line vty
  no login
@@ -28,6 +38,12 @@ phy 0
  osmotrx rts-advance 5
  instance 0
   osmotrx rx-gain 10
+ instance 1
+  osmotrx rx-gain 10
+ instance 2
+  osmotrx rx-gain 10
+ instance 3
+  osmotrx rx-gain 10
 bts 0
  band DCS1800
  ipa unit-id 1234 0
@@ -50,7 +66,21 @@ bts 0
   power-ramp max-initial 0 mdBm
   power-ramp step-size 8000 mdB
   power-ramp step-interval 1
-  ms-power-control dsp
   phy 0 instance 0
+ trx 1
+  power-ramp max-initial 0 mdBm
+  power-ramp step-size 8000 mdB
+  power-ramp step-interval 1
+  phy 0 instance 1
+ trx 2
+  power-ramp max-initial 0 mdBm
+  power-ramp step-size 8000 mdB
+  power-ramp step-interval 1
+  phy 0 instance 2
+ trx 3
+  power-ramp max-initial 0 mdBm
+  power-ramp step-size 8000 mdB
+  power-ramp step-interval 1
+  phy 0 instance 3
 ctrl
  bind 127.0.0.20