From d734e2d63485b260235c7694622f671b78dbbe6d Mon Sep 17 00:00:00 2001 From: Alexander Chemeris Date: Sun, 16 Jun 2013 14:30:58 +0400 Subject: Fix build of the Transceiver. --- Transceiver52M/Transceiver.cpp | 2 ++ Transceiver52M/radioInterface.h | 2 ++ Transceiver52M/radioVector.h | 1 + Transceiver52M/sigProcLib.cpp | 2 ++ Transceiver52M/sigProcLib.h | 5 +---- Transceiver52M/sigProcLibTest.cpp | 2 ++ 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index bdc8aff..d030a48 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -36,6 +36,8 @@ #include "config.h" #endif +using namespace GSM; + #define USB_LATENCY_INTRVL 10,0 #if USE_UHD diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h index cac20de..6e15a1f 100644 --- a/Transceiver52M/radioInterface.h +++ b/Transceiver52M/radioInterface.h @@ -26,6 +26,8 @@ #define INCHUNK (625) #define OUTCHUNK (625) +static const unsigned gSlotLen = 148; ///< number of symbols per slot, not counting guard periods + /** class to interface the transceiver with the USRP */ class RadioInterface { diff --git a/Transceiver52M/radioVector.h b/Transceiver52M/radioVector.h index 2975a73..8de4493 100644 --- a/Transceiver52M/radioVector.h +++ b/Transceiver52M/radioVector.h @@ -24,6 +24,7 @@ #include "sigProcLib.h" #include "GSMCommon.h" +#include "Interthread.h" class radioVector : public signalVector { public: diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp index 5dc2def..cf72cae 100644 --- a/Transceiver52M/sigProcLib.cpp +++ b/Transceiver52M/sigProcLib.cpp @@ -33,6 +33,8 @@ #include +using namespace GSM; + #define TABLESIZE 1024 /** Lookup tables for trigonometric approximation */ diff --git a/Transceiver52M/sigProcLib.h b/Transceiver52M/sigProcLib.h index 3aaa62b..8e8c48f 100644 --- a/Transceiver52M/sigProcLib.h +++ b/Transceiver52M/sigProcLib.h @@ -17,10 +17,7 @@ #include "Vector.h" #include "Complex.h" -#include "GSMTransfer.h" - - -using namespace GSM; +#include "BitVector.h" /** Indicated signalVector symmetry */ enum Symmetry { diff --git a/Transceiver52M/sigProcLibTest.cpp b/Transceiver52M/sigProcLibTest.cpp index 1c2a1af..4f92717 100644 --- a/Transceiver52M/sigProcLibTest.cpp +++ b/Transceiver52M/sigProcLibTest.cpp @@ -33,8 +33,10 @@ Harvind S. Samra, hssamra@kestrelsp.com //#include "radioInterface.h" #include #include +#include using namespace std; +using namespace GSM; ConfigurationTable gConfig; -- cgit v1.2.1