commit f2293b8cfa8167e7847cd04ce6a25cfa91abf41f
author Thomas Tsou <tom@tsou.cc> Mon Apr 08 13:35:36 2013 -0400
committer Thomas Tsou <tom@tsou.cc> Fri Oct 18 13:03:41 2013 -0400
tree 01f7bc6956819ab2378addc65bcd801b554bc282
parent e3e88149487c72bd722f83865bca571134caa454

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 <tom@tsou.cc>

Transceiver52M/UHDDevice.cpp

diff --git a/Transceiver52M/UHDDevice.cpp b/Transceiver52M/UHDDevice.cpp
index a2b616c..6ce3380 100644
--- a/Transceiver52M/UHDDevice.cpp
+++ b/Transceiver52M/UHDDevice.cpp
@@ -772,7 +772,6 @@
 
 bool uhd_device::updateAlignment(TIMESTAMP timestamp)
 {
-	aligned = false;
 	return true;
 }
 

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 @@
 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 @@
 
 }
 
+#ifdef USRP1
 void *AlignRadioServiceLoopAdapter(RadioInterface *radioInterface)
 {
   while (1) {
@@ -147,6 +150,7 @@
   sleep(60);
   mRadio->updateAlignment(writeTimestamp+ (TIMESTAMP) 10000);
 }
+#endif
 
 void RadioInterface::driveTransmitRadio(signalVector &radioBurst, bool zeroBurst) {
 
@@ -218,14 +222,6 @@
   return retVal;
 }
 
-void RadioInterface::attach(RadioDevice *wRadio, int wRadioOversampling)
-{
-  if (!mOn) {
-    mRadio = wRadio;
-    mRadioOversampling = SAMPSPERSYM;
-  }
-}
-
 double RadioInterface::setRxGain(double dB)
 {
   if (mRadio)

Transceiver52M/radioInterface.h

diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h
index 3c58222..d1131c6 100644
--- a/Transceiver52M/radioInterface.h
+++ b/Transceiver52M/radioInterface.h
@@ -143,17 +143,17 @@
   /** get transport window type of attached device */ 
   enum RadioDevice::TxWindowType getWindowType() { return mRadio->getWindowType(); }
 
+#if USRP1
 protected:
 
   /** drive synchronization of Tx/Rx of USRP */
   void alignRadio();
 
-  /** reset the interface */
-  void reset();
-
   friend void *AlignRadioServiceLoopAdapter(RadioInterface*);
-
+#endif
 };
 
+#if USRP1
 /** synchronization thread loop */
 void *AlignRadioServiceLoopAdapter(RadioInterface*);
+#endif