[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/7] usb-host: fix halted endpoints
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 3/7] usb-host: fix halted endpoints |
Date: |
Thu, 25 Aug 2011 17:06:53 +0200 |
Two fixes for the price of one ;)
First, reinitialize the endpoint table after device reset.
This is needed anyway as the reset might have switched interfaces.
It also clears the endpoint halted state.
Second the CLEAR_HALT ioctl wants a unsigned int passed in as
argument, not uint8_t.
This gets my usb sd card reader (sandisk micromate) going.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
usb-linux.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/usb-linux.c b/usb-linux.c
index ddfa50a..fe7b9d9 100644
--- a/usb-linux.c
+++ b/usb-linux.c
@@ -143,6 +143,7 @@ static int parse_filter(const char *spec, struct
USBAutoFilter *f);
static void usb_host_auto_check(void *unused);
static int usb_host_read_file(char *line, size_t line_size,
const char *device_file, const char *device_name);
+static int usb_linux_update_endp_table(USBHostDevice *s);
static struct endp_data *get_endp(USBHostDevice *s, int ep)
{
@@ -512,6 +513,7 @@ static void usb_host_handle_reset(USBDevice *dev)
ioctl(s->fd, USBDEVFS_RESET);
usb_host_claim_interfaces(s, s->configuration);
+ usb_linux_update_endp_table(s);
}
static void usb_host_handle_destroy(USBDevice *dev)
@@ -523,8 +525,6 @@ static void usb_host_handle_destroy(USBDevice *dev)
qemu_remove_exit_notifier(&s->exit);
}
-static int usb_linux_update_endp_table(USBHostDevice *s);
-
/* iso data is special, we need to keep enough urbs in flight to make sure
that the controller never runs out of them, otherwise the device will
likely suffer a buffer underrun / overrun. */
@@ -732,7 +732,8 @@ static int usb_host_handle_data(USBDevice *dev, USBPacket
*p)
}
if (is_halted(s, p->devep)) {
- ret = ioctl(s->fd, USBDEVFS_CLEAR_HALT, &ep);
+ unsigned int arg = ep;
+ ret = ioctl(s->fd, USBDEVFS_CLEAR_HALT, &arg);
if (ret < 0) {
perror("USBDEVFS_CLEAR_HALT");
trace_usb_host_req_complete(s->bus_num, s->addr, USB_RET_NAK);
--
1.7.1
- [Qemu-devel] [PATCH 0/7] usb-host: bugfixes, Gerd Hoffmann, 2011/08/25
- [Qemu-devel] [PATCH 2/7] usb-host: reapurb error report fix, Gerd Hoffmann, 2011/08/25
- [Qemu-devel] [PATCH 4/7] usb-host: limit open retries, Gerd Hoffmann, 2011/08/25
- [Qemu-devel] [PATCH 3/7] usb-host: fix halted endpoints,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 6/7] usb-host: claim port, Gerd Hoffmann, 2011/08/25
- [Qemu-devel] [PATCH 7/7] usb: fix use after free, Gerd Hoffmann, 2011/08/25
- [Qemu-devel] [PATCH 5/7] usb-host: fix configuration tracking., Gerd Hoffmann, 2011/08/25
- [Qemu-devel] [PATCH 1/7] usb-host: start tracing support, Gerd Hoffmann, 2011/08/25