diff options
| author | Thomas Tsou | 2009-10-15 20:58:32 -0400 |
|---|---|---|
| committer | Thomas Tsou | 2009-10-15 21:32:11 -0400 |
| commit | 0f4226088ba84e25139bf77957c80ca7a64cba11 (patch) | |
| tree | 7e0be2b0d89024909dbc14b4d63a4b67d1ccecb9 /usrp/host | |
| parent | 84ba64078a2a37b2324d693ba0048e635373bfb6 (diff) | |
| download | gnuradio-0f4226088ba84e25139bf77957c80ca7a64cba11.tar.gz gnuradio-0f4226088ba84e25139bf77957c80ca7a64cba11.tar.bz2 gnuradio-0f4226088ba84e25139bf77957c80ca7a64cba11.zip | |
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.
Diffstat (limited to 'usrp/host')
| -rw-r--r-- | usrp/host/lib/usrp_prims_common.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usrp/host/lib/usrp_prims_common.cc b/usrp/host/lib/usrp_prims_common.cc index 2d8a0fa2a..20a55653c 100644 --- 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: |