summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-03-10 21:43:35 +0000
committeraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-03-10 21:43:35 +0000
commit5ef4efa426d69643d51fc98afcee662bef6a2839 (patch)
tree627f4b36b46f27dabbea6b8b3d9d21bcd38b2ea9
parent419bafa517f777d56f851efce55a9d2328a657bc (diff)
downloadqemu-5ef4efa426d69643d51fc98afcee662bef6a2839.zip
Clean build: Add bt-host.h
Silence compiler warning by providing proper CONFIG_BLUEZ-independent header for the bt-host API. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6809 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--bt-host.c1
-rw-r--r--bt-host.h9
-rw-r--r--hw/bt.h3
-rw-r--r--vl.c1
4 files changed, 11 insertions, 3 deletions
diff --git a/bt-host.c b/bt-host.c
index a0dcce7b41..3701fbdbe7 100644
--- a/bt-host.c
+++ b/bt-host.c
@@ -22,6 +22,7 @@
#include "qemu-char.h"
#include "sysemu.h"
#include "net.h"
+#include "bt-host.h"
#ifndef _WIN32
# include <errno.h>
diff --git a/bt-host.h b/bt-host.h
new file mode 100644
index 0000000000..f1eff65f45
--- /dev/null
+++ b/bt-host.h
@@ -0,0 +1,9 @@
+#ifndef BT_HOST_H
+#define BT_HOST_H
+
+struct HCIInfo;
+
+/* bt-host.c */
+struct HCIInfo *bt_host_hci(const char *id);
+
+#endif
diff --git a/hw/bt.h b/hw/bt.h
index 2d65e10ea3..726905f760 100644
--- a/hw/bt.h
+++ b/hw/bt.h
@@ -112,9 +112,6 @@ void bt_device_done(struct bt_device_s *dev);
/* bt-hci.c */
struct HCIInfo *bt_new_hci(struct bt_scatternet_s *net);
-/* bt-host.c */
-struct HCIInfo *bt_host_hci(const char *id);
-
/* bt-vhci.c */
void bt_vhci_init(struct HCIInfo *info);
diff --git a/vl.c b/vl.c
index b7417008ad..c49a6d1d4b 100644
--- a/vl.c
+++ b/vl.c
@@ -138,6 +138,7 @@ int main(int argc, char **argv)
#include "hw/isa.h"
#include "hw/baum.h"
#include "hw/bt.h"
+#include "bt-host.h"
#include "net.h"
#include "monitor.h"
#include "console.h"