blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-04-01 12:20:11 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/l2cap_use_wrong_handle_v5.3' into 'release/v5.3'

Browse Source 
fix(bt/bluedroid):  Fixed the issue of using the wrong handle to handle the BTA_JV_L2CAP_READ_EVT event(v5.3)

See merge request espressif/esp-idf!31278
This commit is contained in:
Jiang Jiang Jian 2024-07-26 11:39:25 +08:00
commit 35e9a119da
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/bt/host/bluedroid/btc/profile/std/l2cap/btc_l2cap.c
View File

@ -906,7 +906,6 @@ void btc_l2cap_cb_handler(btc_msg_t *msg)
fixed_queue_enqueue(slot->rx.queue, p_data_buf, FIXED_QUEUE_MAX_TIMEOUT); fixed_queue_enqueue(slot->rx.queue, p_data_buf, FIXED_QUEUE_MAX_TIMEOUT);
} else { } else {
osi_free(p_data_buf); osi_free(p_data_buf);
break;
} }
} }
osi_mutex_unlock(&l2cap_local_param.l2cap_slot_mutex); osi_mutex_unlock(&l2cap_local_param.l2cap_slot_mutex);
@ -945,12 +944,11 @@ void btc_l2cap_cb_handler(btc_msg_t *msg)
break; // to do disconnect break; // to do disconnect
} }
memset(p_data_buf, 0, count + sizeof(BT_HDR)); memset(p_data_buf, 0, count + sizeof(BT_HDR));
p_data_buf->len = BTA_JvL2capRead(p_data->data_ind.handle, slot->id, p_data_buf->data, count); p_data_buf->len = BTA_JvL2capRead(p_data->l2c_read.handle, slot->id, p_data_buf->data, count);
if (p_data_buf->len > 0) { if (p_data_buf->len > 0) {
fixed_queue_enqueue(slot->rx.queue, p_data_buf, FIXED_QUEUE_MAX_TIMEOUT); fixed_queue_enqueue(slot->rx.queue, p_data_buf, FIXED_QUEUE_MAX_TIMEOUT);
} else { } else {
osi_free(p_data_buf); osi_free(p_data_buf);
break;
} }
} }
osi_mutex_unlock(&l2cap_local_param.l2cap_slot_mutex); osi_mutex_unlock(&l2cap_local_param.l2cap_slot_mutex);
@ -1060,7 +1058,7 @@ static ssize_t l2cap_vfs_write(int fd, const void * data, size_t size)
if (!enqueue_status) { if (!enqueue_status) {
BTC_TRACE_DEBUG("%s tx_len:%d, fd:%d\n", __func__, fixed_queue_length(slot->tx.queue), fd); BTC_TRACE_DEBUG("%s tx_len:%d, fd:%d\n", __func__, fixed_queue_length(slot->tx.queue), fd);
osi_mutex_unlock(&l2cap_local_param.l2cap_slot_mutex); osi_mutex_unlock(&l2cap_local_param.l2cap_slot_mutex);
//block untill under water level, be closed or time out //block until under water level, be closed or time out
tx_event_group_val = tx_event_group_val =
xEventGroupWaitBits(l2cap_local_param.tx_event_group, SLOT_WRITE_BIT(serial) | SLOT_CLOSE_BIT(serial), pdTRUE, xEventGroupWaitBits(l2cap_local_param.tx_event_group, SLOT_WRITE_BIT(serial) | SLOT_CLOSE_BIT(serial), pdTRUE,
pdFALSE, VFS_WRITE_TIMEOUT / portTICK_PERIOD_MS); pdFALSE, VFS_WRITE_TIMEOUT / portTICK_PERIOD_MS);