From c7ca31b2f54b945ba4babf8ad329c938462c75f5 Mon Sep 17 00:00:00 2001

From: Gerd Hoffmann <kraxel@redhat.com>

Date: Thu, 30 Aug 2012 14:04:04 +0200

Subject: [PATCH 348/366] xhci: move register update into xhci_intr_raise

Now that we have a separate function to raise an IRQ we can move

some comon code into the function.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

---

 hw/usb/hcd-xhci.c | 14 +++++---------

 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c

index 3bac99a..e39fe04 100644

--- a/hw/usb/hcd-xhci.c

+++ b/hw/usb/hcd-xhci.c

@@ -662,8 +662,11 @@ static void xhci_msix_update(XHCIState *xhci)

 static void xhci_intr_raise(XHCIState *xhci)

 {

-    if (!(xhci->iman & IMAN_IP) ||

-        !(xhci->iman & IMAN_IE)) {

+    xhci->erdp_low |= ERDP_EHB;

+    xhci->iman |= IMAN_IP;

+    xhci->usbsts |= USBSTS_EINT;

+

+    if (!(xhci->iman & IMAN_IE)) {

         return;

     }

@@ -784,9 +787,6 @@ static void xhci_events_update(XHCIState *xhci)

     }

     if (do_irq) {

-        xhci->erdp_low |= ERDP_EHB;

-        xhci->iman |= IMAN_IP;

-        xhci->usbsts |= USBSTS_EINT;

         xhci_intr_raise(xhci);

     }

@@ -847,10 +847,6 @@ static void xhci_event(XHCIState *xhci, XHCIEvent *event)

         xhci_write_event(xhci, event);

     }

-    xhci->erdp_low |= ERDP_EHB;

-    xhci->iman |= IMAN_IP;

-    xhci->usbsts |= USBSTS_EINT;

-

     xhci_intr_raise(xhci);

 }

-- 

1.7.12