diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-07-30 13:45:26 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-07-31 10:11:22 -0700 |
| commit | 57079accbb20e04602436a90bec7b71d0f6815fc (patch) | |
| tree | d539e266615cdddb722a1364bd59276767833d1e | |
| parent | 23b646bda313c230494011dbb54576e9f2748fa9 (diff) | |
| download | uhd-57079accbb20e04602436a90bec7b71d0f6815fc.tar.gz uhd-57079accbb20e04602436a90bec7b71d0f6815fc.tar.bz2 uhd-57079accbb20e04602436a90bec7b71d0f6815fc.zip | |
b100: Move fifo_ctrl_excelsior to b100 subdir
This device is the only one using it, and no one will ever use it going
forward.
| -rw-r--r-- | host/lib/usrp/b100/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | host/lib/usrp/b100/b100_impl.hpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/b100/fifo_ctrl_excelsior.cpp (renamed from host/lib/usrp/common/fifo_ctrl_excelsior.cpp) | 0 | ||||
| -rw-r--r-- | host/lib/usrp/b100/fifo_ctrl_excelsior.hpp (renamed from host/lib/include/uhdlib/usrp/common/fifo_ctrl_excelsior.hpp) | 0 | ||||
| -rw-r--r-- | host/lib/usrp/common/CMakeLists.txt | 1 |
5 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/b100/CMakeLists.txt b/host/lib/usrp/b100/CMakeLists.txt index b1bcd22a4..8548b961b 100644 --- a/host/lib/usrp/b100/CMakeLists.txt +++ b/host/lib/usrp/b100/CMakeLists.txt @@ -21,5 +21,6 @@ IF(ENABLE_B100) ${CMAKE_CURRENT_SOURCE_DIR}/io_impl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mb_eeprom.cpp ${CMAKE_CURRENT_SOURCE_DIR}/usb_zero_copy_wrapper.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/fifo_ctrl_excelsior.cpp ) ENDIF(ENABLE_B100) diff --git a/host/lib/usrp/b100/b100_impl.hpp b/host/lib/usrp/b100/b100_impl.hpp index c6947deb7..a0bfcb8ef 100644 --- a/host/lib/usrp/b100/b100_impl.hpp +++ b/host/lib/usrp/b100/b100_impl.hpp @@ -10,6 +10,7 @@ #include "clock_ctrl.hpp" #include "codec_ctrl.hpp" +#include "fifo_ctrl_excelsior.hpp" #include <uhd/device.hpp> #include <uhd/property_tree.hpp> #include <uhd/types/dict.hpp> @@ -21,7 +22,6 @@ #include <uhd/usrp/dboard_eeprom.hpp> #include <uhd/usrp/dboard_manager.hpp> #include <uhd/transport/usb_zero_copy.hpp> -#include <uhdlib/usrp/common/fifo_ctrl_excelsior.hpp> #include <uhdlib/usrp/common/fx2_ctrl.hpp> #include <uhdlib/usrp/common/recv_packet_demuxer_3000.hpp> #include <uhdlib/usrp/cores/i2c_core_200.hpp> diff --git a/host/lib/usrp/common/fifo_ctrl_excelsior.cpp b/host/lib/usrp/b100/fifo_ctrl_excelsior.cpp index e110919f9..e110919f9 100644 --- a/host/lib/usrp/common/fifo_ctrl_excelsior.cpp +++ b/host/lib/usrp/b100/fifo_ctrl_excelsior.cpp diff --git a/host/lib/include/uhdlib/usrp/common/fifo_ctrl_excelsior.hpp b/host/lib/usrp/b100/fifo_ctrl_excelsior.hpp index 91c006a1a..91c006a1a 100644 --- a/host/lib/include/uhdlib/usrp/common/fifo_ctrl_excelsior.hpp +++ b/host/lib/usrp/b100/fifo_ctrl_excelsior.hpp diff --git a/host/lib/usrp/common/CMakeLists.txt b/host/lib/usrp/common/CMakeLists.txt index feb4390e3..6490fac08 100644 --- a/host/lib/usrp/common/CMakeLists.txt +++ b/host/lib/usrp/common/CMakeLists.txt @@ -33,5 +33,4 @@ LIBUHD_APPEND_SOURCES( ${CMAKE_CURRENT_SOURCE_DIR}/apply_corrections.cpp ${CMAKE_CURRENT_SOURCE_DIR}/validate_subdev_spec.cpp ${CMAKE_CURRENT_SOURCE_DIR}/recv_packet_demuxer.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/fifo_ctrl_excelsior.cpp ) |