diff options
author | Josh Blum <josh@joshknows.com> | 2010-11-11 16:08:00 -0800 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-11-11 16:08:00 -0800 |
commit | 5bcfc2c9fb6f190580c3d9200acc7d04b4ca3c1c (patch) | |
tree | 9468e9982f85988a9fd9dd89ce15b9da857e9832 | |
parent | 5da1e3e2d683eecce1f0e888d90caef40661e98e (diff) | |
download | uhd-5bcfc2c9fb6f190580c3d9200acc7d04b4ca3c1c.tar.gz uhd-5bcfc2c9fb6f190580c3d9200acc7d04b4ca3c1c.tar.bz2 uhd-5bcfc2c9fb6f190580c3d9200acc7d04b4ca3c1c.zip |
usrp2: fix discovery timeout, use default
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp index 5f549c4fd..01a753d9e 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.cpp +++ b/host/lib/usrp/usrp2/usrp2_impl.cpp @@ -36,9 +36,6 @@ using namespace uhd::usrp; using namespace uhd::transport; namespace asio = boost::asio; -//! wait this long for a control response when discovering devices -static const size_t DISCOVERY_TIMEOUT_MS = 100; - /*********************************************************************** * Helper Functions **********************************************************************/ @@ -100,7 +97,7 @@ static uhd::device_addrs_t usrp2_find(const device_addr_t &hint){ boost::uint8_t usrp2_ctrl_data_in_mem[udp_simple::mtu]; //allocate max bytes for recv const usrp2_ctrl_data_t *ctrl_data_in = reinterpret_cast<const usrp2_ctrl_data_t *>(usrp2_ctrl_data_in_mem); while(true){ - size_t len = udp_transport->recv(asio::buffer(usrp2_ctrl_data_in_mem), DISCOVERY_TIMEOUT_MS); + size_t len = udp_transport->recv(asio::buffer(usrp2_ctrl_data_in_mem)); //std::cout << len << "\n"; if (len > offsetof(usrp2_ctrl_data_t, data) and ntohl(ctrl_data_in->id) == USRP2_CTRL_ID_WAZZUP_DUDE){ //make a boost asio ipv4 with the raw addr in host byte order |