diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-27 16:59:24 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-27 16:59:24 -0700 |
| commit | 39629ec4aa1b8409b0c5470ebe51d92589b5957e (patch) | |
| tree | 79c2c7e3a7c1d05da112af9a18f683d0c07cf987 /host/lib/usrp/usrp1 | |
| parent | aa2ef7d246e93f4e6c0cb8b9b985a487cd2ea548 (diff) | |
| parent | ec8005e3d5d1a80f89f5cfbaa8e1cdadf2d14db6 (diff) | |
| download | uhd-39629ec4aa1b8409b0c5470ebe51d92589b5957e.tar.gz uhd-39629ec4aa1b8409b0c5470ebe51d92589b5957e.tar.bz2 uhd-39629ec4aa1b8409b0c5470ebe51d92589b5957e.zip | |
Merge branch 'usrp1' of ettus.sourcerepo.com:ettus/uhdpriv into usrp1
Diffstat (limited to 'host/lib/usrp/usrp1')
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_ctrl.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_impl.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_ctrl.cpp b/host/lib/usrp/usrp1/usrp1_ctrl.cpp index b7c6bdaf6..98226b738 100644 --- a/host/lib/usrp/usrp1/usrp1_ctrl.cpp +++ b/host/lib/usrp/usrp1/usrp1_ctrl.cpp @@ -19,6 +19,7 @@ #include "usrp_commands.h" #include <uhd/transport/usb_control.hpp> #include <boost/functional/hash.hpp> +#include <boost/thread/thread.hpp> #include <iostream> #include <fstream> #include <sstream> @@ -209,6 +210,9 @@ public: usrp_set_firmware_hash(hash); file.close(); + //wait for things to settle + boost::this_thread::sleep(boost::posix_time::milliseconds(1000)); + return USRP_FIRMWARE_LOAD_SUCCESS; } //type anything else is unhandled diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp index d37eec566..3c3306525 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.cpp +++ b/host/lib/usrp/usrp1/usrp1_impl.cpp @@ -69,9 +69,6 @@ static device_addrs_t usrp1_find(const device_addr_t &hint) } } - //wait for things to settle - boost::this_thread::sleep(boost::posix_time::milliseconds(1000)); - //get descriptors again with serial number device_list = usb_device_handle::get_device_list(); |