From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 23/23] usb-ohci: raise interrupt on attach
Date: Fri, 8 Jul 2011 11:51:13 +0200 [thread overview]
Message-ID: <1310118673-26196-24-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1310118673-26196-1-git-send-email-kraxel@redhat.com>
Got lost in commit 618c169b577db64ac6589ad48825d2e11760d1a6,
add it back in. Also fix codestyle while we are at it.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/usb-ohci.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c
index c77a20e..8491d59 100644
--- a/hw/usb-ohci.c
+++ b/hw/usb-ohci.c
@@ -327,6 +327,7 @@ static void ohci_attach(USBPort *port1)
{
OHCIState *s = port1->opaque;
OHCIPort *port = &s->rhport[port1->index];
+ uint32_t old_state = port->ctrl;
/* set connect status */
port->ctrl |= OHCI_PORT_CCS | OHCI_PORT_CSC;
@@ -344,6 +345,10 @@ static void ohci_attach(USBPort *port1)
}
DPRINTF("usb-ohci: Attached port %d\n", port1->index);
+
+ if (old_state != port->ctrl) {
+ ohci_set_interrupt(s, OHCI_INTR_RHSC);
+ }
}
static void ohci_detach(USBPort *port1)
@@ -366,8 +371,9 @@ static void ohci_detach(USBPort *port1)
}
DPRINTF("usb-ohci: Detached port %d\n", port1->index);
- if (old_state != port->ctrl)
+ if (old_state != port->ctrl) {
ohci_set_interrupt(s, OHCI_INTR_RHSC);
+ }
}
static void ohci_wakeup(USBPort *port1)
--
1.7.1
next prev parent reply other threads:[~2011-07-08 9:51 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-08 9:50 [Qemu-devel] [PULL] usb patch queue Gerd Hoffmann
2011-07-08 9:50 ` [Qemu-devel] [PATCH 01/23] hw/usb-musb.c: Don't misuse usb_packet_complete() Gerd Hoffmann
2011-07-08 9:50 ` [Qemu-devel] [PATCH 02/23] usb: Add a usb_fill_port helper function Gerd Hoffmann
2011-07-08 9:50 ` [Qemu-devel] [PATCH 03/23] usb: Move (initial) call of usb_port_location to usb_fill_port Gerd Hoffmann
2011-07-08 9:50 ` [Qemu-devel] [PATCH 04/23] usb: Add a register_companion USB bus op Gerd Hoffmann
2011-07-08 9:50 ` [Qemu-devel] [PATCH 05/23] usb: Make port wakeup and complete ops take a USBPort instead of a Device Gerd Hoffmann
2011-07-08 9:50 ` [Qemu-devel] [PATCH 06/23] usb: Replace device_destroy bus op with a child_detach port op Gerd Hoffmann
2011-07-08 9:50 ` [Qemu-devel] [PATCH 07/23] usb-ehci: drop unused num-ports state member Gerd Hoffmann
2011-07-08 9:50 ` [Qemu-devel] [PATCH 08/23] usb-ehci: Connect Status bit is read only, don't allow changing it by the guest Gerd Hoffmann
2011-07-08 9:50 ` [Qemu-devel] [PATCH 09/23] usb-ehci: cleanup port reset handling Gerd Hoffmann
2011-07-08 9:51 ` [Qemu-devel] [PATCH 10/23] usb: assert on calling usb_attach(port, NULL) on a port without a dev Gerd Hoffmann
2011-07-08 9:51 ` [Qemu-devel] [PATCH 11/23] usb-ehci: Fix handling of PED and PEDC port status bits Gerd Hoffmann
2011-07-08 9:51 ` [Qemu-devel] [PATCH 12/23] usb-ehci: Add support for registering companion controllers Gerd Hoffmann
2011-07-08 9:51 ` [Qemu-devel] [PATCH 13/23] usb-uhci: Add support for being a companion controller Gerd Hoffmann
2011-07-08 9:51 ` [Qemu-devel] [PATCH 14/23] usb-ohci: " Gerd Hoffmann
2011-07-08 9:51 ` [Qemu-devel] [PATCH 15/23] pci: add ich9 usb controller ids Gerd Hoffmann
2011-07-08 9:51 ` [Qemu-devel] [PATCH 16/23] uhci: add ich9 controllers Gerd Hoffmann
2011-07-08 9:51 ` [Qemu-devel] [PATCH 17/23] ehci: fix port count Gerd Hoffmann
2011-07-08 9:51 ` [Qemu-devel] [PATCH 18/23] ehci: add ich9 controller Gerd Hoffmann
2011-07-08 9:51 ` [Qemu-devel] [PATCH 19/23] usb: update documentation Gerd Hoffmann
2011-07-08 9:51 ` [Qemu-devel] [PATCH 20/23] usb_register_port(): do not set port->opaque and port->index twice Gerd Hoffmann
2011-07-08 9:51 ` [Qemu-devel] [PATCH 21/23] usb: fixup bluetooth descriptors Gerd Hoffmann
2011-07-08 9:51 ` [Qemu-devel] [PATCH 22/23] usb-hub: remove unused descriptor arrays Gerd Hoffmann
2011-07-08 9:51 ` Gerd Hoffmann [this message]
2011-07-12 14:52 ` [Qemu-devel] [PULL] usb patch queue Gerd Hoffmann
2011-07-19 15:59 ` Anthony Liguori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1310118673-26196-24-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).