diff options
author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2012-07-11 07:32:43 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-07-11 08:56:03 -0400 |
commit | 9f1db00cdc9429593a887c20fb4372a6fb82a96c (patch) | |
tree | 94fb9001641c0db5ba2c5bce8918fcfdaaae3221 /net | |
parent | 89d8b4078921023c52551b641b647352751ae714 (diff) |
Bluetooth: debug: Use standard hex object specifiers in hci_event
To help debugging printed hex object use standard bluetooth
specifiers in hci_event. The patch changes format from 0x%04x to 0x%4.4x;
print manufacturer id and handle in hex instead of int; print opcode
always in 0x%4.4x format; status in 0x%2.2x.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/hci_event.c | 170 |
1 files changed, 85 insertions, 85 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 1ba929c05d0d..41ff978a33f9 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
@@ -36,7 +36,7 @@ static void hci_cc_inquiry_cancel(struct hci_dev *hdev, struct sk_buff *skb) | |||
36 | { | 36 | { |
37 | __u8 status = *((__u8 *) skb->data); | 37 | __u8 status = *((__u8 *) skb->data); |
38 | 38 | ||
39 | BT_DBG("%s status 0x%x", hdev->name, status); | 39 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
40 | 40 | ||
41 | if (status) { | 41 | if (status) { |
42 | hci_dev_lock(hdev); | 42 | hci_dev_lock(hdev); |
@@ -60,7 +60,7 @@ static void hci_cc_periodic_inq(struct hci_dev *hdev, struct sk_buff *skb) | |||
60 | { | 60 | { |
61 | __u8 status = *((__u8 *) skb->data); | 61 | __u8 status = *((__u8 *) skb->data); |
62 | 62 | ||
63 | BT_DBG("%s status 0x%x", hdev->name, status); | 63 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
64 | 64 | ||
65 | if (status) | 65 | if (status) |
66 | return; | 66 | return; |
@@ -72,7 +72,7 @@ static void hci_cc_exit_periodic_inq(struct hci_dev *hdev, struct sk_buff *skb) | |||
72 | { | 72 | { |
73 | __u8 status = *((__u8 *) skb->data); | 73 | __u8 status = *((__u8 *) skb->data); |
74 | 74 | ||
75 | BT_DBG("%s status 0x%x", hdev->name, status); | 75 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
76 | 76 | ||
77 | if (status) | 77 | if (status) |
78 | return; | 78 | return; |
@@ -93,7 +93,7 @@ static void hci_cc_role_discovery(struct hci_dev *hdev, struct sk_buff *skb) | |||
93 | struct hci_rp_role_discovery *rp = (void *) skb->data; | 93 | struct hci_rp_role_discovery *rp = (void *) skb->data; |
94 | struct hci_conn *conn; | 94 | struct hci_conn *conn; |
95 | 95 | ||
96 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 96 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
97 | 97 | ||
98 | if (rp->status) | 98 | if (rp->status) |
99 | return; | 99 | return; |
@@ -116,7 +116,7 @@ static void hci_cc_read_link_policy(struct hci_dev *hdev, struct sk_buff *skb) | |||
116 | struct hci_rp_read_link_policy *rp = (void *) skb->data; | 116 | struct hci_rp_read_link_policy *rp = (void *) skb->data; |
117 | struct hci_conn *conn; | 117 | struct hci_conn *conn; |
118 | 118 | ||
119 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 119 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
120 | 120 | ||
121 | if (rp->status) | 121 | if (rp->status) |
122 | return; | 122 | return; |
@@ -136,7 +136,7 @@ static void hci_cc_write_link_policy(struct hci_dev *hdev, struct sk_buff *skb) | |||
136 | struct hci_conn *conn; | 136 | struct hci_conn *conn; |
137 | void *sent; | 137 | void *sent; |
138 | 138 | ||
139 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 139 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
140 | 140 | ||
141 | if (rp->status) | 141 | if (rp->status) |
142 | return; | 142 | return; |
@@ -159,7 +159,7 @@ static void hci_cc_read_def_link_policy(struct hci_dev *hdev, | |||
159 | { | 159 | { |
160 | struct hci_rp_read_def_link_policy *rp = (void *) skb->data; | 160 | struct hci_rp_read_def_link_policy *rp = (void *) skb->data; |
161 | 161 | ||
162 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 162 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
163 | 163 | ||
164 | if (rp->status) | 164 | if (rp->status) |
165 | return; | 165 | return; |
@@ -173,7 +173,7 @@ static void hci_cc_write_def_link_policy(struct hci_dev *hdev, | |||
173 | __u8 status = *((__u8 *) skb->data); | 173 | __u8 status = *((__u8 *) skb->data); |
174 | void *sent; | 174 | void *sent; |
175 | 175 | ||
176 | BT_DBG("%s status 0x%x", hdev->name, status); | 176 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
177 | 177 | ||
178 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_DEF_LINK_POLICY); | 178 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_DEF_LINK_POLICY); |
179 | if (!sent) | 179 | if (!sent) |
@@ -189,7 +189,7 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb) | |||
189 | { | 189 | { |
190 | __u8 status = *((__u8 *) skb->data); | 190 | __u8 status = *((__u8 *) skb->data); |
191 | 191 | ||
192 | BT_DBG("%s status 0x%x", hdev->name, status); | 192 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
193 | 193 | ||
194 | clear_bit(HCI_RESET, &hdev->flags); | 194 | clear_bit(HCI_RESET, &hdev->flags); |
195 | 195 | ||
@@ -207,7 +207,7 @@ static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb) | |||
207 | __u8 status = *((__u8 *) skb->data); | 207 | __u8 status = *((__u8 *) skb->data); |
208 | void *sent; | 208 | void *sent; |
209 | 209 | ||
210 | BT_DBG("%s status 0x%x", hdev->name, status); | 210 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
211 | 211 | ||
212 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_LOCAL_NAME); | 212 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_LOCAL_NAME); |
213 | if (!sent) | 213 | if (!sent) |
@@ -229,7 +229,7 @@ static void hci_cc_read_local_name(struct hci_dev *hdev, struct sk_buff *skb) | |||
229 | { | 229 | { |
230 | struct hci_rp_read_local_name *rp = (void *) skb->data; | 230 | struct hci_rp_read_local_name *rp = (void *) skb->data; |
231 | 231 | ||
232 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 232 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
233 | 233 | ||
234 | if (rp->status) | 234 | if (rp->status) |
235 | return; | 235 | return; |
@@ -243,7 +243,7 @@ static void hci_cc_write_auth_enable(struct hci_dev *hdev, struct sk_buff *skb) | |||
243 | __u8 status = *((__u8 *) skb->data); | 243 | __u8 status = *((__u8 *) skb->data); |
244 | void *sent; | 244 | void *sent; |
245 | 245 | ||
246 | BT_DBG("%s status 0x%x", hdev->name, status); | 246 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
247 | 247 | ||
248 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_AUTH_ENABLE); | 248 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_AUTH_ENABLE); |
249 | if (!sent) | 249 | if (!sent) |
@@ -269,7 +269,7 @@ static void hci_cc_write_encrypt_mode(struct hci_dev *hdev, struct sk_buff *skb) | |||
269 | __u8 status = *((__u8 *) skb->data); | 269 | __u8 status = *((__u8 *) skb->data); |
270 | void *sent; | 270 | void *sent; |
271 | 271 | ||
272 | BT_DBG("%s status 0x%x", hdev->name, status); | 272 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
273 | 273 | ||
274 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_ENCRYPT_MODE); | 274 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_ENCRYPT_MODE); |
275 | if (!sent) | 275 | if (!sent) |
@@ -293,7 +293,7 @@ static void hci_cc_write_scan_enable(struct hci_dev *hdev, struct sk_buff *skb) | |||
293 | int old_pscan, old_iscan; | 293 | int old_pscan, old_iscan; |
294 | void *sent; | 294 | void *sent; |
295 | 295 | ||
296 | BT_DBG("%s status 0x%x", hdev->name, status); | 296 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
297 | 297 | ||
298 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_SCAN_ENABLE); | 298 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_SCAN_ENABLE); |
299 | if (!sent) | 299 | if (!sent) |
@@ -340,7 +340,7 @@ static void hci_cc_read_class_of_dev(struct hci_dev *hdev, struct sk_buff *skb) | |||
340 | { | 340 | { |
341 | struct hci_rp_read_class_of_dev *rp = (void *) skb->data; | 341 | struct hci_rp_read_class_of_dev *rp = (void *) skb->data; |
342 | 342 | ||
343 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 343 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
344 | 344 | ||
345 | if (rp->status) | 345 | if (rp->status) |
346 | return; | 346 | return; |
@@ -356,7 +356,7 @@ static void hci_cc_write_class_of_dev(struct hci_dev *hdev, struct sk_buff *skb) | |||
356 | __u8 status = *((__u8 *) skb->data); | 356 | __u8 status = *((__u8 *) skb->data); |
357 | void *sent; | 357 | void *sent; |
358 | 358 | ||
359 | BT_DBG("%s status 0x%x", hdev->name, status); | 359 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
360 | 360 | ||
361 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_CLASS_OF_DEV); | 361 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_CLASS_OF_DEV); |
362 | if (!sent) | 362 | if (!sent) |
@@ -378,7 +378,7 @@ static void hci_cc_read_voice_setting(struct hci_dev *hdev, struct sk_buff *skb) | |||
378 | struct hci_rp_read_voice_setting *rp = (void *) skb->data; | 378 | struct hci_rp_read_voice_setting *rp = (void *) skb->data; |
379 | __u16 setting; | 379 | __u16 setting; |
380 | 380 | ||
381 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 381 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
382 | 382 | ||
383 | if (rp->status) | 383 | if (rp->status) |
384 | return; | 384 | return; |
@@ -390,7 +390,7 @@ static void hci_cc_read_voice_setting(struct hci_dev *hdev, struct sk_buff *skb) | |||
390 | 390 | ||
391 | hdev->voice_setting = setting; | 391 | hdev->voice_setting = setting; |
392 | 392 | ||
393 | BT_DBG("%s voice setting 0x%04x", hdev->name, setting); | 393 | BT_DBG("%s voice setting 0x%4.4x", hdev->name, setting); |
394 | 394 | ||
395 | if (hdev->notify) | 395 | if (hdev->notify) |
396 | hdev->notify(hdev, HCI_NOTIFY_VOICE_SETTING); | 396 | hdev->notify(hdev, HCI_NOTIFY_VOICE_SETTING); |
@@ -403,7 +403,7 @@ static void hci_cc_write_voice_setting(struct hci_dev *hdev, | |||
403 | __u16 setting; | 403 | __u16 setting; |
404 | void *sent; | 404 | void *sent; |
405 | 405 | ||
406 | BT_DBG("%s status 0x%x", hdev->name, status); | 406 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
407 | 407 | ||
408 | if (status) | 408 | if (status) |
409 | return; | 409 | return; |
@@ -419,7 +419,7 @@ static void hci_cc_write_voice_setting(struct hci_dev *hdev, | |||
419 | 419 | ||
420 | hdev->voice_setting = setting; | 420 | hdev->voice_setting = setting; |
421 | 421 | ||
422 | BT_DBG("%s voice setting 0x%04x", hdev->name, setting); | 422 | BT_DBG("%s voice setting 0x%4.4x", hdev->name, setting); |
423 | 423 | ||
424 | if (hdev->notify) | 424 | if (hdev->notify) |
425 | hdev->notify(hdev, HCI_NOTIFY_VOICE_SETTING); | 425 | hdev->notify(hdev, HCI_NOTIFY_VOICE_SETTING); |
@@ -429,7 +429,7 @@ static void hci_cc_host_buffer_size(struct hci_dev *hdev, struct sk_buff *skb) | |||
429 | { | 429 | { |
430 | __u8 status = *((__u8 *) skb->data); | 430 | __u8 status = *((__u8 *) skb->data); |
431 | 431 | ||
432 | BT_DBG("%s status 0x%x", hdev->name, status); | 432 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
433 | 433 | ||
434 | hci_req_complete(hdev, HCI_OP_HOST_BUFFER_SIZE, status); | 434 | hci_req_complete(hdev, HCI_OP_HOST_BUFFER_SIZE, status); |
435 | } | 435 | } |
@@ -439,7 +439,7 @@ static void hci_cc_write_ssp_mode(struct hci_dev *hdev, struct sk_buff *skb) | |||
439 | __u8 status = *((__u8 *) skb->data); | 439 | __u8 status = *((__u8 *) skb->data); |
440 | void *sent; | 440 | void *sent; |
441 | 441 | ||
442 | BT_DBG("%s status 0x%x", hdev->name, status); | 442 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
443 | 443 | ||
444 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_SSP_MODE); | 444 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_SSP_MODE); |
445 | if (!sent) | 445 | if (!sent) |
@@ -597,7 +597,7 @@ static void hci_cc_read_local_version(struct hci_dev *hdev, struct sk_buff *skb) | |||
597 | { | 597 | { |
598 | struct hci_rp_read_local_version *rp = (void *) skb->data; | 598 | struct hci_rp_read_local_version *rp = (void *) skb->data; |
599 | 599 | ||
600 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 600 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
601 | 601 | ||
602 | if (rp->status) | 602 | if (rp->status) |
603 | goto done; | 603 | goto done; |
@@ -608,7 +608,7 @@ static void hci_cc_read_local_version(struct hci_dev *hdev, struct sk_buff *skb) | |||
608 | hdev->manufacturer = __le16_to_cpu(rp->manufacturer); | 608 | hdev->manufacturer = __le16_to_cpu(rp->manufacturer); |
609 | hdev->lmp_subver = __le16_to_cpu(rp->lmp_subver); | 609 | hdev->lmp_subver = __le16_to_cpu(rp->lmp_subver); |
610 | 610 | ||
611 | BT_DBG("%s manufacturer %d hci ver %d:%d", hdev->name, | 611 | BT_DBG("%s manufacturer 0x%4.4x hci ver %d:%d", hdev->name, |
612 | hdev->manufacturer, hdev->hci_ver, hdev->hci_rev); | 612 | hdev->manufacturer, hdev->hci_ver, hdev->hci_rev); |
613 | 613 | ||
614 | if (test_bit(HCI_INIT, &hdev->flags)) | 614 | if (test_bit(HCI_INIT, &hdev->flags)) |
@@ -641,7 +641,7 @@ static void hci_cc_read_local_commands(struct hci_dev *hdev, | |||
641 | { | 641 | { |
642 | struct hci_rp_read_local_commands *rp = (void *) skb->data; | 642 | struct hci_rp_read_local_commands *rp = (void *) skb->data; |
643 | 643 | ||
644 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 644 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
645 | 645 | ||
646 | if (rp->status) | 646 | if (rp->status) |
647 | goto done; | 647 | goto done; |
@@ -660,7 +660,7 @@ static void hci_cc_read_local_features(struct hci_dev *hdev, | |||
660 | { | 660 | { |
661 | struct hci_rp_read_local_features *rp = (void *) skb->data; | 661 | struct hci_rp_read_local_features *rp = (void *) skb->data; |
662 | 662 | ||
663 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 663 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
664 | 664 | ||
665 | if (rp->status) | 665 | if (rp->status) |
666 | return; | 666 | return; |
@@ -732,7 +732,7 @@ static void hci_cc_read_local_ext_features(struct hci_dev *hdev, | |||
732 | { | 732 | { |
733 | struct hci_rp_read_local_ext_features *rp = (void *) skb->data; | 733 | struct hci_rp_read_local_ext_features *rp = (void *) skb->data; |
734 | 734 | ||
735 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 735 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
736 | 736 | ||
737 | if (rp->status) | 737 | if (rp->status) |
738 | goto done; | 738 | goto done; |
@@ -758,7 +758,7 @@ static void hci_cc_read_flow_control_mode(struct hci_dev *hdev, | |||
758 | { | 758 | { |
759 | struct hci_rp_read_flow_control_mode *rp = (void *) skb->data; | 759 | struct hci_rp_read_flow_control_mode *rp = (void *) skb->data; |
760 | 760 | ||
761 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 761 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
762 | 762 | ||
763 | if (rp->status) | 763 | if (rp->status) |
764 | return; | 764 | return; |
@@ -772,7 +772,7 @@ static void hci_cc_read_buffer_size(struct hci_dev *hdev, struct sk_buff *skb) | |||
772 | { | 772 | { |
773 | struct hci_rp_read_buffer_size *rp = (void *) skb->data; | 773 | struct hci_rp_read_buffer_size *rp = (void *) skb->data; |
774 | 774 | ||
775 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 775 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
776 | 776 | ||
777 | if (rp->status) | 777 | if (rp->status) |
778 | return; | 778 | return; |
@@ -798,7 +798,7 @@ static void hci_cc_read_bd_addr(struct hci_dev *hdev, struct sk_buff *skb) | |||
798 | { | 798 | { |
799 | struct hci_rp_read_bd_addr *rp = (void *) skb->data; | 799 | struct hci_rp_read_bd_addr *rp = (void *) skb->data; |
800 | 800 | ||
801 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 801 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
802 | 802 | ||
803 | if (!rp->status) | 803 | if (!rp->status) |
804 | bacpy(&hdev->bdaddr, &rp->bdaddr); | 804 | bacpy(&hdev->bdaddr, &rp->bdaddr); |
@@ -811,7 +811,7 @@ static void hci_cc_read_data_block_size(struct hci_dev *hdev, | |||
811 | { | 811 | { |
812 | struct hci_rp_read_data_block_size *rp = (void *) skb->data; | 812 | struct hci_rp_read_data_block_size *rp = (void *) skb->data; |
813 | 813 | ||
814 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 814 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
815 | 815 | ||
816 | if (rp->status) | 816 | if (rp->status) |
817 | return; | 817 | return; |
@@ -832,7 +832,7 @@ static void hci_cc_write_ca_timeout(struct hci_dev *hdev, struct sk_buff *skb) | |||
832 | { | 832 | { |
833 | __u8 status = *((__u8 *) skb->data); | 833 | __u8 status = *((__u8 *) skb->data); |
834 | 834 | ||
835 | BT_DBG("%s status 0x%x", hdev->name, status); | 835 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
836 | 836 | ||
837 | hci_req_complete(hdev, HCI_OP_WRITE_CA_TIMEOUT, status); | 837 | hci_req_complete(hdev, HCI_OP_WRITE_CA_TIMEOUT, status); |
838 | } | 838 | } |
@@ -842,7 +842,7 @@ static void hci_cc_read_local_amp_info(struct hci_dev *hdev, | |||
842 | { | 842 | { |
843 | struct hci_rp_read_local_amp_info *rp = (void *) skb->data; | 843 | struct hci_rp_read_local_amp_info *rp = (void *) skb->data; |
844 | 844 | ||
845 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 845 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
846 | 846 | ||
847 | if (rp->status) | 847 | if (rp->status) |
848 | return; | 848 | return; |
@@ -866,7 +866,7 @@ static void hci_cc_delete_stored_link_key(struct hci_dev *hdev, | |||
866 | { | 866 | { |
867 | __u8 status = *((__u8 *) skb->data); | 867 | __u8 status = *((__u8 *) skb->data); |
868 | 868 | ||
869 | BT_DBG("%s status 0x%x", hdev->name, status); | 869 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
870 | 870 | ||
871 | hci_req_complete(hdev, HCI_OP_DELETE_STORED_LINK_KEY, status); | 871 | hci_req_complete(hdev, HCI_OP_DELETE_STORED_LINK_KEY, status); |
872 | } | 872 | } |
@@ -875,7 +875,7 @@ static void hci_cc_set_event_mask(struct hci_dev *hdev, struct sk_buff *skb) | |||
875 | { | 875 | { |
876 | __u8 status = *((__u8 *) skb->data); | 876 | __u8 status = *((__u8 *) skb->data); |
877 | 877 | ||
878 | BT_DBG("%s status 0x%x", hdev->name, status); | 878 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
879 | 879 | ||
880 | hci_req_complete(hdev, HCI_OP_SET_EVENT_MASK, status); | 880 | hci_req_complete(hdev, HCI_OP_SET_EVENT_MASK, status); |
881 | } | 881 | } |
@@ -885,7 +885,7 @@ static void hci_cc_write_inquiry_mode(struct hci_dev *hdev, | |||
885 | { | 885 | { |
886 | __u8 status = *((__u8 *) skb->data); | 886 | __u8 status = *((__u8 *) skb->data); |
887 | 887 | ||
888 | BT_DBG("%s status 0x%x", hdev->name, status); | 888 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
889 | 889 | ||
890 | hci_req_complete(hdev, HCI_OP_WRITE_INQUIRY_MODE, status); | 890 | hci_req_complete(hdev, HCI_OP_WRITE_INQUIRY_MODE, status); |
891 | } | 891 | } |
@@ -895,7 +895,7 @@ static void hci_cc_read_inq_rsp_tx_power(struct hci_dev *hdev, | |||
895 | { | 895 | { |
896 | struct hci_rp_read_inq_rsp_tx_power *rp = (void *) skb->data; | 896 | struct hci_rp_read_inq_rsp_tx_power *rp = (void *) skb->data; |
897 | 897 | ||
898 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 898 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
899 | 899 | ||
900 | if (!rp->status) | 900 | if (!rp->status) |
901 | hdev->inq_tx_power = rp->tx_power; | 901 | hdev->inq_tx_power = rp->tx_power; |
@@ -907,7 +907,7 @@ static void hci_cc_set_event_flt(struct hci_dev *hdev, struct sk_buff *skb) | |||
907 | { | 907 | { |
908 | __u8 status = *((__u8 *) skb->data); | 908 | __u8 status = *((__u8 *) skb->data); |
909 | 909 | ||
910 | BT_DBG("%s status 0x%x", hdev->name, status); | 910 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
911 | 911 | ||
912 | hci_req_complete(hdev, HCI_OP_SET_EVENT_FLT, status); | 912 | hci_req_complete(hdev, HCI_OP_SET_EVENT_FLT, status); |
913 | } | 913 | } |
@@ -918,7 +918,7 @@ static void hci_cc_pin_code_reply(struct hci_dev *hdev, struct sk_buff *skb) | |||
918 | struct hci_cp_pin_code_reply *cp; | 918 | struct hci_cp_pin_code_reply *cp; |
919 | struct hci_conn *conn; | 919 | struct hci_conn *conn; |
920 | 920 | ||
921 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 921 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
922 | 922 | ||
923 | hci_dev_lock(hdev); | 923 | hci_dev_lock(hdev); |
924 | 924 | ||
@@ -944,7 +944,7 @@ static void hci_cc_pin_code_neg_reply(struct hci_dev *hdev, struct sk_buff *skb) | |||
944 | { | 944 | { |
945 | struct hci_rp_pin_code_neg_reply *rp = (void *) skb->data; | 945 | struct hci_rp_pin_code_neg_reply *rp = (void *) skb->data; |
946 | 946 | ||
947 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 947 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
948 | 948 | ||
949 | hci_dev_lock(hdev); | 949 | hci_dev_lock(hdev); |
950 | 950 | ||
@@ -960,7 +960,7 @@ static void hci_cc_le_read_buffer_size(struct hci_dev *hdev, | |||
960 | { | 960 | { |
961 | struct hci_rp_le_read_buffer_size *rp = (void *) skb->data; | 961 | struct hci_rp_le_read_buffer_size *rp = (void *) skb->data; |
962 | 962 | ||
963 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 963 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
964 | 964 | ||
965 | if (rp->status) | 965 | if (rp->status) |
966 | return; | 966 | return; |
@@ -979,7 +979,7 @@ static void hci_cc_user_confirm_reply(struct hci_dev *hdev, struct sk_buff *skb) | |||
979 | { | 979 | { |
980 | struct hci_rp_user_confirm_reply *rp = (void *) skb->data; | 980 | struct hci_rp_user_confirm_reply *rp = (void *) skb->data; |
981 | 981 | ||
982 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 982 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
983 | 983 | ||
984 | hci_dev_lock(hdev); | 984 | hci_dev_lock(hdev); |
985 | 985 | ||
@@ -995,7 +995,7 @@ static void hci_cc_user_confirm_neg_reply(struct hci_dev *hdev, | |||
995 | { | 995 | { |
996 | struct hci_rp_user_confirm_reply *rp = (void *) skb->data; | 996 | struct hci_rp_user_confirm_reply *rp = (void *) skb->data; |
997 | 997 | ||
998 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 998 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
999 | 999 | ||
1000 | hci_dev_lock(hdev); | 1000 | hci_dev_lock(hdev); |
1001 | 1001 | ||
@@ -1010,7 +1010,7 @@ static void hci_cc_user_passkey_reply(struct hci_dev *hdev, struct sk_buff *skb) | |||
1010 | { | 1010 | { |
1011 | struct hci_rp_user_confirm_reply *rp = (void *) skb->data; | 1011 | struct hci_rp_user_confirm_reply *rp = (void *) skb->data; |
1012 | 1012 | ||
1013 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 1013 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
1014 | 1014 | ||
1015 | hci_dev_lock(hdev); | 1015 | hci_dev_lock(hdev); |
1016 | 1016 | ||
@@ -1026,7 +1026,7 @@ static void hci_cc_user_passkey_neg_reply(struct hci_dev *hdev, | |||
1026 | { | 1026 | { |
1027 | struct hci_rp_user_confirm_reply *rp = (void *) skb->data; | 1027 | struct hci_rp_user_confirm_reply *rp = (void *) skb->data; |
1028 | 1028 | ||
1029 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 1029 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
1030 | 1030 | ||
1031 | hci_dev_lock(hdev); | 1031 | hci_dev_lock(hdev); |
1032 | 1032 | ||
@@ -1042,7 +1042,7 @@ static void hci_cc_read_local_oob_data_reply(struct hci_dev *hdev, | |||
1042 | { | 1042 | { |
1043 | struct hci_rp_read_local_oob_data *rp = (void *) skb->data; | 1043 | struct hci_rp_read_local_oob_data *rp = (void *) skb->data; |
1044 | 1044 | ||
1045 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 1045 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
1046 | 1046 | ||
1047 | hci_dev_lock(hdev); | 1047 | hci_dev_lock(hdev); |
1048 | mgmt_read_local_oob_data_reply_complete(hdev, rp->hash, | 1048 | mgmt_read_local_oob_data_reply_complete(hdev, rp->hash, |
@@ -1054,7 +1054,7 @@ static void hci_cc_le_set_scan_param(struct hci_dev *hdev, struct sk_buff *skb) | |||
1054 | { | 1054 | { |
1055 | __u8 status = *((__u8 *) skb->data); | 1055 | __u8 status = *((__u8 *) skb->data); |
1056 | 1056 | ||
1057 | BT_DBG("%s status 0x%x", hdev->name, status); | 1057 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
1058 | 1058 | ||
1059 | hci_req_complete(hdev, HCI_OP_LE_SET_SCAN_PARAM, status); | 1059 | hci_req_complete(hdev, HCI_OP_LE_SET_SCAN_PARAM, status); |
1060 | 1060 | ||
@@ -1072,7 +1072,7 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev, | |||
1072 | struct hci_cp_le_set_scan_enable *cp; | 1072 | struct hci_cp_le_set_scan_enable *cp; |
1073 | __u8 status = *((__u8 *) skb->data); | 1073 | __u8 status = *((__u8 *) skb->data); |
1074 | 1074 | ||
1075 | BT_DBG("%s status 0x%x", hdev->name, status); | 1075 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
1076 | 1076 | ||
1077 | cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_SCAN_ENABLE); | 1077 | cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_SCAN_ENABLE); |
1078 | if (!cp) | 1078 | if (!cp) |
@@ -1127,7 +1127,7 @@ static void hci_cc_le_ltk_reply(struct hci_dev *hdev, struct sk_buff *skb) | |||
1127 | { | 1127 | { |
1128 | struct hci_rp_le_ltk_reply *rp = (void *) skb->data; | 1128 | struct hci_rp_le_ltk_reply *rp = (void *) skb->data; |
1129 | 1129 | ||
1130 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 1130 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
1131 | 1131 | ||
1132 | if (rp->status) | 1132 | if (rp->status) |
1133 | return; | 1133 | return; |
@@ -1139,7 +1139,7 @@ static void hci_cc_le_ltk_neg_reply(struct hci_dev *hdev, struct sk_buff *skb) | |||
1139 | { | 1139 | { |
1140 | struct hci_rp_le_ltk_neg_reply *rp = (void *) skb->data; | 1140 | struct hci_rp_le_ltk_neg_reply *rp = (void *) skb->data; |
1141 | 1141 | ||
1142 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 1142 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
1143 | 1143 | ||
1144 | if (rp->status) | 1144 | if (rp->status) |
1145 | return; | 1145 | return; |
@@ -1153,7 +1153,7 @@ static void hci_cc_write_le_host_supported(struct hci_dev *hdev, | |||
1153 | struct hci_cp_write_le_host_supported *sent; | 1153 | struct hci_cp_write_le_host_supported *sent; |
1154 | __u8 status = *((__u8 *) skb->data); | 1154 | __u8 status = *((__u8 *) skb->data); |
1155 | 1155 | ||
1156 | BT_DBG("%s status 0x%x", hdev->name, status); | 1156 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
1157 | 1157 | ||
1158 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_LE_HOST_SUPPORTED); | 1158 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_LE_HOST_SUPPORTED); |
1159 | if (!sent) | 1159 | if (!sent) |
@@ -1175,7 +1175,7 @@ static void hci_cc_write_le_host_supported(struct hci_dev *hdev, | |||
1175 | 1175 | ||
1176 | static void hci_cs_inquiry(struct hci_dev *hdev, __u8 status) | 1176 | static void hci_cs_inquiry(struct hci_dev *hdev, __u8 status) |
1177 | { | 1177 | { |
1178 | BT_DBG("%s status 0x%x", hdev->name, status); | 1178 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
1179 | 1179 | ||
1180 | if (status) { | 1180 | if (status) { |
1181 | hci_req_complete(hdev, HCI_OP_INQUIRY, status); | 1181 | hci_req_complete(hdev, HCI_OP_INQUIRY, status); |
@@ -1199,7 +1199,7 @@ static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status) | |||
1199 | struct hci_cp_create_conn *cp; | 1199 | struct hci_cp_create_conn *cp; |
1200 | struct hci_conn *conn; | 1200 | struct hci_conn *conn; |
1201 | 1201 | ||
1202 | BT_DBG("%s status 0x%x", hdev->name, status); | 1202 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
1203 | 1203 | ||
1204 | cp = hci_sent_cmd_data(hdev, HCI_OP_CREATE_CONN); | 1204 | cp = hci_sent_cmd_data(hdev, HCI_OP_CREATE_CONN); |
1205 | if (!cp) | 1205 | if (!cp) |
@@ -1209,7 +1209,7 @@ static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status) | |||
1209 | 1209 | ||
1210 | conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->bdaddr); | 1210 | conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->bdaddr); |
1211 | 1211 | ||
1212 | BT_DBG("%s bdaddr %s conn %p", hdev->name, batostr(&cp->bdaddr), conn); | 1212 | BT_DBG("%s bdaddr %s hcon %p", hdev->name, batostr(&cp->bdaddr), conn); |
1213 | 1213 | ||
1214 | if (status) { | 1214 | if (status) { |
1215 | if (conn && conn->state == BT_CONNECT) { | 1215 | if (conn && conn->state == BT_CONNECT) { |
@@ -1240,7 +1240,7 @@ static void hci_cs_add_sco(struct hci_dev *hdev, __u8 status) | |||
1240 | struct hci_conn *acl, *sco; | 1240 | struct hci_conn *acl, *sco; |
1241 | __u16 handle; | 1241 | __u16 handle; |
1242 | 1242 | ||
1243 | BT_DBG("%s status 0x%x", hdev->name, status); | 1243 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
1244 | 1244 | ||
1245 | if (!status) | 1245 | if (!status) |
1246 | return; | 1246 | return; |
@@ -1251,7 +1251,7 @@ static void hci_cs_add_sco(struct hci_dev *hdev, __u8 status) | |||
1251 | 1251 | ||
1252 | handle = __le16_to_cpu(cp->handle); | 1252 | handle = __le16_to_cpu(cp->handle); |
1253 | 1253 | ||
1254 | BT_DBG("%s handle %d", hdev->name, handle); | 1254 | BT_DBG("%s handle 0x%4.4x", hdev->name, handle); |
1255 | 1255 | ||
1256 | hci_dev_lock(hdev); | 1256 | hci_dev_lock(hdev); |
1257 | 1257 | ||
@@ -1274,7 +1274,7 @@ static void hci_cs_auth_requested(struct hci_dev *hdev, __u8 status) | |||
1274 | struct hci_cp_auth_requested *cp; | 1274 | struct hci_cp_auth_requested *cp; |
1275 | struct hci_conn *conn; | 1275 | struct hci_conn *conn; |
1276 | 1276 | ||
1277 | BT_DBG("%s status 0x%x", hdev->name, status); | 1277 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
1278 | 1278 | ||
1279 | if (!status) | 1279 | if (!status) |
1280 | return; | 1280 | return; |
@@ -1301,7 +1301,7 @@ static void hci_cs_set_conn_encrypt(struct hci_dev *hdev, __u8 status) | |||
1301 | struct hci_cp_set_conn_encrypt *cp; | 1301 | struct hci_cp_set_conn_encrypt *cp; |
1302 | struct hci_conn *conn; | 1302 | struct hci_conn *conn; |
1303 | 1303 | ||
1304 | BT_DBG("%s status 0x%x", hdev->name, status); | 1304 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
1305 | 1305 | ||
1306 | if (!status) | 1306 | if (!status) |
1307 | return; | 1307 | return; |
@@ -1413,7 +1413,7 @@ static void hci_cs_remote_name_req(struct hci_dev *hdev, __u8 status) | |||
1413 | struct hci_cp_remote_name_req *cp; | 1413 | struct hci_cp_remote_name_req *cp; |
1414 | struct hci_conn *conn; | 1414 | struct hci_conn *conn; |
1415 | 1415 | ||
1416 | BT_DBG("%s status 0x%x", hdev->name, status); | 1416 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
1417 | 1417 | ||
1418 | /* If successful wait for the name req complete event before | 1418 | /* If successful wait for the name req complete event before |
1419 | * checking for the need to do authentication */ | 1419 | * checking for the need to do authentication */ |
@@ -1452,7 +1452,7 @@ static void hci_cs_read_remote_features(struct hci_dev *hdev, __u8 status) | |||
1452 | struct hci_cp_read_remote_features *cp; | 1452 | struct hci_cp_read_remote_features *cp; |
1453 | struct hci_conn *conn; | 1453 | struct hci_conn *conn; |
1454 | 1454 | ||
1455 | BT_DBG("%s status 0x%x", hdev->name, status); | 1455 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
1456 | 1456 | ||
1457 | if (!status) | 1457 | if (!status) |
1458 | return; | 1458 | return; |
@@ -1479,7 +1479,7 @@ static void hci_cs_read_remote_ext_features(struct hci_dev *hdev, __u8 status) | |||
1479 | struct hci_cp_read_remote_ext_features *cp; | 1479 | struct hci_cp_read_remote_ext_features *cp; |
1480 | struct hci_conn *conn; | 1480 | struct hci_conn *conn; |
1481 | 1481 | ||
1482 | BT_DBG("%s status 0x%x", hdev->name, status); | 1482 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
1483 | 1483 | ||
1484 | if (!status) | 1484 | if (!status) |
1485 | return; | 1485 | return; |
@@ -1507,7 +1507,7 @@ static void hci_cs_setup_sync_conn(struct hci_dev *hdev, __u8 status) | |||
1507 | struct hci_conn *acl, *sco; | 1507 | struct hci_conn *acl, *sco; |
1508 | __u16 handle; | 1508 | __u16 handle; |
1509 | 1509 | ||
1510 | BT_DBG("%s status 0x%x", hdev->name, status); | 1510 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
1511 | 1511 | ||
1512 | if (!status) | 1512 | if (!status) |
1513 | return; | 1513 | return; |
@@ -1518,7 +1518,7 @@ static void hci_cs_setup_sync_conn(struct hci_dev *hdev, __u8 status) | |||
1518 | 1518 | ||
1519 | handle = __le16_to_cpu(cp->handle); | 1519 | handle = __le16_to_cpu(cp->handle); |
1520 | 1520 | ||
1521 | BT_DBG("%s handle %d", hdev->name, handle); | 1521 | BT_DBG("%s handle 0x%4.4x", hdev->name, handle); |
1522 | 1522 | ||
1523 | hci_dev_lock(hdev); | 1523 | hci_dev_lock(hdev); |
1524 | 1524 | ||
@@ -1541,7 +1541,7 @@ static void hci_cs_sniff_mode(struct hci_dev *hdev, __u8 status) | |||
1541 | struct hci_cp_sniff_mode *cp; | 1541 | struct hci_cp_sniff_mode *cp; |
1542 | struct hci_conn *conn; | 1542 | struct hci_conn *conn; |
1543 | 1543 | ||
1544 | BT_DBG("%s status 0x%x", hdev->name, status); | 1544 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
1545 | 1545 | ||
1546 | if (!status) | 1546 | if (!status) |
1547 | return; | 1547 | return; |
@@ -1568,7 +1568,7 @@ static void hci_cs_exit_sniff_mode(struct hci_dev *hdev, __u8 status) | |||
1568 | struct hci_cp_exit_sniff_mode *cp; | 1568 | struct hci_cp_exit_sniff_mode *cp; |
1569 | struct hci_conn *conn; | 1569 | struct hci_conn *conn; |
1570 | 1570 | ||
1571 | BT_DBG("%s status 0x%x", hdev->name, status); | 1571 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
1572 | 1572 | ||
1573 | if (!status) | 1573 | if (!status) |
1574 | return; | 1574 | return; |
@@ -1617,7 +1617,7 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, __u8 status) | |||
1617 | struct hci_cp_le_create_conn *cp; | 1617 | struct hci_cp_le_create_conn *cp; |
1618 | struct hci_conn *conn; | 1618 | struct hci_conn *conn; |
1619 | 1619 | ||
1620 | BT_DBG("%s status 0x%x", hdev->name, status); | 1620 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
1621 | 1621 | ||
1622 | cp = hci_sent_cmd_data(hdev, HCI_OP_LE_CREATE_CONN); | 1622 | cp = hci_sent_cmd_data(hdev, HCI_OP_LE_CREATE_CONN); |
1623 | if (!cp) | 1623 | if (!cp) |
@@ -1655,7 +1655,7 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, __u8 status) | |||
1655 | 1655 | ||
1656 | static void hci_cs_le_start_enc(struct hci_dev *hdev, u8 status) | 1656 | static void hci_cs_le_start_enc(struct hci_dev *hdev, u8 status) |
1657 | { | 1657 | { |
1658 | BT_DBG("%s status 0x%x", hdev->name, status); | 1658 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
1659 | } | 1659 | } |
1660 | 1660 | ||
1661 | static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) | 1661 | static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) |
@@ -1664,7 +1664,7 @@ static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
1664 | struct discovery_state *discov = &hdev->discovery; | 1664 | struct discovery_state *discov = &hdev->discovery; |
1665 | struct inquiry_entry *e; | 1665 | struct inquiry_entry *e; |
1666 | 1666 | ||
1667 | BT_DBG("%s status %d", hdev->name, status); | 1667 | BT_DBG("%s status 0x%2.2x", hdev->name, status); |
1668 | 1668 | ||
1669 | hci_req_complete(hdev, HCI_OP_INQUIRY, status); | 1669 | hci_req_complete(hdev, HCI_OP_INQUIRY, status); |
1670 | 1670 | ||
@@ -1893,7 +1893,7 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
1893 | struct hci_ev_disconn_complete *ev = (void *) skb->data; | 1893 | struct hci_ev_disconn_complete *ev = (void *) skb->data; |
1894 | struct hci_conn *conn; | 1894 | struct hci_conn *conn; |
1895 | 1895 | ||
1896 | BT_DBG("%s status %d", hdev->name, ev->status); | 1896 | BT_DBG("%s status 0x%2.2x", hdev->name, ev->status); |
1897 | 1897 | ||
1898 | hci_dev_lock(hdev); | 1898 | hci_dev_lock(hdev); |
1899 | 1899 | ||
@@ -1930,7 +1930,7 @@ static void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
1930 | struct hci_ev_auth_complete *ev = (void *) skb->data; | 1930 | struct hci_ev_auth_complete *ev = (void *) skb->data; |
1931 | struct hci_conn *conn; | 1931 | struct hci_conn *conn; |
1932 | 1932 | ||
1933 | BT_DBG("%s status %d", hdev->name, ev->status); | 1933 | BT_DBG("%s status 0x%2.2x", hdev->name, ev->status); |
1934 | 1934 | ||
1935 | hci_dev_lock(hdev); | 1935 | hci_dev_lock(hdev); |
1936 | 1936 | ||
@@ -2035,7 +2035,7 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
2035 | struct hci_ev_encrypt_change *ev = (void *) skb->data; | 2035 | struct hci_ev_encrypt_change *ev = (void *) skb->data; |
2036 | struct hci_conn *conn; | 2036 | struct hci_conn *conn; |
2037 | 2037 | ||
2038 | BT_DBG("%s status %d", hdev->name, ev->status); | 2038 | BT_DBG("%s status 0x%2.2x", hdev->name, ev->status); |
2039 | 2039 | ||
2040 | hci_dev_lock(hdev); | 2040 | hci_dev_lock(hdev); |
2041 | 2041 | ||
@@ -2079,7 +2079,7 @@ static void hci_change_link_key_complete_evt(struct hci_dev *hdev, | |||
2079 | struct hci_ev_change_link_key_complete *ev = (void *) skb->data; | 2079 | struct hci_ev_change_link_key_complete *ev = (void *) skb->data; |
2080 | struct hci_conn *conn; | 2080 | struct hci_conn *conn; |
2081 | 2081 | ||
2082 | BT_DBG("%s status %d", hdev->name, ev->status); | 2082 | BT_DBG("%s status 0x%2.2x", hdev->name, ev->status); |
2083 | 2083 | ||
2084 | hci_dev_lock(hdev); | 2084 | hci_dev_lock(hdev); |
2085 | 2085 | ||
@@ -2102,7 +2102,7 @@ static void hci_remote_features_evt(struct hci_dev *hdev, | |||
2102 | struct hci_ev_remote_features *ev = (void *) skb->data; | 2102 | struct hci_ev_remote_features *ev = (void *) skb->data; |
2103 | struct hci_conn *conn; | 2103 | struct hci_conn *conn; |
2104 | 2104 | ||
2105 | BT_DBG("%s status %d", hdev->name, ev->status); | 2105 | BT_DBG("%s status 0x%2.2x", hdev->name, ev->status); |
2106 | 2106 | ||
2107 | hci_dev_lock(hdev); | 2107 | hci_dev_lock(hdev); |
2108 | 2108 | ||
@@ -2364,7 +2364,7 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
2364 | break; | 2364 | break; |
2365 | 2365 | ||
2366 | default: | 2366 | default: |
2367 | BT_DBG("%s opcode 0x%x", hdev->name, opcode); | 2367 | BT_DBG("%s opcode 0x%4.4x", hdev->name, opcode); |
2368 | break; | 2368 | break; |
2369 | } | 2369 | } |
2370 | 2370 | ||
@@ -2445,7 +2445,7 @@ static void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
2445 | break; | 2445 | break; |
2446 | 2446 | ||
2447 | default: | 2447 | default: |
2448 | BT_DBG("%s opcode 0x%x", hdev->name, opcode); | 2448 | BT_DBG("%s opcode 0x%4.4x", hdev->name, opcode); |
2449 | break; | 2449 | break; |
2450 | } | 2450 | } |
2451 | 2451 | ||
@@ -2464,7 +2464,7 @@ static void hci_role_change_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
2464 | struct hci_ev_role_change *ev = (void *) skb->data; | 2464 | struct hci_ev_role_change *ev = (void *) skb->data; |
2465 | struct hci_conn *conn; | 2465 | struct hci_conn *conn; |
2466 | 2466 | ||
2467 | BT_DBG("%s status %d", hdev->name, ev->status); | 2467 | BT_DBG("%s status 0x%2.2x", hdev->name, ev->status); |
2468 | 2468 | ||
2469 | hci_dev_lock(hdev); | 2469 | hci_dev_lock(hdev); |
2470 | 2470 | ||
@@ -2605,7 +2605,7 @@ static void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
2605 | struct hci_ev_mode_change *ev = (void *) skb->data; | 2605 | struct hci_ev_mode_change *ev = (void *) skb->data; |
2606 | struct hci_conn *conn; | 2606 | struct hci_conn *conn; |
2607 | 2607 | ||
2608 | BT_DBG("%s status %d", hdev->name, ev->status); | 2608 | BT_DBG("%s status 0x%2.2x", hdev->name, ev->status); |
2609 | 2609 | ||
2610 | hci_dev_lock(hdev); | 2610 | hci_dev_lock(hdev); |
2611 | 2611 | ||
@@ -2763,7 +2763,7 @@ static void hci_clock_offset_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
2763 | struct hci_ev_clock_offset *ev = (void *) skb->data; | 2763 | struct hci_ev_clock_offset *ev = (void *) skb->data; |
2764 | struct hci_conn *conn; | 2764 | struct hci_conn *conn; |
2765 | 2765 | ||
2766 | BT_DBG("%s status %d", hdev->name, ev->status); | 2766 | BT_DBG("%s status 0x%2.2x", hdev->name, ev->status); |
2767 | 2767 | ||
2768 | hci_dev_lock(hdev); | 2768 | hci_dev_lock(hdev); |
2769 | 2769 | ||
@@ -2786,7 +2786,7 @@ static void hci_pkt_type_change_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
2786 | struct hci_ev_pkt_type_change *ev = (void *) skb->data; | 2786 | struct hci_ev_pkt_type_change *ev = (void *) skb->data; |
2787 | struct hci_conn *conn; | 2787 | struct hci_conn *conn; |
2788 | 2788 | ||
2789 | BT_DBG("%s status %d", hdev->name, ev->status); | 2789 | BT_DBG("%s status 0x%2.2x", hdev->name, ev->status); |
2790 | 2790 | ||
2791 | hci_dev_lock(hdev); | 2791 | hci_dev_lock(hdev); |
2792 | 2792 | ||
@@ -2930,7 +2930,7 @@ static void hci_sync_conn_complete_evt(struct hci_dev *hdev, | |||
2930 | struct hci_ev_sync_conn_complete *ev = (void *) skb->data; | 2930 | struct hci_ev_sync_conn_complete *ev = (void *) skb->data; |
2931 | struct hci_conn *conn; | 2931 | struct hci_conn *conn; |
2932 | 2932 | ||
2933 | BT_DBG("%s status %d", hdev->name, ev->status); | 2933 | BT_DBG("%s status 0x%2.2x", hdev->name, ev->status); |
2934 | 2934 | ||
2935 | hci_dev_lock(hdev); | 2935 | hci_dev_lock(hdev); |
2936 | 2936 | ||
@@ -2989,7 +2989,7 @@ static void hci_sniff_subrate_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
2989 | { | 2989 | { |
2990 | struct hci_ev_sniff_subrate *ev = (void *) skb->data; | 2990 | struct hci_ev_sniff_subrate *ev = (void *) skb->data; |
2991 | 2991 | ||
2992 | BT_DBG("%s status %d", hdev->name, ev->status); | 2992 | BT_DBG("%s status 0x%2.2x", hdev->name, ev->status); |
2993 | } | 2993 | } |
2994 | 2994 | ||
2995 | static void hci_extended_inquiry_result_evt(struct hci_dev *hdev, | 2995 | static void hci_extended_inquiry_result_evt(struct hci_dev *hdev, |
@@ -3046,7 +3046,7 @@ static void hci_key_refresh_complete_evt(struct hci_dev *hdev, | |||
3046 | struct hci_ev_key_refresh_complete *ev = (void *) skb->data; | 3046 | struct hci_ev_key_refresh_complete *ev = (void *) skb->data; |
3047 | struct hci_conn *conn; | 3047 | struct hci_conn *conn; |
3048 | 3048 | ||
3049 | BT_DBG("%s status %u handle %u", hdev->name, ev->status, | 3049 | BT_DBG("%s status 0x%2.2x handle 0x%4.4x", hdev->name, ev->status, |
3050 | __le16_to_cpu(ev->handle)); | 3050 | __le16_to_cpu(ev->handle)); |
3051 | 3051 | ||
3052 | hci_dev_lock(hdev); | 3052 | hci_dev_lock(hdev); |
@@ -3346,7 +3346,7 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
3346 | struct hci_ev_le_conn_complete *ev = (void *) skb->data; | 3346 | struct hci_ev_le_conn_complete *ev = (void *) skb->data; |
3347 | struct hci_conn *conn; | 3347 | struct hci_conn *conn; |
3348 | 3348 | ||
3349 | BT_DBG("%s status %d", hdev->name, ev->status); | 3349 | BT_DBG("%s status 0x%2.2x", hdev->name, ev->status); |
3350 | 3350 | ||
3351 | hci_dev_lock(hdev); | 3351 | hci_dev_lock(hdev); |
3352 | 3352 | ||
@@ -3421,7 +3421,7 @@ static void hci_le_ltk_request_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
3421 | struct hci_conn *conn; | 3421 | struct hci_conn *conn; |
3422 | struct smp_ltk *ltk; | 3422 | struct smp_ltk *ltk; |
3423 | 3423 | ||
3424 | BT_DBG("%s handle %d", hdev->name, __le16_to_cpu(ev->handle)); | 3424 | BT_DBG("%s handle 0x%4.4x", hdev->name, __le16_to_cpu(ev->handle)); |
3425 | 3425 | ||
3426 | hci_dev_lock(hdev); | 3426 | hci_dev_lock(hdev); |
3427 | 3427 | ||
@@ -3645,7 +3645,7 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb) | |||
3645 | break; | 3645 | break; |
3646 | 3646 | ||
3647 | default: | 3647 | default: |
3648 | BT_DBG("%s event 0x%x", hdev->name, event); | 3648 | BT_DBG("%s event 0x%2.2x", hdev->name, event); |
3649 | break; | 3649 | break; |
3650 | } | 3650 | } |
3651 | 3651 | ||