From 644e1a8a34d2f799bfeefae94b71593a2aa662ae Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Tue, 3 Sep 2013 11:23:08 +0200 Subject: Preparation for usb-bt-dongle conditional build To allow disable usb-bt-dongle device using CONFIG_BLUETOOTH option, some of functions in vl.c file has to be made accessible in dev-bluetooth.c. This is pure code moving. Signed-off-by: Miroslav Rezanina Signed-off-by: Gerd Hoffmann --- include/hw/bt.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/hw/bt.h b/include/hw/bt.h index 3f365bc..cb2a7e6 100644 --- a/include/hw/bt.h +++ b/include/hw/bt.h @@ -108,12 +108,15 @@ struct bt_device_s { uint16_t clkoff; /* Note: Always little-endian */ }; +extern struct HCIInfo null_hci; /* bt.c */ void bt_device_init(struct bt_device_s *dev, struct bt_scatternet_s *net); void bt_device_done(struct bt_device_s *dev); +struct bt_scatternet_s *qemu_find_bt_vlan(int id); /* bt-hci.c */ struct HCIInfo *bt_new_hci(struct bt_scatternet_s *net); +struct HCIInfo *hci_init(const char *str); /* bt-vhci.c */ void bt_vhci_init(struct HCIInfo *info); -- cgit v1.1 From 615fe4de4b3c26619611078960d3103550bde7d0 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Tue, 3 Sep 2013 11:23:09 +0200 Subject: Remove dev-bluetooth.c dependency from vl.c Use usb_legacy_register handling to create bt-dongle device and remove code dependency from vl.c so CONFIG_USB_BLUETOOTH can be disabled. Signed-off-by: Miroslav Rezanina Signed-off-by: Gerd Hoffmann --- include/hw/usb.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'include') diff --git a/include/hw/usb.h b/include/hw/usb.h index 1b8acba..a7680d4 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -442,9 +442,6 @@ int set_usb_string(uint8_t *buf, const char *str); USBDevice *usb_host_device_open(USBBus *bus, const char *devname); void usb_host_info(Monitor *mon, const QDict *qdict); -/* usb-bt.c */ -USBDevice *usb_bt_init(USBBus *bus, HCIInfo *hci); - /* usb ports of the VM */ #define VM_USB_HUB_SIZE 8 -- cgit v1.1