]> granicus.if.org Git - esp-idf/commit
Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp
authorwangmengyang <wangmengyang@espressif.com>
Fri, 25 Nov 2016 11:45:29 +0000 (19:45 +0800)
committerwangmengyang <wangmengyang@espressif.com>
Fri, 25 Nov 2016 11:45:29 +0000 (19:45 +0800)
commit73f00732cfe31e979f6ea7cb69242f5a071f85b3
tree18b55f07fc1ec25f1a637aebdd2cfe2834fb3560
parent8e77c39deb89fddd60ad28bb649fa9579a03e83e
parent19273c7b2d1e4b759c464ed414bdd5d165cbc23d
Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp

# Conflicts:
# components/bt/bluedroid/bta/sys/bta_sys_main.c
# components/bt/bluedroid/btc/profile/std/avrc/avrc_api.c
# components/bt/bluedroid/btc/profile/std/avrc/avrc_bld_ct.c
# components/bt/bluedroid/btc/profile/std/avrc/avrc_bld_tg.c
# components/bt/bluedroid/btc/profile/std/avrc/avrc_opt.c
# components/bt/bluedroid/btc/profile/std/avrc/avrc_pars_ct.c
# components/bt/bluedroid/btc/profile/std/avrc/avrc_pars_tg.c
# components/bt/bluedroid/btc/profile/std/avrc/avrc_sdp.c
# components/bt/bluedroid/btc/profile/std/avrc/avrc_utils.c
# components/bt/bluedroid/btc/profile/std/avrc/include/avrc_int.h
# components/bt/bluedroid/btc/profile/std/include/avct_api.h
# components/bt/bluedroid/btc/profile/std/include/avdt_api.h
# components/bt/bluedroid/btc/profile/std/include/avdt_defs.h
# components/bt/bluedroid/btc/profile/std/include/avdtc_api.h
# components/bt/bluedroid/btc/profile/std/include/avrc_api.h
# components/bt/bluedroid/btc/profile/std/include/avrc_defs.h
# components/bt/bluedroid/gki/gki_buffer.c
# components/bt/bluedroid/hci/hci_hal_h4.c
# components/bt/bluedroid/hci/hci_layer.c
# components/bt/bluedroid/hci/packet_fragmenter.c
# components/bt/bluedroid/include/bt_trace.h
# components/bt/bluedroid/osi/alarm.c
# components/bt/bluedroid/profiles/std/avrc/avrc_api.c
# components/bt/bluedroid/profiles/std/avrc/avrc_bld_ct.c
# components/bt/bluedroid/profiles/std/avrc/avrc_bld_tg.c
# components/bt/bluedroid/profiles/std/avrc/avrc_opt.c
# components/bt/bluedroid/profiles/std/avrc/avrc_pars_ct.c
# components/bt/bluedroid/profiles/std/avrc/avrc_pars_tg.c
# components/bt/bluedroid/profiles/std/avrc/avrc_sdp.c
# components/bt/bluedroid/profiles/std/avrc/avrc_utils.c
# components/bt/bluedroid/profiles/std/avrc/include/avrc_int.h
# components/bt/bluedroid/profiles/std/include/avct_api.h
# components/bt/bluedroid/profiles/std/include/avdt_api.h
# components/bt/bluedroid/profiles/std/include/avdt_defs.h
# components/bt/bluedroid/profiles/std/include/avdtc_api.h
# components/bt/bluedroid/profiles/std/include/avrc_api.h
# components/bt/bluedroid/profiles/std/include/avrc_defs.h
# components/bt/bluedroid/stack/avdt/include/avdt_defs.h
# components/bt/bluedroid/stack/avrc/avrc_api.c
# components/bt/bluedroid/stack/avrc/avrc_bld_ct.c
# components/bt/bluedroid/stack/avrc/avrc_bld_tg.c
# components/bt/bluedroid/stack/avrc/avrc_opt.c
# components/bt/bluedroid/stack/avrc/avrc_pars_ct.c
# components/bt/bluedroid/stack/avrc/avrc_pars_tg.c
# components/bt/bluedroid/stack/avrc/avrc_sdp.c
# components/bt/bluedroid/stack/avrc/avrc_utils.c
# components/bt/bluedroid/stack/avrc/include/avrc_int.h
# components/bt/bluedroid/stack/btu/btu_task.c
# components/bt/bluedroid/stack/include/avct_api.h
# components/bt/bluedroid/stack/include/avdt_api.h
# components/bt/bluedroid/stack/include/avdtc_api.h
# components/bt/bluedroid/stack/include/avrc_api.h
# components/bt/bluedroid/stack/include/avrc_defs.h
# components/bt/bluedroid/stack/include/gatt_api.h
# components/bt/bluedroid/stack/l2cap/l2c_main.c
# components/bt/component.mk
# examples/06_bluedroid_demos/components/bluedroid_demos/app_core/bt_app_core.c
22 files changed:
components/bt/bluedroid/bta/dm/bta_dm_act.c
components/bt/bluedroid/bta/include/bta_api.h
components/bt/bluedroid/bta/include/bta_gattc_int.h
components/bt/bluedroid/bta/sdp/bta_sdp_cfg.c
components/bt/bluedroid/bta/sys/bta_sys_main.c
components/bt/bluedroid/gki/gki_buffer.c
components/bt/bluedroid/hci/hci_hal_h4.c
components/bt/bluedroid/hci/hci_layer.c
components/bt/bluedroid/hci/packet_fragmenter.c
components/bt/bluedroid/include/bt_defs.h
components/bt/bluedroid/include/bt_target.h
components/bt/bluedroid/osi/alarm.c
components/bt/bluedroid/osi/include/alarm.h
components/bt/bluedroid/osi/include/thread.h
components/bt/bluedroid/stack/btu/btu_init.c
components/bt/bluedroid/stack/btu/btu_task.c
components/bt/bluedroid/stack/include/bt_types.h
components/bt/bluedroid/stack/include/btm_ble_int.h
components/bt/bluedroid/stack/include/gatt_api.h
components/bt/component.mk
examples/13_bt_sdp/components/bluedroid_demos/btif/btif_core.c
examples/13_bt_sdp/components/bluedroid_demos/include/btif_util.h