[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/13] usb-ehci: Rip the queues when the async or pe
From: |
Hans de Goede |
Subject: |
[Qemu-devel] [PATCH 06/13] usb-ehci: Rip the queues when the async or period schedule is halted |
Date: |
Fri, 2 Mar 2012 19:32:27 +0100 |
Signed-off-by: Hans de Goede <address@hidden>
---
hw/usb-ehci.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c
index b349003..d386b84 100644
--- a/hw/usb-ehci.c
+++ b/hw/usb-ehci.c
@@ -1076,7 +1076,8 @@ static void ehci_mem_writel(void *ptr, target_phys_addr_t
addr, uint32_t val)
if (!(val & USBCMD_RUNSTOP) && (s->usbcmd & USBCMD_RUNSTOP)) {
qemu_del_timer(s->frame_timer);
- // TODO - should finish out some stuff before setting halt
+ ehci_queues_rip_all(s, 0);
+ ehci_queues_rip_all(s, 1);
ehci_set_usbsts(s, USBSTS_HALT);
}
@@ -2088,6 +2089,7 @@ static void ehci_advance_async_state(EHCIState *ehci)
case EST_ACTIVE:
if ( !(ehci->usbcmd & USBCMD_ASE)) {
+ ehci_queues_rip_all(ehci, async);
ehci_clear_usbsts(ehci, USBSTS_ASS);
ehci_set_state(ehci, async, EST_INACTIVE);
break;
@@ -2148,6 +2150,7 @@ static void ehci_advance_periodic_state(EHCIState *ehci)
case EST_ACTIVE:
if ( !(ehci->frindex & 7) && !(ehci->usbcmd & USBCMD_PSE)) {
+ ehci_queues_rip_all(ehci, async);
ehci_clear_usbsts(ehci, USBSTS_PSS);
ehci_set_state(ehci, async, EST_INACTIVE);
break;
--
1.7.7.6
- [Qemu-devel] [PATCH 0/13] usb patches, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 01/13] usb-redir: Set ep type and interface, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 04/13] usb-ehci: always call ehci_queues_rip_unused for period queues, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 03/13] usb-ehci: split our qh queue into async and periodic queues, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 08/13] usb-ehci: Fix cerr tracking, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 06/13] usb-ehci: Rip the queues when the async or period schedule is halted,
Hans de Goede <=
- [Qemu-devel] [PATCH 07/13] usb-ehci: Any packet completion except for NAK should set the interrupt, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 13/13] usb: add USB_RET_IOERROR, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 05/13] usb-ehci: Drop cached qhs when the doorbell gets rung, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 10/13] usb-ehci: Fix and simplify nakcnt handling, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 02/13] usb-ehci: Never follow table entries with the T-bit set, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 11/13] usb-ehci: Cleanup itd error handling, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 12/13] usb: return BABBLE rather then NAK when we receive too much data, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 09/13] usb-ehci: Remove dead nakcnt code, Hans de Goede, 2012/03/02