From patchwork Thu Oct 25 14:10:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 194168 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BC7022C00B4 for ; Fri, 26 Oct 2012 01:11:07 +1100 (EST) Received: from localhost ([::1]:37184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRO9J-0004Ho-N9 for incoming@patchwork.ozlabs.org; Thu, 25 Oct 2012 10:11:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRO95-0004Fr-IF for qemu-devel@nongnu.org; Thu, 25 Oct 2012 10:10:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TRO8z-0007Bf-7K for qemu-devel@nongnu.org; Thu, 25 Oct 2012 10:10:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57309) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRO8y-0007A6-Kn for qemu-devel@nongnu.org; Thu, 25 Oct 2012 10:10:44 -0400 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 q9PEAf9X009432 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 25 Oct 2012 10:10:41 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-20.ams2.redhat.com [10.36.116.20]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q9PEAdVP028862; Thu, 25 Oct 2012 10:10:39 -0400 Message-ID: <5089485E.5090004@redhat.com> Date: Thu, 25 Oct 2012 16:10:38 +0200 From: Gerd Hoffmann User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.8) Gecko/20121012 Thunderbird/10.0.8 MIME-Version: 1.0 To: Peter Crosthwaite References: <50892CB0.6020706@redhat.com> <50893B33.5000908@redhat.com> <50894360.906@redhat.com> In-Reply-To: <50894360.906@redhat.com> X-Enigmail-Version: 1.4 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: vineshp@xilinx.com, Peter Maydell , john.williams@xilinx.com, qemu-devel@nongnu.org, edgar.iglesias@gmail.com Subject: Re: [Qemu-devel] [PATCH v1 5/8] xilinx_zynq: add USB controllers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Hi, > I'll go try that to simplify uhci ... Seems to work ... cheers, Gerd diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index b6b972f..64442a4 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -88,6 +88,13 @@ enum { typedef struct UHCIState UHCIState; typedef struct UHCIAsync UHCIAsync; typedef struct UHCIQueue UHCIQueue; +typedef struct UHCIInfo UHCIInfo; + +struct UHCIInfo { + uint16_t vendor_id; + uint16_t device_id; + uint8_t revision; +}; /* * Pending async transaction. @@ -1293,17 +1300,18 @@ static Property uhci_properties[] = { DEFINE_PROP_END_OF_LIST(), }; -static void piix3_uhci_class_init(ObjectClass *klass, void *data) +static void uhci_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + UHCIInfo *info = data; k->init = usb_uhci_common_initfn; k->exit = usb_uhci_exit; - k->vendor_id = PCI_VENDOR_ID_INTEL; - k->device_id = PCI_DEVICE_ID_INTEL_82371SB_2; - k->revision = 0x01; - k->class_id = PCI_CLASS_SERIAL_USB; + k->vendor_id = info->vendor_id; + k->device_id = info->device_id; + k->revision = info->revision; + k->class_id = PCI_CLASS_SERIAL_USB; dc->vmsd = &vmstate_uhci; dc->props = uhci_properties; } @@ -1312,29 +1320,24 @@ static TypeInfo piix3_uhci_info = { .name = "piix3-usb-uhci", .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(UHCIState), - .class_init = piix3_uhci_class_init, + .class_init = uhci_class_init, + .class_data = (UHCIInfo[]) { { + .vendor_id = PCI_VENDOR_ID_INTEL, + .device_id = PCI_DEVICE_ID_INTEL_82371SB_2, + .revision = 0x01, + } }, }; -static void piix4_uhci_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc = DEVICE_CLASS(klass); - PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); - - k->init = usb_uhci_common_initfn; - k->exit = usb_uhci_exit; - k->vendor_id = PCI_VENDOR_ID_INTEL; - k->device_id = PCI_DEVICE_ID_INTEL_82371AB_2; - k->revision = 0x01; - k->class_id = PCI_CLASS_SERIAL_USB; - dc->vmsd = &vmstate_uhci; - dc->props = uhci_properties; -} - static TypeInfo piix4_uhci_info = { .name = "piix4-usb-uhci", .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(UHCIState), - .class_init = piix4_uhci_class_init, + .class_init = uhci_class_init, + .class_data = (UHCIInfo[]) { { + .vendor_id = PCI_VENDOR_ID_INTEL, + .device_id = PCI_DEVICE_ID_INTEL_82371AB_2, + .revision = 0x01, + } }, }; static void vt82c686b_uhci_class_init(ObjectClass *klass, void *data)