diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2012-03-07 23:25:00 -0500 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2012-03-08 00:02:26 -0500 |
| commit | 04124681f104c1980024ff249a34a77a249fd2bc (patch) | |
| tree | 5caad821f1cdd55930b054cbdeab1c45421559b4 /include/net/bluetooth | |
| parent | f64b993f44c3a5fe709b276ac5652d006afe9d33 (diff) | |
Bluetooth: fix conding style issues all over the tree
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'include/net/bluetooth')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 67 |
1 files changed, 33 insertions, 34 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index cbbf68a8510d..daefaac51131 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
| @@ -398,16 +398,16 @@ static inline long inquiry_entry_age(struct inquiry_entry *e) | |||
| 398 | } | 398 | } |
| 399 | 399 | ||
| 400 | struct inquiry_entry *hci_inquiry_cache_lookup(struct hci_dev *hdev, | 400 | struct inquiry_entry *hci_inquiry_cache_lookup(struct hci_dev *hdev, |
| 401 | bdaddr_t *bdaddr); | 401 | bdaddr_t *bdaddr); |
| 402 | struct inquiry_entry *hci_inquiry_cache_lookup_unknown(struct hci_dev *hdev, | 402 | struct inquiry_entry *hci_inquiry_cache_lookup_unknown(struct hci_dev *hdev, |
| 403 | bdaddr_t *bdaddr); | 403 | bdaddr_t *bdaddr); |
| 404 | struct inquiry_entry *hci_inquiry_cache_lookup_resolve(struct hci_dev *hdev, | 404 | struct inquiry_entry *hci_inquiry_cache_lookup_resolve(struct hci_dev *hdev, |
| 405 | bdaddr_t *bdaddr, | 405 | bdaddr_t *bdaddr, |
| 406 | int state); | 406 | int state); |
| 407 | void hci_inquiry_cache_update_resolve(struct hci_dev *hdev, | 407 | void hci_inquiry_cache_update_resolve(struct hci_dev *hdev, |
| 408 | struct inquiry_entry *ie); | 408 | struct inquiry_entry *ie); |
| 409 | bool hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data, | 409 | bool hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data, |
| 410 | bool name_known, bool *ssp); | 410 | bool name_known, bool *ssp); |
| 411 | 411 | ||
| 412 | /* ----- HCI Connections ----- */ | 412 | /* ----- HCI Connections ----- */ |
| 413 | enum { | 413 | enum { |
| @@ -669,13 +669,13 @@ int hci_uuids_clear(struct hci_dev *hdev); | |||
| 669 | int hci_link_keys_clear(struct hci_dev *hdev); | 669 | int hci_link_keys_clear(struct hci_dev *hdev); |
| 670 | struct link_key *hci_find_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr); | 670 | struct link_key *hci_find_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr); |
| 671 | int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key, | 671 | int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key, |
| 672 | bdaddr_t *bdaddr, u8 *val, u8 type, u8 pin_len); | 672 | bdaddr_t *bdaddr, u8 *val, u8 type, u8 pin_len); |
| 673 | struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, __le16 ediv, u8 rand[8]); | 673 | struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, __le16 ediv, u8 rand[8]); |
| 674 | int hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type, u8 type, | 674 | int hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type, u8 type, |
| 675 | int new_key, u8 authenticated, u8 tk[16], | 675 | int new_key, u8 authenticated, u8 tk[16], u8 enc_size, u16 ediv, |
| 676 | u8 enc_size, u16 ediv, u8 rand[8]); | 676 | u8 rand[8]); |
| 677 | struct smp_ltk *hci_find_ltk_by_addr(struct hci_dev *hdev, bdaddr_t *bdaddr, | 677 | struct smp_ltk *hci_find_ltk_by_addr(struct hci_dev *hdev, bdaddr_t *bdaddr, |
| 678 | u8 addr_type); | 678 | u8 addr_type); |
| 679 | int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr); | 679 | int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr); |
| 680 | int hci_smp_ltks_clear(struct hci_dev *hdev); | 680 | int hci_smp_ltks_clear(struct hci_dev *hdev); |
| 681 | int hci_remove_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr); | 681 | int hci_remove_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr); |
| @@ -931,7 +931,7 @@ static inline bool eir_has_data_type(u8 *data, size_t data_len, u8 type) | |||
| 931 | } | 931 | } |
| 932 | 932 | ||
| 933 | static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type, u8 *data, | 933 | static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type, u8 *data, |
| 934 | u8 data_len) | 934 | u8 data_len) |
| 935 | { | 935 | { |
| 936 | eir[eir_len++] = sizeof(type) + data_len; | 936 | eir[eir_len++] = sizeof(type) + data_len; |
| 937 | eir[eir_len++] = type; | 937 | eir[eir_len++] = type; |
| @@ -978,50 +978,49 @@ int mgmt_discoverable(struct hci_dev *hdev, u8 discoverable); | |||
| 978 | int mgmt_connectable(struct hci_dev *hdev, u8 connectable); | 978 | int mgmt_connectable(struct hci_dev *hdev, u8 connectable); |
| 979 | int mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status); | 979 | int mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status); |
| 980 | int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key, | 980 | int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key, |
| 981 | u8 persistent); | 981 | u8 persistent); |
| 982 | int mgmt_device_connected(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, | 982 | int mgmt_device_connected(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, |
| 983 | u8 addr_type, u32 flags, u8 *name, | 983 | u8 addr_type, u32 flags, u8 *name, u8 name_len, |
| 984 | u8 name_len, u8 *dev_class); | 984 | u8 *dev_class); |
| 985 | int mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr, | 985 | int mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr, |
| 986 | u8 link_type, u8 addr_type); | 986 | u8 link_type, u8 addr_type); |
| 987 | int mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, | 987 | int mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, |
| 988 | u8 link_type, u8 addr_type, u8 status); | 988 | u8 link_type, u8 addr_type, u8 status); |
| 989 | int mgmt_connect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, | 989 | int mgmt_connect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, |
| 990 | u8 addr_type, u8 status); | 990 | u8 addr_type, u8 status); |
| 991 | int mgmt_pin_code_request(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 secure); | 991 | int mgmt_pin_code_request(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 secure); |
| 992 | int mgmt_pin_code_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, | 992 | int mgmt_pin_code_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, |
| 993 | u8 status); | 993 | u8 status); |
| 994 | int mgmt_pin_code_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, | 994 | int mgmt_pin_code_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, |
| 995 | u8 status); | 995 | u8 status); |
| 996 | int mgmt_user_confirm_request(struct hci_dev *hdev, bdaddr_t *bdaddr, | 996 | int mgmt_user_confirm_request(struct hci_dev *hdev, bdaddr_t *bdaddr, |
| 997 | u8 link_type, u8 addr_type, __le32 value, | 997 | u8 link_type, u8 addr_type, __le32 value, |
| 998 | u8 confirm_hint); | 998 | u8 confirm_hint); |
| 999 | int mgmt_user_confirm_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, | 999 | int mgmt_user_confirm_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, |
| 1000 | u8 link_type, u8 addr_type, u8 status); | 1000 | u8 link_type, u8 addr_type, u8 status); |
| 1001 | int mgmt_user_confirm_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, | 1001 | int mgmt_user_confirm_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, |
| 1002 | u8 link_type, u8 addr_type, u8 status); | 1002 | u8 link_type, u8 addr_type, u8 status); |
| 1003 | int mgmt_user_passkey_request(struct hci_dev *hdev, bdaddr_t *bdaddr, | 1003 | int mgmt_user_passkey_request(struct hci_dev *hdev, bdaddr_t *bdaddr, |
| 1004 | u8 link_type, u8 addr_type); | 1004 | u8 link_type, u8 addr_type); |
| 1005 | int mgmt_user_passkey_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, | 1005 | int mgmt_user_passkey_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, |
| 1006 | u8 link_type, u8 addr_type, u8 status); | 1006 | u8 link_type, u8 addr_type, u8 status); |
| 1007 | int mgmt_user_passkey_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, | 1007 | int mgmt_user_passkey_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, |
| 1008 | u8 link_type, u8 addr_type, u8 status); | 1008 | u8 link_type, u8 addr_type, u8 status); |
| 1009 | int mgmt_auth_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, | 1009 | int mgmt_auth_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, |
| 1010 | u8 addr_type, u8 status); | 1010 | u8 addr_type, u8 status); |
| 1011 | int mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status); | 1011 | int mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status); |
| 1012 | int mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status); | 1012 | int mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status); |
| 1013 | int mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class, | 1013 | int mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class, |
| 1014 | u8 status); | 1014 | u8 status); |
| 1015 | int mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status); | 1015 | int mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status); |
| 1016 | int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash, | 1016 | int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash, |
| 1017 | u8 *randomizer, u8 status); | 1017 | u8 *randomizer, u8 status); |
| 1018 | int mgmt_le_enable_complete(struct hci_dev *hdev, u8 enable, u8 status); | 1018 | int mgmt_le_enable_complete(struct hci_dev *hdev, u8 enable, u8 status); |
| 1019 | int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, | 1019 | int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, |
| 1020 | u8 addr_type, u8 *dev_class, s8 rssi, | 1020 | u8 addr_type, u8 *dev_class, s8 rssi, u8 cfm_name, |
| 1021 | u8 cfm_name, u8 ssp, u8 *eir, | 1021 | u8 ssp, u8 *eir, u16 eir_len); |
| 1022 | u16 eir_len); | ||
| 1023 | int mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, | 1022 | int mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, |
| 1024 | u8 addr_type, s8 rssi, u8 *name, u8 name_len); | 1023 | u8 addr_type, s8 rssi, u8 *name, u8 name_len); |
| 1025 | int mgmt_start_discovery_failed(struct hci_dev *hdev, u8 status); | 1024 | int mgmt_start_discovery_failed(struct hci_dev *hdev, u8 status); |
| 1026 | int mgmt_stop_discovery_failed(struct hci_dev *hdev, u8 status); | 1025 | int mgmt_stop_discovery_failed(struct hci_dev *hdev, u8 status); |
| 1027 | int mgmt_discovering(struct hci_dev *hdev, u8 discovering); | 1026 | int mgmt_discovering(struct hci_dev *hdev, u8 discovering); |
| @@ -1071,6 +1070,6 @@ void hci_le_ltk_neg_reply(struct hci_conn *conn); | |||
| 1071 | int hci_do_inquiry(struct hci_dev *hdev, u8 length); | 1070 | int hci_do_inquiry(struct hci_dev *hdev, u8 length); |
| 1072 | int hci_cancel_inquiry(struct hci_dev *hdev); | 1071 | int hci_cancel_inquiry(struct hci_dev *hdev); |
| 1073 | int hci_le_scan(struct hci_dev *hdev, u8 type, u16 interval, u16 window, | 1072 | int hci_le_scan(struct hci_dev *hdev, u8 type, u16 interval, u16 window, |
| 1074 | int timeout); | 1073 | int timeout); |
| 1075 | 1074 | ||
| 1076 | #endif /* __HCI_CORE_H */ | 1075 | #endif /* __HCI_CORE_H */ |
