[Commit-gnuradio] r11665 - openbts/trunk/apps

[dburgess00]

Author: dburgess00
Date: 2009-12-02 23:41:41 -0700 (Wed, 02 Dec 2009)
New Revision: 11665

Modified:
   openbts/trunk/apps/OpenBTS.config.example
   openbts/trunk/apps/OpenBTS.cpp
Log:
Update to release 2.5.1.


Modified: openbts/trunk/apps/OpenBTS.config.example
===================================================================
--- openbts/trunk/apps/OpenBTS.config.example   2009-12-01 01:41:48 UTC (rev 
11664)
+++ openbts/trunk/apps/OpenBTS.config.example   2009-12-03 06:41:41 UTC (rev 
11665)
@@ -44,7 +44,7 @@
 
 # TRX logging.
 # Logging level.
-TRX.LogLevel DEBUG
+TRX.LogLevel NOTICE
 # Logging file.  If not defined, logs to stdout.
 TRX.LogFileName test.TRX.out
 
@@ -167,17 +167,17 @@
 # US is 310
 # MCC MUST BE 3 DIGITS.  Prefix with 0s if needed.
 # Test code is 001.
-GSM.MCC 310
+GSM.MCC 001
 # Mobile Network Code, 2 or 3 digits.
 # Test code is 01.
-GSM.MNC 410
+GSM.MNC 01
 # Location Area Code, 0-65535
 GSM.LAC 666
 # Cell ID, 0-65535
 GSM.CI 10
 # Network "short name" to display on the handset.
 # SHORT NAME MUST BE LESS THAN 8 CHARACTERS.
-GSM.ShortName NotAT&T
+GSM.ShortName OpenBTS
 
 # Assignment type for call setup.
 # This is defined in an enum AssignmentType in GSMCommon.h.
@@ -187,18 +187,18 @@
 # Band and Frequency
 
 # Valid band values are 850, 900, 1800, 1900.
-#GSM.Band 900
-GSM.Band 850
+GSM.Band 900
+#GSM.Band 850
 
 # Valid ARFCN range depends on the band.
-#GSM.ARFCN 29
+GSM.ARFCN 29
 # ARCN 975 is inside the US ISM-900 band and also in the GSM900 band.
 #GSM.ARFCN 975
 # ARFCN 207 was what we ran at BM2008, I think, in the GSM850 band.
-GSM.ARFCN 207
+#GSM.ARFCN 207
 
 # Neightbor list
-GSM.Neighbors 207
+GSM.Neighbors 29
 
 # Downlink tx power level, dB wrt full power
 GSM.PowerAttenDB 0

Modified: openbts/trunk/apps/OpenBTS.cpp
===================================================================
--- openbts/trunk/apps/OpenBTS.cpp      2009-12-01 01:41:48 UTC (rev 11664)
+++ openbts/trunk/apps/OpenBTS.cpp      2009-12-03 06:41:41 UTC (rev 11665)
@@ -107,16 +107,13 @@
        // Tuning.
        // Make sure its off for tuning.
        radio->powerOff();
+       // Set TSC same as BSC everywhere.
+       radio->setTSC(gBTS.BCC());
        // Tune.
        radio->tune(gConfig.getNum("GSM.ARFCN"));
        // C-V on C0T0
        radio->setSlot(0,5);
 
-       // Channel combinations.
-       // C-I on C0T1-C0T7
-       for (unsigned i=1; i<8; i++) radio->setSlot(i,1);
-               radio->setTSC(gBTS.BCC());
-
        // Turn on and power up.
        radio->powerOn();
                radio->setPower(gConfig.getNum("GSM.PowerAttenDB"));
@@ -175,6 +172,7 @@
 
        // Create C-VII slots on C0Tn
        for (unsigned i=0; i<gConfig.getNum("GSM.NumC7s"); i++) {
+               radio->setSlot(sCount,7);
                for (unsigned sub=0; sub<8; sub++) {
                        SDCCHLogicalChannel* chan = new 
SDCCHLogicalChannel(sCount,gSDCCH8[sub]);
                        chan->downstream(radio);
@@ -189,6 +187,7 @@
 
        // Create C-I slots on C0Tn
        for (unsigned i=0; i<gConfig.getNum("GSM.NumC1s"); i++) {
+               radio->setSlot(sCount,1);
                TCHFACCHLogicalChannel* chan = new 
TCHFACCHLogicalChannel(sCount,gTCHF_T[sCount]);
                chan->downstream(radio);
                Thread* thread = new Thread;