wangmengyang 50227f12fd Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp ...

# Conflicts:
#	components/bt/bluedroid/bta/include/bta_api.h
#	components/bt/bluedroid/bta/include/bta_gattc_int.h
#	components/bt/bluedroid/hci/hci_hal_h4.c
#	components/bt/bluedroid/hci/hci_layer.c
#	components/bt/bluedroid/include/bt_target.h
#	components/bt/bluedroid/stack/btu/btu_init.c

2016-11-28 18:06:24 +08:00

..

alarm.h

Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp

2016-11-25 19:45:29 +08:00

allocator.h

component/bt : run astyle handle the code files

2016-11-25 02:10:15 +08:00

buffer.h

component/bt: add bluedroid 1st version

2016-09-26 21:37:39 +08:00

fixed_queue.h

component/bt: add bluedroid 1st version

2016-09-26 21:37:39 +08:00

future.h

component/bt : cleanup ^M

2016-10-18 21:49:00 +08:00

hash_functions.h

component/bt: add bluedroid 1st version

2016-09-26 21:37:39 +08:00

hash_map.h

component/bt : run astyle handle the code files

2016-11-25 02:10:15 +08:00

list.h

component/bt: add bluedroid 1st version

2016-09-26 21:37:39 +08:00

osi_arch.h

recover semaphore in fixed_queue to control the queue capacity

2016-10-10 20:37:26 +08:00

osi.h

component/bt: add bluedroid 1st version

2016-09-26 21:37:39 +08:00

thread.h

Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp

2016-11-28 18:06:24 +08:00