ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb: usb-bt QOMify 

Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gonglei 2015-05-06 20:55:25 +08:00 committed by Gerd Hoffmann
parent 0389a0b109
commit a293e82bbe
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/usb/dev-bluetooth.c
View File

@ -49,6 +49,9 @@ struct USBBtState {
} outcmd, outacl, outsco; } outcmd, outacl, outsco;
}; };
#define TYPE_USB_BT "usb-bt-dongle"
#define USB_BT(obj) OBJECT_CHECK(struct USBBtState, (obj), TYPE_USB_BT)
#define USB_EVT_EP 1 #define USB_EVT_EP 1
#define USB_ACL_EP 2 #define USB_ACL_EP 2
#define USB_SCO_EP 3 #define USB_SCO_EP 3
@ -503,7 +506,7 @@ static void usb_bt_handle_destroy(USBDevice *dev)
static void usb_bt_realize(USBDevice *dev, Error **errp) static void usb_bt_realize(USBDevice *dev, Error **errp)
{ {
struct USBBtState *s = DO_UPCAST(struct USBBtState, dev, dev); struct USBBtState *s = USB_BT(dev);
usb_desc_create_serial(dev); usb_desc_create_serial(dev);
usb_desc_init(dev); usb_desc_init(dev);
@ -523,7 +526,7 @@ static USBDevice *usb_bt_init(USBBus *bus, const char *cmdline)
USBDevice *dev; USBDevice *dev;
struct USBBtState *s; struct USBBtState *s;
HCIInfo *hci; HCIInfo *hci;
const char *name = "usb-bt-dongle"; const char *name = TYPE_USB_BT;
if (*cmdline) { if (*cmdline) {
hci = hci_init(cmdline); hci = hci_init(cmdline);
@ -534,7 +537,7 @@ static USBDevice *usb_bt_init(USBBus *bus, const char *cmdline)
return NULL; return NULL;
dev = usb_create(bus, name); dev = usb_create(bus, name);
s = DO_UPCAST(struct USBBtState, dev, dev); s = USB_BT(dev);
s->hci = hci; s->hci = hci;
return dev; return dev;
} }
@ -561,7 +564,7 @@ static void usb_bt_class_initfn(ObjectClass *klass, void *data)
} }
static const TypeInfo bt_info = { static const TypeInfo bt_info = {
.name = "usb-bt-dongle", .name = TYPE_USB_BT,
.parent = TYPE_USB_DEVICE, .parent = TYPE_USB_DEVICE,
.instance_size = sizeof(struct USBBtState), .instance_size = sizeof(struct USBBtState),
.class_init = usb_bt_class_initfn, .class_init = usb_bt_class_initfn,
@ -570,7 +573,7 @@ static const TypeInfo bt_info = {
static void usb_bt_register_types(void) static void usb_bt_register_types(void)
{ {
type_register_static(&bt_info); type_register_static(&bt_info);
usb_legacy_register("usb-bt-dongle", "bt", usb_bt_init); usb_legacy_register(TYPE_USB_BT, "bt", usb_bt_init);
} }
type_init(usb_bt_register_types) type_init(usb_bt_register_types)