From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50080) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtMoK-0004cT-L7 for qemu-devel@nongnu.org; Tue, 16 Aug 2011 12:48:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QtMoG-00029a-9f for qemu-devel@nongnu.org; Tue, 16 Aug 2011 12:48:16 -0400 Received: from mail-vw0-f45.google.com ([209.85.212.45]:57789) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtMoF-00024p-EH for qemu-devel@nongnu.org; Tue, 16 Aug 2011 12:48:12 -0400 Received: by mail-vw0-f45.google.com with SMTP id 17so96031vws.4 for ; Tue, 16 Aug 2011 09:48:11 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Tue, 16 Aug 2011 09:45:42 -0700 Message-Id: <1313513145-5348-12-git-send-email-rth@twiddle.net> In-Reply-To: <1313513145-5348-1-git-send-email-rth@twiddle.net> References: <1313513145-5348-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 11/14] pc: Convert port92 to isa_register_ioport. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: avi@redhat.com Signed-off-by: Richard Henderson --- hw/pc.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index d752821..cd01b7a 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -428,6 +428,7 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, /* port 92 stuff: could be split off */ typedef struct Port92State { ISADevice dev; + MemoryRegion io; uint8_t outport; qemu_irq *a20_out; } Port92State; @@ -479,13 +480,22 @@ static void port92_reset(DeviceState *d) s->outport &= ~1; } +static const MemoryRegionPortio port92_portio[] = { + {0, 1, 1, .read = port92_read, .write = port92_write }, + PORTIO_END_OF_LIST(), +}; + +static const MemoryRegionOps port92_ops = { + .old_portio = port92_portio +}; + static int port92_initfn(ISADevice *dev) { Port92State *s = DO_UPCAST(Port92State, dev, dev); - register_ioport_read(0x92, 1, 1, port92_read, s); - register_ioport_write(0x92, 1, 1, port92_write, s); - isa_init_ioport(dev, 0x92); + memory_region_init_io(&s->io, &port92_ops, s, "port92", 1); + isa_register_ioport(dev, &s->io, 0x92); + s->outport = 0; return 0; } -- 1.7.6