From patchwork Wed Aug 24 00:13:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 111215 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 968B4B6F6F for ; Wed, 24 Aug 2011 10:30:30 +1000 (EST) Received: from localhost ([::1]:53956 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qw18I-0008H5-3x for incoming@patchwork.ozlabs.org; Tue, 23 Aug 2011 20:15:50 -0400 Received: from eggs.gnu.org ([140.186.70.92]:37317) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qw178-0005oJ-TN for qemu-devel@nongnu.org; Tue, 23 Aug 2011 20:14:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qw175-0004D9-TE for qemu-devel@nongnu.org; Tue, 23 Aug 2011 20:14:38 -0400 Received: from mail-vw0-f45.google.com ([209.85.212.45]:40396) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qw175-00045z-Ph for qemu-devel@nongnu.org; Tue, 23 Aug 2011 20:14:35 -0400 Received: by mail-vw0-f45.google.com with SMTP id 17so649441vws.4 for ; Tue, 23 Aug 2011 17:14:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=PpRMWors591DSHJjBrurlothbJh1DVQD8L9+lxuqmbw=; b=Utm4UeBQ3tgRhQNJxj/ZaM8r4Kudi9OfuzUdyWLn7rvqnrU8cAMYeNqlZQ9tGuP91C pqGpKi+7UG2OwvHsIPJxkbO5L3XJp+4ewYoyYOVVb3eZwfHwCBI4eMRzL8HuYQJOyMXq VWdZbCX30hD3IS53VZ+qNnUU7D0oZIRWn5qGo= Received: by 10.52.96.166 with SMTP id dt6mr3895206vdb.145.1314144875688; Tue, 23 Aug 2011 17:14:35 -0700 (PDT) Received: from localhost.localdomain (cpe-66-91-180-197.hawaii.res.rr.com [66.91.180.197]) by mx.google.com with ESMTPS id es7sm441852vdb.6.2011.08.23.17.14.34 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Aug 2011 17:14:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 23 Aug 2011 17:13:51 -0700 Message-Id: <1314144835-29098-13-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1314144835-29098-1-git-send-email-rth@twiddle.net> References: <1314144835-29098-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.212.45 Cc: avi@redhat.com Subject: [Qemu-devel] [PATCH 12/16] vga: Convert to isa_register_portio_list. 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 Signed-off-by: Richard Henderson --- hw/vga-isa.c | 10 ---------- hw/vga.c | 55 ++++++++++++++++++++++++++++--------------------------- 2 files changed, 28 insertions(+), 37 deletions(-) diff --git a/hw/vga-isa.c b/hw/vga-isa.c index 0d19901..510ace8 100644 --- a/hw/vga-isa.c +++ b/hw/vga-isa.c @@ -54,16 +54,6 @@ static int vga_initfn(ISADevice *dev) isa_mem_base + 0x000a0000, vga_io_memory, 1); memory_region_set_coalescing(vga_io_memory); - isa_init_ioport(dev, 0x3c0); - isa_init_ioport(dev, 0x3b4); - isa_init_ioport(dev, 0x3ba); - isa_init_ioport(dev, 0x3da); - isa_init_ioport(dev, 0x3c0); -#ifdef CONFIG_BOCHS_VBE - isa_init_ioport(dev, 0x1ce); - isa_init_ioport(dev, 0x1cf); - isa_init_ioport(dev, 0x1d0); -#endif /* CONFIG_BOCHS_VBE */ s->ds = graphic_console_init(s->update, s->invalidate, s->screen_dump, s->text_update, s); diff --git a/hw/vga.c b/hw/vga.c index b0371d5..7a0dedd 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -2198,40 +2198,41 @@ void vga_common_init(VGACommonState *s, int vga_ram_size) vga_dirty_log_start(s); } -/* used by both ISA and PCI */ +static const MemoryRegionPortio vga_portio_list[] = { + { 0x04, 2, 1, .read = vga_ioport_read, .write = vga_ioport_write }, /* 3b4 */ + { 0x0a, 1, 1, .read = vga_ioport_read, .write = vga_ioport_write }, /* 3ba */ + { 0x10, 16, 1, .read = vga_ioport_read, .write = vga_ioport_write }, /* 3c0 */ + { 0x14, 2, 1, .read = vga_ioport_read, .write = vga_ioport_write }, /* 3d4 */ + { 0x1a, 1, 1, .read = vga_ioport_read, .write = vga_ioport_write }, /* 3da */ + PORTIO_END_OF_LIST(), +}; + +#ifdef CONFIG_BOCHS_VBE +static const MemoryRegionPortio vbe_portio_list[] = { +# ifdef TARGET_I386 + { 0, 1, 2, .read = vbe_ioport_read_index, .write = vbe_ioport_write_index }, + { 1, 1, 2, .read = vbe_ioport_read_data, .write = vbe_ioport_write_data }, +# else + { 0, 2, 2, .read = vbe_ioport_read_index, .write = vbe_ioport_write_index }, + { 2, 2, 2, .read = vbe_ioport_read_data, .write = vbe_ioport_write_data }, +# endif + PORTIO_END_OF_LIST(), +}; +#endif /* CONFIG_BOCHS_VBE */ + +/* Used by both ISA and PCI */ MemoryRegion *vga_init_io(VGACommonState *s) { MemoryRegion *vga_mem; - register_ioport_write(0x3c0, 16, 1, vga_ioport_write, s); - - register_ioport_write(0x3b4, 2, 1, vga_ioport_write, s); - register_ioport_write(0x3d4, 2, 1, vga_ioport_write, s); - register_ioport_write(0x3ba, 1, 1, vga_ioport_write, s); - register_ioport_write(0x3da, 1, 1, vga_ioport_write, s); - - register_ioport_read(0x3c0, 16, 1, vga_ioport_read, s); - - register_ioport_read(0x3b4, 2, 1, vga_ioport_read, s); - register_ioport_read(0x3d4, 2, 1, vga_ioport_read, s); - register_ioport_read(0x3ba, 1, 1, vga_ioport_read, s); - register_ioport_read(0x3da, 1, 1, vga_ioport_read, s); + /* The PCI-ISA bridge should have been configured properly such that + this works for PCI devices as well. This only supports one bridge, + but "secondary" VGA cards are generally accessed by MMIO only anyway. */ + isa_register_portio_list(NULL, 0x3b0, vga_portio_list, s, "vga"); #ifdef CONFIG_BOCHS_VBE -#if defined (TARGET_I386) - register_ioport_read(0x1ce, 1, 2, vbe_ioport_read_index, s); - register_ioport_read(0x1cf, 1, 2, vbe_ioport_read_data, s); - - register_ioport_write(0x1ce, 1, 2, vbe_ioport_write_index, s); - register_ioport_write(0x1cf, 1, 2, vbe_ioport_write_data, s); -#else - register_ioport_read(0x1ce, 1, 2, vbe_ioport_read_index, s); - register_ioport_read(0x1d0, 1, 2, vbe_ioport_read_data, s); - - register_ioport_write(0x1ce, 1, 2, vbe_ioport_write_index, s); - register_ioport_write(0x1d0, 1, 2, vbe_ioport_write_data, s); + isa_register_portio_list(NULL, 0x1ce, vbe_portio_list, s, "vbe"); #endif -#endif /* CONFIG_BOCHS_VBE */ vga_mem = g_malloc(sizeof(*vga_mem)); memory_region_init_io(vga_mem, &vga_mem_ops, s,