diff options
| author | Martin Braun <martin.braun@ettus.com> | 2019-08-20 10:00:47 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2019-11-26 12:16:25 -0800 |
| commit | 7d69dcdcc318ccdf87038b732acbf2bf7c087b60 (patch) | |
| tree | 8179f2f4a14be591d7c856f77f13687b45f9a454 /host/tests/common | |
| parent | 1ac6e6f56100a7e8186481ab0715937759f52737 (diff) | |
| download | uhd-7d69dcdcc318ccdf87038b732acbf2bf7c087b60.tar.gz uhd-7d69dcdcc318ccdf87038b732acbf2bf7c087b60.tar.bz2 uhd-7d69dcdcc318ccdf87038b732acbf2bf7c087b60.zip | |
Remove proto-RFNoC files
This commit removes all files and parts of files that are used by
proto-RFNoC only.
uhd: Fix include CMakeLists.txt, add missing files
Diffstat (limited to 'host/tests/common')
| -rw-r--r-- | host/tests/common/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | host/tests/common/mock_ctrl_iface_impl.cpp | 38 | ||||
| -rw-r--r-- | host/tests/common/mock_ctrl_iface_impl.hpp | 29 | ||||
| -rw-r--r-- | host/tests/common/mock_zero_copy.hpp | 2 |
4 files changed, 2 insertions, 73 deletions
diff --git a/host/tests/common/CMakeLists.txt b/host/tests/common/CMakeLists.txt index 58299c688..7f31f3463 100644 --- a/host/tests/common/CMakeLists.txt +++ b/host/tests/common/CMakeLists.txt @@ -8,8 +8,6 @@ # Build uhd_test static lib ######################################################################## include_directories("${CMAKE_SOURCE_DIR}/lib/include") -add_library(uhd_test ${CMAKE_CURRENT_SOURCE_DIR}/mock_ctrl_iface_impl.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/mock_zero_copy.cpp - ${CMAKE_SOURCE_DIR}/lib/rfnoc/graph_impl.cpp - ${CMAKE_SOURCE_DIR}/lib/rfnoc/async_msg_handler.cpp +add_library(uhd_test + ${CMAKE_CURRENT_SOURCE_DIR}/mock_zero_copy.cpp ) diff --git a/host/tests/common/mock_ctrl_iface_impl.cpp b/host/tests/common/mock_ctrl_iface_impl.cpp deleted file mode 100644 index af32637df..000000000 --- a/host/tests/common/mock_ctrl_iface_impl.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// -// Copyright 2018 Ettus Research, a National Instruments Company -// -// SPDX-License-Identifier: GPL-3.0-or-later -// - -#include "mock_ctrl_iface_impl.hpp" -static const uint64_t TEST_NOC_ID = 0xAAAABBBBCCCCDDDD; - -uint64_t mock_ctrl_iface_impl::send_cmd_pkt(const size_t addr, - const size_t data, - const bool readback, - const uint64_t /* timestamp */ -) -{ - if (not readback) { - std::cout << str(boost::format("[MOCK] poke to addr: %016X, data == %016X") % addr - % data) - << std::endl; - } else { - std::cout << str(boost::format("[MOCK] peek64 to addr: %016X") % data) - << std::endl; - switch (data) { - case uhd::rfnoc::SR_READBACK_REG_ID: - return TEST_NOC_ID; - case uhd::rfnoc::SR_READBACK_REG_FIFOSIZE: - return 0x0000000000010000; - case uhd::rfnoc::SR_READBACK_REG_USER: - return 0x0123456789ABCDEF; - case uhd::rfnoc::SR_READBACK_COMPAT: - return uint64_t(uhd::rfnoc::NOC_SHELL_COMPAT_MAJOR) << 32 - | uint64_t(uhd::rfnoc::NOC_SHELL_COMPAT_MINOR); - default: - return 0; - } - } - return 0; -} diff --git a/host/tests/common/mock_ctrl_iface_impl.hpp b/host/tests/common/mock_ctrl_iface_impl.hpp deleted file mode 100644 index f20858b63..000000000 --- a/host/tests/common/mock_ctrl_iface_impl.hpp +++ /dev/null @@ -1,29 +0,0 @@ -// -// Copyright 2018 Ettus Research, a National Instruments Company -// -// SPDX-License-Identifier: GPL-3.0-or-later -// - - -#ifndef INCLUDED_MOCK_CTRL_IFACE_IMPL_HPP -#define INCLUDED_MOCK_CTRL_IFACE_IMPL_HPP - -#include <uhd/rfnoc/constants.hpp> -#include <uhdlib/rfnoc/ctrl_iface.hpp> -#include <boost/bind.hpp> -#include <boost/format.hpp> -#include <boost/make_shared.hpp> -#include <boost/thread/mutex.hpp> -#include <boost/thread/thread.hpp> -#include <queue> - -class mock_ctrl_iface_impl : public uhd::rfnoc::ctrl_iface -{ - uint64_t send_cmd_pkt(const size_t addr, - const size_t data, - const bool readback = false, - const uint64_t timestamp = 0); - - void set_cmd_fifo_size(const size_t) {} -}; -#endif /* INCLUDED_MOCK_CTRL_IFACE_IMPL_HPP */ diff --git a/host/tests/common/mock_zero_copy.hpp b/host/tests/common/mock_zero_copy.hpp index 60e5f4659..515fde498 100644 --- a/host/tests/common/mock_zero_copy.hpp +++ b/host/tests/common/mock_zero_copy.hpp @@ -12,9 +12,7 @@ #include <uhd/transport/vrt_if_packet.hpp> #include <uhd/transport/zero_copy.hpp> #include <uhd/types/endianness.hpp> -#include <uhd/types/sid.hpp> #include <uhd/utils/byteswap.hpp> -#include <uhdlib/rfnoc/xports.hpp> #include <boost/make_shared.hpp> #include <boost/shared_array.hpp> #include <boost/shared_ptr.hpp> |
