wangmengyang
|
73f00732cf
|
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
|
2016-11-25 19:45:29 +08:00 |
|
Tian Hao
|
19273c7b2d
|
component/bt : run astyle handle the code files
|
2016-11-25 02:10:15 +08:00 |
|
wangmengyang
|
dae40afffb
|
component/bt: add protection in GKI_getbuf to protect against memory allocation failure;
|
2016-11-25 00:05:39 +08:00 |
|
Tian Hao
|
b80325604d
|
component/bt: add bluedroid 1st version
1. add bluedroid 1st version
2. alarm adapter
3. task semaphore lock
4. other bugs resolved
|
2016-09-26 21:37:39 +08:00 |
|