alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ble_stack_disable_v5.1' into 'release/v5.1'

Browse Source 
Bugfix/ble stack disable v5.1(backport v5.1)

See merge request espressif/esp-idf!27650
This commit is contained in:
Island 2023-12-19 12:00:04 +08:00
commit fae6ce0e7d
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/bt/host/bluedroid/bta/dm/bta_dm_act.c
View File

@ -577,6 +577,14 @@ void bta_dm_disable (tBTA_DM_MSG *p_data)
bta_dm_disable_search_and_disc(); bta_dm_disable_search_and_disc();
bta_dm_cb.disabling = TRUE; bta_dm_cb.disabling = TRUE;
#if BLE_INCLUDED == TRUE
/* reset scan activity status*/
btm_cb.ble_ctr_cb.scan_activity = 0;
/* reset advertising activity status*/
btm_cb.ble_ctr_cb.inq_var.state = 0;
#endif
#if BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE #if BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE
BTM_BleClearBgConnDev(); BTM_BleClearBgConnDev();
#endif #endif

14
components/bt/host/bluedroid/bta/gatt/bta_gattc_act.c
View File

@ -122,8 +122,11 @@ void bta_gattc_reset_discover_st(tBTA_GATTC_SERV *p_srcb, tBTA_GATT_STATUS statu
static void bta_gattc_enable(tBTA_GATTC_CB *p_cb) static void bta_gattc_enable(tBTA_GATTC_CB *p_cb)
{ {
APPL_TRACE_DEBUG("bta_gattc_enable"); APPL_TRACE_DEBUG("bta_gattc_enable");
/* This is a workaround because the task priority of btc (BTA_GATTC_CLOSE_EVT
if (p_cb->state == BTA_GATTC_STATE_DISABLED) { in that task) is lower than the priority of the btu task.
Consequently, the p_cb->state fails to be restored to BTA_GATTC_STATE_DISABLED
and remains in the BTA_GATTC_STATE_DISABLING state. */
if (p_cb->state == BTA_GATTC_STATE_DISABLED || p_cb->state == BTA_GATTC_STATE_DISABLING) {
/* initialize control block */ /* initialize control block */
memset(&bta_gattc_cb, 0, sizeof(tBTA_GATTC_CB)); memset(&bta_gattc_cb, 0, sizeof(tBTA_GATTC_CB));
bta_gattc_cb.auto_disc = true; bta_gattc_cb.auto_disc = true;
@ -158,6 +161,7 @@ void bta_gattc_disable(tBTA_GATTC_CB *p_cb)
for (i = 0; i < BTA_GATTC_CL_MAX; i ++) { for (i = 0; i < BTA_GATTC_CL_MAX; i ++) {
if (p_cb->cl_rcb[i].in_use) { if (p_cb->cl_rcb[i].in_use) {
p_cb->state = BTA_GATTC_STATE_DISABLING; p_cb->state = BTA_GATTC_STATE_DISABLING;
p_cb->cl_rcb[i].in_use = false;
/* don't deregister HH GATT IF */ /* don't deregister HH GATT IF */
/* HH GATT IF will be deregistered by bta_hh_le_deregister when disable HH */ /* HH GATT IF will be deregistered by bta_hh_le_deregister when disable HH */
#if (defined BTA_HH_LE_INCLUDED && BTA_HH_LE_INCLUDED == TRUE) #if (defined BTA_HH_LE_INCLUDED && BTA_HH_LE_INCLUDED == TRUE)
@ -200,7 +204,11 @@ void bta_gattc_register(tBTA_GATTC_CB *p_cb, tBTA_GATTC_DATA *p_data)
cb_data.reg_oper.status = BTA_GATT_NO_RESOURCES; cb_data.reg_oper.status = BTA_GATT_NO_RESOURCES;
/* check if GATTC module is already enabled . Else enable */ /* check if GATTC module is already enabled . Else enable */
if (p_cb->state == BTA_GATTC_STATE_DISABLED) { /* This is a workaround because the task priority of btc (BTA_GATTC_CLOSE_EVT
in that task) is lower than the priority of the btu task.
Consequently, the p_cb->state fails to be restored to BTA_GATTC_STATE_DISABLED
and remains in the BTA_GATTC_STATE_DISABLING state. */
if (p_cb->state == BTA_GATTC_STATE_DISABLED || p_cb->state == BTA_GATTC_STATE_DISABLING) {
bta_gattc_enable (p_cb); bta_gattc_enable (p_cb);
} }
/* todo need to check duplicate uuid */ /* todo need to check duplicate uuid */