[PATCH] osmo-trx[master]: Move CorrType type from Transceiver to sigProcLib.

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Alexander Chemeris gerrit-no-reply at lists.osmocom.org
Wed Mar 22 18:44:18 UTC 2017


Review at  https://gerrit.osmocom.org/2146

Move CorrType type from Transceiver to sigProcLib.

Required to move Transceiver::detectBurst to sigProcLib.

Change-Id: I3e0e74a98bbca4d19657f50a5fb447f078663c9b
---
M Transceiver52M/Transceiver.cpp
M Transceiver52M/Transceiver.h
M Transceiver52M/sigProcLib.h
3 files changed, 12 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/46/2146/1

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 @@
 
     if ((filler == Transceiver::FILLER_NORM_RAND) ||
         (filler == Transceiver::FILLER_EDGE_RAND)) {
-        chanType[n] = Transceiver::TSC;
+        chanType[n] = TSC;
     }
   }
 
@@ -452,8 +452,8 @@
 }
 
 
-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 @@
     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 @@
   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,

-- 
To view, visit https://gerrit.osmocom.org/2146
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e0e74a98bbca4d19657f50a5fb447f078663c9b
Gerrit-PatchSet: 1
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Alexander Chemeris <Alexander.Chemeris at gmail.com>



More information about the gerrit-log mailing list