From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49166) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qumyk-0007J5-Vu for qemu-devel@nongnu.org; Sat, 20 Aug 2011 10:56:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qumyj-0007lW-W4 for qemu-devel@nongnu.org; Sat, 20 Aug 2011 10:56:54 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:49570) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qumyj-0007i4-8h for qemu-devel@nongnu.org; Sat, 20 Aug 2011 10:56:53 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sat, 20 Aug 2011 16:56:35 +0200 Message-Id: <1313852195-23081-7-git-send-email-hpoussin@reactos.org> In-Reply-To: <1313852195-23081-1-git-send-email-hpoussin@reactos.org> References: <1313852195-23081-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [RFC 6/6] isa: improve bus implementation of ebus bridge List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Signed-off-by: Herv=C3=A9 Poussineau --- hw/sun4u.c | 39 ++++++++++++++++++++++++++++++++------- 1 files changed, 32 insertions(+), 7 deletions(-) diff --git a/hw/sun4u.c b/hw/sun4u.c index 7e5a7e1..898541e 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -38,6 +38,7 @@ #include "loader.h" #include "elf.h" #include "blockdev.h" +#include "exec-memory.h" =20 //#define DEBUG_IRQ //#define DEBUG_EBUS @@ -93,6 +94,9 @@ struct hwdef { =20 typedef struct EbusState { PCIDevice pci_dev; + ISABus bus; + MemoryRegion isa_mem_space; + qemu_irq *isa_irq; MemoryRegion bar0; MemoryRegion bar1; } EbusState; @@ -532,19 +536,40 @@ 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 =3D qemu_allocate_irqs(dummy_isa_irq_handler, NULL, 16); - isa_bus_irqs(isa_irq); } =20 +static qemu_irq pci_ebus_get_irq(ISABus *bus, int isairq) +{ + EbusState *s =3D container_of(bus, EbusState, bus); + if (isairq < 0 || isairq >=3D 16) { + hw_error("isa irq %d invalid", isairq); + } + return s->isa_irq[isairq]; +} + +static MemoryRegion *pci_ebus_get_address_space(ISABus *bus) +{ + EbusState *s =3D container_of(bus, EbusState, bus); + return &s->isa_mem_space; +} + +static ISABusOps pci_ebus_ops =3D { + .get_irq =3D pci_ebus_get_irq, + .get_address_space =3D pci_ebus_get_address_space, +}; + static int pci_ebus_init1(PCIDevice *pci_dev) { EbusState *s =3D DO_UPCAST(EbusState, pci_dev, pci_dev); =20 - isa_bus_bridge_init(&pci_dev->qdev); + isa_bus_new(&s->bus, &pci_ebus_ops, &pci_dev->qdev); + memory_region_init(&s->isa_mem_space, "isa-memory", 0x00100000); + memory_region_add_subregion(get_system_memory(), + APB_PCI_IO_BASE, + &s->isa_mem_space); + s->isa_irq =3D qemu_allocate_irqs(dummy_isa_irq_handler, NULL, 16); =20 pci_dev->config[0x04] =3D 0x06; // command =3D bus master, pci mem pci_dev->config[0x05] =3D 0x00; @@ -759,12 +784,12 @@ static void sun4uv_init(ram_addr_t RAM_size, irq =3D qemu_allocate_irqs(cpu_set_irq, env, MAX_PILS); pci_bus =3D pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, irq, &pci_b= us2, &pci_bus3); - isa_mem_base =3D APB_PCI_IO_BASE; - pci_vga_init(pci_bus); =20 // XXX Should be pci_bus3 pci_ebus_init(pci_bus, -1); =20 + pci_vga_init(pci_bus); + i =3D 0; if (hwdef->console_serial_base) { serial_mm_init(hwdef->console_serial_base, 0, NULL, 115200, --=20 1.7.5.4