From f2293b8cfa8167e7847cd04ce6a25cfa91abf41f Mon Sep 17 00:00:00 2001 From: Thomas Tsou Date: Mon, 8 Apr 2013 13:35:36 -0400 Subject: Transceiver52M: Remove periodic alignment update from UHD build Periodic timing alignment should never be required for UHD devices, though the mechanism was used as a fallback mechanism should UHD not properly recover after an underrun - as may occur in old 003.003.000 based revisions. This issue is not a concern in more recent UHD releases and deprecates this code for legacy USRP1 use only. Signed-off-by: Thomas Tsou --- Transceiver52M/radioInterface.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'Transceiver52M/radioInterface.cpp') diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index b733d0e..65d5738 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -118,8 +118,10 @@ bool RadioInterface::tuneRx(double freq) void RadioInterface::start() { LOG(INFO) << "starting radio interface..."; +#ifdef USRP1 mAlignRadioServiceLoopThread.start((void * (*)(void*))AlignRadioServiceLoopAdapter, (void*)this); +#endif writeTimestamp = mRadio->initialWriteTimestamp(); readTimestamp = mRadio->initialReadTimestamp(); mRadio->start(); @@ -134,6 +136,7 @@ void RadioInterface::start() } +#ifdef USRP1 void *AlignRadioServiceLoopAdapter(RadioInterface *radioInterface) { while (1) { @@ -147,6 +150,7 @@ void RadioInterface::alignRadio() { sleep(60); mRadio->updateAlignment(writeTimestamp+ (TIMESTAMP) 10000); } +#endif void RadioInterface::driveTransmitRadio(signalVector &radioBurst, bool zeroBurst) { @@ -218,14 +222,6 @@ bool RadioInterface::isUnderrun() return retVal; } -void RadioInterface::attach(RadioDevice *wRadio, int wRadioOversampling) -{ - if (!mOn) { - mRadio = wRadio; - mRadioOversampling = SAMPSPERSYM; - } -} - double RadioInterface::setRxGain(double dB) { if (mRadio) -- cgit v1.2.3