Patchwork [11/32] net: move Bluetooth stuff out of net.h

login
register
mail settings
Submitter Paolo Bonzini
Date Dec. 6, 2012, 1:06 p.m.
Message ID <1354799230-30904-12-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/204267/
State New
Headers show

Comments

Paolo Bonzini - Dec. 6, 2012, 1:06 p.m.
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(-)

Patch

diff --git a/bt-host.c b/bt-host.c
index 3118645..65aaca3 100644
--- 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 f1eff65..2bc6d53 100644
--- 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 6fecb66..13c0e53 100644
--- 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 772b677..0faabbb 100644
--- 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 e54cfd7..d2ad57f 100644
--- 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 dc99fc2..3fea098 100644
--- 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 39984f5..4a37442 100644
--- 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 04fda1d..1d0816b 100644
--- 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;