commit fc40a84d9ba3d798ff51c15d6197ad49e29b3d57
author ttsou <ttsou@19bc5d8c-e614-43d4-8b26-e1612bc8e597> Sun Jun 09 22:38:18 2013 +0000
committer Alexander Chemeris <Alexander.Chemeris@gmail.com> Sat Jun 15 22:29:20 2013 +0400
tree 1e53b5064b125899cc76be253d3c3351d04ca9ed
parent 258855c7589b28a86b677139c8c8bbfba7fd5ce9

Transceiver52M: Add more complete specification of GPRS types

Submitted by: Ivan Kluchnikov <kluchnikovi@gmail.com>
Signed-off-by: Thomas Tsou <tom@tsou.cc>

git-svn-id: http://wush.net/svn/range/software/public/openbts/trunk@5690 19bc5d8c-e614-43d4-8b26-e1612bc8e597

Transceiver52M/Transceiver.cpp

diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp
index 2376e3d..bdc8aff 100644
--- a/Transceiver52M/Transceiver.cpp
+++ b/Transceiver52M/Transceiver.cpp
@@ -214,6 +214,9 @@
   case VII:
     fillerModulus[timeslot] = 102;
     break;
+  case XIII:
+    fillerModulus[timeslot] = 52;
+    break;
   default:
     break;
   }
@@ -268,15 +271,22 @@
     else
       return TSC;
     break;
+  case XIII: {
+    int mod52 = burstFN % 52;
+    if ((mod52 == 12) || (mod52 == 38))
+      return RACH;
+    else if ((mod52 == 25) || (mod52 == 51))
+      return IDLE;
+    else
+      return TSC;
+    break;
+  }
   case LOOPBACK:
     if ((burstFN % 51 <= 50) && (burstFN % 51 >=48))
       return IDLE;
     else
       return TSC;
     break;
-  case XIII:
-    return TSC;
-      break;
   default:
     return OFF;
     break;

Transceiver52M/Transceiver.h

diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h
index 8df29e5..30eb7b9 100644
--- a/Transceiver52M/Transceiver.h
+++ b/Transceiver52M/Transceiver.h
@@ -86,12 +86,14 @@
     V,                  ///< FCCH+SCH+CCCH+BCCH+SDCCH/4+SACCH/4, uplink RACH+SDCCH/4
     VI,                 ///< CCCH+BCCH, uplink RACH
     VII,                ///< SDCCH/8 + SACCH/8
+    VIII,               ///< TCH/F + FACCH/F + SACCH/M
+    IX,                 ///< TCH/F + SACCH/M
+    X,                  ///< TCH/FD + SACCH/MD
+    XI,                 ///< PBCCH+PCCCH+PDTCH+PACCH+PTCCH
+    XII,                ///< PCCCH+PDTCH+PACCH+PTCCH
+    XIII,               ///< PDTCH+PACCH+PTCCH
     NONE,               ///< Channel is inactive, default
-    LOOPBACK,           ///< similar go VII, used in loopback testing

-    X,
-    XI,
-    XII,
-    XIII
+    LOOPBACK            ///< similar go VII, used in loopback testing
   } ChannelCombination;