[PATCH] osmo-trx[master]: Revert "uhd: Set minimum supported version to 3.9.0"

Tom Tsou gerrit-no-reply at lists.osmocom.org
Thu Jan 19 21:53:38 UTC 2017


Review at  https://gerrit.osmocom.org/1635

Revert "uhd: Set minimum supported version to 3.9.0"

This reverts commit 93ca09ea61d044e5f8662b28bf084c808cac4f2c.

Ettus Research recommends the use of 3.9 series of UHD releases,
but requiring this version has lead to issues with broken OBS and
packaged binaries by Debian, Ubuntu, and other distributions.

Change-Id: Ie6b175ac6d46d091937380c79fdd0125b16ec75f
Signed-off-by: Tom Tsou <tom.tsou at ettus.com>
---
M Transceiver52M/UHDDevice.cpp
M configure.ac
2 files changed, 11 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/35/1635/1

diff --git a/Transceiver52M/UHDDevice.cpp b/Transceiver52M/UHDDevice.cpp
index 0a640f9..d139cdc 100644
--- a/Transceiver52M/UHDDevice.cpp
+++ b/Transceiver52M/UHDDevice.cpp
@@ -84,9 +84,15 @@
 /*
  * 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 b41382f..7e394c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,9 +97,12 @@
 ])
 
 AS_IF([test "x$with_usrp1" != "xyes"],[
-    PKG_CHECK_MODULES(UHD, uhd >= 003.009)
+    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(FFTWF, fftw3f)
-    AC_DEFINE(USE_UHD, 1, Using UHD driver)
 ])
 
 AS_IF([test "x$with_singledb" = "xyes"], [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6b175ac6d46d091937380c79fdd0125b16ec75f
Gerrit-PatchSet: 1
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Tom Tsou <tom at tsou.cc>


More information about the gerrit-log mailing list