From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36750) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXzno-0002u1-2C for qemu-devel@nongnu.org; Thu, 02 May 2013 16:08:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UXznm-0000s0-JN for qemu-devel@nongnu.org; Thu, 02 May 2013 16:08:27 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Thu, 2 May 2013 22:09:00 +0200 Message-Id: <1367525344-7755-4-git-send-email-hpoussin@reactos.org> In-Reply-To: <1367525344-7755-1-git-send-email-hpoussin@reactos.org> References: <1367525344-7755-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] [PATCH 3/7] m48t59: move ISA ports/memory regions registration to QOM constructor 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?= , qemu-ppc@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= -device m48t59_isa can now be used to create a fully functional nvram. Signed-off-by: Herv=C3=A9 Poussineau --- hw/timer/m48t59.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c index 45753d8..fb78d20 100644 --- a/hw/timer/m48t59.c +++ b/hw/timer/m48t59.c @@ -655,9 +655,9 @@ M48t59State *m48t59_init(qemu_irq IRQ, hwaddr mem_bas= e, d =3D FROM_SYSBUS(M48t59SysBusState, s); state =3D &d->state; sysbus_connect_irq(s, 0, IRQ); - memory_region_init_io(&d->io, &m48t59_io_ops, state, "m48t59", 4); if (io_base !=3D 0) { - memory_region_add_subregion(get_system_io(), io_base, &d->io); + memory_region_add_subregion(get_system_io(), io_base, + sysbus_mmio_get_region(dev, 1)); } if (mem_base !=3D 0) { sysbus_mmio_map(s, 0, mem_base); @@ -683,11 +683,6 @@ M48t59State *m48t59_init_isa(ISABus *bus, uint32_t i= o_base, uint16_t size, d =3D ISA_M48T59(isadev); s =3D &d->state; =20 - memory_region_init_io(&d->io, &m48t59_io_ops, s, "m48t59", 4); - if (io_base !=3D 0) { - isa_register_ioport(isadev, &d->io, io_base); - } - return s; } =20 @@ -710,6 +705,10 @@ static int m48t59_init_isa1(ISADevice *dev) =20 isa_init_irq(dev, &s->IRQ, 8); m48t59_init_common(s); + memory_region_init_io(&d->io, &m48t59_io_ops, s, "m48t59", 4); + if (s->io_base !=3D 0) { + isa_register_ioport(dev, &d->io, s->io_base); + } =20 return 0; } @@ -723,6 +722,8 @@ static int m48t59_init1(SysBusDevice *dev) =20 memory_region_init_io(&s->iomem, &nvram_ops, s, "m48t59.nvram", s->s= ize); sysbus_init_mmio(dev, &s->iomem); + memory_region_init_io(&d->io, &m48t59_io_ops, s, "m48t59", 4); + sysbus_init_mmio(dev, &d->io); m48t59_init_common(s); =20 return 0; --=20 1.7.10.4