From 86a1c47ee1a1d1d2aa9b7904ecf5486bb3bf3eac Mon Sep 17 00:00:00 2001 From: Grant Meyerhoff Date: Mon, 14 Jun 2021 11:25:58 -0500 Subject: uhd: Add callback for setting sync_sources --- .../uhdlib/usrp/common/mpmd_mb_controller.hpp | 4 ++++ host/lib/rfnoc/mb_controller.cpp | 6 ++++++ host/lib/usrp/mpmd/mpmd_mb_controller.cpp | 25 ++++++++++++++++++++++ 3 files changed, 35 insertions(+) (limited to 'host/lib') diff --git a/host/lib/include/uhdlib/usrp/common/mpmd_mb_controller.hpp b/host/lib/include/uhdlib/usrp/common/mpmd_mb_controller.hpp index a40398991..e7498b9f5 100644 --- a/host/lib/include/uhdlib/usrp/common/mpmd_mb_controller.hpp +++ b/host/lib/include/uhdlib/usrp/common/mpmd_mb_controller.hpp @@ -101,6 +101,8 @@ public: std::vector get_gpio_src(const std::string& bank) override; void set_gpio_src( const std::string& bank, const std::vector& src) override; + void register_sync_source_updater( + mb_controller::sync_source_updater_t callback_f) override; private: /************************************************************************** @@ -118,6 +120,8 @@ private: std::vector _gpio_banks; std::unordered_map> _gpio_srcs; + std::vector _sync_source_updaters; + public: /*! When the FPGA is reloaded, pass the notification to every Radio block * Public to allow other classes to register for notifications. diff --git a/host/lib/rfnoc/mb_controller.cpp b/host/lib/rfnoc/mb_controller.cpp index 356224f83..c7034fd5f 100644 --- a/host/lib/rfnoc/mb_controller.cpp +++ b/host/lib/rfnoc/mb_controller.cpp @@ -191,3 +191,9 @@ void mb_controller::set_gpio_src(const std::string&, const std::vectorget_raw_rpc_client()->notify_with_token(MPMD_DEFAULT_LONG_TIMEOUT, "set_time_source", source); + if (!_sync_source_updaters.empty()) { + mb_controller::sync_source_t sync_source; + sync_source["time_source"] = source; + for (const auto& updater : _sync_source_updaters) { + updater(sync_source); + } + } } std::string mpmd_mb_controller::get_time_source() const @@ -140,6 +147,13 @@ std::vector mpmd_mb_controller::get_time_sources() const void mpmd_mb_controller::set_clock_source(const std::string& source) { _rpc->get_raw_rpc_client()->notify_with_token(MPMD_DEFAULT_LONG_TIMEOUT, "set_clock_source", source); + if (!_sync_source_updaters.empty()) { + mb_controller::sync_source_t sync_source; + sync_source["clock_source"] = source; + for (const auto& updater : _sync_source_updaters) { + updater(sync_source); + } + } } std::string mpmd_mb_controller::get_clock_source() const @@ -169,6 +183,11 @@ void mpmd_mb_controller::set_sync_source(const device_addr_t& sync_source) } _rpc->get_raw_rpc_client()->notify_with_token( MPMD_DEFAULT_LONG_TIMEOUT, "set_sync_source", sync_source_map); + if (!_sync_source_updaters.empty()) { + for (const auto& updater : _sync_source_updaters) { + updater(sync_source); + } + } } device_addr_t mpmd_mb_controller::get_sync_source() const @@ -259,3 +278,9 @@ void mpmd_mb_controller::set_gpio_src( } _rpc->set_gpio_src(bank, src); } + +void mpmd_mb_controller::register_sync_source_updater( + mb_controller::sync_source_updater_t callback_f) +{ + _sync_source_updaters.push_back(callback_f); +} -- cgit v1.2.3