diff options
| author | Josh Blum <josh@joshknows.com> | 2011-06-30 12:33:40 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-06-30 12:33:40 -0700 |
| commit | 3a53fc9b19d1b1aed5f6c99367fe0f8e2911457c (patch) | |
| tree | 1acbbaddc093da13df7b2456b1be49eea49f02c4 /host/lib | |
| parent | 6f4fb27955333ed9db372ec42aea52f3b605a968 (diff) | |
| download | uhd-3a53fc9b19d1b1aed5f6c99367fe0f8e2911457c.tar.gz uhd-3a53fc9b19d1b1aed5f6c99367fe0f8e2911457c.tar.bz2 uhd-3a53fc9b19d1b1aed5f6c99367fe0f8e2911457c.zip | |
usrp2: restored component registry
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/usrp/b100/b100_ctrl.cpp | 1 | ||||
| -rw-r--r-- | host/lib/usrp/b100/b100_ctrl.hpp | 3 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/CMakeLists.txt | 24 |
3 files changed, 17 insertions, 11 deletions
diff --git a/host/lib/usrp/b100/b100_ctrl.cpp b/host/lib/usrp/b100/b100_ctrl.cpp index 53054edf7..5b03fd591 100644 --- a/host/lib/usrp/b100/b100_ctrl.cpp +++ b/host/lib/usrp/b100/b100_ctrl.cpp @@ -16,6 +16,7 @@ // #include "b100_ctrl.hpp" +#include <uhd/transport/bounded_buffer.hpp> #include <uhd/transport/usb_zero_copy.hpp> #include <uhd/transport/zero_copy.hpp> #include <uhd/transport/vrt_if_packet.hpp> diff --git a/host/lib/usrp/b100/b100_ctrl.hpp b/host/lib/usrp/b100/b100_ctrl.hpp index 6c3217b11..74884d525 100644 --- a/host/lib/usrp/b100/b100_ctrl.hpp +++ b/host/lib/usrp/b100/b100_ctrl.hpp @@ -19,14 +19,11 @@ #define INCLUDED_B100_CTRL_HPP #include "wb_iface.hpp" -#include <uhd/transport/bounded_buffer.hpp> #include <uhd/transport/usb_zero_copy.hpp> -#include <uhd/types/metadata.hpp> #include <uhd/types/serial.hpp> #include <boost/shared_ptr.hpp> #include <boost/utility.hpp> #include "ctrl_packet.hpp" -#include <boost/thread.hpp> #include <boost/function.hpp> class b100_ctrl : boost::noncopyable, public wb_iface{ diff --git a/host/lib/usrp/usrp2/CMakeLists.txt b/host/lib/usrp/usrp2/CMakeLists.txt index d16976060..10f7407b0 100644 --- a/host/lib/usrp/usrp2/CMakeLists.txt +++ b/host/lib/usrp/usrp2/CMakeLists.txt @@ -18,11 +18,19 @@ ######################################################################## # This file included, use CMake directory variables ######################################################################## -LIBUHD_APPEND_SOURCES( - ${CMAKE_CURRENT_SOURCE_DIR}/clock_ctrl.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/codec_ctrl.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dboard_iface.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/io_impl.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/usrp2_iface.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/usrp2_impl.cpp -) + +######################################################################## +# Conditionally configure the USRP2 support +######################################################################## +LIBUHD_REGISTER_COMPONENT("USRP2" ENABLE_USRP2 ON "ENABLE_LIBUHD" OFF) + +IF(ENABLE_USRP2) + LIBUHD_APPEND_SOURCES( + ${CMAKE_CURRENT_SOURCE_DIR}/clock_ctrl.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/codec_ctrl.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dboard_iface.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/io_impl.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/usrp2_iface.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/usrp2_impl.cpp + ) +ENDIF(ENABLE_USRP2) |