From patchwork Mon Aug 31 14:07:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 32642 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 CDC24B70B0 for ; Tue, 1 Sep 2009 00:26:23 +1000 (EST) Received: from localhost ([127.0.0.1]:34123 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mi7ps-0001bT-5h for incoming@patchwork.ozlabs.org; Mon, 31 Aug 2009 10:26:20 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mi7aN-0004ld-Ev for qemu-devel@nongnu.org; Mon, 31 Aug 2009 10:10:19 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mi7aH-0004h5-LF for qemu-devel@nongnu.org; Mon, 31 Aug 2009 10:10:18 -0400 Received: from [199.232.76.173] (port=43328 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mi7aG-0004ge-OQ for qemu-devel@nongnu.org; Mon, 31 Aug 2009 10:10:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27435) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mi7aG-0003Dd-8j for qemu-devel@nongnu.org; Mon, 31 Aug 2009 10:10:12 -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 n7VEABOo012539; Mon, 31 Aug 2009 10:10:11 -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 n7VEA0oQ003480; Mon, 31 Aug 2009 10:10:10 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 31 Aug 2009 16:07:16 +0200 Message-Id: <1fd884db2a26a7832d02eec6b754726563781bdd.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 06/23] vga: split isa bits inco vga-isa.c 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 Adjust all the VGAState in VGACommonState Compile vga-isa.o in the targets that use it Signed-off-by: Juan Quintela --- Makefile.target | 4 ++-- hw/vga-isa.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ hw/vga.c | 21 --------------------- 3 files changed, 52 insertions(+), 23 deletions(-) create mode 100644 hw/vga-isa.c diff --git a/Makefile.target b/Makefile.target index a74c3f2..07017a5 100644 --- a/Makefile.target +++ b/Makefile.target @@ -184,7 +184,7 @@ obj-y += wdt_i6300esb.o # Hardware support obj-i386-y = ide/core.o ide/isa.o ide/pci.o pckbd.o $(sound-obj-y) dma.o isa-bus.o -obj-i386-y += vga.o vga-pci.o +obj-i386-y += vga.o vga-pci.o vga-isa.o obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o obj-i386-y += cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o @@ -212,7 +212,7 @@ obj-ppc-$(CONFIG_FDT) += device_tree.o obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o obj-mips-y += mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o rc4030.o -obj-mips-y += vga-pci.o +obj-mips-y += vga-pci.o vga-isa.o obj-mips-y += g364fb.o jazz_led.o dp8393x.o obj-mips-y += ide/core.o ide/isa.o ide/pci.o obj-mips-y += gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o diff --git a/hw/vga-isa.c b/hw/vga-isa.c new file mode 100644 index 0000000..7fa31d3 --- /dev/null +++ b/hw/vga-isa.c @@ -0,0 +1,50 @@ +/* + * QEMU ISA VGA Emulator. + * + * Copyright (c) 2003 Fabrice Bellard + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +#include "hw.h" +#include "console.h" +#include "pc.h" +#include "vga_int.h" +#include "pixel_ops.h" +#include "qemu-timer.h" + +int isa_vga_init(void) +{ + VGACommonState *s; + + s = qemu_mallocz(sizeof(*s)); + + vga_common_init(s, VGA_RAM_SIZE); + vga_init(s); + register_savevm("vga", 0, 2, vga_common_save, vga_common_load, s); + + s->ds = graphic_console_init(s->update, s->invalidate, + s->screen_dump, s->text_update, s); + +#ifdef CONFIG_BOCHS_VBE + /* XXX: use optimized standard vga accesses */ + cpu_register_physical_memory(VBE_DISPI_LFB_PHYSICAL_ADDRESS, + VGA_RAM_SIZE, s->vram_offset); +#endif + return 0; +} diff --git a/hw/vga.c b/hw/vga.c index edd11fc..8b926b0 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -2394,27 +2394,6 @@ static void vga_mm_init(VGAState *s, target_phys_addr_t vram_base, qemu_register_coalesced_mmio(vram_base + 0x000a0000, 0x20000); } -int isa_vga_init(void) -{ - VGAState *s; - - s = qemu_mallocz(sizeof(VGAState)); - - vga_common_init(s, VGA_RAM_SIZE); - vga_init(s); - register_savevm("vga", 0, 2, vga_common_save, vga_common_load, s); - - s->ds = graphic_console_init(s->update, s->invalidate, - s->screen_dump, s->text_update, s); - -#ifdef CONFIG_BOCHS_VBE - /* XXX: use optimized standard vga accesses */ - cpu_register_physical_memory(VBE_DISPI_LFB_PHYSICAL_ADDRESS, - VGA_RAM_SIZE, s->vram_offset); -#endif - return 0; -} - int isa_vga_mm_init(target_phys_addr_t vram_base, target_phys_addr_t ctrl_base, int it_shift) {