[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/23] vga: split isa bits inco vga-isa.c
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 06/23] vga: split isa bits inco vga-isa.c |
Date: |
Mon, 31 Aug 2009 16:07:16 +0200 |
Adjust all the VGAState in VGACommonState
Compile vga-isa.o in the targets that use it
Signed-off-by: Juan Quintela <address@hidden>
---
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)
{
--
1.6.2.5
- [Qemu-devel] [PATCH 00/23] VGA cleanup, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 01/23] vga: remove useless cast from void *, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 02/23] cirrus_vga: prefix vga_ioport_{read, write} with cirrus, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 03/23] vga: export vga_ioport_{read,write}, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 04/23] vga: split vga_{load, save} into pci and common parts, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 05/23] vga: split pci bits into vga-pci.c, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 06/23] vga: split isa bits inco vga-isa.c,
Juan Quintela <=
- [Qemu-devel] [PATCH 07/23] vga: export vga_mem_{read,write}, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 08/23] vga: split vga-isa-mm.o, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 09/23] vga and cirrus_vga: create vga_ioport_invalid() and use it everywhere, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 10/23] cirrus_vga: Add a VGACommonState local var to cirrus_vga_ioport_{read, write}, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 11/23] vga: change tabs to spaces, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 13/23] vga and cirrus_vga: substitute switch for equivalent assigntment, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 12/23] cirrus_vga: make cirrus_read_hidden_dac() return its result, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 15/23] cirrus_vga: rename cirrus_hook_read_sr() cirrus_vga_read_sr(), Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 14/23] vga: Rename last VGAState occurrences to VGACommonState, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 16/23] cirrus_vga: rename cirrus_hook_write_sr() cirrus_vga_write_sr(), Juan Quintela, 2009/08/31