From 2a66eb62d89c5d18c176878ce036f0109706a9e2 Mon Sep 17 00:00:00 2001 From: Lars Amsel Date: Mon, 8 Jul 2019 15:36:52 +0200 Subject: rfnoc: Introduce device-specific blocks - Add device ID constants (e.g., E310 == 0xE310, X300 == 0xA300). These are stored in the device FPGA, and can be used for decisions later - Blocks can be specific to a device. For example, x300_radio_control can only work on an X300 series device. - Because blocks can be device-specific, all radio blocks can now share a common Noc-ID (0x12AD1000). - The registry and factory functions are modified to acommodate for this. - The motherboard access is now also factored into the same registry macro. --- host/tests/rfnoc_blocks_test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'host/tests') diff --git a/host/tests/rfnoc_blocks_test.cpp b/host/tests/rfnoc_blocks_test.cpp index ca82ee305..caf50f2fa 100644 --- a/host/tests/rfnoc_blocks_test.cpp +++ b/host/tests/rfnoc_blocks_test.cpp @@ -21,7 +21,7 @@ using namespace uhd::rfnoc; namespace { -noc_block_base::make_args_ptr make_make_args(noc_block_base::noc_id_t noc_id, +noc_block_base::make_args_ptr make_make_args(noc_id_t noc_id, const std::string& block_id, const size_t n_inputs, const size_t n_outputs, @@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE(test_null_block) constexpr size_t num_chans = 2; constexpr uint32_t nipc = 2; constexpr uint32_t item_width = 32; - constexpr noc_block_base::noc_id_t mock_id = 0x7E570000; + constexpr noc_id_t mock_id = 0x7E570000; auto make_args = make_make_args(mock_id, "0/NullSrcSink#0", num_chans, num_chans); auto reg_iface = std::dynamic_pointer_cast(make_args->reg_iface); @@ -144,7 +144,7 @@ BOOST_AUTO_TEST_CASE(test_ddc_block) constexpr uint32_t num_hb = 2; constexpr uint32_t max_cic = 128; constexpr size_t num_chans = 4; - constexpr noc_block_base::noc_id_t mock_noc_id = 0x7E57DDC0; + constexpr noc_id_t mock_noc_id = 0x7E57DDC0; constexpr int TEST_DECIM = 20; auto ddc_make_args = make_make_args(mock_noc_id, "0/DDC#0", num_chans, num_chans); -- cgit v1.2.3