espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/build_error_in_compiler_performance_mode_v4.4' into 'release/v4.4'

Browse Source 
fix(bt/bluedroid): fixed build error when compiler in performace mode (backport v4.4)

See merge request espressif/esp-idf!27866
This commit is contained in:
Jiang Jiang Jian
2023-12-13 15:01:46 +08:00
parent a2b4ddc113 ba81334bf5
commit e47fe5df8e
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/bt/host/bluedroid/bta/hf_ag/bta_ag_sdp.c
View File

@@ -243,13 +243,16 @@ void bta_ag_del_records(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
UNUSED(p_data); UNUSED(p_data);
/* get services of all other registered servers */ /* get services of all other registered servers */
for (i = 0; i < BTA_AG_NUM_IDX; i++, p++) { for (i = 0; i < BTA_AG_NUM_IDX; i++) {
if (p_scb == p) { if (p_scb == p) {
continue; continue;
} }
if (p->in_use && p->dealloc == FALSE) { if (p->in_use && p->dealloc == FALSE) {
others |= p->reg_services; others |= p->reg_services;
} }
if (i < BTA_AG_NUM_SCB) {
p++;
}
} }
others >>= BTA_HSP_SERVICE_ID; others >>= BTA_HSP_SERVICE_ID;
services = p_scb->reg_services >> BTA_HSP_SERVICE_ID; services = p_scb->reg_services >> BTA_HSP_SERVICE_ID;

14
components/bt/host/bluedroid/bta/jv/bta_jv_act.c
View File

@@ -1199,10 +1199,15 @@ void bta_jv_delete_record(tBTA_JV_MSG *p_data)
*******************************************************************************/ *******************************************************************************/
static void bta_jv_l2cap_client_cback(UINT16 gap_handle, UINT16 event) static void bta_jv_l2cap_client_cback(UINT16 gap_handle, UINT16 event)
{ {
if (gap_handle >= BTA_JV_MAX_L2C_CONN) {
APPL_TRACE_WARNING("Invalid gap_handle: %u", gap_handle);
return;
}
tBTA_JV_L2C_CB *p_cb = &bta_jv_cb.l2c_cb[gap_handle]; tBTA_JV_L2C_CB *p_cb = &bta_jv_cb.l2c_cb[gap_handle];
tBTA_JV evt_data = {0}; tBTA_JV evt_data = {0};
if (gap_handle >= BTA_JV_MAX_L2C_CONN && !p_cb->p_cback) { if (!p_cb->p_cback) {
return; return;
} }
@@ -1354,12 +1359,17 @@ void bta_jv_l2cap_close(tBTA_JV_MSG *p_data)
*******************************************************************************/ *******************************************************************************/
static void bta_jv_l2cap_server_cback(UINT16 gap_handle, UINT16 event) static void bta_jv_l2cap_server_cback(UINT16 gap_handle, UINT16 event)
{ {
if (gap_handle >= BTA_JV_MAX_L2C_CONN) {
APPL_TRACE_WARNING("Invalid gap_handle: %u", gap_handle);
return;
}
tBTA_JV_L2C_CB *p_cb = &bta_jv_cb.l2c_cb[gap_handle]; tBTA_JV_L2C_CB *p_cb = &bta_jv_cb.l2c_cb[gap_handle];
tBTA_JV evt_data = {0}; tBTA_JV evt_data = {0};
tBTA_JV_L2CAP_CBACK *p_cback; tBTA_JV_L2CAP_CBACK *p_cback;
void *user_data; void *user_data;
if (gap_handle >= BTA_JV_MAX_L2C_CONN && !p_cb->p_cback) { if (!p_cb->p_cback) {
return; return;
} }