From 7d69dcdcc318ccdf87038b732acbf2bf7c087b60 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Tue, 20 Aug 2019 10:00:47 -0700 Subject: 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 --- mpm/include/mpm/CMakeLists.txt | 1 - mpm/include/mpm/xbar_iface.hpp | 60 ------------------------------------------ 2 files changed, 61 deletions(-) delete mode 100644 mpm/include/mpm/xbar_iface.hpp (limited to 'mpm/include') diff --git a/mpm/include/mpm/CMakeLists.txt b/mpm/include/mpm/CMakeLists.txt index f3637c913..d4caff1c4 100644 --- a/mpm/include/mpm/CMakeLists.txt +++ b/mpm/include/mpm/CMakeLists.txt @@ -4,7 +4,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later # install(FILES - xbar_iface.hpp exception.hpp DESTINATION ${INCLUDE_DIR}/mpm ) diff --git a/mpm/include/mpm/xbar_iface.hpp b/mpm/include/mpm/xbar_iface.hpp deleted file mode 100644 index bf4399593..000000000 --- a/mpm/include/mpm/xbar_iface.hpp +++ /dev/null @@ -1,60 +0,0 @@ -// -// Copyright 2017 Ettus Research, a National Instruments Company -// Copyright 2019 Ettus Research, a National Instruments Brand -// -// SPDX-License-Identifier: GPL-3.0-or-later -// -#pragma once -#include -#include -#include -#include - -namespace mpm { - -/*! - * Crossbar route command - */ -using rfnoc_crossbar_cmd = struct rfnoc_crossbar_cmd -{ - /*! destination address */ - uint8_t dest_addr; - /*! destination port */ - uint8_t dest_port; -}; - -#define RFNCBWROUTIOC _IOW('R', 1, struct rfnoc_crossbar_cmd) -#define RFNCDELROUTIOC _IOW('D', 1, struct rfnoc_crossbar_cmd) - -/*! - * Crossbar interface class holding a crossbar context - */ -class xbar_iface : boost::noncopyable -{ -public: - // use static mutex! lock_guard - using sptr = std::shared_ptr; - static sptr make(const std::string& device); - void set_route(uint8_t dst_addr, uint8_t dst_port); - void del_route(uint8_t dst_addr, uint8_t dst_port); - ~xbar_iface(); - xbar_iface(const std::string& device); - -private: - static std::mutex _lock; - int _fd; -}; -} // namespace mpm - - -#ifdef LIBMPM_PYTHON -void export_xbar(py::module& top_module) -{ - auto m = top_module.def_submodule("xbar"); - - py::class_>(m, "xbar") - .def(py::init(&mpm::xbar_iface::make)) - .def("set_route", &mpm::xbar_iface::set_route) - .def("del_route", &mpm::xbar_iface::del_route); -} -#endif -- cgit v1.2.3