From owner-freebsd-emulation@FreeBSD.ORG Tue Aug 16 07:50:06 2011 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D0FAA1065673 for ; Tue, 16 Aug 2011 07:50:06 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe05.c2i.net [212.247.154.130]) by mx1.freebsd.org (Postfix) with ESMTP id 2C4FE8FC15 for ; Tue, 16 Aug 2011 07:50:05 +0000 (UTC) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.1 cv=b20eX9+WwT+rchjRp65q2r9rWd5NV3fsbYwDDw8k8E8= c=1 sm=1 a=fJEGAQ7EGC8A:10 a=WQU8e4WWZSUA:10 a=CL8lFSKtTFcA:10 a=i9M/sDlu2rpZ9XS819oYzg==:17 a=4dUV7anAB9YGbLdZuTQA:9 a=4NtnIaRTLMHL91dE4QwA:7 a=pILNOxqGKmIA:10 a=8PRmaPxWSHiRE86-vQ4A:9 a=GIi2Wv7FhjRqQxNC:21 a=NSU_4XTvM9YSOr7i:21 a=i9M/sDlu2rpZ9XS819oYzg==:117 Received: from [188.126.198.129] (account mc467741@c2i.net HELO laptop002.hselasky.homeunix.org) by mailfe05.swip.net (CommuniGate Pro SMTP 5.2.19) with ESMTPA id 164351699; Tue, 16 Aug 2011 09:40:02 +0200 To: Juergen Lock From: Hans Petter Selasky X-Face: *nPdTl_}RuAI6^PVpA02T?$%Xa^>@hE0uyUIoiha$pC:9TVgl.Oq,NwSZ4V" =?iso-8859-15?q?=7CLR=2E+tj=7Dg5=0A=09=25V?=,x^qOs~mnU3]Gn; cQLv&.N>TrxmSFf+p6(30a/{)KUU!s}w\IhQBj}[g}bj0I3^glmC( =?iso-8859-15?q?=0A=09=3AAuzV9=3A=2EhESm-x4h240C=609=3Dw?= Date: Tue, 16 Aug 2011 09:37:39 +0200 MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_D5hSOoqXjo4E+bg" Message-Id: <201108160937.39168.hselasky@c2i.net> Cc: "freebsd-emulation@FreeBSD.org" , "qemu-devel@nongnu.org" , "freebsd-usb@FreeBSD.org" Subject: Re: qemu 0.15.0 testing, usb redirection, and libusb_get_device_speed() X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Aug 2011 07:50:07 -0000 --Boundary-00=_D5hSOoqXjo4E+bg Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit 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 --Boundary-00=_D5hSOoqXjo4E+bg Content-Type: text/plain; charset="windows-1252"; name="libusb_speed.txt" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="libusb_speed.txt" === 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) { --Boundary-00=_D5hSOoqXjo4E+bg--