From patchwork Sun Dec 16 03:49:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 206665 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 B52E02C0093 for ; Sun, 16 Dec 2012 14:50:13 +1100 (EST) Received: from localhost ([::1]:36331 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tk5Ev-0004vZ-75 for incoming@patchwork.ozlabs.org; Sat, 15 Dec 2012 22:50:09 -0500 Received: from eggs.gnu.org ([208.118.235.92]:36959) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tk5El-0004vH-5B for qemu-devel@nongnu.org; Sat, 15 Dec 2012 22:50:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tk5Ej-00024f-VV for qemu-devel@nongnu.org; Sat, 15 Dec 2012 22:49:59 -0500 Received: from mout.web.de ([212.227.17.12]:57227) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tk5Ej-00024T-LL for qemu-devel@nongnu.org; Sat, 15 Dec 2012 22:49:57 -0500 Received: from localhost.localdomain ([84.148.35.106]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0LdVvS-1TKPO22UoU-00iakf; Sun, 16 Dec 2012 04:49:56 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sun, 16 Dec 2012 04:49:44 +0100 Message-Id: <1355629786-14649-3-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1355629786-14649-1-git-send-email-andreas.faerber@web.de> References: <1355629786-14649-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Provags-ID: V02:K0:3R2qcqiGoONcXqSlqPgjZf0xwDay87vPE0VaQ75u/c3 BIkK5mapY3NF5l8N2lsS1/RZ14Fsk6lVbuCffRozRY1RuAHeME wOPTtO4ncQ488koSqDCWY/Cu+GC/U3hSE5HPqlEfkQntVnzNwz gd3Kzixm1a/eNibcs7kq0EEmXbL5K5SPfFKWf26tr+vQ6ojoaP fXzceCjnLVJVL8EU9aicQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 212.227.17.12 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , kraxel@redhat.com Subject: [Qemu-devel] [PATCH v2 2/4] usb/ehci: Move capsbase and opregbase into SysBus EHCI class 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 This allows specific derived models to use different values. Signed-off-by: Andreas Färber --- hw/usb/hcd-ehci-sysbus.c | 15 +++++++++++++-- hw/usb/hcd-ehci.h | 13 +++++++++++++ 2 Dateien geändert, 26 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c index d431193..5a94ce3 100644 --- a/hw/usb/hcd-ehci-sysbus.c +++ b/hw/usb/hcd-ehci-sysbus.c @@ -35,10 +35,11 @@ static Property ehci_sysbus_properties[] = { static int usb_ehci_sysbus_initfn(SysBusDevice *dev) { EHCISysBusState *i = SYS_BUS_EHCI(dev); + SysBusEHCIClass *sec = SYS_BUS_EHCI_GET_CLASS(dev); EHCIState *s = &i->ehci; - s->capsbase = 0x100; - s->opregbase = 0x140; + s->capsbase = sec->capsbase; + s->opregbase = sec->opregbase; s->dma = &dma_context_memory; usb_ehci_initfn(s, DEVICE(dev)); @@ -63,11 +64,21 @@ static const TypeInfo ehci_type_info = { .instance_size = sizeof(EHCISysBusState), .abstract = true, .class_init = ehci_sysbus_class_init, + .class_size = sizeof(SysBusEHCIClass), }; +static void ehci_xlnx_class_init(ObjectClass *oc, void *data) +{ + SysBusEHCIClass *sec = SYS_BUS_EHCI_CLASS(oc); + + sec->capsbase = 0x100; + sec->opregbase = 0x140; +} + static const TypeInfo ehci_xlnx_type_info = { .name = "xlnx,ps7-usb", .parent = TYPE_SYS_BUS_EHCI, + .class_init = ehci_xlnx_class_init, }; static void ehci_sysbus_register_types(void) diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h index 9825b19..9a62cbe 100644 --- a/hw/usb/hcd-ehci.h +++ b/hw/usb/hcd-ehci.h @@ -339,6 +339,10 @@ typedef struct EHCIPCIState { #define TYPE_SYS_BUS_EHCI "sysbus-ehci-usb" #define SYS_BUS_EHCI(obj) \ OBJECT_CHECK(EHCISysBusState, (obj), TYPE_SYS_BUS_EHCI) +#define SYS_BUS_EHCI_CLASS(class) \ + OBJECT_CLASS_CHECK(SysBusEHCIClass, (class), TYPE_SYS_BUS_EHCI) +#define SYS_BUS_EHCI_GET_CLASS(obj) \ + OBJECT_GET_CLASS(SysBusEHCIClass, (obj), TYPE_SYS_BUS_EHCI) typedef struct EHCISysBusState { /*< private >*/ @@ -348,4 +352,13 @@ typedef struct EHCISysBusState { EHCIState ehci; } EHCISysBusState; +typedef struct SysBusEHCIClass { + /*< private >*/ + SysBusDeviceClass parent_class; + /*< public >*/ + + uint16_t capsbase; + uint16_t opregbase; +} SysBusEHCIClass; + #endif