diff options
Diffstat (limited to 'hw/gus.c')
-rw-r--r-- | hw/gus.c | 32 |
1 files changed, 18 insertions, 14 deletions
@@ -299,29 +299,33 @@ int GUS_init (ISABus *bus) return 0; } +static Property gus_properties[] = { + DEFINE_PROP_UINT32 ("freq", GUSState, freq, 44100), + DEFINE_PROP_HEX32 ("iobase", GUSState, port, 0x240), + DEFINE_PROP_UINT32 ("irq", GUSState, emu.gusirq, 7), + DEFINE_PROP_UINT32 ("dma", GUSState, emu.gusdma, 3), + DEFINE_PROP_END_OF_LIST (), +}; + static void gus_class_initfn(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); ISADeviceClass *ic = ISA_DEVICE_CLASS(klass); ic->init = gus_initfn; + dc->desc = "Gravis Ultrasound GF1"; + dc->vmsd = &vmstate_gus; + dc->props = gus_properties; } -static DeviceInfo gus_info = { - .name = "gus", - .desc = "Gravis Ultrasound GF1", - .size = sizeof (GUSState), - .vmsd = &vmstate_gus, - .class_init = gus_class_initfn, - .props = (Property[]) { - DEFINE_PROP_UINT32 ("freq", GUSState, freq, 44100), - DEFINE_PROP_HEX32 ("iobase", GUSState, port, 0x240), - DEFINE_PROP_UINT32 ("irq", GUSState, emu.gusirq, 7), - DEFINE_PROP_UINT32 ("dma", GUSState, emu.gusdma, 3), - DEFINE_PROP_END_OF_LIST (), - }, +static TypeInfo gus_info = { + .name = "gus", + .parent = TYPE_ISA_DEVICE, + .instance_size = sizeof (GUSState), + .class_init = gus_class_initfn, }; static void gus_register (void) { - isa_qdev_register (&gus_info); + type_register_static(&gus_info); } device_init (gus_register) |