Revision db895a1e hw/display/cirrus_vga.c
b/hw/display/cirrus_vga.c | ||
---|---|---|
2906 | 2906 |
* |
2907 | 2907 |
***************************************/ |
2908 | 2908 |
|
2909 |
static int vga_initfn(ISADevice *dev)
|
|
2909 |
static void isa_cirrus_vga_realizefn(DeviceState *dev, Error **errp)
|
|
2910 | 2910 |
{ |
2911 |
ISADevice *isadev = ISA_DEVICE(dev); |
|
2911 | 2912 |
ISACirrusVGAState *d = ISA_CIRRUS_VGA(dev); |
2912 | 2913 |
VGACommonState *s = &d->cirrus_vga.vga; |
2913 | 2914 |
|
2914 | 2915 |
vga_common_init(s); |
2915 | 2916 |
cirrus_init_common(&d->cirrus_vga, CIRRUS_ID_CLGD5430, 0, |
2916 |
isa_address_space(dev), isa_address_space_io(dev)); |
|
2917 |
s->con = graphic_console_init(DEVICE(dev), s->hw_ops, s); |
|
2917 |
isa_address_space(isadev), |
|
2918 |
isa_address_space_io(isadev)); |
|
2919 |
s->con = graphic_console_init(dev, s->hw_ops, s); |
|
2918 | 2920 |
rom_add_vga(VGABIOS_CIRRUS_FILENAME); |
2919 | 2921 |
/* XXX ISA-LFB support */ |
2920 | 2922 |
/* FIXME not qdev yet */ |
2921 |
return 0; |
|
2922 | 2923 |
} |
2923 | 2924 |
|
2924 | 2925 |
static Property isa_cirrus_vga_properties[] = { |
... | ... | |
2929 | 2930 |
|
2930 | 2931 |
static void isa_cirrus_vga_class_init(ObjectClass *klass, void *data) |
2931 | 2932 |
{ |
2932 |
ISADeviceClass *k = ISA_DEVICE_CLASS(klass); |
|
2933 | 2933 |
DeviceClass *dc = DEVICE_CLASS(klass); |
2934 | 2934 |
|
2935 | 2935 |
dc->vmsd = &vmstate_cirrus_vga; |
2936 |
k->init = vga_initfn;
|
|
2936 |
dc->realize = isa_cirrus_vga_realizefn;
|
|
2937 | 2937 |
dc->props = isa_cirrus_vga_properties; |
2938 | 2938 |
} |
2939 | 2939 |
|
Also available in: Unified diff