From patchwork Fri Dec 17 11:26:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 75889 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 06873B7082 for ; Sat, 18 Dec 2010 00:12:49 +1100 (EST) Received: from localhost ([127.0.0.1]:39281 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PTYc5-0005Db-A9 for incoming@patchwork.ozlabs.org; Fri, 17 Dec 2010 06:36:41 -0500 Received: from [140.186.70.92] (port=39128 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PTYSu-0007zW-SR for qemu-devel@nongnu.org; Fri, 17 Dec 2010 06:27:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PTYSr-0007Sr-HZ for qemu-devel@nongnu.org; Fri, 17 Dec 2010 06:27:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:14861) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PTYSr-0007Sh-5z for qemu-devel@nongnu.org; Fri, 17 Dec 2010 06:27:09 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oBHBR82H026101 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 17 Dec 2010 06:27:08 -0500 Received: from rincewind.home.kraxel.org (vpn2-10-81.ams2.redhat.com [10.36.10.81]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oBHBQwGq007956; Fri, 17 Dec 2010 06:26:59 -0500 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id ACE0B4130B; Fri, 17 Dec 2010 12:26:47 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 17 Dec 2010 12:26:28 +0100 Message-Id: <1292585206-24862-13-git-send-email-kraxel@redhat.com> In-Reply-To: <1292585206-24862-1-git-send-email-kraxel@redhat.com> References: <1292585206-24862-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 12/30] usb: move USB_REQ_SET_ADDRESS handling to common code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org USB_REQ_SET_ADDRESS handling is identical in *all* emulated devices. Move it to common code. Signed-off-by: Gerd Hoffmann --- hw/usb-bt.c | 4 ---- hw/usb-desc.c | 6 ++++++ hw/usb-hid.c | 4 ---- hw/usb-hub.c | 4 ---- hw/usb-msd.c | 4 ---- hw/usb-net.c | 5 ----- hw/usb-serial.c | 4 ---- hw/usb-wacom.c | 4 ---- trace-events | 1 + 9 files changed, 7 insertions(+), 29 deletions(-) diff --git a/hw/usb-bt.c b/hw/usb-bt.c index d7959ad..c0bfc35 100644 --- a/hw/usb-bt.c +++ b/hw/usb-bt.c @@ -413,10 +413,6 @@ static int usb_bt_handle_control(USBDevice *dev, int request, int value, } ret = 0; break; - case DeviceOutRequest | USB_REQ_SET_ADDRESS: - dev->addr = value; - ret = 0; - break; case DeviceRequest | USB_REQ_GET_CONFIGURATION: data[0] = 1; ret = 1; diff --git a/hw/usb-desc.c b/hw/usb-desc.c index 69ab207..3e87f46 100644 --- a/hw/usb-desc.c +++ b/hw/usb-desc.c @@ -266,6 +266,12 @@ int usb_desc_handle_control(USBDevice *dev, int request, int value, assert(desc != NULL); switch(request) { + case DeviceOutRequest | USB_REQ_SET_ADDRESS: + dev->addr = value; + trace_usb_set_addr(dev->addr); + ret = 0; + break; + case DeviceRequest | USB_REQ_GET_DESCRIPTOR: ret = usb_desc_get_descriptor(dev, value, data, length); break; diff --git a/hw/usb-hid.c b/hw/usb-hid.c index 74d17fc..72daddf 100644 --- a/hw/usb-hid.c +++ b/hw/usb-hid.c @@ -695,10 +695,6 @@ static int usb_hid_handle_control(USBDevice *dev, int request, int value, } ret = 0; break; - case DeviceOutRequest | USB_REQ_SET_ADDRESS: - dev->addr = value; - ret = 0; - break; case DeviceRequest | USB_REQ_GET_CONFIGURATION: data[0] = 1; ret = 1; diff --git a/hw/usb-hub.c b/hw/usb-hub.c index 0f8d060..51a67a2 100644 --- a/hw/usb-hub.c +++ b/hw/usb-hub.c @@ -297,10 +297,6 @@ static int usb_hub_handle_control(USBDevice *dev, int request, int value, } ret = 0; break; - case DeviceOutRequest | USB_REQ_SET_ADDRESS: - dev->addr = value; - ret = 0; - break; case DeviceRequest | USB_REQ_GET_CONFIGURATION: data[0] = 1; ret = 1; diff --git a/hw/usb-msd.c b/hw/usb-msd.c index 9aa8888..b54ccbc 100644 --- a/hw/usb-msd.c +++ b/hw/usb-msd.c @@ -261,10 +261,6 @@ static int usb_msd_handle_control(USBDevice *dev, int request, int value, } ret = 0; break; - case DeviceOutRequest | USB_REQ_SET_ADDRESS: - dev->addr = value; - ret = 0; - break; case DeviceRequest | USB_REQ_GET_CONFIGURATION: data[0] = 1; ret = 1; diff --git a/hw/usb-net.c b/hw/usb-net.c index 3a34414..1a57ef7 100644 --- a/hw/usb-net.c +++ b/hw/usb-net.c @@ -1075,11 +1075,6 @@ static int usb_net_handle_control(USBDevice *dev, int request, int value, ret = 0; break; - case DeviceOutRequest | USB_REQ_SET_ADDRESS: - dev->addr = value; - ret = 0; - break; - case ClassInterfaceOutRequest | USB_CDC_SEND_ENCAPSULATED_COMMAND: if (!s->rndis || value || index != 0) goto fail; diff --git a/hw/usb-serial.c b/hw/usb-serial.c index f89eb9b..c1f31c7 100644 --- a/hw/usb-serial.c +++ b/hw/usb-serial.c @@ -254,10 +254,6 @@ static int usb_serial_handle_control(USBDevice *dev, int request, int value, } ret = 0; break; - case DeviceOutRequest | USB_REQ_SET_ADDRESS: - dev->addr = value; - ret = 0; - break; case DeviceRequest | USB_REQ_GET_CONFIGURATION: data[0] = 1; ret = 1; diff --git a/hw/usb-wacom.c b/hw/usb-wacom.c index ffe6ac7..ad1c3ae 100644 --- a/hw/usb-wacom.c +++ b/hw/usb-wacom.c @@ -284,10 +284,6 @@ static int usb_wacom_handle_control(USBDevice *dev, int request, int value, } ret = 0; break; - case DeviceOutRequest | USB_REQ_SET_ADDRESS: - dev->addr = value; - ret = 0; - break; case DeviceRequest | USB_REQ_GET_CONFIGURATION: data[0] = 1; ret = 1; diff --git a/trace-events b/trace-events index 23303c4..3372b78 100644 --- a/trace-events +++ b/trace-events @@ -194,6 +194,7 @@ disable sun4m_iommu_bad_addr(uint64_t addr) "bad addr %"PRIx64"" disable usb_desc_device(int addr, int len, int ret) "dev %d query device, len %d, ret %d" disable usb_desc_config(int addr, int index, int len, int ret) "dev %d query config %d, len %d, ret %d" disable usb_desc_string(int addr, int index, int len, int ret) "dev %d query string %d, len %d, ret %d" +disable usb_set_addr(int addr) "dev %d" # vl.c disable vm_state_notify(int running, int reason) "running %d reason %d"