diff options
| author | Tom Tsou <tom.tsou@ettus.com> | 2016-10-19 14:29:45 -0700 |
|---|---|---|
| committer | Tom Tsou <tom@tsou.cc> | 2016-10-25 18:48:52 +0000 |
| commit | 93ca09ea61d044e5f8662b28bf084c808cac4f2c (patch) | |
| tree | 0f43607be7d6151ab25aa386be9b31cd4015e162 | |
| parent | 365bc38beec7970d38b2c8644a1998103671684a (diff) | |
uhd: Set minimum supported version to 3.9.0
Versions of UHD prior to 3.9.0 are no longer supported.
Rather then backport and ifdef UHD version specific API and
behavioral changes, set minimum support to the current LTS
release, which is 3.9.0.
Change-Id: Id7d15b52cd4e45f1d856a6ef3a84832a28f2dd04
Signed-off-by: Tom Tsou <tom.tsou@ettus.com>
| -rw-r--r-- | Transceiver52M/UHDDevice.cpp | 6 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 2 insertions, 11 deletions
diff --git a/Transceiver52M/UHDDevice.cpp b/Transceiver52M/UHDDevice.cpp index 47fa0bf..a84fe4b 100644 --- a/Transceiver52M/UHDDevice.cpp +++ b/Transceiver52M/UHDDevice.cpp @@ -84,15 +84,9 @@ struct uhd_dev_offset { /* * USRP version dependent device timings */ -#ifdef USE_UHD_3_9 #define B2XX_TIMING_1SPS 1.7153e-4 #define B2XX_TIMING_4SPS 1.1696e-4 #define B2XX_TIMING_4_4SPS 6.18462e-5 -#else -#define B2XX_TIMING_1SPS 9.9692e-5 -#define B2XX_TIMING_4SPS 6.9248e-5 -#define B2XX_TIMING_4_4SPS 4.52308e-5 -#endif /* * Tx / Rx sample offset values. In a perfect world, there is no group delay diff --git a/configure.ac b/configure.ac index 7e394c2..b41382f 100644 --- a/configure.ac +++ b/configure.ac @@ -97,12 +97,9 @@ AS_IF([test "x$with_usrp1" = "xyes"], [ ]) AS_IF([test "x$with_usrp1" != "xyes"],[ - PKG_CHECK_MODULES(UHD, uhd >= 003.009, - [AC_DEFINE(USE_UHD_3_9, 1, UHD version 3.9.0 or higher)], - [PKG_CHECK_MODULES(UHD, uhd >= 003.005.004)] - ) - AC_DEFINE(USE_UHD, 1, All UHD versions) + PKG_CHECK_MODULES(UHD, uhd >= 003.009) PKG_CHECK_MODULES(FFTWF, fftw3f) + AC_DEFINE(USE_UHD, 1, Using UHD driver) ]) AS_IF([test "x$with_singledb" = "xyes"], [ |