Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/coex_a2dp_stuck_after_creating_another_connection_v3.3' into 'release/v3.3'

Browse source 
components/coex: Fix a2dp stuck after creating another connection

See merge request espressif/esp-idf!7663
This commit is contained in:
Jiang Jiang Jian 2020-02-20 14:16:53 +08:00
commit 365092fb57
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/bt/bluedroid/bta/dm/bta_dm_act.c
View file

@ -3093,7 +3093,6 @@ static void bta_dm_bl_change_cback (tBTM_BL_EVENT_DATA *p_data)
p_msg->transport = p_data->conn.transport; p_msg->transport = p_data->conn.transport;
p_msg->handle = p_data->conn.handle; p_msg->handle = p_data->conn.handle;
#endif #endif
BTA_DmCoexEventTrigger(BTA_COEX_EVT_ACL_CONNECTED);
break; break;
case BTM_BL_DISCN_EVT: case BTM_BL_DISCN_EVT:
bdcpy(p_msg->bd_addr, p_data->discn.p_bda); bdcpy(p_msg->bd_addr, p_data->discn.p_bda);
@ -3101,7 +3100,6 @@ static void bta_dm_bl_change_cback (tBTM_BL_EVENT_DATA *p_data)
p_msg->transport = p_data->discn.transport; p_msg->transport = p_data->discn.transport;
p_msg->handle = p_data->discn.handle; p_msg->handle = p_data->discn.handle;
#endif #endif
BTA_DmCoexEventTrigger(BTA_COEX_EVT_ACL_DISCONNECTED);
break; break;
case BTM_BL_UPDATE_EVT: case BTM_BL_UPDATE_EVT:
p_msg->busy_level = p_data->update.busy_level; p_msg->busy_level = p_data->update.busy_level;

6
components/bt/bluedroid/bta/dm/bta_dm_main.c
View file

@ -462,14 +462,8 @@ void BTA_DmCoexEventTrigger(uint32_t event)
case BTA_COEX_EVT_SNIFF_EXIT: case BTA_COEX_EVT_SNIFF_EXIT:
case BTA_COEX_EVT_A2DP_PAUSED_ENTER: case BTA_COEX_EVT_A2DP_PAUSED_ENTER:
case BTA_COEX_EVT_A2DP_PAUSED_EXIT: case BTA_COEX_EVT_A2DP_PAUSED_EXIT:
break;
case BTA_COEX_EVT_ACL_CONNECTED: case BTA_COEX_EVT_ACL_CONNECTED:
esp_coex_status_bit_clear(ESP_COEX_ST_TYPE_BT, ESP_COEX_BT_ST_A2DP_STREAMING);
esp_coex_status_bit_clear(ESP_COEX_ST_TYPE_BT, ESP_COEX_BT_ST_A2DP_PAUSED);
break;
case BTA_COEX_EVT_ACL_DISCONNECTED: case BTA_COEX_EVT_ACL_DISCONNECTED:
esp_coex_status_bit_clear(ESP_COEX_ST_TYPE_BT, ESP_COEX_BT_ST_A2DP_STREAMING);
esp_coex_status_bit_clear(ESP_COEX_ST_TYPE_BT, ESP_COEX_BT_ST_A2DP_PAUSED);
break; break;
case BTA_COEX_EVT_STREAMING_STARTED: case BTA_COEX_EVT_STREAMING_STARTED:
esp_coex_status_bit_set(ESP_COEX_ST_TYPE_BT, ESP_COEX_BT_ST_A2DP_STREAMING); esp_coex_status_bit_set(ESP_COEX_ST_TYPE_BT, ESP_COEX_BT_ST_A2DP_STREAMING);