* [PATCH 0/7] Bluetooth: Correct debug code
@ 2012-07-10 12:27 Andrei Emeltchenko
2012-07-10 12:27 ` [PATCH 1/7] Bluetooth: debug: Print l2cap refcount Andrei Emeltchenko
` (6 more replies)
0 siblings, 7 replies; 17+ messages in thread
From: Andrei Emeltchenko @ 2012-07-10 12:27 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
This set of patches helps to parse debug in Bluetooth:
- Add printing refcount for l2cap_chan and amp_mgr
- Correct CID output %d -> 0x%4.4x for chan move functions
- Remove unneded type conversion by using for example types: %u and %zu
- and some other fixes
Andrei Emeltchenko (7):
Bluetooth: debug: Print l2cap refcount
Bluetooth: debug: Print amp_mgr refcnt
Bluetooth: debug: Add printing num of cmds queued
Bluetooth: debug: Use standard hex object specifier
Bluetooth: debug: Correct types specifiers for L2CAP
Bluetooth: debug: Print CID and PSM in hex format
Bluetooth: debug: Add debug to l2cap_security_cfm
include/net/bluetooth/l2cap.h | 6 ++
net/bluetooth/a2mp.c | 8 +-
net/bluetooth/hci_core.c | 3 +-
net/bluetooth/hci_event.c | 170 ++++++++++++++++++++---------------------
net/bluetooth/l2cap_core.c | 92 +++++++++++-----------
5 files changed, 148 insertions(+), 131 deletions(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 1/7] Bluetooth: debug: Print l2cap refcount
2012-07-10 12:27 [PATCH 0/7] Bluetooth: Correct debug code Andrei Emeltchenko
@ 2012-07-10 12:27 ` Andrei Emeltchenko
2012-07-10 18:33 ` Gustavo Padovan
2012-07-10 12:27 ` [PATCH 2/7] " Andrei Emeltchenko
` (5 subsequent siblings)
6 siblings, 1 reply; 17+ messages in thread
From: Andrei Emeltchenko @ 2012-07-10 12:27 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
include/net/bluetooth/l2cap.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index d80e3f0..dfe9374 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -672,11 +672,17 @@ enum {
static inline void l2cap_chan_hold(struct l2cap_chan *c)
{
+ BT_DBG("chan %p refcnt %d -> %d", c, atomic_read(&c->refcnt),
+ atomic_read(&c->refcnt) + 1);
+
atomic_inc(&c->refcnt);
}
static inline void l2cap_chan_put(struct l2cap_chan *c)
{
+ BT_DBG("chan %p refcnt %d -> %d", c, atomic_read(&c->refcnt),
+ atomic_read(&c->refcnt) - 1);
+
if (atomic_dec_and_test(&c->refcnt))
kfree(c);
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 2/7] Bluetooth: debug: Print amp_mgr refcnt
2012-07-10 12:27 [PATCH 0/7] Bluetooth: Correct debug code Andrei Emeltchenko
2012-07-10 12:27 ` [PATCH 1/7] Bluetooth: debug: Print l2cap refcount Andrei Emeltchenko
@ 2012-07-10 12:27 ` Andrei Emeltchenko
2012-07-10 12:27 ` [PATCH 3/7] Bluetooth: debug: Add printing num of cmds queued Andrei Emeltchenko
` (4 subsequent siblings)
6 siblings, 0 replies; 17+ messages in thread
From: Andrei Emeltchenko @ 2012-07-10 12:27 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
net/bluetooth/a2mp.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
index ec1ef2e..c4e7412 100644
--- a/net/bluetooth/a2mp.c
+++ b/net/bluetooth/a2mp.c
@@ -503,7 +503,9 @@ static struct l2cap_chan *a2mp_chan_open(struct l2cap_conn *conn)
/* AMP Manager functions */
void amp_mgr_get(struct amp_mgr *mgr)
{
- BT_DBG("mgr %p", mgr);
+ BT_DBG("mgr %p refcnt %d -> %d", mgr,
+ atomic_read(&mgr->kref.refcount),
+ atomic_read(&mgr->kref.refcount) + 1);
kref_get(&mgr->kref);
}
@@ -519,7 +521,9 @@ static void amp_mgr_destroy(struct kref *kref)
int amp_mgr_put(struct amp_mgr *mgr)
{
- BT_DBG("mgr %p", mgr);
+ BT_DBG("mgr %p refcnt %d -> %d", mgr,
+ atomic_read(&mgr->kref.refcount),
+ atomic_read(&mgr->kref.refcount) - 1);
return kref_put(&mgr->kref, &_mgr_destroy);
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 3/7] Bluetooth: debug: Add printing num of cmds queued
2012-07-10 12:27 [PATCH 0/7] Bluetooth: Correct debug code Andrei Emeltchenko
2012-07-10 12:27 ` [PATCH 1/7] Bluetooth: debug: Print l2cap refcount Andrei Emeltchenko
2012-07-10 12:27 ` [PATCH 2/7] " Andrei Emeltchenko
@ 2012-07-10 12:27 ` Andrei Emeltchenko
2012-07-10 12:27 ` [PATCH 4/7] Bluetooth: debug: Use standard hex object specifier Andrei Emeltchenko
` (3 subsequent siblings)
6 siblings, 0 replies; 17+ messages in thread
From: Andrei Emeltchenko @ 2012-07-10 12:27 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
net/bluetooth/hci_core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 5ad508e..28bab9d 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2823,7 +2823,8 @@ static void hci_cmd_work(struct work_struct *work)
struct hci_dev *hdev = container_of(work, struct hci_dev, cmd_work);
struct sk_buff *skb;
- BT_DBG("%s cmd %d", hdev->name, atomic_read(&hdev->cmd_cnt));
+ BT_DBG("%s cmd_cnt %d cmd queued %d", hdev->name,
+ atomic_read(&hdev->cmd_cnt), skb_queue_len(&hdev->cmd_q));
/* Send queued commands */
if (atomic_read(&hdev->cmd_cnt)) {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 4/7] Bluetooth: debug: Use standard hex object specifier
2012-07-10 12:27 [PATCH 0/7] Bluetooth: Correct debug code Andrei Emeltchenko
` (2 preceding siblings ...)
2012-07-10 12:27 ` [PATCH 3/7] Bluetooth: debug: Add printing num of cmds queued Andrei Emeltchenko
@ 2012-07-10 12:27 ` Andrei Emeltchenko
2012-07-10 18:38 ` Gustavo Padovan
2012-07-10 12:27 ` [PATCH 5/7] Bluetooth: debug: Correct types specifiers for L2CAP Andrei Emeltchenko
` (2 subsequent siblings)
6 siblings, 1 reply; 17+ messages in thread
From: Andrei Emeltchenko @ 2012-07-10 12:27 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
To help debugging printed hex object use standard bluetooth
specifier in hci_event.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
net/bluetooth/hci_event.c | 170 ++++++++++++++++++++++-----------------------
1 file changed, 85 insertions(+), 85 deletions(-)
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index f4c679b..06996ff 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)
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (status) {
hci_dev_lock(hdev);
@@ -60,7 +60,7 @@ static void hci_cc_periodic_inq(struct hci_dev *hdev, struct sk_buff *skb)
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (status)
return;
@@ -72,7 +72,7 @@ static void hci_cc_exit_periodic_inq(struct hci_dev *hdev, struct sk_buff *skb)
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (status)
return;
@@ -93,7 +93,7 @@ static void hci_cc_role_discovery(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_rp_role_discovery *rp = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -116,7 +116,7 @@ static void hci_cc_read_link_policy(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_rp_read_link_policy *rp = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -136,7 +136,7 @@ static void hci_cc_write_link_policy(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_conn *conn;
void *sent;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -159,7 +159,7 @@ static void hci_cc_read_def_link_policy(struct hci_dev *hdev,
{
struct hci_rp_read_def_link_policy *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -173,7 +173,7 @@ static void hci_cc_write_def_link_policy(struct hci_dev *hdev,
__u8 status = *((__u8 *) skb->data);
void *sent;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_DEF_LINK_POLICY);
if (!sent)
@@ -189,7 +189,7 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb)
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
clear_bit(HCI_RESET, &hdev->flags);
@@ -207,7 +207,7 @@ static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb)
__u8 status = *((__u8 *) skb->data);
void *sent;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_LOCAL_NAME);
if (!sent)
@@ -229,7 +229,7 @@ static void hci_cc_read_local_name(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_rp_read_local_name *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -243,7 +243,7 @@ static void hci_cc_write_auth_enable(struct hci_dev *hdev, struct sk_buff *skb)
__u8 status = *((__u8 *) skb->data);
void *sent;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_AUTH_ENABLE);
if (!sent)
@@ -269,7 +269,7 @@ static void hci_cc_write_encrypt_mode(struct hci_dev *hdev, struct sk_buff *skb)
__u8 status = *((__u8 *) skb->data);
void *sent;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_ENCRYPT_MODE);
if (!sent)
@@ -293,7 +293,7 @@ static void hci_cc_write_scan_enable(struct hci_dev *hdev, struct sk_buff *skb)
int old_pscan, old_iscan;
void *sent;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_SCAN_ENABLE);
if (!sent)
@@ -340,7 +340,7 @@ static void hci_cc_read_class_of_dev(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_rp_read_class_of_dev *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -356,7 +356,7 @@ static void hci_cc_write_class_of_dev(struct hci_dev *hdev, struct sk_buff *skb)
__u8 status = *((__u8 *) skb->data);
void *sent;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_CLASS_OF_DEV);
if (!sent)
@@ -378,7 +378,7 @@ static void hci_cc_read_voice_setting(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_rp_read_voice_setting *rp = (void *) skb->data;
__u16 setting;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -390,7 +390,7 @@ static void hci_cc_read_voice_setting(struct hci_dev *hdev, struct sk_buff *skb)
hdev->voice_setting = setting;
- BT_DBG("%s voice setting 0x%04x", hdev->name, setting);
+ BT_DBG("%s voice setting 0x%4.4x", hdev->name, setting);
if (hdev->notify)
hdev->notify(hdev, HCI_NOTIFY_VOICE_SETTING);
@@ -403,7 +403,7 @@ static void hci_cc_write_voice_setting(struct hci_dev *hdev,
__u16 setting;
void *sent;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (status)
return;
@@ -419,7 +419,7 @@ static void hci_cc_write_voice_setting(struct hci_dev *hdev,
hdev->voice_setting = setting;
- BT_DBG("%s voice setting 0x%04x", hdev->name, setting);
+ BT_DBG("%s voice setting 0x%4.4x", hdev->name, setting);
if (hdev->notify)
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)
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
hci_req_complete(hdev, HCI_OP_HOST_BUFFER_SIZE, status);
}
@@ -439,7 +439,7 @@ static void hci_cc_write_ssp_mode(struct hci_dev *hdev, struct sk_buff *skb)
__u8 status = *((__u8 *) skb->data);
void *sent;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_SSP_MODE);
if (!sent)
@@ -597,7 +597,7 @@ static void hci_cc_read_local_version(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_rp_read_local_version *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
goto done;
@@ -608,7 +608,7 @@ static void hci_cc_read_local_version(struct hci_dev *hdev, struct sk_buff *skb)
hdev->manufacturer = __le16_to_cpu(rp->manufacturer);
hdev->lmp_subver = __le16_to_cpu(rp->lmp_subver);
- BT_DBG("%s manufacturer %d hci ver %d:%d", hdev->name,
+ BT_DBG("%s manufacturer 0x%4.4x hci ver %d:%d", hdev->name,
hdev->manufacturer, hdev->hci_ver, hdev->hci_rev);
if (test_bit(HCI_INIT, &hdev->flags))
@@ -641,7 +641,7 @@ static void hci_cc_read_local_commands(struct hci_dev *hdev,
{
struct hci_rp_read_local_commands *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
goto done;
@@ -660,7 +660,7 @@ static void hci_cc_read_local_features(struct hci_dev *hdev,
{
struct hci_rp_read_local_features *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -732,7 +732,7 @@ static void hci_cc_read_local_ext_features(struct hci_dev *hdev,
{
struct hci_rp_read_local_ext_features *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
goto done;
@@ -758,7 +758,7 @@ static void hci_cc_read_flow_control_mode(struct hci_dev *hdev,
{
struct hci_rp_read_flow_control_mode *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -772,7 +772,7 @@ static void hci_cc_read_buffer_size(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_rp_read_buffer_size *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -798,7 +798,7 @@ static void hci_cc_read_bd_addr(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_rp_read_bd_addr *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (!rp->status)
bacpy(&hdev->bdaddr, &rp->bdaddr);
@@ -811,7 +811,7 @@ static void hci_cc_read_data_block_size(struct hci_dev *hdev,
{
struct hci_rp_read_data_block_size *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -832,7 +832,7 @@ static void hci_cc_write_ca_timeout(struct hci_dev *hdev, struct sk_buff *skb)
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
hci_req_complete(hdev, HCI_OP_WRITE_CA_TIMEOUT, status);
}
@@ -842,7 +842,7 @@ static void hci_cc_read_local_amp_info(struct hci_dev *hdev,
{
struct hci_rp_read_local_amp_info *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -866,7 +866,7 @@ static void hci_cc_delete_stored_link_key(struct hci_dev *hdev,
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
hci_req_complete(hdev, HCI_OP_DELETE_STORED_LINK_KEY, status);
}
@@ -875,7 +875,7 @@ static void hci_cc_set_event_mask(struct hci_dev *hdev, struct sk_buff *skb)
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
hci_req_complete(hdev, HCI_OP_SET_EVENT_MASK, status);
}
@@ -885,7 +885,7 @@ static void hci_cc_write_inquiry_mode(struct hci_dev *hdev,
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
hci_req_complete(hdev, HCI_OP_WRITE_INQUIRY_MODE, status);
}
@@ -895,7 +895,7 @@ static void hci_cc_read_inq_rsp_tx_power(struct hci_dev *hdev,
{
struct hci_rp_read_inq_rsp_tx_power *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (!rp->status)
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)
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
hci_req_complete(hdev, HCI_OP_SET_EVENT_FLT, status);
}
@@ -918,7 +918,7 @@ static void hci_cc_pin_code_reply(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_cp_pin_code_reply *cp;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
hci_dev_lock(hdev);
@@ -944,7 +944,7 @@ static void hci_cc_pin_code_neg_reply(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_rp_pin_code_neg_reply *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
hci_dev_lock(hdev);
@@ -960,7 +960,7 @@ static void hci_cc_le_read_buffer_size(struct hci_dev *hdev,
{
struct hci_rp_le_read_buffer_size *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -979,7 +979,7 @@ static void hci_cc_user_confirm_reply(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_rp_user_confirm_reply *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
hci_dev_lock(hdev);
@@ -995,7 +995,7 @@ static void hci_cc_user_confirm_neg_reply(struct hci_dev *hdev,
{
struct hci_rp_user_confirm_reply *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
hci_dev_lock(hdev);
@@ -1010,7 +1010,7 @@ static void hci_cc_user_passkey_reply(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_rp_user_confirm_reply *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
hci_dev_lock(hdev);
@@ -1026,7 +1026,7 @@ static void hci_cc_user_passkey_neg_reply(struct hci_dev *hdev,
{
struct hci_rp_user_confirm_reply *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
hci_dev_lock(hdev);
@@ -1042,7 +1042,7 @@ static void hci_cc_read_local_oob_data_reply(struct hci_dev *hdev,
{
struct hci_rp_read_local_oob_data *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
hci_dev_lock(hdev);
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)
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
hci_req_complete(hdev, HCI_OP_LE_SET_SCAN_PARAM, status);
@@ -1072,7 +1072,7 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
struct hci_cp_le_set_scan_enable *cp;
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_SCAN_ENABLE);
if (!cp)
@@ -1127,7 +1127,7 @@ static void hci_cc_le_ltk_reply(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_rp_le_ltk_reply *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -1139,7 +1139,7 @@ static void hci_cc_le_ltk_neg_reply(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_rp_le_ltk_neg_reply *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -1153,7 +1153,7 @@ static void hci_cc_write_le_host_supported(struct hci_dev *hdev,
struct hci_cp_write_le_host_supported *sent;
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_LE_HOST_SUPPORTED);
if (!sent)
@@ -1175,7 +1175,7 @@ static void hci_cc_write_le_host_supported(struct hci_dev *hdev,
static void hci_cs_inquiry(struct hci_dev *hdev, __u8 status)
{
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (status) {
hci_req_complete(hdev, HCI_OP_INQUIRY, status);
@@ -1199,7 +1199,7 @@ static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)
struct hci_cp_create_conn *cp;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
cp = hci_sent_cmd_data(hdev, HCI_OP_CREATE_CONN);
if (!cp)
@@ -1209,7 +1209,7 @@ static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)
conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->bdaddr);
- BT_DBG("%s bdaddr %pMR conn %p", hdev->name, &cp->bdaddr, conn);
+ BT_DBG("%s bdaddr %pMR hcon %p", hdev->name, &cp->bdaddr, conn);
if (status) {
if (conn && conn->state == BT_CONNECT) {
@@ -1240,7 +1240,7 @@ static void hci_cs_add_sco(struct hci_dev *hdev, __u8 status)
struct hci_conn *acl, *sco;
__u16 handle;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (!status)
return;
@@ -1251,7 +1251,7 @@ static void hci_cs_add_sco(struct hci_dev *hdev, __u8 status)
handle = __le16_to_cpu(cp->handle);
- BT_DBG("%s handle %d", hdev->name, handle);
+ BT_DBG("%s handle 0x%4.4x", hdev->name, handle);
hci_dev_lock(hdev);
@@ -1274,7 +1274,7 @@ static void hci_cs_auth_requested(struct hci_dev *hdev, __u8 status)
struct hci_cp_auth_requested *cp;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (!status)
return;
@@ -1301,7 +1301,7 @@ static void hci_cs_set_conn_encrypt(struct hci_dev *hdev, __u8 status)
struct hci_cp_set_conn_encrypt *cp;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (!status)
return;
@@ -1413,7 +1413,7 @@ static void hci_cs_remote_name_req(struct hci_dev *hdev, __u8 status)
struct hci_cp_remote_name_req *cp;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
/* If successful wait for the name req complete event before
* checking for the need to do authentication */
@@ -1452,7 +1452,7 @@ static void hci_cs_read_remote_features(struct hci_dev *hdev, __u8 status)
struct hci_cp_read_remote_features *cp;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (!status)
return;
@@ -1479,7 +1479,7 @@ static void hci_cs_read_remote_ext_features(struct hci_dev *hdev, __u8 status)
struct hci_cp_read_remote_ext_features *cp;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (!status)
return;
@@ -1507,7 +1507,7 @@ static void hci_cs_setup_sync_conn(struct hci_dev *hdev, __u8 status)
struct hci_conn *acl, *sco;
__u16 handle;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (!status)
return;
@@ -1518,7 +1518,7 @@ static void hci_cs_setup_sync_conn(struct hci_dev *hdev, __u8 status)
handle = __le16_to_cpu(cp->handle);
- BT_DBG("%s handle %d", hdev->name, handle);
+ BT_DBG("%s handle 0x%4.4x", hdev->name, handle);
hci_dev_lock(hdev);
@@ -1541,7 +1541,7 @@ static void hci_cs_sniff_mode(struct hci_dev *hdev, __u8 status)
struct hci_cp_sniff_mode *cp;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (!status)
return;
@@ -1568,7 +1568,7 @@ static void hci_cs_exit_sniff_mode(struct hci_dev *hdev, __u8 status)
struct hci_cp_exit_sniff_mode *cp;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (!status)
return;
@@ -1617,7 +1617,7 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, __u8 status)
struct hci_cp_le_create_conn *cp;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
cp = hci_sent_cmd_data(hdev, HCI_OP_LE_CREATE_CONN);
if (!cp)
@@ -1654,7 +1654,7 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, __u8 status)
static void hci_cs_le_start_enc(struct hci_dev *hdev, u8 status)
{
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
}
static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
@@ -1663,7 +1663,7 @@ static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
struct discovery_state *discov = &hdev->discovery;
struct inquiry_entry *e;
- BT_DBG("%s status %d", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
hci_req_complete(hdev, HCI_OP_INQUIRY, status);
@@ -1892,7 +1892,7 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_ev_disconn_complete *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -1929,7 +1929,7 @@ static void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_ev_auth_complete *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -2034,7 +2034,7 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_ev_encrypt_change *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -2078,7 +2078,7 @@ static void hci_change_link_key_complete_evt(struct hci_dev *hdev,
struct hci_ev_change_link_key_complete *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -2101,7 +2101,7 @@ static void hci_remote_features_evt(struct hci_dev *hdev,
struct hci_ev_remote_features *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -2363,7 +2363,7 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
break;
default:
- BT_DBG("%s opcode 0x%x", hdev->name, opcode);
+ BT_DBG("%s opcode 0x%4.4x", hdev->name, opcode);
break;
}
@@ -2444,7 +2444,7 @@ static void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb)
break;
default:
- BT_DBG("%s opcode 0x%x", hdev->name, opcode);
+ BT_DBG("%s opcode 0x%4.4x", hdev->name, opcode);
break;
}
@@ -2463,7 +2463,7 @@ static void hci_role_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_ev_role_change *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -2604,7 +2604,7 @@ static void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_ev_mode_change *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -2762,7 +2762,7 @@ static void hci_clock_offset_evt(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_ev_clock_offset *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -2785,7 +2785,7 @@ static void hci_pkt_type_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_ev_pkt_type_change *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -2929,7 +2929,7 @@ static void hci_sync_conn_complete_evt(struct hci_dev *hdev,
struct hci_ev_sync_conn_complete *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -2988,7 +2988,7 @@ static void hci_sniff_subrate_evt(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_ev_sniff_subrate *ev = (void *) skb->data;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
}
static void hci_extended_inquiry_result_evt(struct hci_dev *hdev,
@@ -3045,7 +3045,7 @@ static void hci_key_refresh_complete_evt(struct hci_dev *hdev,
struct hci_ev_key_refresh_complete *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %u handle %u", hdev->name, ev->status,
+ BT_DBG("%s status 0x%2.2x handle 0x%4.4x", hdev->name, ev->status,
__le16_to_cpu(ev->handle));
hci_dev_lock(hdev);
@@ -3345,7 +3345,7 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_ev_le_conn_complete *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -3420,7 +3420,7 @@ static void hci_le_ltk_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_conn *conn;
struct smp_ltk *ltk;
- BT_DBG("%s handle %d", hdev->name, __le16_to_cpu(ev->handle));
+ BT_DBG("%s handle 0x%4.4x", hdev->name, __le16_to_cpu(ev->handle));
hci_dev_lock(hdev);
@@ -3644,7 +3644,7 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb)
break;
default:
- BT_DBG("%s event 0x%x", hdev->name, event);
+ BT_DBG("%s event 0x%2.2x", hdev->name, event);
break;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 5/7] Bluetooth: debug: Correct types specifiers for L2CAP
2012-07-10 12:27 [PATCH 0/7] Bluetooth: Correct debug code Andrei Emeltchenko
` (3 preceding siblings ...)
2012-07-10 12:27 ` [PATCH 4/7] Bluetooth: debug: Use standard hex object specifier Andrei Emeltchenko
@ 2012-07-10 12:27 ` Andrei Emeltchenko
2012-07-10 12:27 ` [PATCH 6/7] Bluetooth: debug: Print CID and PSM in hex format Andrei Emeltchenko
2012-07-10 12:27 ` [PATCH 7/7] Bluetooth: debug: Add debug to l2cap_security_cfm Andrei Emeltchenko
6 siblings, 0 replies; 17+ messages in thread
From: Andrei Emeltchenko @ 2012-07-10 12:27 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Avoid unneeded type conversion by correcting type specifiers in debug
statements for L2CAP.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
net/bluetooth/l2cap_core.c | 52 ++++++++++++++++++++++----------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 5dd7a76..9fbac57 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1655,7 +1655,7 @@ static void l2cap_streaming_send(struct l2cap_chan *chan,
l2cap_do_send(chan, skb);
- BT_DBG("Sent txseq %d", (int)control->txseq);
+ BT_DBG("Sent txseq %u", control->txseq);
chan->next_tx_seq = __next_seq(chan, chan->next_tx_seq);
chan->frames_sent++;
@@ -1720,11 +1720,11 @@ static int l2cap_ertm_send(struct l2cap_chan *chan)
chan->tx_send_head = skb_queue_next(&chan->tx_q, skb);
l2cap_do_send(chan, tx_skb);
- BT_DBG("Sent txseq %d", (int)control->txseq);
+ BT_DBG("Sent txseq %u", control->txseq);
}
- BT_DBG("Sent %d, %d unacked, %d in ERTM queue", sent,
- (int) chan->unacked_frames, skb_queue_len(&chan->tx_q));
+ BT_DBG("Sent %d, %u unacked, %u in ERTM queue", sent,
+ chan->unacked_frames, skb_queue_len(&chan->tx_q));
return sent;
}
@@ -1882,7 +1882,7 @@ static void l2cap_send_ack(struct l2cap_chan *chan)
threshold += threshold << 1;
threshold >>= 2;
- BT_DBG("frames_to_ack %d, threshold %d", (int)frames_to_ack,
+ BT_DBG("frames_to_ack %u, threshold %d", frames_to_ack,
threshold);
if (frames_to_ack >= threshold) {
@@ -1944,15 +1944,15 @@ static inline int l2cap_skbuff_fromiovec(struct l2cap_chan *chan,
}
static struct sk_buff *l2cap_create_connless_pdu(struct l2cap_chan *chan,
- struct msghdr *msg, size_t len,
- u32 priority)
+ struct msghdr *msg, size_t len,
+ u32 priority)
{
struct l2cap_conn *conn = chan->conn;
struct sk_buff *skb;
int err, count, hlen = L2CAP_HDR_SIZE + L2CAP_PSMLEN_SIZE;
struct l2cap_hdr *lh;
- BT_DBG("chan %p len %d priority %u", chan, (int)len, priority);
+ BT_DBG("chan %p len %zu priority %u", chan, len, priority);
count = min_t(unsigned int, (conn->mtu - hlen), len);
@@ -1978,15 +1978,15 @@ static struct sk_buff *l2cap_create_connless_pdu(struct l2cap_chan *chan,
}
static struct sk_buff *l2cap_create_basic_pdu(struct l2cap_chan *chan,
- struct msghdr *msg, size_t len,
- u32 priority)
+ struct msghdr *msg, size_t len,
+ u32 priority)
{
struct l2cap_conn *conn = chan->conn;
struct sk_buff *skb;
int err, count;
struct l2cap_hdr *lh;
- BT_DBG("chan %p len %d", chan, (int)len);
+ BT_DBG("chan %p len %zu", chan, len);
count = min_t(unsigned int, (conn->mtu - L2CAP_HDR_SIZE), len);
@@ -2011,15 +2011,15 @@ static struct sk_buff *l2cap_create_basic_pdu(struct l2cap_chan *chan,
}
static struct sk_buff *l2cap_create_iframe_pdu(struct l2cap_chan *chan,
- struct msghdr *msg, size_t len,
- u16 sdulen)
+ struct msghdr *msg, size_t len,
+ u16 sdulen)
{
struct l2cap_conn *conn = chan->conn;
struct sk_buff *skb;
int err, count, hlen;
struct l2cap_hdr *lh;
- BT_DBG("chan %p len %d", chan, (int)len);
+ BT_DBG("chan %p len %zu", chan, len);
if (!conn)
return ERR_PTR(-ENOTCONN);
@@ -2073,7 +2073,7 @@ static int l2cap_segment_sdu(struct l2cap_chan *chan,
size_t pdu_len;
u8 sar;
- BT_DBG("chan %p, msg %p, len %d", chan, msg, (int)len);
+ BT_DBG("chan %p, msg %p, len %zu", chan, msg, len);
/* It is critical that ERTM PDUs fit in a single HCI fragment,
* so fragmented skbs are not used. The HCI layer's handling
@@ -2217,7 +2217,7 @@ static void l2cap_send_srej(struct l2cap_chan *chan, u16 txseq)
struct l2cap_ctrl control;
u16 seq;
- BT_DBG("chan %p, txseq %d", chan, txseq);
+ BT_DBG("chan %p, txseq %u", chan, txseq);
memset(&control, 0, sizeof(control));
control.sframe = 1;
@@ -2257,7 +2257,7 @@ static void l2cap_send_srej_list(struct l2cap_chan *chan, u16 txseq)
u16 initial_head;
u16 seq;
- BT_DBG("chan %p, txseq %d", chan, txseq);
+ BT_DBG("chan %p, txseq %u", chan, txseq);
memset(&control, 0, sizeof(control));
control.sframe = 1;
@@ -2282,12 +2282,12 @@ static void l2cap_process_reqseq(struct l2cap_chan *chan, u16 reqseq)
struct sk_buff *acked_skb;
u16 ackseq;
- BT_DBG("chan %p, reqseq %d", chan, reqseq);
+ BT_DBG("chan %p, reqseq %u", chan, reqseq);
if (chan->unacked_frames == 0 || reqseq == chan->expected_ack_seq)
return;
- BT_DBG("expected_ack_seq %d, unacked_frames %d",
+ BT_DBG("expected_ack_seq %u, unacked_frames %u",
chan->expected_ack_seq, chan->unacked_frames);
for (ackseq = chan->expected_ack_seq; ackseq != reqseq;
@@ -2306,7 +2306,7 @@ static void l2cap_process_reqseq(struct l2cap_chan *chan, u16 reqseq)
if (chan->unacked_frames == 0)
__clear_retrans_timer(chan);
- BT_DBG("unacked_frames %d", (int) chan->unacked_frames);
+ BT_DBG("unacked_frames %u", chan->unacked_frames);
}
static void l2cap_abort_rx_srej_sent(struct l2cap_chan *chan)
@@ -2532,16 +2532,16 @@ static void l2cap_raw_recv(struct l2cap_conn *conn, struct sk_buff *skb)
}
/* ---- L2CAP signalling commands ---- */
-static struct sk_buff *l2cap_build_cmd(struct l2cap_conn *conn,
- u8 code, u8 ident, u16 dlen, void *data)
+static struct sk_buff *l2cap_build_cmd(struct l2cap_conn *conn, u8 code,
+ u8 ident, u16 dlen, void *data)
{
struct sk_buff *skb, **frag;
struct l2cap_cmd_hdr *cmd;
struct l2cap_hdr *lh;
int len, count;
- BT_DBG("conn %p, code 0x%2.2x, ident 0x%2.2x, len %d",
- conn, code, ident, dlen);
+ BT_DBG("conn %p, code 0x%2.2x, ident 0x%2.2x, len %u",
+ conn, code, ident, dlen);
len = L2CAP_HDR_SIZE + L2CAP_CMD_HDR_SIZE + dlen;
count = min_t(unsigned int, conn->mtu, len);
@@ -2624,7 +2624,7 @@ static inline int l2cap_get_conf_opt(void **ptr, int *type, int *olen, unsigned
break;
}
- BT_DBG("type 0x%2.2x len %d val 0x%lx", *type, opt->len, *val);
+ BT_DBG("type 0x%2.2x len %u val 0x%lx", *type, opt->len, *val);
return len;
}
@@ -2632,7 +2632,7 @@ static void l2cap_add_conf_opt(void **ptr, u8 type, u8 len, unsigned long val)
{
struct l2cap_conf_opt *opt = *ptr;
- BT_DBG("type 0x%2.2x len %d val 0x%lx", type, len, val);
+ BT_DBG("type 0x%2.2x len %u val 0x%lx", type, len, val);
opt->type = type;
opt->len = len;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 6/7] Bluetooth: debug: Print CID and PSM in hex format
2012-07-10 12:27 [PATCH 0/7] Bluetooth: Correct debug code Andrei Emeltchenko
` (4 preceding siblings ...)
2012-07-10 12:27 ` [PATCH 5/7] Bluetooth: debug: Correct types specifiers for L2CAP Andrei Emeltchenko
@ 2012-07-10 12:27 ` Andrei Emeltchenko
2012-07-10 12:27 ` [PATCH 7/7] Bluetooth: debug: Add debug to l2cap_security_cfm Andrei Emeltchenko
6 siblings, 0 replies; 17+ messages in thread
From: Andrei Emeltchenko @ 2012-07-10 12:27 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Correct places where CID and PSM were printed as int. For CID: 0x%4.4x
is used and for PSM: 0x%2.2x.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
net/bluetooth/l2cap_core.c | 35 ++++++++++++++++++++---------------
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 9fbac57..41905de9 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -3947,7 +3947,7 @@ static inline int l2cap_create_channel_req(struct l2cap_conn *conn,
psm = le16_to_cpu(req->psm);
scid = le16_to_cpu(req->scid);
- BT_DBG("psm %d, scid %d, amp_id %d", psm, scid, req->amp_id);
+ BT_DBG("psm 0x%2.2x, scid 0x%4.4x, amp_id %d", psm, scid, req->amp_id);
/* Placeholder: Always reject */
rsp.dcid = 0;
@@ -3970,11 +3970,11 @@ static inline int l2cap_create_channel_rsp(struct l2cap_conn *conn,
}
static void l2cap_send_move_chan_rsp(struct l2cap_conn *conn, u8 ident,
- u16 icid, u16 result)
+ u16 icid, u16 result)
{
struct l2cap_move_chan_rsp rsp;
- BT_DBG("icid %d, result %d", icid, result);
+ BT_DBG("icid 0x%4.4x, result 0x%4.4x", icid, result);
rsp.icid = cpu_to_le16(icid);
rsp.result = cpu_to_le16(result);
@@ -3983,12 +3983,13 @@ static void l2cap_send_move_chan_rsp(struct l2cap_conn *conn, u8 ident,
}
static void l2cap_send_move_chan_cfm(struct l2cap_conn *conn,
- struct l2cap_chan *chan, u16 icid, u16 result)
+ struct l2cap_chan *chan,
+ u16 icid, u16 result)
{
struct l2cap_move_chan_cfm cfm;
u8 ident;
- BT_DBG("icid %d, result %d", icid, result);
+ BT_DBG("icid 0x%4.4x, result 0x%4.4x", icid, result);
ident = l2cap_get_ident(conn);
if (chan)
@@ -4001,18 +4002,19 @@ static void l2cap_send_move_chan_cfm(struct l2cap_conn *conn,
}
static void l2cap_send_move_chan_cfm_rsp(struct l2cap_conn *conn, u8 ident,
- u16 icid)
+ u16 icid)
{
struct l2cap_move_chan_cfm_rsp rsp;
- BT_DBG("icid %d", icid);
+ BT_DBG("icid 0x%4.4x", icid);
rsp.icid = cpu_to_le16(icid);
l2cap_send_cmd(conn, ident, L2CAP_MOVE_CHAN_CFM_RSP, sizeof(rsp), &rsp);
}
static inline int l2cap_move_channel_req(struct l2cap_conn *conn,
- struct l2cap_cmd_hdr *cmd, u16 cmd_len, void *data)
+ struct l2cap_cmd_hdr *cmd,
+ u16 cmd_len, void *data)
{
struct l2cap_move_chan_req *req = data;
u16 icid = 0;
@@ -4023,7 +4025,7 @@ static inline int l2cap_move_channel_req(struct l2cap_conn *conn,
icid = le16_to_cpu(req->icid);
- BT_DBG("icid %d, dest_amp_id %d", icid, req->dest_amp_id);
+ BT_DBG("icid 0x%4.4x, dest_amp_id %d", icid, req->dest_amp_id);
if (!enable_hs)
return -EINVAL;
@@ -4035,7 +4037,8 @@ static inline int l2cap_move_channel_req(struct l2cap_conn *conn,
}
static inline int l2cap_move_channel_rsp(struct l2cap_conn *conn,
- struct l2cap_cmd_hdr *cmd, u16 cmd_len, void *data)
+ struct l2cap_cmd_hdr *cmd,
+ u16 cmd_len, void *data)
{
struct l2cap_move_chan_rsp *rsp = data;
u16 icid, result;
@@ -4046,7 +4049,7 @@ static inline int l2cap_move_channel_rsp(struct l2cap_conn *conn,
icid = le16_to_cpu(rsp->icid);
result = le16_to_cpu(rsp->result);
- BT_DBG("icid %d, result %d", icid, result);
+ BT_DBG("icid 0x%4.4x, result 0x%4.4x", icid, result);
/* Placeholder: Always unconfirmed */
l2cap_send_move_chan_cfm(conn, NULL, icid, L2CAP_MC_UNCONFIRMED);
@@ -4055,7 +4058,8 @@ static inline int l2cap_move_channel_rsp(struct l2cap_conn *conn,
}
static inline int l2cap_move_channel_confirm(struct l2cap_conn *conn,
- struct l2cap_cmd_hdr *cmd, u16 cmd_len, void *data)
+ struct l2cap_cmd_hdr *cmd,
+ u16 cmd_len, void *data)
{
struct l2cap_move_chan_cfm *cfm = data;
u16 icid, result;
@@ -4066,7 +4070,7 @@ static inline int l2cap_move_channel_confirm(struct l2cap_conn *conn,
icid = le16_to_cpu(cfm->icid);
result = le16_to_cpu(cfm->result);
- BT_DBG("icid %d, result %d", icid, result);
+ BT_DBG("icid 0x%4.4x, result 0x%4.4x", icid, result);
l2cap_send_move_chan_cfm_rsp(conn, cmd->ident, icid);
@@ -4074,7 +4078,8 @@ static inline int l2cap_move_channel_confirm(struct l2cap_conn *conn,
}
static inline int l2cap_move_channel_confirm_rsp(struct l2cap_conn *conn,
- struct l2cap_cmd_hdr *cmd, u16 cmd_len, void *data)
+ struct l2cap_cmd_hdr *cmd,
+ u16 cmd_len, void *data)
{
struct l2cap_move_chan_cfm_rsp *rsp = data;
u16 icid;
@@ -4084,7 +4089,7 @@ static inline int l2cap_move_channel_confirm_rsp(struct l2cap_conn *conn,
icid = le16_to_cpu(rsp->icid);
- BT_DBG("icid %d", icid);
+ BT_DBG("icid 0x%4.4x", icid);
return 0;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 7/7] Bluetooth: debug: Add debug to l2cap_security_cfm
2012-07-10 12:27 [PATCH 0/7] Bluetooth: Correct debug code Andrei Emeltchenko
` (5 preceding siblings ...)
2012-07-10 12:27 ` [PATCH 6/7] Bluetooth: debug: Print CID and PSM in hex format Andrei Emeltchenko
@ 2012-07-10 12:27 ` Andrei Emeltchenko
2012-07-10 18:44 ` Gustavo Padovan
6 siblings, 1 reply; 17+ messages in thread
From: Andrei Emeltchenko @ 2012-07-10 12:27 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
net/bluetooth/l2cap_core.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 41905de9..32faa36 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -5377,7 +5377,7 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
if (!conn)
return 0;
- BT_DBG("conn %p", conn);
+ BT_DBG("conn %p status 0x%2.2x encrypt %u", conn, status, encrypt);
if (hcon->type == LE_LINK) {
if (!status && encrypt)
@@ -5390,7 +5390,8 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
list_for_each_entry(chan, &conn->chan_l, list) {
l2cap_chan_lock(chan);
- BT_DBG("chan->scid %d", chan->scid);
+ BT_DBG("chan %p scid 0x%4.4x state %s", chan, chan->scid,
+ state_to_string(chan->state));
if (chan->scid == L2CAP_CID_LE_DATA) {
if (!status && encrypt) {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 1/7] Bluetooth: debug: Print l2cap refcount
2012-07-10 12:27 ` [PATCH 1/7] Bluetooth: debug: Print l2cap refcount Andrei Emeltchenko
@ 2012-07-10 18:33 ` Gustavo Padovan
2012-07-11 11:37 ` Andrei Emeltchenko
2012-07-11 11:43 ` [PATCH 1/2] Bluetooth: debug: Print l2cap_chan refcount Andrei Emeltchenko
0 siblings, 2 replies; 17+ messages in thread
From: Gustavo Padovan @ 2012-07-10 18:33 UTC (permalink / raw)
To: Andrei Emeltchenko; +Cc: linux-bluetooth
Hi Andrei,
* Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com> [2012-07-10 15:27:45 +0300]:
> From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
>
>
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> ---
> include/net/bluetooth/l2cap.h | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
> index d80e3f0..dfe9374 100644
> --- a/include/net/bluetooth/l2cap.h
> +++ b/include/net/bluetooth/l2cap.h
> @@ -672,11 +672,17 @@ enum {
>
> static inline void l2cap_chan_hold(struct l2cap_chan *c)
> {
> + BT_DBG("chan %p refcnt %d -> %d", c, atomic_read(&c->refcnt),
> + atomic_read(&c->refcnt) + 1);
> +
We don't really need to call atomic_read() twice read. Just print the new
value and the log reader has to figure it out.
Gustavo
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 4/7] Bluetooth: debug: Use standard hex object specifier
2012-07-10 12:27 ` [PATCH 4/7] Bluetooth: debug: Use standard hex object specifier Andrei Emeltchenko
@ 2012-07-10 18:38 ` Gustavo Padovan
2012-07-11 11:32 ` [PATCH] Bluetooth: debug: Use standard hex object specifiers in hci_event Andrei Emeltchenko
0 siblings, 1 reply; 17+ messages in thread
From: Gustavo Padovan @ 2012-07-10 18:38 UTC (permalink / raw)
To: Andrei Emeltchenko; +Cc: linux-bluetooth
Hi Andrei,
* Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com> [2012-07-10 15:27:48 +0300]:
> From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
>
> To help debugging printed hex object use standard bluetooth
> specifier in hci_event.
>
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> ---
> net/bluetooth/hci_event.c | 170 ++++++++++++++++++++++-----------------------
> 1 file changed, 85 insertions(+), 85 deletions(-)
>
> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
> index f4c679b..06996ff 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)
> {
> __u8 status = *((__u8 *) skb->data);
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> if (status) {
> hci_dev_lock(hdev);
> @@ -60,7 +60,7 @@ static void hci_cc_periodic_inq(struct hci_dev *hdev, struct sk_buff *skb)
> {
> __u8 status = *((__u8 *) skb->data);
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> if (status)
> return;
> @@ -72,7 +72,7 @@ static void hci_cc_exit_periodic_inq(struct hci_dev *hdev, struct sk_buff *skb)
> {
> __u8 status = *((__u8 *) skb->data);
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> if (status)
> return;
> @@ -93,7 +93,7 @@ static void hci_cc_role_discovery(struct hci_dev *hdev, struct sk_buff *skb)
> struct hci_rp_role_discovery *rp = (void *) skb->data;
> struct hci_conn *conn;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> if (rp->status)
> return;
> @@ -116,7 +116,7 @@ static void hci_cc_read_link_policy(struct hci_dev *hdev, struct sk_buff *skb)
> struct hci_rp_read_link_policy *rp = (void *) skb->data;
> struct hci_conn *conn;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> if (rp->status)
> return;
> @@ -136,7 +136,7 @@ static void hci_cc_write_link_policy(struct hci_dev *hdev, struct sk_buff *skb)
> struct hci_conn *conn;
> void *sent;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> if (rp->status)
> return;
> @@ -159,7 +159,7 @@ static void hci_cc_read_def_link_policy(struct hci_dev *hdev,
> {
> struct hci_rp_read_def_link_policy *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> if (rp->status)
> return;
> @@ -173,7 +173,7 @@ static void hci_cc_write_def_link_policy(struct hci_dev *hdev,
> __u8 status = *((__u8 *) skb->data);
> void *sent;
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_DEF_LINK_POLICY);
> if (!sent)
> @@ -189,7 +189,7 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb)
> {
> __u8 status = *((__u8 *) skb->data);
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> clear_bit(HCI_RESET, &hdev->flags);
>
> @@ -207,7 +207,7 @@ static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb)
> __u8 status = *((__u8 *) skb->data);
> void *sent;
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_LOCAL_NAME);
> if (!sent)
> @@ -229,7 +229,7 @@ static void hci_cc_read_local_name(struct hci_dev *hdev, struct sk_buff *skb)
> {
> struct hci_rp_read_local_name *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> if (rp->status)
> return;
> @@ -243,7 +243,7 @@ static void hci_cc_write_auth_enable(struct hci_dev *hdev, struct sk_buff *skb)
> __u8 status = *((__u8 *) skb->data);
> void *sent;
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_AUTH_ENABLE);
> if (!sent)
> @@ -269,7 +269,7 @@ static void hci_cc_write_encrypt_mode(struct hci_dev *hdev, struct sk_buff *skb)
> __u8 status = *((__u8 *) skb->data);
> void *sent;
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_ENCRYPT_MODE);
> if (!sent)
> @@ -293,7 +293,7 @@ static void hci_cc_write_scan_enable(struct hci_dev *hdev, struct sk_buff *skb)
> int old_pscan, old_iscan;
> void *sent;
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_SCAN_ENABLE);
> if (!sent)
> @@ -340,7 +340,7 @@ static void hci_cc_read_class_of_dev(struct hci_dev *hdev, struct sk_buff *skb)
> {
> struct hci_rp_read_class_of_dev *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> if (rp->status)
> return;
> @@ -356,7 +356,7 @@ static void hci_cc_write_class_of_dev(struct hci_dev *hdev, struct sk_buff *skb)
> __u8 status = *((__u8 *) skb->data);
> void *sent;
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_CLASS_OF_DEV);
> if (!sent)
> @@ -378,7 +378,7 @@ static void hci_cc_read_voice_setting(struct hci_dev *hdev, struct sk_buff *skb)
> struct hci_rp_read_voice_setting *rp = (void *) skb->data;
> __u16 setting;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> if (rp->status)
> return;
> @@ -390,7 +390,7 @@ static void hci_cc_read_voice_setting(struct hci_dev *hdev, struct sk_buff *skb)
>
> hdev->voice_setting = setting;
>
> - BT_DBG("%s voice setting 0x%04x", hdev->name, setting);
> + BT_DBG("%s voice setting 0x%4.4x", hdev->name, setting);
>
> if (hdev->notify)
> hdev->notify(hdev, HCI_NOTIFY_VOICE_SETTING);
> @@ -403,7 +403,7 @@ static void hci_cc_write_voice_setting(struct hci_dev *hdev,
> __u16 setting;
> void *sent;
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> if (status)
> return;
> @@ -419,7 +419,7 @@ static void hci_cc_write_voice_setting(struct hci_dev *hdev,
>
> hdev->voice_setting = setting;
>
> - BT_DBG("%s voice setting 0x%04x", hdev->name, setting);
> + BT_DBG("%s voice setting 0x%4.4x", hdev->name, setting);
>
> if (hdev->notify)
> 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)
> {
> __u8 status = *((__u8 *) skb->data);
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> hci_req_complete(hdev, HCI_OP_HOST_BUFFER_SIZE, status);
> }
> @@ -439,7 +439,7 @@ static void hci_cc_write_ssp_mode(struct hci_dev *hdev, struct sk_buff *skb)
> __u8 status = *((__u8 *) skb->data);
> void *sent;
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_SSP_MODE);
> if (!sent)
> @@ -597,7 +597,7 @@ static void hci_cc_read_local_version(struct hci_dev *hdev, struct sk_buff *skb)
> {
> struct hci_rp_read_local_version *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> if (rp->status)
> goto done;
> @@ -608,7 +608,7 @@ static void hci_cc_read_local_version(struct hci_dev *hdev, struct sk_buff *skb)
> hdev->manufacturer = __le16_to_cpu(rp->manufacturer);
> hdev->lmp_subver = __le16_to_cpu(rp->lmp_subver);
>
> - BT_DBG("%s manufacturer %d hci ver %d:%d", hdev->name,
> + BT_DBG("%s manufacturer 0x%4.4x hci ver %d:%d", hdev->name,
> hdev->manufacturer, hdev->hci_ver, hdev->hci_rev);
>
> if (test_bit(HCI_INIT, &hdev->flags))
> @@ -641,7 +641,7 @@ static void hci_cc_read_local_commands(struct hci_dev *hdev,
> {
> struct hci_rp_read_local_commands *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> if (rp->status)
> goto done;
> @@ -660,7 +660,7 @@ static void hci_cc_read_local_features(struct hci_dev *hdev,
> {
> struct hci_rp_read_local_features *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> if (rp->status)
> return;
> @@ -732,7 +732,7 @@ static void hci_cc_read_local_ext_features(struct hci_dev *hdev,
> {
> struct hci_rp_read_local_ext_features *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> if (rp->status)
> goto done;
> @@ -758,7 +758,7 @@ static void hci_cc_read_flow_control_mode(struct hci_dev *hdev,
> {
> struct hci_rp_read_flow_control_mode *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> if (rp->status)
> return;
> @@ -772,7 +772,7 @@ static void hci_cc_read_buffer_size(struct hci_dev *hdev, struct sk_buff *skb)
> {
> struct hci_rp_read_buffer_size *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> if (rp->status)
> return;
> @@ -798,7 +798,7 @@ static void hci_cc_read_bd_addr(struct hci_dev *hdev, struct sk_buff *skb)
> {
> struct hci_rp_read_bd_addr *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> if (!rp->status)
> bacpy(&hdev->bdaddr, &rp->bdaddr);
> @@ -811,7 +811,7 @@ static void hci_cc_read_data_block_size(struct hci_dev *hdev,
> {
> struct hci_rp_read_data_block_size *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> if (rp->status)
> return;
> @@ -832,7 +832,7 @@ static void hci_cc_write_ca_timeout(struct hci_dev *hdev, struct sk_buff *skb)
> {
> __u8 status = *((__u8 *) skb->data);
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> hci_req_complete(hdev, HCI_OP_WRITE_CA_TIMEOUT, status);
> }
> @@ -842,7 +842,7 @@ static void hci_cc_read_local_amp_info(struct hci_dev *hdev,
> {
> struct hci_rp_read_local_amp_info *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> if (rp->status)
> return;
> @@ -866,7 +866,7 @@ static void hci_cc_delete_stored_link_key(struct hci_dev *hdev,
> {
> __u8 status = *((__u8 *) skb->data);
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> hci_req_complete(hdev, HCI_OP_DELETE_STORED_LINK_KEY, status);
> }
> @@ -875,7 +875,7 @@ static void hci_cc_set_event_mask(struct hci_dev *hdev, struct sk_buff *skb)
> {
> __u8 status = *((__u8 *) skb->data);
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> hci_req_complete(hdev, HCI_OP_SET_EVENT_MASK, status);
> }
> @@ -885,7 +885,7 @@ static void hci_cc_write_inquiry_mode(struct hci_dev *hdev,
> {
> __u8 status = *((__u8 *) skb->data);
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> hci_req_complete(hdev, HCI_OP_WRITE_INQUIRY_MODE, status);
> }
> @@ -895,7 +895,7 @@ static void hci_cc_read_inq_rsp_tx_power(struct hci_dev *hdev,
> {
> struct hci_rp_read_inq_rsp_tx_power *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> if (!rp->status)
> 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)
> {
> __u8 status = *((__u8 *) skb->data);
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> hci_req_complete(hdev, HCI_OP_SET_EVENT_FLT, status);
> }
> @@ -918,7 +918,7 @@ static void hci_cc_pin_code_reply(struct hci_dev *hdev, struct sk_buff *skb)
> struct hci_cp_pin_code_reply *cp;
> struct hci_conn *conn;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> hci_dev_lock(hdev);
>
> @@ -944,7 +944,7 @@ static void hci_cc_pin_code_neg_reply(struct hci_dev *hdev, struct sk_buff *skb)
> {
> struct hci_rp_pin_code_neg_reply *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> hci_dev_lock(hdev);
>
> @@ -960,7 +960,7 @@ static void hci_cc_le_read_buffer_size(struct hci_dev *hdev,
> {
> struct hci_rp_le_read_buffer_size *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> if (rp->status)
> return;
> @@ -979,7 +979,7 @@ static void hci_cc_user_confirm_reply(struct hci_dev *hdev, struct sk_buff *skb)
> {
> struct hci_rp_user_confirm_reply *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> hci_dev_lock(hdev);
>
> @@ -995,7 +995,7 @@ static void hci_cc_user_confirm_neg_reply(struct hci_dev *hdev,
> {
> struct hci_rp_user_confirm_reply *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> hci_dev_lock(hdev);
>
> @@ -1010,7 +1010,7 @@ static void hci_cc_user_passkey_reply(struct hci_dev *hdev, struct sk_buff *skb)
> {
> struct hci_rp_user_confirm_reply *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> hci_dev_lock(hdev);
>
> @@ -1026,7 +1026,7 @@ static void hci_cc_user_passkey_neg_reply(struct hci_dev *hdev,
> {
> struct hci_rp_user_confirm_reply *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> hci_dev_lock(hdev);
>
> @@ -1042,7 +1042,7 @@ static void hci_cc_read_local_oob_data_reply(struct hci_dev *hdev,
> {
> struct hci_rp_read_local_oob_data *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> hci_dev_lock(hdev);
> 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)
> {
> __u8 status = *((__u8 *) skb->data);
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> hci_req_complete(hdev, HCI_OP_LE_SET_SCAN_PARAM, status);
>
> @@ -1072,7 +1072,7 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
> struct hci_cp_le_set_scan_enable *cp;
> __u8 status = *((__u8 *) skb->data);
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_SCAN_ENABLE);
> if (!cp)
> @@ -1127,7 +1127,7 @@ static void hci_cc_le_ltk_reply(struct hci_dev *hdev, struct sk_buff *skb)
> {
> struct hci_rp_le_ltk_reply *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> if (rp->status)
> return;
> @@ -1139,7 +1139,7 @@ static void hci_cc_le_ltk_neg_reply(struct hci_dev *hdev, struct sk_buff *skb)
> {
> struct hci_rp_le_ltk_neg_reply *rp = (void *) skb->data;
>
> - BT_DBG("%s status 0x%x", hdev->name, rp->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
>
> if (rp->status)
> return;
> @@ -1153,7 +1153,7 @@ static void hci_cc_write_le_host_supported(struct hci_dev *hdev,
> struct hci_cp_write_le_host_supported *sent;
> __u8 status = *((__u8 *) skb->data);
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_LE_HOST_SUPPORTED);
> if (!sent)
> @@ -1175,7 +1175,7 @@ static void hci_cc_write_le_host_supported(struct hci_dev *hdev,
>
> static void hci_cs_inquiry(struct hci_dev *hdev, __u8 status)
> {
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> if (status) {
> hci_req_complete(hdev, HCI_OP_INQUIRY, status);
> @@ -1199,7 +1199,7 @@ static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)
> struct hci_cp_create_conn *cp;
> struct hci_conn *conn;
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> cp = hci_sent_cmd_data(hdev, HCI_OP_CREATE_CONN);
> if (!cp)
> @@ -1209,7 +1209,7 @@ static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)
>
> conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->bdaddr);
>
> - BT_DBG("%s bdaddr %pMR conn %p", hdev->name, &cp->bdaddr, conn);
> + BT_DBG("%s bdaddr %pMR hcon %p", hdev->name, &cp->bdaddr, conn);
>
> if (status) {
> if (conn && conn->state == BT_CONNECT) {
> @@ -1240,7 +1240,7 @@ static void hci_cs_add_sco(struct hci_dev *hdev, __u8 status)
> struct hci_conn *acl, *sco;
> __u16 handle;
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> if (!status)
> return;
> @@ -1251,7 +1251,7 @@ static void hci_cs_add_sco(struct hci_dev *hdev, __u8 status)
>
> handle = __le16_to_cpu(cp->handle);
>
> - BT_DBG("%s handle %d", hdev->name, handle);
> + BT_DBG("%s handle 0x%4.4x", hdev->name, handle);
>
> hci_dev_lock(hdev);
>
> @@ -1274,7 +1274,7 @@ static void hci_cs_auth_requested(struct hci_dev *hdev, __u8 status)
> struct hci_cp_auth_requested *cp;
> struct hci_conn *conn;
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> if (!status)
> return;
> @@ -1301,7 +1301,7 @@ static void hci_cs_set_conn_encrypt(struct hci_dev *hdev, __u8 status)
> struct hci_cp_set_conn_encrypt *cp;
> struct hci_conn *conn;
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> if (!status)
> return;
> @@ -1413,7 +1413,7 @@ static void hci_cs_remote_name_req(struct hci_dev *hdev, __u8 status)
> struct hci_cp_remote_name_req *cp;
> struct hci_conn *conn;
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> /* If successful wait for the name req complete event before
> * checking for the need to do authentication */
> @@ -1452,7 +1452,7 @@ static void hci_cs_read_remote_features(struct hci_dev *hdev, __u8 status)
> struct hci_cp_read_remote_features *cp;
> struct hci_conn *conn;
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> if (!status)
> return;
> @@ -1479,7 +1479,7 @@ static void hci_cs_read_remote_ext_features(struct hci_dev *hdev, __u8 status)
> struct hci_cp_read_remote_ext_features *cp;
> struct hci_conn *conn;
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> if (!status)
> return;
> @@ -1507,7 +1507,7 @@ static void hci_cs_setup_sync_conn(struct hci_dev *hdev, __u8 status)
> struct hci_conn *acl, *sco;
> __u16 handle;
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> if (!status)
> return;
> @@ -1518,7 +1518,7 @@ static void hci_cs_setup_sync_conn(struct hci_dev *hdev, __u8 status)
>
> handle = __le16_to_cpu(cp->handle);
>
> - BT_DBG("%s handle %d", hdev->name, handle);
> + BT_DBG("%s handle 0x%4.4x", hdev->name, handle);
>
> hci_dev_lock(hdev);
>
> @@ -1541,7 +1541,7 @@ static void hci_cs_sniff_mode(struct hci_dev *hdev, __u8 status)
> struct hci_cp_sniff_mode *cp;
> struct hci_conn *conn;
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> if (!status)
> return;
> @@ -1568,7 +1568,7 @@ static void hci_cs_exit_sniff_mode(struct hci_dev *hdev, __u8 status)
> struct hci_cp_exit_sniff_mode *cp;
> struct hci_conn *conn;
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> if (!status)
> return;
> @@ -1617,7 +1617,7 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, __u8 status)
> struct hci_cp_le_create_conn *cp;
> struct hci_conn *conn;
>
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> cp = hci_sent_cmd_data(hdev, HCI_OP_LE_CREATE_CONN);
> if (!cp)
> @@ -1654,7 +1654,7 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, __u8 status)
>
> static void hci_cs_le_start_enc(struct hci_dev *hdev, u8 status)
> {
> - BT_DBG("%s status 0x%x", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
> }
>
> static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
> @@ -1663,7 +1663,7 @@ static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
> struct discovery_state *discov = &hdev->discovery;
> struct inquiry_entry *e;
>
> - BT_DBG("%s status %d", hdev->name, status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, status);
>
> hci_req_complete(hdev, HCI_OP_INQUIRY, status);
>
> @@ -1892,7 +1892,7 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
> struct hci_ev_disconn_complete *ev = (void *) skb->data;
> struct hci_conn *conn;
>
> - BT_DBG("%s status %d", hdev->name, ev->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
>
> hci_dev_lock(hdev);
>
> @@ -1929,7 +1929,7 @@ static void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
> struct hci_ev_auth_complete *ev = (void *) skb->data;
> struct hci_conn *conn;
>
> - BT_DBG("%s status %d", hdev->name, ev->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
>
> hci_dev_lock(hdev);
>
> @@ -2034,7 +2034,7 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
> struct hci_ev_encrypt_change *ev = (void *) skb->data;
> struct hci_conn *conn;
>
> - BT_DBG("%s status %d", hdev->name, ev->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
>
> hci_dev_lock(hdev);
>
> @@ -2078,7 +2078,7 @@ static void hci_change_link_key_complete_evt(struct hci_dev *hdev,
> struct hci_ev_change_link_key_complete *ev = (void *) skb->data;
> struct hci_conn *conn;
>
> - BT_DBG("%s status %d", hdev->name, ev->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
>
> hci_dev_lock(hdev);
>
> @@ -2101,7 +2101,7 @@ static void hci_remote_features_evt(struct hci_dev *hdev,
> struct hci_ev_remote_features *ev = (void *) skb->data;
> struct hci_conn *conn;
>
> - BT_DBG("%s status %d", hdev->name, ev->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
>
> hci_dev_lock(hdev);
>
> @@ -2363,7 +2363,7 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
> break;
>
> default:
> - BT_DBG("%s opcode 0x%x", hdev->name, opcode);
> + BT_DBG("%s opcode 0x%4.4x", hdev->name, opcode);
> break;
> }
>
> @@ -2444,7 +2444,7 @@ static void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb)
> break;
>
> default:
> - BT_DBG("%s opcode 0x%x", hdev->name, opcode);
> + BT_DBG("%s opcode 0x%4.4x", hdev->name, opcode);
> break;
> }
>
> @@ -2463,7 +2463,7 @@ static void hci_role_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
> struct hci_ev_role_change *ev = (void *) skb->data;
> struct hci_conn *conn;
>
> - BT_DBG("%s status %d", hdev->name, ev->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
>
> hci_dev_lock(hdev);
>
> @@ -2604,7 +2604,7 @@ static void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
> struct hci_ev_mode_change *ev = (void *) skb->data;
> struct hci_conn *conn;
>
> - BT_DBG("%s status %d", hdev->name, ev->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
>
> hci_dev_lock(hdev);
>
> @@ -2762,7 +2762,7 @@ static void hci_clock_offset_evt(struct hci_dev *hdev, struct sk_buff *skb)
> struct hci_ev_clock_offset *ev = (void *) skb->data;
> struct hci_conn *conn;
>
> - BT_DBG("%s status %d", hdev->name, ev->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
>
> hci_dev_lock(hdev);
>
> @@ -2785,7 +2785,7 @@ static void hci_pkt_type_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
> struct hci_ev_pkt_type_change *ev = (void *) skb->data;
> struct hci_conn *conn;
>
> - BT_DBG("%s status %d", hdev->name, ev->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
>
> hci_dev_lock(hdev);
>
> @@ -2929,7 +2929,7 @@ static void hci_sync_conn_complete_evt(struct hci_dev *hdev,
> struct hci_ev_sync_conn_complete *ev = (void *) skb->data;
> struct hci_conn *conn;
>
> - BT_DBG("%s status %d", hdev->name, ev->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
>
> hci_dev_lock(hdev);
>
> @@ -2988,7 +2988,7 @@ static void hci_sniff_subrate_evt(struct hci_dev *hdev, struct sk_buff *skb)
> {
> struct hci_ev_sniff_subrate *ev = (void *) skb->data;
>
> - BT_DBG("%s status %d", hdev->name, ev->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
> }
>
> static void hci_extended_inquiry_result_evt(struct hci_dev *hdev,
> @@ -3045,7 +3045,7 @@ static void hci_key_refresh_complete_evt(struct hci_dev *hdev,
> struct hci_ev_key_refresh_complete *ev = (void *) skb->data;
> struct hci_conn *conn;
>
> - BT_DBG("%s status %u handle %u", hdev->name, ev->status,
> + BT_DBG("%s status 0x%2.2x handle 0x%4.4x", hdev->name, ev->status,
> __le16_to_cpu(ev->handle));
>
> hci_dev_lock(hdev);
> @@ -3345,7 +3345,7 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
> struct hci_ev_le_conn_complete *ev = (void *) skb->data;
> struct hci_conn *conn;
>
> - BT_DBG("%s status %d", hdev->name, ev->status);
> + BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
>
> hci_dev_lock(hdev);
>
> @@ -3420,7 +3420,7 @@ static void hci_le_ltk_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
> struct hci_conn *conn;
> struct smp_ltk *ltk;
>
> - BT_DBG("%s handle %d", hdev->name, __le16_to_cpu(ev->handle));
> + BT_DBG("%s handle 0x%4.4x", hdev->name, __le16_to_cpu(ev->handle));
>
> hci_dev_lock(hdev);
>
> @@ -3644,7 +3644,7 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb)
> break;
>
> default:
> - BT_DBG("%s event 0x%x", hdev->name, event);
> + BT_DBG("%s event 0x%2.2x", hdev->name, event);
> break;
> }
This patch doesn't apply anymore, it needs rebase.
Gustavo
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 7/7] Bluetooth: debug: Add debug to l2cap_security_cfm
2012-07-10 12:27 ` [PATCH 7/7] Bluetooth: debug: Add debug to l2cap_security_cfm Andrei Emeltchenko
@ 2012-07-10 18:44 ` Gustavo Padovan
0 siblings, 0 replies; 17+ messages in thread
From: Gustavo Padovan @ 2012-07-10 18:44 UTC (permalink / raw)
To: Andrei Emeltchenko; +Cc: linux-bluetooth
Hi Andrei,
* Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com> [2012-07-10 15:27:51 +0300]:
> From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
>
>
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> ---
> net/bluetooth/l2cap_core.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
Patch 3,5,6 and 7 were applied to bluetooth-next. Thanks.
Gustavo
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH] Bluetooth: debug: Use standard hex object specifiers in hci_event
2012-07-10 18:38 ` Gustavo Padovan
@ 2012-07-11 11:32 ` Andrei Emeltchenko
2012-07-11 13:07 ` Gustavo Padovan
0 siblings, 1 reply; 17+ messages in thread
From: Andrei Emeltchenko @ 2012-07-11 11:32 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
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>
---
net/bluetooth/hci_event.c | 170 ++++++++++++++++++++++-----------------------
1 file changed, 85 insertions(+), 85 deletions(-)
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 1ba929c..41ff978 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)
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (status) {
hci_dev_lock(hdev);
@@ -60,7 +60,7 @@ static void hci_cc_periodic_inq(struct hci_dev *hdev, struct sk_buff *skb)
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (status)
return;
@@ -72,7 +72,7 @@ static void hci_cc_exit_periodic_inq(struct hci_dev *hdev, struct sk_buff *skb)
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (status)
return;
@@ -93,7 +93,7 @@ static void hci_cc_role_discovery(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_rp_role_discovery *rp = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -116,7 +116,7 @@ static void hci_cc_read_link_policy(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_rp_read_link_policy *rp = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -136,7 +136,7 @@ static void hci_cc_write_link_policy(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_conn *conn;
void *sent;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -159,7 +159,7 @@ static void hci_cc_read_def_link_policy(struct hci_dev *hdev,
{
struct hci_rp_read_def_link_policy *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -173,7 +173,7 @@ static void hci_cc_write_def_link_policy(struct hci_dev *hdev,
__u8 status = *((__u8 *) skb->data);
void *sent;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_DEF_LINK_POLICY);
if (!sent)
@@ -189,7 +189,7 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb)
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
clear_bit(HCI_RESET, &hdev->flags);
@@ -207,7 +207,7 @@ static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb)
__u8 status = *((__u8 *) skb->data);
void *sent;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_LOCAL_NAME);
if (!sent)
@@ -229,7 +229,7 @@ static void hci_cc_read_local_name(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_rp_read_local_name *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -243,7 +243,7 @@ static void hci_cc_write_auth_enable(struct hci_dev *hdev, struct sk_buff *skb)
__u8 status = *((__u8 *) skb->data);
void *sent;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_AUTH_ENABLE);
if (!sent)
@@ -269,7 +269,7 @@ static void hci_cc_write_encrypt_mode(struct hci_dev *hdev, struct sk_buff *skb)
__u8 status = *((__u8 *) skb->data);
void *sent;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_ENCRYPT_MODE);
if (!sent)
@@ -293,7 +293,7 @@ static void hci_cc_write_scan_enable(struct hci_dev *hdev, struct sk_buff *skb)
int old_pscan, old_iscan;
void *sent;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_SCAN_ENABLE);
if (!sent)
@@ -340,7 +340,7 @@ static void hci_cc_read_class_of_dev(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_rp_read_class_of_dev *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -356,7 +356,7 @@ static void hci_cc_write_class_of_dev(struct hci_dev *hdev, struct sk_buff *skb)
__u8 status = *((__u8 *) skb->data);
void *sent;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_CLASS_OF_DEV);
if (!sent)
@@ -378,7 +378,7 @@ static void hci_cc_read_voice_setting(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_rp_read_voice_setting *rp = (void *) skb->data;
__u16 setting;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -390,7 +390,7 @@ static void hci_cc_read_voice_setting(struct hci_dev *hdev, struct sk_buff *skb)
hdev->voice_setting = setting;
- BT_DBG("%s voice setting 0x%04x", hdev->name, setting);
+ BT_DBG("%s voice setting 0x%4.4x", hdev->name, setting);
if (hdev->notify)
hdev->notify(hdev, HCI_NOTIFY_VOICE_SETTING);
@@ -403,7 +403,7 @@ static void hci_cc_write_voice_setting(struct hci_dev *hdev,
__u16 setting;
void *sent;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (status)
return;
@@ -419,7 +419,7 @@ static void hci_cc_write_voice_setting(struct hci_dev *hdev,
hdev->voice_setting = setting;
- BT_DBG("%s voice setting 0x%04x", hdev->name, setting);
+ BT_DBG("%s voice setting 0x%4.4x", hdev->name, setting);
if (hdev->notify)
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)
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
hci_req_complete(hdev, HCI_OP_HOST_BUFFER_SIZE, status);
}
@@ -439,7 +439,7 @@ static void hci_cc_write_ssp_mode(struct hci_dev *hdev, struct sk_buff *skb)
__u8 status = *((__u8 *) skb->data);
void *sent;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_SSP_MODE);
if (!sent)
@@ -597,7 +597,7 @@ static void hci_cc_read_local_version(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_rp_read_local_version *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
goto done;
@@ -608,7 +608,7 @@ static void hci_cc_read_local_version(struct hci_dev *hdev, struct sk_buff *skb)
hdev->manufacturer = __le16_to_cpu(rp->manufacturer);
hdev->lmp_subver = __le16_to_cpu(rp->lmp_subver);
- BT_DBG("%s manufacturer %d hci ver %d:%d", hdev->name,
+ BT_DBG("%s manufacturer 0x%4.4x hci ver %d:%d", hdev->name,
hdev->manufacturer, hdev->hci_ver, hdev->hci_rev);
if (test_bit(HCI_INIT, &hdev->flags))
@@ -641,7 +641,7 @@ static void hci_cc_read_local_commands(struct hci_dev *hdev,
{
struct hci_rp_read_local_commands *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
goto done;
@@ -660,7 +660,7 @@ static void hci_cc_read_local_features(struct hci_dev *hdev,
{
struct hci_rp_read_local_features *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -732,7 +732,7 @@ static void hci_cc_read_local_ext_features(struct hci_dev *hdev,
{
struct hci_rp_read_local_ext_features *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
goto done;
@@ -758,7 +758,7 @@ static void hci_cc_read_flow_control_mode(struct hci_dev *hdev,
{
struct hci_rp_read_flow_control_mode *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -772,7 +772,7 @@ static void hci_cc_read_buffer_size(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_rp_read_buffer_size *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -798,7 +798,7 @@ static void hci_cc_read_bd_addr(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_rp_read_bd_addr *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (!rp->status)
bacpy(&hdev->bdaddr, &rp->bdaddr);
@@ -811,7 +811,7 @@ static void hci_cc_read_data_block_size(struct hci_dev *hdev,
{
struct hci_rp_read_data_block_size *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -832,7 +832,7 @@ static void hci_cc_write_ca_timeout(struct hci_dev *hdev, struct sk_buff *skb)
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
hci_req_complete(hdev, HCI_OP_WRITE_CA_TIMEOUT, status);
}
@@ -842,7 +842,7 @@ static void hci_cc_read_local_amp_info(struct hci_dev *hdev,
{
struct hci_rp_read_local_amp_info *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -866,7 +866,7 @@ static void hci_cc_delete_stored_link_key(struct hci_dev *hdev,
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
hci_req_complete(hdev, HCI_OP_DELETE_STORED_LINK_KEY, status);
}
@@ -875,7 +875,7 @@ static void hci_cc_set_event_mask(struct hci_dev *hdev, struct sk_buff *skb)
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
hci_req_complete(hdev, HCI_OP_SET_EVENT_MASK, status);
}
@@ -885,7 +885,7 @@ static void hci_cc_write_inquiry_mode(struct hci_dev *hdev,
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
hci_req_complete(hdev, HCI_OP_WRITE_INQUIRY_MODE, status);
}
@@ -895,7 +895,7 @@ static void hci_cc_read_inq_rsp_tx_power(struct hci_dev *hdev,
{
struct hci_rp_read_inq_rsp_tx_power *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (!rp->status)
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)
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
hci_req_complete(hdev, HCI_OP_SET_EVENT_FLT, status);
}
@@ -918,7 +918,7 @@ static void hci_cc_pin_code_reply(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_cp_pin_code_reply *cp;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
hci_dev_lock(hdev);
@@ -944,7 +944,7 @@ static void hci_cc_pin_code_neg_reply(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_rp_pin_code_neg_reply *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
hci_dev_lock(hdev);
@@ -960,7 +960,7 @@ static void hci_cc_le_read_buffer_size(struct hci_dev *hdev,
{
struct hci_rp_le_read_buffer_size *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -979,7 +979,7 @@ static void hci_cc_user_confirm_reply(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_rp_user_confirm_reply *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
hci_dev_lock(hdev);
@@ -995,7 +995,7 @@ static void hci_cc_user_confirm_neg_reply(struct hci_dev *hdev,
{
struct hci_rp_user_confirm_reply *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
hci_dev_lock(hdev);
@@ -1010,7 +1010,7 @@ static void hci_cc_user_passkey_reply(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_rp_user_confirm_reply *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
hci_dev_lock(hdev);
@@ -1026,7 +1026,7 @@ static void hci_cc_user_passkey_neg_reply(struct hci_dev *hdev,
{
struct hci_rp_user_confirm_reply *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
hci_dev_lock(hdev);
@@ -1042,7 +1042,7 @@ static void hci_cc_read_local_oob_data_reply(struct hci_dev *hdev,
{
struct hci_rp_read_local_oob_data *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
hci_dev_lock(hdev);
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)
{
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
hci_req_complete(hdev, HCI_OP_LE_SET_SCAN_PARAM, status);
@@ -1072,7 +1072,7 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
struct hci_cp_le_set_scan_enable *cp;
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_SCAN_ENABLE);
if (!cp)
@@ -1127,7 +1127,7 @@ static void hci_cc_le_ltk_reply(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_rp_le_ltk_reply *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -1139,7 +1139,7 @@ static void hci_cc_le_ltk_neg_reply(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_rp_le_ltk_neg_reply *rp = (void *) skb->data;
- BT_DBG("%s status 0x%x", hdev->name, rp->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
if (rp->status)
return;
@@ -1153,7 +1153,7 @@ static void hci_cc_write_le_host_supported(struct hci_dev *hdev,
struct hci_cp_write_le_host_supported *sent;
__u8 status = *((__u8 *) skb->data);
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_LE_HOST_SUPPORTED);
if (!sent)
@@ -1175,7 +1175,7 @@ static void hci_cc_write_le_host_supported(struct hci_dev *hdev,
static void hci_cs_inquiry(struct hci_dev *hdev, __u8 status)
{
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (status) {
hci_req_complete(hdev, HCI_OP_INQUIRY, status);
@@ -1199,7 +1199,7 @@ static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)
struct hci_cp_create_conn *cp;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
cp = hci_sent_cmd_data(hdev, HCI_OP_CREATE_CONN);
if (!cp)
@@ -1209,7 +1209,7 @@ static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)
conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->bdaddr);
- BT_DBG("%s bdaddr %s conn %p", hdev->name, batostr(&cp->bdaddr), conn);
+ BT_DBG("%s bdaddr %s hcon %p", hdev->name, batostr(&cp->bdaddr), conn);
if (status) {
if (conn && conn->state == BT_CONNECT) {
@@ -1240,7 +1240,7 @@ static void hci_cs_add_sco(struct hci_dev *hdev, __u8 status)
struct hci_conn *acl, *sco;
__u16 handle;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (!status)
return;
@@ -1251,7 +1251,7 @@ static void hci_cs_add_sco(struct hci_dev *hdev, __u8 status)
handle = __le16_to_cpu(cp->handle);
- BT_DBG("%s handle %d", hdev->name, handle);
+ BT_DBG("%s handle 0x%4.4x", hdev->name, handle);
hci_dev_lock(hdev);
@@ -1274,7 +1274,7 @@ static void hci_cs_auth_requested(struct hci_dev *hdev, __u8 status)
struct hci_cp_auth_requested *cp;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (!status)
return;
@@ -1301,7 +1301,7 @@ static void hci_cs_set_conn_encrypt(struct hci_dev *hdev, __u8 status)
struct hci_cp_set_conn_encrypt *cp;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (!status)
return;
@@ -1413,7 +1413,7 @@ static void hci_cs_remote_name_req(struct hci_dev *hdev, __u8 status)
struct hci_cp_remote_name_req *cp;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
/* If successful wait for the name req complete event before
* checking for the need to do authentication */
@@ -1452,7 +1452,7 @@ static void hci_cs_read_remote_features(struct hci_dev *hdev, __u8 status)
struct hci_cp_read_remote_features *cp;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (!status)
return;
@@ -1479,7 +1479,7 @@ static void hci_cs_read_remote_ext_features(struct hci_dev *hdev, __u8 status)
struct hci_cp_read_remote_ext_features *cp;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (!status)
return;
@@ -1507,7 +1507,7 @@ static void hci_cs_setup_sync_conn(struct hci_dev *hdev, __u8 status)
struct hci_conn *acl, *sco;
__u16 handle;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (!status)
return;
@@ -1518,7 +1518,7 @@ static void hci_cs_setup_sync_conn(struct hci_dev *hdev, __u8 status)
handle = __le16_to_cpu(cp->handle);
- BT_DBG("%s handle %d", hdev->name, handle);
+ BT_DBG("%s handle 0x%4.4x", hdev->name, handle);
hci_dev_lock(hdev);
@@ -1541,7 +1541,7 @@ static void hci_cs_sniff_mode(struct hci_dev *hdev, __u8 status)
struct hci_cp_sniff_mode *cp;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (!status)
return;
@@ -1568,7 +1568,7 @@ static void hci_cs_exit_sniff_mode(struct hci_dev *hdev, __u8 status)
struct hci_cp_exit_sniff_mode *cp;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
if (!status)
return;
@@ -1617,7 +1617,7 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, __u8 status)
struct hci_cp_le_create_conn *cp;
struct hci_conn *conn;
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
cp = hci_sent_cmd_data(hdev, HCI_OP_LE_CREATE_CONN);
if (!cp)
@@ -1655,7 +1655,7 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, __u8 status)
static void hci_cs_le_start_enc(struct hci_dev *hdev, u8 status)
{
- BT_DBG("%s status 0x%x", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
}
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)
struct discovery_state *discov = &hdev->discovery;
struct inquiry_entry *e;
- BT_DBG("%s status %d", hdev->name, status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, status);
hci_req_complete(hdev, HCI_OP_INQUIRY, status);
@@ -1893,7 +1893,7 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_ev_disconn_complete *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -1930,7 +1930,7 @@ static void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_ev_auth_complete *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -2035,7 +2035,7 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_ev_encrypt_change *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -2079,7 +2079,7 @@ static void hci_change_link_key_complete_evt(struct hci_dev *hdev,
struct hci_ev_change_link_key_complete *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -2102,7 +2102,7 @@ static void hci_remote_features_evt(struct hci_dev *hdev,
struct hci_ev_remote_features *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -2364,7 +2364,7 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
break;
default:
- BT_DBG("%s opcode 0x%x", hdev->name, opcode);
+ BT_DBG("%s opcode 0x%4.4x", hdev->name, opcode);
break;
}
@@ -2445,7 +2445,7 @@ static void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb)
break;
default:
- BT_DBG("%s opcode 0x%x", hdev->name, opcode);
+ BT_DBG("%s opcode 0x%4.4x", hdev->name, opcode);
break;
}
@@ -2464,7 +2464,7 @@ static void hci_role_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_ev_role_change *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -2605,7 +2605,7 @@ static void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_ev_mode_change *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -2763,7 +2763,7 @@ static void hci_clock_offset_evt(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_ev_clock_offset *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -2786,7 +2786,7 @@ static void hci_pkt_type_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_ev_pkt_type_change *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -2930,7 +2930,7 @@ static void hci_sync_conn_complete_evt(struct hci_dev *hdev,
struct hci_ev_sync_conn_complete *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -2989,7 +2989,7 @@ static void hci_sniff_subrate_evt(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_ev_sniff_subrate *ev = (void *) skb->data;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
}
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,
struct hci_ev_key_refresh_complete *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %u handle %u", hdev->name, ev->status,
+ BT_DBG("%s status 0x%2.2x handle 0x%4.4x", hdev->name, ev->status,
__le16_to_cpu(ev->handle));
hci_dev_lock(hdev);
@@ -3346,7 +3346,7 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_ev_le_conn_complete *ev = (void *) skb->data;
struct hci_conn *conn;
- BT_DBG("%s status %d", hdev->name, ev->status);
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
hci_dev_lock(hdev);
@@ -3421,7 +3421,7 @@ static void hci_le_ltk_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
struct hci_conn *conn;
struct smp_ltk *ltk;
- BT_DBG("%s handle %d", hdev->name, __le16_to_cpu(ev->handle));
+ BT_DBG("%s handle 0x%4.4x", hdev->name, __le16_to_cpu(ev->handle));
hci_dev_lock(hdev);
@@ -3645,7 +3645,7 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb)
break;
default:
- BT_DBG("%s event 0x%x", hdev->name, event);
+ BT_DBG("%s event 0x%2.2x", hdev->name, event);
break;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 1/7] Bluetooth: debug: Print l2cap refcount
2012-07-10 18:33 ` Gustavo Padovan
@ 2012-07-11 11:37 ` Andrei Emeltchenko
2012-07-11 11:43 ` [PATCH 1/2] Bluetooth: debug: Print l2cap_chan refcount Andrei Emeltchenko
1 sibling, 0 replies; 17+ messages in thread
From: Andrei Emeltchenko @ 2012-07-11 11:37 UTC (permalink / raw)
To: Gustavo Padovan, linux-bluetooth
Hi Gustavo,
On Tue, Jul 10, 2012 at 03:33:33PM -0300, Gustavo Padovan wrote:
> > Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> > ---
> > include/net/bluetooth/l2cap.h | 6 ++++++
> > 1 file changed, 6 insertions(+)
> >
> > diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
> > index d80e3f0..dfe9374 100644
> > --- a/include/net/bluetooth/l2cap.h
> > +++ b/include/net/bluetooth/l2cap.h
> > @@ -672,11 +672,17 @@ enum {
> >
> > static inline void l2cap_chan_hold(struct l2cap_chan *c)
> > {
> > + BT_DBG("chan %p refcnt %d -> %d", c, atomic_read(&c->refcnt),
> > + atomic_read(&c->refcnt) + 1);
> > +
>
> We don't really need to call atomic_read() twice read. Just print the new
> value and the log reader has to figure it out.
The code looks better if I print original refcnt in a case chan_put and
also for kref cases with amp_mgr. I will send patches shortly.
Best regards
Andrei Emeltchenko
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 1/2] Bluetooth: debug: Print l2cap_chan refcount
2012-07-10 18:33 ` Gustavo Padovan
2012-07-11 11:37 ` Andrei Emeltchenko
@ 2012-07-11 11:43 ` Andrei Emeltchenko
2012-07-11 11:43 ` [PATCH 2/2] Bluetooth: debug: Print amp_mgr refcnt Andrei Emeltchenko
1 sibling, 1 reply; 17+ messages in thread
From: Andrei Emeltchenko @ 2012-07-11 11:43 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
include/net/bluetooth/l2cap.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index d80e3f0..e5164ff 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -672,11 +672,15 @@ enum {
static inline void l2cap_chan_hold(struct l2cap_chan *c)
{
+ BT_DBG("chan %p orig refcnt %d", c, atomic_read(&c->refcnt));
+
atomic_inc(&c->refcnt);
}
static inline void l2cap_chan_put(struct l2cap_chan *c)
{
+ BT_DBG("chan %p orig refcnt %d", c, atomic_read(&c->refcnt));
+
if (atomic_dec_and_test(&c->refcnt))
kfree(c);
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 2/2] Bluetooth: debug: Print amp_mgr refcnt
2012-07-11 11:43 ` [PATCH 1/2] Bluetooth: debug: Print l2cap_chan refcount Andrei Emeltchenko
@ 2012-07-11 11:43 ` Andrei Emeltchenko
2012-07-11 13:10 ` Gustavo Padovan
0 siblings, 1 reply; 17+ messages in thread
From: Andrei Emeltchenko @ 2012-07-11 11:43 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
net/bluetooth/a2mp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
index fb93250..4ff0bf3 100644
--- a/net/bluetooth/a2mp.c
+++ b/net/bluetooth/a2mp.c
@@ -501,7 +501,7 @@ static struct l2cap_chan *a2mp_chan_open(struct l2cap_conn *conn)
/* AMP Manager functions */
void amp_mgr_get(struct amp_mgr *mgr)
{
- BT_DBG("mgr %p", mgr);
+ BT_DBG("mgr %p orig refcnt %d", mgr, atomic_read(&mgr->kref.refcount));
kref_get(&mgr->kref);
}
@@ -517,7 +517,7 @@ static void amp_mgr_destroy(struct kref *kref)
int amp_mgr_put(struct amp_mgr *mgr)
{
- BT_DBG("mgr %p", mgr);
+ BT_DBG("mgr %p orig refcnt %d", mgr, atomic_read(&mgr->kref.refcount));
return kref_put(&mgr->kref, &_mgr_destroy);
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH] Bluetooth: debug: Use standard hex object specifiers in hci_event
2012-07-11 11:32 ` [PATCH] Bluetooth: debug: Use standard hex object specifiers in hci_event Andrei Emeltchenko
@ 2012-07-11 13:07 ` Gustavo Padovan
0 siblings, 0 replies; 17+ messages in thread
From: Gustavo Padovan @ 2012-07-11 13:07 UTC (permalink / raw)
To: Andrei Emeltchenko; +Cc: linux-bluetooth
Hi Andrei,
* Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com> [2012-07-11 14:32:43 +0300]:
> From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
>
> 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>
> ---
> net/bluetooth/hci_event.c | 170 ++++++++++++++++++++++-----------------------
> 1 file changed, 85 insertions(+), 85 deletions(-)
Patch has been applied to bluetooth-next. Thanks.
Gustavo
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 2/2] Bluetooth: debug: Print amp_mgr refcnt
2012-07-11 11:43 ` [PATCH 2/2] Bluetooth: debug: Print amp_mgr refcnt Andrei Emeltchenko
@ 2012-07-11 13:10 ` Gustavo Padovan
0 siblings, 0 replies; 17+ messages in thread
From: Gustavo Padovan @ 2012-07-11 13:10 UTC (permalink / raw)
To: Andrei Emeltchenko; +Cc: linux-bluetooth
Hi Andrei,
* Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com> [2012-07-11 14:43:35 +0300]:
> From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
>
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> ---
> net/bluetooth/a2mp.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Both patches have been applied to bluetooth-next. Thanks.
Gustavo
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2012-07-11 13:10 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-10 12:27 [PATCH 0/7] Bluetooth: Correct debug code Andrei Emeltchenko
2012-07-10 12:27 ` [PATCH 1/7] Bluetooth: debug: Print l2cap refcount Andrei Emeltchenko
2012-07-10 18:33 ` Gustavo Padovan
2012-07-11 11:37 ` Andrei Emeltchenko
2012-07-11 11:43 ` [PATCH 1/2] Bluetooth: debug: Print l2cap_chan refcount Andrei Emeltchenko
2012-07-11 11:43 ` [PATCH 2/2] Bluetooth: debug: Print amp_mgr refcnt Andrei Emeltchenko
2012-07-11 13:10 ` Gustavo Padovan
2012-07-10 12:27 ` [PATCH 2/7] " Andrei Emeltchenko
2012-07-10 12:27 ` [PATCH 3/7] Bluetooth: debug: Add printing num of cmds queued Andrei Emeltchenko
2012-07-10 12:27 ` [PATCH 4/7] Bluetooth: debug: Use standard hex object specifier Andrei Emeltchenko
2012-07-10 18:38 ` Gustavo Padovan
2012-07-11 11:32 ` [PATCH] Bluetooth: debug: Use standard hex object specifiers in hci_event Andrei Emeltchenko
2012-07-11 13:07 ` Gustavo Padovan
2012-07-10 12:27 ` [PATCH 5/7] Bluetooth: debug: Correct types specifiers for L2CAP Andrei Emeltchenko
2012-07-10 12:27 ` [PATCH 6/7] Bluetooth: debug: Print CID and PSM in hex format Andrei Emeltchenko
2012-07-10 12:27 ` [PATCH 7/7] Bluetooth: debug: Add debug to l2cap_security_cfm Andrei Emeltchenko
2012-07-10 18:44 ` Gustavo Padovan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.