diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2012-08-30 11:20:51 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2012-08-31 15:47:57 +0200 |
| commit | adf478342b11cf9f540baf1f387b669210d3bea1 (patch) | |
| tree | ac0b17b4e509c9825d7b6c7e1d3726ffdd232264 | |
| parent | 287fd3f1dd0b2abbd69e58b402e5364b334e95bd (diff) | |
| download | qemu-adf478342b11cf9f540baf1f387b669210d3bea1.tar.gz qemu-adf478342b11cf9f540baf1f387b669210d3bea1.tar.bz2 qemu-adf478342b11cf9f540baf1f387b669210d3bea1.zip | |
ehci: Fix interrupt endpoints no longer working
One of the recent changes (likely the addition of queuing support) has broken
interrupt endpoints, this patch fixes this.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| -rw-r--r-- | hw/usb/hcd-ehci.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index eca1431bff..017342b56a 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -1987,10 +1987,19 @@ static int ehci_state_fetchqtd(EHCIQueue *q) ehci_set_state(q->ehci, q->async, EST_HORIZONTALQH); again = 1; } else if (p != NULL) { - if (p->async == EHCI_ASYNC_INFLIGHT) { + switch (p->async) { + case EHCI_ASYNC_NONE: + /* Previously nacked packet (likely interrupt ep) */ + ehci_set_state(q->ehci, q->async, EST_EXECUTE); + break; + case EHCI_ASYNC_INFLIGHT: + /* Unfinyshed async handled packet, go horizontal */ ehci_set_state(q->ehci, q->async, EST_HORIZONTALQH); - } else { + break; + case EHCI_ASYNC_FINISHED: + /* Should never happen, as this case is caught by fetchqh */ ehci_set_state(q->ehci, q->async, EST_EXECUTING); + break; } again = 1; } else { |