On Monday 15 August 2011 22:26:56 Juergen Lock wrote:
> Hi!
>
> I just prepared a preliminary update of the emulators/qemu-devel
> port to 0.15.0 [1], and among other things it now also has a
> usb network redirection feature using usbredir [2], which uses
> libusb 1.0 and a function that is missing in our version,
> libusb_get_device_speed(). I added a stub to the code that
> always returns LIBUSB_SPEED_UNKNOWN
> (files/patch-usbredirhost-usbredirhost.c in the usbredir port [2]),
> question for Hans (I guess), would there be an easy way to make a
> `proper' implementation?
>
> If anyone wants to help me test qemu 0.15.0, thanx!
Please try the attached patch to libusb in /usr/src/lib/libusb .
You only need to rebuild libusb: make all install clean
> FETCHENTRY: entry at 22C5484 is of type 2 which is not supported
> yet processing error - resetting ehci HC
Try my patch first. EHCI needs to know device speed.
--HPS
=== libusb.h
==================================================================
--- libusb.h (revision 224768)
+++ libusb.h (local)
@@ -151,6 +151,14 @@
LIBUSB_ERROR_OTHER = -99,
};
+enum libusb_speed {
+ LIBUSB_SPEED_UNKNOWN = 0,
+ LIBUSB_SPEED_LOW = 1,
+ LIBUSB_SPEED_FULL = 2,
+ LIBUSB_SPEED_HIGH = 3,
+ LIBUSB_SPEED_SUPER = 4,
+};
+
enum libusb_transfer_status {
LIBUSB_TRANSFER_COMPLETED,
LIBUSB_TRANSFER_ERROR,
@@ -304,6 +312,7 @@
void libusb_free_device_list(libusb_device ** list, int unref_devices);
uint8_t libusb_get_bus_number(libusb_device * dev);
uint8_t libusb_get_device_address(libusb_device * dev);
+enum libusb_speed libusb_get_device_speed(libusb_device * dev);
int libusb_clear_halt(libusb_device_handle *devh, uint8_t endpoint);
int libusb_get_max_packet_size(libusb_device * dev, uint8_t endpoint);
libusb_device *libusb_ref_device(libusb_device * dev);
=== libusb10.c
==================================================================
--- libusb10.c (revision 224768)
+++ libusb10.c (local)
@@ -272,6 +272,27 @@
return (libusb20_dev_get_address(dev->os_priv));
}
+enum libusb_speed
+libusb_get_device_speed(libusb_device *dev)
+{
+ if (dev == NULL)
+ return (0); /* should not happen */
+
+ switch (libusb20_dev_get_speed(dev->os_priv)) {
+ case LIBUSB20_SPEED_LOW:
+ return (LIBUSB_SPEED_LOW);
+ case LIBUSB20_SPEED_FULL:
+ return (LIBUSB_SPEED_FULL);
+ case LIBUSB20_SPEED_HIGH:
+ return (LIBUSB_SPEED_HIGH);
+ case LIBUSB20_SPEED_SUPER:
+ return (LIBUSB_SPEED_SUPER);
+ default:
+ break;
+ }
+ return (LIBUSB_SPEED_UNKNOWN);
+}
+
int
libusb_get_max_packet_size(libusb_device *dev, uint8_t endpoint)
{
