usrp: Fixed firmware load regression

This fixes a bug from "Applied libusb-1.0 patch set from Thomas
Tsou <ttsou@vt.edu>" b5aa407ec2b1bdebc1c950a9428789fe50327776

The bus rescan after firmware load was stomped with the addition of
libusb-1.0 support causing the subsequent device open to fail.
libusb-1.0 doesn't (appear to) require the bus to be explicity
rescanned. The rescan is added back for libusb-0.1. For libusb-1.0
the rescan nops.

diff --git a/usrp/host/lib/usrp_prims_common.cc b/usrp/host/lib/usrp_prims_common.cc
index 2d8a0fa2ab8cad17c9ea4c4cccd336288bc22ba9..20a55653cf4f882af237633e1b31a0984dcb36f7 100644 (file)
--- a/usrp/host/lib/usrp_prims_common.cc
+++ b/usrp/host/lib/usrp_prims_common.cc
@@ -692,11 +692,13 @@ usrp_load_firmware_nth (int nth, const char *filename, bool force, libusb_contex
 
     // FIXME.  Turn this into a loop that rescans until we refind ourselves
 
-    struct timespec     t;      // delay for 1 second
+    struct timespec     t;      // delay for 2 second
     t.tv_sec = 2;
     t.tv_nsec = 0;
     our_nanosleep (&t);
 
+    usrp_rescan ();
+
     return ULS_OK;
 
   default: