linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / net / bluetooth / hci.h

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index b2bdb1a..b06a2d2 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -54,8 +54,7 @@
 /* HCI device quirks */
 enum {
        HCI_QUIRK_RESET_ON_INIT,
-       HCI_QUIRK_RAW_DEVICE,
-       HCI_QUIRK_FIXUP_BUFFER_SIZE
+       HCI_QUIRK_RAW_DEVICE
 };
 
 /* HCI device flags */
@@ -101,10 +100,9 @@ enum {
 #define HCIINQUIRY     _IOR('H', 240, int)
 
 /* HCI timeouts */
-#define HCI_CONNECT_TIMEOUT    (40000) /* 40 seconds */
-#define HCI_DISCONN_TIMEOUT    (2000)  /* 2 seconds */
-#define HCI_IDLE_TIMEOUT       (6000)  /* 6 seconds */
-#define HCI_INIT_TIMEOUT       (10000) /* 10 seconds */
+#define HCI_CONN_TIMEOUT       (HZ * 40)
+#define HCI_DISCONN_TIMEOUT    (HZ * 2)
+#define HCI_CONN_IDLE_TIMEOUT  (HZ * 60)
 
 /* HCI Packet types */
 #define HCI_COMMAND_PKT                0x01
@@ -146,7 +144,7 @@ enum {
 #define LMP_TACCURACY  0x10
 #define LMP_RSWITCH    0x20
 #define LMP_HOLD       0x40
-#define LMP_SNIFF      0x80
+#define LMP_SNIF       0x80
 
 #define LMP_PARK       0x01
 #define LMP_RSSI       0x02
@@ -161,21 +159,13 @@ enum {
 #define LMP_PSCHEME    0x02
 #define LMP_PCONTROL   0x04
 
-#define LMP_SNIFF_SUBR 0x02
-
-/* Connection modes */
-#define HCI_CM_ACTIVE  0x0000
-#define HCI_CM_HOLD    0x0001
-#define HCI_CM_SNIFF   0x0002
-#define HCI_CM_PARK    0x0003
-
 /* Link policies */
 #define HCI_LP_RSWITCH 0x0001
 #define HCI_LP_HOLD    0x0002
 #define HCI_LP_SNIFF   0x0004
 #define HCI_LP_PARK    0x0008
 
-/* Link modes */
+/* Link mode */
 #define HCI_LM_ACCEPT  0x8000
 #define HCI_LM_MASTER  0x0001
 #define HCI_LM_AUTH    0x0002
@@ -201,7 +191,7 @@ struct hci_rp_read_loc_version {
 } __attribute__ ((packed));
 
 #define OCF_READ_LOCAL_FEATURES        0x0003
-struct hci_rp_read_local_features {
+struct hci_rp_read_loc_features {
        __u8 status;
        __u8 features[8];
 } __attribute__ ((packed));
@@ -385,32 +375,17 @@ struct hci_cp_change_conn_link_key {
 } __attribute__ ((packed));
 
 #define OCF_READ_REMOTE_FEATURES 0x001B
-struct hci_cp_read_remote_features {
+struct hci_cp_read_rmt_features {
        __le16   handle;
 } __attribute__ ((packed));
 
 #define OCF_READ_REMOTE_VERSION 0x001D
-struct hci_cp_read_remote_version {
+struct hci_cp_read_rmt_version {
        __le16   handle;
 } __attribute__ ((packed));
 
 /* Link Policy */
-#define OGF_LINK_POLICY        0x02   
-
-#define OCF_SNIFF_MODE         0x0003
-struct hci_cp_sniff_mode {
-       __le16   handle;
-       __le16   max_interval;
-       __le16   min_interval;
-       __le16   attempt;
-       __le16   timeout;
-} __attribute__ ((packed));
-
-#define OCF_EXIT_SNIFF_MODE    0x0004
-struct hci_cp_exit_sniff_mode {
-       __le16   handle;
-} __attribute__ ((packed));
-
+#define OGF_LINK_POLICY         0x02   
 #define OCF_ROLE_DISCOVERY     0x0009
 struct hci_cp_role_discovery {
        __le16   handle;
@@ -431,7 +406,7 @@ struct hci_rp_read_link_policy {
        __le16   policy;
 } __attribute__ ((packed));
 
-#define OCF_SWITCH_ROLE                0x000B
+#define OCF_SWITCH_ROLE        0x000B
 struct hci_cp_switch_role {
        bdaddr_t bdaddr;
        __u8     role;
@@ -447,14 +422,6 @@ struct hci_rp_write_link_policy {
        __le16   handle;
 } __attribute__ ((packed));
 
-#define OCF_SNIFF_SUBRATE      0x0011
-struct hci_cp_sniff_subrate {
-       __le16   handle;
-       __le16   max_latency;
-       __le16   min_remote_timeout;
-       __le16   min_local_timeout;
-} __attribute__ ((packed));
-
 /* Status params */
 #define OGF_STATUS_PARAM       0x05
 
@@ -614,15 +581,15 @@ struct hci_ev_link_key_notify {
        __u8     key_type;
 } __attribute__ ((packed));
 
-#define HCI_EV_REMOTE_FEATURES 0x0B
-struct hci_ev_remote_features {
+#define HCI_EV_RMT_FEATURES    0x0B
+struct hci_ev_rmt_features {
        __u8     status;
        __le16   handle;
        __u8     features[8];
 } __attribute__ ((packed));
 
-#define HCI_EV_REMOTE_VERSION  0x0C
-struct hci_ev_remote_version {
+#define HCI_EV_RMT_VERSION     0x0C
+struct hci_ev_rmt_version {
        __u8     status;
        __le16   handle;
        __u8     lmp_ver;
@@ -643,16 +610,6 @@ struct hci_ev_pscan_rep_mode {
        __u8     pscan_rep_mode;
 } __attribute__ ((packed));
 
-#define HCI_EV_SNIFF_SUBRATE   0x2E
-struct hci_ev_sniff_subrate {
-       __u8     status;
-       __le16   handle;
-       __le16   max_tx_latency;
-       __le16   max_rx_latency;
-       __le16   max_remote_timeout;
-       __le16   max_local_timeout;
-} __attribute__ ((packed));
-
 /* Internal events generated by Bluetooth stack */
 #define HCI_EV_STACK_INTERNAL  0xFD
 struct hci_ev_stack_internal {