Disable bluetooth proxy compilation on win32.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5365 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/bt-host.c b/bt-host.c
index 5d3e8405bd86350b1a06e936d3bb22d6bc60c9f4..042a55e47e6a10079df838f5aa964be2a209633a 100644 (file)
--- a/bt-host.c
+++ b/bt-host.c
@@ -24,17 +24,18 @@
 #include "sysemu.h"
 #include "net.h"
 
 #include "sysemu.h"
 #include "net.h"
 

-#include <errno.h>
-#include <sys/ioctl.h>
-#include <sys/uio.h>
-#ifdef CONFIG_BLUEZ
-# include <bluetooth/bluetooth.h>
-# include <bluetooth/hci.h>
-# include <bluetooth/hci_lib.h>
-#else
-# include "hw/bt.h"
-# define HCI_MAX_FRAME_SIZE    1028
-#endif
+#ifndef _WIN32
+# include <errno.h>
+# include <sys/ioctl.h>
+# include <sys/uio.h>
+# ifdef CONFIG_BLUEZ
+#  include <bluetooth/bluetooth.h>
+#  include <bluetooth/hci.h>
+#  include <bluetooth/hci_lib.h>
+# else
+#  include "hw/bt.h"
+#  define HCI_MAX_FRAME_SIZE   1028
+# endif

 
 struct bt_host_hci_s {
     struct HCIInfo hci;
 
 struct bt_host_hci_s {
     struct HCIInfo hci;


@@ -154,7 +155,7 @@ struct HCIInfo *bt_host_hci(const char *id)
 {
     struct bt_host_hci_s *s;
     int fd = -1;
 {
     struct bt_host_hci_s *s;
     int fd = -1;

-#ifdef CONFIG_BLUEZ
+# ifdef CONFIG_BLUEZ

     int dev_id = hci_devid(id);
     struct hci_filter flt;
 
     int dev_id = hci_devid(id);
     struct hci_filter flt;
 


@@ -166,7 +167,7 @@ struct HCIInfo *bt_host_hci(const char *id)
     fd = hci_open_dev(dev_id);
 
     /* XXX: can we ensure nobody else has the device opened?  */
     fd = hci_open_dev(dev_id);
 
     /* XXX: can we ensure nobody else has the device opened?  */

-#endif
+# endif

 
     if (fd < 0) {
         fprintf(stderr, "qemu: Can't open `%s': %s (%i)\n",
 
     if (fd < 0) {
         fprintf(stderr, "qemu: Can't open `%s': %s (%i)\n",


@@ -174,7 +175,7 @@ struct HCIInfo *bt_host_hci(const char *id)
         return 0;
     }
 
         return 0;
     }
 

-#ifdef CONFIG_BLUEZ
+# ifdef CONFIG_BLUEZ

     hci_filter_clear(&flt);
     hci_filter_all_ptypes(&flt);
     hci_filter_all_events(&flt);
     hci_filter_clear(&flt);
     hci_filter_all_ptypes(&flt);
     hci_filter_all_events(&flt);


@@ -183,7 +184,7 @@ struct HCIInfo *bt_host_hci(const char *id)
         fprintf(stderr, "qemu: Can't set HCI filter on socket (%i)\n", errno);
         return 0;
     }
         fprintf(stderr, "qemu: Can't set HCI filter on socket (%i)\n", errno);
         return 0;
     }

-#endif
+# endif

 
     s = qemu_mallocz(sizeof(struct bt_host_hci_s));
     s->fd = fd;
 
     s = qemu_mallocz(sizeof(struct bt_host_hci_s));
     s->fd = fd;


@@ -196,3 +197,11 @@ struct HCIInfo *bt_host_hci(const char *id)
 
     return &s->hci;
 }
 
     return &s->hci;
 }

+#else
+struct HCIInfo *bt_host_hci(const char *id)
+{
+    fprintf(stderr, "qemu: bluetooth passthrough not supported (yet)\n", errno);
+
+    return 0;
+}
+#endif

diff --git a/bt-vhci.c b/bt-vhci.c
index 146939313d59cae23cf2017c834af512326f3bef..4fa1db45e76070091c2f20f3177f70d8ee0b8bd4 100644 (file)
--- a/bt-vhci.c
+++ b/bt-vhci.c
@@ -25,9 +25,7 @@
 #include "net.h"
 #include "hw/bt.h"
 
 #include "net.h"
 #include "hw/bt.h"
 

-#include <sys/uio.h>
-
-#define VHCI_DEV       "/dev/vhci" 
+#define VHCI_DEV       "/dev/vhci"

 #define VHCI_UDEV      "/dev/hci_vhci"
 
 struct bt_vhci_s {
 #define VHCI_UDEV      "/dev/hci_vhci"
 
 struct bt_vhci_s {