net: move Bluetooth stuff out of net.h

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/bt-host.c b/bt-host.c
index 311864517defc53d4c8e1615c51a291b23c5de64..65aaca337c5fcc2435162cc877069507d3c87381 100644 (file)
--- a/bt-host.c
+++ b/bt-host.c
@@ -18,7 +18,6 @@
  */
 
 #include "qemu-common.h"
-#include "net.h"
 #include "bt-host.h"
 #include "main-loop.h"
 

diff --git a/bt-host.h b/bt-host.h
index f1eff65f45264f4851c486c84d897259afd6e1bb..2bc6d53ccadc4f5fc0849da7ee8e8f2b5bb43f79 100644 (file)
--- a/bt-host.h
+++ b/bt-host.h
@@ -1,9 +1,20 @@
 #ifndef BT_HOST_H
 #define BT_HOST_H
 
-struct HCIInfo;
+/* BT HCI info */
+
+struct HCIInfo {
+    int (*bdaddr_set)(struct HCIInfo *hci, const uint8_t *bd_addr);
+    void (*cmd_send)(struct HCIInfo *hci, const uint8_t *data, int len);
+    void (*sco_send)(struct HCIInfo *hci, const uint8_t *data, int len);
+    void (*acl_send)(struct HCIInfo *hci, const uint8_t *data, int len);
+    void *opaque;
+    void (*evt_recv)(void *opaque, const uint8_t *data, int len);
+    void (*acl_recv)(void *opaque, const uint8_t *data, int len);
+};
 
 /* bt-host.c */
 struct HCIInfo *bt_host_hci(const char *id);
+struct HCIInfo *qemu_next_hci(void);
 
 #endif

diff --git a/bt-vhci.c b/bt-vhci.c
index 6fecb6671688c7529047823cd5587d672d3dbcab..13c0e53729fb01471939bd565eaa4b79f19ce4e4 100644 (file)
--- a/bt-vhci.c
+++ b/bt-vhci.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu-common.h"
-#include "net.h"
+#include "bt-host.h"
 #include "hw/bt.h"
 #include "main-loop.h"
 

diff --git a/hw/bt-hci-csr.c b/hw/bt-hci-csr.c
index 772b677ba177f60f0f1e40c4cb41f9a14ae0638c..0faabbb5853883b8e33b46e517eef0809ae54bb5 100644 (file)
--- a/hw/bt-hci-csr.c
+++ b/hw/bt-hci-csr.c
@@ -22,7 +22,7 @@
 #include "qemu-char.h"
 #include "qemu-timer.h"
 #include "irq.h"
-#include "net.h"
+#include "bt-host.h"
 #include "bt.h"
 
 struct csrhci_s {

diff --git a/hw/bt-hci.c b/hw/bt-hci.c
index e54cfd78159a3bd8e6bab8cbfd6575d8b52d1cd9..d2ad57faa98f736265a95e88aa15933cf1ee7fc9 100644 (file)
--- a/hw/bt-hci.c
+++ b/hw/bt-hci.c
@@ -21,7 +21,7 @@
 #include "qemu-common.h"
 #include "qemu-timer.h"
 #include "usb.h"
-#include "net.h"
+#include "bt-host.h"
 #include "bt.h"
 
 struct bt_hci_s {

diff --git a/hw/bt.c b/hw/bt.c
index dc99fc28fabe2be33bf14638c5c94f67735eae34..3fea0983d40b0e0b2af98f3f4d1dd7f2a17d448b 100644 (file)
--- a/hw/bt.c
+++ b/hw/bt.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu-common.h"
-#include "net.h"
+#include "bt-host.h"
 #include "bt.h"
 
 /* Slave implementations can ignore this */

diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c
index 39984f53eb19bc339c57fba5ab3157da9b9902ec..4a37442288ace2b98bb80ebacfd20adef330b8cf 100644 (file)
--- a/hw/usb/dev-bluetooth.c
+++ b/hw/usb/dev-bluetooth.c
@@ -21,7 +21,7 @@
 #include "qemu-common.h"
 #include "hw/usb.h"
 #include "hw/usb/desc.h"
-#include "net.h"
+#include "bt-host.h"
 #include "hw/bt.h"
 
 struct USBBtState {

diff --git a/net.h b/net.h
index 04fda1d6c8f8559dac23e34824b8fc07d443a6b3..1d0816bc0a2aa70f9cac23529d13ffccfdb2a7a5 100644 (file)
--- a/net.h
+++ b/net.h
@@ -133,20 +133,6 @@ extern int nb_nics;
 extern NICInfo nd_table[MAX_NICS];
 extern int default_net;
 
-/* BT HCI info */
-
-struct HCIInfo {
-    int (*bdaddr_set)(struct HCIInfo *hci, const uint8_t *bd_addr);
-    void (*cmd_send)(struct HCIInfo *hci, const uint8_t *data, int len);
-    void (*sco_send)(struct HCIInfo *hci, const uint8_t *data, int len);
-    void (*acl_send)(struct HCIInfo *hci, const uint8_t *data, int len);
-    void *opaque;
-    void (*evt_recv)(void *opaque, const uint8_t *data, int len);
-    void (*acl_recv)(void *opaque, const uint8_t *data, int len);
-};
-
-struct HCIInfo *qemu_next_hci(void);
-
 /* from net.c */
 extern const char *legacy_tftp_prefix;
 extern const char *legacy_bootp_filename;