spapr/rtas: modify spapr_rtas_register() to remove RTAS handlers

[qemu.git] / include / hw / bt.h

diff --git a/include/hw/bt.h b/include/hw/bt.h
index 830af947355cdee6c720c98e7411af4cdf7f2e97..b5e11d4d4328ee737b8ad39155eb3aee2a49168b 100644 (file)
--- a/include/hw/bt.h
+++ b/include/hw/bt.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef HW_BT_H
-#define HW_BT_H 1
+#define HW_BT_H
 
 #include "hw/irq.h"
 
@@ -108,12 +108,15 @@ struct bt_device_s {
     uint16_t clkoff;   /* Note: Always little-endian */
 };
 
+extern struct HCIInfo null_hci;
 /* bt.c */
 void bt_device_init(struct bt_device_s *dev, struct bt_scatternet_s *net);
 void bt_device_done(struct bt_device_s *dev);
+struct bt_scatternet_s *qemu_find_bt_vlan(int id);
 
 /* bt-hci.c */
 struct HCIInfo *bt_new_hci(struct bt_scatternet_s *net);
+struct HCIInfo *hci_init(const char *str);
 
 /* bt-vhci.c */
 void bt_vhci_init(struct HCIInfo *info);
@@ -124,8 +127,8 @@ enum {
     csrhci_pin_wakeup,
     __csrhci_pins,
 };
-qemu_irq *csrhci_pins_get(CharDriverState *chr);
-CharDriverState *uart_hci_init(qemu_irq wakeup);
+qemu_irq *csrhci_pins_get(Chardev *chr);
+Chardev *uart_hci_init(void);
 
 /* bt-l2cap.c */
 struct bt_l2cap_device_s;
@@ -171,8 +174,6 @@ enum bt_l2cap_psm_predef {
 void bt_l2cap_sdp_init(struct bt_l2cap_device_s *dev);
 
 /* bt-hid.c */
-struct bt_device_s *bt_mouse_init(struct bt_scatternet_s *net);
-struct bt_device_s *bt_tablet_init(struct bt_scatternet_s *net);
 struct bt_device_s *bt_keyboard_init(struct bt_scatternet_s *net);
 
 /* Link Management Protocol layer defines */
@@ -501,7 +502,6 @@ typedef struct {
 
 #define OCF_CREATE_CONN_CANCEL         0x0008
 typedef struct {
-    uint8_t    status;
     bdaddr_t   bdaddr;
 } QEMU_PACKED create_conn_cancel_cp;
 #define CREATE_CONN_CANCEL_CP_SIZE 6
@@ -640,8 +640,8 @@ typedef struct {
 #define OCF_SETUP_SYNC_CONN            0x0028
 typedef struct {
     uint16_t   handle;
-    uint32_t   tx_bandwith;
-    uint32_t   rx_bandwith;
+    uint32_t   tx_bandwidth;
+    uint32_t   rx_bandwidth;
     uint16_t   max_latency;
     uint16_t   voice_setting;
     uint8_t    retrans_effort;
@@ -652,8 +652,8 @@ typedef struct {
 #define OCF_ACCEPT_SYNC_CONN_REQ       0x0029
 typedef struct {
     bdaddr_t   bdaddr;
-    uint32_t   tx_bandwith;
-    uint32_t   rx_bandwith;
+    uint32_t   tx_bandwidth;
+    uint32_t   rx_bandwidth;
     uint16_t   max_latency;
     uint16_t   voice_setting;
     uint8_t    retrans_effort;
@@ -1263,13 +1263,13 @@ typedef struct {
     uint8_t    status;
     uint16_t   handle;
 } QEMU_PACKED reset_failed_contact_counter_rp;
-#define RESET_FAILED_CONTACT_COUNTER_RP_SIZE 4
+#define RESET_FAILED_CONTACT_COUNTER_RP_SIZE 3
 
 #define OCF_READ_LINK_QUALITY          0x0003
 typedef struct {
     uint16_t   handle;
 } QEMU_PACKED read_link_quality_cp;
-#define READ_LINK_QUALITY_CP_SIZE 4
+#define READ_LINK_QUALITY_CP_SIZE 2
 
 typedef struct {
     uint8_t    status;
@@ -1329,7 +1329,7 @@ typedef struct {
     uint8_t    dev_class[3];
     uint16_t   clock_offset;
 } QEMU_PACKED inquiry_info;
-#define INQUIRY_INFO_SIZE 14
+#define INQUIRY_INFO_SIZE 15
 
 #define EVT_CONN_COMPLETE              0x03
 typedef struct {
@@ -1378,7 +1378,7 @@ typedef struct {
     uint16_t   handle;
     uint8_t    encrypt;
 } QEMU_PACKED evt_encrypt_change;
-#define EVT_ENCRYPT_CHANGE_SIZE 5
+#define EVT_ENCRYPT_CHANGE_SIZE 4
 
 #define EVT_CHANGE_CONN_LINK_KEY_COMPLETE      0x09
 typedef struct {
@@ -1626,18 +1626,6 @@ typedef struct {
 } QEMU_PACKED evt_sniff_subrate;
 #define EVT_SNIFF_SUBRATE_SIZE 11
 
-#define EVT_EXTENDED_INQUIRY_RESULT    0x2F
-typedef struct {
-    bdaddr_t   bdaddr;
-    uint8_t    pscan_rep_mode;
-    uint8_t    pscan_period_mode;
-    uint8_t    dev_class[3];
-    uint16_t   clock_offset;
-    int8_t     rssi;
-    uint8_t    data[240];
-} QEMU_PACKED extended_inquiry_info;
-#define EXTENDED_INQUIRY_INFO_SIZE 254
-
 #define EVT_TESTING                    0xFE
 
 #define EVT_VENDOR                     0xFF