From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=41978 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ofd0V-0007Dn-BJ for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:11:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ofd0T-00062O-QX for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:11:30 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:43863) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ofd0T-000627-94 for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:11:29 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 1 Aug 2010 19:37:16 +0200 Message-Id: <1280684242-19611-14-git-send-email-hpoussin@reactos.org> In-Reply-To: <4C5579DA.8050508@reactos.org> References: <4C5579DA.8050508@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 14/20] [MIPS] qdev: add an isa bus device List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Use it in Jazz emulation Signed-off-by: Herv=C3=A9 Poussineau --- hw/isa-bus.c | 29 +++++++++++++++++++++++++++++ hw/mips_jazz.c | 12 ++---------- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 4e306de..c245151 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -21,6 +21,7 @@ #include "monitor.h" #include "sysbus.h" #include "isa.h" +#include "qdev-addr.h" =20 struct ISABus { BusState qbus; @@ -53,6 +54,22 @@ ISABus *isa_bus_new(DeviceState *dev) return isabus; } =20 +typedef struct IsaBusState { + SysBusDevice dev; + target_phys_addr_t iobase; + uint32_t size; +} IsaBusState; + +static int isabus_init(SysBusDevice *dev) +{ + IsaBusState *bus =3D DO_UPCAST(IsaBusState, dev, dev); + + if (isa_bus_new(NULL) =3D=3D NULL) + return -1; + isa_mmio_init(bus->iobase, bus->size, 0); + return 0; +} + void isa_bus_irqs(qemu_irq *irqs) { isabus->irqs =3D irqs; @@ -157,9 +174,21 @@ static SysBusDeviceInfo isabus_bridge_info =3D { .qdev.no_user =3D 1, }; =20 +static SysBusDeviceInfo isabus_info =3D { + .init =3D isabus_init, + .qdev.name =3D "isabus", + .qdev.size =3D sizeof(IsaBusState), + .qdev.props =3D (Property[]) { + DEFINE_PROP_TADDR("iobase", IsaBusState, iobase, 0x90000000), + DEFINE_PROP_HEX32("size", IsaBusState, size, 0x1000000), + DEFINE_PROP_END_OF_LIST(), + }, +}; + static void isabus_register_devices(void) { sysbus_register_withprop(&isabus_bridge_info); + sysbus_register_withprop(&isabus_info); } =20 device_init(isabus_register_devices) diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index b9c6b62..cf0001e 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -163,23 +163,15 @@ void mips_jazz_init (ram_addr_t ram_size, cpu_register_physical_memory(0x8000d000, 0x00001000, s_dma_dummy); =20 /* ISA devices */ + dev =3D qdev_create(NULL, "isabus"); + qdev_init_nofail(dev); i8259 =3D i8259_init(qdev_get_gpio_in(cpu->parent, 4)); - isa_bus_new(NULL); isa_bus_irqs(i8259); cpu_exit_irq =3D qemu_allocate_irqs(cpu_request_exit, NULL, 1); DMA_init(0, cpu_exit_irq); pit =3D pit_init(0x40, i8259[0]); pcspk_init(pit); =20 - /* ISA IO space at 0x90000000 */ -#ifdef TARGET_WORDS_BIGENDIAN - isa_mmio_init(0x90000000, 0x01000000, 1); -#else - isa_mmio_init(0x90000000, 0x01000000, 0); -#endif - - isa_mem_base =3D 0x11000000; - /* Optional video card */ if (vga_interface_type !=3D VGA_NONE) { switch (jazz_model) { --=20 1.7.1.GIT