[Openbts-public-commits] r6749 - in software/public/openbts/trunk: . Transceiver52M

[<do_...@wu...>]

Author: ttsou
Date: 2013-10-17 01:19:12 -0500 (Thu, 17 Oct 2013)
New Revision: 6749

Modified:
   software/public/openbts/trunk/Transceiver52M/USRPDevice.cpp
   software/public/openbts/trunk/Transceiver52M/USRPDevice.h
   software/public/openbts/trunk/configure.ac
Log:
Transceiver52M: Remove support for ancient libusrp versions

Current functionality with these old versions is questionable.
There is no reason to use any version of GNU Radio / libusrp older
than 3.3. Version 3.4.2 is the only recommended version for USRP1
users.

Non-USRP1 users must use UHD driver from Ettus Research.

Signed-off-by: Thomas Tsou <to...@ts...>

Modified: software/public/openbts/trunk/Transceiver52M/USRPDevice.cpp
===================================================================
--- software/public/openbts/trunk/Transceiver52M/USRPDevice.cpp	2013-10-17 06:19:08 UTC (rev 6748)
+++ software/public/openbts/trunk/Transceiver52M/USRPDevice.cpp	2013-10-17 06:19:12 UTC (rev 6749)
@@ -105,11 +105,9 @@
                                         0, decimRate * sps, 1, -1,
                                         usrp_standard_rx::FPGA_MODE_NORMAL,
                                         1024, 16 * 8, rbf));
-#ifdef HAVE_LIBUSRP_3_2
     m_uRx->set_fpga_master_clock_freq(masterClockRate);
-#endif
   }
-  
+
   catch(...) {
     LOG(ALERT) << "make failed on Rx";
     m_uRx.reset();
@@ -129,11 +127,9 @@
     m_uTx = usrp_standard_tx_sptr(usrp_standard_tx::make(
                                         0, decimRate * 2, 1, -1,
                                         1024, 16 * 8, rbf));
-#ifdef HAVE_LIBUSRP_3_2
     m_uTx->set_fpga_master_clock_freq(masterClockRate);
-#endif
   }
-  
+
   catch(...) {
     LOG(ALERT) << "make failed on Tx";
     m_uTx.reset();

Modified: software/public/openbts/trunk/Transceiver52M/USRPDevice.h
===================================================================
--- software/public/openbts/trunk/Transceiver52M/USRPDevice.h	2013-10-17 06:19:08 UTC (rev 6748)
+++ software/public/openbts/trunk/Transceiver52M/USRPDevice.h	2013-10-17 06:19:12 UTC (rev 6749)
@@ -21,30 +21,18 @@
 
 #include "radioDevice.h"
 
-#ifdef HAVE_LIBUSRP_3_3 // [
-#  include <usrp/usrp_standard.h>
-#  include <usrp/usrp_bytesex.h>
-#  include <usrp/usrp_prims.h>
-#else // HAVE_LIBUSRP_3_3 ][
-#  include "usrp_standard.h"
-#  include "usrp_bytesex.h"
-#  include "usrp_prims.h"
-#endif // !HAVE_LIBUSRP_3_3 ]
+#include <usrp/usrp_standard.h>
+#include <usrp/usrp_bytesex.h>
+#include <usrp/usrp_prims.h>
 #include <sys/time.h>
 #include <math.h>
 #include <string>
 #include <iostream>
 
-
-/** Define types which are not defined in libusrp-3.1 */
-#ifndef HAVE_LIBUSRP_3_2
 #include <boost/shared_ptr.hpp>
 typedef boost::shared_ptr<usrp_standard_tx> usrp_standard_tx_sptr;
 typedef boost::shared_ptr<usrp_standard_rx> usrp_standard_rx_sptr;
-#endif // HAVE_LIBUSRP_3_2
 
-
-
 /** A class to handle a USRP rev 4, with a two RFX900 daughterboards */
 class USRPDevice: public RadioDevice {
 

Modified: software/public/openbts/trunk/configure.ac
===================================================================
--- software/public/openbts/trunk/configure.ac	2013-10-17 06:19:08 UTC (rev 6748)
+++ software/public/openbts/trunk/configure.ac	2013-10-17 06:19:12 UTC (rev 6749)
@@ -76,18 +76,7 @@
 ])
 
 AS_IF([test "x$with_usrp1" = "xyes"], [
-    # Defines USRP_CFLAGS, USRP_INCLUDEDIR, and USRP_LIBS
-    PKG_CHECK_MODULES(USRP, usrp > 3.1)
-    # Check whether we have libusrp >= 3.2
-    PKG_CHECK_EXISTS(usrp >= 3.2, libusrp_3_2=yes, libusrp_3_2=no)
-    if test "x$libusrp_3_2" = "xyes";then
-        AC_DEFINE(HAVE_LIBUSRP_3_2, 1, Define to 1 if you have libusrp >= 3.2)
-    fi
-    # Check whether we have libusrp >= 3.3
-    PKG_CHECK_EXISTS(usrp >= 3.3, libusrp_3_3=yes, libusrp_3_3=no)
-    if test "x$libusrp_3_3" = "xyes";then
-        AC_DEFINE(HAVE_LIBUSRP_3_3, 1, Define to 1 if you have libusrp >= 3.3)
-    fi
+    PKG_CHECK_MODULES(USRP, usrp >= 3.3)
     # Find and define supported SIMD extensions
     AX_EXT
 ])