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/radio_ctrl_impl.cpp | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'host/lib/rfnoc/radio_ctrl_impl.cpp') diff --git a/host/lib/rfnoc/radio_ctrl_impl.cpp b/host/lib/rfnoc/radio_ctrl_impl.cpp index fe8d51468..a151b2690 100644 --- a/host/lib/rfnoc/radio_ctrl_impl.cpp +++ b/host/lib/rfnoc/radio_ctrl_impl.cpp @@ -45,29 +45,7 @@ radio_ctrl_impl::radio_ctrl_impl() : ///////////////////////////////////////////////////////////////////////// for (size_t i = 0; i < _get_num_radios(); i++) { _register_loopback_self_test(i); - _perifs[i].ctrl = boost::make_shared( - // poke32 functor - [this, i](const uint32_t addr, const uint32_t data){ - this->sr_write(addr, data, i); - }, - // peek32 functor - [this, i](const uint32_t addr){ - return this->user_reg_read32(addr, i); - }, - // peek64 functor - [this, i](const uint32_t addr){ - return this->user_reg_read64(addr, i); - }, - // get_time functor - [this, i](){ - return this->get_command_time(i); - }, - // set_time functor - [this, i](const time_spec_t& time_spec){ - this->set_command_time(time_spec, i); - } - ); - + _perifs[i].ctrl = this->get_ctrl_iface(i); // FIXME there's currently no way to set the underflow policy if (i == 0) { -- cgit v1.2.3