Skip to content

L
linux
Commit c4762507 authored by Gustavo F. Padovan's avatar Gustavo F. Padovan
Browse files
Options

Bluetooth: Fix coding style in mgmt.h 

Align struct definition in a proper way.
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 0a4eaeeb
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 79 deletions
include/net/bluetooth/mgmt.h
View file @ c4762507
...@@ -44,37 +44,37 @@ ...@@ -44,37 +44,37 @@
#define MGMT_STATUS_INVALID_INDEX 0x11 #define MGMT_STATUS_INVALID_INDEX 0x11
struct mgmt_hdr { struct mgmt_hdr {
__le16 opcode; __le16 opcode;
__le16 index; __le16 index;
__le16 len; __le16 len;
} __packed; } __packed;
struct mgmt_addr_info { struct mgmt_addr_info {
bdaddr_t bdaddr; bdaddr_t bdaddr;
__u8 type; __u8 type;
} __packed; } __packed;
#define MGMT_ADDR_INFO_SIZE 7 #define MGMT_ADDR_INFO_SIZE 7
#define MGMT_OP_READ_VERSION 0x0001 #define MGMT_OP_READ_VERSION 0x0001
#define MGMT_READ_VERSION_SIZE 0 #define MGMT_READ_VERSION_SIZE 0
struct mgmt_rp_read_version { struct mgmt_rp_read_version {
__u8 version; __u8 version;
__le16 revision; __le16 revision;
} __packed; } __packed;
#define MGMT_OP_READ_COMMANDS 0x0002 #define MGMT_OP_READ_COMMANDS 0x0002
#define MGMT_READ_COMMANDS_SIZE 0 #define MGMT_READ_COMMANDS_SIZE 0
struct mgmt_rp_read_commands { struct mgmt_rp_read_commands {
__le16 num_commands; __le16 num_commands;
__le16 num_events; __le16 num_events;
__le16 opcodes[0]; __le16 opcodes[0];
} __packed; } __packed;
#define MGMT_OP_READ_INDEX_LIST 0x0003 #define MGMT_OP_READ_INDEX_LIST 0x0003
#define MGMT_READ_INDEX_LIST_SIZE 0 #define MGMT_READ_INDEX_LIST_SIZE 0
struct mgmt_rp_read_index_list { struct mgmt_rp_read_index_list {
__le16 num_controllers; __le16 num_controllers;
__le16 index[0]; __le16 index[0];
} __packed; } __packed;
/* Reserve one extra byte for names in management messages so that they /* Reserve one extra byte for names in management messages so that they
...@@ -96,14 +96,14 @@ struct mgmt_rp_read_index_list { ...@@ -96,14 +96,14 @@ struct mgmt_rp_read_index_list {
#define MGMT_OP_READ_INFO 0x0004 #define MGMT_OP_READ_INFO 0x0004
#define MGMT_READ_INFO_SIZE 0 #define MGMT_READ_INFO_SIZE 0
struct mgmt_rp_read_info { struct mgmt_rp_read_info {
bdaddr_t bdaddr; bdaddr_t bdaddr;
__u8 version; __u8 version;
__le16 manufacturer; __le16 manufacturer;
__le32 supported_settings; __le32 supported_settings;
__le32 current_settings; __le32 current_settings;
__u8 dev_class[3]; __u8 dev_class[3];
__u8 name[MGMT_MAX_NAME_LENGTH]; __u8 name[MGMT_MAX_NAME_LENGTH];
__u8 short_name[MGMT_MAX_SHORT_NAME_LENGTH]; __u8 short_name[MGMT_MAX_SHORT_NAME_LENGTH];
} __packed; } __packed;
struct mgmt_mode { struct mgmt_mode {
...@@ -116,8 +116,8 @@ struct mgmt_mode { ...@@ -116,8 +116,8 @@ struct mgmt_mode {
#define MGMT_OP_SET_DISCOVERABLE 0x0006 #define MGMT_OP_SET_DISCOVERABLE 0x0006
struct mgmt_cp_set_discoverable { struct mgmt_cp_set_discoverable {
__u8 val; __u8 val;
__u16 timeout; __u16 timeout;
} __packed; } __packed;
#define MGMT_SET_DISCOVERABLE_SIZE 3 #define MGMT_SET_DISCOVERABLE_SIZE 3
...@@ -134,63 +134,62 @@ struct mgmt_cp_set_discoverable { ...@@ -134,63 +134,62 @@ struct mgmt_cp_set_discoverable {
#define MGMT_OP_SET_HS 0x000C #define MGMT_OP_SET_HS 0x000C
#define MGMT_OP_SET_LE 0x000D #define MGMT_OP_SET_LE 0x000D
#define MGMT_OP_SET_DEV_CLASS 0x000E #define MGMT_OP_SET_DEV_CLASS 0x000E
struct mgmt_cp_set_dev_class { struct mgmt_cp_set_dev_class {
__u8 major; __u8 major;
__u8 minor; __u8 minor;
} __packed; } __packed;
#define MGMT_SET_DEV_CLASS_SIZE 2 #define MGMT_SET_DEV_CLASS_SIZE 2
#define MGMT_OP_SET_LOCAL_NAME 0x000F #define MGMT_OP_SET_LOCAL_NAME 0x000F
struct mgmt_cp_set_local_name { struct mgmt_cp_set_local_name {
__u8 name[MGMT_MAX_NAME_LENGTH]; __u8 name[MGMT_MAX_NAME_LENGTH];
__u8 short_name[MGMT_MAX_SHORT_NAME_LENGTH]; __u8 short_name[MGMT_MAX_SHORT_NAME_LENGTH];
} __packed; } __packed;
#define MGMT_SET_LOCAL_NAME_SIZE 260 #define MGMT_SET_LOCAL_NAME_SIZE 260
#define MGMT_OP_ADD_UUID 0x0010 #define MGMT_OP_ADD_UUID 0x0010
struct mgmt_cp_add_uuid { struct mgmt_cp_add_uuid {
__u8 uuid[16]; __u8 uuid[16];
__u8 svc_hint; __u8 svc_hint;
} __packed; } __packed;
#define MGMT_ADD_UUID_SIZE 17 #define MGMT_ADD_UUID_SIZE 17
#define MGMT_OP_REMOVE_UUID 0x0011 #define MGMT_OP_REMOVE_UUID 0x0011
struct mgmt_cp_remove_uuid { struct mgmt_cp_remove_uuid {
__u8 uuid[16]; __u8 uuid[16];
} __packed; } __packed;
#define MGMT_REMOVE_UUID_SIZE 16 #define MGMT_REMOVE_UUID_SIZE 16
struct mgmt_link_key_info { struct mgmt_link_key_info {
struct mgmt_addr_info addr; struct mgmt_addr_info addr;
u8 type; u8 type;
u8 val[16]; u8 val[16];
u8 pin_len; u8 pin_len;
} __packed; } __packed;
#define MGMT_OP_LOAD_LINK_KEYS 0x0012 #define MGMT_OP_LOAD_LINK_KEYS 0x0012
struct mgmt_cp_load_link_keys { struct mgmt_cp_load_link_keys {
__u8 debug_keys; __u8 debug_keys;
__le16 key_count; __le16 key_count;
struct mgmt_link_key_info keys[0]; struct mgmt_link_key_info keys[0];
} __packed; } __packed;
#define MGMT_LOAD_LINK_KEYS_SIZE 3 #define MGMT_LOAD_LINK_KEYS_SIZE 3
struct mgmt_ltk_info { struct mgmt_ltk_info {
struct mgmt_addr_info addr; struct mgmt_addr_info addr;
__u8 authenticated; __u8 authenticated;
__u8 master; __u8 master;
__u8 enc_size; __u8 enc_size;
__le16 ediv; __le16 ediv;
__u8 rand[8]; __u8 rand[8];
__u8 val[16]; __u8 val[16];
} __packed; } __packed;
#define MGMT_OP_LOAD_LONG_TERM_KEYS 0x0013 #define MGMT_OP_LOAD_LONG_TERM_KEYS 0x0013
struct mgmt_cp_load_long_term_keys { struct mgmt_cp_load_long_term_keys {
__le16 key_count; __le16 key_count;
struct mgmt_ltk_info keys[0]; struct mgmt_ltk_info keys[0];
} __packed; } __packed;
#define MGMT_LOAD_LONG_TERM_KEYS_SIZE 2 #define MGMT_LOAD_LONG_TERM_KEYS_SIZE 2
...@@ -213,8 +212,8 @@ struct mgmt_rp_get_connections { ...@@ -213,8 +212,8 @@ struct mgmt_rp_get_connections {
#define MGMT_OP_PIN_CODE_REPLY 0x0016 #define MGMT_OP_PIN_CODE_REPLY 0x0016
struct mgmt_cp_pin_code_reply { struct mgmt_cp_pin_code_reply {
struct mgmt_addr_info addr; struct mgmt_addr_info addr;
__u8 pin_len; __u8 pin_len;
__u8 pin_code[16]; __u8 pin_code[16];
} __packed; } __packed;
#define MGMT_PIN_CODE_REPLY_SIZE (MGMT_ADDR_INFO_SIZE + 17) #define MGMT_PIN_CODE_REPLY_SIZE (MGMT_ADDR_INFO_SIZE + 17)
struct mgmt_rp_pin_code_reply { struct mgmt_rp_pin_code_reply {
...@@ -229,14 +228,14 @@ struct mgmt_cp_pin_code_neg_reply { ...@@ -229,14 +228,14 @@ struct mgmt_cp_pin_code_neg_reply {
#define MGMT_OP_SET_IO_CAPABILITY 0x0018 #define MGMT_OP_SET_IO_CAPABILITY 0x0018
struct mgmt_cp_set_io_capability { struct mgmt_cp_set_io_capability {
__u8 io_capability; __u8 io_capability;
} __packed; } __packed;
#define MGMT_SET_IO_CAPABILITY_SIZE 1 #define MGMT_SET_IO_CAPABILITY_SIZE 1
#define MGMT_OP_PAIR_DEVICE 0x0019 #define MGMT_OP_PAIR_DEVICE 0x0019
struct mgmt_cp_pair_device { struct mgmt_cp_pair_device {
struct mgmt_addr_info addr; struct mgmt_addr_info addr;
__u8 io_cap; __u8 io_cap;
} __packed; } __packed;
#define MGMT_PAIR_DEVICE_SIZE (MGMT_ADDR_INFO_SIZE + 1) #define MGMT_PAIR_DEVICE_SIZE (MGMT_ADDR_INFO_SIZE + 1)
struct mgmt_rp_pair_device { struct mgmt_rp_pair_device {
...@@ -274,7 +273,7 @@ struct mgmt_cp_user_confirm_neg_reply { ...@@ -274,7 +273,7 @@ struct mgmt_cp_user_confirm_neg_reply {
#define MGMT_OP_USER_PASSKEY_REPLY 0x001E #define MGMT_OP_USER_PASSKEY_REPLY 0x001E
struct mgmt_cp_user_passkey_reply { struct mgmt_cp_user_passkey_reply {
struct mgmt_addr_info addr; struct mgmt_addr_info addr;
__le32 passkey; __le32 passkey;
} __packed; } __packed;
#define MGMT_USER_PASSKEY_REPLY_SIZE (MGMT_ADDR_INFO_SIZE + 4) #define MGMT_USER_PASSKEY_REPLY_SIZE (MGMT_ADDR_INFO_SIZE + 4)
struct mgmt_rp_user_passkey_reply { struct mgmt_rp_user_passkey_reply {
...@@ -290,15 +289,15 @@ struct mgmt_cp_user_passkey_neg_reply { ...@@ -290,15 +289,15 @@ struct mgmt_cp_user_passkey_neg_reply {
#define MGMT_OP_READ_LOCAL_OOB_DATA 0x0020 #define MGMT_OP_READ_LOCAL_OOB_DATA 0x0020
#define MGMT_READ_LOCAL_OOB_DATA_SIZE 0 #define MGMT_READ_LOCAL_OOB_DATA_SIZE 0
struct mgmt_rp_read_local_oob_data { struct mgmt_rp_read_local_oob_data {
__u8 hash[16]; __u8 hash[16];
__u8 randomizer[16]; __u8 randomizer[16];
} __packed; } __packed;
#define MGMT_OP_ADD_REMOTE_OOB_DATA 0x0021 #define MGMT_OP_ADD_REMOTE_OOB_DATA 0x0021
struct mgmt_cp_add_remote_oob_data { struct mgmt_cp_add_remote_oob_data {
struct mgmt_addr_info addr; struct mgmt_addr_info addr;
__u8 hash[16]; __u8 hash[16];
__u8 randomizer[16]; __u8 randomizer[16];
} __packed; } __packed;
#define MGMT_ADD_REMOTE_OOB_DATA_SIZE (MGMT_ADDR_INFO_SIZE + 32) #define MGMT_ADD_REMOTE_OOB_DATA_SIZE (MGMT_ADDR_INFO_SIZE + 32)
...@@ -323,7 +322,7 @@ struct mgmt_cp_stop_discovery { ...@@ -323,7 +322,7 @@ struct mgmt_cp_stop_discovery {
#define MGMT_OP_CONFIRM_NAME 0x0025 #define MGMT_OP_CONFIRM_NAME 0x0025
struct mgmt_cp_confirm_name { struct mgmt_cp_confirm_name {
struct mgmt_addr_info addr; struct mgmt_addr_info addr;
__u8 name_known; __u8 name_known;
} __packed; } __packed;
#define MGMT_CONFIRM_NAME_SIZE (MGMT_ADDR_INFO_SIZE + 1) #define MGMT_CONFIRM_NAME_SIZE (MGMT_ADDR_INFO_SIZE + 1)
struct mgmt_rp_confirm_name { struct mgmt_rp_confirm_name {
...@@ -344,20 +343,20 @@ struct mgmt_cp_unblock_device { ...@@ -344,20 +343,20 @@ struct mgmt_cp_unblock_device {
#define MGMT_EV_CMD_COMPLETE 0x0001 #define MGMT_EV_CMD_COMPLETE 0x0001
struct mgmt_ev_cmd_complete { struct mgmt_ev_cmd_complete {
__le16 opcode; __le16 opcode;
__u8 status; __u8 status;
__u8 data[0]; __u8 data[0];
} __packed; } __packed;
#define MGMT_EV_CMD_STATUS 0x0002 #define MGMT_EV_CMD_STATUS 0x0002
struct mgmt_ev_cmd_status { struct mgmt_ev_cmd_status {
__le16 opcode; __le16 opcode;
__u8 status; __u8 status;
} __packed; } __packed;
#define MGMT_EV_CONTROLLER_ERROR 0x0003 #define MGMT_EV_CONTROLLER_ERROR 0x0003
struct mgmt_ev_controller_error { struct mgmt_ev_controller_error {
__u8 error_code; __u8 error_code;
} __packed; } __packed;
#define MGMT_EV_INDEX_ADDED 0x0004 #define MGMT_EV_INDEX_ADDED 0x0004
...@@ -368,33 +367,33 @@ struct mgmt_ev_controller_error { ...@@ -368,33 +367,33 @@ struct mgmt_ev_controller_error {
#define MGMT_EV_CLASS_OF_DEV_CHANGED 0x0007 #define MGMT_EV_CLASS_OF_DEV_CHANGED 0x0007
struct mgmt_ev_class_of_dev_changed { struct mgmt_ev_class_of_dev_changed {
__u8 dev_class[3]; __u8 dev_class[3];
}; };
#define MGMT_EV_LOCAL_NAME_CHANGED 0x0008 #define MGMT_EV_LOCAL_NAME_CHANGED 0x0008
struct mgmt_ev_local_name_changed { struct mgmt_ev_local_name_changed {
__u8 name[MGMT_MAX_NAME_LENGTH]; __u8 name[MGMT_MAX_NAME_LENGTH];
__u8 short_name[MGMT_MAX_SHORT_NAME_LENGTH]; __u8 short_name[MGMT_MAX_SHORT_NAME_LENGTH];
} __packed; } __packed;
#define MGMT_EV_NEW_LINK_KEY 0x0009 #define MGMT_EV_NEW_LINK_KEY 0x0009
struct mgmt_ev_new_link_key { struct mgmt_ev_new_link_key {
__u8 store_hint; __u8 store_hint;
struct mgmt_link_key_info key; struct mgmt_link_key_info key;
} __packed; } __packed;
#define MGMT_EV_NEW_LONG_TERM_KEY 0x000A #define MGMT_EV_NEW_LONG_TERM_KEY 0x000A
struct mgmt_ev_new_long_term_key { struct mgmt_ev_new_long_term_key {
__u8 store_hint; __u8 store_hint;
struct mgmt_ltk_info key; struct mgmt_ltk_info key;
} __packed; } __packed;
#define MGMT_EV_DEVICE_CONNECTED 0x000B #define MGMT_EV_DEVICE_CONNECTED 0x000B
struct mgmt_ev_device_connected { struct mgmt_ev_device_connected {
struct mgmt_addr_info addr; struct mgmt_addr_info addr;
__le32 flags; __le32 flags;
__le16 eir_len; __le16 eir_len;
__u8 eir[0]; __u8 eir[0];
} __packed; } __packed;
#define MGMT_EV_DEVICE_DISCONNECTED 0x000C #define MGMT_EV_DEVICE_DISCONNECTED 0x000C
...@@ -402,20 +401,20 @@ struct mgmt_ev_device_connected { ...@@ -402,20 +401,20 @@ struct mgmt_ev_device_connected {
#define MGMT_EV_CONNECT_FAILED 0x000D #define MGMT_EV_CONNECT_FAILED 0x000D
struct mgmt_ev_connect_failed { struct mgmt_ev_connect_failed {
struct mgmt_addr_info addr; struct mgmt_addr_info addr;
__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 {
struct mgmt_addr_info addr; struct mgmt_addr_info addr;
__u8 secure; __u8 secure;
} __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 {
struct mgmt_addr_info addr; struct mgmt_addr_info addr;
__u8 confirm_hint; __u8 confirm_hint;
__le32 value; __le32 value;
} __packed; } __packed;
#define MGMT_EV_USER_PASSKEY_REQUEST 0x0010 #define MGMT_EV_USER_PASSKEY_REQUEST 0x0010
...@@ -426,7 +425,7 @@ struct mgmt_ev_user_passkey_request { ...@@ -426,7 +425,7 @@ struct mgmt_ev_user_passkey_request {
#define MGMT_EV_AUTH_FAILED 0x0011 #define MGMT_EV_AUTH_FAILED 0x0011
struct mgmt_ev_auth_failed { struct mgmt_ev_auth_failed {
struct mgmt_addr_info addr; struct mgmt_addr_info addr;
__u8 status; __u8 status;
} __packed; } __packed;
#define MGMT_DEV_FOUND_CONFIRM_NAME 0x01 #define MGMT_DEV_FOUND_CONFIRM_NAME 0x01
...@@ -435,16 +434,16 @@ struct mgmt_ev_auth_failed { ...@@ -435,16 +434,16 @@ struct mgmt_ev_auth_failed {
#define MGMT_EV_DEVICE_FOUND 0x0012 #define MGMT_EV_DEVICE_FOUND 0x0012
struct mgmt_ev_device_found { struct mgmt_ev_device_found {
struct mgmt_addr_info addr; struct mgmt_addr_info addr;
__s8 rssi; __s8 rssi;
__u8 flags[4]; __u8 flags[4];
__le16 eir_len; __le16 eir_len;
__u8 eir[0]; __u8 eir[0];
} __packed; } __packed;
#define MGMT_EV_DISCOVERING 0x0013 #define MGMT_EV_DISCOVERING 0x0013
struct mgmt_ev_discovering { struct mgmt_ev_discovering {
__u8 type; __u8 type;
__u8 discovering; __u8 discovering;
} __packed; } __packed;
#define MGMT_EV_DEVICE_BLOCKED 0x0014 #define MGMT_EV_DEVICE_BLOCKED 0x0014
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7