Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp

# Conflicts:
#	examples/13_bt_sdp/components/bluedroid_demos/btif/btif_core.c
#	examples/13_bt_sdp/components/bluedroid_demos/include/btif_util.h
This commit is contained in:
wangmengyang
2016-12-02 22:33:09 +08:00
215 changed files with 12529 additions and 5908 deletions
@@ -167,7 +167,7 @@ typedef UINT8 tBTM_BLE_SFP;
#define BTM_BLE_CONN_INT_MIN_DEF 24 /* recommended min: 30ms = 24 * 1.25 */
#endif
/* default connectino interval max */
/* default connection interval max */
#ifndef BTM_BLE_CONN_INT_MAX_DEF
#define BTM_BLE_CONN_INT_MAX_DEF 40 /* recommended max: 50 ms = 56 * 1.25 */
#endif