michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Remove BT_HEXDUMP_DBG

Browse source 
Replace unnecessary `BT_HEXDUMP_DBG` with `LOG_HEXDUMP_DBG`.

`BT_HEXDUMP_DBG` did an extra cast to `const uint8_t *` on its first
argument. This was probably the reason it was introduced. But the
current definition of `LOG_HEXDUMP_DBG` does this cast for us.

Signed-off-by: Théo Battrel <theo.battrel@nordicsemi.no>
This commit is contained in:
Théo Battrel 2022-10-24 11:23:12 +02:00 • committed by Carles Cufí
commit fdd0a26348
22 changed files with 85 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

68
subsys/bluetooth/audio/mcc.c
View file

@ -174,7 +174,7 @@ static uint8_t mcc_read_player_name_cb(struct bt_conn *conn, uint8_t err,
} else if (!data) {
cb_err = BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
} else {
BT_HEXDUMP_DBG(data, length, "Player name read");
LOG_HEXDUMP_DBG(data, length, "Player name read");
if (length >= sizeof(name)) {
length = sizeof(name) - 1;
@ -209,7 +209,7 @@ static uint8_t mcc_read_icon_obj_id_cb(struct bt_conn *conn, uint8_t err,
} else if ((!pid) || (length != BT_OTS_OBJ_ID_SIZE)) {
cb_err = BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
} else {
BT_HEXDUMP_DBG(pid, length, "Icon Object ID");
LOG_HEXDUMP_DBG(pid, length, "Icon Object ID");
id = sys_get_le48(pid);
BT_DBG_OBJ_ID("Icon Object ID: ", id);
}
@ -238,7 +238,7 @@ static uint8_t mcc_read_icon_url_cb(struct bt_conn *conn, uint8_t err,
} else if (length >= sizeof(url)) {
cb_err = BT_ATT_ERR_INSUFFICIENT_RESOURCES;
} else {
BT_HEXDUMP_DBG(data, length, "Icon URL");
LOG_HEXDUMP_DBG(data, length, "Icon URL");
(void)memcpy(&url, data, length);
url[length] = '\0';
BT_DBG("Icon URL: %s", url);
@ -264,7 +264,7 @@ static uint8_t mcc_read_track_title_cb(struct bt_conn *conn, uint8_t err,
} else if (!data) {
cb_err = BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
} else {
BT_HEXDUMP_DBG(data, length, "Track title");
LOG_HEXDUMP_DBG(data, length, "Track title");
if (length >= sizeof(title)) {
/* If the description is too long; clip it. */
length = sizeof(title) - 1;
@ -297,7 +297,7 @@ static uint8_t mcc_read_track_duration_cb(struct bt_conn *conn, uint8_t err,
} else {
dur = sys_get_le32((uint8_t *)data);
BT_DBG("Track duration: %d", dur);
BT_HEXDUMP_DBG(data, sizeof(int32_t), "Track duration");
LOG_HEXDUMP_DBG(data, sizeof(int32_t), "Track duration");
}
if (mcc_cb && mcc_cb->read_track_duration) {
@ -323,7 +323,7 @@ static uint8_t mcc_read_track_position_cb(struct bt_conn *conn, uint8_t err,
} else {
pos = sys_get_le32((uint8_t *)data);
BT_DBG("Track position: %d", pos);
BT_HEXDUMP_DBG(data, sizeof(pos), "Track position");
LOG_HEXDUMP_DBG(data, sizeof(pos), "Track position");
}
if (mcc_cb && mcc_cb->read_track_position) {
@ -348,8 +348,7 @@ static void mcs_write_track_position_cb(struct bt_conn *conn, uint8_t err,
} else {
pos = sys_get_le32((uint8_t *)params->data);
BT_DBG("Track position: %d", pos);
BT_HEXDUMP_DBG(params->data, sizeof(pos),
"Track position in callback");
LOG_HEXDUMP_DBG(params->data, sizeof(pos), "Track position in callback");
}
if (mcc_cb && mcc_cb->set_track_position) {
@ -373,7 +372,7 @@ static uint8_t mcc_read_playback_speed_cb(struct bt_conn *conn, uint8_t err,
} else {
speed = *(int8_t *)data;
BT_DBG("Playback speed: %d", speed);
BT_HEXDUMP_DBG(data, sizeof(int8_t), "Playback speed");
LOG_HEXDUMP_DBG(data, sizeof(int8_t), "Playback speed");
}
if (mcc_cb && mcc_cb->read_playback_speed) {
@ -421,7 +420,7 @@ static uint8_t mcc_read_seeking_speed_cb(struct bt_conn *conn, uint8_t err,
} else {
speed = *(int8_t *)data;
BT_DBG("Seeking speed: %d", speed);
BT_HEXDUMP_DBG(data, sizeof(int8_t), "Seeking speed");
LOG_HEXDUMP_DBG(data, sizeof(int8_t), "Seeking speed");
}
if (mcc_cb && mcc_cb->read_seeking_speed) {
@ -448,7 +447,7 @@ static uint8_t mcc_read_segments_obj_id_cb(struct bt_conn *conn, uint8_t err,
BT_DBG("length: %d, data: %p", length, data);
cb_err = BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
} else {
BT_HEXDUMP_DBG(pid, length, "Segments Object ID");
LOG_HEXDUMP_DBG(pid, length, "Segments Object ID");
id = sys_get_le48(pid);
BT_DBG_OBJ_ID("Segments Object ID: ", id);
cb_err = 0;
@ -477,7 +476,7 @@ static uint8_t mcc_read_current_track_obj_id_cb(struct bt_conn *conn, uint8_t er
BT_DBG("length: %d, data: %p", length, data);
cb_err = BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
} else {
BT_HEXDUMP_DBG(pid, length, "Current Track Object ID");
LOG_HEXDUMP_DBG(pid, length, "Current Track Object ID");
id = sys_get_le48(pid);
BT_DBG_OBJ_ID("Current Track Object ID: ", id);
cb_err = 0;
@ -529,7 +528,7 @@ static uint8_t mcc_read_next_track_obj_id_cb(struct bt_conn *conn, uint8_t err,
BT_DBG("length: %d, data: %p", length, data);
cb_err = BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
} else {
BT_HEXDUMP_DBG(pid, length, "Next Track Object ID");
LOG_HEXDUMP_DBG(pid, length, "Next Track Object ID");
id = sys_get_le48(pid);
BT_DBG_OBJ_ID("Next Track Object ID: ", id);
}
@ -578,7 +577,7 @@ static uint8_t mcc_read_parent_group_obj_id_cb(struct bt_conn *conn, uint8_t err
BT_DBG("length: %d, data: %p", length, data);
cb_err = BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
} else {
BT_HEXDUMP_DBG(pid, length, "Parent Group Object ID");
LOG_HEXDUMP_DBG(pid, length, "Parent Group Object ID");
id = sys_get_le48(pid);
BT_DBG_OBJ_ID("Parent Group Object ID: ", id);
}
@ -605,7 +604,7 @@ static uint8_t mcc_read_current_group_obj_id_cb(struct bt_conn *conn, uint8_t er
BT_DBG("length: %d, data: %p", length, data);
cb_err = BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
} else {
BT_HEXDUMP_DBG(pid, length, "Current Group Object ID");
LOG_HEXDUMP_DBG(pid, length, "Current Group Object ID");
id = sys_get_le48(pid);
BT_DBG_OBJ_ID("Current Group Object ID: ", id);
}
@ -656,7 +655,7 @@ static uint8_t mcc_read_playing_order_cb(struct bt_conn *conn, uint8_t err,
} else {
order = *(uint8_t *)data;
BT_DBG("Playing order: %d", order);
BT_HEXDUMP_DBG(data, sizeof(order), "Playing order");
LOG_HEXDUMP_DBG(data, sizeof(order), "Playing order");
}
if (mcc_cb && mcc_cb->read_playing_order) {
@ -704,7 +703,7 @@ static uint8_t mcc_read_playing_orders_supported_cb(struct bt_conn *conn, uint8_
} else {
orders = sys_get_le16((uint8_t *)data);
BT_DBG("Playing orders_supported: %d", orders);
BT_HEXDUMP_DBG(data, sizeof(orders), "Playing orders supported");
LOG_HEXDUMP_DBG(data, sizeof(orders), "Playing orders supported");
}
if (mcc_cb && mcc_cb->read_playing_orders_supported) {
@ -730,7 +729,7 @@ static uint8_t mcc_read_media_state_cb(struct bt_conn *conn, uint8_t err,
} else {
state = *(uint8_t *)data;
BT_DBG("Media state: %d", state);
BT_HEXDUMP_DBG(data, sizeof(uint8_t), "Media state");
LOG_HEXDUMP_DBG(data, sizeof(uint8_t), "Media state");
}
if (mcc_cb && mcc_cb->read_media_state) {
@ -791,7 +790,7 @@ static uint8_t mcc_read_opcodes_supported_cb(struct bt_conn *conn, uint8_t err,
} else {
operations = sys_get_le32((uint8_t *)data);
BT_DBG("Opcodes supported: %d", operations);
BT_HEXDUMP_DBG(data, sizeof(operations), "Opcodes_supported");
LOG_HEXDUMP_DBG(data, sizeof(operations), "Opcodes_supported");
}
if (mcc_cb && mcc_cb->read_opcodes_supported) {
@ -1991,8 +1990,7 @@ int bt_mcc_set_track_position(struct bt_conn *conn, int32_t pos)
cur_mcs_inst->write_params.handle = cur_mcs_inst->track_position_handle;
cur_mcs_inst->write_params.func = mcs_write_track_position_cb;
BT_HEXDUMP_DBG(cur_mcs_inst->write_params.data, sizeof(pos),
"Track position sent");
LOG_HEXDUMP_DBG(cur_mcs_inst->write_params.data, sizeof(pos), "Track position sent");
err = bt_gatt_write(conn, &cur_mcs_inst->write_params);
if (!err) {
@ -2051,8 +2049,7 @@ int bt_mcc_set_playback_speed(struct bt_conn *conn, int8_t speed)
cur_mcs_inst->write_params.handle = cur_mcs_inst->playback_speed_handle;
cur_mcs_inst->write_params.func = mcs_write_playback_speed_cb;
BT_HEXDUMP_DBG(cur_mcs_inst->write_params.data, sizeof(speed),
"Playback speed");
LOG_HEXDUMP_DBG(cur_mcs_inst->write_params.data, sizeof(speed), "Playback speed");
err = bt_gatt_write(conn, &cur_mcs_inst->write_params);
if (!err) {
@ -2170,7 +2167,7 @@ int bt_mcc_set_current_track_obj_id(struct bt_conn *conn, uint64_t obj_id)
cur_mcs_inst->write_params.handle = cur_mcs_inst->current_track_obj_id_handle;
cur_mcs_inst->write_params.func = mcs_write_current_track_obj_id_cb;
BT_HEXDUMP_DBG(cur_mcs_inst->write_params.data, BT_OTS_OBJ_ID_SIZE, "Object Id");
LOG_HEXDUMP_DBG(cur_mcs_inst->write_params.data, BT_OTS_OBJ_ID_SIZE, "Object Id");
err = bt_gatt_write(conn, &cur_mcs_inst->write_params);
if (!err) {
@ -2233,7 +2230,7 @@ int bt_mcc_set_next_track_obj_id(struct bt_conn *conn, uint64_t obj_id)
cur_mcs_inst->write_params.handle = cur_mcs_inst->next_track_obj_id_handle;
cur_mcs_inst->write_params.func = mcs_write_next_track_obj_id_cb;
BT_HEXDUMP_DBG(cur_mcs_inst->write_params.data, BT_OTS_OBJ_ID_SIZE, "Object Id");
LOG_HEXDUMP_DBG(cur_mcs_inst->write_params.data, BT_OTS_OBJ_ID_SIZE, "Object Id");
err = bt_gatt_write(conn, &cur_mcs_inst->write_params);
if (!err) {
@ -2323,7 +2320,7 @@ int bt_mcc_set_current_group_obj_id(struct bt_conn *conn, uint64_t obj_id)
cur_mcs_inst->write_params.handle = cur_mcs_inst->current_group_obj_id_handle;
cur_mcs_inst->write_params.func = mcs_write_current_group_obj_id_cb;
BT_HEXDUMP_DBG(cur_mcs_inst->write_params.data, BT_OTS_OBJ_ID_SIZE, "Object Id");
LOG_HEXDUMP_DBG(cur_mcs_inst->write_params.data, BT_OTS_OBJ_ID_SIZE, "Object Id");
err = bt_gatt_write(conn, &cur_mcs_inst->write_params);
if (!err) {
@ -2383,8 +2380,7 @@ int bt_mcc_set_playing_order(struct bt_conn *conn, uint8_t order)
cur_mcs_inst->write_params.handle = cur_mcs_inst->playing_order_handle;
cur_mcs_inst->write_params.func = mcs_write_playing_order_cb;
BT_HEXDUMP_DBG(cur_mcs_inst->write_params.data, sizeof(order),
"Playing order");
LOG_HEXDUMP_DBG(cur_mcs_inst->write_params.data, sizeof(order), "Playing order");
err = bt_gatt_write(conn, &cur_mcs_inst->write_params);
if (!err) {
@ -2476,8 +2472,7 @@ int bt_mcc_send_cmd(struct bt_conn *conn, const struct mpl_cmd *cmd)
cur_mcs_inst->write_params.handle = cur_mcs_inst->cp_handle;
cur_mcs_inst->write_params.func = mcs_write_cp_cb;
BT_HEXDUMP_DBG(cur_mcs_inst->write_params.data, sizeof(*cmd),
"Command sent");
LOG_HEXDUMP_DBG(cur_mcs_inst->write_params.data, sizeof(*cmd), "Command sent");
err = bt_gatt_write(conn, &cur_mcs_inst->write_params);
if (!err) {
@ -2537,8 +2532,7 @@ int bt_mcc_send_search(struct bt_conn *conn, const struct mpl_search *search)
cur_mcs_inst->write_params.handle = cur_mcs_inst->scp_handle;
cur_mcs_inst->write_params.func = mcs_write_scp_cb;
BT_HEXDUMP_DBG(cur_mcs_inst->write_params.data, search->len,
"Search sent");
LOG_HEXDUMP_DBG(cur_mcs_inst->write_params.data, search->len, "Search sent");
err = bt_gatt_write(conn, &cur_mcs_inst->write_params);
if (!err) {
@ -2632,7 +2626,7 @@ int on_icon_content(struct bt_ots_client *otc_inst, struct bt_conn *conn,
BT_DBG("Received Media Player Icon content, %i bytes at offset %i",
len, offset);
BT_HEXDUMP_DBG(data_p, len, "Icon content");
LOG_HEXDUMP_DBG(data_p, len, "Icon content");
if (len > net_buf_simple_tailroom(&otc_obj_buf)) {
BT_WARN("Can not fit whole object");
@ -2761,7 +2755,7 @@ int on_current_track_content(struct bt_ots_client *otc_inst,
BT_DBG("Received Current Track content, %i bytes at offset %i",
len, offset);
BT_HEXDUMP_DBG(data_p, len, "Track content");
LOG_HEXDUMP_DBG(data_p, len, "Track content");
if (len > net_buf_simple_tailroom(&otc_obj_buf)) {
BT_WARN("Can not fit whole object");
@ -2793,7 +2787,7 @@ int on_next_track_content(struct bt_ots_client *otc_inst,
BT_DBG("Received Next Track content, %i bytes at offset %i",
len, offset);
BT_HEXDUMP_DBG(data_p, len, "Track content");
LOG_HEXDUMP_DBG(data_p, len, "Track content");
if (len > net_buf_simple_tailroom(&otc_obj_buf)) {
BT_WARN("Can not fit whole object");
@ -2852,7 +2846,7 @@ int on_parent_group_content(struct bt_ots_client *otc_inst,
BT_DBG("Received Parent Group content, %i bytes at offset %i",
len, offset);
BT_HEXDUMP_DBG(data_p, len, "Group content");
LOG_HEXDUMP_DBG(data_p, len, "Group content");
if (len > net_buf_simple_tailroom(&otc_obj_buf)) {
BT_WARN("Can not fit whole object");
@ -2898,7 +2892,7 @@ int on_current_group_content(struct bt_ots_client *otc_inst,
BT_DBG("Received Current Group content, %i bytes at offset %i",
len, offset);
BT_HEXDUMP_DBG(data_p, len, "Group content");
LOG_HEXDUMP_DBG(data_p, len, "Group content");
if (len > net_buf_simple_tailroom(&otc_obj_buf)) {
BT_WARN("Can not fit whole object");