esp-idf/components/bt/bluedroid/stack/btm
Tian Hao acda125e8b Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid
# Conflicts:
#	components/bt/bluedroid/profiles/core/bt_prf_sys_main.c
#	components/bt/bluedroid/profiles/core/bt_prf_task.c
#	components/bt/bluedroid/profiles/core/include/bt_prf_sys.h
#	components/bt/bluedroid/profiles/core/include/bt_prf_task.h
#	components/bt/bluedroid/profiles/esp/include/wx_airsync_prf.h
#	components/bt/bluedroid/profiles/esp/wechat_AirSync/wx_airsync_prf.c
#	components/bt/bluedroid/stack/btm/btm_sec.c
2016-11-04 19:32:47 +08:00
..
btm_acl.c component/bt: fix logging format for some source files of BTM module 2016-10-24 16:17:55 +08:00
btm_ble_addr.c component/bt: add bluedroid 1st version 2016-09-26 21:37:39 +08:00
btm_ble_adv_filter.c component/bt: add bluedroid 1st version 2016-09-26 21:37:39 +08:00
btm_ble_batchscan.c component/bt: add bluedroid 1st version 2016-09-26 21:37:39 +08:00
btm_ble_bgconn.c component bt:Change the button profile function to the new API function 2016-11-02 02:05:30 -04:00
btm_ble_cont_energy.c commponent bt:add the wechat airsync profile to the project 2016-10-11 05:43:36 -04:00
btm_ble_gap.c Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid 2016-11-04 19:32:47 +08:00
btm_ble_multi_adv.c component/bt: add bluedroid 1st version 2016-09-26 21:37:39 +08:00
btm_ble_privacy.c component bt:added the button profile event & process method to the project 2016-10-18 05:22:36 -04:00
btm_ble.c component bt: Change the battery function to the new API function 2016-11-02 06:14:02 -04:00
btm_dev.c component/bt: fix logging format for some source files of BTM module 2016-10-24 16:17:55 +08:00
btm_devctl.c 1. Recover "future_t" model implementation using semaphore to allow for blocking function 2016-10-10 21:34:21 +08:00
btm_inq.c component/bt: add bluedroid 1st version 2016-09-26 21:37:39 +08:00
btm_main.c component/bt: add bluedroid 1st version 2016-09-26 21:37:39 +08:00
btm_pm.c component/bt: add bluedroid 1st version 2016-09-26 21:37:39 +08:00
btm_sco.c component/bt: add bluedroid 1st version 2016-09-26 21:37:39 +08:00
btm_sec.c Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid 2016-11-04 19:32:47 +08:00