diff options
| author | Thomas Tsou <ttsou@vt.edu> | 2010-08-27 16:20:15 -0700 |
|---|---|---|
| committer | Thomas Tsou <ttsou@vt.edu> | 2010-08-27 16:20:15 -0700 |
| commit | ec8005e3d5d1a80f89f5cfbaa8e1cdadf2d14db6 (patch) | |
| tree | 41b7303b667c98e8eddf4d470b5be41babc3da15 | |
| parent | 7f8c73faa22aaf2a381193d9f460857785e45023 (diff) | |
| download | uhd-ec8005e3d5d1a80f89f5cfbaa8e1cdadf2d14db6.tar.gz uhd-ec8005e3d5d1a80f89f5cfbaa8e1cdadf2d14db6.tar.bz2 uhd-ec8005e3d5d1a80f89f5cfbaa8e1cdadf2d14db6.zip | |
usrp1: Wait for USB device renumeration only when necessary
Waiting for FX2 renumeration is only needed after a firmware
load so move it out of the main device discovery loop and
into the firmware load itself.
| -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(); |