From patchwork Sat Dec 1 15:27:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: walimis X-Patchwork-Id: 203138 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 2DA302C00A9 for ; Sun, 2 Dec 2012 02:28:18 +1100 (EST) Received: from localhost ([::1]:59159 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TeozI-0007MI-J1 for incoming@patchwork.ozlabs.org; Sat, 01 Dec 2012 10:28:16 -0500 Received: from eggs.gnu.org ([208.118.235.92]:34202) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TeozB-0007K9-Nq for qemu-devel@nongnu.org; Sat, 01 Dec 2012 10:28:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TeozA-0000fM-OU for qemu-devel@nongnu.org; Sat, 01 Dec 2012 10:28:09 -0500 Received: from mail-bk0-f45.google.com ([209.85.214.45]:52879) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TeozA-0000fH-GL for qemu-devel@nongnu.org; Sat, 01 Dec 2012 10:28:08 -0500 Received: by mail-bk0-f45.google.com with SMTP id jk13so526102bkc.4 for ; Sat, 01 Dec 2012 07:28:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=RamK6YEO0U3CkNo62mHITqbasfvi8+wCFSjyIEximDE=; b=x4PoRx+H5YwQAX8+Ex8ldtiMa53e1GWhzEPNCixExHVQJFmd57rXKOXE4HbXmQCDVn OUbOpx77WkGSo4Pkz/NP9OJKsDU/ZnBE1CLWu/O3lw2EtJ0VzKkZLiGX0I2XX6fGZQSn 4nMUC5OGFQqQ++MiG3VfraLv9Yey88SHovCR8yzL7FIo0cW6YRHxltkNQ4QdsCVjudak hLP8af82aCRm4ihYbd+ws0u6+md5dBTNZq8LTEGCgpUIhCA7+oiwgeLk9oSct6kLTW7m hX0W/w4fZpckxPk5AOH4jzk+wwvuIcB3+QIsJflnGgaKo8n/gwc7wgirZLA1QjGDPj+g fEug== Received: by 10.204.150.218 with SMTP id z26mr1424367bkv.95.1354375685585; Sat, 01 Dec 2012 07:28:05 -0800 (PST) Received: from localhost ([61.148.56.138]) by mx.google.com with ESMTPS id z5sm4851523bkv.11.2012.12.01.07.27.52 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 01 Dec 2012 07:28:04 -0800 (PST) From: Liming Wang To: qemu-devel@nongnu.org, Gerd Hoffmann , Peter Crosthwaite , Mitsyanko Igor Date: Sat, 1 Dec 2012 23:27:38 +0800 Message-Id: <1354375659-17056-1-git-send-email-walimisdev@gmail.com> X-Mailer: git-send-email 1.7.9.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.214.45 Cc: Peter Maydell Subject: [Qemu-devel] [PATCH 1/2] usb/ehci: Refactor ehci-sysbus to add exynos4210 ehci support 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 Refactor ehci-sysbus to accept different capsbase and opregbase. And then add exynos4210 ehci support to ehci-sysbus. Signed-off-by: Liming Wang --- hw/usb/hcd-ehci-sysbus.c | 48 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c index 803df92..f4f3ffe 100644 --- a/hw/usb/hcd-ehci-sysbus.c +++ b/hw/usb/hcd-ehci-sysbus.c @@ -23,6 +23,11 @@ typedef struct EHCISysBusState { EHCIState ehci; } EHCISysBusState; +typedef struct EHCISysBusClass { + SysBusDeviceClass sdc; + EHCIState ehci; +} EHCISysBusClass; + static const VMStateDescription vmstate_ehci_sysbus = { .name = "ehci-sysbus", .version_id = 2, @@ -41,10 +46,11 @@ static Property ehci_sysbus_properties[] = { static int usb_ehci_sysbus_initfn(SysBusDevice *dev) { EHCISysBusState *i = FROM_SYSBUS(EHCISysBusState, dev); + EHCISysBusClass *c = (EHCISysBusClass *)object_get_class(OBJECT(dev)); EHCIState *s = &i->ehci; - s->capsbase = 0x100; - s->opregbase = 0x140; + s->capsbase = c->ehci.capsbase; + s->opregbase = c->ehci.opregbase; s->dma = &dma_context_memory; usb_ehci_initfn(s, DEVICE(dev)); @@ -56,23 +62,45 @@ static int usb_ehci_sysbus_initfn(SysBusDevice *dev) static void ehci_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); + EHCISysBusClass *k = (EHCISysBusClass *)klass; + EHCISysBusClass *c = (EHCISysBusClass *)data; - k->init = usb_ehci_sysbus_initfn; + k->sdc.init = usb_ehci_sysbus_initfn; + k->ehci = c->ehci; dc->vmsd = &vmstate_ehci_sysbus; dc->props = ehci_sysbus_properties; } -TypeInfo ehci_xlnx_type_info = { - .name = "xlnx,ps7-usb", - .parent = TYPE_SYS_BUS_DEVICE, - .instance_size = sizeof(EHCISysBusState), - .class_init = ehci_sysbus_class_init, +static TypeInfo ehci_sysbus_type_info[] = { + { + .name = "xlnx,ps7-usb", + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(EHCISysBusState), + .class_init = ehci_sysbus_class_init, + .class_size = sizeof(EHCISysBusClass), + .class_data = (EHCISysBusClass[]) {{ + .ehci.capsbase = 0x100, + .ehci.opregbase = 0x140, + } } + }, { + .name = "exynos4210.usb", + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(EHCISysBusState), + .class_init = ehci_sysbus_class_init, + .class_size = sizeof(EHCISysBusClass), + .class_data = (EHCISysBusClass[]) {{ + .ehci.capsbase = 0x0, + .ehci.opregbase = 0x40, + } } + }, }; static void ehci_sysbus_register_types(void) { - type_register_static(&ehci_xlnx_type_info); + int i; + for (i = 0; i < ARRAY_SIZE(ehci_sysbus_type_info); i++) { + type_register_static(&ehci_sysbus_type_info[i]); + } } type_init(ehci_sysbus_register_types)