From b92a8e2f2b548eef7cb5d58edc92d26befcf67d7 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Wed, 19 Jun 2019 11:55:32 -0700 Subject: rfnoc: Add device_id allocator This is a single atomic allocator in the global uhd::rfnoc namespace, so that devices can allocate themselves device IDs without having to confer with the rest of the RFNoC infrastructure. --- host/lib/include/uhdlib/rfnoc/device_id.hpp | 22 ++++++++++++++++++++++ host/lib/rfnoc/CMakeLists.txt | 1 + host/lib/rfnoc/device_id.cpp | 17 +++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 host/lib/include/uhdlib/rfnoc/device_id.hpp create mode 100644 host/lib/rfnoc/device_id.cpp (limited to 'host') diff --git a/host/lib/include/uhdlib/rfnoc/device_id.hpp b/host/lib/include/uhdlib/rfnoc/device_id.hpp new file mode 100644 index 000000000..d4cecc840 --- /dev/null +++ b/host/lib/include/uhdlib/rfnoc/device_id.hpp @@ -0,0 +1,22 @@ +// +// Copyright 2019 Ettus Research, a National Instruments Brand +// +// SPDX-License-Identifier: GPL-3.0-or-later +// + +#ifndef INCLUDED_LIBUHD_DEVICE_ID_HPP +#define INCLUDED_LIBUHD_DEVICE_ID_HPP + +#include + +namespace uhd { namespace rfnoc { + +//! Return a new, unique device ID. +// +// This function will never return the same device ID twice. +device_id_t allocate_device_id(); + +}} /* namespace uhd::rfnoc */ + +#endif /* INCLUDED_LIBUHD_DEVICE_ID_HPP */ + diff --git a/host/lib/rfnoc/CMakeLists.txt b/host/lib/rfnoc/CMakeLists.txt index 1b627d304..0f9d62c51 100644 --- a/host/lib/rfnoc/CMakeLists.txt +++ b/host/lib/rfnoc/CMakeLists.txt @@ -24,6 +24,7 @@ LIBUHD_APPEND_SOURCES( ${CMAKE_CURRENT_SOURCE_DIR}/chdr_packet.cpp ${CMAKE_CURRENT_SOURCE_DIR}/client_zero.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ctrl_iface.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/device_id.cpp ${CMAKE_CURRENT_SOURCE_DIR}/epid_allocator.cpp ${CMAKE_CURRENT_SOURCE_DIR}/graph_impl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/graph.cpp diff --git a/host/lib/rfnoc/device_id.cpp b/host/lib/rfnoc/device_id.cpp new file mode 100644 index 000000000..6bd287dce --- /dev/null +++ b/host/lib/rfnoc/device_id.cpp @@ -0,0 +1,17 @@ +// +// Copyright 2019 Ettus Research, a National Instruments Brand +// +// SPDX-License-Identifier: GPL-3.0-or-later +// + +#include +#include + +using namespace uhd::rfnoc; + +device_id_t uhd::rfnoc::allocate_device_id() +{ + static std::atomic counter{1}; + return counter++; +} + -- cgit v1.2.3