diff options
Diffstat (limited to 'host/lib/usrp/mpmd')
| -rw-r--r-- | host/lib/usrp/mpmd/mpmd_image_loader.cpp | 1 | ||||
| -rw-r--r-- | host/lib/usrp/mpmd/mpmd_impl.cpp | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/host/lib/usrp/mpmd/mpmd_image_loader.cpp b/host/lib/usrp/mpmd/mpmd_image_loader.cpp index c25d9b8ce..40536d147 100644 --- a/host/lib/usrp/mpmd/mpmd_image_loader.cpp +++ b/host/lib/usrp/mpmd/mpmd_image_loader.cpp @@ -119,6 +119,7 @@ static bool mpmd_image_loader(const image_loader::image_loader_args_t &image_loa } // Call RPC to update the component + UHD_LOG_INFO("MPMD IMAGE LOADER", "Starting update. This may take a while."); tree->access<uhd::usrp::component_files_t>("/mboards/0/components/fpga").set(all_component_files); UHD_LOG_INFO("MPMD IMAGE LOADER", "Update component function succeeded."); diff --git a/host/lib/usrp/mpmd/mpmd_impl.cpp b/host/lib/usrp/mpmd/mpmd_impl.cpp index f06f7b2a4..ae0e31f62 100644 --- a/host/lib/usrp/mpmd/mpmd_impl.cpp +++ b/host/lib/usrp/mpmd/mpmd_impl.cpp @@ -44,7 +44,7 @@ namespace { //! MPM Compatibility number const std::vector<size_t> MPM_COMPAT_NUM = {1, 1}; //! Timeout value for the update_component RPC call (ms) - const size_t MPMD_UPDATE_COMPONENT_TIMEOUT = 10000; + const size_t MPMD_UPDATE_COMPONENT_TIMEOUT = 20000; /************************************************************************* * Helper functions @@ -77,7 +77,8 @@ namespace { } // Now call update component - mb->rpc->set_timeout(MPMD_UPDATE_COMPONENT_TIMEOUT); + const size_t update_component_timeout = MPMD_UPDATE_COMPONENT_TIMEOUT * comps.size(); + mb->rpc->set_timeout(update_component_timeout); mb->rpc->notify_with_token("update_component", all_metadata, all_data); mb->set_timeout_default(); |