OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

uhci: Fixed length handling for SETUP and OUT tokens

Browse Source 
Fixes regression reported agains Linux 2.6.18.
Looks like XP and newer Linux kernels are less sensitive
to length returned for control transfers.

Signed-off-by: Max Krasnyansky <maxk@kernel.org>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5070 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aurel32 2008-08-22 08:58:08 +00:00
parent 7da76bcef2
commit 5d80824563
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/usb-uhci.c
View File

@ -635,7 +635,7 @@ static int uhci_broadcast_packet(UHCIState *s, USBPacket *p)
dprintf("uhci: packet enter. pid %s addr 0x%02x ep %d len %d\n", dprintf("uhci: packet enter. pid %s addr 0x%02x ep %d len %d\n",
pid2str(p->pid), p->devaddr, p->devep, p->len); pid2str(p->pid), p->devaddr, p->devep, p->len);
if (p->pid == USB_TOKEN_OUT) if (p->pid == USB_TOKEN_OUT || p->pid == USB_TOKEN_SETUP)
dump_data(p->data, p->len); dump_data(p->data, p->len);
ret = USB_RET_NODEV; ret = USB_RET_NODEV;
@ -755,7 +755,7 @@ out:
static int uhci_handle_td(UHCIState *s, uint32_t addr, UHCI_TD *td, uint32_t *int_mask) static int uhci_handle_td(UHCIState *s, uint32_t addr, UHCI_TD *td, uint32_t *int_mask)
{ {
UHCIAsync *async; UHCIAsync *async;
int len = 0, max_len, ret = 0; int len = 0, max_len;
uint8_t pid; uint8_t pid;
/* Is active ? */ /* Is active ? */
@ -798,12 +798,13 @@ static int uhci_handle_td(UHCIState *s, uint32_t addr, UHCI_TD *td, uint32_t *in
case USB_TOKEN_OUT: case USB_TOKEN_OUT:
case USB_TOKEN_SETUP: case USB_TOKEN_SETUP:
cpu_physical_memory_read(td->buffer, async->buffer, max_len); cpu_physical_memory_read(td->buffer, async->buffer, max_len);
ret = uhci_broadcast_packet(s, &async->packet); len = uhci_broadcast_packet(s, &async->packet);
len = max_len; if (len >= 0)
len = max_len;
break; break;
case USB_TOKEN_IN: case USB_TOKEN_IN:
ret = uhci_broadcast_packet(s, &async->packet); len = uhci_broadcast_packet(s, &async->packet);
break; break;
default: default:
@ -814,17 +815,17 @@ static int uhci_handle_td(UHCIState *s, uint32_t addr, UHCI_TD *td, uint32_t *in
return -1; return -1;
} }
if (ret == USB_RET_ASYNC) { if (len == USB_RET_ASYNC) {
uhci_async_link(s, async); uhci_async_link(s, async);
return 2; return 2;
} }
async->packet.len = ret; async->packet.len = len;
done: done:
ret = uhci_complete_td(s, td, async, int_mask); len = uhci_complete_td(s, td, async, int_mask);
uhci_async_free(s, async); uhci_async_free(s, async);
return ret; return len;
} }
static void uhci_async_complete(USBPacket *packet, void *opaque) static void uhci_async_complete(USBPacket *packet, void *opaque)