ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb-host: fix halted endpoints 

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 <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2011-08-24 10:55:40 +02:00
parent 40197c359b
commit 9b87e19bc7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usb-linux.c
View File

@ -143,6 +143,7 @@ static int parse_filter(const char *spec, struct USBAutoFilter *f);
static void usb_host_auto_check(void *unused); static void usb_host_auto_check(void *unused);
static int usb_host_read_file(char *line, size_t line_size, static int usb_host_read_file(char *line, size_t line_size,
const char *device_file, const char *device_name); 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) 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); ioctl(s->fd, USBDEVFS_RESET);
usb_host_claim_interfaces(s, s->configuration); usb_host_claim_interfaces(s, s->configuration);
usb_linux_update_endp_table(s);
} }
static void usb_host_handle_destroy(USBDevice *dev) 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); 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 /* 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 that the controller never runs out of them, otherwise the device will
likely suffer a buffer underrun / overrun. */ 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)) { 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) { if (ret < 0) {
perror("USBDEVFS_CLEAR_HALT"); perror("USBDEVFS_CLEAR_HALT");
trace_usb_host_req_complete(s->bus_num, s->addr, USB_RET_NAK); trace_usb_host_req_complete(s->bus_num, s->addr, USB_RET_NAK);