diff options
| author | Brent Stapleton <brent.stapleton@ettus.com> | 2018-02-08 16:18:23 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-02-09 01:41:32 +0100 |
| commit | ca81898889ae7fa3c2b7b2cdd67213a45dc82282 (patch) | |
| tree | 439f91aa23f24f08dd1ebe0e49b5c17b05707e42 /host | |
| parent | dfacf7d9963b58d77b0c173f10d3cd7623f970e3 (diff) | |
| download | uhd-ca81898889ae7fa3c2b7b2cdd67213a45dc82282.tar.gz uhd-ca81898889ae7fa3c2b7b2cdd67213a45dc82282.tar.bz2 uhd-ca81898889ae7fa3c2b7b2cdd67213a45dc82282.zip | |
fixup! mpmd: Factor find and prop tree init code out of mpmd_impl.cpp
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/usrp/mpmd/mpmd_impl.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/mpmd/mpmd_prop_tree.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/host/lib/usrp/mpmd/mpmd_impl.cpp b/host/lib/usrp/mpmd/mpmd_impl.cpp index 662676203..4b6d49a8b 100644 --- a/host/lib/usrp/mpmd/mpmd_impl.cpp +++ b/host/lib/usrp/mpmd/mpmd_impl.cpp @@ -32,8 +32,6 @@ namespace { const double MPMD_CHDR_MAX_RTT = 0.02; //! 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 = 20000; /************************************************************************* * Helper functions diff --git a/host/lib/usrp/mpmd/mpmd_prop_tree.cpp b/host/lib/usrp/mpmd/mpmd_prop_tree.cpp index 01e78e2cd..6ca308689 100644 --- a/host/lib/usrp/mpmd/mpmd_prop_tree.cpp +++ b/host/lib/usrp/mpmd/mpmd_prop_tree.cpp @@ -18,7 +18,7 @@ using namespace uhd::mpmd; namespace { //! Timeout value for the update_component RPC call (ms) - constexpr size_t MPMD_UPDATE_COMPONENT_TIMEOUT = 10000; + constexpr size_t MPMD_UPDATE_COMPONENT_TIMEOUT = 20000; uhd::usrp::component_files_t _update_component( const uhd::usrp::component_files_t& comps, @@ -48,7 +48,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(); |