diff options
| author | Thomas Tsou <tom@tsou.cc> | 2013-10-11 14:55:31 -0400 |
|---|---|---|
| committer | Thomas Tsou <tom@tsou.cc> | 2013-10-18 13:10:17 -0400 |
| commit | c064124429890393ee9a447990bc861840d73803 (patch) | |
| tree | b5ac147e2b743ff0959a0e8948940e5e45e2d31c | |
| parent | 69d14c9a14c1e9f9ae558e5843ef23195f56f04b (diff) | |
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 <tom@tsou.cc>
| -rw-r--r-- | Transceiver52M/USRPDevice.cpp | 8 | ||||
| -rw-r--r-- | Transceiver52M/USRPDevice.h | 18 | ||||
| -rw-r--r-- | configure.ac | 13 |
3 files changed, 6 insertions, 33 deletions
diff --git a/Transceiver52M/USRPDevice.cpp b/Transceiver52M/USRPDevice.cpp index 275f1c4..3a61e64 100644 --- a/Transceiver52M/USRPDevice.cpp +++ b/Transceiver52M/USRPDevice.cpp @@ -105,11 +105,9 @@ int USRPDevice::open(const std::string &) 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 @@ int USRPDevice::open(const std::string &) 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(); diff --git a/Transceiver52M/USRPDevice.h b/Transceiver52M/USRPDevice.h index 01cf261..f74db47 100644 --- a/Transceiver52M/USRPDevice.h +++ b/Transceiver52M/USRPDevice.h @@ -21,29 +21,17 @@ #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 { diff --git a/configure.ac b/configure.ac index 6ab694d..1fc58ea 100644 --- a/configure.ac +++ b/configure.ac @@ -79,18 +79,7 @@ AC_ARG_WITH(extref, [ ]) 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 ]) |