diff options
Diffstat (limited to 'Transceiver52M/Transceiver.h')
| -rw-r--r-- | Transceiver52M/Transceiver.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h index 840f87b..56acd9c 100644 --- a/Transceiver52M/Transceiver.h +++ b/Transceiver52M/Transceiver.h @@ -49,7 +49,6 @@ private: UDPSocket mDataSocket; ///< socket for writing to/reading from GSM core UDPSocket mControlSocket; ///< socket for writing/reading control commands from GSM core - UDPSocket mClockSocket; ///< socket for writing clock updates to GSM core VectorQueue *mTransmitPriorityQueue; ///< priority queue of transmit bursts received from GSM core VectorFIFO* mReceiveFIFO; ///< radioInterface FIFO of receive bursts @@ -60,9 +59,6 @@ private: int mChannel; ///< channelizer attach number between 0 and 'M-1' - GSM::Time *mTransmitDeadlineClock; ///< deadline for pushing bursts into transmit FIFO - GSM::Time mLastClockUpdateTime; ///< last time clock update was sent up to core - RadioInterface *mRadioInterface; ///< associated radioInterface object double txFullScale; ///< full scale input to radio double rxFullScale; ///< full scale output to radio @@ -96,8 +92,10 @@ private: bool mOn; ///< flag to indicate that transceiver is powered on bool mRunning; ///< flag to indicate control loop is running + bool mPrimary; ///< flag to indicate C0 channel double mTxFreq; ///< the transmit frequency double mRxFreq; ///< the receive frequency + double mFreqOffset; ///< RF frequency offset int mPower; ///< the transmit power in dB int mTSC; ///< the midamble sequence code double mEnergyThreshold; ///< threshold to determine if received data is potentially a GSM burst @@ -112,7 +110,7 @@ private: float chanRespOffset[8]; ///< most recent timing offset, e.g. TOA, of all timeslots complex chanRespAmplitude[8]; ///< most recent channel amplitude of all timeslots - bool mRadioLocked; + static int mTSC; ///< the midamble sequence code public: @@ -128,7 +126,7 @@ public: int wSamplesPerSymbol, RadioInterface *wRadioInterface, DriveLoop *wDriveLoop, - int wChannel); + int wChannel, bool wPrimary); /** Destructor */ ~Transceiver(); @@ -169,9 +167,11 @@ protected: /** return control loop operational status */ bool running() { return mRunning; } + /** return the drive loop pointer */ + DriveLoop *getDriveLoop() { return mDriveLoop; } + /** set priority on current thread */ void setPriority() { mRadioInterface->setPriority(); } - }; /** FIFO thread loop */ @@ -182,4 +182,3 @@ void *ControlServiceLoopAdapter(Transceiver *); /** transmit queueing thread loop */ void *TransmitPriorityQueueServiceLoopAdapter(Transceiver *); - |