Changeset 3688

Timestamp:

05/30/2012 07:05:12 PM (12 months ago)

Author:

kurtis.heimerl

Message:

Adding MultiARFCN support to core.

Location:

openbts/trunk

Files:

• CLI/CLI.cpp (modified) (2 diffs)
• GSM/GSMConfig.cpp (modified) (2 diffs)
• GSM/GSMConfig.h (modified) (1 diff)
• GSM/GSML1FEC.cpp (modified) (11 diffs)
• GSM/GSML1FEC.h (modified) (24 diffs)
• GSM/GSMLogicalChannel.cpp (modified) (5 diffs)
• GSM/GSMLogicalChannel.h (modified) (6 diffs)
• GSM/PowerManager.cpp (modified) (1 diff)
• TRXManager/TRXManager.cpp (modified) (2 diffs)
• TRXManager/TRXManager.h (modified) (2 diffs)
• apps/OpenBTS.cpp (modified) (8 diffs)

openbts/trunk/CLI/CLI.cpp

@@ -711 +711 @@
         if (argc!=2) return BAD_NUM_ARGS;
 
-        int newGain = gTRX.ARFCN()->setRxGain(atoi(argv[1]));
+        int newGain = gTRX.ARFCN(0)->setRxGain(atoi(argv[1]));
         os << "new RX gain is " << newGain << " dB" << endl;
   
@@ -723 +723 @@
         if (argc!=1) return BAD_NUM_ARGS;
 
-        int noise = gTRX.ARFCN()->getNoiseLevel();
+        int noise = gTRX.ARFCN(0)->getNoiseLevel();
         os << "noise RSSI is -" << noise << " dB wrt full scale" << endl;
         os << "MS RSSI target is " << gConfig.getNum("GSM.Radio.RSSITarget") << " dB wrt full scale" << endl;

openbts/trunk/GSM/GSMConfig.cpp

@@ -288 +288 @@
         LOG_ASSERT(TN!=0);
         LOG(NOTICE) << "Configuring dummy filling on C0T " << TN;
-        ARFCNManager *radio = TRX.ARFCN();
+        ARFCNManager *radio = TRX.ARFCN(0);
         radio->setSlot(TN,0);
 }
 
 
