[MERGED] osmo-trx[master]: uhd: Set minimum supported version to 3.9.0

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Tom Tsou gerrit-no-reply at lists.osmocom.org
Tue Oct 25 18:48:52 UTC 2016


Tom Tsou has submitted this change and it was merged.

Change subject: uhd: Set minimum supported version to 3.9.0
......................................................................


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 at ettus.com>
---
M Transceiver52M/UHDDevice.cpp
M configure.ac
2 files changed, 2 insertions(+), 11 deletions(-)

Approvals:
  Tom Tsou: Looks good to me, approved
  Max: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



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 @@
 /*
  * 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"],[
-    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"], [

-- 
To view, visit https://gerrit.osmocom.org/1117
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7d15b52cd4e45f1d856a6ef3a84832a28f2dd04
Gerrit-PatchSet: 2
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Tom Tsou <tom at tsou.cc>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Tom Tsou <tom at tsou.cc>



More information about the gerrit-log mailing list