Commit 4e51eae9 authored by Szymon Janc's avatar Szymon Janc Committed by Gustavo F. Padovan

Bluetooth: Move index to common header in management interface

Most mgmt commands and event are related to hci adapter. Moving index to
common header allow to easily use it in command status while reporting errors.
For those not related to adapter use MGMT_INDEX_NONE (0xFFFF) as index.
Signed-off-by: default avatarSzymon Janc <szymon.janc@tieto.com>
Acked-by: default avatarJohan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 779cb850
...@@ -21,11 +21,13 @@ ...@@ -21,11 +21,13 @@
SOFTWARE IS DISCLAIMED. SOFTWARE IS DISCLAIMED.
*/ */
#define MGMT_INDEX_NONE 0xFFFF
struct mgmt_hdr { struct mgmt_hdr {
__le16 opcode; __le16 opcode;
__le16 index;
__le16 len; __le16 len;
} __packed; } __packed;
#define MGMT_HDR_SIZE 4
#define MGMT_OP_READ_VERSION 0x0001 #define MGMT_OP_READ_VERSION 0x0001
struct mgmt_rp_read_version { struct mgmt_rp_read_version {
...@@ -40,11 +42,7 @@ struct mgmt_rp_read_index_list { ...@@ -40,11 +42,7 @@ struct mgmt_rp_read_index_list {
} __packed; } __packed;
#define MGMT_OP_READ_INFO 0x0004 #define MGMT_OP_READ_INFO 0x0004
struct mgmt_cp_read_info {
__le16 index;
} __packed;
struct mgmt_rp_read_info { struct mgmt_rp_read_info {
__le16 index;
__u8 type; __u8 type;
__u8 powered; __u8 powered;
__u8 connectable; __u8 connectable;
...@@ -60,7 +58,6 @@ struct mgmt_rp_read_info { ...@@ -60,7 +58,6 @@ struct mgmt_rp_read_info {
} __packed; } __packed;
struct mgmt_mode { struct mgmt_mode {
__le16 index;
__u8 val; __u8 val;
} __packed; } __packed;
...@@ -74,27 +71,23 @@ struct mgmt_mode { ...@@ -74,27 +71,23 @@ struct mgmt_mode {
#define MGMT_OP_ADD_UUID 0x0009 #define MGMT_OP_ADD_UUID 0x0009
struct mgmt_cp_add_uuid { struct mgmt_cp_add_uuid {
__le16 index;
__u8 uuid[16]; __u8 uuid[16];
__u8 svc_hint; __u8 svc_hint;
} __packed; } __packed;
#define MGMT_OP_REMOVE_UUID 0x000A #define MGMT_OP_REMOVE_UUID 0x000A
struct mgmt_cp_remove_uuid { struct mgmt_cp_remove_uuid {
__le16 index;
__u8 uuid[16]; __u8 uuid[16];
} __packed; } __packed;
#define MGMT_OP_SET_DEV_CLASS 0x000B #define MGMT_OP_SET_DEV_CLASS 0x000B
struct mgmt_cp_set_dev_class { struct mgmt_cp_set_dev_class {
__le16 index;
__u8 major; __u8 major;
__u8 minor; __u8 minor;
} __packed; } __packed;
#define MGMT_OP_SET_SERVICE_CACHE 0x000C #define MGMT_OP_SET_SERVICE_CACHE 0x000C
struct mgmt_cp_set_service_cache { struct mgmt_cp_set_service_cache {
__le16 index;
__u8 enable; __u8 enable;
} __packed; } __packed;
...@@ -107,7 +100,6 @@ struct mgmt_key_info { ...@@ -107,7 +100,6 @@ struct mgmt_key_info {
#define MGMT_OP_LOAD_KEYS 0x000D #define MGMT_OP_LOAD_KEYS 0x000D
struct mgmt_cp_load_keys { struct mgmt_cp_load_keys {
__le16 index;
__u8 debug_keys; __u8 debug_keys;
__le16 key_count; __le16 key_count;
struct mgmt_key_info keys[0]; struct mgmt_key_info keys[0];
...@@ -115,75 +107,60 @@ struct mgmt_cp_load_keys { ...@@ -115,75 +107,60 @@ struct mgmt_cp_load_keys {
#define MGMT_OP_REMOVE_KEY 0x000E #define MGMT_OP_REMOVE_KEY 0x000E
struct mgmt_cp_remove_key { struct mgmt_cp_remove_key {
__le16 index;
bdaddr_t bdaddr; bdaddr_t bdaddr;
__u8 disconnect; __u8 disconnect;
} __packed; } __packed;
#define MGMT_OP_DISCONNECT 0x000F #define MGMT_OP_DISCONNECT 0x000F
struct mgmt_cp_disconnect { struct mgmt_cp_disconnect {
__le16 index;
bdaddr_t bdaddr; bdaddr_t bdaddr;
} __packed; } __packed;
struct mgmt_rp_disconnect { struct mgmt_rp_disconnect {
__le16 index;
bdaddr_t bdaddr; bdaddr_t bdaddr;
} __packed; } __packed;
#define MGMT_OP_GET_CONNECTIONS 0x0010 #define MGMT_OP_GET_CONNECTIONS 0x0010
struct mgmt_cp_get_connections {
__le16 index;
} __packed;
struct mgmt_rp_get_connections { struct mgmt_rp_get_connections {
__le16 index;
__le16 conn_count; __le16 conn_count;
bdaddr_t conn[0]; bdaddr_t conn[0];
} __packed; } __packed;
#define MGMT_OP_PIN_CODE_REPLY 0x0011 #define MGMT_OP_PIN_CODE_REPLY 0x0011
struct mgmt_cp_pin_code_reply { struct mgmt_cp_pin_code_reply {
__le16 index;
bdaddr_t bdaddr; bdaddr_t bdaddr;
__u8 pin_len; __u8 pin_len;
__u8 pin_code[16]; __u8 pin_code[16];
} __packed; } __packed;
struct mgmt_rp_pin_code_reply { struct mgmt_rp_pin_code_reply {
__le16 index;
bdaddr_t bdaddr; bdaddr_t bdaddr;
uint8_t status; uint8_t status;
} __packed; } __packed;
#define MGMT_OP_PIN_CODE_NEG_REPLY 0x0012 #define MGMT_OP_PIN_CODE_NEG_REPLY 0x0012
struct mgmt_cp_pin_code_neg_reply { struct mgmt_cp_pin_code_neg_reply {
__le16 index;
bdaddr_t bdaddr; bdaddr_t bdaddr;
} __packed; } __packed;
#define MGMT_OP_SET_IO_CAPABILITY 0x0013 #define MGMT_OP_SET_IO_CAPABILITY 0x0013
struct mgmt_cp_set_io_capability { struct mgmt_cp_set_io_capability {
__le16 index;
__u8 io_capability; __u8 io_capability;
} __packed; } __packed;
#define MGMT_OP_PAIR_DEVICE 0x0014 #define MGMT_OP_PAIR_DEVICE 0x0014
struct mgmt_cp_pair_device { struct mgmt_cp_pair_device {
__le16 index;
bdaddr_t bdaddr; bdaddr_t bdaddr;
__u8 io_cap; __u8 io_cap;
} __packed; } __packed;
struct mgmt_rp_pair_device { struct mgmt_rp_pair_device {
__le16 index;
bdaddr_t bdaddr; bdaddr_t bdaddr;
__u8 status; __u8 status;
} __packed; } __packed;
#define MGMT_OP_USER_CONFIRM_REPLY 0x0015 #define MGMT_OP_USER_CONFIRM_REPLY 0x0015
struct mgmt_cp_user_confirm_reply { struct mgmt_cp_user_confirm_reply {
__le16 index;
bdaddr_t bdaddr; bdaddr_t bdaddr;
} __packed; } __packed;
struct mgmt_rp_user_confirm_reply { struct mgmt_rp_user_confirm_reply {
__le16 index;
bdaddr_t bdaddr; bdaddr_t bdaddr;
__u8 status; __u8 status;
} __packed; } __packed;
...@@ -204,19 +181,12 @@ struct mgmt_ev_cmd_status { ...@@ -204,19 +181,12 @@ struct mgmt_ev_cmd_status {
#define MGMT_EV_CONTROLLER_ERROR 0x0003 #define MGMT_EV_CONTROLLER_ERROR 0x0003
struct mgmt_ev_controller_error { struct mgmt_ev_controller_error {
__le16 index;
__u8 error_code; __u8 error_code;
} __packed; } __packed;
#define MGMT_EV_INDEX_ADDED 0x0004 #define MGMT_EV_INDEX_ADDED 0x0004
struct mgmt_ev_index_added {
__le16 index;
} __packed;
#define MGMT_EV_INDEX_REMOVED 0x0005 #define MGMT_EV_INDEX_REMOVED 0x0005
struct mgmt_ev_index_removed {
__le16 index;
} __packed;
#define MGMT_EV_POWERED 0x0006 #define MGMT_EV_POWERED 0x0006
...@@ -228,46 +198,39 @@ struct mgmt_ev_index_removed { ...@@ -228,46 +198,39 @@ struct mgmt_ev_index_removed {
#define MGMT_EV_NEW_KEY 0x000A #define MGMT_EV_NEW_KEY 0x000A
struct mgmt_ev_new_key { struct mgmt_ev_new_key {
__le16 index;
struct mgmt_key_info key; struct mgmt_key_info key;
__u8 old_key_type; __u8 old_key_type;
} __packed; } __packed;
#define MGMT_EV_CONNECTED 0x000B #define MGMT_EV_CONNECTED 0x000B
struct mgmt_ev_connected { struct mgmt_ev_connected {
__le16 index;
bdaddr_t bdaddr; bdaddr_t bdaddr;
} __packed; } __packed;
#define MGMT_EV_DISCONNECTED 0x000C #define MGMT_EV_DISCONNECTED 0x000C
struct mgmt_ev_disconnected { struct mgmt_ev_disconnected {
__le16 index;
bdaddr_t bdaddr; bdaddr_t bdaddr;
} __packed; } __packed;
#define MGMT_EV_CONNECT_FAILED 0x000D #define MGMT_EV_CONNECT_FAILED 0x000D
struct mgmt_ev_connect_failed { struct mgmt_ev_connect_failed {
__le16 index;
bdaddr_t bdaddr; bdaddr_t bdaddr;
__u8 status; __u8 status;
} __packed; } __packed;
#define MGMT_EV_PIN_CODE_REQUEST 0x000E #define MGMT_EV_PIN_CODE_REQUEST 0x000E
struct mgmt_ev_pin_code_request { struct mgmt_ev_pin_code_request {
__le16 index;
bdaddr_t bdaddr; bdaddr_t bdaddr;
} __packed; } __packed;
#define MGMT_EV_USER_CONFIRM_REQUEST 0x000F #define MGMT_EV_USER_CONFIRM_REQUEST 0x000F
struct mgmt_ev_user_confirm_request { struct mgmt_ev_user_confirm_request {
__le16 index;
bdaddr_t bdaddr; bdaddr_t bdaddr;
__le32 value; __le32 value;
} __packed; } __packed;
#define MGMT_EV_AUTH_FAILED 0x0010 #define MGMT_EV_AUTH_FAILED 0x0010
struct mgmt_ev_auth_failed { struct mgmt_ev_auth_failed {
__le16 index;
bdaddr_t bdaddr; bdaddr_t bdaddr;
__u8 status; __u8 status;
} __packed; } __packed;
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment