michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Use hexadecimal format when printing GATT handles

Browse source 
hexadecimal is the usual format when defining GATT handles values so
printing in the same format makes it easier to debug.

Change-Id: I6babcadaf5a4cffbac73db29c155343540cee120
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Luiz Augusto von Dentz 2015-06-17 13:50:29 +03:00 • committed by Anas Nashif
commit afc6628c26
2 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

41
net/bluetooth/att.c
View file

@ -188,7 +188,7 @@ static uint8_t find_info_cb(const struct bt_gatt_attr *attr, void *user_data)
struct find_info_data *data = user_data; struct find_info_data *data = user_data;
struct bt_att *att = data->conn->att; struct bt_att *att = data->conn->att;
BT_DBG("handle %u\n", attr->handle); BT_DBG("handle 0x%04x\n", attr->handle);
/* Initialize rsp at first entry */ /* Initialize rsp at first entry */
if (!data->rsp) { if (!data->rsp) {
@ -265,7 +265,8 @@ static uint8_t att_find_info_req(struct bt_conn *conn, struct bt_buf *data)
start_handle = sys_le16_to_cpu(req->start_handle); start_handle = sys_le16_to_cpu(req->start_handle);
end_handle = sys_le16_to_cpu(req->end_handle); end_handle = sys_le16_to_cpu(req->end_handle);
BT_DBG("start_handle %u end_handle %u\n", start_handle, end_handle); BT_DBG("start_handle 0x%04x end_handle 0x%04x\n", start_handle,
end_handle);
if (!range_is_valid(start_handle, end_handle, &err_handle)) { if (!range_is_valid(start_handle, end_handle, &err_handle)) {
send_err_rsp(conn, BT_ATT_OP_FIND_INFO_REQ, err_handle, send_err_rsp(conn, BT_ATT_OP_FIND_INFO_REQ, err_handle,
@ -299,7 +300,7 @@ static uint8_t find_type_cb(const struct bt_gatt_attr *attr, void *user_data)
return BT_GATT_ITER_CONTINUE; return BT_GATT_ITER_CONTINUE;
} }
BT_DBG("handle %u\n", attr->handle); BT_DBG("handle 0x%04x\n", attr->handle);
/* stop if there is no space left */ /* stop if there is no space left */
if (att->mtu - data->buf->len < sizeof(*data->group)) if (att->mtu - data->buf->len < sizeof(*data->group))
@ -371,7 +372,7 @@ static uint8_t att_find_type_req(struct bt_conn *conn, struct bt_buf *data)
type = sys_le16_to_cpu(req->type); type = sys_le16_to_cpu(req->type);
value = bt_buf_pull(data, sizeof(*req)); value = bt_buf_pull(data, sizeof(*req));
BT_DBG("start_handle %u end_handle %u type %u\n", start_handle, BT_DBG("start_handle 0x%04x end_handle 0x%04x type %u\n", start_handle,
end_handle, type); end_handle, type);
if (!range_is_valid(start_handle, end_handle, &err_handle)) { if (!range_is_valid(start_handle, end_handle, &err_handle)) {
@ -434,7 +435,7 @@ static uint8_t read_type_cb(const struct bt_gatt_attr *attr, void *user_data)
return BT_GATT_ITER_CONTINUE; return BT_GATT_ITER_CONTINUE;
} }
BT_DBG("handle %u\n", attr->handle); BT_DBG("handle 0x%04x\n", attr->handle);
/* Fast foward to next item position */ /* Fast foward to next item position */
data->item = bt_buf_add(data->buf, sizeof(*data->item)); data->item = bt_buf_add(data->buf, sizeof(*data->item));
@ -519,7 +520,7 @@ static uint8_t att_read_type_req(struct bt_conn *conn, struct bt_buf *data)
return BT_ATT_ERR_UNLIKELY; return BT_ATT_ERR_UNLIKELY;
} }
BT_DBG("start_handle %u end_handle %u type %u\n", BT_DBG("start_handle 0x%04x end_handle 0x%04x type %u\n",
start_handle, end_handle, uuid.u16); start_handle, end_handle, uuid.u16);
if (!range_is_valid(start_handle, end_handle, &err_handle)) { if (!range_is_valid(start_handle, end_handle, &err_handle)) {
@ -587,7 +588,7 @@ static uint8_t read_cb(const struct bt_gatt_attr *attr, void *user_data)
struct bt_att *att = data->conn->att; struct bt_att *att = data->conn->att;
int read; int read;
BT_DBG("handle %u\n", attr->handle); BT_DBG("handle 0x%04x\n", attr->handle);
data->rsp = bt_buf_add(data->buf, sizeof(*data->rsp)); data->rsp = bt_buf_add(data->buf, sizeof(*data->rsp));
@ -667,7 +668,7 @@ static uint8_t att_read_req(struct bt_conn *conn, struct bt_buf *data)
handle = sys_le16_to_cpu(req->handle); handle = sys_le16_to_cpu(req->handle);
BT_DBG("handle %u\n", handle); BT_DBG("handle 0x%04x\n", handle);
return att_read_rsp(conn, BT_ATT_OP_READ_REQ, BT_ATT_OP_READ_RSP, return att_read_rsp(conn, BT_ATT_OP_READ_REQ, BT_ATT_OP_READ_RSP,
&handle, 1, 0); &handle, 1, 0);
@ -683,7 +684,7 @@ static uint8_t att_read_blob_req(struct bt_conn *conn, struct bt_buf *data)
handle = sys_le16_to_cpu(req->handle); handle = sys_le16_to_cpu(req->handle);
offset = sys_le16_to_cpu(req->offset); offset = sys_le16_to_cpu(req->offset);
BT_DBG("handle %u offset %u\n", handle, offset); BT_DBG("handle 0x%04x offset %u\n", handle, offset);
return att_read_rsp(conn, BT_ATT_OP_READ_BLOB_REQ, return att_read_rsp(conn, BT_ATT_OP_READ_BLOB_REQ,
BT_ATT_OP_READ_BLOB_RSP, &handle, 1, offset); BT_ATT_OP_READ_BLOB_RSP, &handle, 1, offset);
@ -704,13 +705,13 @@ static uint8_t att_read_mult_req(struct bt_conn *conn, struct bt_buf *data)
handles[0] = sys_le16_to_cpu(req->handle1); handles[0] = sys_le16_to_cpu(req->handle1);
handles[1] = sys_le16_to_cpu(req->handle2); handles[1] = sys_le16_to_cpu(req->handle2);
BT_DBG("handle1 %u handle2 %u\n", handles[0], handles[1]); BT_DBG("handle1 0x%04x handle2 0x%04x\n", handles[0], handles[1]);
bt_buf_pull(data, sizeof(*req)); bt_buf_pull(data, sizeof(*req));
for (i = 0; data->len; i++) { for (i = 0; data->len; i++) {
handles[2 + i] = bt_buf_pull_le16(data); handles[2 + i] = bt_buf_pull_le16(data);
BT_DBG("handle%d %u \n", 2 + i, handles[2 + i]); BT_DBG("handle%d 0x%04x\n", 2 + i, handles[2 + i]);
} }
return att_read_rsp(conn, BT_ATT_OP_READ_MULT_REQ, return att_read_rsp(conn, BT_ATT_OP_READ_MULT_REQ,
@ -739,7 +740,7 @@ static uint8_t read_group_cb(const struct bt_gatt_attr *attr, void *user_data)
return BT_GATT_ITER_CONTINUE; return BT_GATT_ITER_CONTINUE;
} }
BT_DBG("handle %u\n", attr->handle); BT_DBG("handle 0x%04x\n", attr->handle);
/* Stop if there is no space left */ /* Stop if there is no space left */
if (data->rsp->len && att->mtu - data->buf->len < data->rsp->len) if (data->rsp->len && att->mtu - data->buf->len < data->rsp->len)
@ -831,7 +832,7 @@ static uint8_t att_read_group_req(struct bt_conn *conn, struct bt_buf *data)
return BT_ATT_ERR_UNLIKELY; return BT_ATT_ERR_UNLIKELY;
} }
BT_DBG("start_handle %u end_handle %u type %u\n", BT_DBG("start_handle 0x%04x end_handle 0x%04x type %u\n",
start_handle, end_handle, uuid.u16); start_handle, end_handle, uuid.u16);
if (!range_is_valid(start_handle, end_handle, &err_handle)) { if (!range_is_valid(start_handle, end_handle, &err_handle)) {
@ -872,7 +873,7 @@ static uint8_t write_cb(const struct bt_gatt_attr *attr, void *user_data)
struct write_data *data = user_data; struct write_data *data = user_data;
int write; int write;
BT_DBG("handle %u\n", attr->handle); BT_DBG("handle 0x%04x\n", attr->handle);
/* Check for write support and flush support in case of prepare */ /* Check for write support and flush support in case of prepare */
if (!attr->write || if (!attr->write ||
@ -975,7 +976,7 @@ static uint8_t att_write_req(struct bt_conn *conn, struct bt_buf *data)
handle = sys_le16_to_cpu(req->handle); handle = sys_le16_to_cpu(req->handle);
bt_buf_pull(data, sizeof(*req)); bt_buf_pull(data, sizeof(*req));
BT_DBG("handle %u\n", handle); BT_DBG("handle 0x%04x\n", handle);
return att_write_rsp(conn, BT_ATT_OP_WRITE_REQ, BT_ATT_OP_WRITE_RSP, return att_write_rsp(conn, BT_ATT_OP_WRITE_REQ, BT_ATT_OP_WRITE_RSP,
handle, 0, data->data, data->len); handle, 0, data->data, data->len);
@ -992,7 +993,7 @@ static uint8_t att_prepare_write_req(struct bt_conn *conn, struct bt_buf *data)
offset = sys_le16_to_cpu(req->offset); offset = sys_le16_to_cpu(req->offset);
bt_buf_pull(data, sizeof(*req)); bt_buf_pull(data, sizeof(*req));
BT_DBG("handle %u offset %u\n", handle, offset); BT_DBG("handle 0x%04x offset %u\n", handle, offset);
return att_write_rsp(conn, BT_ATT_OP_PREPARE_WRITE_REQ, return att_write_rsp(conn, BT_ATT_OP_PREPARE_WRITE_REQ,
BT_ATT_OP_PREPARE_WRITE_RSP, handle, offset, BT_ATT_OP_PREPARE_WRITE_RSP, handle, offset,
@ -1064,7 +1065,7 @@ static uint8_t att_exec_write_req(struct bt_conn *conn, struct bt_buf *data)
req = (void *)data->data; req = (void *)data->data;
BT_DBG("flags %u\n", req->flags); BT_DBG("flags 0x%02x\n", req->flags);
return att_exec_write_rsp(conn, req->flags); return att_exec_write_rsp(conn, req->flags);
} }
@ -1083,7 +1084,7 @@ static uint8_t att_write_cmd(struct bt_conn *conn, struct bt_buf *data)
handle = sys_le16_to_cpu(req->handle); handle = sys_le16_to_cpu(req->handle);
BT_DBG("handle %u\n", handle); BT_DBG("handle 0x%04x\n", handle);
return att_write_rsp(conn, 0, 0, handle, 0, data->data, data->len); return att_write_rsp(conn, 0, 0, handle, 0, data->data, data->len);
} }
@ -1098,7 +1099,7 @@ static uint8_t att_signed_write_cmd(struct bt_conn *conn, struct bt_buf *data)
handle = sys_le16_to_cpu(req->handle); handle = sys_le16_to_cpu(req->handle);
bt_buf_pull(data, sizeof(*req)); bt_buf_pull(data, sizeof(*req));
BT_DBG("handle %u\n", handle); BT_DBG("handle 0x%04x\n", handle);
/* TODO: Validate signature */ /* TODO: Validate signature */
@ -1150,7 +1151,7 @@ static void bt_att_recv(struct bt_conn *conn, struct bt_buf *buf)
goto done; goto done;
} }
BT_DBG("Received ATT code %u len %u\n", hdr->code, buf->len); BT_DBG("Received ATT code 0x%02x len %u\n", hdr->code, buf->len);
bt_buf_pull(buf, sizeof(*hdr)); bt_buf_pull(buf, sizeof(*hdr));

7
net/bluetooth/gatt.c
View file

@ -77,7 +77,8 @@ int bt_gatt_attr_read(const bt_addr_le_t *peer, const struct bt_gatt_attr *attr,
len = min(buf_len, value_len - offset); len = min(buf_len, value_len - offset);
BT_DBG("handle %u offset %u length %u\n", attr->handle, offset, len); BT_DBG("handle 0x%04x offset %u length %u\n", attr->handle, offset,
len);
memcpy(buf, value + offset, len); memcpy(buf, value + offset, len);
@ -271,7 +272,7 @@ int bt_gatt_attr_write_ccc(const bt_addr_le_t *peer,
ccc->cfg[i].value = sys_le16_to_cpu(*data); ccc->cfg[i].value = sys_le16_to_cpu(*data);
BT_DBG("handle %u value %u\n", attr->handle, ccc->cfg[i].value); BT_DBG("handle 0x%04x value %u\n", attr->handle, ccc->cfg[i].value);
/* Update cfg if don't match */ /* Update cfg if don't match */
if (ccc->cfg[i].value != ccc->value) { if (ccc->cfg[i].value != ccc->value) {
@ -345,7 +346,7 @@ static uint8_t notify_cb(const struct bt_gatt_attr *attr, void *user_data)
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;
} }
BT_DBG("conn %p handle %u\n", conn, data->handle); BT_DBG("conn %p handle 0x%04x\n", conn, data->handle);
nfy = bt_buf_add(buf, sizeof(*nfy)); nfy = bt_buf_add(buf, sizeof(*nfy));
nfy->handle = sys_cpu_to_le16(data->handle); nfy->handle = sys_cpu_to_le16(data->handle);