Merge branch 'master' into next

Conflicts:
	host/lib/usrp/usrp2/CMakeLists.txt

2 files changed, 21 insertions, 24 deletions

diff --git a/host/lib/usrp/usrp1/CMakeLists.txt b/host/lib/usrp/usrp1/CMakeLists.txt
index 8b6ba78d2..519e17bfa 100644
--- a/host/lib/usrp/usrp1/CMakeLists.txt
+++ b/host/lib/usrp/usrp1/CMakeLists.txt
@@ -15,37 +15,34 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-#This file will be included by cmake, use absolute paths!
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
 
 ########################################################################
 # Conditionally configure the USRP1 support
 ########################################################################
-LIBUHD_REGISTER_COMPONENT("USRP1" ENABLE_USRP1 ${HAVE_USB_SUPPORT})
-
-#sanity check when USRP1 support enabled
-IF(ENABLE_USRP1 AND NOT HAVE_USB_SUPPORT)
-    MESSAGE(FATAL_ERROR "USRP1 support enabled without USB support")
-ENDIF(ENABLE_USRP1 AND NOT HAVE_USB_SUPPORT)
+LIBUHD_REGISTER_COMPONENT("USRP1" ENABLE_USRP1 ON "ENABLE_LIBUHD;ENABLE_USB" OFF)
 
 IF(ENABLE_USRP1)
     INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/../firmware/fx2/common)
 
     LIBUHD_APPEND_SOURCES(
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/clock_ctrl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/clock_ctrl.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/codec_ctrl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/codec_ctrl.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/codec_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/dboard_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/dboard_iface.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/dsp_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/io_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/mboard_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/usrp1_iface.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/usrp1_iface.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/usrp1_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/usrp1_impl.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/usrp1_ctrl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/usrp1_ctrl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/clock_ctrl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/clock_ctrl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/codec_ctrl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/codec_ctrl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/codec_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/dboard_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/dboard_iface.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/dsp_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/io_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/mboard_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp1_iface.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp1_iface.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp1_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp1_impl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp1_ctrl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp1_ctrl.hpp
     )
 ENDIF(ENABLE_USRP1)
diff --git a/host/lib/usrp/usrp1/dsp_impl.cpp b/host/lib/usrp/usrp1/dsp_impl.cpp
index e9a5e60a6..370f4831f 100644
--- a/host/lib/usrp/usrp1/dsp_impl.cpp
+++ b/host/lib/usrp/usrp1/dsp_impl.cpp
@@ -102,7 +102,7 @@ void usrp1_impl::rx_dsp_set(const wax::obj &key_, const wax::obj &val){
                 ("0", FR_RX_FREQ_0) ("1", FR_RX_FREQ_1)
                 ("2", FR_RX_FREQ_2) ("3", FR_RX_FREQ_3)
             ;
-            _iface->poke32(freq_name_to_reg_val[key.name], reg_word);
+            _iface->poke32(freq_name_to_reg_val[key.name], ~reg_word + 1);
             _rx_dsp_freqs[key.name] = new_freq;
             return;
         }