| Message ID | 1336478816-32522-1-git-send-email-kraxel@redhat.com |
|---|---|
| State | New |
| Headers | show |
Looks good, ACK. On 05/08/2012 02:06 PM, Gerd Hoffmann wrote: > Most important here is to update our internal endpoint state so we know > the endpoint isn't in halted state any more. Without this usb-host > tries to clear halt again with the next data transfer submitted. Doing > this twice is (a) not correct and (b) confuses some usb devices, > rendering them non-functional in the guest. > > Signed-off-by: Gerd Hoffmann<kraxel@redhat.com> > --- > hw/usb/host-linux.c | 9 +++++++++ > 1 files changed, 9 insertions(+), 0 deletions(-) > > diff --git a/hw/usb/host-linux.c b/hw/usb/host-linux.c > index bb08542..9094120 100644 > --- a/hw/usb/host-linux.c > +++ b/hw/usb/host-linux.c > @@ -1101,6 +1101,15 @@ static int usb_host_handle_control(USBDevice *dev, USBPacket *p, > ret = usb_host_set_interface(s, index, value); > trace_usb_host_req_emulated(s->bus_num, s->addr, p, ret); > return ret; > + > + case EndpointOutRequest | USB_REQ_CLEAR_FEATURE: > + if (value == 0) { /* clear halt */ > + int pid = (index& USB_DIR_IN) ? USB_TOKEN_IN : USB_TOKEN_OUT; > + ioctl(s->fd, USBDEVFS_CLEAR_HALT,&index); > + clear_halt(s, pid, index& 0x0f); > + trace_usb_host_req_emulated(s->bus_num, s->addr, p, 0); > + return 0; > + } > } > > /* The rest are asynchronous */
Looks VERY good, ACK! The DVD drive works now! On May 8, 2012 at 2:06 PM Gerd Hoffmann <kraxel@redhat.com> wrote: > Most important here is to update our internal endpoint state so we know > the endpoint isn't in halted state any more. Without this usb-host > tries to clear halt again with the next data transfer submitted. Doing > this twice is (a) not correct and (b) confuses some usb devices, > rendering them non-functional in the guest. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > hw/usb/host-linux.c | 9 +++++++++ > 1 files changed, 9 insertions(+), 0 deletions(-) > > diff --git a/hw/usb/host-linux.c b/hw/usb/host-linux.c > index bb08542..9094120 100644 > --- a/hw/usb/host-linux.c > +++ b/hw/usb/host-linux.c > @@ -1101,6 +1101,15 @@ static int usb_host_handle_control(USBDevice *dev, USBPacket *p, > ret = usb_host_set_interface(s, index, value); > trace_usb_host_req_emulated(s->bus_num, s->addr, p, ret); > return ret; > + > + case EndpointOutRequest | USB_REQ_CLEAR_FEATURE: > + if (value == 0) { /* clear halt */ > + int pid = (index & USB_DIR_IN) ? USB_TOKEN_IN : USB_TOKEN_OUT; > + ioctl(s->fd, USBDEVFS_CLEAR_HALT, &index); > + clear_halt(s, pid, index & 0x0f); > + trace_usb_host_req_emulated(s->bus_num, s->addr, p, 0); > + return 0; > + } > } > > /* The rest are asynchronous */ > -- > 1.7.1 > >
On 05/08/12 14:06, Gerd Hoffmann wrote: > Most important here is to update our internal endpoint state so we know > the endpoint isn't in halted state any more. Without this usb-host > tries to clear halt again with the next data transfer submitted. Doing > this twice is (a) not correct and (b) confuses some usb devices, > rendering them non-functional in the guest. Anthony, can you pick this directly? It is the only 1.1 usb patch in the queue right now ... cheers, Gerd
diff --git a/hw/usb/host-linux.c b/hw/usb/host-linux.c index bb08542..9094120 100644 --- a/hw/usb/host-linux.c +++ b/hw/usb/host-linux.c @@ -1101,6 +1101,15 @@ static int usb_host_handle_control(USBDevice *dev, USBPacket *p, ret = usb_host_set_interface(s, index, value); trace_usb_host_req_emulated(s->bus_num, s->addr, p, ret); return ret; + + case EndpointOutRequest | USB_REQ_CLEAR_FEATURE: + if (value == 0) { /* clear halt */ + int pid = (index & USB_DIR_IN) ? USB_TOKEN_IN : USB_TOKEN_OUT; + ioctl(s->fd, USBDEVFS_CLEAR_HALT, &index); + clear_halt(s, pid, index & 0x0f); + trace_usb_host_req_emulated(s->bus_num, s->addr, p, 0); + return 0; + } } /* The rest are asynchronous */
Most important here is to update our internal endpoint state so we know the endpoint isn't in halted state any more. Without this usb-host tries to clear halt again with the next data transfer submitted. Doing this twice is (a) not correct and (b) confuses some usb devices, rendering them non-functional in the guest. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- hw/usb/host-linux.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)