summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrung Tran <trung.tran@ettus.com>2019-01-29 10:46:57 -0800
committerBrent Stapleton <brent.stapleton@ettus.com>2019-01-29 11:32:08 -0800
commitc043f92e810da4682572eefb308c7fb7c451a2c7 (patch)
tree1db1a45eb289abed7c97dc9dab425d5a8ba5e58a
parentRFNoC: Update FIFO XML definition (diff)
downloaduhd-c043f92e810da4682572eefb308c7fb7c451a2c7.tar.xz
uhd-c043f92e810da4682572eefb308c7fb7c451a2c7.zip
mpmd: use init timeout for update_component
update_component will reinit the device therefore we should use MPMD_DEFAULT_INIT_TIMEOUT.
-rw-r--r--host/lib/usrp/mpmd/mpmd_prop_tree.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/host/lib/usrp/mpmd/mpmd_prop_tree.cpp b/host/lib/usrp/mpmd/mpmd_prop_tree.cpp
index e4ebee5ac..e1b5d43cb 100644
--- a/host/lib/usrp/mpmd/mpmd_prop_tree.cpp
+++ b/host/lib/usrp/mpmd/mpmd_prop_tree.cpp
@@ -17,8 +17,6 @@ using namespace uhd;
using namespace uhd::mpmd;
namespace {
-//! Timeout value for the update_component RPC call (ms)
-constexpr size_t MPMD_UPDATE_COMPONENT_TIMEOUT = 20000;
/*! Update a component using all required files. For example, when updating the FPGA image
* (.bit or .bin), users can provide a new overlay image (DTS) to apply in addition.
@@ -53,9 +51,8 @@ uhd::usrp::component_files_t _update_component(
}
// Now call update component
- const size_t update_component_timeout = MPMD_UPDATE_COMPONENT_TIMEOUT * comps.size();
mb->rpc->notify_with_token(
- update_component_timeout, "update_component", all_metadata, all_data);
+ MPMD_DEFAULT_INIT_TIMEOUT, "update_component", all_metadata, all_data);
return all_comps_copy;
}