diff options
Diffstat (limited to 'hw/sb16.c')
| -rw-r--r-- | hw/sb16.c | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/hw/sb16.c b/hw/sb16.c index 67357ce546..ae2545068a 100644 --- a/hw/sb16.c +++ b/hw/sb16.c @@ -1391,30 +1391,34 @@ int SB16_init (ISABus *bus) return 0; } +static Property sb16_properties[] = { + DEFINE_PROP_HEX32 ("version", SB16State, ver, 0x0405), /* 4.5 */ + DEFINE_PROP_HEX32 ("iobase", SB16State, port, 0x220), + DEFINE_PROP_UINT32 ("irq", SB16State, irq, 5), + DEFINE_PROP_UINT32 ("dma", SB16State, dma, 1), + DEFINE_PROP_UINT32 ("dma16", SB16State, hdma, 5), + DEFINE_PROP_END_OF_LIST (), +}; + static void sb16_class_initfn(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); ISADeviceClass *ic = ISA_DEVICE_CLASS(klass); ic->init = sb16_initfn; + dc->desc = "Creative Sound Blaster 16"; + dc->vmsd = &vmstate_sb16; + dc->props = sb16_properties; } -static DeviceInfo sb16_info = { - .name = "sb16", - .desc = "Creative Sound Blaster 16", - .size = sizeof (SB16State), - .vmsd = &vmstate_sb16, - .class_init = sb16_class_initfn, - .props = (Property[]) { - DEFINE_PROP_HEX32 ("version", SB16State, ver, 0x0405), /* 4.5 */ - DEFINE_PROP_HEX32 ("iobase", SB16State, port, 0x220), - DEFINE_PROP_UINT32 ("irq", SB16State, irq, 5), - DEFINE_PROP_UINT32 ("dma", SB16State, dma, 1), - DEFINE_PROP_UINT32 ("dma16", SB16State, hdma, 5), - DEFINE_PROP_END_OF_LIST (), - }, +static TypeInfo sb16_info = { + .name = "sb16", + .parent = TYPE_ISA_DEVICE, + .instance_size = sizeof (SB16State), + .class_init = sb16_class_initfn, }; static void sb16_register (void) { - isa_qdev_register (&sb16_info); + type_register_static(&sb16_info); } device_init (sb16_register) |