From patchwork Mon Aug 31 14:07:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 32639 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id ECEC4B7B6D for ; Tue, 1 Sep 2009 00:19:39 +1000 (EST) Received: from localhost ([127.0.0.1]:34392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mi7jI-00086t-Hu for incoming@patchwork.ozlabs.org; Mon, 31 Aug 2009 10:19:32 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mi7aI-0004hU-6m for qemu-devel@nongnu.org; Mon, 31 Aug 2009 10:10:14 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mi7aD-0004eF-81 for qemu-devel@nongnu.org; Mon, 31 Aug 2009 10:10:13 -0400 Received: from [199.232.76.173] (port=43325 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mi7aC-0004dx-Lk for qemu-devel@nongnu.org; Mon, 31 Aug 2009 10:10:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35790) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mi7aB-0003Cc-Qz for qemu-devel@nongnu.org; Mon, 31 Aug 2009 10:10:08 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7VEA6N9011766; Mon, 31 Aug 2009 10:10:07 -0400 Received: from localhost.localdomain (vpn1-4-222.ams2.redhat.com [10.36.4.222]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7VEA0oN003480; Mon, 31 Aug 2009 10:10:05 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 31 Aug 2009 16:07:13 +0200 Message-Id: <3897829bb10663007cf9f1fa30baaeadeeb8f5c2.1251725415.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 03/23] vga: export vga_ioport_{read,write} X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- hw/vga.c | 8 ++++---- hw/vga_int.h | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/vga.c b/hw/vga.c index 7bfd8e9..d1de04e 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -285,9 +285,9 @@ static uint8_t vga_dumb_retrace(VGAState *s) return s->st01 ^ (ST01_V_RETRACE | ST01_DISP_ENABLE); } -static uint32_t vga_ioport_read(void *opaque, uint32_t addr) +uint32_t vga_ioport_read(void *opaque, uint32_t addr) { - VGAState *s = opaque; + VGACommonState *s = opaque; int val, index; /* check port range access depending on color/monochrome mode */ @@ -378,9 +378,9 @@ static uint32_t vga_ioport_read(void *opaque, uint32_t addr) return val; } -static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) +void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) { - VGAState *s = opaque; + VGACommonState *s = opaque; int index; /* check port range access depending on color/monochrome mode */ diff --git a/hw/vga_int.h b/hw/vga_int.h index eb837ff..b44790d 100644 --- a/hw/vga_int.h +++ b/hw/vga_int.h @@ -194,6 +194,8 @@ void vga_common_reset(VGACommonState *s); void vga_dirty_log_start(VGACommonState *s); +uint32_t vga_ioport_read(void *opaque, uint32_t addr); +void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val); uint32_t vga_mem_readb(void *opaque, target_phys_addr_t addr); void vga_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val); void vga_invalidate_scanlines(VGACommonState *s, int y1, int y2);