From 2e9b08e59e241fe0119463fc5192e15a6403eded Mon Sep 17 00:00:00 2001 From: balrog Date: Tue, 30 Sep 2008 23:31:35 +0000 Subject: [PATCH] Disable bluetooth proxy compilation on win32. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5365 c046a42c-6fe2-441c-8c8c-71466251a162 --- bt-host.c | 39 ++++++++++++++++++++++++--------------- bt-vhci.c | 4 +--- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/bt-host.c b/bt-host.c index 5d3e8405bd..042a55e47e 100644 --- a/bt-host.c +++ b/bt-host.c @@ -24,17 +24,18 @@ #include "sysemu.h" #include "net.h" -#include -#include -#include -#ifdef CONFIG_BLUEZ -# include -# include -# include -#else -# include "hw/bt.h" -# define HCI_MAX_FRAME_SIZE 1028 -#endif +#ifndef _WIN32 +# include +# include +# include +# ifdef CONFIG_BLUEZ +# include +# include +# include +# else +# include "hw/bt.h" +# define HCI_MAX_FRAME_SIZE 1028 +# endif 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; -#ifdef CONFIG_BLUEZ +# ifdef CONFIG_BLUEZ 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? */ -#endif +# endif 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; } -#ifdef CONFIG_BLUEZ +# ifdef CONFIG_BLUEZ 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; } -#endif +# endif 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; } +#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 146939313d..4fa1db45e7 100644 --- a/bt-vhci.c +++ b/bt-vhci.c @@ -25,9 +25,7 @@ #include "net.h" #include "hw/bt.h" -#include - -#define VHCI_DEV "/dev/vhci" +#define VHCI_DEV "/dev/vhci" #define VHCI_UDEV "/dev/hci_vhci" struct bt_vhci_s {