diff options
Diffstat (limited to 'include/net/bluetooth/hci.h')
-rw-r--r-- | include/net/bluetooth/hci.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index b2bdb1aa0429..10a3eec191fd 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h | |||
@@ -44,12 +44,13 @@ | |||
44 | #define HCI_NOTIFY_VOICE_SETTING 3 | 44 | #define HCI_NOTIFY_VOICE_SETTING 3 |
45 | 45 | ||
46 | /* HCI device types */ | 46 | /* HCI device types */ |
47 | #define HCI_VHCI 0 | 47 | #define HCI_VIRTUAL 0 |
48 | #define HCI_USB 1 | 48 | #define HCI_USB 1 |
49 | #define HCI_PCCARD 2 | 49 | #define HCI_PCCARD 2 |
50 | #define HCI_UART 3 | 50 | #define HCI_UART 3 |
51 | #define HCI_RS232 4 | 51 | #define HCI_RS232 4 |
52 | #define HCI_PCI 5 | 52 | #define HCI_PCI 5 |
53 | #define HCI_SDIO 6 | ||
53 | 54 | ||
54 | /* HCI device quirks */ | 55 | /* HCI device quirks */ |
55 | enum { | 56 | enum { |
@@ -296,6 +297,7 @@ struct hci_cp_host_buffer_size { | |||
296 | 297 | ||
297 | /* Link Control */ | 298 | /* Link Control */ |
298 | #define OGF_LINK_CTL 0x01 | 299 | #define OGF_LINK_CTL 0x01 |
300 | |||
299 | #define OCF_CREATE_CONN 0x0005 | 301 | #define OCF_CREATE_CONN 0x0005 |
300 | struct hci_cp_create_conn { | 302 | struct hci_cp_create_conn { |
301 | bdaddr_t bdaddr; | 303 | bdaddr_t bdaddr; |
@@ -306,6 +308,11 @@ struct hci_cp_create_conn { | |||
306 | __u8 role_switch; | 308 | __u8 role_switch; |
307 | } __attribute__ ((packed)); | 309 | } __attribute__ ((packed)); |
308 | 310 | ||
311 | #define OCF_CREATE_CONN_CANCEL 0x0008 | ||
312 | struct hci_cp_create_conn_cancel { | ||
313 | bdaddr_t bdaddr; | ||
314 | } __attribute__ ((packed)); | ||
315 | |||
309 | #define OCF_ACCEPT_CONN_REQ 0x0009 | 316 | #define OCF_ACCEPT_CONN_REQ 0x0009 |
310 | struct hci_cp_accept_conn_req { | 317 | struct hci_cp_accept_conn_req { |
311 | bdaddr_t bdaddr; | 318 | bdaddr_t bdaddr; |
@@ -339,6 +346,8 @@ struct hci_cp_inquiry { | |||
339 | 346 | ||
340 | #define OCF_INQUIRY_CANCEL 0x0002 | 347 | #define OCF_INQUIRY_CANCEL 0x0002 |
341 | 348 | ||
349 | #define OCF_EXIT_PERIODIC_INQ 0x0004 | ||
350 | |||
342 | #define OCF_LINK_KEY_REPLY 0x000B | 351 | #define OCF_LINK_KEY_REPLY 0x000B |
343 | struct hci_cp_link_key_reply { | 352 | struct hci_cp_link_key_reply { |
344 | bdaddr_t bdaddr; | 353 | bdaddr_t bdaddr; |