From 548bef02cafec8778f64b4c2348dc828f7cca83e Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Tue, 22 Jun 2021 12:24:33 +0200 Subject: zbx: Fix clang compiler warnings - Missing override - Superfluous 'this' lambda capture - Register state in zbx_cpld_ctrl was being initialized too late (this is actually a bug depending on compiler version) - Remove lots of unused fields from experts --- host/lib/usrp/dboard/zbx/zbx_dboard_init.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'host/lib/usrp/dboard/zbx/zbx_dboard_init.cpp') diff --git a/host/lib/usrp/dboard/zbx/zbx_dboard_init.cpp b/host/lib/usrp/dboard/zbx/zbx_dboard_init.cpp index ef86f10b6..f0558f8a4 100644 --- a/host/lib/usrp/dboard/zbx/zbx_dboard_init.cpp +++ b/host/lib/usrp/dboard/zbx/zbx_dboard_init.cpp @@ -190,7 +190,7 @@ void zbx_dboard_impl::_init_prop_tree() _cpld); subtree->create("eeprom") - .add_coerced_subscriber([this](const eeprom_map_t&) { + .add_coerced_subscriber([](const eeprom_map_t&) { throw uhd::runtime_error("Attempting to update daughterboard eeprom!"); }) .set_publisher([this]() { return get_db_eeprom(); }); @@ -261,8 +261,7 @@ uhd::usrp::pwr_cal_mgr::sptr zbx_dboard_impl::_init_power_cal( return trx == TX_DIRECTION ? get_tx_frequency(chan_idx) : get_rx_frequency(chan_idx); }, - [this, - trx_str = (trx == TX_DIRECTION ? "tx" : "rx"), + [trx_str = (trx == TX_DIRECTION ? "tx" : "rx"), fe_path, subtree, chan_str = std::to_string(chan_idx)]() -> std::string { @@ -327,16 +326,15 @@ void zbx_dboard_impl::_init_experts(uhd::property_tree::sptr subtree, expert_factory::add_worker_node(expert, expert->node_retriever(), fe_path, - chan_idx, get_pwr_mgr(trx).at(chan_idx), _rx_dsa_cal); } expert_factory::add_worker_node( - expert, expert->node_retriever(), fe_path, trx, chan_idx); + expert, expert->node_retriever(), fe_path); expert_factory::add_worker_node( - expert, expert->node_retriever(), fe_path, trx, chan_idx, _db_idx, _rpcc); + expert, expert->node_retriever(), fe_path, trx, chan_idx, _rpcc); // Initialize our LO Control Experts @@ -365,8 +363,6 @@ void zbx_dboard_impl::_init_experts(uhd::property_tree::sptr subtree, expert_factory::add_worker_node(expert, expert->node_retriever(), fe_path, - trx, - chan_idx, lo_select, lo_ctrl); _lo_ctrl_map.insert({lo, lo_ctrl}); -- cgit v1.2.3