From 49520bfecb5e13126224ee915208c2cd936f911c Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Tue, 1 Nov 2016 16:45:29 -0700 Subject: rfnoc: ctrl_iface cleanup - ctrl_iface is now longer a wb_iface. All it can do now is send command packets, and receive responses to those. - ctrl_iface does not store command time or tick rate - wb_iface_adapter is no longer a set of functors, but a wrapper around ctrl_iface. Command times are stored once, in the block. - DMA FIFO and radio block controllers have an easier time getting access to a timed_wb_iface --- host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp') diff --git a/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp b/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp index cbbd59323..e27c20809 100644 --- a/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp +++ b/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp @@ -27,25 +27,7 @@ public: { _perifs.resize(get_input_ports().size()); for(size_t i = 0; i < _perifs.size(); i++) { - _perifs[i].ctrl = boost::make_shared( - // poke32 functor - boost::bind( - static_cast< void (block_ctrl_base::*)(const uint32_t, const uint32_t, const size_t) >(&block_ctrl_base::sr_write), - this, _1, _2, i - ), - // peek32 functor - boost::bind( - static_cast< uint32_t (block_ctrl_base::*)(const uint32_t, const size_t) >(&block_ctrl_base::user_reg_read32), - this, - _1, i - ), - // peek64 functor - boost::bind( - static_cast< uint64_t (block_ctrl_base::*)(const uint32_t, const size_t) >(&block_ctrl_base::user_reg_read64), - this, - _1, i - ) - ); + _perifs[i].ctrl = this->get_ctrl_iface(i); static const uint32_t USER_SR_BASE = 128*4; static const uint32_t USER_RB_BASE = 0; //Don't care _perifs[i].base_addr = DEFAULT_SIZE*i; -- cgit v1.2.3