From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:59748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qf7in-0005dW-7R for qemu-devel@nongnu.org; Fri, 08 Jul 2011 05:51:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qf7il-0004pj-QN for qemu-devel@nongnu.org; Fri, 08 Jul 2011 05:51:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64936) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qf7il-0004nc-92 for qemu-devel@nongnu.org; Fri, 08 Jul 2011 05:51:39 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p689pcPN019558 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 8 Jul 2011 05:51:38 -0400 From: Gerd Hoffmann Date: Fri, 8 Jul 2011 11:51:13 +0200 Message-Id: <1310118673-26196-24-git-send-email-kraxel@redhat.com> In-Reply-To: <1310118673-26196-1-git-send-email-kraxel@redhat.com> References: <1310118673-26196-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 23/23] usb-ohci: raise interrupt on attach List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Got lost in commit 618c169b577db64ac6589ad48825d2e11760d1a6, add it back in. Also fix codestyle while we are at it. Signed-off-by: Gerd Hoffmann --- 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