projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usrp: Corrected error message
[debian/gnuradio]
/
usrp
/
host
/
lib
/
usrp_prims_libusb0.cc
diff --git
a/usrp/host/lib/usrp_prims_libusb0.cc
b/usrp/host/lib/usrp_prims_libusb0.cc
index 0c8c3d1de764b4a68cc57e69d369157fb7d33286..4fbfabea941e3d6bcee733dbd3fb6f3c048cfb3a 100644
(file)
--- a/
usrp/host/lib/usrp_prims_libusb0.cc
+++ b/
usrp/host/lib/usrp_prims_libusb0.cc
@@
-69,7
+69,8
@@
_get_usb_string_descriptor (struct usb_dev_handle *udh, int index,
fprintf (stderr, "usrp: usb_get_string_descriptor failed: %s\n",
usb_strerror());
}
fprintf (stderr, "usrp: usb_get_string_descriptor failed: %s\n",
usb_strerror());
}
- return (ret);
+
+ return ret;
}
int
}
int
@@
-82,9
+83,9
@@
_usb_control_transfer (struct usb_dev_handle *udh, int request_type,
ret = usb_control_msg (udh, request_type,request, value, index,
(char*) data, length, (int) timeout);
if (ret < 0)
ret = usb_control_msg (udh, request_type,request, value, index,
(char*) data, length, (int) timeout);
if (ret < 0)
- fprintf (stderr, "usrp: usb_c
laim_interface
failed: %s\n", usb_strerror());
+ fprintf (stderr, "usrp: usb_c
ontrol_msg
failed: %s\n", usb_strerror());
- return
(ret)
;
+ return
ret
;
}
}
@@
-104,6
+105,12
@@
usrp_one_time_init (libusb_context **ctx)
}
}
}
}
+void
+usrp_deinit (libusb_context *ctx)
+{
+ // nop
+}
+
void
usrp_rescan ()
{
void
usrp_rescan ()
{