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

component/bt:Recovery the btm_establish_continue when created the acl connection

Browse source
This commit is contained in:
Yulong 2017-04-21 02:43:35 -04:00
parent bc807a18d1
commit b5989a6b26
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
components/bt/bluedroid/include/bt_target.h
View file

@ -111,6 +111,9 @@
#define BLE_PRIVACY_SPT FALSE
#endif /* CONFIG_GATTC_ENABLE */
#if (CONFIG_BT_ACL_CONNECTIONS)
#define MAX_ACL_CONNECTIONS CONFIG_BT_ACL_CONNECTIONS
#endif /* CONFIG_BT_ACL_CONNECTIONS */
//------------------Added from bdroid_buildcfg.h---------------------
#ifndef L2CAP_EXTFEA_SUPPORTED_MASK
@ -709,10 +712,6 @@
#define L2CAP_CLIENT_INCLUDED FALSE
#endif
/* The default connection link number set to 1,
** if the user want to support muti connction, should change it in the menuconfig */
#define MAX_ACL_CONNECTIONS 1
/* The maximum number of simultaneous links that L2CAP can support. Up to 7*/
#ifndef MAX_ACL_CONNECTIONS
#define MAX_L2CAP_LINKS 3
@ -984,7 +983,7 @@
#endif
#ifndef GATT_MAX_PHY_CHANNEL
#define GATT_MAX_PHY_CHANNEL 7
#define GATT_MAX_PHY_CHANNEL 1
#endif
/* Used for conformance testing ONLY */

4
components/bt/bluedroid/stack/btm/btm_acl.c
View file

@ -289,7 +289,7 @@ void btm_acl_created (BD_ADDR bda, DEV_CLASS dc, BD_NAME bdn,
l2cu_resubmit_pending_sec_req (p_dev_rec->bd_addr);
}
#endif ///CLASSIC_BT_INCLUDED == TRUE
//btm_establish_continue (p);
btm_establish_continue (p);
return;
}
}
@ -310,7 +310,7 @@ void btm_acl_created (BD_ADDR bda, DEV_CLASS dc, BD_NAME bdn,
&& link_role == HCI_ROLE_SLAVE) {
//do nothing in this case for fix the android7.0 cann't sent security request issue
} else {
//btm_establish_continue(p);
btm_establish_continue(p);
}
} else
#endif