From de68707dd42b55822c2b1fa19003675d03010982 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Tue, 6 Jul 2021 17:23:14 +0200 Subject: b200: Move the B200 radio control core into usrp/b200/ This serves two purposes: - This file no longer goes into the compiled DLL if B200 is disabled - Discourage use of this file for new devices, making it clear that this architecture is no longer used The file itself is left untouched, only the class is renamed from radio_ctrl_core_3000 to b200_radio_ctrl_core. Note: In UHD 3, this file was also used by N230. --- host/lib/usrp/b200/b200_impl.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'host/lib/usrp/b200/b200_impl.cpp') diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index 65d009e61..2e2ed5a98 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -501,7 +501,7 @@ b200_impl::b200_impl( //////////////////////////////////////////////////////////////////// // Local control endpoint //////////////////////////////////////////////////////////////////// - _local_ctrl = radio_ctrl_core_3000::make(false /*lilE*/, + _local_ctrl = b200_radio_ctrl_core::make(false /*lilE*/, _ctrl_transport, zero_copy_if::sptr() /*null*/, B200_LOCAL_CTRL_SID); @@ -868,16 +868,16 @@ void b200_impl::setup_radio(const size_t dspno) //////////////////////////////////////////////////////////////////// // radio control //////////////////////////////////////////////////////////////////// - perif.ctrl = radio_ctrl_core_3000::make( + perif.ctrl = b200_radio_ctrl_core::make( false /*lilE*/, _ctrl_transport, zero_copy_if::sptr() /*null*/, sid); perif.ctrl->hold_task(_async_task); _async_task_data->radio_ctrl[dspno] = perif.ctrl; // weak _tree->access(mb_path / "time" / "cmd") .add_coerced_subscriber(std::bind( - &radio_ctrl_core_3000::set_time, perif.ctrl, std::placeholders::_1)); + &b200_radio_ctrl_core::set_time, perif.ctrl, std::placeholders::_1)); _tree->access(mb_path / "tick_rate") .add_coerced_subscriber(std::bind( - &radio_ctrl_core_3000::set_tick_rate, perif.ctrl, std::placeholders::_1)); + &b200_radio_ctrl_core::set_tick_rate, perif.ctrl, std::placeholders::_1)); this->register_loopback_self_test(perif.ctrl); //////////////////////////////////////////////////////////////////// -- cgit v1.2.3