diff options
Diffstat (limited to 'hw/usb-wacom.c')
| -rw-r--r-- | hw/usb-wacom.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/hw/usb-wacom.c b/hw/usb-wacom.c index 9b20a3154c..14de14d5f7 100644 --- a/hw/usb-wacom.c +++ b/hw/usb-wacom.c @@ -349,9 +349,10 @@ static const VMStateDescription vmstate_usb_wacom = { .unmigratable = 1, }; -static void usb_wacom_class_init(ObjectClass *class, void *data) +static void usb_wacom_class_init(ObjectClass *klass, void *data) { - USBDeviceClass *uc = USB_DEVICE_CLASS(class); + DeviceClass *dc = DEVICE_CLASS(klass); + USBDeviceClass *uc = USB_DEVICE_CLASS(klass); uc->product_desc = "QEMU PenPartner Tablet"; uc->usb_desc = &desc_wacom; @@ -361,18 +362,20 @@ static void usb_wacom_class_init(ObjectClass *class, void *data) uc->handle_control = usb_wacom_handle_control; uc->handle_data = usb_wacom_handle_data; uc->handle_destroy = usb_wacom_handle_destroy; + dc->desc = "QEMU PenPartner Tablet"; + dc->vmsd = &vmstate_usb_wacom; } -static struct DeviceInfo wacom_info = { - .name = "usb-wacom-tablet", - .desc = "QEMU PenPartner Tablet", - .size = sizeof(USBWacomState), - .vmsd = &vmstate_usb_wacom, - .class_init= usb_wacom_class_init, +static TypeInfo wacom_info = { + .name = "usb-wacom-tablet", + .parent = TYPE_USB_DEVICE, + .instance_size = sizeof(USBWacomState), + .class_init = usb_wacom_class_init, }; static void usb_wacom_register_devices(void) { - usb_qdev_register(&wacom_info, "wacom-tablet", NULL); + type_register_static(&wacom_info); + usb_legacy_register("usb-wacom-tablet", "wacom-tablet", NULL); } device_init(usb_wacom_register_devices) |