summary refs log tree commit diff stats
path: root/include/hw/bt.h
diff options
context:
space:
mode:
authorAnthony Liguori <anthony@codemonkey.ws>2013-09-11 14:46:21 -0500
committerAnthony Liguori <anthony@codemonkey.ws>2013-09-11 14:46:21 -0500
commita640f07c0d03bfa3031af1fc0a32b0d779917d17 (patch)
treeaef05faa1cb19136263cd28fcd061ff71ae68144 /include/hw/bt.h
parentf69f0bcac951f3c3089246695874b84ea8967936 (diff)
parentadbecc89731cf3e0ae656d50ea9fa58c589c4bdc (diff)
downloadfocaccia-qemu-a640f07c0d03bfa3031af1fc0a32b0d779917d17.tar.gz
focaccia-qemu-a640f07c0d03bfa3031af1fc0a32b0d779917d17.zip
Merge remote-tracking branch 'kraxel/usb.89' into staging
# By Gerd Hoffmann (2) and Miroslav Rezanina (2)
# Via Gerd Hoffmann
* kraxel/usb.89:
  ehci: save device pointer in EHCIState
  Remove dev-bluetooth.c dependency from vl.c
  Preparation for usb-bt-dongle conditional build
  usb: sanity check setup_index+setup_len in post_load

Message-id: 1378806073-25197-1-git-send-email-kraxel@redhat.com
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to 'include/hw/bt.h')
-rw-r--r--include/hw/bt.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/hw/bt.h b/include/hw/bt.h
index 3f365bcbcb..cb2a7e6579 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);