summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2011-02-13 14:01:05 +0000
committerBlue Swirl <blauwirbel@gmail.com>2011-02-20 09:34:31 +0000
commit7435b791ca9c76b11a9dba4beb60656f951432c1 (patch)
treebf3186d1b68a69c9fa3bd3e4ee19c25d6b81a3d7
parent1c9c5fcdfef9d97e5f6d4ce37d41a205a26f0347 (diff)
vga-isa: convert to qdev
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rw-r--r--hw/pc.h8
-rw-r--r--hw/vga-isa.c51
-rw-r--r--hw/vga.c22
-rw-r--r--hw/vga_int.h1
4 files changed, 67 insertions, 15 deletions
diff --git a/hw/pc.h b/hw/pc.h
index 64a3a22679..475484ac2c 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -181,7 +181,13 @@ enum vga_retrace_method {
extern enum vga_retrace_method vga_retrace_method;
-int isa_vga_init(void);
+static inline int isa_vga_init(void)
+{
+ isa_create_simple("isa-vga");
+
+ return 0;
+}
+
int pci_vga_init(PCIBus *bus);
int isa_vga_mm_init(target_phys_addr_t vram_base,
target_phys_addr_t ctrl_base, int it_shift);
diff --git a/hw/vga-isa.c b/hw/vga-isa.c
index 304605493a..fde0d56fd3 100644
--- a/hw/vga-isa.c
+++ b/hw/vga-isa.c
@@ -29,16 +29,40 @@
#include "qemu-timer.h"
#include "loader.h"
-int isa_vga_init(void)
+typedef struct ISAVGAState {
+ ISADevice dev;
+ struct VGACommonState state;
+} ISAVGAState;
+
+static void vga_reset_isa(DeviceState *dev)
{
- VGACommonState *s;
+ ISAVGAState *d = container_of(dev, ISAVGAState, dev.qdev);
+ VGACommonState *s = &d->state;
- s = qemu_mallocz(sizeof(*s));
+ vga_common_reset(s);
+}
- vga_common_init(s, VGA_RAM_SIZE);
- vga_init(s);
- vmstate_register(NULL, 0, &vmstate_vga_common, s);
+static int vga_initfn(ISADevice *dev)
+{
+ ISAVGAState *d = DO_UPCAST(ISAVGAState, dev, dev);
+ VGACommonState *s = &d->state;
+ int vga_io_memory;
+ vga_common_init(s, VGA_RAM_SIZE);
+ vga_io_memory = vga_init_io(s);
+ cpu_register_physical_memory(isa_mem_base + 0x000a0000, 0x20000,
+ vga_io_memory);
+ qemu_register_coalesced_mmio(isa_mem_base + 0x000a0000, 0x20000);
+ 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);
@@ -47,3 +71,18 @@ int isa_vga_init(void)
rom_add_vga(VGABIOS_FILENAME);
return 0;
}
+
+static ISADeviceInfo vga_info = {
+ .qdev.name = "isa-vga",
+ .qdev.size = sizeof(ISAVGAState),
+ .qdev.vmsd = &vmstate_vga_common,
+ .qdev.reset = vga_reset_isa,
+ .qdev.no_user = 1,
+ .init = vga_initfn,
+};
+
+static void vga_register(void)
+{
+ isa_qdev_register(&vga_info);
+}
+device_init(vga_register)
diff --git a/hw/vga.c b/hw/vga.c
index c22b8af833..3ef85fbf97 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -2260,12 +2260,8 @@ void vga_common_init(VGACommonState *s, int vga_ram_size)
}
/* used by both ISA and PCI */
-void vga_init(VGACommonState *s)
+int vga_init_io(VGACommonState *s)
{
- int vga_io_memory;
-
- qemu_register_reset(vga_reset, s);
-
register_ioport_write(0x3c0, 16, 1, vga_ioport_write, s);
register_ioport_write(0x3b4, 2, 1, vga_ioport_write, s);
@@ -2279,7 +2275,6 @@ void vga_init(VGACommonState *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);
- s->bank_offset = 0;
#ifdef CONFIG_BOCHS_VBE
#if defined (TARGET_I386)
@@ -2297,8 +2292,19 @@ void vga_init(VGACommonState *s)
#endif
#endif /* CONFIG_BOCHS_VBE */
- vga_io_memory = cpu_register_io_memory(vga_mem_read, vga_mem_write, s,
- DEVICE_LITTLE_ENDIAN);
+ return cpu_register_io_memory(vga_mem_read, vga_mem_write, s,
+ DEVICE_LITTLE_ENDIAN);
+}
+
+void vga_init(VGACommonState *s)
+{
+ int vga_io_memory;
+
+ qemu_register_reset(vga_reset, s);
+
+ s->bank_offset = 0;
+
+ vga_io_memory = vga_init_io(s);
cpu_register_physical_memory(isa_mem_base + 0x000a0000, 0x20000,
vga_io_memory);
qemu_register_coalesced_mmio(isa_mem_base + 0x000a0000, 0x20000);
diff --git a/hw/vga_int.h b/hw/vga_int.h
index 1067f2cc5f..d2811bdf1c 100644
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -191,6 +191,7 @@ static inline int c6_to_8(int v)
void vga_common_init(VGACommonState *s, int vga_ram_size);
void vga_init(VGACommonState *s);
+int vga_init_io(VGACommonState *s);
void vga_common_reset(VGACommonState *s);
void vga_dirty_log_start(VGACommonState *s);