-void GSMConfig::createCombinationI(TransceiverManager& TRX, unsigned TN)
-{
-        LOG_ASSERT(TN!=0);
-        LOG(NOTICE) << "Configuring combination I on C0T" << TN;
-        ARFCNManager *radio = TRX.ARFCN();
+void GSMConfig::createCombinationI(TransceiverManager& TRX, unsigned CN, unsigned TN)
+{
+        LOG_ASSERT((CN!=0)||(TN!=0));
+        LOG(NOTICE) << "Configuring combination I on C" << CN << "T" << TN;
+        ARFCNManager *radio = TRX.ARFCN(CN);
         radio->setSlot(TN,1);
-        TCHFACCHLogicalChannel* chan = new TCHFACCHLogicalChannel(TN,gTCHF_T[TN]);
+        TCHFACCHLogicalChannel* chan = new TCHFACCHLogicalChannel(CN,TN,gTCHF_T[TN]);
         chan->downstream(radio);
         Thread* thread = new Thread;
@@ -309 +309 @@
 
 
-void GSMConfig::createCombinationVII(TransceiverManager& TRX, unsigned TN)
-{
-        LOG_ASSERT(TN!=0);
-        LOG(NOTICE) << "Configuring combination VII on C0T" << TN;
-        ARFCNManager *radio = TRX.ARFCN();
+void GSMConfig::createCombinationVII(TransceiverManager& TRX, unsigned CN, unsigned TN)
+{
+        LOG_ASSERT((CN!=0)||(TN!=0));
+        LOG(NOTICE) << "Configuring combination VII on C" << CN << "T" << TN;
+        ARFCNManager *radio = TRX.ARFCN(CN);
         radio->setSlot(TN,7);
         for (int i=0; i<8; i++) {
-                SDCCHLogicalChannel* chan = new SDCCHLogicalChannel(TN,gSDCCH8[i]);
+                SDCCHLogicalChannel* chan = new SDCCHLogicalChannel(CN,TN,gSDCCH8[i]);
                 chan->downstream(radio);
                 Thread* thread = new Thread;

openbts/trunk/GSM/GSMConfig.h

@@ -269 +269 @@
         void createCombination0(TransceiverManager &TRX, unsigned TN);
         /** Combination I is full rate traffic. */
-        void createCombinationI(TransceiverManager &TRX, unsigned TN);
+        void createCombinationI(TransceiverManager &TRX, unsigned CN, unsigned TN);
         /** Combination VII is 8 SDCCHs. */
-        void createCombinationVII(TransceiverManager &TRX, unsigned TN);
+        void createCombinationVII(TransceiverManager &TRX, unsigned CN, unsigned TN);
         //@}
 

openbts/trunk/GSM/GSML1FEC.cpp

@@ -182 +182 @@
 
 
-L1Encoder::L1Encoder(unsigned wTN, const TDMAMapping& wMapping, L1FEC *wParent)
+L1Encoder::L1Encoder(unsigned wCN, unsigned wTN, const TDMAMapping& wMapping, L1FEC *wParent)
         :mDownstream(NULL),
-        mTN(wTN),
+        mCN(wCN),mTN(wTN),
         mMapping(wMapping),
         mTSC(gBTS.BCC()),                               // Note that TSC is hardcoded to the BCC.
@@ -193 +193 @@
         mRunning(false),mActive(false)
 {
+        assert(mCN<gConfig.getNum("GSM.Radio.ARFCNs"));
         assert(mMapping.allowedSlot(mTN));
         assert(mMapping.downlink());
@@ -201 +202 @@
         ostringstream ss;
         ss << wMapping.typeAndOffset();
-        sprintf(mDescriptiveString,"C0T%d %s", wTN, ss.str().c_str());
+        sprintf(mDescriptiveString,"C%dT%d %s", wCN, wTN, ss.str().c_str());
 }
 
@@ -298 +299 @@
         // For Cn, don't do anything.
         resync();
+        if (mCN!=0) return;
         for (unsigned i=0; i<mMapping.numFrames(); i++) {
                 mFillerBurst.time(mNextWriteTime);
@@ -523 +525 @@
 
 XCCHL1Decoder::XCCHL1Decoder(
+                unsigned wCN,
                 unsigned wTN,
                 const TDMAMapping& wMapping,
                 L1FEC *wParent)
-        :L1Decoder(wTN,wMapping,wParent),
+        :L1Decoder(wCN,wTN,wMapping,wParent),
         mBlockCoder(0x10004820009ULL, 40, 224),
         mC(456), mU(228),
@@ -731 +734 @@
 
 XCCHL1Encoder::XCCHL1Encoder(
+                unsigned wCN,
                 unsigned wTN,
                 const TDMAMapping& wMapping,
                 L1FEC* wParent)
-        :L1Encoder(wTN,wMapping,wParent),
+        :L1Encoder(wCN,wTN,wMapping,wParent),
         mBlockCoder(0x10004820009ULL, 40, 224),
         mC(456), mU(228),
@@ -919 +923 @@
 
 SCHL1Encoder::SCHL1Encoder(L1FEC* wParent)
-        :GeneratorL1Encoder(0,gSCHMapping,wParent),
+        :GeneratorL1Encoder(0,0,gSCHMapping,wParent),
         mBlockCoder(0x0575,10,25),
         mU(25+10+4), mE(78),
@@ -966 +970 @@
 
 FCCHL1Encoder::FCCHL1Encoder(L1FEC *wParent)
-        :GeneratorL1Encoder(0,gFCCHMapping,wParent)
+        :GeneratorL1Encoder(0,0,gFCCHMapping,wParent)
 {
         mBurst.zero();
@@ -1037 +1041 @@
 
 TCHFACCHL1Decoder::TCHFACCHL1Decoder(
+        unsigned wCN,
         unsigned wTN,
         const TDMAMapping& wMapping,
         L1FEC *wParent)
-        :XCCHL1Decoder(wTN, wMapping, wParent),
+        :XCCHL1Decoder(wCN,wTN, wMapping, wParent),
         mTCHU(189),mTCHD(260),
         mClass1_c(mC.head(378)),mClass1A_d(mTCHD.head(50)),mClass2_c(mC.segment(378,78)),
@@ -1242 +1247 @@
 
 TCHFACCHL1Encoder::TCHFACCHL1Encoder(
+        unsigned wCN,
         unsigned wTN,
         const TDMAMapping& wMapping,
         L1FEC *wParent)
-        :XCCHL1Encoder(wTN, wMapping, wParent), 
+        :XCCHL1Encoder(wCN, wTN, wMapping, wParent), 
         mPreviousFACCH(false),mOffset(0),
         mTCHU(189),mTCHD(260),
@@ -1526 +1532 @@
 
 
-SACCHL1Encoder::SACCHL1Encoder(unsigned wTN, const TDMAMapping& wMapping, SACCHL1FEC *wParent)
-        :XCCHL1Encoder(wTN,wMapping,(L1FEC*)wParent),
+SACCHL1Encoder::SACCHL1Encoder(unsigned wCN, unsigned wTN, const TDMAMapping& wMapping, SACCHL1FEC *wParent)
+        :XCCHL1Encoder(wCN,wTN,wMapping,(L1FEC*)wParent),
         mSACCHParent(wParent),
         mOrderedMSPower(33),mOrderedMSTiming(0)

openbts/trunk/GSM/GSML1FEC.h

@@ -93 +93 @@
         //@{
         const TDMAMapping& mMapping;    ///< multiplexing description
+        unsigned mCN;                                   ///< carrier index
         unsigned mTN;                                   ///< timeslot number to use
         unsigned mTSC;                                  ///< training sequence for this channel
@@ -120 +121 @@
         /**
                 The basic encoder constructor.
+                @param wCN carrier index.
                 @param wTN TDMA timeslot number.
                 @param wMapping TDMA mapping onto the timeslot -- MUST PERSIST.
                 @param wParent The containing L1FEC, for sibling access -- may be NULL.
         */
-        L1Encoder(unsigned wTN, const TDMAMapping& wMapping, L1FEC *wParent);
+        L1Encoder(unsigned wCN, unsigned wTN, const TDMAMapping& wMapping, L1FEC *wParent);
 
         virtual ~L1Encoder() {}
@@ -140 +142 @@
         /**@name Components of the channel description. */
         //@{
+        unsigned CN() const { return mCN; }
         unsigned TN() const { return mTN; }
         unsigned TSC() const { return mTSC; }
@@ -232 +235 @@
         /**@name Parameters fixed by the constructor, not requiring mutex protection. */
         //@{
+        unsigned mCN;                                   ///< carrier index
         unsigned mTN;                                   ///< timeslot number 
         const TDMAMapping& mMapping;    ///< demux parameters
@@ -248 +252 @@
                 @param wParent The containing L1FEC, for sibling access.
         */
-        L1Decoder(unsigned wTN, const TDMAMapping& wMapping, L1FEC* wParent)
+        L1Decoder(unsigned wCN, unsigned wTN, const TDMAMapping& wMapping, L1FEC* wParent)
                         :mUpstream(NULL),
                         mT3101(T3101ms),mT3109(T3109ms),mT3111(T3111ms),
@@ -254 +258 @@
                         mRunning(false),
                         mFER(0.0F),
-                        mTN(wTN),
+                        mCN(wCN),mTN(wTN),
                         mMapping(wMapping),mParent(wParent)
         {
@@ -383 +387 @@
         unsigned TN() const
                 { assert(mEncoder); return mEncoder->TN(); }
+
+        unsigned CN() const
+                { assert(mEncoder); return mEncoder->CN(); }
 
         unsigned TSC() const
@@ -459 +466 @@
         RACHL1Decoder(const TDMAMapping &wMapping,
                 L1FEC *wParent)
-                :L1Decoder(0,wMapping,wParent),
+                :L1Decoder(0,0,wMapping,wParent),
                 mParity(0x06f,6,8),mU(18),mD(mU.head(8))
         { }
@@ -501 +508 @@
         public:
 
-        XCCHL1Decoder(unsigned wTN, const TDMAMapping& wMapping,
+        XCCHL1Decoder(unsigned wCN, unsigned wTN, const TDMAMapping& wMapping,
                 L1FEC *wParent);
 
@@ -549 +556 @@
 
         SDCCHL1Decoder(
+                unsigned wCN,
                 unsigned wTN,
                 const TDMAMapping& wMapping,
                 L1FEC *wParent)
-                :XCCHL1Decoder(wTN,wMapping,wParent)
+                :XCCHL1Decoder(wCN,wTN,wMapping,wParent)
         { }
 
@@ -580 +588 @@
 
         SACCHL1Decoder(
+                unsigned wCN,
                 unsigned wTN,
                 const TDMAMapping& wMapping,
                 SACCHL1FEC *wParent)
-                :XCCHL1Decoder(wTN,wMapping,(L1FEC*)wParent),
+                :XCCHL1Decoder(wCN,wTN,wMapping,(L1FEC*)wParent),
                 mSACCHParent(wParent),
                 mRSSICounter(0)
@@ -654 +663 @@
 
         XCCHL1Encoder(
+                unsigned wCN,
                 unsigned wTN,
                 const TDMAMapping& wMapping,
@@ -721 +731 @@
 public:
 
-        TCHFACCHL1Encoder(unsigned wTN, 
+        TCHFACCHL1Encoder(unsigned wCN, unsigned wTN, 
                           const TDMAMapping& wMapping,
                           L1FEC* wParent);
@@ -781 +791 @@
         public:
 
-        TCHFACCHL1Decoder(unsigned wTN, 
+        TCHFACCHL1Decoder(unsigned wCN, unsigned wTN, 
                            const TDMAMapping& wMapping,
                            L1FEC *wParent);
@@ -837 +847 @@
 
         GeneratorL1Encoder(     
+                unsigned wCN,
                 unsigned wTN,
                 const TDMAMapping& wMapping,
                 L1FEC* wParent)
-                :L1Encoder(wTN,wMapping,wParent)
+                :L1Encoder(wCN,wTN,wMapping,wParent)
         { }
 
@@ -925 +936 @@
 
         NDCCHL1Encoder(
+                unsigned wCN,
                 unsigned wTN,
                 const TDMAMapping& wMapping,
                 L1FEC *wParent)
-                :XCCHL1Encoder(wTN, wMapping, wParent)
+                :XCCHL1Encoder(wCN, wTN, wMapping, wParent)
         { }
 
@@ -955 +967 @@
 
         BCCHL1Encoder(L1FEC *wParent)
-                :NDCCHL1Encoder(0,gBCCHMapping,wParent)
+                :NDCCHL1Encoder(0,0,gBCCHMapping,wParent)
         {}
 
@@ -984 +996 @@
         public:
 
-        SACCHL1Encoder(unsigned wTN, const TDMAMapping& wMapping, SACCHL1FEC *wParent);
+        SACCHL1Encoder(unsigned wCN, unsigned wTN, const TDMAMapping& wMapping, SACCHL1FEC *wParent);
 
         void orderedMSPower(int power) { mOrderedMSPower = power; }
@@ -1022 +1034 @@
         CCCHL1Encoder(const TDMAMapping& wMapping,
                         L1FEC* wParent)
-                :XCCHL1Encoder(0,wMapping,wParent)
+                :XCCHL1Encoder(0,0,wMapping,wParent)
         {}
 
@@ -1028 +1040 @@
 
 
+/** Cell Broadcast Channel (CBCH). */
+class CBCHL1Encoder : public XCCHL1Encoder {
+
+        public:
+
+        CBCHL1Encoder(const TDMAMapping& wMapping,
+                        L1FEC* wParent)
+                :XCCHL1Encoder(0,0,wMapping,wParent)
+        {}
+
+        /** Override sendFrame to meet sync requirements of GSM 05.02 6.5.4. */
+        virtual void sendFrame(const L2Frame&);
+
+};
+
+
+
 
 
@@ -1036 +1065 @@
 
         SDCCHL1FEC(
+                unsigned wCN,
                 unsigned wTN,
                 const MappingPair& wMapping)
                 :L1FEC()
         {
-                mEncoder = new SDCCHL1Encoder(wTN,wMapping.downlink(),this);
-                mDecoder = new SDCCHL1Decoder(wTN,wMapping.uplink(),this);
-        }
-};
-
+                mEncoder = new SDCCHL1Encoder(wCN,wTN,wMapping.downlink(),this);
+                mDecoder = new SDCCHL1Decoder(wCN,wTN,wMapping.uplink(),this);
+        }
+};
+
+
+
+
+
+
+class CBCHL1FEC : public L1FEC {
+
+        public:
+
+        CBCHL1FEC(const MappingPair& wMapping)
+                :L1FEC()
+        {
+                mEncoder = new CBCHL1Encoder(wMapping.downlink(),this);
+        }
+};
 
 
@@ -1066 +1111 @@
 
         TCHFACCHL1FEC(
+                unsigned wCN,
                 unsigned wTN,
                 const MappingPair& wMapping)
                 :L1FEC()
         {
-                mTCHEncoder = new TCHFACCHL1Encoder(wTN, wMapping.downlink(), this );
+                mTCHEncoder = new TCHFACCHL1Encoder(wCN, wTN, wMapping.downlink(), this );
                 mEncoder = mTCHEncoder;
-                mTCHDecoder = new TCHFACCHL1Decoder(wTN, wMapping.uplink(), this );     
+                mTCHDecoder = new TCHFACCHL1Decoder(wCN, wTN, wMapping.uplink(), this );        
                 mDecoder = mTCHDecoder;
         }
@@ -1108 +1154 @@
 
         SACCHL1FEC(
+                unsigned wCN,
                 unsigned wTN,
                 const MappingPair& wMapping)
                 :L1FEC()
         {
-                mSACCHEncoder = new SACCHL1Encoder(wTN,wMapping.downlink(),this);
+                mSACCHEncoder = new SACCHL1Encoder(wCN,wTN,wMapping.downlink(),this);
                 mEncoder = mSACCHEncoder;
-                mSACCHDecoder = new SACCHL1Decoder(wTN,wMapping.uplink(),this);
+                mSACCHDecoder = new SACCHL1Decoder(wCN,wTN,wMapping.uplink(),this);
                 mDecoder = mSACCHDecoder;
         }
@@ -1143 +1190 @@
         public:
 
-        LoopbackL1FEC(unsigned wTN)
+        LoopbackL1FEC(unsigned wCN, unsigned wTN)
                 :L1FEC()
         {
-                mEncoder = new XCCHL1Encoder(wTN,gLoopbackTestFullMapping,this);
-                mDecoder = new SDCCHL1Decoder(wTN,gLoopbackTestFullMapping,this);
+                mEncoder = new XCCHL1Encoder(wCN,wTN,gLoopbackTestFullMapping,this);
+                mDecoder = new SDCCHL1Decoder(wCN,wTN,gLoopbackTestFullMapping,this);
         }
 };

openbts/trunk/GSM/GSMLogicalChannel.cpp

@@ -164 +164 @@
 
 SDCCHLogicalChannel::SDCCHLogicalChannel(
+                unsigned wCN,
                 unsigned wTN,
                 const CompleteMapping& wMapping)
 {
-        mL1 = new SDCCHL1FEC(wTN,wMapping.LCH());
+        mL1 = new SDCCHL1FEC(wCN,wTN,wMapping.LCH());
         // SAP0 is RR/MM/CC, SAP3 is SMS
         // SAP1 and SAP2 are not used.
@@ -176 +177 @@
         mL2[0] = SAP0L2;
         mL2[3] = SAP3L2;
-        mSACCH = new SACCHLogicalChannel(wTN,wMapping.SACCH());
+        mSACCH = new SACCHLogicalChannel(wCN,wTN,wMapping.SACCH());
         connect();
 }
@@ -185 +186 @@
 
 SACCHLogicalChannel::SACCHLogicalChannel(
+                unsigned wCN,
                 unsigned wTN,
                 const MappingPair& wMapping)
                 : mRunning(false)
 {
-        mSACCHL1 = new SACCHL1FEC(wTN,wMapping);
+        mSACCHL1 = new SACCHL1FEC(wCN,wTN,wMapping);
         mL1 = mSACCHL1;
         // SAP0 is RR, SAP3 is SMS
@@ -350 +352 @@
 
 TCHFACCHLogicalChannel::TCHFACCHLogicalChannel(
+                unsigned wCN,
                 unsigned wTN,
                 const CompleteMapping& wMapping)
 {
-        mTCHL1 = new TCHFACCHL1FEC(wTN,wMapping.LCH());
+        mTCHL1 = new TCHFACCHL1FEC(wCN,wTN,wMapping.LCH());
         mL1 = mTCHL1;
         // SAP0 is RR/MM/CC, SAP3 is SMS
@@ -359 +362 @@
         mL2[0] = new FACCHL2(1,0);
         mL2[3] = new FACCHL2(1,3);
-        mSACCH = new SACCHLogicalChannel(wTN,wMapping.SACCH());
+        mSACCH = new SACCHLogicalChannel(wCN,wTN,wMapping.SACCH());
         connect();
 }

openbts/trunk/GSM/GSMLogicalChannel.h

@@ -221 +221 @@
         //@{
         /** Carrier index. */
-        unsigned CN() const { return 0; }
+        unsigned CN() const { assert(mL1); return mL1->CN(); }
         /** Slot number. */
         unsigned TN() const { assert(mL1); return mL1->TN(); }
@@ -297 +297 @@
         
         SDCCHLogicalChannel(
+                unsigned wCN,
                 unsigned wTN,
                 const CompleteMapping& wMapping);
@@ -361 +362 @@
 
         SACCHLogicalChannel(
+                unsigned wCN,
                 unsigned wTN,
                 const MappingPair& wMapping);
@@ -467 +469 @@
 
         TCHFACCHLogicalChannel(
+                unsigned wCN,
                 unsigned wTN,
                 const CompleteMapping& wMapping);
@@ -532 +535 @@
         public : 
       SDCCHLogicalChannel_LB(
+                unsigned wCN,
                 unsigned wTN,
                 const CompleteMapping& wMapping);
@@ -542 +546 @@
         /** Custom constructor, L2 is Uplink instead of downlink. */
         TCHFACCHLogicalChannel_UPLINK(
+                unsigned wCN,
                 unsigned wTN, 
                 const CompleteMapping& wMapping);

openbts/trunk/GSM/PowerManager.cpp

@@ -125 +125 @@
 void PowerManager::start()
 {
-        mRadio = gTRX.ARFCN();
+        mRadio = gTRX.ARFCN(0);
         mRadio->setPower(mAtten);
         mThread.start((void*(*)(void*))PowerManagerServiceLoopAdapter,this);

openbts/trunk/TRXManager/TRXManager.cpp

@@ -46 +46 @@
 
 
-TransceiverManager::TransceiverManager(const char* wTRXAddress, int wBasePort)
+TransceiverManager::TransceiverManager(int numARFCNs,
+                const char* wTRXAddress, int wBasePort)
         :mHaveClock(false),
         mClockSocket(wBasePort+100)
 {
-        // set up the ARFCN manager
-        mARFCN = new ::ARFCNManager(wTRXAddress,wBasePort+1,*this);
+        // set up the ARFCN managers
+        for (int i=0; i<numARFCNs; i++) {
+                int thisBasePort = wBasePort + 1 + 2*i;
+                mARFCNs.push_back(new ::ARFCNManager(wTRXAddress,thisBasePort,*this));
+        }
 }
 
@@ -59 +63 @@
 {
         mClockThread.start((void*(*)(void*))ClockLoopAdapter,this);
-        mARFCN->start();
+        for (unsigned i=0; i<mARFCNs.size(); i++) {
+                mARFCNs[i]->start();
+        }
 }
 

openbts/trunk/TRXManager/TRXManager.h

@@ -59 +59 @@
         private:
 
-        /// the ARFCN mananger under this TRX
-        ARFCNManager* mARFCN;
+        /// the ARFCN manangers under this TRX
+        std::vector<ARFCNManager*> mARFCNs;             
 
         /// set true when the first CLOCK packet is received
@@ -74 +74 @@
         /**
                 Construct a TransceiverManager.
+                @param numARFCNs Number of ARFCNs supported by the transceiver.
                 @param wTRXAddress IP address of the transceiver.
                 @param wBasePort The base port for the interface, as defined in README.TRX.
         */
-        TransceiverManager(const char* wTRXAddress, int wBasePort);
+        TransceiverManager(int numARFCNs,
+                const char* wTRXAddress, int wBasePort);
 
         /**@name Accessors. */
         //@{
-        ARFCNManager* ARFCN() { return mARFCN; }
+        ARFCNManager* ARFCN(unsigned i) { assert(i<mARFCNs.size()); return mARFCNs.at(i); }
         //@}
+
+        unsigned numARFCNs() const { return mARFCNs.size(); }
+
+        /** Block until the clock is set over the UDP link. */
+        //void waitForClockInit() const;
 
         /** Start the clock management thread and all ARFCN managers. */

openbts/trunk/apps/OpenBTS.cpp

@@ -92 +92 @@
 
 // Our interface to the software-defined radio.
-TransceiverManager gTRX(gConfig.getStr("TRX.IP").c_str(), gConfig.getNum("TRX.Port"));
+TransceiverManager gTRX(gConfig.getNum("GSM.Radio.ARFCNs"), gConfig.getStr("TRX.IP").c_str(), gConfig.getNum("TRX.Port"));
 
 // Subscriber registry
@@ -117 +117 @@
         // If the path is not defined, the transceiver must be started by some other process.
         char TRXnumARFCN[4];
-        sprintf(TRXnumARFCN,"%1d",1);
+        sprintf(TRXnumARFCN,"%1d",gConfig.getNum("GSM.Radio.ARFCNs"));
         LOG(NOTICE) << "starting transceiver " << transceiverPath << " " << TRXnumARFCN;
         gTransceiverPid = vfork();
@@ -176 +176 @@
         // Set up the interface to the radio.
         // Get a handle to the C0 transceiver interface.
-        ARFCNManager* C0radio = gTRX.ARFCN();
+        ARFCNManager* C0radio = gTRX.ARFCN(0);
 
         // Tuning.
@@ -183 +183 @@
         // Get the ARFCN list.
         unsigned C0 = gConfig.getNum("GSM.Radio.C0");
-        // Tune the radio.
-        LOG(INFO) << "tuning TRX to ARFCN " << C0;
-        ARFCNManager* radio = gTRX.ARFCN();
-        radio->tune(C0);
+        unsigned numARFCNs = gConfig.getNum("GSM.Radio.ARFCNs");
+        for (unsigned i=0; i<numARFCNs; i++) {
+                // Tune the radios.
+                unsigned ARFCN = C0 + i*2;
+                LOG(INFO) << "tuning TRX " << i << " to ARFCN " << ARFCN;
+                ARFCNManager* radio = gTRX.ARFCN(i);
+                radio->tune(ARFCN);
+        }
 
         // Set TSC same as BCC everywhere.
@@ -240 +244 @@
         // C-V C0T0 SDCCHs
         SDCCHLogicalChannel C0T0SDCCH[4] = {
-                SDCCHLogicalChannel(0,gSDCCH_4_0),
-                SDCCHLogicalChannel(0,gSDCCH_4_1),
-                SDCCHLogicalChannel(0,gSDCCH_4_2),
-                SDCCHLogicalChannel(0,gSDCCH_4_3),
+                SDCCHLogicalChannel(0,0,gSDCCH_4_0),
+                SDCCHLogicalChannel(0,0,gSDCCH_4_1),
+                SDCCHLogicalChannel(0,0,gSDCCH_4_2),
+                SDCCHLogicalChannel(0,0,gSDCCH_4_3),
         };
         Thread C0T0SDCCHControlThread[4];
@@ -264 +268 @@
                 // Create C-I slots.
                 for (int i=0; i<gConfig.getNum("GSM.Channels.NumC1s"); i++) {
-                        gBTS.createCombinationI(gTRX,sCount);
+                        gBTS.createCombinationI(gTRX,sCount/8,sCount%8);
                         sCount++;
                 }
@@ -271 +275 @@
         // Create C-VII slots.
         for (int i=0; i<gConfig.getNum("GSM.Channels.NumC7s"); i++) {
-                gBTS.createCombinationVII(gTRX,sCount);
+                gBTS.createCombinationVII(gTRX,sCount/8,sCount%8);
                 sCount++;
         }
@@ -278 +282 @@
                 // Create C-I slots.
                 for (int i=0; i<gConfig.getNum("GSM.Channels.NumC1s"); i++) {
-                        gBTS.createCombinationI(gTRX,sCount);
+                        gBTS.createCombinationI(gTRX,sCount/8,sCount%8);
                         sCount++;
                 }