From patchwork Tue Sep 20 05:24:05 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: 115443 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 803C1B71C7 for ; Tue, 20 Sep 2011 15:58:29 +1000 (EST) Received: from localhost ([::1]:55271 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5spA-0003EQ-NC for incoming@patchwork.ozlabs.org; Tue, 20 Sep 2011 01:24:52 -0400 Received: from eggs.gnu.org ([140.186.70.92]:47750) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5sop-0002n0-Sd for qemu-devel@nongnu.org; Tue, 20 Sep 2011 01:24:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R5soo-0003oY-1B for qemu-devel@nongnu.org; Tue, 20 Sep 2011 01:24:31 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:35379) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5som-0003oE-Lt for qemu-devel@nongnu.org; Tue, 20 Sep 2011 01:24:29 -0400 Received: from localhost.localdomain (unknown [88.171.126.33]) by smtp5-g21.free.fr (Postfix) with ESMTP id 70B07D480BB; Tue, 20 Sep 2011 07:24:23 +0200 (CEST) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Tue, 20 Sep 2011 07:24:05 +0200 Message-Id: <1316496250-2727-8-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 07/12] sun4u: improve bus implementation of EBus 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/sun4u.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/hw/sun4u.c b/hw/sun4u.c index facfae0..410d52b 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -93,6 +93,8 @@ struct hwdef { typedef struct EbusState { PCIDevice pci_dev; + ISABus bus; + qemu_irq *isa_irq; MemoryRegion bar0; MemoryRegion bar1; } EbusState; @@ -536,20 +538,29 @@ static void dummy_isa_irq_handler(void *opaque, int n, int level) static void pci_ebus_init(PCIBus *bus, int devfn) { - qemu_irq *isa_irq; - pci_create_simple(bus, devfn, "ebus"); - isa_irq = qemu_allocate_irqs(dummy_isa_irq_handler, NULL, 16); - isa_bus_irqs(isa_irq); } +static qemu_irq pci_ebus_get_irq(ISABus *bus, int isairq) +{ + EbusState *s = container_of(bus, EbusState, bus); + if (isairq < 0 || isairq >= 16) { + hw_error("isa irq %d invalid", isairq); + } + return s->isa_irq[isairq]; +} + +static ISABusOps pci_ebus_ops = { + .get_irq = pci_ebus_get_irq, +}; + static int pci_ebus_init1(PCIDevice *pci_dev) { EbusState *s = DO_UPCAST(EbusState, pci_dev, pci_dev); - isa_bus_bridge_init(&pci_dev->qdev); - + isa_bus_new(&s->bus, &pci_ebus_ops, &pci_dev->qdev); + s->isa_irq = qemu_allocate_irqs(dummy_isa_irq_handler, NULL, 16); pci_dev->config[0x04] = 0x06; // command = bus master, pci mem pci_dev->config[0x05] = 0x00; pci_dev->config[0x06] = 0xa0; // status = fast back-to-back, 66MHz, no error