From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:46389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rvot5-0005tZ-Uw for qemu-devel@nongnu.org; Fri, 10 Feb 2012 06:43:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rvosz-0000GH-GM for qemu-devel@nongnu.org; Fri, 10 Feb 2012 06:43:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:8788) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rvosz-0000G2-56 for qemu-devel@nongnu.org; Fri, 10 Feb 2012 06:43:29 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q1ABhSjS012917 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 10 Feb 2012 06:43:28 -0500 From: Gerd Hoffmann Date: Fri, 10 Feb 2012 12:43:00 +0100 Message-Id: <1328874204-20920-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1328874204-20920-1-git-send-email-kraxel@redhat.com> References: <1328874204-20920-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 04/28] usb: kill USB_MSG_{ATTACH,DETACH} List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann The USB subsystem pipes internal attach/detach notifications through usb_handle_packet() with a special magic PID. This indirection is a pretty pointless excercise as it ends up being handled by usb_generic_handle_packet anyway. Remove it. Signed-off-by: Gerd Hoffmann --- hw/usb.c | 14 +++----------- hw/usb.h | 2 -- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/hw/usb.c b/hw/usb.c index c3ff5b7..800dd83 100644 --- a/hw/usb.c +++ b/hw/usb.c @@ -35,7 +35,8 @@ void usb_attach(USBPort *port) assert(dev->attached); assert(dev->state == USB_STATE_NOTATTACHED); port->ops->attach(port); - usb_send_msg(dev, USB_MSG_ATTACH); + dev->state = USB_STATE_ATTACHED; + usb_device_handle_attach(dev); } void usb_detach(USBPort *port) @@ -45,7 +46,7 @@ void usb_detach(USBPort *port) assert(dev != NULL); assert(dev->state != USB_STATE_NOTATTACHED); port->ops->detach(port); - usb_send_msg(dev, USB_MSG_DETACH); + dev->state = USB_STATE_NOTATTACHED; } void usb_reset(USBPort *port) @@ -218,15 +219,6 @@ static int do_token_out(USBDevice *s, USBPacket *p) int usb_generic_handle_packet(USBDevice *s, USBPacket *p) { switch(p->pid) { - case USB_MSG_ATTACH: - s->state = USB_STATE_ATTACHED; - usb_device_handle_attach(s); - return 0; - - case USB_MSG_DETACH: - s->state = USB_STATE_NOTATTACHED; - return 0; - case USB_MSG_RESET: s->remote_wakeup = 0; s->addr = 0; diff --git a/hw/usb.h b/hw/usb.h index 13e7c8e..0bd9098 100644 --- a/hw/usb.h +++ b/hw/usb.h @@ -40,8 +40,6 @@ #define USB_TOKEN_OUT 0xe1 /* host -> device */ /* specific usb messages, also sent in the 'pid' parameter */ -#define USB_MSG_ATTACH 0x100 -#define USB_MSG_DETACH 0x101 #define USB_MSG_RESET 0x102 #define USB_RET_NODEV (-1) -- 1.7.1