[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 48/54] xhci: move register update into xhci_intr_rai
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 48/54] xhci: move register update into xhci_intr_raise |
Date: |
Thu, 6 Sep 2012 09:12:49 +0200 |
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 <address@hidden>
---
hw/usb/hcd-xhci.c | 14 +++++---------
1 files 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.1
- [Qemu-devel] [PATCH 33/54] xhci: move device lookup into xhci_setup_packet, (continued)
- [Qemu-devel] [PATCH 33/54] xhci: move device lookup into xhci_setup_packet, Gerd Hoffmann, 2012/09/06
- [Qemu-devel] [PATCH 09/54] ehci: Properly report completed but not yet processed packets to the guest, Gerd Hoffmann, 2012/09/06
- [Qemu-devel] [PATCH 36/54] xhci: trace cc codes in cleartext, Gerd Hoffmann, 2012/09/06
- [Qemu-devel] [PATCH 38/54] xhci: fix runtime write tracepoint, Gerd Hoffmann, 2012/09/06
- [Qemu-devel] [PATCH 31/54] xhci: rip out background transfer code, Gerd Hoffmann, 2012/09/06
- [Qemu-devel] [PATCH 42/54] usb3: superspeed endpoint companion, Gerd Hoffmann, 2012/09/06
- [Qemu-devel] [PATCH 34/54] xhci: implement mfindex, Gerd Hoffmann, 2012/09/06
- [Qemu-devel] [PATCH 35/54] xhci: iso xfer support, Gerd Hoffmann, 2012/09/06
- [Qemu-devel] [PATCH 47/54] xhci: add msix support, Gerd Hoffmann, 2012/09/06
- [Qemu-devel] [PATCH 45/54] xhci: fix & cleanup msi., Gerd Hoffmann, 2012/09/06
- [Qemu-devel] [PATCH 48/54] xhci: move register update into xhci_intr_raise,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 46/54] xhci: rework interrupt handling, Gerd Hoffmann, 2012/09/06
- [Qemu-devel] [PATCH 50/54] xhci: prepare xhci_runtime_{read, write} for multiple interrupters, Gerd Hoffmann, 2012/09/06
- [Qemu-devel] [PATCH 49/54] xhci: add XHCIInterrupter, Gerd Hoffmann, 2012/09/06
- [Qemu-devel] [PATCH 54/54] xhci: allow bytewise capability register reads, Gerd Hoffmann, 2012/09/06
- [Qemu-devel] [PATCH 29/54] Better name usb braille device, Gerd Hoffmann, 2012/09/06
- [Qemu-devel] [PATCH 22/54] usb-redir: Move to core packet id and queue handling, Gerd Hoffmann, 2012/09/06
- [Qemu-devel] [PATCH 51/54] xhci: pick target interrupter, Gerd Hoffmann, 2012/09/06
- [Qemu-devel] [PATCH 53/54] xhci: kill xhci_mem_{read, write} dispatcher functions, Gerd Hoffmann, 2012/09/06
- [Qemu-devel] [PATCH 32/54] xhci: drop buffering, Gerd Hoffmann, 2012/09/06
- Re: [Qemu-devel] [PULL 00/54] usb patch queue, Aurelien Jarno, 2012/09/10