diff options
| author | Alexander Chemeris <Alexander.Chemeris@gmail.com> | 2017-03-17 15:00:34 -0700 |
|---|---|---|
| committer | Alexander Chemeris <Alexander.Chemeris@gmail.com> | 2017-03-24 19:54:04 +0000 |
| commit | f9e78beea545aa207b7bd3f17a83dfa5787490d1 (patch) | |
| tree | 5495fa975d89e03f74f93aad493a4ae6abe6f0fc | |
| parent | f0189c47beb4ccfbbbb805d324d2b7bcb1092653 (diff) | |
Move CorrType type from Transceiver to sigProcLib.
Required to move Transceiver::detectBurst to sigProcLib.
Change-Id: I3e0e74a98bbca4d19657f50a5fb447f078663c9b
| -rw-r--r-- | Transceiver52M/Transceiver.cpp | 6 | ||||
| -rw-r--r-- | Transceiver52M/Transceiver.h | 9 | ||||
| -rw-r--r-- | Transceiver52M/sigProcLib.h | 9 |
3 files changed, 12 insertions, 12 deletions
diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 85dd629..c1a63fd 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -113,7 +113,7 @@ bool TransceiverState::init(int filler, size_t sps, float scale, size_t rtsc, un if ((filler == Transceiver::FILLER_NORM_RAND) || (filler == Transceiver::FILLER_EDGE_RAND)) { - chanType[n] = Transceiver::TSC; + chanType[n] = TSC; } } @@ -452,8 +452,8 @@ void Transceiver::setModulus(size_t timeslot, size_t chan) } -Transceiver::CorrType Transceiver::expectedCorrType(GSM::Time currTime, - size_t chan) +CorrType Transceiver::expectedCorrType(GSM::Time currTime, + size_t chan) { static int tchh_subslot[26] = { 0,1,0,1,0,1,0,1,0,1,0,1,0,0,1,0,1,0,1,0,1,0,1,0,1,1 }; static int sdcch4_subslot[102] = { 3,3,3,3,0,0,2,2,2,2,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,0,0,2,2,2,2, diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h index d9a9708..425b004 100644 --- a/Transceiver52M/Transceiver.h +++ b/Transceiver52M/Transceiver.h @@ -142,15 +142,6 @@ public: LOOPBACK ///< similar go VII, used in loopback testing } ChannelCombination; - /** Codes for burst types of received bursts*/ - typedef enum { - OFF, ///< timeslot is off - TSC, ///< timeslot should contain a normal burst - RACH, ///< timeslot should contain an access burst - EDGE, ///< timeslot should contain an EDGE burst - IDLE ///< timeslot is an idle (or dummy) burst - } CorrType; - enum FillerType { FILLER_DUMMY, FILLER_ZERO, diff --git a/Transceiver52M/sigProcLib.h b/Transceiver52M/sigProcLib.h index ed72430..211e1a9 100644 --- a/Transceiver52M/sigProcLib.h +++ b/Transceiver52M/sigProcLib.h @@ -33,6 +33,15 @@ enum ConvType { UNDEFINED, }; +/** Codes for burst types of received bursts*/ +enum CorrType{ + OFF, ///< timeslot is off + TSC, ///< timeslot should contain a normal burst + RACH, ///< timeslot should contain an access burst + EDGE, ///< timeslot should contain an EDGE burst + IDLE ///< timeslot is an idle (or dummy) burst +}; + enum signalError { SIGERR_NONE, SIGERR_BOUNDS, |