aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorttsou <ttsou@19bc5d8c-e614-43d4-8b26-e1612bc8e597>2013-06-09 22:38:18 +0000
committerAlexander Chemeris <Alexander.Chemeris@gmail.com>2013-06-15 22:29:20 +0400
commitfc40a84d9ba3d798ff51c15d6197ad49e29b3d57 (patch)
tree1e53b5064b125899cc76be253d3c3351d04ca9ed
parent258855c7589b28a86b677139c8c8bbfba7fd5ce9 (diff)
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
-rw-r--r--Transceiver52M/Transceiver.cpp16
-rw-r--r--Transceiver52M/Transceiver.h12
2 files changed, 20 insertions, 8 deletions
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 @@ void Transceiver::setModulus(int timeslot)
case VII:
fillerModulus[timeslot] = 102;
break;
+ case XIII:
+ fillerModulus[timeslot] = 52;
+ break;
default:
break;
}
@@ -268,15 +271,22 @@ Transceiver::CorrType Transceiver::expectedCorrType(GSM::Time currTime)
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;
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 @@ private:
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;