[Commit-gnuradio] r10008 - in openbts/branches/developers/dburgess00/trunk: Control Transceiver

[dburgess00]

Author: dburgess00
Date: 2008-11-16 22:26:23 -0700 (Sun, 16 Nov 2008)
New Revision: 10008

Modified:
   openbts/branches/developers/dburgess00/trunk/Control/CallControl.cpp
   openbts/branches/developers/dburgess00/trunk/Control/RadioResource.cpp
   openbts/branches/developers/dburgess00/trunk/Transceiver/USRPDevice.cpp
   openbts/branches/developers/dburgess00/trunk/Transceiver/radioInterface.cpp
Log:
Changes to debugging messages.


Modified: openbts/branches/developers/dburgess00/trunk/Control/CallControl.cpp
===================================================================
--- openbts/branches/developers/dburgess00/trunk/Control/CallControl.cpp        
2008-11-17 05:25:03 UTC (rev 10007)
+++ openbts/branches/developers/dburgess00/trunk/Control/CallControl.cpp        
2008-11-17 05:26:23 UTC (rev 10008)
@@ -529,6 +529,7 @@
        unsigned transactionID = gTransactionTable.add(transaction);
        SDCCH->transactionID(transactionID);
        TCH->transactionID(transactionID);
+       CLDCOUT("MOC: transaction: " << transaction);
 
        // At this point, we have enough information start the SIP call setup.
        // We have 2 seconds to repsond to the MS.  ITU-T Q.931 Table 9-1, T303.
@@ -547,6 +548,7 @@
 
        // The transaction is moving on to the MOCController.
        gTransactionTable.update(transaction);
+       CLDCOUT("MOC: transaction: " << transaction);
        // This call also opens the TCH.
        assignTCHF(SDCCH,TCH);
 }
@@ -560,7 +562,7 @@
 */
 void Control::MOCController(TransactionEntry& transaction, 
TCHFACCHLogicalChannel* TCH)
 {
-       CLDCOUT("MOC: transaction ID " << transaction.ID());
+       CLDCOUT("MOC: transaction: " << transaction);
        unsigned L3TI = transaction.TIValue();
 
        // Once we can start SIP call setup, send Call Proceeding.
@@ -734,6 +736,7 @@
 
        // The transaction is moving to the MTCController.
        gTransactionTable.update(transaction);
+       CLDCOUT("MTC: transaction: " << transaction);
        assignTCHF(SDCCH,TCH);
 }
 
@@ -744,7 +747,7 @@
        // Early Assignment Mobile Terminated Call. 
        // Transaction table in 04.08 7.3.3 figure 7.10a
 
-       CLDCOUT("MTC:, transaction ID " << transaction.ID());
+       CLDCOUT("MTC: transaction: " << transaction);
        unsigned L3TI = transaction.TIValue();
 
        // Get the alerting message.
@@ -826,7 +829,7 @@
        
        sleep(1);
        TLMessage * msg = tl_proc.mUplinkFIFO.read();
-       DCOUT(" ControlLayer SMS = "<<*msg)
+       CLDCOUT(" ControlLayer SMS = "<<*msg)
        sleep(1);
        tl_proc.writeHighSide( SubmitReport("08162312394401"), SM_RL_REPORT_REQ 
);
        

Modified: openbts/branches/developers/dburgess00/trunk/Control/RadioResource.cpp
===================================================================
--- openbts/branches/developers/dburgess00/trunk/Control/RadioResource.cpp      
2008-11-17 05:25:03 UTC (rev 10007)
+++ openbts/branches/developers/dburgess00/trunk/Control/RadioResource.cpp      
2008-11-17 05:26:23 UTC (rev 10008)
@@ -82,6 +82,7 @@
        // GSM 04.08 3.3.1.1.3.
        // Given a request reference, try to allocate a channel
        // and send the assignment to the handset on the CCCH.
+       // Papa Legba, open that door...
 
        CLDCOUT("AccessGrantResponder RA=" << RA << " when=" << when);
 
@@ -98,6 +99,9 @@
        CCCHLogicalChannel *AGCH = gBTS.getAGCH();
        assert(AGCH);
 
+       // FIXME -- We are ASSUMING that SDCCH is OK.
+       // The truth is that we should decode according GSM 04.08 9.1.8, Table 
9.9a.
+
        // Get an SDCCH to assign to.
        SDCCHLogicalChannel *SDCCH = gBTS.getSDCCH();
 
@@ -107,7 +111,7 @@
                // Emergency calls are not subject to T3122 hold-off.
                // They are not handled as a special case because the
                // MS will ignore the T3122 setting.
-               CERR("NOTICE -- SDCCH CONGESTION");
+               CERR("NOTICE -- Access Grant CONGESTION");
                unsigned waitTime = curT3122()/1000;
                CLDCOUT("AccessGrantResponder: assginment reject, wait time " 
<< waitTime);
                const L3ImmediateAssignmentReject 
reject(L3RequestReference(RA,when),waitTime);

Modified: 
openbts/branches/developers/dburgess00/trunk/Transceiver/USRPDevice.cpp
===================================================================
--- openbts/branches/developers/dburgess00/trunk/Transceiver/USRPDevice.cpp     
2008-11-17 05:25:03 UTC (rev 10007)
+++ openbts/branches/developers/dburgess00/trunk/Transceiver/USRPDevice.cpp     
2008-11-17 05:26:23 UTC (rev 10008)
@@ -31,8 +31,9 @@
 #include <stdlib.h>
 #include "Threads.h"
 #include "USRPDevice.h"
-#define DEBUG 0
 
+#define NDEBUG
+
 using namespace std;
 
 string write_it(unsigned v) {
@@ -332,7 +333,7 @@
       }
       if ((word0 >> 28) & 0x04) {
        if (underrun) *underrun = true; 
-       CERR("UNDERRUN!");
+       CERR("WARNING -- UNDERRUN in TRX->USRP interface");
       }
       if (RSSI) *RSSI = (word0 >> 21) & 0x3f;
       if (!currLen && (pktTimestamp + payloadSz/2/sizeof(short) > timestamp + 
10000))

Modified: 
openbts/branches/developers/dburgess00/trunk/Transceiver/radioInterface.cpp
===================================================================
--- openbts/branches/developers/dburgess00/trunk/Transceiver/radioInterface.cpp 
2008-11-17 05:25:03 UTC (rev 10007)
+++ openbts/branches/developers/dburgess00/trunk/Transceiver/radioInterface.cpp 
2008-11-17 05:26:23 UTC (rev 10008)
@@ -22,7 +22,7 @@
 
 #include "radioInterface.h"
 
-#define DEBUG 0
+#define NDEBUG
 
 GSM::Time VectorQueue::nextTime() const
 {