From patchwork Thu May 2 20:09:00 2013 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: 241071 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6C30D2C00CF for ; Fri, 3 May 2013 06:09:03 +1000 (EST) Received: from localhost ([::1]:43361 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXzoL-0002zD-Hs for incoming@patchwork.ozlabs.org; Thu, 02 May 2013 16:09:01 -0400 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 Received: from smtp1-g21.free.fr ([2a01:e0c:1:1599::10]:44753) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXznm-0000rV-25; Thu, 02 May 2013 16:08:26 -0400 Received: from localhost.localdomain (unknown [82.227.227.196]) by smtp1-g21.free.fr (Postfix) with ESMTP id 2B73A9401AE; Thu, 2 May 2013 22:08:19 +0200 (CEST) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Thu, 2 May 2013 22:09:00 +0200 Message-Id: <1367525344-7755-4-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 1.7.10.4 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 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:e0c:1:1599::10 Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-ppc@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH 3/7] m48t59: move ISA ports/memory regions registration to QOM constructor 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 -device m48t59_isa can now be used to create a fully functional nvram. Signed-off-by: Hervé 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_base, d = FROM_SYSBUS(M48t59SysBusState, s); state = &d->state; sysbus_connect_irq(s, 0, IRQ); - memory_region_init_io(&d->io, &m48t59_io_ops, state, "m48t59", 4); if (io_base != 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 != 0) { sysbus_mmio_map(s, 0, mem_base); @@ -683,11 +683,6 @@ M48t59State *m48t59_init_isa(ISABus *bus, uint32_t io_base, uint16_t size, d = ISA_M48T59(isadev); s = &d->state; - memory_region_init_io(&d->io, &m48t59_io_ops, s, "m48t59", 4); - if (io_base != 0) { - isa_register_ioport(isadev, &d->io, io_base); - } - return s; } @@ -710,6 +705,10 @@ static int m48t59_init_isa1(ISADevice *dev) 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 != 0) { + isa_register_ioport(dev, &d->io, s->io_base); + } return 0; } @@ -723,6 +722,8 @@ static int m48t59_init1(SysBusDevice *dev) memory_region_init_io(&s->iomem, &nvram_ops, s, "m48t59.nvram", s->size); 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); return 0;