From patchwork Tue Sep 20 05:24:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 115441 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 98106B71E6 for ; Tue, 20 Sep 2011 15:46:43 +1000 (EST) Received: from localhost ([::1]:55373 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5spA-0003HB-Qt for incoming@patchwork.ozlabs.org; Tue, 20 Sep 2011 01:24:52 -0400 Received: from eggs.gnu.org ([140.186.70.92]:47784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5sot-0002xZ-Jn for qemu-devel@nongnu.org; Tue, 20 Sep 2011 01:24:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R5sor-0003pQ-VZ for qemu-devel@nongnu.org; Tue, 20 Sep 2011 01:24:35 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:35459) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5sor-0003ok-81 for qemu-devel@nongnu.org; Tue, 20 Sep 2011 01:24:33 -0400 Received: from localhost.localdomain (unknown [88.171.126.33]) by smtp5-g21.free.fr (Postfix) with ESMTP id 46A8BD480B7; Tue, 20 Sep 2011 07:24:27 +0200 (CEST) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Tue, 20 Sep 2011 07:24:06 +0200 Message-Id: <1316496250-2727-9-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1316496250-2727-1-git-send-email-hpoussin@reactos.org> References: <1316496250-2727-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 212.27.42.5 Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Subject: [Qemu-devel] [PATCH v2 08/12] malta: improve bus implementation of PIIX4 bridge 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 Signed-off-by: Hervé Poussineau --- hw/mips_malta.c | 3 +-- hw/pc.h | 2 +- hw/piix4.c | 23 +++++++++++++++++++++-- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/hw/mips_malta.c b/hw/mips_malta.c index e7cdf20..65e5915 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -939,8 +939,7 @@ void mips_malta_init (ram_addr_t ram_size, /* Southbridge */ ide_drive_get(hd, MAX_IDE_BUS); - piix4_devfn = piix4_init(pci_bus, 80); - isa_bus_irqs(i8259); + piix4_devfn = piix4_init(pci_bus, 80, i8259); pci_piix4_ide_init(pci_bus, hd, piix4_devfn + 1); usb_uhci_piix4_init(pci_bus, piix4_devfn + 2); smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100, isa_get_irq(9), diff --git a/hw/pc.h b/hw/pc.h index 5489039..8d1573f 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -194,7 +194,7 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix_devfn, /* piix4.c */ extern PCIDevice *piix4_dev; -int piix4_init(PCIBus *bus, int devfn); +int piix4_init(PCIBus *bus, int devfn, qemu_irq *isa_irqs); /* vga.c */ enum vga_retrace_method { diff --git a/hw/piix4.c b/hw/piix4.c index 984de8b..f6437ce 100644 --- a/hw/piix4.c +++ b/hw/piix4.c @@ -32,6 +32,8 @@ PCIDevice *piix4_dev; typedef struct PIIX4State { PCIDevice dev; + ISABus bus; + qemu_irq *isa_irq; } PIIX4State; static void piix4_reset(void *opaque) @@ -83,21 +85,38 @@ static const VMStateDescription vmstate_piix4 = { } }; +static qemu_irq pci_piix4_get_irq(ISABus *bus, int isairq) +{ + PIIX4State *s = container_of(bus, PIIX4State, bus); + if (isairq < 0 || isairq >= 16) { + hw_error("isa irq %d invalid", isairq); + } + return s->isa_irq[isairq]; +} + +static ISABusOps pci_piix4_ops = { + .get_irq = pci_piix4_get_irq, +}; + static int piix4_initfn(PCIDevice *dev) { PIIX4State *d = DO_UPCAST(PIIX4State, dev, dev); - isa_bus_bridge_init(&d->dev.qdev); + isa_bus_new(&d->bus, &pci_piix4_ops, &d->dev.qdev); piix4_dev = &d->dev; qemu_register_reset(piix4_reset, d); return 0; } -int piix4_init(PCIBus *bus, int devfn) +int piix4_init(PCIBus *bus, int devfn, qemu_irq *isa_irqs) { PCIDevice *d; + PIIX4State *s; d = pci_create_simple_multifunction(bus, devfn, true, "PIIX4"); + s = DO_UPCAST(PIIX4State, dev, d); + s->isa_irq = isa_irqs; + return d->devfn; }