feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/fix_ble_app_unregister_no_event' into 'master'

Browse Source 
fix(bt/bluedroid): Fix ble app unregister no event

Closes BLERP-402

See merge request espressif/esp-idf!28166
This commit is contained in:
Jiang Jiang Jian
2023-12-29 11:08:08 +08:00
parent ece73357ca a2425ac3e7
commit 16ae218dfb
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,9 +122,9 @@ 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 /* 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. 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 Consequently, the p_cb->state fails to be restored to BTA_GATTC_STATE_DISABLED
and remains in the BTA_GATTC_STATE_DISABLING state. */ and remains in the BTA_GATTC_STATE_DISABLING state. */
if (p_cb->state == BTA_GATTC_STATE_DISABLED || p_cb->state == BTA_GATTC_STATE_DISABLING) { if (p_cb->state == BTA_GATTC_STATE_DISABLED || p_cb->state == BTA_GATTC_STATE_DISABLING) {
/* initialize control block */ /* initialize control block */
@@ -161,7 +161,6 @@ 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)
@@ -204,9 +203,9 @@ 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 */
/* This is a workaround because the task priority of btc (BTA_GATTC_CLOSE_EVT /* 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. 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 Consequently, the p_cb->state fails to be restored to BTA_GATTC_STATE_DISABLED
and remains in the BTA_GATTC_STATE_DISABLING state. */ and remains in the BTA_GATTC_STATE_DISABLING state. */
if (p_cb->state == BTA_GATTC_STATE_DISABLED || p_cb->state == BTA_GATTC_STATE_DISABLING) { 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);