pioduino/esp-idf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ble/bluedroid): Disable bluedroid desire_role

Browse Source 
(cherry picked from commit 9ae4d9a14a20d152042d626f56daaf568ee21c89)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
This commit is contained in:
Zhi Wei Jian
2026-01-07 17:24:19 +08:00
parent a8d0be7f2a
commit 2348342ff4
6 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bt/host/bluedroid/stack/gap/include/gap_int.h
-1
View File
@@ -129,7 +129,6 @@ typedef struct {
typedef struct {
tGAP_INFO blk[GAP_MAX_BLOCKS];
tBTM_CMPL_CB *btm_cback[GAP_MAX_BLOCKS];
UINT8 trace_level;
//tGAP_FINDADDR_CB findaddr_cb; /* Contains the control block for finding a device addr */
//tBTM_INQ_INFO *cur_inqptr;
components/bt/host/bluedroid/stack/l2cap/include/l2c_int.h
+2 -1
View File
@@ -490,9 +490,10 @@ typedef struct {
list_t *p_ccb_pool; /* Channel Control Block pool */
tL2C_RCB rcb_pool[MAX_L2CAP_CLIENTS]; /* Registration info pool */
#if (CLASSIC_BT_INCLUDED == TRUE)
UINT8 desire_role; /* desire to be master/slave when accepting a connection */
BOOLEAN disallow_switch; /* FALSE, to allow switch at create conn */
#endif // (CLASSIC_BT_INCLUDED == TRUE)
UINT16 num_lm_acl_bufs; /* # of ACL buffers on controller */
UINT16 idle_timeout; /* Idle timeout */
components/bt/host/bluedroid/stack/l2cap/l2c_api.c
+2 -1
View File
@@ -863,7 +863,7 @@ UINT8 L2CA_SetTraceLevel (UINT8 new_level)
return (l2cb.l2cap_trace_level);
}
#if (CLASSIC_BT_INCLUDED == TRUE)
/*******************************************************************************
**
** Function L2CA_SetDesireRole
@@ -901,6 +901,7 @@ UINT8 L2CA_SetDesireRole (UINT8 new_role)
return (l2cb.desire_role);
}
#endif // (CLASSIC_BT_INCLUDED == TRUE)
#if (CLASSIC_BT_INCLUDED == TRUE)
components/bt/host/bluedroid/stack/l2cap/l2c_link.c
+2
View File
@@ -936,6 +936,7 @@ UINT8 l2c_link_pkts_rcvd (UINT16 *num_pkts, UINT16 *handles)
return (num_found);
}
#if (CLASSIC_BT_INCLUDED == TRUE)
/*******************************************************************************
**
** Function l2c_link_role_changed
@@ -973,6 +974,7 @@ void l2c_link_role_changed (BD_ADDR bd_addr, UINT8 new_role, UINT8 hci_status)
}
}
}
#endif // (CLASSIC_BT_INCLUDED == TRUE)
/*******************************************************************************
**
components/bt/host/bluedroid/stack/l2cap/l2c_main.c
+2 -2
View File
@@ -877,13 +877,13 @@ void l2c_init (void)
#endif
#if (CLASSIC_BT_INCLUDED == TRUE)
#ifdef L2CAP_DESIRED_LINK_ROLE
l2cb.desire_role = L2CAP_DESIRED_LINK_ROLE;
#else
l2cb.desire_role = HCI_ROLE_SLAVE;
#endif
#endif // (CLASSIC_BT_INCLUDED == TRUE)
/* Set the default idle timeout */
l2cb.idle_timeout = L2CAP_LINK_INACTIVITY_TOUT;
components/bt/host/bluedroid/stack/l2cap/l2c_utils.c
+4 -2
View File
@@ -369,6 +369,7 @@ uint8_t l2cu_ble_plcb_active_count(void)
}
#if (CLASSIC_BT_INCLUDED == TRUE)
/*******************************************************************************
**
** Function l2cu_get_conn_role
@@ -385,6 +386,7 @@ UINT8 l2cu_get_conn_role (tL2C_LCB *p_this_lcb)
{
return l2cb.desire_role;
}
#endif // (CLASSIC_BT_INCLUDED == TRUE)
/*******************************************************************************
**
@@ -2373,7 +2375,7 @@ UINT8 l2cu_get_num_hi_priority (void)
return no_hi;
}
#if (CLASSIC_BT_INCLUDED == TRUE)
/*******************************************************************************
**
** Function l2cu_create_conn_after_switch
@@ -2448,7 +2450,7 @@ BOOLEAN l2cu_create_conn_after_switch (tL2C_LCB *p_lcb)
return (TRUE);
}
#endif // (CLASSIC_BT_INCLUDED == TRUE)
/*******************************************************************************
**