@@ -18,7 +18,6 @@
*/
#include "qemu-common.h"
-#include "net.h"
#include "bt-host.h"
#include "main-loop.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
@@ -18,7 +18,7 @@
*/
#include "qemu-common.h"
-#include "net.h"
+#include "bt-host.h"
#include "hw/bt.h"
#include "main-loop.h"
@@ -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 {
@@ -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 {
@@ -18,7 +18,7 @@
*/
#include "qemu-common.h"
-#include "net.h"
+#include "bt-host.h"
#include "bt.h"
/* Slave implementations can ignore this */
@@ -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 {
@@ -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;
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- bt-host.c | 1 - bt-host.h | 13 ++++++++++++- bt-vhci.c | 2 +- hw/bt-hci-csr.c | 2 +- hw/bt-hci.c | 2 +- hw/bt.c | 2 +- hw/usb/dev-bluetooth.c | 2 +- net.h | 14 -------------- 8 files changed, 17 insertions(+), 21 deletions(-)