From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=60807 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ofd0s-0007SE-MI for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:11:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ofd0r-00066p-IF for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:11:54 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:48003) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ofd0q-00066Z-UV for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:11:53 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 1 Aug 2010 19:37:22 +0200 Message-Id: <1280684242-19611-20-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 20/20] [MIPS] qdev: Complete rc4030 conversion, by removing legacy stuff 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?= Signed-off-by: Herv=C3=A9 Poussineau --- hw/mips_jazz.c | 7 +++---- hw/rc4030.c | 17 ----------------- hw/rc4030.h | 4 ---- 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index b4c95c9..04d80ee 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -104,9 +104,7 @@ void mips_jazz_init (ram_addr_t ram_size, int bios_size, n; BusState *cpu; DeviceState *dev; - qemu_irq *rc4030, *i8259; - rc4030_dma *dmas; - void* rc4030_opaque; + qemu_irq *i8259; int s_dma_dummy; NICInfo *nd; PITState *pit; @@ -158,7 +156,8 @@ void mips_jazz_init (ram_addr_t ram_size, } =20 /* Chipset */ - rc4030_opaque =3D rc4030_init(cpu, &rc4030, &dmas); + dev =3D qdev_create(cpu, "rc4030"); + qdev_init_nofail(dev); s_dma_dummy =3D cpu_register_io_memory(dma_dummy_read, dma_dummy_wri= te, NULL); cpu_register_physical_memory(0x8000d000, 0x00001000, s_dma_dummy); =20 diff --git a/hw/rc4030.c b/hw/rc4030.c index 3c8cdfa..710085e 100644 --- a/hw/rc4030.c +++ b/hw/rc4030.c @@ -948,20 +948,3 @@ static void rc4030_register_devices(void) =20 device_init(rc4030_register_devices) =20 -void *rc4030_init(BusState *bus, - qemu_irq **irqs, rc4030_dma **dmas) -{ - DeviceState *dev; - rc4030State* rc4030; - - dev =3D qdev_create(bus, "rc4030"); - qdev_init_nofail(dev); - - rc4030 =3D DO_UPCAST(rc4030State, busdev, dev); - - *irqs =3D rc4030->busdev.gpio_in; - *dmas =3D rc4030->bus.dmas; - - return rc4030; -} - diff --git a/hw/rc4030.h b/hw/rc4030.h index 58522f3..f15b459 100644 --- a/hw/rc4030.h +++ b/hw/rc4030.h @@ -34,8 +34,4 @@ void rc4030_dma_write(void *dma, uint8_t *buf, int len)= ; void *rc4030_get_opaque(void); rc4030_dma rc4030_get_dma(int dma); =20 -/* Non-qdev compatibility stuff... */ -void *rc4030_init(BusState *parent, - qemu_irq **irqs, rc4030_dma **dmas); - #endif --=20 1.7.1.GIT