From cbb6384d32c4926822ba9216992253deef9ef3b5 Mon Sep 17 00:00:00 2001

From: Hans de Goede <hdegoede@redhat.com>

Date: Fri, 2 Mar 2012 11:02:04 +0100

Subject: [PATCH 131/140] usb-ehci: Rip the queues when the async or period

 schedule is halted

Signed-off-by: Hans de Goede <hdegoede@redhat.com>

---

 hw/usb-ehci.c |    5 ++++-

 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c

index b8ba483..11eded7 100644

--- a/hw/usb-ehci.c

+++ b/hw/usb-ehci.c

@@ -1054,7 +1054,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);

         }

@@ -2116,6 +2117,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;

@@ -2176,6 +2178,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.9.3