diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-02-13 14:01:05 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-02-20 09:34:31 +0000 |
| commit | 7435b791ca9c76b11a9dba4beb60656f951432c1 (patch) | |
| tree | bf3186d1b68a69c9fa3bd3e4ee19c25d6b81a3d7 /hw/vga-isa.c | |
| parent | 1c9c5fcdfef9d97e5f6d4ce37d41a205a26f0347 (diff) | |
| download | qemu-7435b791ca9c76b11a9dba4beb60656f951432c1.tar.gz | |
vga-isa: convert to qdev
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/vga-isa.c')
| -rw-r--r-- | hw/vga-isa.c | 51 |
1 files changed, 45 insertions, 6 deletions
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) |