From patchwork Thu Apr 12 11:45:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 152024 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 0FD57B70D9 for ; Thu, 12 Apr 2012 21:47:37 +1000 (EST) Received: from localhost ([::1]:48651 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SIIUw-0005XG-4v for incoming@patchwork.ozlabs.org; Thu, 12 Apr 2012 07:47:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58363) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SIIUo-0005PN-KK for qemu-devel@nongnu.org; Thu, 12 Apr 2012 07:47:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SIIUm-0001Wp-FJ for qemu-devel@nongnu.org; Thu, 12 Apr 2012 07:47:26 -0400 Received: from smtp.citrix.com ([66.165.176.89]:32838) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SIIUm-0001Vr-BI for qemu-devel@nongnu.org; Thu, 12 Apr 2012 07:47:24 -0400 X-IronPort-AV: E=Sophos;i="4.75,410,1330923600"; d="scan'208";a="24093321" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Apr 2012 07:47:23 -0400 Received: from meteora.cam.xci-test.com (10.80.248.241) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.213.0; Thu, 12 Apr 2012 07:47:23 -0400 From: Julien Grall To: qemu-devel@nongnu.org Date: Thu, 12 Apr 2012 12:45:58 +0100 Message-ID: <476bbc9c798ab2afb9be029519d906796724f81e.1334230338.git.julien.grall@citrix.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.89 Cc: Julien Grall , Stefano.Stabellini@eu.citrix.com, avi@redhat.com, julian.pidancet@citrix.com Subject: [Qemu-devel] [PATCH V4 3/8] hw/cirrus_vga.c: replace register_ioport* 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 This patch replaces all register_ioport* with portio_*. It permits to use the new Memory stuff like listener. Signed-off-by: Julien Grall --- hw/cirrus_vga.c | 38 ++++++++++++++++++++++---------------- 1 files changed, 22 insertions(+), 16 deletions(-) diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index afedaa4..43731ac 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -198,6 +198,7 @@ typedef void (*cirrus_fill_t)(struct CirrusVGAState *s, typedef struct CirrusVGAState { VGACommonState vga; + PortioList cirrus_port_list; MemoryRegion cirrus_linear_io; MemoryRegion cirrus_linear_bitblt_io; MemoryRegion cirrus_mmio_io; @@ -2781,8 +2782,23 @@ static const MemoryRegionOps cirrus_linear_io_ops = { }, }; +static const MemoryRegionPortio cirrus_portio_list[] = { + { 0x04, 2, 1, .write = cirrus_vga_ioport_write, + .read = cirrus_vga_ioport_read, }, /* 0x3b4 */ + { 0x0a, 1, 1, .write = cirrus_vga_ioport_write, + .read = cirrus_vga_ioport_read, }, /* 0x3ba */ + { 0x10, 16, 1, .write = cirrus_vga_ioport_write, + .read = cirrus_vga_ioport_read, }, /* 0x3c0 */ + { 0x24, 2, 1, .write = cirrus_vga_ioport_write, + .read = cirrus_vga_ioport_read, }, /* 0x3d4 */ + { 0x2a, 1, 1, .write = cirrus_vga_ioport_write, + .read = cirrus_vga_ioport_read, }, /* 0x3da */ + PORTIO_END_OF_LIST(), +}; + static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci, - MemoryRegion *system_memory) + MemoryRegion *system_memory, + MemoryRegion *system_io) { int i; static int inited; @@ -2814,19 +2830,8 @@ static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci, s->bustype = CIRRUS_BUSTYPE_ISA; } - register_ioport_write(0x3c0, 16, 1, cirrus_vga_ioport_write, s); - - register_ioport_write(0x3b4, 2, 1, cirrus_vga_ioport_write, s); - register_ioport_write(0x3d4, 2, 1, cirrus_vga_ioport_write, s); - register_ioport_write(0x3ba, 1, 1, cirrus_vga_ioport_write, s); - register_ioport_write(0x3da, 1, 1, cirrus_vga_ioport_write, s); - - register_ioport_read(0x3c0, 16, 1, cirrus_vga_ioport_read, s); - - register_ioport_read(0x3b4, 2, 1, cirrus_vga_ioport_read, s); - register_ioport_read(0x3d4, 2, 1, cirrus_vga_ioport_read, s); - register_ioport_read(0x3ba, 1, 1, cirrus_vga_ioport_read, s); - register_ioport_read(0x3da, 1, 1, cirrus_vga_ioport_read, s); + portio_list_init(&s->cirrus_port_list, cirrus_portio_list, s, "cirrus-io"); + portio_list_add(&s->cirrus_port_list, system_io, 0x3b0); memory_region_init(&s->low_mem_container, "cirrus-lowmem-container", @@ -2893,7 +2898,7 @@ static int vga_initfn(ISADevice *dev) vga_common_init(s, VGA_RAM_SIZE); cirrus_init_common(&d->cirrus_vga, CIRRUS_ID_CLGD5430, 0, - isa_address_space(dev)); + isa_address_space(dev), isa_address_space_io(dev)); s->ds = graphic_console_init(s->update, s->invalidate, s->screen_dump, s->text_update, s); @@ -2934,7 +2939,8 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev) /* setup VGA */ vga_common_init(&s->vga, VGA_RAM_SIZE); - cirrus_init_common(s, device_id, 1, pci_address_space(dev)); + cirrus_init_common(s, device_id, 1, pci_address_space(dev), + pci_address_space_io(dev)); s->vga.ds = graphic_console_init(s->vga.update, s->vga.invalidate, s->vga.screen_dump, s->vga.text_update, &s->vga);