[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [5365] Disable bluetooth proxy compilation on win32.
From: |
Andrzej Zaborowski |
Subject: |
[Qemu-devel] [5365] Disable bluetooth proxy compilation on win32. |
Date: |
Tue, 30 Sep 2008 23:31:36 +0000 |
Revision: 5365
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5365
Author: balrog
Date: 2008-09-30 23:31:35 +0000 (Tue, 30 Sep 2008)
Log Message:
-----------
Disable bluetooth proxy compilation on win32.
Modified Paths:
--------------
trunk/bt-host.c
trunk/bt-vhci.c
Modified: trunk/bt-host.c
===================================================================
--- trunk/bt-host.c 2008-09-30 19:44:32 UTC (rev 5364)
+++ trunk/bt-host.c 2008-09-30 23:31:35 UTC (rev 5365)
@@ -24,17 +24,18 @@
#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;
@@ -154,7 +155,7 @@
{
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 @@
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 @@
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 @@
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 @@
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
Modified: trunk/bt-vhci.c
===================================================================
--- trunk/bt-vhci.c 2008-09-30 19:44:32 UTC (rev 5364)
+++ trunk/bt-vhci.c 2008-09-30 23:31:35 UTC (rev 5365)
@@ -25,9 +25,7 @@
#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 {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [5365] Disable bluetooth proxy compilation on win32.,
Andrzej Zaborowski <=