]> granicus.if.org Git - esp-idf/commitdiff
component/bt : modify header files to avoid conflict
authorTian Hao <tianhao@espressif.com>
Sun, 8 Apr 2018 04:10:50 +0000 (12:10 +0800)
committerTian Hao <tianhao@espressif.com>
Thu, 26 Apr 2018 11:32:06 +0000 (19:32 +0800)
1. add the L1 include path with a prefix, such like osi/list.h, stack/a2d_api.h and etc.
2. modify component, only bluedroid/api/include/api is export to another component and application,
   other include path just for bluedroid used
3. put bluedroid/include into common/include/common, so the root directory of bluedroid have no include path.
4. modify doxygen to use esp_bt.h and redirect to
component/bt/bluedroid/api/include/api/

fix compile

394 files changed:
components/bt/bluedroid/api/esp_a2dp_api.c
components/bt/bluedroid/api/esp_avrc_api.c
components/bt/bluedroid/api/esp_blufi_api.c
components/bt/bluedroid/api/esp_bt_device.c
components/bt/bluedroid/api/esp_bt_main.c
components/bt/bluedroid/api/esp_gap_ble_api.c
components/bt/bluedroid/api/esp_gap_bt_api.c
components/bt/bluedroid/api/esp_gattc_api.c
components/bt/bluedroid/api/esp_gatts_api.c
components/bt/bluedroid/api/esp_spp_api.c
components/bt/bluedroid/api/include/api/esp_a2dp_api.h [moved from components/bt/bluedroid/api/include/esp_a2dp_api.h with 100% similarity]
components/bt/bluedroid/api/include/api/esp_avrc_api.h [moved from components/bt/bluedroid/api/include/esp_avrc_api.h with 100% similarity]
components/bt/bluedroid/api/include/api/esp_blufi_api.h [moved from components/bt/bluedroid/api/include/esp_blufi_api.h with 100% similarity]
components/bt/bluedroid/api/include/api/esp_bt_defs.h [moved from components/bt/bluedroid/api/include/esp_bt_defs.h with 88% similarity]
components/bt/bluedroid/api/include/api/esp_bt_device.h [moved from components/bt/bluedroid/api/include/esp_bt_device.h with 100% similarity]
components/bt/bluedroid/api/include/api/esp_bt_main.h [moved from components/bt/bluedroid/api/include/esp_bt_main.h with 100% similarity]
components/bt/bluedroid/api/include/api/esp_gap_ble_api.h [moved from components/bt/bluedroid/api/include/esp_gap_ble_api.h with 93% similarity]
components/bt/bluedroid/api/include/api/esp_gap_bt_api.h [moved from components/bt/bluedroid/api/include/esp_gap_bt_api.h with 100% similarity]
components/bt/bluedroid/api/include/api/esp_gatt_common_api.h [moved from components/bt/bluedroid/api/include/esp_gatt_common_api.h with 95% similarity]
components/bt/bluedroid/api/include/api/esp_gatt_defs.h [moved from components/bt/bluedroid/api/include/esp_gatt_defs.h with 85% similarity]
components/bt/bluedroid/api/include/api/esp_gattc_api.h [moved from components/bt/bluedroid/api/include/esp_gattc_api.h with 100% similarity]
components/bt/bluedroid/api/include/api/esp_gatts_api.h [moved from components/bt/bluedroid/api/include/esp_gatts_api.h with 100% similarity]
components/bt/bluedroid/api/include/api/esp_spp_api.h [moved from components/bt/bluedroid/api/include/esp_spp_api.h with 96% similarity]
components/bt/bluedroid/bta/ar/bta_ar.c
components/bt/bluedroid/bta/ar/include/bta_ar_int.h [moved from components/bt/bluedroid/bta/include/bta_ar_int.h with 98% similarity]
components/bt/bluedroid/bta/av/bta_av_aact.c
components/bt/bluedroid/bta/av/bta_av_act.c
components/bt/bluedroid/bta/av/bta_av_api.c
components/bt/bluedroid/bta/av/bta_av_cfg.c
components/bt/bluedroid/bta/av/bta_av_ci.c
components/bt/bluedroid/bta/av/bta_av_main.c
components/bt/bluedroid/bta/av/bta_av_sbc.c
components/bt/bluedroid/bta/av/bta_av_ssm.c
components/bt/bluedroid/bta/av/include/bta_av_int.h [moved from components/bt/bluedroid/bta/include/bta_av_int.h with 99% similarity]
components/bt/bluedroid/bta/dm/bta_dm_act.c
components/bt/bluedroid/bta/dm/bta_dm_api.c
components/bt/bluedroid/bta/dm/bta_dm_cfg.c
components/bt/bluedroid/bta/dm/bta_dm_ci.c
components/bt/bluedroid/bta/dm/bta_dm_co.c [moved from components/bt/bluedroid/btif/bta_dm_co.c with 98% similarity]
components/bt/bluedroid/bta/dm/bta_dm_main.c
components/bt/bluedroid/bta/dm/bta_dm_pm.c
components/bt/bluedroid/bta/dm/bta_dm_sco.c
components/bt/bluedroid/bta/dm/include/bta_dm_int.h [moved from components/bt/bluedroid/bta/include/bta_dm_int.h with 99% similarity]
components/bt/bluedroid/bta/gatt/bta_gatt_common.c
components/bt/bluedroid/bta/gatt/bta_gattc_act.c
components/bt/bluedroid/bta/gatt/bta_gattc_api.c
components/bt/bluedroid/bta/gatt/bta_gattc_cache.c
components/bt/bluedroid/bta/gatt/bta_gattc_ci.c
components/bt/bluedroid/bta/gatt/bta_gattc_co.c [moved from components/bt/bluedroid/btif/bta_gattc_co.c with 99% similarity]
components/bt/bluedroid/bta/gatt/bta_gattc_main.c
components/bt/bluedroid/bta/gatt/bta_gattc_utils.c
components/bt/bluedroid/bta/gatt/bta_gatts_act.c
components/bt/bluedroid/bta/gatt/bta_gatts_api.c
components/bt/bluedroid/bta/gatt/bta_gatts_co.c [moved from components/bt/bluedroid/btif/bta_gatts_co.c with 99% similarity]
components/bt/bluedroid/bta/gatt/bta_gatts_main.c
components/bt/bluedroid/bta/gatt/bta_gatts_utils.c
components/bt/bluedroid/bta/gatt/include/bta_gattc_int.h [moved from components/bt/bluedroid/bta/include/bta_gattc_int.h with 99% similarity]
components/bt/bluedroid/bta/gatt/include/bta_gatts_int.h [moved from components/bt/bluedroid/bta/include/bta_gatts_int.h with 98% similarity]
components/bt/bluedroid/bta/hh/bta_hh_act.c
components/bt/bluedroid/bta/hh/bta_hh_api.c
components/bt/bluedroid/bta/hh/bta_hh_cfg.c
components/bt/bluedroid/bta/hh/bta_hh_le.c
components/bt/bluedroid/bta/hh/bta_hh_main.c
components/bt/bluedroid/bta/hh/bta_hh_utils.c
components/bt/bluedroid/bta/hh/include/bta_hh_int.h [moved from components/bt/bluedroid/bta/include/bta_hh_int.h with 99% similarity]
components/bt/bluedroid/bta/include/bta/bta_api.h [moved from components/bt/bluedroid/bta/include/bta_api.h with 99% similarity]
components/bt/bluedroid/bta/include/bta/bta_ar_api.h [moved from components/bt/bluedroid/bta/include/bta_ar_api.h with 96% similarity]
components/bt/bluedroid/bta/include/bta/bta_av_api.h [moved from components/bt/bluedroid/bta/include/bta_av_api.h with 99% similarity]
components/bt/bluedroid/bta/include/bta/bta_av_ci.h [moved from components/bt/bluedroid/bta/include/bta_av_ci.h with 98% similarity]
components/bt/bluedroid/bta/include/bta/bta_av_co.h [moved from components/bt/bluedroid/bta/include/bta_av_co.h with 99% similarity]
components/bt/bluedroid/bta/include/bta/bta_av_sbc.h [moved from components/bt/bluedroid/bta/include/bta_av_sbc.h with 100% similarity]
components/bt/bluedroid/bta/include/bta/bta_dm_ci.h [moved from components/bt/bluedroid/bta/include/bta_dm_ci.h with 99% similarity]
components/bt/bluedroid/bta/include/bta/bta_dm_co.h [moved from components/bt/bluedroid/bta/include/bta_dm_co.h with 99% similarity]
components/bt/bluedroid/bta/include/bta/bta_gatt_api.h [moved from components/bt/bluedroid/bta/include/bta_gatt_api.h with 99% similarity]
components/bt/bluedroid/bta/include/bta/bta_gatt_common.h [moved from components/bt/bluedroid/bta/include/bta_gatt_common.h with 97% similarity]
components/bt/bluedroid/bta/include/bta/bta_gattc_ci.h [moved from components/bt/bluedroid/bta/include/bta_gattc_ci.h with 99% similarity]
components/bt/bluedroid/bta/include/bta/bta_gattc_co.h [moved from components/bt/bluedroid/bta/include/bta_gattc_co.h with 99% similarity]
components/bt/bluedroid/bta/include/bta/bta_gatts_co.h [moved from components/bt/bluedroid/bta/include/bta_gatts_co.h with 99% similarity]
components/bt/bluedroid/bta/include/bta/bta_hh_api.h [moved from components/bt/bluedroid/bta/include/bta_hh_api.h with 99% similarity]
components/bt/bluedroid/bta/include/bta/bta_hh_co.h [moved from components/bt/bluedroid/bta/include/bta_hh_co.h with 99% similarity]
components/bt/bluedroid/bta/include/bta/bta_jv_api.h [moved from components/bt/bluedroid/bta/include/bta_jv_api.h with 99% similarity]
components/bt/bluedroid/bta/include/bta/bta_jv_co.h [moved from components/bt/bluedroid/bta/include/bta_jv_co.h with 98% similarity]
components/bt/bluedroid/bta/include/bta/bta_sdp_api.h [moved from components/bt/bluedroid/bta/include/bta_sdp_api.h with 98% similarity]
components/bt/bluedroid/bta/include/bta/bta_sys.h [moved from components/bt/bluedroid/bta/include/bta_sys.h with 99% similarity]
components/bt/bluedroid/bta/include/bta/utl.h [moved from components/bt/bluedroid/bta/include/utl.h with 99% similarity]
components/bt/bluedroid/bta/jv/bta_jv_act.c
components/bt/bluedroid/bta/jv/bta_jv_api.c
components/bt/bluedroid/bta/jv/bta_jv_cfg.c
components/bt/bluedroid/bta/jv/bta_jv_main.c
components/bt/bluedroid/bta/jv/include/bta_jv_int.h [moved from components/bt/bluedroid/bta/include/bta_jv_int.h with 98% similarity]
components/bt/bluedroid/bta/sdp/bta_sdp.c
components/bt/bluedroid/bta/sdp/bta_sdp_act.c
components/bt/bluedroid/bta/sdp/bta_sdp_api.c
components/bt/bluedroid/bta/sdp/bta_sdp_cfg.c
components/bt/bluedroid/bta/sdp/include/bta_sdp_int.h [moved from components/bt/bluedroid/bta/include/bta_sdp_int.h with 97% similarity]
components/bt/bluedroid/bta/sys/bta_sys_conn.c
components/bt/bluedroid/bta/sys/bta_sys_main.c
components/bt/bluedroid/bta/sys/utl.c
components/bt/bluedroid/btc/core/btc_alarm.c
components/bt/bluedroid/btc/core/btc_ble_storage.c
components/bt/bluedroid/btc/core/btc_config.c
components/bt/bluedroid/btc/core/btc_dev.c
components/bt/bluedroid/btc/core/btc_dm.c
components/bt/bluedroid/btc/core/btc_main.c
components/bt/bluedroid/btc/core/btc_manage.c
components/bt/bluedroid/btc/core/btc_profile_queue.c
components/bt/bluedroid/btc/core/btc_sm.c
components/bt/bluedroid/btc/core/btc_storage.c
components/bt/bluedroid/btc/core/btc_task.c
components/bt/bluedroid/btc/core/btc_util.c
components/bt/bluedroid/btc/include/btc/btc_alarm.h [moved from components/bt/bluedroid/btc/include/btc_alarm.h with 97% similarity]
components/bt/bluedroid/btc/include/btc/btc_ble_storage.h [moved from components/bt/bluedroid/btc/include/btc_ble_storage.h with 98% similarity]
components/bt/bluedroid/btc/include/btc/btc_common.h [moved from components/bt/bluedroid/btc/include/btc_common.h with 93% similarity]
components/bt/bluedroid/btc/include/btc/btc_config.h [moved from components/bt/bluedroid/btc/include/btc_config.h with 98% similarity]
components/bt/bluedroid/btc/include/btc/btc_dev.h [moved from components/bt/bluedroid/btc/include/btc_dev.h with 97% similarity]
components/bt/bluedroid/btc/include/btc/btc_dm.h [moved from components/bt/bluedroid/btc/include/btc_dm.h with 98% similarity]
components/bt/bluedroid/btc/include/btc/btc_main.h [moved from components/bt/bluedroid/btc/include/btc_main.h with 92% similarity]
components/bt/bluedroid/btc/include/btc/btc_manage.h [moved from components/bt/bluedroid/btc/include/btc_manage.h with 94% similarity]
components/bt/bluedroid/btc/include/btc/btc_profile_queue.h [moved from components/bt/bluedroid/btc/include/btc_profile_queue.h with 94% similarity]
components/bt/bluedroid/btc/include/btc/btc_sm.h [moved from components/bt/bluedroid/btc/include/btc_sm.h with 99% similarity]
components/bt/bluedroid/btc/include/btc/btc_storage.h [moved from components/bt/bluedroid/btc/include/btc_storage.h with 97% similarity]
components/bt/bluedroid/btc/include/btc/btc_task.h [moved from components/bt/bluedroid/btc/include/btc_task.h with 96% similarity]
components/bt/bluedroid/btc/include/btc/btc_util.h [moved from components/bt/bluedroid/btc/include/btc_util.h with 96% similarity]
components/bt/bluedroid/btc/profile/esp/ble_button/button_pro.c
components/bt/bluedroid/btc/profile/esp/blufi/blufi_prf.c
components/bt/bluedroid/btc/profile/esp/blufi/blufi_protocol.c
components/bt/bluedroid/btc/profile/esp/include/btc_blufi_prf.h
components/bt/bluedroid/btc/profile/esp/include/button_pro.h
components/bt/bluedroid/btc/profile/esp/include/wx_airsync_prf.h
components/bt/bluedroid/btc/profile/esp/wechat_AirSync/wx_airsync_prf.c
components/bt/bluedroid/btc/profile/std/a2dp/bta_av_co.c
components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp.c
components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_control.c
components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_sink.c
components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_source.c
components/bt/bluedroid/btc/profile/std/a2dp/btc_av.c
components/bt/bluedroid/btc/profile/std/avrc/btc_avrc.c
components/bt/bluedroid/btc/profile/std/battery/battery_prf.c
components/bt/bluedroid/btc/profile/std/battery/include/srvc_battery_int.h
components/bt/bluedroid/btc/profile/std/dis/dis_profile.c
components/bt/bluedroid/btc/profile/std/dis/include/srvc_dis_int.h
components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c
components/bt/bluedroid/btc/profile/std/gap/btc_gap_bt.c
components/bt/bluedroid/btc/profile/std/gatt/btc_gatt_common.c
components/bt/bluedroid/btc/profile/std/gatt/btc_gattc.c
components/bt/bluedroid/btc/profile/std/gatt/btc_gatts.c
components/bt/bluedroid/btc/profile/std/hid/include/hidh_int.h
components/bt/bluedroid/btc/profile/std/include/bt_sdp.h
components/bt/bluedroid/btc/profile/std/include/btc_a2dp.h
components/bt/bluedroid/btc/profile/std/include/btc_a2dp_control.h
components/bt/bluedroid/btc/profile/std/include/btc_a2dp_sink.h
components/bt/bluedroid/btc/profile/std/include/btc_a2dp_source.h
components/bt/bluedroid/btc/profile/std/include/btc_av.h
components/bt/bluedroid/btc/profile/std/include/btc_av_api.h
components/bt/bluedroid/btc/profile/std/include/btc_avrc.h
components/bt/bluedroid/btc/profile/std/include/btc_gap_bt.h
components/bt/bluedroid/btc/profile/std/include/btc_gatt_common.h
components/bt/bluedroid/btc/profile/std/include/btc_gatt_util.h
components/bt/bluedroid/btc/profile/std/include/btc_gattc.h
components/bt/bluedroid/btc/profile/std/include/btc_gatts.h
components/bt/bluedroid/btc/profile/std/include/btc_spp.h
components/bt/bluedroid/btc/profile/std/include/dis_api.h
components/bt/bluedroid/btc/profile/std/include/hid_le_prf.h
components/bt/bluedroid/btc/profile/std/include/srvc_api.h
components/bt/bluedroid/btc/profile/std/smp/include/esp_sec_api.h
components/bt/bluedroid/btc/profile/std/spp/btc_spp.c
components/bt/bluedroid/common/include/common/bt_common_types.h [moved from components/bt/bluedroid/include/bt_common_types.h with 95% similarity]
components/bt/bluedroid/common/include/common/bt_defs.h [moved from components/bt/bluedroid/include/bt_defs.h with 96% similarity]
components/bt/bluedroid/common/include/common/bt_target.h [moved from components/bt/bluedroid/include/bt_target.h with 99% similarity]
components/bt/bluedroid/common/include/common/bt_trace.h [moved from components/bt/bluedroid/include/bt_trace.h with 99% similarity]
components/bt/bluedroid/common/include/common/bt_vendor_lib.h [moved from components/bt/bluedroid/hci/include/bt_vendor_lib.h with 100% similarity]
components/bt/bluedroid/common/include/common/bte.h [moved from components/bt/bluedroid/include/bte.h with 98% similarity]
components/bt/bluedroid/common/include/common/bte_appl.h [moved from components/bt/bluedroid/include/bte_appl.h with 100% similarity]
components/bt/bluedroid/device/bdaddr.c [moved from components/bt/bluedroid/btcore/bdaddr.c with 98% similarity]
components/bt/bluedroid/device/controller.c
components/bt/bluedroid/device/include/device/bdaddr.h [moved from components/bt/bluedroid/btcore/include/bdaddr.h with 97% similarity]
components/bt/bluedroid/device/include/device/controller.h [moved from components/bt/bluedroid/device/include/controller.h with 93% similarity]
components/bt/bluedroid/device/include/device/device_features.h [moved from components/bt/bluedroid/btcore/include/device_features.h with 100% similarity]
components/bt/bluedroid/device/include/device/event_mask.h [moved from components/bt/bluedroid/btcore/include/event_mask.h with 100% similarity]
components/bt/bluedroid/device/include/device/interop.h [moved from components/bt/bluedroid/device/include/interop.h with 96% similarity]
components/bt/bluedroid/device/include/device/interop_database.h [moved from components/bt/bluedroid/device/include/interop_database.h with 98% similarity]
components/bt/bluedroid/device/include/device/version.h [moved from components/bt/bluedroid/btcore/include/version.h with 100% similarity]
components/bt/bluedroid/device/interop.c
components/bt/bluedroid/external/sbc/decoder/srce/alloc.c
components/bt/bluedroid/external/sbc/decoder/srce/bitalloc-sbc.c
components/bt/bluedroid/external/sbc/decoder/srce/bitalloc.c
components/bt/bluedroid/external/sbc/decoder/srce/bitstream-decode.c
components/bt/bluedroid/external/sbc/decoder/srce/decoder-oina.c
components/bt/bluedroid/external/sbc/decoder/srce/decoder-private.c
components/bt/bluedroid/external/sbc/decoder/srce/decoder-sbc.c
components/bt/bluedroid/external/sbc/decoder/srce/dequant.c
components/bt/bluedroid/external/sbc/decoder/srce/framing-sbc.c
components/bt/bluedroid/external/sbc/decoder/srce/framing.c
components/bt/bluedroid/external/sbc/decoder/srce/oi_codec_version.c
components/bt/bluedroid/external/sbc/decoder/srce/synthesis-8-generated.c
components/bt/bluedroid/external/sbc/decoder/srce/synthesis-dct8.c
components/bt/bluedroid/external/sbc/decoder/srce/synthesis-sbc.c
components/bt/bluedroid/external/sbc/encoder/include/sbc_encoder.h
components/bt/bluedroid/external/sbc/encoder/include/sbc_types.h
components/bt/bluedroid/external/sbc/encoder/srce/sbc_analysis.c
components/bt/bluedroid/external/sbc/encoder/srce/sbc_dct.c
components/bt/bluedroid/external/sbc/encoder/srce/sbc_dct_coeffs.c
components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_mono.c
components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_ste.c
components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_coeffs.c
components/bt/bluedroid/external/sbc/encoder/srce/sbc_encoder.c
components/bt/bluedroid/external/sbc/encoder/srce/sbc_packing.c
components/bt/bluedroid/hci/buffer_allocator.c
components/bt/bluedroid/hci/hci_hal_h4.c
components/bt/bluedroid/hci/hci_layer.c
components/bt/bluedroid/hci/hci_packet_factory.c
components/bt/bluedroid/hci/hci_packet_parser.c
components/bt/bluedroid/hci/include/hci/bt_vendor_lib.h [moved from components/bt/bluedroid/include/bt_vendor_lib.h with 100% similarity]
components/bt/bluedroid/hci/include/hci/buffer_allocator.h [moved from components/bt/bluedroid/hci/include/buffer_allocator.h with 97% similarity]
components/bt/bluedroid/hci/include/hci/hci_hal.h [moved from components/bt/bluedroid/hci/include/hci_hal.h with 99% similarity]
components/bt/bluedroid/hci/include/hci/hci_internals.h [moved from components/bt/bluedroid/hci/include/hci_internals.h with 100% similarity]
components/bt/bluedroid/hci/include/hci/hci_layer.h [moved from components/bt/bluedroid/hci/include/hci_layer.h with 97% similarity]
components/bt/bluedroid/hci/include/hci/hci_packet_factory.h [moved from components/bt/bluedroid/hci/include/hci_packet_factory.h with 97% similarity]
components/bt/bluedroid/hci/include/hci/hci_packet_parser.h [moved from components/bt/bluedroid/hci/include/hci_packet_parser.h with 95% similarity]
components/bt/bluedroid/hci/include/hci/packet_fragmenter.h [moved from components/bt/bluedroid/hci/include/packet_fragmenter.h with 96% similarity]
components/bt/bluedroid/hci/packet_fragmenter.c
components/bt/bluedroid/main/bte_init.c
components/bt/bluedroid/main/bte_main.c
components/bt/bluedroid/osi/alarm.c
components/bt/bluedroid/osi/allocator.c
components/bt/bluedroid/osi/buffer.c
components/bt/bluedroid/osi/config.c
components/bt/bluedroid/osi/fixed_queue.c
components/bt/bluedroid/osi/future.c
components/bt/bluedroid/osi/hash_functions.c
components/bt/bluedroid/osi/hash_map.c
components/bt/bluedroid/osi/include/osi/alarm.h [moved from components/bt/bluedroid/osi/include/alarm.h with 100% similarity]
components/bt/bluedroid/osi/include/osi/allocator.h [moved from components/bt/bluedroid/osi/include/allocator.h with 100% similarity]
components/bt/bluedroid/osi/include/osi/buffer.h [moved from components/bt/bluedroid/osi/include/buffer.h with 100% similarity]
components/bt/bluedroid/osi/include/osi/config.h [moved from components/bt/bluedroid/osi/include/config.h with 100% similarity]
components/bt/bluedroid/osi/include/osi/fixed_queue.h [moved from components/bt/bluedroid/osi/include/fixed_queue.h with 99% similarity]
components/bt/bluedroid/osi/include/osi/future.h [moved from components/bt/bluedroid/osi/include/future.h with 98% similarity]
components/bt/bluedroid/osi/include/osi/hash_functions.h [moved from components/bt/bluedroid/osi/include/hash_functions.h with 97% similarity]
components/bt/bluedroid/osi/include/osi/hash_map.h [moved from components/bt/bluedroid/osi/include/hash_map.h with 100% similarity]
components/bt/bluedroid/osi/include/osi/list.h [moved from components/bt/bluedroid/osi/include/list.h with 100% similarity]
components/bt/bluedroid/osi/include/osi/mutex.h [moved from components/bt/bluedroid/osi/include/mutex.h with 100% similarity]
components/bt/bluedroid/osi/include/osi/osi.h [moved from components/bt/bluedroid/osi/include/osi.h with 100% similarity]
components/bt/bluedroid/osi/include/osi/semaphore.h [moved from components/bt/bluedroid/osi/include/semaphore.h with 100% similarity]
components/bt/bluedroid/osi/include/osi/thread.h [moved from components/bt/bluedroid/osi/include/thread.h with 99% similarity]
components/bt/bluedroid/osi/list.c
components/bt/bluedroid/osi/mutex.c
components/bt/bluedroid/osi/osi.c
components/bt/bluedroid/osi/semaphore.c
components/bt/bluedroid/stack/a2dp/a2d_api.c
components/bt/bluedroid/stack/a2dp/a2d_sbc.c
components/bt/bluedroid/stack/a2dp/include/a2d_int.h
components/bt/bluedroid/stack/avct/avct_api.c
components/bt/bluedroid/stack/avct/avct_ccb.c
components/bt/bluedroid/stack/avct/avct_l2c.c
components/bt/bluedroid/stack/avct/avct_lcb.c
components/bt/bluedroid/stack/avct/avct_lcb_act.c
components/bt/bluedroid/stack/avct/include/avct_int.h
components/bt/bluedroid/stack/avdt/avdt_ad.c
components/bt/bluedroid/stack/avdt/avdt_api.c
components/bt/bluedroid/stack/avdt/avdt_ccb.c
components/bt/bluedroid/stack/avdt/avdt_ccb_act.c
components/bt/bluedroid/stack/avdt/avdt_l2c.c
components/bt/bluedroid/stack/avdt/avdt_msg.c
components/bt/bluedroid/stack/avdt/avdt_scb.c
components/bt/bluedroid/stack/avdt/avdt_scb_act.c
components/bt/bluedroid/stack/avdt/include/avdt_defs.h
components/bt/bluedroid/stack/avdt/include/avdt_int.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/btm/btm_acl.c
components/bt/bluedroid/stack/btm/btm_ble.c
components/bt/bluedroid/stack/btm/btm_ble_addr.c
components/bt/bluedroid/stack/btm/btm_ble_adv_filter.c
components/bt/bluedroid/stack/btm/btm_ble_batchscan.c
components/bt/bluedroid/stack/btm/btm_ble_bgconn.c
components/bt/bluedroid/stack/btm/btm_ble_cont_energy.c
components/bt/bluedroid/stack/btm/btm_ble_gap.c
components/bt/bluedroid/stack/btm/btm_ble_multi_adv.c
components/bt/bluedroid/stack/btm/btm_ble_privacy.c
components/bt/bluedroid/stack/btm/btm_dev.c
components/bt/bluedroid/stack/btm/btm_devctl.c
components/bt/bluedroid/stack/btm/btm_inq.c
components/bt/bluedroid/stack/btm/btm_main.c
components/bt/bluedroid/stack/btm/btm_pm.c
components/bt/bluedroid/stack/btm/btm_sco.c
components/bt/bluedroid/stack/btm/btm_sec.c
components/bt/bluedroid/stack/btm/include/btm_ble_int.h [moved from components/bt/bluedroid/stack/include/btm_ble_int.h with 99% similarity]
components/bt/bluedroid/stack/btm/include/btm_int.h [moved from components/bt/bluedroid/stack/include/btm_int.h with 99% similarity]
components/bt/bluedroid/stack/btu/btu_hcif.c
components/bt/bluedroid/stack/btu/btu_init.c
components/bt/bluedroid/stack/btu/btu_task.c
components/bt/bluedroid/stack/gap/gap_api.c
components/bt/bluedroid/stack/gap/gap_ble.c
components/bt/bluedroid/stack/gap/gap_conn.c
components/bt/bluedroid/stack/gap/gap_utils.c
components/bt/bluedroid/stack/gap/include/gap_int.h
components/bt/bluedroid/stack/gatt/att_protocol.c
components/bt/bluedroid/stack/gatt/gatt_api.c
components/bt/bluedroid/stack/gatt/gatt_attr.c
components/bt/bluedroid/stack/gatt/gatt_auth.c
components/bt/bluedroid/stack/gatt/gatt_cl.c
components/bt/bluedroid/stack/gatt/gatt_db.c
components/bt/bluedroid/stack/gatt/gatt_main.c
components/bt/bluedroid/stack/gatt/gatt_sr.c
components/bt/bluedroid/stack/gatt/gatt_utils.c
components/bt/bluedroid/stack/gatt/include/gatt_int.h
components/bt/bluedroid/stack/hcic/hciblecmds.c
components/bt/bluedroid/stack/hcic/hcicmds.c
components/bt/bluedroid/stack/include/stack/a2d_api.h [moved from components/bt/bluedroid/stack/include/a2d_api.h with 99% similarity]
components/bt/bluedroid/stack/include/stack/a2d_sbc.h [moved from components/bt/bluedroid/stack/include/a2d_sbc.h with 100% similarity]
components/bt/bluedroid/stack/include/stack/avct_api.h [moved from components/bt/bluedroid/stack/include/avct_api.h with 99% similarity]
components/bt/bluedroid/stack/include/stack/avdt_api.h [moved from components/bt/bluedroid/stack/include/avdt_api.h with 99% similarity]
components/bt/bluedroid/stack/include/stack/avdtc_api.h [moved from components/bt/bluedroid/stack/include/avdtc_api.h with 99% similarity]
components/bt/bluedroid/stack/include/stack/avrc_api.h [moved from components/bt/bluedroid/stack/include/avrc_api.h with 99% similarity]
components/bt/bluedroid/stack/include/stack/avrc_defs.h [moved from components/bt/bluedroid/stack/include/avrc_defs.h with 99% similarity]
components/bt/bluedroid/stack/include/stack/bt_types.h [moved from components/bt/bluedroid/stack/include/bt_types.h with 100% similarity]
components/bt/bluedroid/stack/include/stack/btm_api.h [moved from components/bt/bluedroid/stack/include/btm_api.h with 99% similarity]
components/bt/bluedroid/stack/include/stack/btm_ble_api.h [moved from components/bt/bluedroid/stack/include/btm_ble_api.h with 99% similarity]
components/bt/bluedroid/stack/include/stack/btu.h [moved from components/bt/bluedroid/stack/include/btu.h with 99% similarity]
components/bt/bluedroid/stack/include/stack/dyn_mem.h [moved from components/bt/bluedroid/stack/include/dyn_mem.h with 100% similarity]
components/bt/bluedroid/stack/include/stack/gap_api.h [moved from components/bt/bluedroid/stack/include/gap_api.h with 99% similarity]
components/bt/bluedroid/stack/include/stack/gatt_api.h [moved from components/bt/bluedroid/stack/include/gatt_api.h with 99% similarity]
components/bt/bluedroid/stack/include/stack/gattdefs.h [moved from components/bt/bluedroid/stack/include/gattdefs.h with 100% similarity]
components/bt/bluedroid/stack/include/stack/hcidefs.h [moved from components/bt/bluedroid/stack/include/hcidefs.h with 99% similarity]
components/bt/bluedroid/stack/include/stack/hcimsgs.h [moved from components/bt/bluedroid/stack/include/hcimsgs.h with 99% similarity]
components/bt/bluedroid/stack/include/stack/hiddefs.h [moved from components/bt/bluedroid/stack/include/hiddefs.h with 98% similarity]
components/bt/bluedroid/stack/include/stack/hidh_api.h [moved from components/bt/bluedroid/stack/include/hidh_api.h with 99% similarity]
components/bt/bluedroid/stack/include/stack/l2c_api.h [moved from components/bt/bluedroid/stack/include/l2c_api.h with 99% similarity]
components/bt/bluedroid/stack/include/stack/l2cap_client.h [moved from components/bt/bluedroid/stack/include/l2cap_client.h with 100% similarity]
components/bt/bluedroid/stack/include/stack/l2cdefs.h [moved from components/bt/bluedroid/stack/include/l2cdefs.h with 100% similarity]
components/bt/bluedroid/stack/include/stack/port_api.h [moved from components/bt/bluedroid/stack/include/port_api.h with 99% similarity]
components/bt/bluedroid/stack/include/stack/port_ext.h [moved from components/bt/bluedroid/stack/include/port_ext.h with 100% similarity]
components/bt/bluedroid/stack/include/stack/profiles_api.h [moved from components/bt/bluedroid/stack/include/profiles_api.h with 98% similarity]
components/bt/bluedroid/stack/include/stack/rfcdefs.h [moved from components/bt/bluedroid/stack/include/rfcdefs.h with 100% similarity]
components/bt/bluedroid/stack/include/stack/sdp_api.h [moved from components/bt/bluedroid/stack/include/sdp_api.h with 99% similarity]
components/bt/bluedroid/stack/include/stack/sdpdefs.h [moved from components/bt/bluedroid/stack/include/sdpdefs.h with 100% similarity]
components/bt/bluedroid/stack/include/stack/smp_api.h [moved from components/bt/bluedroid/stack/include/smp_api.h with 99% similarity]
components/bt/bluedroid/stack/l2cap/include/l2c_int.h
components/bt/bluedroid/stack/l2cap/l2c_api.c
components/bt/bluedroid/stack/l2cap/l2c_ble.c
components/bt/bluedroid/stack/l2cap/l2c_csm.c
components/bt/bluedroid/stack/l2cap/l2c_fcr.c
components/bt/bluedroid/stack/l2cap/l2c_link.c
components/bt/bluedroid/stack/l2cap/l2c_main.c
components/bt/bluedroid/stack/l2cap/l2c_ucd.c
components/bt/bluedroid/stack/l2cap/l2c_utils.c
components/bt/bluedroid/stack/l2cap/l2cap_client.c
components/bt/bluedroid/stack/rfcomm/include/port_int.h
components/bt/bluedroid/stack/rfcomm/include/rfc_int.h
components/bt/bluedroid/stack/rfcomm/port_api.c
components/bt/bluedroid/stack/rfcomm/port_rfc.c
components/bt/bluedroid/stack/rfcomm/port_utils.c
components/bt/bluedroid/stack/rfcomm/rfc_l2cap_if.c
components/bt/bluedroid/stack/rfcomm/rfc_mx_fsm.c
components/bt/bluedroid/stack/rfcomm/rfc_port_fsm.c
components/bt/bluedroid/stack/rfcomm/rfc_port_if.c
components/bt/bluedroid/stack/rfcomm/rfc_ts_frames.c
components/bt/bluedroid/stack/rfcomm/rfc_utils.c
components/bt/bluedroid/stack/sdp/include/sdpint.h
components/bt/bluedroid/stack/sdp/sdp_api.c
components/bt/bluedroid/stack/sdp/sdp_db.c
components/bt/bluedroid/stack/sdp/sdp_discovery.c
components/bt/bluedroid/stack/sdp/sdp_main.c
components/bt/bluedroid/stack/sdp/sdp_server.c
components/bt/bluedroid/stack/sdp/sdp_utils.c
components/bt/bluedroid/stack/smp/aes.c
components/bt/bluedroid/stack/smp/include/p_256_multprecision.h
components/bt/bluedroid/stack/smp/include/smp_int.h
components/bt/bluedroid/stack/smp/p_256_multprecision.c
components/bt/bluedroid/stack/smp/smp_act.c
components/bt/bluedroid/stack/smp/smp_api.c
components/bt/bluedroid/stack/smp/smp_br_main.c
components/bt/bluedroid/stack/smp/smp_cmac.c
components/bt/bluedroid/stack/smp/smp_keys.c
components/bt/bluedroid/stack/smp/smp_l2c.c
components/bt/bluedroid/stack/smp/smp_main.c
components/bt/bluedroid/stack/smp/smp_utils.c
components/bt/component.mk
docs/Doxyfile
docs/en/api-reference/bluetooth/controller_vhci.rst
examples/bluetooth/ble_ibeacon/main/esp_ibeacon_api.c
examples/bluetooth/ble_ibeacon/main/esp_ibeacon_api.h
examples/bluetooth/ble_ibeacon/main/ibeacon_demo.c
examples/bluetooth/ble_spp_client/main/spp_client_demo.c
examples/bluetooth/gatt_client/main/gattc_demo.c
examples/bluetooth/gatt_security_client/main/example_ble_sec_gattc_demo.c
examples/bluetooth/gattc_multi_connect/main/gattc_multi_connect.c

index 2141ce0c23d852ae37c40d72f43ce9727403990f..a7a2df08d74995a56e820f1b8d4be43c3cb5243c 100644 (file)
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include <string.h>
 #include "esp_err.h"
 #include "esp_a2dp_api.h"
 #include "esp_bt_main.h"
-#include "btc_manage.h"
+#include "btc/btc_manage.h"
 #include "btc_av.h"
 
 #if BTC_AV_INCLUDED
index 2523665c2061a2f1baf51acc7f6f493b3c069094..3c80c538162966433a0b3e79783ea7490e8c776b 100644 (file)
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include <string.h>
 #include "esp_err.h"
 #include "esp_avrc_api.h"
 #include "esp_bt_main.h"
-#include "btc_manage.h"
+#include "btc/btc_manage.h"
 #include "btc_avrc.h"
 
 #if BTC_AV_INCLUDED
index 4ecb6f006150ac6fb3b55d3ef15e10caef0070fe..e6d8648ab8b489bb3b6a0949f00d1fdefab49bed 100644 (file)
 #include "esp_blufi_api.h"
 #include "esp_bt_defs.h"
 #include "esp_bt_main.h"
-#include "btc_task.h"
+#include "btc/btc_task.h"
 #include "btc_blufi_prf.h"
-#include "btc_manage.h"
-#include "btc_main.h"
-#include "future.h"
+#include "btc/btc_manage.h"
+#include "btc/btc_main.h"
+#include "osi/future.h"
 #include "btc_gatts.h"
 #include "btc_gatt_util.h"
 
index c50ada980e04f504d9e86c274403a158c5183bda..212157e06dd459693665e39c0a0e2411471d59c5 100644 (file)
@@ -16,9 +16,9 @@
 #include <string.h>
 #include "esp_bt_device.h"
 #include "esp_bt_main.h"
-#include "controller.h"
-#include "btc_task.h"
-#include "btc_dev.h"
+#include "device/controller.h"
+#include "btc/btc_task.h"
+#include "btc/btc_dev.h"
 
 const uint8_t *esp_bt_dev_get_address(void)
 {
index b904a0509b2fe4841f9dd912d48da7db6fb74137..1b4f46c52d5bf664d37c0e7ab9e5c9d9779daa63 100644 (file)
 
 
 #include "esp_bt_main.h"
-#include "btc_task.h"
-#include "btc_main.h"
+#include "btc/btc_task.h"
+#include "btc/btc_main.h"
 #include "esp_bt.h"
-#include "future.h"
-#include "allocator.h"
+#include "osi/future.h"
+#include "osi/allocator.h"
 
 static bool bd_already_enable = false;
 static bool bd_already_init = false;
index 49ec7137a926288b3af95a89d4ab363a43ac9fa0..a73eca9d675b006341018ba3113f010bae9d24b0 100644 (file)
 #include "esp_bt_device.h"
 #include "esp_bt_main.h"
 #include "esp_gap_ble_api.h"
-#include "bta_api.h"
-#include "bt_trace.h"
-#include "btc_manage.h"
+#include "bta/bta_api.h"
+#include "common/bt_trace.h"
+#include "btc/btc_manage.h"
 #include "btc_gap_ble.h"
-#include "btc_ble_storage.h"
+#include "btc/btc_ble_storage.h"
 
 
 esp_err_t esp_ble_gap_register_callback(esp_gap_ble_cb_t callback)
index 5d887fa28c7b54dd90b8591d12984f87e51d4c71..9f3f427861c937febc35a5482ac842c610f78b55 100644 (file)
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include <string.h>
 #include "esp_bt_main.h"
 #include "esp_gap_bt_api.h"
-#include "bt_trace.h"
-#include "btc_manage.h"
+#include "common/bt_trace.h"
+#include "btc/btc_manage.h"
 #include "btc_gap_bt.h"
 
 #if (BTC_GAP_BT_INCLUDED == TRUE)
index 6246cc8fd9c109a9774dcf9124d0bae13108f0d7..32d840fe95c0b1c3badbf7c5e698c1b6a117144b 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "esp_gattc_api.h"
 #include "esp_bt_main.h"
-#include "btc_manage.h"
+#include "btc/btc_manage.h"
 #include "btc_gattc.h"
 #include "btc_gatt_util.h"
 
index 4d2a6f5f8e2dbe904330c3595309024925933b02..fc1dc81ca20e039079f454d655483bc47291779f 100644 (file)
 #include "esp_gatt_defs.h"
 #include "esp_gatts_api.h"
 #include "esp_bt_main.h"
-#include "btc_manage.h"
+#include "btc/btc_manage.h"
 #include "btc_gatts.h"
 #include "btc_gatt_util.h"
-#include "bt_target.h"
+#include "common/bt_target.h"
 #if (GATTS_INCLUDED == TRUE)
 #define COPY_TO_GATTS_ARGS(_gatt_args, _arg, _arg_type) memcpy(_gatt_args, _arg, sizeof(_arg_type))
 
index d8935259968c908f780ae39cba246cbdb4da60b3..fe4db951beb2f4e364cb8ab5373e70b7b2a6910e 100644 (file)
 #include <string.h>
 
 #include "esp_bt_main.h"
-#include "btc_manage.h"
+#include "btc/btc_manage.h"
 
 #include "btc_spp.h"
 #include "esp_spp_api.h"
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if (defined BTC_SPP_INCLUDED && BTC_SPP_INCLUDED == TRUE)
 
similarity index 88%
rename from components/bt/bluedroid/api/include/esp_bt_defs.h
rename to components/bt/bluedroid/api/include/api/esp_bt_defs.h
index aa3cdb45ad626384513eabaa4a544a41870c5b7e..33f46e8d470f291c4d4fd2e6dedc4e1858120eb4 100644 (file)
@@ -48,9 +48,9 @@ typedef enum {
     ESP_BT_STATUS_UNACCEPT_CONN_INTERVAL,       /* relate to BT_UNACCEPT_CONN_INTERVAL in bt_def.h */
     ESP_BT_STATUS_PARAM_OUT_OF_RANGE,           /* relate to BT_PARAM_OUT_OF_RANGE in bt_def.h */
     ESP_BT_STATUS_TIMEOUT,                      /* relate to BT_STATUS_TIMEOUT in bt_def.h */
-    ESP_BT_STATUS_PEER_LE_DATA_LEN_UNSUPPORTED, /* relate to BTM_PEER_LE_DATA_LEN_UNSUPPORTED in btm_api.h */
-    ESP_BT_STATUS_CONTROL_LE_DATA_LEN_UNSUPPORTED,/* relate to BTM_CONTROL_LE_DATA_LEN_UNSUPPORTED in btm_api.h */
-    ESP_BT_STATUS_ERR_ILLEGAL_PARAMETER_FMT,    /* relate to HCI_ERR_ILLEGAL_PARAMETER_FMT in hcidefs.h */
+    ESP_BT_STATUS_PEER_LE_DATA_LEN_UNSUPPORTED, /* relate to BTM_PEER_LE_DATA_LEN_UNSUPPORTED in stack/btm_api.h */
+    ESP_BT_STATUS_CONTROL_LE_DATA_LEN_UNSUPPORTED,/* relate to BTM_CONTROL_LE_DATA_LEN_UNSUPPORTED in stack/btm_api.h */
+    ESP_BT_STATUS_ERR_ILLEGAL_PARAMETER_FMT,    /* relate to HCI_ERR_ILLEGAL_PARAMETER_FMT in stack/hcidefs.h */
     ESP_BT_STATUS_MEMORY_FULL,                  /* relate to BT_STATUS_MEMORY_FULL in bt_def.h */
 } esp_bt_status_t;
 
@@ -67,13 +67,13 @@ typedef uint8_t esp_link_key[ESP_BT_OCTET16_LEN];      /* Link Key */
 /// Default GATT interface id
 #define ESP_DEFAULT_GATT_IF             0xff
 
-#define ESP_BLE_CONN_INT_MIN                0x0006       /*!< relate to BTM_BLE_CONN_INT_MIN in btm_ble_api.h */
-#define ESP_BLE_CONN_INT_MAX                0x0C80       /*!< relate to BTM_BLE_CONN_INT_MAX in btm_ble_api.h */
-#define ESP_BLE_CONN_LATENCY_MAX            500          /*!< relate to ESP_BLE_CONN_LATENCY_MAX in btm_ble_api.h */
-#define ESP_BLE_CONN_SUP_TOUT_MIN           0x000A       /*!< relate to BTM_BLE_CONN_SUP_TOUT_MIN in btm_ble_api.h */
-#define ESP_BLE_CONN_SUP_TOUT_MAX           0x0C80       /*!< relate to ESP_BLE_CONN_SUP_TOUT_MAX in btm_ble_api.h */
-#define ESP_BLE_CONN_PARAM_UNDEF            0xffff       /* use this value when a specific value not to be overwritten */ /* relate to ESP_BLE_CONN_PARAM_UNDEF in btm_ble_api.h */
-#define ESP_BLE_SCAN_PARAM_UNDEF            0xffffffff   /* relate to ESP_BLE_SCAN_PARAM_UNDEF in btm_ble_api.h */
+#define ESP_BLE_CONN_INT_MIN                0x0006       /*!< relate to BTM_BLE_CONN_INT_MIN in stack/btm_ble_api.h */
+#define ESP_BLE_CONN_INT_MAX                0x0C80       /*!< relate to BTM_BLE_CONN_INT_MAX in stack/btm_ble_api.h */
+#define ESP_BLE_CONN_LATENCY_MAX            500          /*!< relate to ESP_BLE_CONN_LATENCY_MAX in stack/btm_ble_api.h */
+#define ESP_BLE_CONN_SUP_TOUT_MIN           0x000A       /*!< relate to BTM_BLE_CONN_SUP_TOUT_MIN in stack/btm_ble_api.h */
+#define ESP_BLE_CONN_SUP_TOUT_MAX           0x0C80       /*!< relate to ESP_BLE_CONN_SUP_TOUT_MAX in stack/btm_ble_api.h */
+#define ESP_BLE_CONN_PARAM_UNDEF            0xffff       /* use this value when a specific value not to be overwritten */ /* relate to ESP_BLE_CONN_PARAM_UNDEF in stack/btm_ble_api.h */
+#define ESP_BLE_SCAN_PARAM_UNDEF            0xffffffff   /* relate to ESP_BLE_SCAN_PARAM_UNDEF in stack/btm_ble_api.h */
 
 /// Check the param is valid or not
 #define ESP_BLE_IS_VALID_PARAM(x, min, max)  (((x) >= (min) && (x) <= (max)) || ((x) == ESP_BLE_CONN_PARAM_UNDEF))
@@ -113,13 +113,13 @@ typedef enum {
 } esp_ble_addr_type_t;
 
 /// Used to exchange the encrytyption key in the init key & response key
-#define ESP_BLE_ENC_KEY_MASK    (1 << 0)            /* relate to BTM_BLE_ENC_KEY_MASK in btm_api.h */
+#define ESP_BLE_ENC_KEY_MASK    (1 << 0)            /* relate to BTM_BLE_ENC_KEY_MASK in stack/btm_api.h */
 /// Used to exchange the IRK key in the init key & response key
-#define ESP_BLE_ID_KEY_MASK     (1 << 1)            /* relate to BTM_BLE_ID_KEY_MASK in btm_api.h */
+#define ESP_BLE_ID_KEY_MASK     (1 << 1)            /* relate to BTM_BLE_ID_KEY_MASK in stack/btm_api.h */
 /// Used to exchange the CSRK key in the init key & response key
-#define ESP_BLE_CSR_KEY_MASK    (1 << 2)            /* relate to BTM_BLE_CSR_KEY_MASK in btm_api.h */
+#define ESP_BLE_CSR_KEY_MASK    (1 << 2)            /* relate to BTM_BLE_CSR_KEY_MASK in stack/btm_api.h */
 /// Used to exchange the link key(this key just used in the BLE & BR/EDR coexist mode) in the init key & response key
-#define ESP_BLE_LINK_KEY_MASK   (1 << 3)            /* relate to BTM_BLE_LINK_KEY_MASK in btm_api.h */
+#define ESP_BLE_LINK_KEY_MASK   (1 << 3)            /* relate to BTM_BLE_LINK_KEY_MASK in stack/btm_api.h */
 typedef uint8_t esp_ble_key_mask_t;            /* the key mask type */
 
 /// Minimum of the application id
similarity index 93%
rename from components/bt/bluedroid/api/include/esp_gap_ble_api.h
rename to components/bt/bluedroid/api/include/api/esp_gap_ble_api.h
index 495c8fb156222432f3d4df630ef4c0ac54676f8d..fe5bd04eeb12b33169030c0a7d688e314aa6ec66 100644 (file)
@@ -38,34 +38,34 @@ extern "C" {
  * @}
  */
 
-/* relate to BTM_LE_KEY_xxx in btm_api.h */
-#define ESP_LE_KEY_NONE                    0                                                                         /* relate to BTM_LE_KEY_NONE in btm_api.h */
-#define ESP_LE_KEY_PENC                    (1 << 0)   /*!< encryption key, encryption information of peer device */  /* relate to BTM_LE_KEY_PENC in btm_api.h */
-#define ESP_LE_KEY_PID                     (1 << 1)   /*!< identity key of the peer device */                        /* relate to BTM_LE_KEY_PID in btm_api.h */
-#define ESP_LE_KEY_PCSRK                   (1 << 2)   /*!< peer SRK */                                               /* relate to BTM_LE_KEY_PCSRK in btm_api.h */
-#define ESP_LE_KEY_PLK                     (1 << 3)   /*!< Link key*/                                                /* relate to BTM_LE_KEY_PLK in btm_api.h */
-#define ESP_LE_KEY_LLK                     (ESP_LE_KEY_PLK << 4)                                                     /* relate to BTM_LE_KEY_LLK in btm_api.h */
-#define ESP_LE_KEY_LENC                    (ESP_LE_KEY_PENC << 4)   /*!< master role security information:div */     /* relate to BTM_LE_KEY_LENC in btm_api.h */
-#define ESP_LE_KEY_LID                     (ESP_LE_KEY_PID << 4)    /*!< master device ID key */                     /* relate to BTM_LE_KEY_LID in btm_api.h */
-#define ESP_LE_KEY_LCSRK                   (ESP_LE_KEY_PCSRK << 4)  /*!< local CSRK has been deliver to peer */      /* relate to BTM_LE_KEY_LCSRK in btm_api.h */
+/* relate to BTM_LE_KEY_xxx in stack/btm_api.h */
+#define ESP_LE_KEY_NONE                    0                                                                         /* relate to BTM_LE_KEY_NONE in stack/btm_api.h */
+#define ESP_LE_KEY_PENC                    (1 << 0)   /*!< encryption key, encryption information of peer device */  /* relate to BTM_LE_KEY_PENC in stack/btm_api.h */
+#define ESP_LE_KEY_PID                     (1 << 1)   /*!< identity key of the peer device */                        /* relate to BTM_LE_KEY_PID in stack/btm_api.h */
+#define ESP_LE_KEY_PCSRK                   (1 << 2)   /*!< peer SRK */                                               /* relate to BTM_LE_KEY_PCSRK in stack/btm_api.h */
+#define ESP_LE_KEY_PLK                     (1 << 3)   /*!< Link key*/                                                /* relate to BTM_LE_KEY_PLK in stack/btm_api.h */
+#define ESP_LE_KEY_LLK                     (ESP_LE_KEY_PLK << 4)                                                     /* relate to BTM_LE_KEY_LLK in stack/btm_api.h */
+#define ESP_LE_KEY_LENC                    (ESP_LE_KEY_PENC << 4)   /*!< master role security information:div */     /* relate to BTM_LE_KEY_LENC in stack/btm_api.h */
+#define ESP_LE_KEY_LID                     (ESP_LE_KEY_PID << 4)    /*!< master device ID key */                     /* relate to BTM_LE_KEY_LID in stack/btm_api.h */
+#define ESP_LE_KEY_LCSRK                   (ESP_LE_KEY_PCSRK << 4)  /*!< local CSRK has been deliver to peer */      /* relate to BTM_LE_KEY_LCSRK in stack/btm_api.h */
 typedef uint8_t esp_ble_key_type_t;
 
-/* relate to BTM_LE_AUTH_xxx in btm_api.h */
-#define ESP_LE_AUTH_NO_BOND                 0x00                                     /*!< 0*/                     /* relate to BTM_LE_AUTH_NO_BOND in btm_api.h */
-#define ESP_LE_AUTH_BOND                    0x01                                     /*!< 1 << 0 */               /* relate to BTM_LE_AUTH_BOND in btm_api.h */
-#define ESP_LE_AUTH_REQ_MITM                (1 << 2)                                 /*!< 1 << 2 */               /* relate to BTM_LE_AUTH_REQ_MITM in btm_api.h */
-#define ESP_LE_AUTH_REQ_SC_ONLY             (1 << 3)                                 /*!< 1 << 3 */               /* relate to BTM_LE_AUTH_REQ_SC_ONLY in btm_api.h */
-#define ESP_LE_AUTH_REQ_SC_BOND             (ESP_LE_AUTH_BOND | ESP_LE_AUTH_REQ_SC_ONLY)            /*!< 1001 */  /* relate to BTM_LE_AUTH_REQ_SC_BOND in btm_api.h */
-#define ESP_LE_AUTH_REQ_SC_MITM             (ESP_LE_AUTH_REQ_MITM | ESP_LE_AUTH_REQ_SC_ONLY)        /*!< 1100 */  /* relate to BTM_LE_AUTH_REQ_SC_MITM in btm_api.h */
-#define ESP_LE_AUTH_REQ_SC_MITM_BOND        (ESP_LE_AUTH_REQ_MITM | ESP_LE_AUTH_REQ_SC_ONLY | ESP_LE_AUTH_BOND)   /*!< 1101 */  /* relate to BTM_LE_AUTH_REQ_SC_MITM_BOND in btm_api.h */
+/* relate to BTM_LE_AUTH_xxx in stack/btm_api.h */
+#define ESP_LE_AUTH_NO_BOND                 0x00                                     /*!< 0*/                     /* relate to BTM_LE_AUTH_NO_BOND in stack/btm_api.h */
+#define ESP_LE_AUTH_BOND                    0x01                                     /*!< 1 << 0 */               /* relate to BTM_LE_AUTH_BOND in stack/btm_api.h */
+#define ESP_LE_AUTH_REQ_MITM                (1 << 2)                                 /*!< 1 << 2 */               /* relate to BTM_LE_AUTH_REQ_MITM in stack/btm_api.h */
+#define ESP_LE_AUTH_REQ_SC_ONLY             (1 << 3)                                 /*!< 1 << 3 */               /* relate to BTM_LE_AUTH_REQ_SC_ONLY in stack/btm_api.h */
+#define ESP_LE_AUTH_REQ_SC_BOND             (ESP_LE_AUTH_BOND | ESP_LE_AUTH_REQ_SC_ONLY)            /*!< 1001 */  /* relate to BTM_LE_AUTH_REQ_SC_BOND in stack/btm_api.h */
+#define ESP_LE_AUTH_REQ_SC_MITM             (ESP_LE_AUTH_REQ_MITM | ESP_LE_AUTH_REQ_SC_ONLY)        /*!< 1100 */  /* relate to BTM_LE_AUTH_REQ_SC_MITM in stack/btm_api.h */
+#define ESP_LE_AUTH_REQ_SC_MITM_BOND        (ESP_LE_AUTH_REQ_MITM | ESP_LE_AUTH_REQ_SC_ONLY | ESP_LE_AUTH_BOND)   /*!< 1101 */  /* relate to BTM_LE_AUTH_REQ_SC_MITM_BOND in stack/btm_api.h */
 typedef uint8_t   esp_ble_auth_req_t;         /*!< combination of the above bit pattern */
 
-/* relate to BTM_IO_CAP_xxx in btm_api.h */
-#define ESP_IO_CAP_OUT                      0   /*!< DisplayOnly */         /* relate to BTM_IO_CAP_OUT in btm_api.h */
-#define ESP_IO_CAP_IO                       1   /*!< DisplayYesNo */        /* relate to BTM_IO_CAP_IO in btm_api.h */
-#define ESP_IO_CAP_IN                       2   /*!< KeyboardOnly */        /* relate to BTM_IO_CAP_IN in btm_api.h */
-#define ESP_IO_CAP_NONE                     3   /*!< NoInputNoOutput */     /* relate to BTM_IO_CAP_NONE in btm_api.h */
-#define ESP_IO_CAP_KBDISP                   4   /*!< Keyboard display */    /* relate to BTM_IO_CAP_KBDISP in btm_api.h */
+/* relate to BTM_IO_CAP_xxx in stack/btm_api.h */
+#define ESP_IO_CAP_OUT                      0   /*!< DisplayOnly */         /* relate to BTM_IO_CAP_OUT in stack/btm_api.h */
+#define ESP_IO_CAP_IO                       1   /*!< DisplayYesNo */        /* relate to BTM_IO_CAP_IO in stack/btm_api.h */
+#define ESP_IO_CAP_IN                       2   /*!< KeyboardOnly */        /* relate to BTM_IO_CAP_IN in stack/btm_api.h */
+#define ESP_IO_CAP_NONE                     3   /*!< NoInputNoOutput */     /* relate to BTM_IO_CAP_NONE in stack/btm_api.h */
+#define ESP_IO_CAP_KBDISP                   4   /*!< Keyboard display */    /* relate to BTM_IO_CAP_KBDISP in stack/btm_api.h */
 typedef uint8_t esp_ble_io_cap_t;               /*!< combination of the io capability */
 
 /// GAP BLE callback event type
@@ -108,45 +108,45 @@ typedef enum {
 /// Scan response data maximum length
 #define ESP_BLE_SCAN_RSP_DATA_LEN_MAX          31
 
-/* relate to BTM_BLE_AD_TYPE_xxx in btm_ble_api.h */
+/* relate to BTM_BLE_AD_TYPE_xxx in stack/btm_ble_api.h */
 /// The type of advertising data(not adv_type)
 typedef enum {
-    ESP_BLE_AD_TYPE_FLAG                     = 0x01,    /* relate to BTM_BLE_AD_TYPE_FLAG in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_16SRV_PART               = 0x02,    /* relate to BTM_BLE_AD_TYPE_16SRV_PART in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_16SRV_CMPL               = 0x03,    /* relate to BTM_BLE_AD_TYPE_16SRV_CMPL in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_32SRV_PART               = 0x04,    /* relate to BTM_BLE_AD_TYPE_32SRV_PART in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_32SRV_CMPL               = 0x05,    /* relate to BTM_BLE_AD_TYPE_32SRV_CMPL in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_128SRV_PART              = 0x06,    /* relate to BTM_BLE_AD_TYPE_128SRV_PART in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_128SRV_CMPL              = 0x07,    /* relate to BTM_BLE_AD_TYPE_128SRV_CMPL in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_NAME_SHORT               = 0x08,    /* relate to BTM_BLE_AD_TYPE_NAME_SHORT in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_NAME_CMPL                = 0x09,    /* relate to BTM_BLE_AD_TYPE_NAME_CMPL in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_TX_PWR                   = 0x0A,    /* relate to BTM_BLE_AD_TYPE_TX_PWR in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_DEV_CLASS                = 0x0D,    /* relate to BTM_BLE_AD_TYPE_DEV_CLASS in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_SM_TK                    = 0x10,    /* relate to BTM_BLE_AD_TYPE_SM_TK in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_SM_OOB_FLAG              = 0x11,    /* relate to BTM_BLE_AD_TYPE_SM_OOB_FLAG in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_INT_RANGE                = 0x12,    /* relate to BTM_BLE_AD_TYPE_INT_RANGE in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_SOL_SRV_UUID             = 0x14,    /* relate to BTM_BLE_AD_TYPE_SOL_SRV_UUID in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_128SOL_SRV_UUID          = 0x15,    /* relate to BTM_BLE_AD_TYPE_128SOL_SRV_UUID in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_SERVICE_DATA             = 0x16,    /* relate to BTM_BLE_AD_TYPE_SERVICE_DATA in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_PUBLIC_TARGET            = 0x17,    /* relate to BTM_BLE_AD_TYPE_PUBLIC_TARGET in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_RANDOM_TARGET            = 0x18,    /* relate to BTM_BLE_AD_TYPE_RANDOM_TARGET in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_APPEARANCE               = 0x19,    /* relate to BTM_BLE_AD_TYPE_APPEARANCE in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_ADV_INT                  = 0x1A,    /* relate to BTM_BLE_AD_TYPE_ADV_INT in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_LE_DEV_ADDR              = 0x1b,    /* relate to BTM_BLE_AD_TYPE_LE_DEV_ADDR in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_LE_ROLE                  = 0x1c,    /* relate to BTM_BLE_AD_TYPE_LE_ROLE in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_SPAIR_C256               = 0x1d,    /* relate to BTM_BLE_AD_TYPE_SPAIR_C256 in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_SPAIR_R256               = 0x1e,    /* relate to BTM_BLE_AD_TYPE_SPAIR_R256 in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_32SOL_SRV_UUID           = 0x1f,    /* relate to BTM_BLE_AD_TYPE_32SOL_SRV_UUID in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_32SERVICE_DATA           = 0x20,    /* relate to BTM_BLE_AD_TYPE_32SERVICE_DATA in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_128SERVICE_DATA          = 0x21,    /* relate to BTM_BLE_AD_TYPE_128SERVICE_DATA in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_LE_SECURE_CONFIRM        = 0x22,    /* relate to BTM_BLE_AD_TYPE_LE_SECURE_CONFIRM in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_LE_SECURE_RANDOM         = 0x23,    /* relate to BTM_BLE_AD_TYPE_LE_SECURE_RANDOM in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_URI                      = 0x24,    /* relate to BTM_BLE_AD_TYPE_URI in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_INDOOR_POSITION          = 0x25,    /* relate to BTM_BLE_AD_TYPE_INDOOR_POSITION in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_TRANS_DISC_DATA          = 0x26,    /* relate to BTM_BLE_AD_TYPE_TRANS_DISC_DATA in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_LE_SUPPORT_FEATURE       = 0x27,    /* relate to BTM_BLE_AD_TYPE_LE_SUPPORT_FEATURE in btm_ble_api.h */
-    ESP_BLE_AD_TYPE_CHAN_MAP_UPDATE          = 0x28,    /* relate to BTM_BLE_AD_TYPE_CHAN_MAP_UPDATE in btm_ble_api.h */
-    ESP_BLE_AD_MANUFACTURER_SPECIFIC_TYPE    = 0xFF,    /* relate to BTM_BLE_AD_MANUFACTURER_SPECIFIC_TYPE in btm_ble_api.h */
+    ESP_BLE_AD_TYPE_FLAG                     = 0x01,    /* relate to BTM_BLE_AD_TYPE_FLAG in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_16SRV_PART               = 0x02,    /* relate to BTM_BLE_AD_TYPE_16SRV_PART in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_16SRV_CMPL               = 0x03,    /* relate to BTM_BLE_AD_TYPE_16SRV_CMPL in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_32SRV_PART               = 0x04,    /* relate to BTM_BLE_AD_TYPE_32SRV_PART in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_32SRV_CMPL               = 0x05,    /* relate to BTM_BLE_AD_TYPE_32SRV_CMPL in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_128SRV_PART              = 0x06,    /* relate to BTM_BLE_AD_TYPE_128SRV_PART in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_128SRV_CMPL              = 0x07,    /* relate to BTM_BLE_AD_TYPE_128SRV_CMPL in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_NAME_SHORT               = 0x08,    /* relate to BTM_BLE_AD_TYPE_NAME_SHORT in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_NAME_CMPL                = 0x09,    /* relate to BTM_BLE_AD_TYPE_NAME_CMPL in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_TX_PWR                   = 0x0A,    /* relate to BTM_BLE_AD_TYPE_TX_PWR in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_DEV_CLASS                = 0x0D,    /* relate to BTM_BLE_AD_TYPE_DEV_CLASS in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_SM_TK                    = 0x10,    /* relate to BTM_BLE_AD_TYPE_SM_TK in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_SM_OOB_FLAG              = 0x11,    /* relate to BTM_BLE_AD_TYPE_SM_OOB_FLAG in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_INT_RANGE                = 0x12,    /* relate to BTM_BLE_AD_TYPE_INT_RANGE in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_SOL_SRV_UUID             = 0x14,    /* relate to BTM_BLE_AD_TYPE_SOL_SRV_UUID in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_128SOL_SRV_UUID          = 0x15,    /* relate to BTM_BLE_AD_TYPE_128SOL_SRV_UUID in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_SERVICE_DATA             = 0x16,    /* relate to BTM_BLE_AD_TYPE_SERVICE_DATA in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_PUBLIC_TARGET            = 0x17,    /* relate to BTM_BLE_AD_TYPE_PUBLIC_TARGET in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_RANDOM_TARGET            = 0x18,    /* relate to BTM_BLE_AD_TYPE_RANDOM_TARGET in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_APPEARANCE               = 0x19,    /* relate to BTM_BLE_AD_TYPE_APPEARANCE in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_ADV_INT                  = 0x1A,    /* relate to BTM_BLE_AD_TYPE_ADV_INT in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_LE_DEV_ADDR              = 0x1b,    /* relate to BTM_BLE_AD_TYPE_LE_DEV_ADDR in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_LE_ROLE                  = 0x1c,    /* relate to BTM_BLE_AD_TYPE_LE_ROLE in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_SPAIR_C256               = 0x1d,    /* relate to BTM_BLE_AD_TYPE_SPAIR_C256 in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_SPAIR_R256               = 0x1e,    /* relate to BTM_BLE_AD_TYPE_SPAIR_R256 in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_32SOL_SRV_UUID           = 0x1f,    /* relate to BTM_BLE_AD_TYPE_32SOL_SRV_UUID in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_32SERVICE_DATA           = 0x20,    /* relate to BTM_BLE_AD_TYPE_32SERVICE_DATA in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_128SERVICE_DATA          = 0x21,    /* relate to BTM_BLE_AD_TYPE_128SERVICE_DATA in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_LE_SECURE_CONFIRM        = 0x22,    /* relate to BTM_BLE_AD_TYPE_LE_SECURE_CONFIRM in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_LE_SECURE_RANDOM         = 0x23,    /* relate to BTM_BLE_AD_TYPE_LE_SECURE_RANDOM in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_URI                      = 0x24,    /* relate to BTM_BLE_AD_TYPE_URI in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_INDOOR_POSITION          = 0x25,    /* relate to BTM_BLE_AD_TYPE_INDOOR_POSITION in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_TRANS_DISC_DATA          = 0x26,    /* relate to BTM_BLE_AD_TYPE_TRANS_DISC_DATA in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_LE_SUPPORT_FEATURE       = 0x27,    /* relate to BTM_BLE_AD_TYPE_LE_SUPPORT_FEATURE in stack/btm_ble_api.h */
+    ESP_BLE_AD_TYPE_CHAN_MAP_UPDATE          = 0x28,    /* relate to BTM_BLE_AD_TYPE_CHAN_MAP_UPDATE in stack/btm_ble_api.h */
+    ESP_BLE_AD_MANUFACTURER_SPECIFIC_TYPE    = 0xFF,    /* relate to BTM_BLE_AD_MANUFACTURER_SPECIFIC_TYPE in stack/btm_ble_api.h */
 } esp_ble_adv_data_type;
 
 /// Advertising mode
@@ -179,18 +179,18 @@ typedef enum {
 } esp_ble_adv_filter_t;
 
 
-/* relate to BTA_DM_BLE_SEC_xxx in bta_api.h */
+/* relate to BTA_DM_BLE_SEC_xxx in bta/bta_api.h */
 typedef enum {
-    ESP_BLE_SEC_ENCRYPT = 1,            /* relate to BTA_DM_BLE_SEC_ENCRYPT in bta_api.h. If the device has already
+    ESP_BLE_SEC_ENCRYPT = 1,            /* relate to BTA_DM_BLE_SEC_ENCRYPT in bta/bta_api.h. If the device has already
                                            bonded, the stack will used LTK to encrypt with the remote device directly.
                                            Else if the device hasn't bonded, the stack will used the default authentication request
                                            used the esp_ble_gap_set_security_param function set by the user. */
-    ESP_BLE_SEC_ENCRYPT_NO_MITM,        /* relate to BTA_DM_BLE_SEC_ENCRYPT_NO_MITM in bta_api.h. If the device has already
+    ESP_BLE_SEC_ENCRYPT_NO_MITM,        /* relate to BTA_DM_BLE_SEC_ENCRYPT_NO_MITM in bta/bta_api.h. If the device has already
                                            bonded, the stack will check the LTK Whether the authentication request has been met, if met, used the LTK
                                            to encrypt with the remote device directly, else Re-pair with the remote device.
                                            Else if the device hasn't bonded, the stack will used NO MITM authentication request in the current link instead of
                                            used the authreq in the esp_ble_gap_set_security_param function set by the user. */
-    ESP_BLE_SEC_ENCRYPT_MITM,           /* relate to BTA_DM_BLE_SEC_ENCRYPT_MITM in bta_api.h. If the device has already
+    ESP_BLE_SEC_ENCRYPT_MITM,           /* relate to BTA_DM_BLE_SEC_ENCRYPT_MITM in bta/bta_api.h. If the device has already
                                            bonded, the stack will check the LTK Whether the authentication request has been met, if met, used the LTK
                                            to encrypt with the remote device directly, else Re-pair with the remote device.
                                            Else if the device hasn't bonded, the stack will used MITM authentication request in the current link instead of
similarity index 95%
rename from components/bt/bluedroid/api/include/esp_gatt_common_api.h
rename to components/bt/bluedroid/api/include/api/esp_gatt_common_api.h
index 33bc11250a3db59dc2b3da8cc9cecd8795a0f20c..6e6d9253b9d5831b3b6fd436c84140f66db7f495 100644 (file)
@@ -23,10 +23,10 @@ extern "C" {
 #endif
 
 // Maximum Transmission Unit used in GATT
-#define ESP_GATT_DEF_BLE_MTU_SIZE   23   /* relate to GATT_DEF_BLE_MTU_SIZE in gatt_api.h */
+#define ESP_GATT_DEF_BLE_MTU_SIZE   23   /* relate to GATT_DEF_BLE_MTU_SIZE in stack/gatt_api.h */
 
 // Maximum Transmission Unit allowed in GATT
-#define ESP_GATT_MAX_MTU_SIZE       517  /* relate to GATT_MAX_MTU_SIZE in gatt_api.h */
+#define ESP_GATT_MAX_MTU_SIZE       517  /* relate to GATT_MAX_MTU_SIZE in stack/gatt_api.h */
 
 /**
  * @brief           This function is called to set local MTU,
similarity index 85%
rename from components/bt/bluedroid/api/include/esp_gatt_defs.h
rename to components/bt/bluedroid/api/include/api/esp_gatt_defs.h
index a98069eadb515ea47234b5201b5d7aca7c6a7f49..5383f70e0eb2e6ec7f186aae020bef6d2002eb61 100644 (file)
@@ -154,81 +154,81 @@ extern "C" {
  * @}
  */
 
-/* relate to BTA_GATT_PREP_WRITE_xxx in bta_gatt_api.h */
+/* relate to BTA_GATT_PREP_WRITE_xxx in bta/bta_gatt_api.h */
 /// Attribute write data type from the client
 typedef enum {
-    ESP_GATT_PREP_WRITE_CANCEL    = 0x00,       /*!< Prepare write cancel */  /* relate to BTA_GATT_PREP_WRITE_CANCEL in bta_gatt_api.h */
-    ESP_GATT_PREP_WRITE_EXEC      = 0x01,       /*!< Prepare write execute */ /* relate to BTA_GATT_PREP_WRITE_EXEC in bta_gatt_api.h */
+    ESP_GATT_PREP_WRITE_CANCEL    = 0x00,       /*!< Prepare write cancel */  /* relate to BTA_GATT_PREP_WRITE_CANCEL in bta/bta_gatt_api.h */
+    ESP_GATT_PREP_WRITE_EXEC      = 0x01,       /*!< Prepare write execute */ /* relate to BTA_GATT_PREP_WRITE_EXEC in bta/bta_gatt_api.h */
 } esp_gatt_prep_write_type;
 
-/* relate to BTA_GATT_xxx in bta_gatt_api.h */
+/* relate to BTA_GATT_xxx in bta/bta_gatt_api.h */
 /**
  * @brief GATT success code and error codes
  */
 typedef enum {
-    ESP_GATT_OK                     =   0x0,                    /* relate to BTA_GATT_OK in bta_gatt_api.h */
-    ESP_GATT_INVALID_HANDLE         =   0x01,   /* 0x0001 */    /* relate to BTA_GATT_INVALID_HANDLE in bta_gatt_api.h */
-    ESP_GATT_READ_NOT_PERMIT        =   0x02,   /* 0x0002 */    /* relate to BTA_GATT_READ_NOT_PERMIT in bta_gatt_api.h */
-    ESP_GATT_WRITE_NOT_PERMIT       =   0x03,   /* 0x0003 */    /* relate to BTA_GATT_WRITE_NOT_PERMIT in bta_gatt_api.h */
-    ESP_GATT_INVALID_PDU            =   0x04,   /* 0x0004 */    /* relate to BTA_GATT_INVALID_PDU in bta_gatt_api.h */
-    ESP_GATT_INSUF_AUTHENTICATION   =   0x05,   /* 0x0005 */    /* relate to BTA_GATT_INSUF_AUTHENTICATION in bta_gatt_api.h */
-    ESP_GATT_REQ_NOT_SUPPORTED      =   0x06,   /* 0x0006 */    /* relate to BTA_GATT_REQ_NOT_SUPPORTED in bta_gatt_api.h */
-    ESP_GATT_INVALID_OFFSET         =   0x07,   /* 0x0007 */    /* relate to BTA_GATT_INVALID_OFFSET in bta_gatt_api.h */
-    ESP_GATT_INSUF_AUTHORIZATION    =   0x08,   /* 0x0008 */    /* relate to BTA_GATT_INSUF_AUTHORIZATION in bta_gatt_api.h */
-    ESP_GATT_PREPARE_Q_FULL         =   0x09,   /* 0x0009 */    /* relate to BTA_GATT_PREPARE_Q_FULL in bta_gatt_api.h */
-    ESP_GATT_NOT_FOUND              =   0x0a,   /* 0x000a */    /* relate to BTA_GATT_NOT_FOUND in bta_gatt_api.h */
-    ESP_GATT_NOT_LONG               =   0x0b,   /* 0x000b */    /* relate to BTA_GATT_NOT_LONG in bta_gatt_api.h */
-    ESP_GATT_INSUF_KEY_SIZE         =   0x0c,   /* 0x000c */    /* relate to BTA_GATT_INSUF_KEY_SIZE in bta_gatt_api.h */
-    ESP_GATT_INVALID_ATTR_LEN       =   0x0d,   /* 0x000d */    /* relate to BTA_GATT_INVALID_ATTR_LEN in bta_gatt_api.h */
-    ESP_GATT_ERR_UNLIKELY           =   0x0e,   /* 0x000e */    /* relate to BTA_GATT_ERR_UNLIKELY in bta_gatt_api.h */
-    ESP_GATT_INSUF_ENCRYPTION       =   0x0f,   /* 0x000f */    /* relate to BTA_GATT_INSUF_ENCRYPTION in bta_gatt_api.h */
-    ESP_GATT_UNSUPPORT_GRP_TYPE     =   0x10,   /* 0x0010 */    /* relate to BTA_GATT_UNSUPPORT_GRP_TYPE in bta_gatt_api.h */
-    ESP_GATT_INSUF_RESOURCE         =   0x11,   /* 0x0011 */    /* relate to BTA_GATT_INSUF_RESOURCE in bta_gatt_api.h */
-
-    ESP_GATT_NO_RESOURCES           =   0x80,   /* 0x80 */    /* relate to BTA_GATT_NO_RESOURCES in bta_gatt_api.h */
-    ESP_GATT_INTERNAL_ERROR         =   0x81,   /* 0x81 */    /* relate to BTA_GATT_INTERNAL_ERROR in bta_gatt_api.h */
-    ESP_GATT_WRONG_STATE            =   0x82,   /* 0x82 */    /* relate to BTA_GATT_WRONG_STATE in bta_gatt_api.h */
-    ESP_GATT_DB_FULL                =   0x83,   /* 0x83 */    /* relate to BTA_GATT_DB_FULL in bta_gatt_api.h */
-    ESP_GATT_BUSY                   =   0x84,   /* 0x84 */    /* relate to BTA_GATT_BUSY in bta_gatt_api.h */
-    ESP_GATT_ERROR                  =   0x85,   /* 0x85 */    /* relate to BTA_GATT_ERROR in bta_gatt_api.h */
-    ESP_GATT_CMD_STARTED            =   0x86,   /* 0x86 */    /* relate to BTA_GATT_CMD_STARTED in bta_gatt_api.h */
-    ESP_GATT_ILLEGAL_PARAMETER      =   0x87,   /* 0x87 */    /* relate to BTA_GATT_ILLEGAL_PARAMETER in bta_gatt_api.h */
-    ESP_GATT_PENDING                =   0x88,   /* 0x88 */    /* relate to BTA_GATT_PENDING in bta_gatt_api.h */
-    ESP_GATT_AUTH_FAIL              =   0x89,   /* 0x89 */    /* relate to BTA_GATT_AUTH_FAIL in bta_gatt_api.h */
-    ESP_GATT_MORE                   =   0x8a,   /* 0x8a */    /* relate to BTA_GATT_MORE in bta_gatt_api.h */
-    ESP_GATT_INVALID_CFG            =   0x8b,   /* 0x8b */    /* relate to BTA_GATT_INVALID_CFG in bta_gatt_api.h */
-    ESP_GATT_SERVICE_STARTED        =   0x8c,   /* 0x8c */    /* relate to BTA_GATT_SERVICE_STARTED in bta_gatt_api.h */
-    ESP_GATT_ENCRYPED_MITM          =   ESP_GATT_OK,    /* relate to BTA_GATT_ENCRYPED_MITM in bta_gatt_api.h */
-    ESP_GATT_ENCRYPED_NO_MITM       =   0x8d,   /* 0x8d */    /* relate to BTA_GATT_ENCRYPED_NO_MITM in bta_gatt_api.h */
-    ESP_GATT_NOT_ENCRYPTED          =   0x8e,   /* 0x8e */    /* relate to BTA_GATT_NOT_ENCRYPTED in bta_gatt_api.h */
-    ESP_GATT_CONGESTED              =   0x8f,   /* 0x8f */    /* relate to BTA_GATT_CONGESTED in bta_gatt_api.h */
-    ESP_GATT_DUP_REG                =   0x90,   /* 0x90 */    /* relate to BTA_GATT_DUP_REG in bta_gatt_api.h */
-    ESP_GATT_ALREADY_OPEN           =   0x91,   /* 0x91 */    /* relate to BTA_GATT_ALREADY_OPEN in bta_gatt_api.h */
-    ESP_GATT_CANCEL                 =   0x92,   /* 0x92 */    /* relate to BTA_GATT_CANCEL in bta_gatt_api.h */
+    ESP_GATT_OK                     =   0x0,                    /* relate to BTA_GATT_OK in bta/bta_gatt_api.h */
+    ESP_GATT_INVALID_HANDLE         =   0x01,   /* 0x0001 */    /* relate to BTA_GATT_INVALID_HANDLE in bta/bta_gatt_api.h */
+    ESP_GATT_READ_NOT_PERMIT        =   0x02,   /* 0x0002 */    /* relate to BTA_GATT_READ_NOT_PERMIT in bta/bta_gatt_api.h */
+    ESP_GATT_WRITE_NOT_PERMIT       =   0x03,   /* 0x0003 */    /* relate to BTA_GATT_WRITE_NOT_PERMIT in bta/bta_gatt_api.h */
+    ESP_GATT_INVALID_PDU            =   0x04,   /* 0x0004 */    /* relate to BTA_GATT_INVALID_PDU in bta/bta_gatt_api.h */
+    ESP_GATT_INSUF_AUTHENTICATION   =   0x05,   /* 0x0005 */    /* relate to BTA_GATT_INSUF_AUTHENTICATION in bta/bta_gatt_api.h */
+    ESP_GATT_REQ_NOT_SUPPORTED      =   0x06,   /* 0x0006 */    /* relate to BTA_GATT_REQ_NOT_SUPPORTED in bta/bta_gatt_api.h */
+    ESP_GATT_INVALID_OFFSET         =   0x07,   /* 0x0007 */    /* relate to BTA_GATT_INVALID_OFFSET in bta/bta_gatt_api.h */
+    ESP_GATT_INSUF_AUTHORIZATION    =   0x08,   /* 0x0008 */    /* relate to BTA_GATT_INSUF_AUTHORIZATION in bta/bta_gatt_api.h */
+    ESP_GATT_PREPARE_Q_FULL         =   0x09,   /* 0x0009 */    /* relate to BTA_GATT_PREPARE_Q_FULL in bta/bta_gatt_api.h */
+    ESP_GATT_NOT_FOUND              =   0x0a,   /* 0x000a */    /* relate to BTA_GATT_NOT_FOUND in bta/bta_gatt_api.h */
+    ESP_GATT_NOT_LONG               =   0x0b,   /* 0x000b */    /* relate to BTA_GATT_NOT_LONG in bta/bta_gatt_api.h */
+    ESP_GATT_INSUF_KEY_SIZE         =   0x0c,   /* 0x000c */    /* relate to BTA_GATT_INSUF_KEY_SIZE in bta/bta_gatt_api.h */
+    ESP_GATT_INVALID_ATTR_LEN       =   0x0d,   /* 0x000d */    /* relate to BTA_GATT_INVALID_ATTR_LEN in bta/bta_gatt_api.h */
+    ESP_GATT_ERR_UNLIKELY           =   0x0e,   /* 0x000e */    /* relate to BTA_GATT_ERR_UNLIKELY in bta/bta_gatt_api.h */
+    ESP_GATT_INSUF_ENCRYPTION       =   0x0f,   /* 0x000f */    /* relate to BTA_GATT_INSUF_ENCRYPTION in bta/bta_gatt_api.h */
+    ESP_GATT_UNSUPPORT_GRP_TYPE     =   0x10,   /* 0x0010 */    /* relate to BTA_GATT_UNSUPPORT_GRP_TYPE in bta/bta_gatt_api.h */
+    ESP_GATT_INSUF_RESOURCE         =   0x11,   /* 0x0011 */    /* relate to BTA_GATT_INSUF_RESOURCE in bta/bta_gatt_api.h */
+
+    ESP_GATT_NO_RESOURCES           =   0x80,   /* 0x80 */    /* relate to BTA_GATT_NO_RESOURCES in bta/bta_gatt_api.h */
+    ESP_GATT_INTERNAL_ERROR         =   0x81,   /* 0x81 */    /* relate to BTA_GATT_INTERNAL_ERROR in bta/bta_gatt_api.h */
+    ESP_GATT_WRONG_STATE            =   0x82,   /* 0x82 */    /* relate to BTA_GATT_WRONG_STATE in bta/bta_gatt_api.h */
+    ESP_GATT_DB_FULL                =   0x83,   /* 0x83 */    /* relate to BTA_GATT_DB_FULL in bta/bta_gatt_api.h */
+    ESP_GATT_BUSY                   =   0x84,   /* 0x84 */    /* relate to BTA_GATT_BUSY in bta/bta_gatt_api.h */
+    ESP_GATT_ERROR                  =   0x85,   /* 0x85 */    /* relate to BTA_GATT_ERROR in bta/bta_gatt_api.h */
+    ESP_GATT_CMD_STARTED            =   0x86,   /* 0x86 */    /* relate to BTA_GATT_CMD_STARTED in bta/bta_gatt_api.h */
+    ESP_GATT_ILLEGAL_PARAMETER      =   0x87,   /* 0x87 */    /* relate to BTA_GATT_ILLEGAL_PARAMETER in bta/bta_gatt_api.h */
+    ESP_GATT_PENDING                =   0x88,   /* 0x88 */    /* relate to BTA_GATT_PENDING in bta/bta_gatt_api.h */
+    ESP_GATT_AUTH_FAIL              =   0x89,   /* 0x89 */    /* relate to BTA_GATT_AUTH_FAIL in bta/bta_gatt_api.h */
+    ESP_GATT_MORE                   =   0x8a,   /* 0x8a */    /* relate to BTA_GATT_MORE in bta/bta_gatt_api.h */
+    ESP_GATT_INVALID_CFG            =   0x8b,   /* 0x8b */    /* relate to BTA_GATT_INVALID_CFG in bta/bta_gatt_api.h */
+    ESP_GATT_SERVICE_STARTED        =   0x8c,   /* 0x8c */    /* relate to BTA_GATT_SERVICE_STARTED in bta/bta_gatt_api.h */
+    ESP_GATT_ENCRYPED_MITM          =   ESP_GATT_OK,    /* relate to BTA_GATT_ENCRYPED_MITM in bta/bta_gatt_api.h */
+    ESP_GATT_ENCRYPED_NO_MITM       =   0x8d,   /* 0x8d */    /* relate to BTA_GATT_ENCRYPED_NO_MITM in bta/bta_gatt_api.h */
+    ESP_GATT_NOT_ENCRYPTED          =   0x8e,   /* 0x8e */    /* relate to BTA_GATT_NOT_ENCRYPTED in bta/bta_gatt_api.h */
+    ESP_GATT_CONGESTED              =   0x8f,   /* 0x8f */    /* relate to BTA_GATT_CONGESTED in bta/bta_gatt_api.h */
+    ESP_GATT_DUP_REG                =   0x90,   /* 0x90 */    /* relate to BTA_GATT_DUP_REG in bta/bta_gatt_api.h */
+    ESP_GATT_ALREADY_OPEN           =   0x91,   /* 0x91 */    /* relate to BTA_GATT_ALREADY_OPEN in bta/bta_gatt_api.h */
+    ESP_GATT_CANCEL                 =   0x92,   /* 0x92 */    /* relate to BTA_GATT_CANCEL in bta/bta_gatt_api.h */
     /* 0xE0 ~ 0xFC reserved for future use */
-    ESP_GATT_STACK_RSP              =   0xe0,   /* 0xe0 */    /* relate to BTA_GATT_STACK_RSP in bta_gatt_api.h */
-    ESP_GATT_APP_RSP                =   0xe1,   /* 0xe1 */    /* relate to BTA_GATT_APP_RSP in bta_gatt_api.h */
+    ESP_GATT_STACK_RSP              =   0xe0,   /* 0xe0 */    /* relate to BTA_GATT_STACK_RSP in bta/bta_gatt_api.h */
+    ESP_GATT_APP_RSP                =   0xe1,   /* 0xe1 */    /* relate to BTA_GATT_APP_RSP in bta/bta_gatt_api.h */
     //Error caused by customer application or stack bug
-    ESP_GATT_UNKNOWN_ERROR          =   0xef,   /* 0xef */    /* relate to BTA_GATT_UNKNOWN_ERROR in bta_gatt_api.h */
-    ESP_GATT_CCC_CFG_ERR            =   0xfd,   /* 0xFD Client Characteristic Configuration Descriptor Improperly Configured */    /* relate to BTA_GATT_CCC_CFG_ERR in bta_gatt_api.h */
-    ESP_GATT_PRC_IN_PROGRESS        =   0xfe,   /* 0xFE Procedure Already in progress */  /* relate to BTA_GATT_PRC_IN_PROGRESS in bta_gatt_api.h */
-    ESP_GATT_OUT_OF_RANGE           =   0xff,   /* 0xFFAttribute value out of range */    /* relate to BTA_GATT_OUT_OF_RANGE in bta_gatt_api.h */
+    ESP_GATT_UNKNOWN_ERROR          =   0xef,   /* 0xef */    /* relate to BTA_GATT_UNKNOWN_ERROR in bta/bta_gatt_api.h */
+    ESP_GATT_CCC_CFG_ERR            =   0xfd,   /* 0xFD Client Characteristic Configuration Descriptor Improperly Configured */    /* relate to BTA_GATT_CCC_CFG_ERR in bta/bta_gatt_api.h */
+    ESP_GATT_PRC_IN_PROGRESS        =   0xfe,   /* 0xFE Procedure Already in progress */  /* relate to BTA_GATT_PRC_IN_PROGRESS in bta/bta_gatt_api.h */
+    ESP_GATT_OUT_OF_RANGE           =   0xff,   /* 0xFFAttribute value out of range */    /* relate to BTA_GATT_OUT_OF_RANGE in bta/bta_gatt_api.h */
 } esp_gatt_status_t;
 
-/* relate to BTA_GATT_CONN_xxx in bta_gatt_api.h */
+/* relate to BTA_GATT_CONN_xxx in bta/bta_gatt_api.h */
 /**
  * @brief Gatt Connection reason enum
  */
 typedef enum {
-    ESP_GATT_CONN_UNKNOWN = 0,                      /*!< Gatt connection unknown */               /* relate to BTA_GATT_CONN_UNKNOWN in bta_gatt_api.h */
-    ESP_GATT_CONN_L2C_FAILURE = 1,                  /*!< General L2cap failure  */                /* relate to BTA_GATT_CONN_L2C_FAILURE in bta_gatt_api.h */
-    ESP_GATT_CONN_TIMEOUT = 0x08,                   /*!< Connection timeout  */                   /* relate to BTA_GATT_CONN_TIMEOUT in bta_gatt_api.h */
-    ESP_GATT_CONN_TERMINATE_PEER_USER = 0x13,       /*!< Connection terminate by peer user  */    /* relate to BTA_GATT_CONN_TERMINATE_PEER_USER in bta_gatt_api.h */
-    ESP_GATT_CONN_TERMINATE_LOCAL_HOST = 0x16,      /*!< Connectionterminated by local host */    /* relate to BTA_GATT_CONN_TERMINATE_LOCAL_HOST in bta_gatt_api.h */
-    ESP_GATT_CONN_FAIL_ESTABLISH = 0x3e,            /*!< Connection fail to establish  */         /* relate to BTA_GATT_CONN_FAIL_ESTABLISH in bta_gatt_api.h */
-    ESP_GATT_CONN_LMP_TIMEOUT = 0x22,               /*!< Connection fail for LMP response tout */ /* relate to BTA_GATT_CONN_LMP_TIMEOUT in bta_gatt_api.h */
-    ESP_GATT_CONN_CONN_CANCEL = 0x0100,             /*!< L2CAP connection cancelled  */           /* relate to BTA_GATT_CONN_CONN_CANCEL in bta_gatt_api.h */
-    ESP_GATT_CONN_NONE = 0x0101                     /*!< No connection to cancel  */              /* relate to BTA_GATT_CONN_NONE in bta_gatt_api.h */
+    ESP_GATT_CONN_UNKNOWN = 0,                      /*!< Gatt connection unknown */               /* relate to BTA_GATT_CONN_UNKNOWN in bta/bta_gatt_api.h */
+    ESP_GATT_CONN_L2C_FAILURE = 1,                  /*!< General L2cap failure  */                /* relate to BTA_GATT_CONN_L2C_FAILURE in bta/bta_gatt_api.h */
+    ESP_GATT_CONN_TIMEOUT = 0x08,                   /*!< Connection timeout  */                   /* relate to BTA_GATT_CONN_TIMEOUT in bta/bta_gatt_api.h */
+    ESP_GATT_CONN_TERMINATE_PEER_USER = 0x13,       /*!< Connection terminate by peer user  */    /* relate to BTA_GATT_CONN_TERMINATE_PEER_USER in bta/bta_gatt_api.h */
+    ESP_GATT_CONN_TERMINATE_LOCAL_HOST = 0x16,      /*!< Connectionterminated by local host */    /* relate to BTA_GATT_CONN_TERMINATE_LOCAL_HOST in bta/bta_gatt_api.h */
+    ESP_GATT_CONN_FAIL_ESTABLISH = 0x3e,            /*!< Connection fail to establish  */         /* relate to BTA_GATT_CONN_FAIL_ESTABLISH in bta/bta_gatt_api.h */
+    ESP_GATT_CONN_LMP_TIMEOUT = 0x22,               /*!< Connection fail for LMP response tout */ /* relate to BTA_GATT_CONN_LMP_TIMEOUT in bta/bta_gatt_api.h */
+    ESP_GATT_CONN_CONN_CANCEL = 0x0100,             /*!< L2CAP connection cancelled  */           /* relate to BTA_GATT_CONN_CONN_CANCEL in bta/bta_gatt_api.h */
+    ESP_GATT_CONN_NONE = 0x0101                     /*!< No connection to cancel  */              /* relate to BTA_GATT_CONN_NONE in bta/bta_gatt_api.h */
 } esp_gatt_conn_reason_t;
 
 /**
@@ -248,42 +248,42 @@ typedef struct {
     bool            is_primary;             /*!< This service is primary or not */
 } __attribute__((packed)) esp_gatt_srvc_id_t;
 
-/* relate to BTA_GATT_AUTH_REQ_xxx in bta_gatt_api.h */
+/* relate to BTA_GATT_AUTH_REQ_xxx in bta/bta_gatt_api.h */
 /**
  * @brief Gatt authentication request type
  */
 typedef enum {
-    ESP_GATT_AUTH_REQ_NONE                  = 0,                                       /* relate to BTA_GATT_AUTH_REQ_NONE in bta_gatt_api.h */
-    ESP_GATT_AUTH_REQ_NO_MITM               = 1,   /* unauthenticated encryption */    /* relate to BTA_GATT_AUTH_REQ_NO_MITM in bta_gatt_api.h */
-    ESP_GATT_AUTH_REQ_MITM                  = 2,   /* authenticated encryption */      /* relate to BTA_GATT_AUTH_REQ_MITM in bta_gatt_api.h */
-    ESP_GATT_AUTH_REQ_SIGNED_NO_MITM        = 3,                                       /* relate to BTA_GATT_AUTH_REQ_SIGNED_NO_MITM in bta_gatt_api.h */
-    ESP_GATT_AUTH_REQ_SIGNED_MITM           = 4,                                       /* relate to BTA_GATT_AUTH_REQ_SIGNED_MITM in bta_gatt_api.h */
+    ESP_GATT_AUTH_REQ_NONE                  = 0,                                       /* relate to BTA_GATT_AUTH_REQ_NONE in bta/bta_gatt_api.h */
+    ESP_GATT_AUTH_REQ_NO_MITM               = 1,   /* unauthenticated encryption */    /* relate to BTA_GATT_AUTH_REQ_NO_MITM in bta/bta_gatt_api.h */
+    ESP_GATT_AUTH_REQ_MITM                  = 2,   /* authenticated encryption */      /* relate to BTA_GATT_AUTH_REQ_MITM in bta/bta_gatt_api.h */
+    ESP_GATT_AUTH_REQ_SIGNED_NO_MITM        = 3,                                       /* relate to BTA_GATT_AUTH_REQ_SIGNED_NO_MITM in bta/bta_gatt_api.h */
+    ESP_GATT_AUTH_REQ_SIGNED_MITM           = 4,                                       /* relate to BTA_GATT_AUTH_REQ_SIGNED_MITM in bta/bta_gatt_api.h */
 } esp_gatt_auth_req_t;
 
-/* relate to BTA_GATT_PERM_xxx in bta_gatt_api.h */
+/* relate to BTA_GATT_PERM_xxx in bta/bta_gatt_api.h */
 /**
  * @brief Attribute permissions
  */
-#define    ESP_GATT_PERM_READ                  (1 << 0)   /* bit 0 -  0x0001 */    /* relate to BTA_GATT_PERM_READ in bta_gatt_api.h */
-#define    ESP_GATT_PERM_READ_ENCRYPTED        (1 << 1)   /* bit 1 -  0x0002 */    /* relate to BTA_GATT_PERM_READ_ENCRYPTED in bta_gatt_api.h */
-#define    ESP_GATT_PERM_READ_ENC_MITM         (1 << 2)   /* bit 2 -  0x0004 */    /* relate to BTA_GATT_PERM_READ_ENC_MITM in bta_gatt_api.h */
-#define    ESP_GATT_PERM_WRITE                 (1 << 4)   /* bit 4 -  0x0010 */    /* relate to BTA_GATT_PERM_WRITE in bta_gatt_api.h */
-#define    ESP_GATT_PERM_WRITE_ENCRYPTED       (1 << 5)   /* bit 5 -  0x0020 */    /* relate to BTA_GATT_PERM_WRITE_ENCRYPTED in bta_gatt_api.h */
-#define    ESP_GATT_PERM_WRITE_ENC_MITM        (1 << 6)   /* bit 6 -  0x0040 */    /* relate to BTA_GATT_PERM_WRITE_ENC_MITM in bta_gatt_api.h */
-#define    ESP_GATT_PERM_WRITE_SIGNED          (1 << 7)   /* bit 7 -  0x0080 */    /* relate to BTA_GATT_PERM_WRITE_SIGNED in bta_gatt_api.h */
-#define    ESP_GATT_PERM_WRITE_SIGNED_MITM     (1 << 8)   /* bit 8 -  0x0100 */    /* relate to BTA_GATT_PERM_WRITE_SIGNED_MITM in bta_gatt_api.h */
+#define    ESP_GATT_PERM_READ                  (1 << 0)   /* bit 0 -  0x0001 */    /* relate to BTA_GATT_PERM_READ in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_READ_ENCRYPTED        (1 << 1)   /* bit 1 -  0x0002 */    /* relate to BTA_GATT_PERM_READ_ENCRYPTED in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_READ_ENC_MITM         (1 << 2)   /* bit 2 -  0x0004 */    /* relate to BTA_GATT_PERM_READ_ENC_MITM in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_WRITE                 (1 << 4)   /* bit 4 -  0x0010 */    /* relate to BTA_GATT_PERM_WRITE in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_WRITE_ENCRYPTED       (1 << 5)   /* bit 5 -  0x0020 */    /* relate to BTA_GATT_PERM_WRITE_ENCRYPTED in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_WRITE_ENC_MITM        (1 << 6)   /* bit 6 -  0x0040 */    /* relate to BTA_GATT_PERM_WRITE_ENC_MITM in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_WRITE_SIGNED          (1 << 7)   /* bit 7 -  0x0080 */    /* relate to BTA_GATT_PERM_WRITE_SIGNED in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_WRITE_SIGNED_MITM     (1 << 8)   /* bit 8 -  0x0100 */    /* relate to BTA_GATT_PERM_WRITE_SIGNED_MITM in bta/bta_gatt_api.h */
 typedef uint16_t esp_gatt_perm_t;
 
-/* relate to BTA_GATT_CHAR_PROP_BIT_xxx in bta_gatt_api.h */
+/* relate to BTA_GATT_CHAR_PROP_BIT_xxx in bta/bta_gatt_api.h */
 /* definition of characteristic properties */
-#define    ESP_GATT_CHAR_PROP_BIT_BROADCAST    (1 << 0)       /* 0x01 */    /* relate to BTA_GATT_CHAR_PROP_BIT_BROADCAST in bta_gatt_api.h */
-#define    ESP_GATT_CHAR_PROP_BIT_READ         (1 << 1)       /* 0x02 */    /* relate to BTA_GATT_CHAR_PROP_BIT_READ in bta_gatt_api.h */
-#define    ESP_GATT_CHAR_PROP_BIT_WRITE_NR     (1 << 2)       /* 0x04 */    /* relate to BTA_GATT_CHAR_PROP_BIT_WRITE_NR in bta_gatt_api.h */
-#define    ESP_GATT_CHAR_PROP_BIT_WRITE        (1 << 3)       /* 0x08 */    /* relate to BTA_GATT_CHAR_PROP_BIT_WRITE in bta_gatt_api.h */
-#define    ESP_GATT_CHAR_PROP_BIT_NOTIFY       (1 << 4)       /* 0x10 */    /* relate to BTA_GATT_CHAR_PROP_BIT_NOTIFY in bta_gatt_api.h */
-#define    ESP_GATT_CHAR_PROP_BIT_INDICATE     (1 << 5)       /* 0x20 */    /* relate to BTA_GATT_CHAR_PROP_BIT_INDICATE in bta_gatt_api.h */
-#define    ESP_GATT_CHAR_PROP_BIT_AUTH         (1 << 6)       /* 0x40 */    /* relate to BTA_GATT_CHAR_PROP_BIT_AUTH in bta_gatt_api.h */
-#define    ESP_GATT_CHAR_PROP_BIT_EXT_PROP     (1 << 7)       /* 0x80 */    /* relate to BTA_GATT_CHAR_PROP_BIT_EXT_PROP in bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_BROADCAST    (1 << 0)       /* 0x01 */    /* relate to BTA_GATT_CHAR_PROP_BIT_BROADCAST in bta/bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_READ         (1 << 1)       /* 0x02 */    /* relate to BTA_GATT_CHAR_PROP_BIT_READ in bta/bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_WRITE_NR     (1 << 2)       /* 0x04 */    /* relate to BTA_GATT_CHAR_PROP_BIT_WRITE_NR in bta/bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_WRITE        (1 << 3)       /* 0x08 */    /* relate to BTA_GATT_CHAR_PROP_BIT_WRITE in bta/bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_NOTIFY       (1 << 4)       /* 0x10 */    /* relate to BTA_GATT_CHAR_PROP_BIT_NOTIFY in bta/bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_INDICATE     (1 << 5)       /* 0x20 */    /* relate to BTA_GATT_CHAR_PROP_BIT_INDICATE in bta/bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_AUTH         (1 << 6)       /* 0x40 */    /* relate to BTA_GATT_CHAR_PROP_BIT_AUTH in bta/bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_EXT_PROP     (1 << 7)       /* 0x80 */    /* relate to BTA_GATT_CHAR_PROP_BIT_EXT_PROP in bta/bta_gatt_api.h */
 typedef uint8_t esp_gatt_char_prop_t;
 
 /// GATT maximum attribute length
similarity index 96%
rename from components/bt/bluedroid/api/include/esp_spp_api.h
rename to components/bt/bluedroid/api/include/api/esp_spp_api.h
index 5a6bb7d463b1c4fe9567001444a35e304251b032..86e52c8cc86018314abbc1caee85feb1221e5475 100644 (file)
@@ -31,13 +31,13 @@ typedef enum {
 } esp_spp_status_t;
 
 /* Security Setting Mask */
-#define ESP_SPP_SEC_NONE            0x0000    /*!< No security. relate to BTA_SEC_NONE in bta_api.h */
-#define ESP_SPP_SEC_AUTHORIZE       0x0001    /*!< Authorization required (only needed for out going connection ) relate to BTA_SEC_AUTHORIZE in bta_api.h*/
-#define ESP_SPP_SEC_AUTHENTICATE    0x0012    /*!< Authentication required.  relate to BTA_SEC_AUTHENTICATE in bta_api.h*/
-#define ESP_SPP_SEC_ENCRYPT         0x0024    /*!< Encryption required.  relate to BTA_SEC_ENCRYPT in bta_api.h*/
-#define ESP_SPP_SEC_MODE4_LEVEL4    0x0040    /*!< Mode 4 level 4 service, i.e. incoming/outgoing MITM and P-256 encryption  relate to BTA_SEC_MODE4_LEVEL4 in bta_api.h*/
-#define ESP_SPP_SEC_MITM            0x3000    /*!< Man-In-The_Middle protection  relate to BTA_SEC_MITM in bta_api.h*/
-#define ESP_SPP_SEC_IN_16_DIGITS    0x4000    /*!< Min 16 digit for pin code  relate to BTA_SEC_IN_16_DIGITS in bta_api.h*/
+#define ESP_SPP_SEC_NONE            0x0000    /*!< No security. relate to BTA_SEC_NONE in bta/bta_api.h */
+#define ESP_SPP_SEC_AUTHORIZE       0x0001    /*!< Authorization required (only needed for out going connection ) relate to BTA_SEC_AUTHORIZE in bta/bta_api.h*/
+#define ESP_SPP_SEC_AUTHENTICATE    0x0012    /*!< Authentication required.  relate to BTA_SEC_AUTHENTICATE in bta/bta_api.h*/
+#define ESP_SPP_SEC_ENCRYPT         0x0024    /*!< Encryption required.  relate to BTA_SEC_ENCRYPT in bta/bta_api.h*/
+#define ESP_SPP_SEC_MODE4_LEVEL4    0x0040    /*!< Mode 4 level 4 service, i.e. incoming/outgoing MITM and P-256 encryption  relate to BTA_SEC_MODE4_LEVEL4 in bta/bta_api.h*/
+#define ESP_SPP_SEC_MITM            0x3000    /*!< Man-In-The_Middle protection  relate to BTA_SEC_MITM in bta/bta_api.h*/
+#define ESP_SPP_SEC_IN_16_DIGITS    0x4000    /*!< Min 16 digit for pin code  relate to BTA_SEC_IN_16_DIGITS in bta/bta_api.h*/
 typedef uint16_t esp_spp_sec_t;
 
 typedef enum {
index 9323aa8aa32c66a8290cc5c0a1a27393810bb0de..c94910cd04bb440c0d3963bfc9a948efba1a3cca 100644 (file)
@@ -22,9 +22,9 @@
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include <string.h>
-#include "bta_ar_api.h"
+#include "bta/bta_ar_api.h"
 #include "bta_ar_int.h"
 
 #if BTA_AR_INCLUDED
similarity index 98%
rename from components/bt/bluedroid/bta/include/bta_ar_int.h
rename to components/bt/bluedroid/bta/ar/include/bta_ar_int.h
index e9997ec78804893ffa62b37161693da32904d02b..c4af8269aa7df05a51da053a440c8cf357c270b4 100644 (file)
@@ -25,7 +25,7 @@
 #ifndef BTA_AR_INT_H
 #define BTA_AR_INT_H
 
-#include "bta_av_api.h"
+#include "bta/bta_av_api.h"
 
 #if (BTA_AR_INCLUDED == TRUE)
 
index d146607c9159243d103ed730ed45bd0d9b70f9bc..5c0d15de7d0801711bfd39cf3ad36f1eb2ff87c3 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #if defined(BTA_AV_INCLUDED) && (BTA_AV_INCLUDED == TRUE)
 
 // #include <assert.h>
-#include "bt_trace.h"
+#include "common/bt_trace.h"
 #include <string.h>
 
-#include "allocator.h"
+#include "osi/allocator.h"
 
 #include "bta_av_int.h"
-#include "avdt_api.h"
-#include "utl.h"
-#include "l2c_api.h"
-#include "l2cdefs.h"
+#include "stack/avdt_api.h"
+#include "bta/utl.h"
+#include "stack/l2c_api.h"
+#include "stack/l2cdefs.h"
 #if( defined BTA_AR_INCLUDED ) && (BTA_AR_INCLUDED == TRUE)
-#include "bta_ar_api.h"
+#include "bta/bta_ar_api.h"
 #endif
 
 /*****************************************************************************
index 97d240f167cbe0f79b8585c5a39067f3926bb3e0..5aa91b84d61f575d8b49986967c0b1495099e574 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #if defined(BTA_AV_INCLUDED) && (BTA_AV_INCLUDED == TRUE)
 
 #include <string.h>
-#include "bta_av_api.h"
+#include "bta/bta_av_api.h"
 #include "bta_av_int.h"
-#include "avdt_api.h"
-#include "utl.h"
-#include "l2c_api.h"
-#include "allocator.h"
-#include "list.h"
+#include "stack/avdt_api.h"
+#include "bta/utl.h"
+#include "stack/l2c_api.h"
+#include "osi/allocator.h"
+#include "osi/list.h"
 #if( defined BTA_AR_INCLUDED ) && (BTA_AR_INCLUDED == TRUE)
-#include "bta_ar_api.h"
+#include "bta/bta_ar_api.h"
 #endif
 
 #define LOG_TAG "bt_bta_av"
 // #include "osi/include/log.h"
-#include "bt_trace.h"
+#include "common/bt_trace.h"
 
 /*****************************************************************************
 **  Constants
index 7ea9855d8a9a00d82d111f4d0d4e366cb1fbaa5f..0a75551a0e84881ecae080e679affc127cf545ed 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #if defined(BTA_AV_INCLUDED) && (BTA_AV_INCLUDED == TRUE)
 
-#include "allocator.h"
-#include "bta_api.h"
-#include "bta_sys.h"
-#include "bta_av_api.h"
+#include "osi/allocator.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_av_api.h"
 #include "bta_av_int.h"
 #include <string.h>
 
index 5774be1d33ae7c2a51e5818c201142aed49341f2..144df6ea31c42ef27256158c40543f441c9dfa48 100644 (file)
@@ -25,8 +25,8 @@
 
 #include <stddef.h>
 
-#include "bt_target.h"
-#include "bta_api.h"
+#include "common/bt_target.h"
+#include "bta/bta_api.h"
 #include "bta_av_int.h"
 
 #if defined(BTA_AV_INCLUDED) && (BTA_AV_INCLUDED == TRUE)
index 8f1426e00c7d9d87c50baf78344bde9a02417298..3c4c95d04ef6d8bc631bd606632bb09aa12d7e70 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
-#include "bta_api.h"
-#include "bta_sys.h"
+#include "common/bt_target.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sys.h"
 #include "bta_av_int.h"
-#include "bta_av_ci.h"
-#include "allocator.h"
+#include "bta/bta_av_ci.h"
+#include "osi/allocator.h"
 
 #include <string.h>
 
index be141b6e4baff3d08632023f4384374527a722e1..8a376f58c60997943ec75c78530aa1330622c036 100644 (file)
 // #include <assert.h>
 #include <string.h>
 
-#include "bt_target.h"
-#include "bt_trace.h"
-#include "allocator.h"
+#include "common/bt_target.h"
+#include "common/bt_trace.h"
+#include "osi/allocator.h"
 
 #if defined(BTA_AV_INCLUDED) && (BTA_AV_INCLUDED == TRUE)
 #include "bta_av_int.h"
-#include "utl.h"
-#include "l2c_api.h"
-#include "l2cdefs.h"
-#include "bta_av_co.h"
+#include "bta/utl.h"
+#include "stack/l2c_api.h"
+#include "stack/l2cdefs.h"
+#include "bta/bta_av_co.h"
 #if( defined BTA_AR_INCLUDED ) && (BTA_AR_INCLUDED == TRUE)
-#include "bta_ar_api.h"
+#include "bta/bta_ar_api.h"
 #endif
-#include "osi.h"
+#include "osi/osi.h"
 
 /*****************************************************************************
 ** Constants and types
index 9ea59170a3b7a82e7f51a154e1fdc608a36481f4..30f178efb3820f5bdaa2444f31d67496bd0d2af5 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
-#include "a2d_api.h"
-#include "a2d_sbc.h"
-#include "bta_av_sbc.h"
-#include "utl.h"
-#include "bt_defs.h"
+#include "common/bt_target.h"
+#include "stack/a2d_api.h"
+#include "stack/a2d_sbc.h"
+#include "bta/bta_av_sbc.h"
+#include "bta/utl.h"
+#include "common/bt_defs.h"
 
 #if defined(BTA_AV_INCLUDED) && (BTA_AV_INCLUDED == TRUE)
 
index c08d77c9999a8d510bf7616ab8c5b1493c18c168..45fa9242bead7aa10344ac48c253f811eb97896f 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #if defined(BTA_AV_INCLUDED) && (BTA_AV_INCLUDED == TRUE)
 
 #include <string.h>
-#include "bta_av_co.h"
+#include "bta/bta_av_co.h"
 #include "bta_av_int.h"
 
 /*****************************************************************************
similarity index 99%
rename from components/bt/bluedroid/bta/include/bta_av_int.h
rename to components/bt/bluedroid/bta/av/include/bta_av_int.h
index 2409c3a48074ed4d92ad0d650bf4b8240c087590..3a13c0cc529ce40c9b14f64b15130c230d38b2b7 100644 (file)
 #ifndef BTA_AV_INT_H
 #define BTA_AV_INT_H
 
-#include "bta_sys.h"
-#include "bta_api.h"
-#include "bta_av_api.h"
-#include "avdt_api.h"
-#include "bta_av_co.h"
-#include "list.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_api.h"
+#include "bta/bta_av_api.h"
+#include "stack/avdt_api.h"
+#include "bta/bta_av_co.h"
+#include "osi/list.h"
 
 #if (BTA_AV_INCLUDED == TRUE)
 
index df1c4533390cb0f88716487363eaf09a1b9b25ca..fa87d3fe6c1ea55b23889a81c30f93de1cc759e9 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
-#include "bt_types.h"
-#include "bta_sys.h"
-#include "bta_api.h"
+#include "common/bt_target.h"
+#include "stack/bt_types.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_api.h"
 #include "bta_dm_int.h"
-#include "bta_dm_co.h"
-#include "bta_gattc_co.h"
-#include "btm_api.h"
+#include "bta/bta_dm_co.h"
+#include "bta/bta_gattc_co.h"
+#include "stack/btm_api.h"
 #include "btm_int.h"
-#include "btu.h"
-#include "sdp_api.h"
-#include "l2c_api.h"
-#include "utl.h"
-#include "gap_api.h"    /* For GAP_BleReadPeerPrefConnParams */
+#include "stack/btu.h"
+#include "stack/sdp_api.h"
+#include "stack/l2c_api.h"
+#include "bta/utl.h"
+#include "stack/gap_api.h"    /* For GAP_BleReadPeerPrefConnParams */
 #include <string.h>
-#include "controller.h"
+#include "device/controller.h"
 
 #define LOG_TAG "bt_bta_dm"
 // #include "osi/include/log.h"
 
 #if (GAP_INCLUDED == TRUE)
-#include "gap_api.h"
+#include "stack/gap_api.h"
 #endif
 
 static void bta_dm_inq_results_cb (tBTM_INQ_RESULTS *p_inq, UINT8 *p_eir);
@@ -169,10 +169,10 @@ const UINT16 bta_service_id_to_uuid_lkup_tbl [BTA_MAX_SERVICE_ID] = {
 
 /*
  * NOTE : The number of element in bta_service_id_to_btm_srv_id_lkup_tbl should be matching with
- *        the value BTA_MAX_SERVICE_ID in bta_api.h
+ *        the value BTA_MAX_SERVICE_ID in bta/bta_api.h
  *
  *        i.e., If you add new Service ID for BTA, the correct security ID of the new service
- *              from Security service definitions (btm_api.h) should be added to this lookup table.
+ *              from Security service definitions (stack/btm_api.h) should be added to this lookup table.
  */
 const UINT32 bta_service_id_to_btm_srv_id_lkup_tbl [BTA_MAX_SERVICE_ID] = {
     0,                                      /* Reserved */
index 7558788beb163ce32d61a21e63c1f8a8906f39e6..fdd5f97a93be553940bc7a1734ca5bfc656e6aaf 100644 (file)
  *
  ******************************************************************************/
 
-#include "bta_sys.h"
-#include "bta_api.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_api.h"
 #include "bta_dm_int.h"
 #include "bta_sys_int.h"
-#include "btm_api.h"
+#include "stack/btm_api.h"
 #include "btm_int.h"
 #include <string.h>
-#include "utl.h"
-#include "allocator.h"
+#include "bta/utl.h"
+#include "osi/allocator.h"
 
 /*****************************************************************************
 **  Constants
index e122177b8776b8f7097a6f4790064589937a8907..2e22aa77c5c280f28b92726720e768a88d202370 100644 (file)
  ******************************************************************************/
 
 #include <stddef.h>
-#include "bt_target.h"
-#include "bta_sys.h"
-#include "bta_api.h"
+#include "common/bt_target.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_api.h"
 #include "bta_dm_int.h"
-// #include "bta_jv_api.h"
+// #include "bta/bta_jv_api.h"
 
 #ifndef BTA_DM_LINK_POLICY_SETTINGS
 #define BTA_DM_LINK_POLICY_SETTINGS    (HCI_ENABLE_MASTER_SLAVE_SWITCH | HCI_ENABLE_HOLD_MODE | HCI_ENABLE_SNIFF_MODE | HCI_ENABLE_PARK_MODE)
@@ -459,13 +459,13 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = {
 #endif  /* BTE_SIM_APP */
 };
 
-/* Please refer to the SNIFF table definitions in bta_api.h.
+/* Please refer to the SNIFF table definitions in bta/bta_api.h.
  *
  * Adding to or Modifying the Table
  * Additional sniff parameter entries can be added for BTA_DM_PM_SNIFF5 - BTA_DM_PM_SNIFF7.
  * Overrides of additional table entries can be specified in bdroid_buildcfg.h.  If additional
  * sniff parameter entries are added or an override of an existing entry is specified in
- * bdroid_buildcfg.h then the BTA_DM_PM_*_IDX defines in bta_api.h will need to be match the new
+ * bdroid_buildcfg.h then the BTA_DM_PM_*_IDX defines in bta/bta_api.h will need to be match the new
  * ordering.
  *
  * Table Ordering
@@ -478,7 +478,7 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTM_PM_PWR_MD bta_dm_pm_md[] = {
      * More sniff parameter entries can be added for
      * BTA_DM_PM_SNIFF3 - BTA_DM_PM_SNIFF7, if needed. When entries are added or
      * removed, BTA_DM_PM_PARK_IDX needs to be updated to reflect the actual index
-     * BTA_DM_PM_PARK_IDX is defined in bta_api.h and can be override by the
+     * BTA_DM_PM_PARK_IDX is defined in bta/bta_api.h and can be override by the
      * bdroid_buildcfg.h settings.
      * The SNIFF table entries must be in the order from highest latency (biggest
      * interval) to lowest latency. If there's a conflict among the connected
index afceda0c28de3c1ce833fc170014ab32b5c07f35..e7385013c5112fc877b17aab934c60bf428bf89b 100644 (file)
  *
  ******************************************************************************/
 
-#include "bta_sys.h"
-#include "bta_api.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_api.h"
 #include "bta_dm_int.h"
 #include <string.h>
-#include "bta_dm_ci.h"
-#include "allocator.h"
+#include "bta/bta_dm_ci.h"
+#include "osi/allocator.h"
 
 
 #if (BTM_OOB_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
similarity index 98%
rename from components/bt/bluedroid/btif/bta_dm_co.c
rename to components/bt/bluedroid/bta/dm/bta_dm_co.c
index f71ebfc44a291eb6e9a9acc5ec3221d5e4b413e6..9b0b89b3a45792afa29d6d1f8bc3d53be05a63b5 100644 (file)
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "bta_api.h"
-#include "bta_sys.h"
-#include "bta_dm_co.h"
-#include "bta_dm_ci.h"
-#include "btc_dm.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_dm_co.h"
+#include "bta/bta_dm_ci.h"
+#include "btc/btc_dm.h"
 #if (defined(BTIF_INCLUDED) && BTIF_INCLUDED == TRUE)
-#include "bt_defs.h"
+#include "common/bt_defs.h"
 #if (BTM_OOB_INCLUDED == TRUE)
 #include "btif_dm.h"
 #endif
 #endif /* #if (defined(BTIF_INCLUDED) && BTIF_INCLUDED == TRUE) */
 #if (defined BLE_INCLUDED && BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
-#include "bte_appl.h"
+#include "common/bte_appl.h"
 tBTE_APPL_CFG bte_appl_cfg = {
 #if SMP_INCLUDED == TRUE
     BTA_LE_AUTH_REQ_SC_MITM_BOND, // Authentication requirements
index 9d3b42d637f4c22c0f99f0062478b1c53932010f..75d5ad44c68b543414f176312b2d232b5b91fbfa 100644 (file)
  *
  ******************************************************************************/
 
-#include "bta_api.h"
-#include "bta_sys.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sys.h"
 #include "bta_dm_int.h"
-#include "allocator.h"
+#include "osi/allocator.h"
 #include <string.h>
 
 
index 7afec045a19356426166eddcf3242495030cccb6..3354a33b2a5145c463acb12872484cc87c3adcc5 100644 (file)
 // #include <assert.h>
 #include <string.h>
 
-#include "bta_sys.h"
-#include "bta_api.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_api.h"
 #include "bta_dm_int.h"
-#include "btm_api.h"
+#include "stack/btm_api.h"
 
 #if (BTM_SSR_INCLUDED == TRUE)
 
index 06e58e9637c7aaffed64d8a20e4d4c59c8e6712e..45d098f44227150b920b670339886d4fb83e55ba 100644 (file)
@@ -26,8 +26,8 @@
  *
  ******************************************************************************/
 #include <string.h>
-#include "bta_api.h"
-#include "bta_sys.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sys.h"
 
 #if (BTM_SCO_HCI_INCLUDED == TRUE)
 
similarity index 99%
rename from components/bt/bluedroid/bta/include/bta_dm_int.h
rename to components/bt/bluedroid/bta/dm/include/bta_dm_int.h
index a27c94979f007456c72f4ffc76d1d45046589d57..6461bd4986b728d4fe2650040f3a5601903aa52b 100644 (file)
 #ifndef BTA_DM_INT_H
 #define BTA_DM_INT_H
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if (BLE_INCLUDED == TRUE && (defined BTA_GATT_INCLUDED) && (BTA_GATT_INCLUDED == TRUE))
-#include "bta_gatt_api.h"
+#include "bta/bta_gatt_api.h"
 #endif
 
 
index 3e4a0f73d807c3b13a173ffbe5830c72b60a9852..cd36966a58bfce7ca69debef1f286ba29e56cb58 100644 (file)
@@ -21,7 +21,7 @@
  *
  ******************************************************************************/
 
-#include "bta_gatt_common.h"
+#include "bta/bta_gatt_common.h"
 #include "gatt_int.h"
 
 void BTA_GATT_SetLocalMTU(uint16_t mtu)
index c3e729f48bd87f6daf2a332daa213c25656d9ad8..bc907d203571d701802639a6cd02d377e2de924b 100644 (file)
  ******************************************************************************/
 #define LOG_TAG "bt_bta_gattc"
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
-#include "utl.h"
-#include "bta_sys.h"
+#include "bta/utl.h"
+#include "bta/bta_sys.h"
 
 #include "bta_gattc_int.h"
-#include "l2c_api.h"
+#include "stack/l2c_api.h"
 #include "l2c_int.h"
 #include "gatt_int.h"
-#include "allocator.h"
-#include "mutex.h"
+#include "osi/allocator.h"
+#include "osi/mutex.h"
 
 #if (defined BTA_HH_LE_INCLUDED && BTA_HH_LE_INCLUDED == TRUE)
 #include "bta_hh_int.h"
index ec971d88b4020e3e609a21329042d334ff5392e1..b7c292a51e396cb8ff58675565ea630f82224573 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
-#include "allocator.h"
+#include "common/bt_target.h"
+#include "osi/allocator.h"
 
 #if defined(GATTC_INCLUDED) && (GATTC_INCLUDED == TRUE)
 
 #include <string.h>
-#include "bta_sys.h"
-#include "bta_gatt_api.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_gatt_api.h"
 #include "bta_gattc_int.h"
 
 /*****************************************************************************
index c43a2d49119b3dc271c13d645aa493a18232d5df..b17dc9ec0e0166459462cab77e722d7da9c46ab7 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if defined(GATTC_INCLUDED) && (GATTC_INCLUDED == TRUE)
 
 #include <string.h>
-#include "utl.h"
-#include "bta_sys.h"
-#include "sdp_api.h"
-#include "sdpdefs.h"
+#include "bta/utl.h"
+#include "bta/bta_sys.h"
+#include "stack/sdp_api.h"
+#include "stack/sdpdefs.h"
 #include "bta_gattc_int.h"
-#include "btm_api.h"
-#include "btm_ble_api.h"
-#include "allocator.h"
-#include "l2c_api.h"
+#include "stack/btm_api.h"
+#include "stack/btm_ble_api.h"
+#include "osi/allocator.h"
+#include "stack/l2c_api.h"
 #include "btm_int.h"
 #include "errno.h"
 
index 19e7748fcef1cb5c054f6d1c80a9365a1ab12395..cfe085603a9b91e0b82149f2c7ad8ec32d81fbd1 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if defined(GATTC_INCLUDED) && (GATTC_INCLUDED == TRUE)
 
 #include <string.h>
 
-#include "bta_api.h"
-#include "bta_sys.h"
-#include "bta_gattc_ci.h"
-#include "utl.h"
-#include "allocator.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_gattc_ci.h"
+#include "bta/utl.h"
+#include "osi/allocator.h"
 
 
 /*******************************************************************************
similarity index 99%
rename from components/bt/bluedroid/btif/bta_gattc_co.c
rename to components/bt/bluedroid/bta/gatt/bta_gattc_co.c
index 56feb4df605c9c363353dff8a5a37add3dd91a06..b3d73b6a5ecf2137c5ec7c6e8bcf5718e8bebde5 100644 (file)
 #include <unistd.h>
 #endif /* BT_SUPPORT_NVM */
 
-#include "bta_gattc_co.h"
-#include "bta_gattc_ci.h"
+#include "bta/bta_gattc_co.h"
+#include "bta/bta_gattc_ci.h"
 // #include "btif_util.h"
 #include "btm_int.h"
 #include "nvs.h"
 #include "nvs_flash.h"
-#include "list.h"
+#include "osi/list.h"
 #include "esp_err.h"
-#include "allocator.h"
+#include "osi/allocator.h"
 
 #if( defined BLE_INCLUDED ) && (BLE_INCLUDED == TRUE)
 #if( defined BTA_GATT_INCLUDED ) && (GATTC_INCLUDED == TRUE)
index 5ee5613d71bceb1594d927241f92b606015595fe..e20efe499e5a8f50bfcde957694871d0edbdaf2b 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if (GATTC_INCLUDED == TRUE && BLE_INCLUDED == TRUE)
 
 #include <string.h>
 
 #include "bta_gattc_int.h"
-#include "allocator.h"
+#include "osi/allocator.h"
 
 
 /*****************************************************************************
index 22a6f24b893131f25e34a5688da197f0e14f8c0a..35dcb0929ec73096ac8f3f916f9e25e824d3d585 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if defined(GATTC_INCLUDED) && (GATTC_INCLUDED == TRUE)
 
 #include <string.h>
 
-#include "bdaddr.h"
+#include "device/bdaddr.h"
 // #include "btif/include/btif_util.h"
-#include "utl.h"
-#include "bta_sys.h"
+#include "bta/utl.h"
+#include "bta/bta_sys.h"
 #include "bta_gattc_int.h"
-#include "l2c_api.h"
-#include "allocator.h"
+#include "stack/l2c_api.h"
+#include "osi/allocator.h"
 
 #define LOG_TAG "bt_bta_gattc"
 /*****************************************************************************
index c93fbe0e0576d60635ea0f03840c92a5aaece351..42f6d97aeea2d862c3eced832748eb1d45ad1951 100644 (file)
  ******************************************************************************/
 
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if defined(GATTS_INCLUDED) && (GATTS_INCLUDED == TRUE)
 
-#include "utl.h"
-#include "bta_sys.h"
+#include "bta/utl.h"
+#include "bta/bta_sys.h"
 #include "bta_gatts_int.h"
-#include "bta_gatts_co.h"
-#include "btm_ble_api.h"
+#include "bta/bta_gatts_co.h"
+#include "stack/btm_ble_api.h"
 #include <string.h>
-#include "allocator.h"
+#include "osi/allocator.h"
 
 static void bta_gatts_nv_save_cback(BOOLEAN is_saved, tGATTS_HNDL_RANGE *p_hndl_range);
 static BOOLEAN bta_gatts_nv_srv_chg_cback(tGATTS_SRV_CHG_CMD cmd, tGATTS_SRV_CHG_REQ *p_req,
index 67bc847e03f8cef2642a1f340b0c2e3c1b8562fb..2985da2e20bbeeb82d972a10c79e02558102cfd2 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if defined(GATTS_INCLUDED) && (GATTS_INCLUDED == TRUE)
 
 #include <string.h>
-#include "bta_sys.h"
-#include "bta_gatt_api.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_gatt_api.h"
 #include "bta_gatts_int.h"
-#include "allocator.h"
+#include "osi/allocator.h"
 
 /*****************************************************************************
 **  Constants
similarity index 99%
rename from components/bt/bluedroid/btif/bta_gatts_co.c
rename to components/bt/bluedroid/bta/gatt/bta_gatts_co.c
index 9469c15832d1b2f96811bad4de9fa894b152c3bc..1bc7881cc920337a6d2e62780c8a392668edd5fa 100644 (file)
  *
  ******************************************************************************/
 
-#include "bta_api.h"
+#include "bta/bta_api.h"
 
 #if( defined BLE_INCLUDED ) && (BLE_INCLUDED == TRUE)
 #if( defined GATTS_INCLUDED ) && (GATTS_INCLUDED == TRUE)
 
 #include <stdlib.h>
 #include <string.h>
-#include "bta_gatts_co.h"
+#include "bta/bta_gatts_co.h"
 // #include "btif_util.h"
 
 #if (defined(BTIF_INCLUDED) && BTIF_INCLUDED == TRUE)
index 2ca2da566b056b2d4b0c8f4e90efb5e4678eef1d..3401c2bba19d415015544618057ed6ce225df403 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if defined(GATTS_INCLUDED) && (GATTS_INCLUDED == TRUE)
 
 #include <string.h>
 
 #include "bta_gatts_int.h"
-#include "allocator.h"
+#include "osi/allocator.h"
 
 /* type for service building action functions */
 typedef void (*tBTA_GATTS_SRVC_ACT)(tBTA_GATTS_SRVC_CB *p_rcb, tBTA_GATTS_DATA *p_data);
index 1862c72d340192cd09ed5fb50ee0ab35fe7e194d..e7a0a23f0750417804b67e9f3899ee70542860ce 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if defined(GATTS_INCLUDED) && (GATTS_INCLUDED == TRUE)
 
 #include <string.h>
-#include "utl.h"
-#include "bta_sys.h"
+#include "bta/utl.h"
+#include "bta/bta_sys.h"
 #include "bta_gatts_int.h"
 
 static const UINT8  base_uuid[LEN_UUID_128] = {0xFB, 0x34, 0x9B, 0x5F, 0x80, 0x00, 0x00, 0x80,
similarity index 99%
rename from components/bt/bluedroid/bta/include/bta_gattc_int.h
rename to components/bt/bluedroid/bta/gatt/include/bta_gattc_int.h
index 6df2529f7700e914c3e3479e82b59f98839e4b68..26ab73bf5677466728215e37c19e1c20b7b82576 100644 (file)
 #ifndef BTA_GATTC_INT_H
 #define BTA_GATTC_INT_H
 
-#include "bt_target.h"
-#include "bta_sys.h"
-#include "bta_gatt_api.h"
-#include "bta_gattc_ci.h"
-#include "bta_gattc_co.h"
-#include "fixed_queue.h"
-#include "mutex.h"
+#include "common/bt_target.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_gatt_api.h"
+#include "bta/bta_gattc_ci.h"
+#include "bta/bta_gattc_co.h"
+#include "osi/fixed_queue.h"
+#include "osi/mutex.h"
 
 /*****************************************************************************
 **  Constants and data types
similarity index 98%
rename from components/bt/bluedroid/bta/include/bta_gatts_int.h
rename to components/bt/bluedroid/bta/gatt/include/bta_gatts_int.h
index 9d04423f3d39497ea25c6c74c77ee10834adf8b3..7f92ec8cb66cdbddb0e58c4a8abeb158ff4a7f05 100644 (file)
 #ifndef BTA_GATTS_INT_H
 #define BTA_GATTS_INT_H
 
-#include "bt_target.h"
-#include "bta_sys.h"
-#include "bta_gatt_api.h"
-#include "gatt_api.h"
+#include "common/bt_target.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_gatt_api.h"
+#include "stack/gatt_api.h"
 
 
 /*****************************************************************************
index eb0cf7a2af0fe1dbcdbd06e44fead5310ea2968c..88a26192a7b35bae00840b449922ded044ed9778 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if defined(BTA_HH_INCLUDED) && (BTA_HH_INCLUDED == TRUE)
 
 #include <string.h>
 
-#include "bta_sys.h"
-#include "btm_api.h"
-#include "l2c_api.h"
+#include "bta/bta_sys.h"
+#include "stack/btm_api.h"
+#include "stack/l2c_api.h"
 #include "bta_hh_int.h"
-#include "bta_hh_co.h"
-#include "utl.h"
+#include "bta/bta_hh_co.h"
+#include "bta/utl.h"
 
 /*****************************************************************************
 **  Constants
index 3887ed8d112eef46315f93a8fa9e4d1695c27baa..ed96d8ee723865ee18e14481e40e59e0d111d673 100644 (file)
@@ -22,7 +22,7 @@
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if defined(BTA_HH_INCLUDED) && (BTA_HH_INCLUDED == TRUE)
 
 #include <string.h>
 #include <stdio.h>
 
-#include "bta_hh_api.h"
+#include "bta/bta_hh_api.h"
 #include "bta_hh_int.h"
-#include "l2c_api.h"
-#include "utl.h"
+#include "stack/l2c_api.h"
+#include "bta/utl.h"
 
 #define LOG_TAG "bt_bta_hh"
 #include "osi/include/log.h"
index 9362a5d75fe9ff429282d6ee2df65dab009847b9..65e06c7345bfaa2734c65bd212b4e6c44b851f0a 100644 (file)
@@ -23,8 +23,8 @@
  *
  ******************************************************************************/
 
-#include "bt_target.h"
-#include "bta_hh_api.h"
+#include "common/bt_target.h"
+#include "bta/bta_hh_api.h"
 
 #if defined(BTA_HH_INCLUDED) && (BTA_HH_INCLUDED == TRUE)
 
index e933771534f3020f175fef0855ef43ccf87db00b..78eca9c2b87ae805ea4cff77954cf557a6d52994 100644 (file)
  *
  ******************************************************************************/
 
-#include "bta_api.h"
+#include "bta/bta_api.h"
 #include "bta_hh_int.h"
 
 #if (defined BTA_HH_LE_INCLUDED && BTA_HH_LE_INCLUDED == TRUE)
 
-#include "bta_api.h"
+#include "bta/bta_api.h"
 #include <string.h>
-#include "btm_api.h"
-#include "btm_ble_api.h"
-#include "bta_hh_co.h"
-#include "bta_gatt_api.h"
+#include "stack/btm_api.h"
+#include "stack/btm_ble_api.h"
+#include "bta/bta_hh_co.h"
+#include "bta/bta_gatt_api.h"
 #include "srvc_api.h"
 #include "btm_int.h"
-#include "utl.h"
+#include "bta/utl.h"
 
 #define LOG_TAG "bt_bta_hh"
 #include "osi/include/log.h"
index 0737d408051398ea2969869a8e863425343df42e..fd74672780b9354920cb94a6b2936f193c3ecc5a 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if defined(BTA_HH_INCLUDED) && (BTA_HH_INCLUDED == TRUE)
 
 #include <string.h>
 
-#include "bta_hh_api.h"
+#include "bta/bta_hh_api.h"
 #include "bta_hh_int.h"
 
 /*****************************************************************************
index 16abfee73069e799cbd43608f46dea52b39449b1..bc2b0db358fa19cb40847a3eacd3d39b515839db 100644 (file)
@@ -17,7 +17,7 @@
  ******************************************************************************/
 #include <string.h>
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #if defined(BTA_HH_INCLUDED) && (BTA_HH_INCLUDED == TRUE)
 
 
similarity index 99%
rename from components/bt/bluedroid/bta/include/bta_hh_int.h
rename to components/bt/bluedroid/bta/hh/include/bta_hh_int.h
index e3d296ee766ade18e552ec9884c4e9711670b49f..0eba2dd2dd283cda7498a69852398437f64234e9 100644 (file)
 #ifndef BTA_HH_INT_H
 #define BTA_HH_INT_H
 
-#include "bta_sys.h"
-#include "utl.h"
-#include "bta_hh_api.h"
+#include "bta/bta_sys.h"
+#include "bta/utl.h"
+#include "bta/bta_hh_api.h"
 
 //#if BTA_HH_LE_INCLUDED == TRUE
-#include "bta_gatt_api.h"
+#include "bta/bta_gatt_api.h"
 //#endif
 #if defined(BTA_HH_INCLUDED) && (BTA_HH_INCLUDED == TRUE)
 
-/* can be moved to bta_api.h */
+/* can be moved to bta/bta_api.h */
 #define BTA_HH_MAX_RPT_CHARS    8
 
 #if (BTA_GATT_INCLUDED == FALSE || BLE_INCLUDED == FALSE)
similarity index 99%
rename from components/bt/bluedroid/bta/include/bta_api.h
rename to components/bt/bluedroid/bta/include/bta/bta_api.h
index 8df5952d6222c25fb06eccddc4b155ba4224cd7a..b2ef0ecd3acb0abecb06fe0d366c5574e6adb65a 100644 (file)
 #ifndef BTA_API_H
 #define BTA_API_H
 
-#include "bt_target.h"
-#include "bt_types.h"
-#include "btm_api.h"
+#include "common/bt_target.h"
+#include "stack/bt_types.h"
+#include "stack/btm_api.h"
 // #include "uipc_msg.h"
-#include "sdp_api.h"
+#include "stack/sdp_api.h"
 
 #if BLE_INCLUDED == TRUE
-#include "btm_ble_api.h"
+#include "stack/btm_ble_api.h"
 #endif
 
 /*****************************************************************************
@@ -53,7 +53,7 @@ typedef UINT8 tBTA_STATUS;
  * Service ID
  *
  * NOTES: When you add a new Service ID for BTA AND require to change the value of BTA_MAX_SERVICE_ID,
- *        make sure that the correct security ID of the new service from Security service definitions (btm_api.h)
+ *        make sure that the correct security ID of the new service from Security service definitions (stack/btm_api.h)
  *        should be added to bta_service_id_to_btm_srv_id_lkup_tbl table in bta_dm_act.c.
  */
 
similarity index 96%
rename from components/bt/bluedroid/bta/include/bta_ar_api.h
rename to components/bt/bluedroid/bta/include/bta/bta_ar_api.h
index acfac9df44ba0da82b7da3e29fd08ad4a2fa638f..99cc511e957062fa86fea8d29771577be3f3ffd9 100644 (file)
 #ifndef BTA_AR_API_H
 #define BTA_AR_API_H
 
-#include "avdt_api.h"
-#include "avct_api.h"
-#include "avrc_api.h"
-#include "sdp_api.h"
-#include "bta_av_api.h"
-#include "bta_sys.h"
+#include "stack/avdt_api.h"
+#include "stack/avct_api.h"
+#include "stack/avrc_api.h"
+#include "stack/sdp_api.h"
+#include "bta/bta_av_api.h"
+#include "bta/bta_sys.h"
 
 #if (BTA_AR_INCLUDED == TRUE)
 
similarity index 99%
rename from components/bt/bluedroid/bta/include/bta_av_api.h
rename to components/bt/bluedroid/bta/include/bta/bta_av_api.h
index a7560c9ebc493acfd9ba5c702133ac0426fb1ecf..6e70acf946a24014ebe5f3f4d5e18825b8b18c5c 100644 (file)
 #ifndef BTA_AV_API_H
 #define BTA_AV_API_H
 
-#include "avrc_api.h"
-#include "avdt_api.h"
-#include "a2d_api.h"
-#include "bta_api.h"
+#include "stack/avrc_api.h"
+#include "stack/avdt_api.h"
+#include "stack/a2d_api.h"
+#include "bta/bta_api.h"
 
 #if (BTA_AV_INCLUDED == TRUE)
 
similarity index 98%
rename from components/bt/bluedroid/bta/include/bta_av_ci.h
rename to components/bt/bluedroid/bta/include/bta/bta_av_ci.h
index a537b8a4cafa09177ff4f1517613c0a78840c11e..b39acace6db60c956ba5f6f7cc72d45f7d850c29 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef BTA_AV_CI_H
 #define BTA_AV_CI_H
 
-#include "bta_av_api.h"
+#include "bta/bta_av_api.h"
 
 #if (BTA_AV_INCLUDED == TRUE)
 
similarity index 99%
rename from components/bt/bluedroid/bta/include/bta_av_co.h
rename to components/bt/bluedroid/bta/include/bta/bta_av_co.h
index 3f7f989d6c98ae0e9d12f86b103b3e7f2eb4ebd5..403b7a9217abeba35c0e7d6136ae4105944ef863 100644 (file)
@@ -24,8 +24,8 @@
 #ifndef BTA_AV_CO_H
 #define BTA_AV_CO_H
 
-#include "l2c_api.h"
-#include "bta_av_api.h"
+#include "stack/l2c_api.h"
+#include "bta/bta_av_api.h"
 
 #if (BTA_AV_INCLUDED == TRUE)
 
similarity index 99%
rename from components/bt/bluedroid/bta/include/bta_dm_ci.h
rename to components/bt/bluedroid/bta/include/bta/bta_dm_ci.h
index 9f8a87437a2942848d3caa5256508a06b5c5dbb6..90565aac8513cdae0b339f61b8df66f5f0fdf730 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef BTA_DM_CI_H
 #define BTA_DM_CI_H
 
-#include "bta_api.h"
+#include "bta/bta_api.h"
 
 /*****************************************************************************
 **  Function Declarations
similarity index 99%
rename from components/bt/bluedroid/bta/include/bta_dm_co.h
rename to components/bt/bluedroid/bta/include/bta/bta_dm_co.h
index 2a80aefe86a671931c7cfe1ed389bbdb5fe401a2..7d62857191fe0064e6c1fcb18cd164d41984165e 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef BTA_DM_CO_H
 #define BTA_DM_CO_H
 
-#include "bta_sys.h"
+#include "bta/bta_sys.h"
 
 
 #ifndef BTA_SCO_OUT_PKT_SIZE
similarity index 99%
rename from components/bt/bluedroid/bta/include/bta_gatt_api.h
rename to components/bt/bluedroid/bta/include/bta/bta_gatt_api.h
index 936cb3b420962841a2d8c1043f9cf7a7127f8136..72eb3643b6637583d3c3ce298f207a05224cf888 100644 (file)
@@ -25,9 +25,9 @@
 #ifndef BTA_GATT_API_H
 #define BTA_GATT_API_H
 
-#include "bta_api.h"
-#include "gatt_api.h"
-#include "list.h"
+#include "bta/bta_api.h"
+#include "stack/gatt_api.h"
+#include "osi/list.h"
 
 #ifndef     BTA_GATT_INCLUDED
 #warning BTA_GATT_INCLUDED not defined
similarity index 97%
rename from components/bt/bluedroid/bta/include/bta_gatt_common.h
rename to components/bt/bluedroid/bta/include/bta/bta_gatt_common.h
index f6bc884b6a9421fb32c76a955a70f9df61156aab..96bd348021c02a23ac7dafce6a9f4219ce59f956 100644 (file)
@@ -21,7 +21,7 @@
  *
  ******************************************************************************/
 
-#include "bt_types.h"
+#include "stack/bt_types.h"
 
 
 #ifdef __cplusplus
similarity index 99%
rename from components/bt/bluedroid/bta/include/bta_gattc_ci.h
rename to components/bt/bluedroid/bta/include/bta/bta_gattc_ci.h
index c4caf14990069a95de02aa7222a4e37d41244ed0..d523e87ba290d23d03ac34d9596107251b25c0a2 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef BTA_GATTC_CI_H
 #define BTA_GATTC_CI_H
 
-#include "bta_gatt_api.h"
+#include "bta/bta_gatt_api.h"
 
 /*****************************************************************************
 **  Constants and data types
similarity index 99%
rename from components/bt/bluedroid/bta/include/bta_gattc_co.h
rename to components/bt/bluedroid/bta/include/bta/bta_gattc_co.h
index 0f4d473bfdaf8eb973a36b8bcbcd00ab4583c196..561986f8823df7a26faabfd0870ba04a7a5d30c5 100644 (file)
@@ -24,8 +24,8 @@
 #ifndef BTA_GATTC_CO_H
 #define BTA_GATTC_CO_H
 
-#include "bta_gatt_api.h"
-#include "hashkey.h"
+#include "bta/bta_gatt_api.h"
+#include "coap/hashkey.h"
 
 /*******************************************************************************
 **
similarity index 99%
rename from components/bt/bluedroid/bta/include/bta_gatts_co.h
rename to components/bt/bluedroid/bta/include/bta/bta_gatts_co.h
index 78e001b764d9a0a7c9497427a01a86fb5e8a9844..79c70c8b0e6c1228ced77c7325e03a7caa5527e2 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef BTA_GATTS_CO_H
 #define BTA_GATTS_CO_H
 
-#include "bta_gatt_api.h"
+#include "bta/bta_gatt_api.h"
 
 /*******************************************************************************
 **
similarity index 99%
rename from components/bt/bluedroid/bta/include/bta_hh_api.h
rename to components/bt/bluedroid/bta/include/bta/bta_hh_api.h
index aa9fd0a236fa31b403cd3b3d697877b6739ae9ef..e1bf4017fb03c061939df5727b786f8c22b50afc 100644 (file)
 #ifndef BTA_HH_API_H
 #define BTA_HH_API_H
 
-#include "bta_api.h"
-#include "hidh_api.h"
+#include "bta/bta_api.h"
+#include "stack/hidh_api.h"
 #if defined(BTA_HH_INCLUDED) && (BTA_HH_INCLUDED == TRUE)
 
 #if (defined BTA_HH_LE_INCLUDED && BTA_HH_LE_INCLUDED == TRUE)
-#include "gatt_api.h"
+#include "stack/gatt_api.h"
 #endif
 
 /*****************************************************************************
similarity index 99%
rename from components/bt/bluedroid/bta/include/bta_hh_co.h
rename to components/bt/bluedroid/bta/include/bta/bta_hh_co.h
index 9cbb155025caeb5b4b02020e2fd8f01ca39c1b7a..f0fef370c83fbb368dd53aa41764b0640ad1e437 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef BTA_HH_CO_H
 #define BTA_HH_CO_H
 
-#include "bta_hh_api.h"
+#include "bta/bta_hh_api.h"
 
 typedef struct {
     UINT16              rpt_uuid;
similarity index 99%
rename from components/bt/bluedroid/bta/include/bta_jv_api.h
rename to components/bt/bluedroid/bta/include/bta/bta_jv_api.h
index a9279a846b461f4c5b1fe62071e0f18fdad1507e..bf23aab4e4cdf0156dc90bdc8c4aa9671e35b400 100644 (file)
 #ifndef BTA_JV_API_H
 #define BTA_JV_API_H
 
-#include "bt_target.h"
-#include "bt_types.h"
-#include "bta_api.h"
-#include "btm_api.h"
-#include "l2c_api.h"
-#include "rfcdefs.h"
-#include "sdp_api.h"
+#include "common/bt_target.h"
+#include "stack/bt_types.h"
+#include "bta/bta_api.h"
+#include "stack/btm_api.h"
+#include "stack/l2c_api.h"
+#include "stack/rfcdefs.h"
+#include "stack/sdp_api.h"
 
 #if (defined BTA_JV_INCLUDED && BTA_JV_INCLUDED == TRUE)
 /*****************************************************************************
similarity index 98%
rename from components/bt/bluedroid/bta/include/bta_jv_co.h
rename to components/bt/bluedroid/bta/include/bta/bta_jv_co.h
index e68096c15ce4a5a1a28171252e55e50c61d45fa5..b37625cfe805970dde908b370d7966a7a1afaedd 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef BTA_JV_CO_H
 #define BTA_JV_CO_H
 
-#include "bta_jv_api.h"
+#include "bta/bta_jv_api.h"
 
 #if (defined BTA_JV_INCLUDED && BTA_JV_INCLUDED == TRUE)
 /*****************************************************************************
similarity index 98%
rename from components/bt/bluedroid/bta/include/bta_sdp_api.h
rename to components/bt/bluedroid/bta/include/bta/bta_sdp_api.h
index 6f27f5ccb0a61bfdf561110c7313d44cee0eb3ca..b88c0c263c30365c7b1343a23c7c2b16e39bb10c 100644 (file)
 #define BTA_SDP_API_H
 
 #include "bt_sdp.h"
-#include "bt_target.h"
-#include "bt_types.h"
-#include "bta_api.h"
-#include "btm_api.h"
+#include "common/bt_target.h"
+#include "stack/bt_types.h"
+#include "bta/bta_api.h"
+#include "stack/btm_api.h"
 
 #if (SDP_INCLUDED == TRUE)
 /* status values */
similarity index 99%
rename from components/bt/bluedroid/bta/include/bta_sys.h
rename to components/bt/bluedroid/bta/include/bta/bta_sys.h
index 0119008693950c79193f06c5b0c0d2e60a35a811..a58773de734d28f1a709222b168ad2e1a7ee97d9 100644 (file)
@@ -24,8 +24,8 @@
 #ifndef BTA_SYS_H
 #define BTA_SYS_H
 
-#include "bt_target.h"
-#include "bt_defs.h"
+#include "common/bt_target.h"
+#include "common/bt_defs.h"
 
 /*****************************************************************************
 **  Constants and data types
similarity index 99%
rename from components/bt/bluedroid/bta/include/utl.h
rename to components/bt/bluedroid/bta/include/bta/utl.h
index 74653c26e0fea54ed66bd5a6248ae7c6a3e19ab3..a140832f3227a74f3913958167a2ab704cf9b0f2 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef UTL_H
 #define UTL_H
 
-#include "bt_types.h"
+#include "stack/bt_types.h"
 // #include "bt_utils.h"
 
 /*****************************************************************************
index b3fe83ae9e2d6d7727d33ff7d897792a757de3e4..9ce667745604cd2df9d41739146f7239e02b4b4f 100644 (file)
 #include <pthread.h>
 #include <stdlib.h>
 
-#include "allocator.h"
-#include "bt_types.h"
-#include "utl.h"
-#include "bta_sys.h"
-#include "bta_api.h"
-#include "bta_jv_api.h"
+#include "osi/allocator.h"
+#include "stack/bt_types.h"
+#include "bta/utl.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_api.h"
+#include "bta/bta_jv_api.h"
 #include "bta_jv_int.h"
-#include "bta_jv_co.h"
-#include "btm_api.h"
+#include "bta/bta_jv_co.h"
+#include "stack/btm_api.h"
 #include "btm_int.h"
-#include "sdp_api.h"
-#include "l2c_api.h"
-#include "port_api.h"
+#include "stack/sdp_api.h"
+#include "stack/l2c_api.h"
+#include "stack/port_api.h"
 #include <string.h>
-#include "rfcdefs.h"
-#include "avct_api.h"
-#include "avdt_api.h"
-#include "gap_api.h"
-#include "l2c_api.h"
+#include "stack/rfcdefs.h"
+#include "stack/avct_api.h"
+#include "stack/avdt_api.h"
+#include "stack/gap_api.h"
+#include "stack/l2c_api.h"
 
 
 #if (defined BTA_JV_INCLUDED && BTA_JV_INCLUDED == TRUE)
index 3af262a13609cf0045772e87303504d8aa5d8a93..e6a686e46f8934a80b5d8a52bf4e43b1945f74a3 100644 (file)
  *
  ******************************************************************************/
 
-#include "bta_api.h"
-#include "bta_sys.h"
-#include "bta_jv_api.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_jv_api.h"
 #include "bta_jv_int.h"
-#include "allocator.h"
+#include "osi/allocator.h"
 #include <string.h>
-#include "port_api.h"
-#include "sdp_api.h"
-#include "utl.h"
-#include "gap_api.h"
+#include "stack/port_api.h"
+#include "stack/sdp_api.h"
+#include "bta/utl.h"
+#include "stack/gap_api.h"
 
-#include "bt_target.h"
-#include "sdp_api.h"
+#include "common/bt_target.h"
+#include "stack/sdp_api.h"
 
 
 #if (defined BTA_JV_INCLUDED && BTA_JV_INCLUDED == TRUE)
index e88aa8cd3525c561429f01badf338c24a8ab32ec..f617dfc5139791db7821d0e6a352138d62adb662 100644 (file)
  *
  ******************************************************************************/
 
-#include "allocator.h"
-#include "bta_api.h"
-#include "bta_jv_api.h"
-#include "bt_target.h"
+#include "osi/allocator.h"
+#include "bta/bta_api.h"
+#include "bta/bta_jv_api.h"
+#include "common/bt_target.h"
 
 #if (defined BTA_JV_INCLUDED && BTA_JV_INCLUDED == TRUE)
 #ifndef BTA_JV_SDP_DB_SIZE
index 9cce6e07f4dda4975c2b964afe15bd0b7fdac008..9523d6e8932e1779e9f59a0da39755b109b08ed4 100644 (file)
  *
  ******************************************************************************/
 
-#include "bta_api.h"
-#include "bta_sys.h"
-#include "bta_jv_api.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_jv_api.h"
 #include "bta_jv_int.h"
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if (defined BTA_JV_INCLUDED && BTA_JV_INCLUDED == TRUE)
 /*****************************************************************************
similarity index 98%
rename from components/bt/bluedroid/bta/include/bta_jv_int.h
rename to components/bt/bluedroid/bta/jv/include/bta_jv_int.h
index 2ef9ace3efb802f5623e3d3396b57e8c7dfc2013..4f0ce4405db73a1508256131a34ef8be73616b61 100644 (file)
 #ifndef BTA_JV_INT_H
 #define BTA_JV_INT_H
 
-#include "bta_sys.h"
-#include "bta_api.h"
-#include "bta_jv_api.h"
-#include "rfcdefs.h"
-#include "port_api.h"
-#include "sdp_api.h"
-
-#include "bt_target.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_api.h"
+#include "bta/bta_jv_api.h"
+#include "stack/rfcdefs.h"
+#include "stack/port_api.h"
+#include "stack/sdp_api.h"
+
+#include "common/bt_target.h"
 #if (defined BTA_JV_INCLUDED && BTA_JV_INCLUDED == TRUE)
 /*****************************************************************************
 **  Constants
index 61cbbd62e5d27d7ec6c379c059bccbd2d865e020..4deabe9aff934b6e21242f7d91ce912b1bc616f7 100644 (file)
  ******************************************************************************/
 
 #include <stdlib.h>
-#include "bt_target.h"
-#include "bta_api.h"
-#include "bta_sys.h"
-#include "bta_sdp_api.h"
+#include "common/bt_target.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_sdp_api.h"
 #include "bta_sdp_int.h"
 
 #if defined(BTA_SDP_INCLUDED) && (BTA_SDP_INCLUDED == TRUE)
index 21e3fd17354d30b82acb630969a3cf6a2897f809..c235800b1d971fa4f1e7df36cfa97970d2ffeddf 100644 (file)
 // #include <hardware/bluetooth.h>
 #include "bt_sdp.h"
 // #include <arpa/inet.h>
-#include "bt_defs.h"
+#include "common/bt_defs.h"
 #include <stdlib.h>
 #include <string.h>
-#include "bt_target.h"
-#include "allocator.h"
-#include "bt_types.h"
-#include "utl.h"
-#include "bta_sys.h"
-#include "bta_api.h"
-#include "bta_sdp_api.h"
+#include "common/bt_target.h"
+#include "osi/allocator.h"
+#include "stack/bt_types.h"
+#include "bta/utl.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sdp_api.h"
 #include "bta_sdp_int.h"
-#include "btm_api.h"
+#include "stack/btm_api.h"
 #include "btm_int.h"
-#include "sdp_api.h"
+#include "stack/sdp_api.h"
 
 #if (SDP_INCLUDED == TRUE)
 
index c49d38e8c0ef30e5fa7d63c9b7dc6d41d69e3cd6..1d027cb79e2bd74f7550b791f509a8a21957e50b 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
-#include "bta_api.h"
-#include "bta_sys.h"
-#include "bta_sdp_api.h"
+#include "common/bt_target.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_sdp_api.h"
 #include "bta_sdp_int.h"
 #include <string.h>
-#include "allocator.h"
-#include "sdp_api.h"
+#include "osi/allocator.h"
+#include "stack/sdp_api.h"
 
 #if defined(BTA_SDP_INCLUDED) && (BTA_SDP_INCLUDED == TRUE)
 /*****************************************************************************
index c515c090c72fe69dac4e1ffa96011d283178eeae..fff5e321a2f27bc1eed63ee21c2d2e995c3ec0f0 100644 (file)
@@ -20,9 +20,9 @@
  *  This file contains compile-time configurable constants for SDP Search
  ******************************************************************************/
 
-#include "bt_target.h"
-#include "bta_api.h"
-#include "bta_sdp_api.h"
+#include "common/bt_target.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sdp_api.h"
 
 #if defined(BTA_SDP_INCLUDED) && (BTA_SDP_INCLUDED == TRUE)
 
similarity index 97%
rename from components/bt/bluedroid/bta/include/bta_sdp_int.h
rename to components/bt/bluedroid/bta/sdp/include/bta_sdp_int.h
index 9dee3fc96317400a11295af5e2b0d6a3615f7ff3..dfe3546f13a218823929e449f029bdbabe5af5d1 100644 (file)
@@ -27,9 +27,9 @@
 #ifndef BTA_SDP_INT_H
 #define BTA_SDP_INT_H
 
-#include "bta_sys.h"
-#include "bta_api.h"
-#include "bta_sdp_api.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sdp_api.h"
 
 #if (SDP_INCLUDED == TRUE)
 /*****************************************************************************
index 55824e7a7a3555270f1a45b2a0eb679fc434c0ef..4324a6b5694519f4c61ca0ecfb36844741ffb773 100644 (file)
  ******************************************************************************/
 
 #include <stddef.h>
-#include "bta_api.h"
-#include "bta_sys.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sys.h"
 #include "bta_sys_int.h"
-#include "utl.h"
+#include "bta/utl.h"
 
 /*******************************************************************************
 **
index 590c907efcc26fb8ef61d8deefdf4e43425493b6..3efd2a39d86a80b161ec3d7b85eb7c73942f1f2d 100644 (file)
 // #include <assert.h>
 #include <string.h>
 
-#include "alarm.h"
-#include "thread.h"
-#include "btm_api.h"
-#include "bta_api.h"
-#include "bta_sys.h"
+#include "osi/alarm.h"
+#include "osi/thread.h"
+#include "stack/btm_api.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sys.h"
 #include "bta_sys_int.h"
 
-#include "fixed_queue.h"
-#include "hash_map.h"
-#include "osi.h"
-#include "hash_functions.h"
+#include "osi/fixed_queue.h"
+#include "osi/hash_map.h"
+#include "osi/osi.h"
+#include "osi/hash_functions.h"
 #if( defined BTA_AR_INCLUDED ) && (BTA_AR_INCLUDED == TRUE)
-#include "bta_ar_api.h"
+#include "bta/bta_ar_api.h"
 #endif
-#include "utl.h"
-#include "allocator.h"
-#include "mutex.h"
+#include "bta/utl.h"
+#include "osi/allocator.h"
+#include "osi/mutex.h"
 
 
 /* system manager control block definition */
@@ -75,7 +75,7 @@ typedef void (*tBTA_SYS_ACTION)(tBTA_SYS_HW_MSG *p_data);
 
 /* action function list */
 const tBTA_SYS_ACTION bta_sys_action[] = {
-    /* device manager local device API events - cf bta_sys.h for events */
+    /* device manager local device API events - cf bta/bta_sys.h for events */
     bta_sys_hw_api_enable,             /* 0  BTA_SYS_HW_API_ENABLE_EVT    */
     bta_sys_hw_evt_enabled,           /* 1  BTA_SYS_HW_EVT_ENABLED_EVT */
     bta_sys_hw_evt_stack_enabled,       /* 2  BTA_SYS_HW_EVT_STACK_ENABLED_EVT */
index c0b7bcd8b521ac89ab7361405e259685cb701c69..ddaec5aa835657d46f5c037fdf85b2e9095611dc 100644 (file)
@@ -22,9 +22,9 @@
  *
  ******************************************************************************/
 #include <stddef.h>
-#include "utl.h"
-#include "btm_api.h"
-#include "allocator.h"
+#include "bta/utl.h"
+#include "stack/btm_api.h"
+#include "osi/allocator.h"
 
 /*******************************************************************************
 **
index 15587d6749f4fbe74827a6e1de224eea1b3d69c7..9d8d52bcac68a4eb44a51b70dc39184c45398746 100644 (file)
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "btc_task.h"
-#include "btc_alarm.h"
+#include "btc/btc_task.h"
+#include "btc/btc_alarm.h"
 
 void btc_alarm_handler(btc_msg_t *msg)
 {
index e2c2b6d3f82d32b16cee5ab6314150f297fb0419..b0dbf2f9e5f2d18b87a7da258f454140680e322f 100644 (file)
 
 #include <string.h>
 
-#include "bta_api.h"
-#include "btc_config.h"
-#include "bdaddr.h"
-#include "btc_ble_storage.h"
-#include "bta_gatts_co.h"
-#include "btc_util.h"
+#include "bta/bta_api.h"
+#include "btc/btc_config.h"
+#include "device/bdaddr.h"
+#include "btc/btc_ble_storage.h"
+#include "bta/bta_gatts_co.h"
+#include "btc/btc_util.h"
 
 #if (SMP_INCLUDED == TRUE)
 
index df95701385fc1a0094a0c0378512d10ddcefde6c..4a859340b26f05028ff4bebbca5e58159831fbfc 100644 (file)
 #include <stdio.h>
 #include <string.h>
 
-#include "bt_defs.h"
-#include "bt_trace.h"
-#include "alarm.h"
-#include "allocator.h"
-#include "bdaddr.h"
-#include "btc_config.h"
-#include "btc_util.h"
-#include "config.h"
-#include "osi.h"
-#include "mutex.h"
-
-#include "bt_types.h"
+#include "common/bt_defs.h"
+#include "common/bt_trace.h"
+#include "osi/alarm.h"
+#include "osi/allocator.h"
+#include "device/bdaddr.h"
+#include "btc/btc_config.h"
+#include "btc/btc_util.h"
+#include "osi/config.h"
+#include "osi/osi.h"
+#include "osi/mutex.h"
+
+#include "stack/bt_types.h"
 
 static const char *CONFIG_FILE_PATH = "bt_config.conf";
 static const period_ms_t CONFIG_SETTLE_PERIOD_MS = 3000;
index b75100055a731ee4b0fe2356e791e99057fd08b6..976e5a16c6f6b539a9e8ada00c0a7f56709b4214 100644 (file)
 // limitations under the License.
 
 #include <string.h>
-#include "bta_api.h"
-#include "btc_task.h"
-#include "btc_manage.h"
-#include "btc_dev.h"
+#include "bta/bta_api.h"
+#include "btc/btc_task.h"
+#include "btc/btc_manage.h"
+#include "btc/btc_dev.h"
 
 void btc_dev_call_handler(btc_msg_t *msg)
 {
index e073889723612dc0eb04cf6da5571357c59be99c..ff82b45f58f8bc07f96373eb201fafa76c2be79c 100644 (file)
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include <stdlib.h>
 #include <string.h>
-#include "btc_common.h"
-#include "btc_dm.h"
-#include "btc_main.h"
-#include "bt_trace.h"
-#include "bt_target.h"
-#include "btc_storage.h"
-#include "btc_ble_storage.h"
+#include "btc/btc_common.h"
+#include "btc/btc_dm.h"
+#include "btc/btc_main.h"
+#include "common/bt_trace.h"
+#include "common/bt_target.h"
+#include "btc/btc_storage.h"
+#include "btc/btc_ble_storage.h"
 #include "esp_gap_ble_api.h"
 #include "btm_int.h"
-#include "bta_api.h"
-#include "bta_gatt_api.h"
-#include "allocator.h"
+#include "bta/bta_api.h"
+#include "bta/bta_gatt_api.h"
+#include "osi/allocator.h"
 
 #if (BTC_GAP_BT_INCLUDED == TRUE)
 #include "btc_gap_bt.h"
index cb5975be1f8178bc056fa8f9b35719b845b4e593..b6c9606be63cb2a3b3b90a239ecb55de3ae19efc 100644 (file)
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "btc_task.h"
-#include "btc_main.h"
-#include "btc_dm.h"
-#include "future.h"
+#include "btc/btc_task.h"
+#include "btc/btc_main.h"
+#include "btc/btc_dm.h"
+#include "osi/future.h"
 #include "esp_err.h"
-#include "btc_config.h"
-#include "alarm.h"
-#include "btc_ble_storage.h"
+#include "btc/btc_config.h"
+#include "osi/alarm.h"
+#include "btc/btc_ble_storage.h"
 #include "btc_gap_ble.h"
 #include "bta_gattc_int.h"
 #include "bta_gatts_int.h"
index 32df4440bc58ed6b2cc39fa72947f4b4e5930bcb..81ecad41031bd77bfd7f6dccac3e6b60b9b8b8d4 100644 (file)
@@ -13,9 +13,9 @@
 // limitations under the License.
 
 
-#include "btc_task.h"
-#include "bt_trace.h"
-#include "thread.h"
+#include "btc/btc_task.h"
+#include "common/bt_trace.h"
+#include "osi/thread.h"
 #include "esp_bt_defs.h"
 #include "esp_gatt_defs.h"
 
index d72f822e701fe2085186d55483fdd2b1a48c01e2..cd495f0e5f3c9786477f2d527c91d6b0818b1182 100644 (file)
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include <string.h>
 #include "esp_bt_main.h"
-#include "bt_trace.h"
-#include "bt_defs.h"
-#include "btc_profile_queue.h"
-#include "list.h"
-#include "allocator.h"
+#include "common/bt_trace.h"
+#include "common/bt_defs.h"
+#include "btc/btc_profile_queue.h"
+#include "osi/list.h"
+#include "osi/allocator.h"
 
 #if BTC_PRF_QUEUE_INCLUDED
 /*******************************************************************************
index b3d87f8ee0f91dfe6264fe61921654dbf3be4bfd..cdf75548f704bdeb773afa5d4d107f2af9e040a7 100644 (file)
  *  Description:   Generic BTC state machine API
  *
  *****************************************************************************/
-#include "bt_target.h"
-#include "bt_defs.h"
-#include "allocator.h"
-#include "btc_common.h"
-#include "btc_sm.h"
+#include "common/bt_target.h"
+#include "common/bt_defs.h"
+#include "osi/allocator.h"
+#include "btc/btc_common.h"
+#include "btc/btc_sm.h"
 
 #if BTC_SM_INCLUDED
 /*****************************************************************************
index 333b768af42b8b0ba2594633a05f6fc7f31d81b0..4109bb7a8458b9a35847e0ff3f0698b2f0ff49b9 100644 (file)
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "btc_storage.h"
-#include "btc_util.h"
-#include "osi.h"
-#include "bt_trace.h"
+#include "btc/btc_storage.h"
+#include "btc/btc_util.h"
+#include "osi/osi.h"
+#include "common/bt_trace.h"
 #include "esp_system.h"
-#include "bta_api.h"
-#include "bdaddr.h"
-#include "btc_config.h"
+#include "bta/bta_api.h"
+#include "device/bdaddr.h"
+#include "btc/btc_config.h"
 
 /*******************************************************************************
 **
index a99751cb2db4cc5685d495dba0ff51ce9c9a6979..be198082cfb7669967dc0346e0220d3b15bba190 100644 (file)
 
 #include <stdlib.h>
 #include <string.h>
-#include "bt_target.h"
-#include "btc_task.h"
-#include "bt_trace.h"
-#include "thread.h"
-#include "bt_defs.h"
-#include "allocator.h"
-#include "btc_main.h"
-#include "btc_dev.h"
+#include "common/bt_target.h"
+#include "btc/btc_task.h"
+#include "common/bt_trace.h"
+#include "osi/thread.h"
+#include "common/bt_defs.h"
+#include "osi/allocator.h"
+#include "btc/btc_main.h"
+#include "btc/btc_dev.h"
 #include "btc_gatts.h"
 #include "btc_gattc.h"
 #include "btc_gatt_common.h"
 #include "btc_gap_ble.h"
 #include "btc_blufi_prf.h"
-#include "btc_dm.h"
-#include "btc_alarm.h"
-#include "bta_gatt_api.h"
+#include "btc/btc_dm.h"
+#include "btc/btc_alarm.h"
+#include "bta/bta_gatt_api.h"
 #if CONFIG_CLASSIC_BT_ENABLED
-#include "btc_profile_queue.h"
+#include "btc/btc_profile_queue.h"
 #if (BTC_GAP_BT_INCLUDED == TRUE)
 #include "btc_gap_bt.h"
 #endif /* BTC_GAP_BT_INCLUDED == TRUE */
index 3668e4e9f4e8b491d8cc0bd3503c1a57d9ab8892..fa95f421632caf061cd44a2743e9873c93c3a951 100644 (file)
 #include <string.h>
 #include <ctype.h>
 
-#include "btc_util.h"
+#include "btc/btc_util.h"
 #if (BTA_AV_INCLUDED == TRUE)
-#include "bta_av_api.h"
+#include "bta/bta_av_api.h"
 #endif  ///BTA_AV_INCLUDED == TRUE
-#include "bt_defs.h"
+#include "common/bt_defs.h"
 
 /************************************************************************************
 **  Constants & Macros
similarity index 97%
rename from components/bt/bluedroid/btc/include/btc_alarm.h
rename to components/bt/bluedroid/btc/include/btc/btc_alarm.h
index ca9640a3f41b35161966753b157400c986f827b5..39348f0f565d85e3b764f5c8335c3a16c34f9b65 100644 (file)
@@ -17,7 +17,7 @@
 #define __BTC_ALARM_H__
 
 #include <stdint.h>
-#include "alarm.h"
+#include "osi/alarm.h"
 
 /* btc_alarm_args_t */
 typedef struct {
similarity index 98%
rename from components/bt/bluedroid/btc/include/btc_ble_storage.h
rename to components/bt/bluedroid/btc/include/btc/btc_ble_storage.h
index 0d4d43e7c74623fed17d33b5a8842743ffc8abc4..9b336815e51d5cbfbdc4c4d712a3043568274b74 100644 (file)
@@ -13,8 +13,8 @@
 // limitations under the License.
 #ifndef __BTC_BLE_STORAGE_H__
 #define __BTC_BLE_STORAGE_H__
-#include "bt_types.h"
-#include "bt_target.h"
+#include "stack/bt_types.h"
+#include "common/bt_target.h"
 #include "esp_gap_ble_api.h"
 
 #if (SMP_INCLUDED == TRUE)
similarity index 93%
rename from components/bt/bluedroid/btc/include/btc_common.h
rename to components/bt/bluedroid/btc/include/btc/btc_common.h
index 62246289716ec573a4a01e86f3b43131ce23ceeb..ae4501b5a803eebc71915bb014794dd796e027b0 100644 (file)
@@ -16,9 +16,9 @@
 #ifndef __BTC_COMMON_H__
 #define __BTC_COMMON_H__
 
-#include "bt_trace.h"
-#include "bt_types.h"
-#include "osi.h"
+#include "common/bt_trace.h"
+#include "stack/bt_types.h"
+#include "osi/osi.h"
 
 #define BTC_ASSERTC(cond, msg, val) if (!(cond)) { LOG_ERROR( \
     "### ASSERT : %s line %d %s (%d) ###", __FILE__, __LINE__, msg, val);}
similarity index 98%
rename from components/bt/bluedroid/btc/include/btc_config.h
rename to components/bt/bluedroid/btc/include/btc/btc_config.h
index dfbdcdbadfe1bf1b916a5e6833a2bd20b40e8291..6aec264b6cbb8b502e9a2cedf45f21ca6d0c147a 100644 (file)
@@ -18,7 +18,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include "bt_types.h"
+#include "stack/bt_types.h"
 
 typedef struct btc_config_section_iter_t btc_config_section_iter_t;
 
similarity index 97%
rename from components/bt/bluedroid/btc/include/btc_dev.h
rename to components/bt/bluedroid/btc/include/btc/btc_dev.h
index dd2e8663a95a251246d08efc043f436780333d87..1d176633036cadea9576b6e8fb6270a7c555b248 100644 (file)
@@ -17,7 +17,7 @@
 
 #include "esp_bt_defs.h"
 #include "esp_bt_device.h"
-#include "btc_task.h"
+#include "btc/btc_task.h"
 
 typedef enum {
     BTC_DEV_ACT_SET_DEVICE_NAME
similarity index 98%
rename from components/bt/bluedroid/btc/include/btc_dm.h
rename to components/bt/bluedroid/btc/include/btc/btc_dm.h
index 44f4d84c199d64893802740c0ab79462452acdad..b6e7741ef61c3fa76de30ee039bf5dec4695d7ef 100644 (file)
@@ -15,9 +15,9 @@
 #ifndef __BTC_DM_H__
 #define __BTC_DM_H__
 
-#include "btc_task.h"
+#include "btc/btc_task.h"
 #include "esp_bt_defs.h"
-#include "bta_api.h"
+#include "bta/bta_api.h"
 
 typedef enum {
     BTC_DM_SEC_ACT
similarity index 92%
rename from components/bt/bluedroid/btc/include/btc_main.h
rename to components/bt/bluedroid/btc/include/btc/btc_main.h
index b95ae0bbec205f63215e7d318d5c1346a3aa146f..40b9ef32c2cabc7ff16552cfb42f6f3b3c363290 100644 (file)
 #ifndef __BTC_BT_MAIN_H__
 #define __BTC_BT_MAIN_H__
 
-#include "future.h"
-#include "bt_types.h"
-#include "bta_api.h"
-#include "btc_main.h"
-#include "btc_task.h"
+#include "osi/future.h"
+#include "stack/bt_types.h"
+#include "bta/bta_api.h"
+#include "btc/btc_main.h"
+#include "btc/btc_task.h"
 
 typedef enum {
     BTC_MAIN_ACT_INIT = 0,
similarity index 94%
rename from components/bt/bluedroid/btc/include/btc_manage.h
rename to components/bt/bluedroid/btc/include/btc/btc_manage.h
index 8789f543dd1d7402e1c5189bbbccf331d6730c1c..46f746e8dfbbde05d6c9874e24bb3321c5fc9b83 100644 (file)
@@ -15,8 +15,8 @@
 #ifndef __BTC_MANAGE_H__
 #define __BTC_MANAGE_H__
 
-#include "bta_api.h"
-#include "btc_task.h"
+#include "bta/bta_api.h"
+#include "btc/btc_task.h"
 #include "esp_bt_defs.h"
 
 /* reset gatt callback table */
similarity index 94%
rename from components/bt/bluedroid/btc/include/btc_profile_queue.h
rename to components/bt/bluedroid/btc/include/btc/btc_profile_queue.h
index 39b897e96cbf15fff79be616fb7d8b076ff5eca5..93270ff4cfe73adbe57d5bd5f17075372683c43e 100644 (file)
@@ -14,7 +14,7 @@
 
 /*******************************************************************************
  *
- *  Filename:      btc_profile_queue.h
+ *  Filename:      btc/btc_profile_queue.h
  *
  *  Description:   Bluetooth remote device connection queuing
  *
@@ -23,8 +23,8 @@
 #ifndef __BTC_PROFILE_QUEUE_H__
 #define __BTC_PROFILE_QUEUE_H__
 
-#include "bt_defs.h"
-#include "btc_task.h"
+#include "common/bt_defs.h"
+#include "btc/btc_task.h"
 
 typedef enum {
     BTC_PRF_QUE_CONNECT = 0,
similarity index 99%
rename from components/bt/bluedroid/btc/include/btc_sm.h
rename to components/bt/bluedroid/btc/include/btc/btc_sm.h
index b8e95b99003315247c2ec23ab9b6a9e856c66de6..92acc6a1f35f1f24ffbfe36cc39766bec9529b50 100644 (file)
@@ -15,7 +15,7 @@
 
 /*****************************************************************************
  *
- *  Filename:      btc_sm.h
+ *  Filename:      btc/btc_sm.h
  *
  *  Description:   Generic BTC state machine API
  *
similarity index 97%
rename from components/bt/bluedroid/btc/include/btc_storage.h
rename to components/bt/bluedroid/btc/include/btc/btc_storage.h
index 9e69b4139e8bd0f2b97bfd1612607c78bf54037c..5e54cb705b5b31305fe3da22ac9511b15c5c6786 100644 (file)
@@ -16,8 +16,8 @@
 #define __BTC_STORAGE_H__
 
 #include <stdint.h>
-#include "bt_defs.h"
-#include "bt_types.h"
+#include "common/bt_defs.h"
+#include "stack/bt_types.h"
 
 
 #define BTC_STORAGE_DEV_CLASS_STR       "DevClass"
similarity index 96%
rename from components/bt/bluedroid/btc/include/btc_task.h
rename to components/bt/bluedroid/btc/include/btc/btc_task.h
index 16388c685bbd4579f2ed925c6fb4b1c51c964d33..401f8ee7bb73134030176539b27b672a6951aa18 100644 (file)
@@ -16,9 +16,9 @@
 #define __BTC_TASK_H__
 
 #include <stdint.h>
-#include "bt_target.h"
-#include "bt_defs.h"
-#include "thread.h"
+#include "common/bt_target.h"
+#include "common/bt_defs.h"
+#include "osi/thread.h"
 
 typedef struct btc_msg {
     uint8_t sig;    //event signal
similarity index 96%
rename from components/bt/bluedroid/btc/include/btc_util.h
rename to components/bt/bluedroid/btc/include/btc/btc_util.h
index d2bfdcca8771b19ef0a60d4f3da37673e5de799d..9787a919467e8c2b01c83c73de12862a601afcab 100644 (file)
@@ -16,8 +16,8 @@
 #define __BTC_UTIL_H__
 
 #include <stdbool.h>
-#include "bt_types.h"
-#include "bt_defs.h"
+#include "stack/bt_types.h"
+#include "common/bt_defs.h"
 #include "esp_bt_defs.h"
 
 /*******************************************************************************
index 74d496c3e55e670a289ec12ce8ce5178b3c6695a..506356b33cb0e83028d30648ea592b0c1b4ecee7 100644 (file)
 #include <stdio.h>
 
 
-#include "bt_target.h"
-#include "bt_trace.h"
-#include "bt_types.h"
-#include "gatt_api.h"
-#include "bta_api.h"
-#include "bta_gatt_api.h"
+#include "common/bt_target.h"
+#include "common/bt_trace.h"
+#include "stack/bt_types.h"
+#include "stack/gatt_api.h"
+#include "bta/bta_api.h"
+#include "bta/bta_gatt_api.h"
 #include "bta_gatts_int.h"
 #include "button_pro.h"
 
index 08b9e8287c737016a2a07361730c8ed039d402e7..de58b0201e366aa31e4efc150e5afe1c261051d6 100644 (file)
 #include <stdio.h>
 
 
-#include "bt_target.h"
-#include "bt_trace.h"
-#include "allocator.h"
-#include "bt_types.h"
-#include "gatt_api.h"
-#include "bta_api.h"
-#include "bta_gatt_api.h"
+#include "common/bt_target.h"
+#include "common/bt_trace.h"
+#include "osi/allocator.h"
+#include "stack/bt_types.h"
+#include "stack/gatt_api.h"
+#include "bta/bta_api.h"
+#include "bta/bta_gatt_api.h"
 #include "bta_gatts_int.h"
 
 #include "btc_blufi_prf.h"
-#include "btc_task.h"
-#include "btc_manage.h"
+#include "btc/btc_task.h"
+#include "btc/btc_manage.h"
 #include "btc_gatt_util.h"
 
 #include "blufi_int.h"
index 50e8d275ef59729670ac032d5959da2875a61b5d..19ab994ba6201cc7dcd92a37d58e123e6e941ee2 100644 (file)
 #include <stdio.h>
 
 
-#include "bt_target.h"
-#include "bt_trace.h"
-#include "bt_types.h"
-#include "gatt_api.h"
-#include "bta_api.h"
-#include "bta_gatt_api.h"
+#include "common/bt_target.h"
+#include "common/bt_trace.h"
+#include "stack/bt_types.h"
+#include "stack/gatt_api.h"
+#include "bta/bta_api.h"
+#include "bta/bta_gatt_api.h"
 #include "bta_gatts_int.h"
 
 #include "btc_blufi_prf.h"
-#include "btc_task.h"
-#include "btc_manage.h"
+#include "btc/btc_task.h"
+#include "btc/btc_manage.h"
 
 #include "blufi_int.h"
 
index 06154673a89ab9cbd13aac4d1fdc3d38531f49ff..e79b896f881d6cf07beb55879b12bade82ceb1ef 100644 (file)
@@ -15,8 +15,8 @@
 #ifndef __BTC_BLUFI_PRF_H__
 #define __BTC_BLUFI_PRF_H__
 
-#include "bt_target.h"
-#include "btc_task.h"
+#include "common/bt_target.h"
+#include "btc/btc_task.h"
 #include "esp_blufi_api.h"
 
 typedef enum {
index cbc2d68d51c4df61d8006eea28e244d73747ff07..489acf5931755632aa3323c8b534d4aec2539969 100644 (file)
@@ -15,9 +15,9 @@
 
 
 #if (BUT_PROFILE_CFG)
-#include "bt_target.h"
-#include "gatt_api.h"
-#include "gattdefs.h"
+#include "common/bt_target.h"
+#include "stack/gatt_api.h"
+#include "stack/gattdefs.h"
 #include "esp_gatt_api.h"
 
 #define KEY_SUCCESS             GATT_SUCCESS
index f008ce64382fe534deeba1aec60e95d5770719f4..42b9036f3444128404c8520f6fab43b7b7ca8070 100644 (file)
@@ -16,9 +16,9 @@
 
 #if (WX_AIRSYNC_CFG)
 
-#include "bt_target.h"
-#include "gatt_api.h"
-#include "gattdefs.h"
+#include "common/bt_target.h"
+#include "stack/gatt_api.h"
+#include "stack/gattdefs.h"
 #include "bt_app_api.h"
 
 
index 06d159aa3287a3f78e2092024c2951f48bc05713..2620b60d82076aa271320466379b40089860a1b7 100644 (file)
 #include <stdbool.h>
 #include <stdio.h>
 
-#include "bt_target.h"
-#include "bt_trace.h"
-#include "bt_types.h"
-#include "gatt_api.h"
-#include "bta_api.h"
-#include "bta_gatt_api.h"
+#include "common/bt_target.h"
+#include "common/bt_trace.h"
+#include "stack/bt_types.h"
+#include "stack/gatt_api.h"
+#include "bta/bta_api.h"
+#include "bta/bta_gatt_api.h"
 #include "bta_gatts_int.h"
 
 
index d6c3605441aebc575ca612aa9ea805bfe3cceb01..fc1f3e836fc596cf6f628009c47c4288914bcd92 100644 (file)
  *
  ******************************************************************************/
 #include "string.h"
-#include "bt_target.h"
-#include "a2d_api.h"
-#include "a2d_sbc.h"
-#include "bta_sys.h"
-#include "bta_av_api.h"
-#include "bta_av_co.h"
-#include "bta_av_ci.h"
-#include "bta_av_sbc.h"
+#include "common/bt_target.h"
+#include "stack/a2d_api.h"
+#include "stack/a2d_sbc.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_av_api.h"
+#include "bta/bta_av_co.h"
+#include "bta/bta_av_ci.h"
+#include "bta/bta_av_sbc.h"
 #include "btc_a2dp.h"
 #include "btc_a2dp_source.h"
 #include "btc_av_co.h"
-#include "btc_util.h"
-#include "mutex.h"
+#include "btc/btc_util.h"
+#include "osi/mutex.h"
 
 #if BTC_AV_INCLUDED
 
index 29004c2f2a69036a0588e0e689eab3d3cef3b294..3987d05c8700e442e4e017ffd9be7476d18a8d83 100644 (file)
  *  Filename:      btc_a2dp.c
  *
  *****************************************************************************/
-#include "bt_target.h"
-#include "bt_trace.h"
-#include "bta_api.h"
-#include "bta_av_api.h"
+#include "common/bt_target.h"
+#include "common/bt_trace.h"
+#include "bta/bta_api.h"
+#include "bta/bta_av_api.h"
 #include "btc_av.h"
 #include "btc_av_co.h"
 #include "btc_a2dp.h"
index c3ae55572ebe6179a7259433a5c29680579b523a..6c6f30f1a9326c0aeb6ea5f868511fb11507bc08 100644 (file)
  *  Filename:      btc_a2dp_control.c
  *
  *****************************************************************************/
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include <string.h>
-#include "bt_trace.h"
-#include "bta_api.h"
-#include "bta_av_api.h"
-#include "btc_manage.h"
+#include "common/bt_trace.h"
+#include "bta/bta_api.h"
+#include "bta/bta_av_api.h"
+#include "btc/btc_manage.h"
 #include "btc_av.h"
 #include "btc_a2dp.h"
 #include "btc_a2dp_control.h"
index 28de53691e576d69896c73256ccce9817dfd35e0..e5747e62bef8a52252e6a6b707556ec776c19cd1 100644 (file)
  **  Name:          btc_a2dp_sink.c
  **
  ******************************************************************************/
-#include "bt_target.h"
-#include "bt_trace.h"
+#include "common/bt_target.h"
+#include "common/bt_trace.h"
 #include <string.h>
 #include <stdint.h>
-#include "bt_defs.h"
-#include "allocator.h"
-#include "mutex.h"
-#include "thread.h"
-#include "fixed_queue.h"
-#include "a2d_api.h"
-#include "a2d_sbc.h"
-#include "bta_av_api.h"
-#include "bta_av_ci.h"
+#include "common/bt_defs.h"
+#include "osi/allocator.h"
+#include "osi/mutex.h"
+#include "osi/thread.h"
+#include "osi/fixed_queue.h"
+#include "stack/a2d_api.h"
+#include "stack/a2d_sbc.h"
+#include "bta/bta_av_api.h"
+#include "bta/bta_av_ci.h"
 #include "btc_av_co.h"
 #include "btc_a2dp.h"
 #include "btc_a2dp_control.h"
 #include "btc_a2dp_sink.h"
-#include "btc_manage.h"
+#include "btc/btc_manage.h"
 #include "btc_av.h"
-#include "btc_util.h"
+#include "btc/btc_util.h"
 #include "esp_a2dp_api.h"
 #include "oi_codec_sbc.h"
 #include "oi_status.h"
-#include "future.h"
+#include "osi/future.h"
 #include <assert.h>
 
 #if (BTC_AV_SINK_INCLUDED == TRUE)
index ea138ab4fb26f3a6c89d9804ff0b607617fdeeeb..827542dc186a8fee6c713ff0cee0aaee99768c54 100644 (file)
  **  Name:          btc_a2dp_source.c
  **
  ******************************************************************************/
-#include "bt_target.h"
-#include "bt_trace.h"
+#include "common/bt_target.h"
+#include "common/bt_trace.h"
 #include <string.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <unistd.h>
 #include <time.h>
 #include <sys/time.h>
-#include "allocator.h"
-#include "alarm.h"
-#include "thread.h"
-#include "mutex.h"
-#include "fixed_queue.h"
-#include "a2d_api.h"
-#include "a2d_sbc.h"
-#include "bta_av_api.h"
-#include "bta_av_sbc.h"
-#include "bta_av_ci.h"
-#include "btc_manage.h"
-#include "btc_common.h"
+#include "osi/allocator.h"
+#include "osi/alarm.h"
+#include "osi/thread.h"
+#include "osi/mutex.h"
+#include "osi/fixed_queue.h"
+#include "stack/a2d_api.h"
+#include "stack/a2d_sbc.h"
+#include "bta/bta_av_api.h"
+#include "bta/bta_av_sbc.h"
+#include "bta/bta_av_ci.h"
+#include "btc/btc_manage.h"
+#include "btc/btc_common.h"
 #include "btc_av_co.h"
 #include "btc_a2dp.h"
 #include "btc_a2dp_control.h"
 #include "btc_a2dp_source.h"
 #include "btc_av.h"
-#include "btc_util.h"
+#include "btc/btc_util.h"
 #include "esp_a2dp_api.h"
 #include "sbc_encoder.h"
-#include "future.h"
+#include "osi/future.h"
 #include <assert.h>
 
 #if BTC_AV_SRC_INCLUDED
index 3d54d79770f1bccdce64439fc6605ef96627fb54..b9099a76d6403d694fc3fee881ec355455e7c2f0 100644 (file)
  *  Description:   AV implementation
  *
  *****************************************************************************/
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include <string.h>
-#include "bt_trace.h"
-#include "bt_defs.h"
-#include "allocator.h"
-#include "btu.h"
-#include "bta_av_api.h"
-#include "btc_dm.h"
-#include "btc_common.h"
-#include "btc_manage.h"
+#include "common/bt_trace.h"
+#include "common/bt_defs.h"
+#include "osi/allocator.h"
+#include "stack/btu.h"
+#include "bta/bta_av_api.h"
+#include "btc/btc_dm.h"
+#include "btc/btc_common.h"
+#include "btc/btc_manage.h"
 #include "btc_av.h"
 #include "btc_avrc.h"
-#include "btc_util.h"
-#include "btc_profile_queue.h"
+#include "btc/btc_util.h"
+#include "btc/btc_profile_queue.h"
 #include "btc_a2dp.h"
 #include "btc_a2dp_control.h"
 #include "btc_a2dp_sink.h"
index eb6be23de732e567774d6e09e463e215ab8e42a1..4d061aed90f8900abf4bffba162e948fe06b1107 100644 (file)
  *  Description:   Bluetooth AVRC implementation
  *
  *****************************************************************************/
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include <string.h>
-#include "bta_api.h"
-#include "bta_av_api.h"
-#include "avrc_defs.h"
-#include "btc_common.h"
-#include "btc_util.h"
+#include "bta/bta_api.h"
+#include "bta/bta_av_api.h"
+#include "stack/avrc_defs.h"
+#include "btc/btc_common.h"
+#include "btc/btc_util.h"
 #include "btc_av.h"
 #include "btc_avrc.h"
-#include "btc_manage.h"
+#include "btc/btc_manage.h"
 #include "esp_avrc_api.h"
-#include "mutex.h"
-#include "allocator.h"
+#include "osi/mutex.h"
+#include "osi/allocator.h"
 
 #if BTC_AV_INCLUDED
 
index 63558cd621e5f9ac1dcb7b9b6130950343d188d7..d11a09f1bbc1a0eb9a279f2ebfe901f562bdcd93 100644 (file)
 #include <stdio.h>
 
 //#include "bluedroid_test.h"
-#include "bta_api.h"
-#include "bta_gatt_api.h"
-#include "controller.h"
+#include "bta/bta_api.h"
+#include "bta/bta_gatt_api.h"
+#include "device/controller.h"
 
 #include "gatt_int.h"
-#include "bt_trace.h"
-#include "btm_api.h"
-#include "bt_types.h"
+#include "common/bt_trace.h"
+#include "stack/btm_api.h"
+#include "stack/bt_types.h"
 #include "dis_api.h"
 
 #if BLE_INCLUDED == true
index 4979f101edad313d5b52a0bfc5a6225e0a77e1de..7aee0ff15d075757f7f16d24d02948f0936de9ee 100644 (file)
@@ -19,9 +19,9 @@
 #ifndef SRVC_BATTERY_INT_H
 #define SRVC_BATTERY_INT_H
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "srvc_api.h"
-#include "gatt_api.h"
+#include "stack/gatt_api.h"
 
 #ifndef BA_MAX_INT_NUM
 #define BA_MAX_INT_NUM     4
index f880428353b4af8962683d30909b2214c5c24d7a..117219de2c432f05a53d8511ef388be0cb179cba 100644 (file)
@@ -16,9 +16,9 @@
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 //#include "bt_utils.h"
-//#include "gatt_api.h"
+//#include "stack/gatt_api.h"
 
 #define LOG_TAG "bt_srvc"
 //#include "osi/include/log.h"
 #include "stdint.h"
 #include "string.h"
 
-#include "bta_api.h"
-#include "bta_gatt_api.h"
-#include "controller.h"
+#include "bta/bta_api.h"
+#include "bta/bta_gatt_api.h"
+#include "device/controller.h"
 
 #include "gatt_int.h"
-#include "bt_trace.h"
-#include "btm_api.h"
-#include "bt_types.h"
+#include "common/bt_trace.h"
+#include "stack/btm_api.h"
+#include "stack/bt_types.h"
 #include "dis_api.h"
 
 #if BLE_INCLUDED == TRUE
index 5da32d1e46073882594a1ea2c687bf11664bfa17..4d5913ab2558ab7bb9a22e5f2ec2cd79bf5d898c 100644 (file)
@@ -19,9 +19,9 @@
 #ifndef SRVC_DIS_INT_H
 #define SRVC_DIS_INT_H
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "srvc_api.h"
-#include "gatt_api.h"
+#include "stack/gatt_api.h"
 
 #define DIS_MAX_CHAR_NUM            9
 
index 93df5ba0d2191c786e41a3a5efbc5231cb057b81..741a76dfbff7d70379ca8a45a2aafffcf384c167 100644 (file)
 
 #include <string.h>
 
-#include "allocator.h"
-#include "bt_types.h"
-#include "bt_defs.h"
-#include "bta_api.h"
-#include "bta_dm_co.h"
-#include "btc_task.h"
-#include "btc_manage.h"
+#include "osi/allocator.h"
+#include "stack/bt_types.h"
+#include "common/bt_defs.h"
+#include "bta/bta_api.h"
+#include "bta/bta_dm_co.h"
+#include "btc/btc_task.h"
+#include "btc/btc_manage.h"
 #include "btc_gap_ble.h"
 #include "btc_gatt_util.h"
 #include "esp_bt_defs.h"
 #include "esp_gap_ble_api.h"
-#include "btc_ble_storage.h"
-#include "btc_dm.h"
+#include "btc/btc_ble_storage.h"
+#include "btc/btc_dm.h"
 
 static tBTA_BLE_ADV_DATA gl_bta_adv_data;
 static tBTA_BLE_ADV_DATA gl_bta_scan_rsp_data;
index aef3e10ded76e471b22d62957c085bcd336026ed..20f7d3281130db5c3e83a92a2873f30c0bb6d5d9 100644 (file)
 #include "esp_bt_defs.h"
 #include "esp_gap_bt_api.h"
 #include "btc_gap_bt.h"
-#include "bta_api.h"
-#include "bt_trace.h"
-#include "bt_target.h"
-#include "btc_manage.h"
-#include "btc_util.h"
-#include "allocator.h"
+#include "bta/bta_api.h"
+#include "common/bt_trace.h"
+#include "common/bt_target.h"
+#include "btc/btc_manage.h"
+#include "btc/btc_util.h"
+#include "osi/allocator.h"
 
 #if (BTC_GAP_BT_INCLUDED == TRUE)
 
index af34c7108fbc9581f1d68425d29820679e5c5463..c78ddedbf42387283092c030bda6706d5d217064 100644 (file)
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "btc_task.h"
-#include "btc_main.h"
-#include "btc_dm.h"
-#include "future.h"
+#include "btc/btc_task.h"
+#include "btc/btc_main.h"
+#include "btc/btc_dm.h"
+#include "osi/future.h"
 #include "esp_err.h"
-#include "btc_config.h"
-#include "alarm.h"
-#include "btc_ble_storage.h"
+#include "btc/btc_config.h"
+#include "osi/alarm.h"
+#include "btc/btc_ble_storage.h"
 #include "btc_gatt_common.h"
-#include "bta_gatt_common.h"
+#include "bta/bta_gatt_common.h"
 
 
 static void btc_set_local_mtu(uint16_t mtu)
index 24017aece10ae339b71bb2da365f04304073a18b..a6273d14bb6668f8e49a621861706a9df053fee3 100644 (file)
 
 #include <string.h>
 
-#include "btm_ble_api.h"
+#include "stack/btm_ble_api.h"
 #include "btc_gattc.h"
 #include "btc_gatt_util.h"
-#include "btc_manage.h"
-#include "bta_gatt_api.h"
-#include "bt_trace.h"
-#include "allocator.h"
+#include "btc/btc_manage.h"
+#include "bta/bta_gatt_api.h"
+#include "common/bt_trace.h"
+#include "osi/allocator.h"
 #include "esp_gattc_api.h"
 
 #if (GATTC_INCLUDED == TRUE)
index ae74c5ad3885acb5016e918e62060b7cfbf1aeb1..a265057d5b658fc4313f09b0669e4e9c0d552531 100644 (file)
 
 #include <string.h>
 
-#include "bta_gatt_api.h"
+#include "bta/bta_gatt_api.h"
 
-#include "btc_task.h"
-#include "btc_manage.h"
+#include "btc/btc_task.h"
+#include "btc/btc_manage.h"
 #include "btc_gatts.h"
 #include "btc_gatt_util.h"
-#include "future.h"
-#include "allocator.h"
-#include "btc_main.h"
+#include "osi/future.h"
+#include "osi/allocator.h"
+#include "btc/btc_main.h"
 #include "esp_gatts_api.h"
 
 #if (GATTS_INCLUDED == TRUE)
index a1d40781d70b146f4c4296f15890ae9603e02b1a..20eda6e3a0e1371ec66cafb187e23f01e0ea360b 100644 (file)
@@ -25,9 +25,9 @@
 #ifndef HIDH_INT_H
 #define HIDH_INT_H
 
-#include "hidh_api.h"
+#include "stack/hidh_api.h"
 #include "hid_conn.h"
-#include "l2c_api.h"
+#include "stack/l2c_api.h"
 
 #if (HID_HOST_INCLUDED == TRUE)
 
index da7f7744d357eb62a1793c03b215511ee75ecf97..b2da0873a57f193875e6c22971d4501f78123b6e 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 // #include "bluetooth.h"
-#include "bt_defs.h"
+#include "common/bt_defs.h"
 
 #define SDP_OPP_SUPPORTED_FORMATS_MAX_LENGTH 15
 
index 6243eb43bd7a64b3e1eb265d11b11460ab544a4a..8421cc46af369ebf681be0bc5f532e18eb11ef1b 100644 (file)
@@ -24,8 +24,8 @@
 #define __BTC_A2DP_H__
 
 #include <stdbool.h>
-#include "bt_target.h"
-#include "bta_api.h"
+#include "common/bt_target.h"
+#include "bta/bta_api.h"
 #include "btc_av_api.h"
 #include "esp_a2dp_api.h"
 
index e1d5e2ff66cd1ad6a67512d37296621edcda323d..a3ba543268a6c3dc34ab7eb4ff61eb1cd7052bf9 100644 (file)
@@ -22,8 +22,8 @@
 #define __BTC_A2DP_CONTROL_H__
 
 #include <stdbool.h>
-#include "bt_target.h"
-#include "bta_api.h"
+#include "common/bt_target.h"
+#include "bta/bta_api.h"
 #include "btc_av_api.h"
 #include "esp_a2dp_api.h"
 
index 772ffea6d842725c1b37524aab55566804d650db..baf5b65a6d900168b8fbb9af1fd1d7cb217866d1 100644 (file)
@@ -22,8 +22,8 @@
 #define __BTC_A2DP_SINK_H__
 
 #include <stdbool.h>
-#include "bt_target.h"
-#include "bta_api.h"
+#include "common/bt_target.h"
+#include "bta/bta_api.h"
 #include "btc_av_api.h"
 #include "esp_a2dp_api.h"
 
index 214c9e723551561854cdc25d1727d6f0cc4bd530..cfde02164013d4b960f7299d90158942205e2f7a 100644 (file)
@@ -22,8 +22,8 @@
 #define __BTC_A2DP_SOURCE_H__
 
 #include <stdbool.h>
-#include "bt_target.h"
-#include "bta_api.h"
+#include "common/bt_target.h"
+#include "bta/bta_api.h"
 #include "btc_av_api.h"
 #include "esp_a2dp_api.h"
 
index 312958b0c95357704a80751c96d3e4dc6b2a21d8..78cf7cf0d9192085f5f33d62d89a7a52c734a717 100644 (file)
 #ifndef __BTC_AV_H__
 #define __BTC_AV_H__
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "esp_a2dp_api.h"
-#include "btc_task.h"
-#include "btc_common.h"
-#include "btc_sm.h"
-#include "bta_av_api.h"
+#include "btc/btc_task.h"
+#include "btc/btc_common.h"
+#include "btc/btc_sm.h"
+#include "bta/bta_av_api.h"
 
 #if (BTC_AV_INCLUDED == TRUE)
 /*******************************************************************************
index 7d5f376d6fa6ff95d41496149fc1dc5802755fec..39dafa238da7c73c5f59b3bb5ebed4b54b300f38 100644 (file)
 #ifndef __BTC_AV_API_H__
 #define __BTC_AV_API_H__
 
-#include "bt_target.h"
-#include "bta_av_api.h"
-#include "a2d_api.h"
-#include "a2d_sbc.h"
+#include "common/bt_target.h"
+#include "bta/bta_av_api.h"
+#include "stack/a2d_api.h"
+#include "stack/a2d_sbc.h"
 
 #if (BTC_AV_INCLUDED == TRUE)
 /*****************************************************************************
index 836696433ff2e33a37feab008be434a8d35b99c6..2a66b8b2752339a88536f2aaf858f82255411bbf 100644 (file)
@@ -19,9 +19,9 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "bt_defs.h"
-#include "bt_types.h"
-#include "bta_av_api.h"
+#include "common/bt_defs.h"
+#include "stack/bt_types.h"
+#include "bta/bta_av_api.h"
 
 #if (BTC_AV_INCLUDED == TRUE)
 #ifndef BTC_AVRC_TGT_INCLUDED
index 440fb4e053c1ae45461a28a6caf6c2c5343ceb04..1dc6653125d22372d7089d95abbdfc5c05810fcd 100644 (file)
 #ifndef __BTC_GAP_BT_H__
 #define __BTC_GAP_BT_H__
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "esp_bt_defs.h"
 #include "esp_gap_bt_api.h"
-#include "btc_task.h"
-#include "utl.h"
+#include "btc/btc_task.h"
+#include "bta/utl.h"
 
 #if (BTC_GAP_BT_INCLUDED == TRUE)
 
index 41b0fee54ea1611840e1c52f45daa26be4e4e8d8..4cb6e9277b0a2193762bded097fd8a96064be38f 100644 (file)
 #ifndef __BTC_GATT_COMMON_H__
 #define __BTC_GATT_COMMON_H__
 
-#include "future.h"
-#include "bt_types.h"
-#include "bta_api.h"
-#include "btc_main.h"
-#include "btc_task.h"
+#include "osi/future.h"
+#include "stack/bt_types.h"
+#include "bta/bta_api.h"
+#include "btc/btc_main.h"
+#include "btc/btc_task.h"
 
 typedef enum {
     BTC_GATT_ACT_SET_LOCAL_MTU = 0,
index 99083f74f92287620fe5307a792bc25db6e8ea1c..3daffa15e5f418b3e47fe7bdab9335f3050a2d17 100644 (file)
@@ -15,8 +15,8 @@
 #ifndef __BTC_GATT_UTIL_H__
 #define __BTC_GATT_UTIL_H__
 
-#include "bt_types.h"
-#include "bta_gatt_api.h"
+#include "stack/bt_types.h"
+#include "bta/bta_gatt_api.h"
 #include "esp_bt_defs.h"
 #include "esp_gatt_defs.h"
 #include "esp_gattc_api.h"
index 68d6e57664edcd80f870d5362e26118c68d8859c..afc3e4ba910cd2f15ad4a1251f108c48255b16f3 100644 (file)
@@ -15,7 +15,7 @@
 #ifndef __BTC_GATTC_H__
 #define __BTC_GATTC_H__
 
-#include "btc_task.h"
+#include "btc/btc_task.h"
 #include "esp_bt_defs.h"
 #include "esp_gatt_defs.h"
 #include "esp_gattc_api.h"
index 00f73875c15b4838c00a77a9fec21566baa311d5..e4b57589d51062068b6a9eb470726c94b3988a3f 100644 (file)
@@ -15,7 +15,7 @@
 #ifndef __BTC_GATTS_H__
 #define __BTC_GATTS_H__
 
-#include "btc_task.h"
+#include "btc/btc_task.h"
 #include "esp_bt_defs.h"
 #include "esp_gatt_defs.h"
 #include "esp_gatts_api.h"
index 631c69646e78c093d31c61f10283a38fec436c4b..a75fc1d6266021bcc214572fac4dcc60c92c353e 100644 (file)
 #ifndef __BTC_SPP_H__
 #define __BTC_SPP_H__
 
-#include "btc_task.h"
+#include "btc/btc_task.h"
 #include "esp_bt_defs.h"
 #include "esp_spp_api.h"
-#include "bt_target.h"
-#include "bta_jv_api.h"
+#include "common/bt_target.h"
+#include "bta/bta_jv_api.h"
 
 #if (defined BTC_SPP_INCLUDED && BTC_SPP_INCLUDED == TRUE)
 
index 5b8cfc5f78ead38c4820b29e273a59a779f8fb23..7edbd67dccb0d675472945a751a28c3dfc21806c 100644 (file)
@@ -25,9 +25,9 @@
 #ifndef SRVC_DIS_API_H
 #define SRVC_DIS_API_H
 
-#include "bt_target.h"
-#include "gatt_api.h"
-#include "gattdefs.h"
+#include "common/bt_target.h"
+#include "stack/gatt_api.h"
+#include "stack/gattdefs.h"
 #include "esp_gatts_api.h"
 
 #define DIS_SUCCESS             GATT_SUCCESS
index 6436573f81005b707df9974b53b9b74f4e56b99c..3b567d0c2df3e99eeb4a1b8f7400b8cc1a32c8e8 100644 (file)
@@ -16,9 +16,9 @@
 
 #if (HIDD_LE_PROFILE_CFG)
 #include "bta_gatts_int.h"
-#include "bt_types.h"
-#include "bta_api.h"
-#include "gatt_api.h"
+#include "stack/bt_types.h"
+#include "bta/bta_api.h"
+#include "stack/gatt_api.h"
 #include "bt_app_api.h"
 
 /// Maximal number of HIDS that can be added in the DB
index a7a46b8e8f6565bb169560faf68d4b7616831ccf..e84a86beb6d7fe4f32fd095bad011ceae1247e2f 100644 (file)
@@ -19,9 +19,9 @@
 #ifndef SRVC_DIS_API_H
 #define SRVC_DIS_API_H
 
-#include "bt_target.h"
-#include "gatt_api.h"
-#include "gattdefs.h"
+#include "common/bt_target.h"
+#include "stack/gatt_api.h"
+#include "stack/gattdefs.h"
 
 #define DIS_SUCCESS             GATT_SUCCESS
 #define DIS_ILLEGAL_PARAM       GATT_ILLEGAL_PARAMETER
index f9b0f9ec141d7a158ae883e14b3d4cd7403a2f26..d576a6cd0e8f0e1f9a03ee3d10c73a4ebcd5f8e6 100644 (file)
@@ -15,7 +15,7 @@
 #ifndef __ESP_SEC_API_H__
 #define __ESP_SEC_API_H__
 
-#include "bt_types.h"
+#include "stack/bt_types.h"
 
 #define APP_SEC_IRK_FLAG        (0)
 #define RAND_NB_LEN         0x08
index b08e5eec8bd64182603f9f5ab92962b9d1331584..d39bcc804bdc40b00f93d87b4d007ed3ac781e1f 100644 (file)
 #include <string.h>
 
 #include "btc_spp.h"
-#include "btc_manage.h"
-#include "btc_task.h"
-#include "bta_jv_api.h"
-#include "bt_trace.h"
-#include "allocator.h"
+#include "btc/btc_manage.h"
+#include "btc/btc_task.h"
+#include "bta/bta_jv_api.h"
+#include "common/bt_trace.h"
+#include "osi/allocator.h"
 #include "esp_spp_api.h"
-#include "list.h"
+#include "osi/list.h"
 
-#include "mutex.h"
+#include "osi/mutex.h"
 #include <sys/errno.h>
 #include <sys/lock.h>
 #include <sys/fcntl.h>
similarity index 95%
rename from components/bt/bluedroid/include/bt_common_types.h
rename to components/bt/bluedroid/common/include/common/bt_common_types.h
index abd213fbf499108f50f3d1ed567534072b8dc608..a6b3491885639c05f37d26d5fe02a25c51d3c8c5 100644 (file)
@@ -19,8 +19,8 @@
 #ifndef _BT_COMMON_TYPES_H_
 #define _BT_COMMON_TYPES_H_
 
-#include "bt_defs.h"
-#include "thread.h"
+#include "common/bt_defs.h"
+#include "osi/thread.h"
 
 typedef void (* bluedroid_init_done_cb_t)(void);
 
similarity index 96%
rename from components/bt/bluedroid/include/bt_defs.h
rename to components/bt/bluedroid/common/include/common/bt_defs.h
index db3ce4bff46f649bd0c8102e8608972d4e85ce2d..51ba9a9de1b5c66399f1dffb045a1dd20426b06e 100644 (file)
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 /**
- * bt_defs.h    Defines useful API for whole Bluedroid
+ * common/bt_defs.h    Defines useful API for whole Bluedroid
  *
  */
 #ifndef _BT_DEFS_H_
@@ -21,8 +21,8 @@
 
 #include <stdlib.h>
 #include <stdint.h>
-#include "bt_trace.h"
-#include "bt_target.h"
+#include "common/bt_trace.h"
+#include "common/bt_target.h"
 
 #define UNUSED(x)                   (void)(x)
 
similarity index 99%
rename from components/bt/bluedroid/include/bt_target.h
rename to components/bt/bluedroid/common/include/common/bt_target.h
index 5be76cc0a1d651e696e9116c7ee9dfa98e2a69cf..55b84b808f564cc6f2b7c4f38a9de11a02357f0b 100644 (file)
@@ -35,9 +35,9 @@
 #endif
 
 #include "sdkconfig.h"
-#include "bt_types.h"   /* This must be defined AFTER buildcfg.h */
+#include "stack/bt_types.h"   /* This must be defined AFTER buildcfg.h */
 
-#include "dyn_mem.h"    /* defines static and/or dynamic memory for components */
+#include "stack/dyn_mem.h"    /* defines static and/or dynamic memory for components */
 
 /******************************************************************************
 **
@@ -1904,6 +1904,6 @@ The maximum number of payload octets that the local device can receive in a sing
 #define BTSNOOP_MEM FALSE//TRUE
 #endif
 
-#include "bt_trace.h"
+#include "common/bt_trace.h"
 
 #endif /* BT_TARGET_H */
similarity index 99%
rename from components/bt/bluedroid/include/bt_trace.h
rename to components/bt/bluedroid/common/include/common/bt_trace.h
index d6ded21967845f151e1f744ee4a515361ad01996..b95dd3a8b773f07891d1fd0085d4d6c82e696ead 100644 (file)
@@ -21,7 +21,7 @@
 #include "sdkconfig.h"
 
 #include <stdio.h>
-#include "bt_types.h"
+#include "stack/bt_types.h"
 
 #include "esp_log.h"
 
similarity index 98%
rename from components/bt/bluedroid/include/bte.h
rename to components/bt/bluedroid/common/include/common/bte.h
index 171967cfc388dc9f0a364f85ccb3f724c80f35cb..4bef635af62bd7f78cf8a9f8e0f2dceff4c2c98c 100644 (file)
 #ifndef BTE_H
 #define BTE_H
 
-//#include <semaphore.h>
+//#include <osi/semaphore.h>
 //#include <signal.h>
 //#include <pthread.h>
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 /* by default on shutdown, baudrate is reset 115kbits. this should NOT be need for platforms
  * that kill BTE driver and remove/reset BT chip
similarity index 98%
rename from components/bt/bluedroid/btcore/bdaddr.c
rename to components/bt/bluedroid/device/bdaddr.c
index e2466fa6bb1b01bb62c192133535efa59dd937fa..6317979ab582e627d0d24efdd0a2ae38a32d2b2c 100644 (file)
@@ -18,8 +18,8 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "bt_trace.h"
-#include "bdaddr.h"
+#include "common/bt_trace.h"
+#include "device/bdaddr.h"
 
 static inline bool ets_isxdigit(char c)
 {
index 176eb8f29b299d452776cfe18af0ee366bec4906..93ef5384e89b2ec34523931daac9e7ee7a6a3d8c 100644 (file)
  *
  ******************************************************************************/
 #include <stdbool.h>
-#include "bt_trace.h"
-#include "bdaddr.h"
-#include "bt_types.h"
-#include "controller.h"
-#include "event_mask.h"
-#include "hcimsgs.h"
-#include "hci_layer.h"
-#include "hci_packet_factory.h"
-#include "hci_packet_parser.h"
-#include "btm_ble_api.h"
-#include "version.h"
-#include "future.h"
+#include "common/bt_trace.h"
+#include "device/bdaddr.h"
+#include "stack/bt_types.h"
+#include "device/controller.h"
+#include "device/event_mask.h"
+#include "stack/hcimsgs.h"
+#include "hci/hci_layer.h"
+#include "hci/hci_packet_factory.h"
+#include "hci/hci_packet_parser.h"
+#include "stack/btm_ble_api.h"
+#include "device/version.h"
+#include "osi/future.h"
 
 const bt_event_mask_t BLE_EVENT_MASK = { "\x00\x00\x00\x00\x00\x00\x06\x7f" };
 
similarity index 97%
rename from components/bt/bluedroid/btcore/include/bdaddr.h
rename to components/bt/bluedroid/device/include/device/bdaddr.h
index 87acad2e00cf6921685cdcba924b308c5410328b..611fcf0e2587e245fb344ef3a430f9463a5d5ae2 100644 (file)
@@ -22,8 +22,8 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include "bt_defs.h"
-#include "hash_map.h"
+#include "common/bt_defs.h"
+#include "osi/hash_map.h"
 
 // Note: the string representation of a bdaddr is expected to have the format
 // xx:xx:xx:xx:xx:xx
similarity index 93%
rename from components/bt/bluedroid/device/include/controller.h
rename to components/bt/bluedroid/device/include/device/controller.h
index bffa714f4330897fa252c48cadd1d7a8d6a97a35..b2806d69b80a47d3fce74d656a6d0904391f4dd0 100644 (file)
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "bt_target.h"
-#include "bdaddr.h"
-#include "device_features.h"
-#include "hci_layer.h"
-#include "hci_packet_factory.h"
-#include "hci_packet_parser.h"
+#include "common/bt_target.h"
+#include "device/bdaddr.h"
+#include "device/device_features.h"
+#include "hci/hci_layer.h"
+#include "hci/hci_packet_factory.h"
+#include "hci/hci_packet_parser.h"
 
 typedef struct controller_t {
     void (*start_up)(void);
similarity index 96%
rename from components/bt/bluedroid/device/include/interop.h
rename to components/bt/bluedroid/device/include/device/interop.h
index a90c44ad29224d922766abe0c23e492463ae5769..64f27adb39dc5ffba4cf47cbb3d351936b82a64e 100644 (file)
@@ -20,8 +20,8 @@
 #define _INTEROP_H_
 
 #include <stdbool.h>
-#include "bt_defs.h"
-#include "bt_target.h"
+#include "common/bt_defs.h"
+#include "common/bt_target.h"
 
 typedef enum {
     // Disable secure connections
similarity index 98%
rename from components/bt/bluedroid/device/include/interop_database.h
rename to components/bt/bluedroid/device/include/device/interop_database.h
index 5b9bc934a721498c2a6bd52ac427fbb9518f7213..712249055717da85518f9718d29191f61f93dbbc 100644 (file)
@@ -19,7 +19,7 @@
 #ifndef _INTEROP_DATABASE_H_
 #define _INTEROP_DATABASE_H_
 
-#include "interop.h"
+#include "device/interop.h"
 
 typedef struct {
     bt_bdaddr_t addr;
index 18d2a84fb742122a31163ee939255f2ff15708e4..22c073acf36ecad8ccf70217dd9a189be36b8eff 100644 (file)
 #define LOG_TAG "bt_device_interop"
 */
 #include <string.h> // For memcmp
-#include "bt_trace.h"
-#include "bdaddr.h"
-#include "interop.h"
-#include "interop_database.h"
+#include "common/bt_trace.h"
+#include "device/bdaddr.h"
+#include "device/interop.h"
+#include "device/interop_database.h"
 
 #define CASE_RETURN_STR(const) case const: return #const;
 
index 4ed459d8410cea4acd257b60a9310c4e8c8066c6..3ce6dd7a461a8e4d269f19b80d12077b7946ddb8 100644 (file)
@@ -16,7 +16,7 @@
  *  limitations under the License.
  *
  ******************************************************************************/
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include <stdlib.h>
 #include <oi_codec_sbc_private.h>
 
index bba67e079d1d6fd784ed19da6aa849ac55a4e89b..66521630dc86d96290460fd3aa33983e87c5297a 100644 (file)
@@ -27,7 +27,7 @@
 
 /**@addgroup codec_internal*/
 /**@{*/
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include <oi_codec_sbc_private.h>
 
 #if (defined(SBC_DEC_INCLUDED) && SBC_DEC_INCLUDED == TRUE)
index ce8156be808c6d5d5aeb20897987770c09c3febf..105876dbb987e6a8a138bd063f540d394867b056 100644 (file)
@@ -36,7 +36,7 @@ frame length and bitrate.
 @{
 */
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "oi_utils.h"
 #include <oi_codec_sbc_private.h>
 
index 743a7c1aa2d3dd10977305599a6ebb58feaa3d42..c1b9d6e90e0bf372962d608264b828b511507b99 100644 (file)
@@ -33,7 +33,7 @@ Functions for manipulating input bitstreams.
 @{
 */
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "oi_stddefs.h"
 #include "oi_bitstream.h"
 #include "oi_assert.h"
index 471864bd48fbae00b5a1f5451cdd6d7efd536aa5..6673295de340a7f95339e037cef13e2d4b3471d1 100644 (file)
@@ -33,7 +33,7 @@ This file exposes OINA-specific interfaces to decoder functions.
 @{
 */
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include <oi_codec_sbc_private.h>
 
 #if (defined(SBC_DEC_INCLUDED) && SBC_DEC_INCLUDED == TRUE)
index 09b8e5fa6e6e7b3c3c4467197d0a92c11c1affc5..86c4fdf5963add7bab4e01cf0af1bb75a7e090d1 100644 (file)
@@ -33,7 +33,7 @@ This file drives SBC decoding.
 @{
 */
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "oi_codec_sbc_private.h"
 #include "oi_bitstream.h"
 #include <stdio.h>
index 7dd29ed8f93c8a1cec36b0c4c2e15d36f7322f2b..80a1f33546764b74eaa6afb320aa5667411e866a 100644 (file)
@@ -28,7 +28,7 @@
 /**@addtogroup codec_internal */
 /**@{*/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "oi_codec_sbc_private.h"
 #include "oi_bitstream.h"
 
index 65c340a1ce90a6daabaa3b69cd1a2d2aeb65e264..5c529e0b12ceb71346f70c9eaf1c84879ea33ea6 100644 (file)
@@ -95,7 +95,7 @@
 
  */
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include <oi_codec_sbc_private.h>
 
 #if (defined(SBC_DEC_INCLUDED) && SBC_DEC_INCLUDED == TRUE)
index 7085c80848db41fed3fcb6524d9651c8b107984c..4f6056018c7a60c54d75c9348e338a9215cb8a35 100644 (file)
@@ -28,7 +28,7 @@
 /**@addgroup codec_internal*/
 /**@{*/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "oi_codec_sbc_private.h"
 
 #if (defined(SBC_DEC_INCLUDED) && SBC_DEC_INCLUDED == TRUE)
index 8d46cd5e1b4180be7745da284e44ca22b40cc7c1..f819ae9aa0bc8a3985539d6e76a3e0630636f46d 100644 (file)
@@ -33,7 +33,7 @@ Checksum and header-related functions.
 @{
 */
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "oi_codec_sbc_private.h"
 #include "oi_assert.h"
 
index 1de00db185150f910718c735ce93c7bb3b75cf58..95f8883016e3837a903a362bcb86f4c0c6517d3d 100644 (file)
@@ -33,7 +33,7 @@ version number of the eSBC codec
 /**********************************************************************************
   $Revision: #1 $
 ***********************************************************************************/
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "oi_stddefs.h"
 #include "oi_codec_sbc_private.h"
 
index 571cd4e03bbd5205d39fafbee8d2714896a477f6..137b01e9914be753eac2f5df9953087b49ca7162 100644 (file)
@@ -30,7 +30,7 @@
 
 
  */
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include <oi_codec_sbc_private.h>
 
 #if (defined(SBC_DEC_INCLUDED) && SBC_DEC_INCLUDED == TRUE)
index a34032804c9089a823a8befed05bf88693fd301c..1a12774e71216e45ea7727b78b8901e3857f5b6f 100644 (file)
@@ -33,7 +33,7 @@
  * factorization. The scaling factors are folded into the windowing
  * constants. 29 adds and 5 16x32 multiplies per 8 samples.
  */
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "oi_codec_sbc_private.h"
 
 #if (defined(SBC_DEC_INCLUDED) && SBC_DEC_INCLUDED == TRUE)
index c7cf50e590d7c8233c7a735ecf4de9a05cd336c8..158ba6fbf5d32efd25d88e673967293ccbf292bc 100644 (file)
@@ -158,7 +158,7 @@ The output samples X[0..7] are defined as sums of W:
 @addtogroup codec_internal
 @{
 */
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "oi_codec_sbc_private.h"
 
 #if (defined(SBC_DEC_INCLUDED) && SBC_DEC_INCLUDED == TRUE)
index 8e2e6dd364944cf222abd323fcc9f4863693a99f..8a507a7d3078e713d1100ebd0c44412ab62cef0f 100644 (file)
@@ -28,7 +28,7 @@
 #define ENCODER_VERSION "0025"
 
 #ifdef BUILDCFG
-#include "bt_target.h"
+#include "common/bt_target.h"
 #endif
 
 /*DEFINES*/
index 4bb8829c707fc1673744426e627c20c87e6cd010..c6e4575beee80d7bf8a740bf603dfaf73ce6887f 100644 (file)
 #include <stdint.h>
 
 #ifdef BUILDCFG
-#include "bt_target.h"
+#include "common/bt_target.h"
 #endif
 
-#include "bt_types.h"
+#include "stack/bt_types.h"
 
 typedef short SINT16;
 typedef long SINT32;
index 2de5a81aa5f4512cd40f49d4e52a3d8f375b6f23..12878f315664d9af5c8201f89dc517960c6df0c8 100644 (file)
@@ -22,7 +22,7 @@
  *  stream.
  *
  ******************************************************************************/
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include <string.h>
 #include "sbc_encoder.h"
 #include "sbc_enc_func_declare.h"
index 23ddd386ca24f487fc380659fd6dc72bc592c076..73c981ac951dfb80e05f196f145867cd18eae6aa 100644 (file)
@@ -21,7 +21,7 @@
  *  source file for fast dct operations
  *
  ******************************************************************************/
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "sbc_encoder.h"
 #include "sbc_enc_func_declare.h"
 #include "sbc_dct.h"
index 671ca4bab807d075fbb95cf54d02861c5af4ca0b..44c6162948b0205dc8bb3cc57930a1fdd1830120 100644 (file)
@@ -22,7 +22,7 @@
  *  analysis.
  *
  ******************************************************************************/
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "sbc_encoder.h"
 
 #if (defined(SBC_ENC_INCLUDED) && SBC_ENC_INCLUDED == TRUE)
index d4a1e844770ac26c11a1d0f4cf94545eb4695ebb..d4975189cac06d7d6ca42f3aa0fcdb4808eb4a73 100644 (file)
@@ -24,7 +24,7 @@
  ******************************************************************************/
 
 /*Includes*/
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "sbc_encoder.h"
 #include "sbc_enc_func_declare.h"
 
index 5363d3559a33a1e9fd841a69595a47c485b6b6b6..939f749c8f6dcacb3ddd5121591c869c12b0d924 100644 (file)
@@ -24,7 +24,7 @@
  ******************************************************************************/
 
 /*Includes*/
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "sbc_encoder.h"
 #include "sbc_enc_func_declare.h"
 
index d1cfe743125e9772f13709e611e51d2ba1498af2..a3099f8a0c98a8afbd06365c21d46e81256489fe 100644 (file)
@@ -21,7 +21,7 @@
  *  This file contains the Windowing coeffs for synthesis filter
  *
  ******************************************************************************/
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "sbc_encoder.h"
 
 #if (defined(SBC_ENC_INCLUDED) && SBC_ENC_INCLUDED == TRUE)
index 748f85f6f2998f4edcc26c6db430b520972b9423..c08d4a5cce8c6960ba21bd8853f9049463c4b98f 100644 (file)
@@ -23,7 +23,7 @@
  ******************************************************************************/
 
 #include <string.h>
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "sbc_encoder.h"
 #include "sbc_enc_func_declare.h"
 
index 47d7a6b96529396d9d52b7513e51478f44e2ecfe..d2019baaf14ab37b99e36dd63ff1e89e843ee9e0 100644 (file)
@@ -21,7 +21,7 @@
  *  This file contains code for packing the Encoded data into bit streams.
  *
  ******************************************************************************/
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "sbc_encoder.h"
 #include "sbc_enc_func_declare.h"
 
index 1a5fc69b7cd14bbd5ded86ad14ebd7781631ad6e..591cc390f3bed57ce569c5085daf14d828b13182 100644 (file)
@@ -15,8 +15,8 @@
  *  limitations under the License.
  *
  ******************************************************************************/
-#include "buffer_allocator.h"
-#include "allocator.h"
+#include "hci/buffer_allocator.h"
+#include "osi/allocator.h"
 
 // TODO(zachoverflow): move the assertion into osi_malloc in the future
 static void *buffer_alloc(size_t size)
index b9231b1b6f3d88c0a4845dbda95d9f79a4f68341..ec700dd15d9e1507b2d88344a5781e5a5c387bfb 100644 (file)
  *
  ******************************************************************************/
 #include <string.h>
-#include "bt_defs.h"
-#include "bt_trace.h"
-#include "bt_types.h"
-#include "buffer_allocator.h"
-#include "fixed_queue.h"
-#include "hci_hal.h"
-#include "hci_internals.h"
-#include "hci_layer.h"
-#include "thread.h"
+#include "common/bt_defs.h"
+#include "common/bt_trace.h"
+#include "stack/bt_types.h"
+#include "hci/buffer_allocator.h"
+#include "osi/fixed_queue.h"
+#include "hci/hci_hal.h"
+#include "hci/hci_internals.h"
+#include "hci/hci_layer.h"
+#include "osi/thread.h"
 #include "esp_bt.h"
 
 #define HCI_HAL_SERIAL_BUFFER_SIZE 1026
index 10b0959aae0a9cb07703ed0ce498a64e241853c1..eaeb59fea421c8bb672762d175a1cbc39a68fd9f 100644 (file)
  ******************************************************************************/
 #include <string.h>
 #include "esp_bt.h"
-#include "bt_defs.h"
-#include "bt_trace.h"
-#include "hcidefs.h"
-#include "hcimsgs.h"
-#include "bt_vendor_lib.h"
-#include "hci_internals.h"
-#include "hci_hal.h"
-#include "hci_layer.h"
-#include "allocator.h"
-#include "packet_fragmenter.h"
-#include "buffer_allocator.h"
-#include "list.h"
-#include "alarm.h"
-#include "thread.h"
-#include "mutex.h"
-#include "fixed_queue.h"
+#include "common/bt_defs.h"
+#include "common/bt_trace.h"
+#include "stack/hcidefs.h"
+#include "stack/hcimsgs.h"
+#include "common/bt_vendor_lib.h"
+#include "hci/hci_internals.h"
+#include "hci/hci_hal.h"
+#include "hci/hci_layer.h"
+#include "osi/allocator.h"
+#include "hci/packet_fragmenter.h"
+#include "hci/buffer_allocator.h"
+#include "osi/list.h"
+#include "osi/alarm.h"
+#include "osi/thread.h"
+#include "osi/mutex.h"
+#include "osi/fixed_queue.h"
 
 typedef struct {
     uint16_t opcode;
index c4bb96b162f12f68883391f5b4c09b2ee132ffd8..549323be6167d1204c9a1d812036732266c01835 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_defs.h"
-
-#include "allocator.h"
-#include "bt_types.h"
-#include "buffer_allocator.h"
-#include "hcidefs.h"
-#include "hcimsgs.h"
-#include "hci_internals.h"
-#include "hci_layer.h"
-#include "hci_packet_factory.h"
+#include "common/bt_defs.h"
+
+#include "osi/allocator.h"
+#include "stack/bt_types.h"
+#include "hci/buffer_allocator.h"
+#include "stack/hcidefs.h"
+#include "stack/hcimsgs.h"
+#include "hci/hci_internals.h"
+#include "hci/hci_layer.h"
+#include "hci/hci_packet_factory.h"
 
 static const allocator_t *buffer_allocator;
 
index 8936a7d537ba190256eb4bb03e1dd41cbe40751c..6866872425bed151ca9ede42dc72aa8d3af45608 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_defs.h"
+#include "common/bt_defs.h"
 
-#include "buffer_allocator.h"
-#include "bt_types.h"
-#include "hcimsgs.h"
-#include "hci_layer.h"
-#include "hci_packet_parser.h"
+#include "hci/buffer_allocator.h"
+#include "stack/bt_types.h"
+#include "stack/hcimsgs.h"
+#include "hci/hci_layer.h"
+#include "hci/hci_packet_parser.h"
 
 static const command_opcode_t NO_OPCODE_CHECKING = 0;
 
similarity index 97%
rename from components/bt/bluedroid/hci/include/buffer_allocator.h
rename to components/bt/bluedroid/hci/include/hci/buffer_allocator.h
index 9dd7ba7c4531de6e750b88610773c490696e998f..da44bf6c51fb6e422f2dcd8660dfbb6a6a8a3d37 100644 (file)
@@ -18,7 +18,7 @@
 
 #ifndef _BUFFER_ALLOCATOR_H_
 
-#include "allocator.h"
+#include "osi/allocator.h"
 
 const allocator_t *buffer_allocator_get_interface();
 
similarity index 99%
rename from components/bt/bluedroid/hci/include/hci_hal.h
rename to components/bt/bluedroid/hci/include/hci/hci_hal.h
index 9853211df4670cd8932034b74a992c911bbacc24..2928f29ad342c9b48ca6f6fa5c8012aa6b775301 100644 (file)
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "bt_types.h"
+#include "stack/bt_types.h"
 
 typedef enum {
     DATA_TYPE_COMMAND = 1,
similarity index 97%
rename from components/bt/bluedroid/hci/include/hci_layer.h
rename to components/bt/bluedroid/hci/include/hci/hci_layer.h
index 5e9b8c695b50c2da918ff28f691d3e5922236a63..4b1018098bd594aa931faefe01a2c6a8cd227525 100644 (file)
 #ifndef _HCI_LAYER_H_
 #define _HCI_LAYER_H_
 
-#include "bt_types.h"
-#include "allocator.h"
-#include "osi.h"
-#include "future.h"
+#include "stack/bt_types.h"
+#include "osi/allocator.h"
+#include "osi/osi.h"
+#include "osi/future.h"
 ///// LEGACY DEFINITIONS /////
 
 /* Message event mask across Host/Controller lib and stack */
similarity index 97%
rename from components/bt/bluedroid/hci/include/hci_packet_factory.h
rename to components/bt/bluedroid/hci/include/hci/hci_packet_factory.h
index 11f0053a5837bbb0d017ab638d60173d181b2dd5..b98b80d5d7087ca32379011bb52ee1b5a28b859c 100644 (file)
@@ -19,8 +19,8 @@
 #ifndef _HCI_PACKET_FACTORY_H_
 #define _HCI_PACKET_FACTORY_H_
 
-#include "bt_types.h"
-#include "event_mask.h"
+#include "stack/bt_types.h"
+#include "device/event_mask.h"
 
 typedef struct {
     BT_HDR *(*make_reset)(void);
similarity index 95%
rename from components/bt/bluedroid/hci/include/hci_packet_parser.h
rename to components/bt/bluedroid/hci/include/hci/hci_packet_parser.h
index 7090708f0d0a2b7e6b1d3b489e794e8c46a7c37d..2e5b5ef986896d6722cf780840810179179a9f3e 100644 (file)
 
 #include <stdint.h>
 
-#include "allocator.h"
-#include "bdaddr.h"
-#include "bt_types.h"
-#include "device_features.h"
+#include "osi/allocator.h"
+#include "device/bdaddr.h"
+#include "stack/bt_types.h"
+#include "device/device_features.h"
 //#include "features.h"
-#include "version.h"
+#include "device/version.h"
 
 typedef struct {
     void (*parse_generic_command_complete)(BT_HDR *response);
similarity index 96%
rename from components/bt/bluedroid/hci/include/packet_fragmenter.h
rename to components/bt/bluedroid/hci/include/hci/packet_fragmenter.h
index 7227e0af2cd0694ed1629c8ca8f4cab196e75b9c..80b442f287824df7da8e5324740d412e7cd30747 100644 (file)
@@ -19,9 +19,9 @@
 #ifndef _PACKET_FRAGMENTER_H_
 #define _PACKET_FRAGMENTER_H_
 
-#include "allocator.h"
-#include "bt_types.h"
-#include "hci_layer.h"
+#include "osi/allocator.h"
+#include "stack/bt_types.h"
+#include "hci/hci_layer.h"
 
 typedef void (*transmit_finished_cb)(BT_HDR *packet, bool all_fragments_sent);
 typedef void (*packet_reassembled_cb)(BT_HDR *packet);
index 67e89c28af4b3d3bd075d8040a95b9b8ace5f372..8bc593dd20f1e6f1da91c436418fcd1db0e08c19 100644 (file)
  *
  ******************************************************************************/
 #include <string.h>
-#include "bt_trace.h"
-#include "bt_defs.h"
-#include "controller.h"
-#include "buffer_allocator.h"
-#include "hci_internals.h"
-#include "hci_layer.h"
-#include "packet_fragmenter.h"
-
-#include "hash_map.h"
-#include "hash_functions.h"
-#include "bt_trace.h"
+#include "common/bt_trace.h"
+#include "common/bt_defs.h"
+#include "device/controller.h"
+#include "hci/buffer_allocator.h"
+#include "hci/hci_internals.h"
+#include "hci/hci_layer.h"
+#include "hci/packet_fragmenter.h"
+
+#include "osi/hash_map.h"
+#include "osi/hash_functions.h"
+#include "common/bt_trace.h"
 
 
 #define APPLY_CONTINUATION_FLAG(handle) (((handle) & 0xCFFF) | 0x1000)
index df463280f62a9b6fe531bdbeac1466d216344b9f..1b1395f4b4d14e73cadf4402cf15b7911446a3fc 100644 (file)
@@ -23,7 +23,7 @@
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include <string.h>
 
 
@@ -37,7 +37,7 @@
 
 #if (defined(RFCOMM_INCLUDED) && RFCOMM_INCLUDED == TRUE)
 // Include initialization functions definitions
-#include "port_api.h"
+#include "stack/port_api.h"
 #endif
 
 #if (defined(BNEP_INCLUDED) && BNEP_INCLUDED == TRUE)
@@ -45,7 +45,7 @@
 #endif
 
 #if (defined(GAP_INCLUDED) && GAP_INCLUDED == TRUE)
-#include "gap_api.h"
+#include "stack/gap_api.h"
 #endif
 
 #if (defined(PAN_INCLUDED) && PAN_INCLUDED == TRUE)
 #endif
 
 #if (defined(AVRC_INCLUDED) && AVRC_INCLUDED == TRUE)
-#include "avrc_api.h"
+#include "stack/avrc_api.h"
 #endif
 
 #if (defined(A2D_INCLUDED) && A2D_INCLUDED == TRUE)
-#include "a2d_api.h"
+#include "stack/a2d_api.h"
 #endif
 
 #if (defined(AVDT_INCLUDED) && AVDT_INCLUDED == TRUE)
@@ -69,7 +69,7 @@
 #endif
 
 #if (defined(HID_HOST_INCLUDED) && HID_HOST_INCLUDED == TRUE)
-#include "hidh_api.h"
+#include "stack/hidh_api.h"
 #endif
 
 #if (defined(MCA_INCLUDED) && MCA_INCLUDED == TRUE)
 #endif
 
 #if (defined(BLE_INCLUDED) && BLE_INCLUDED == TRUE)
-#include "gatt_api.h"
+#include "stack/gatt_api.h"
 #if (defined(SMP_INCLUDED) && SMP_INCLUDED == TRUE)
-#include "smp_api.h"
+#include "stack/smp_api.h"
 #endif
 #endif
 
 //BTA Modules
 #if BTA_INCLUDED == TRUE && BTA_DYNAMIC_MEMORY == TRUE
-#include "bta_api.h"
-#include "bta_sys.h"
-#include "allocator.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sys.h"
+#include "osi/allocator.h"
 
 //#include "bta_ag_int.h"
 
index 32ae87d34773669997e344ca17381031aa906b77..2db4fa03daaa1fb49a3ed221ea2adafcdf00f05b 100644 (file)
  ******************************************************************************/
 
 
-#include "bt_defs.h"
-#include "bt_common_types.h"
-#include "bte.h"
-#include "btu.h"
-#include "bt_trace.h"
-#include "osi.h"
-#include "alarm.h"
-#include "hash_map.h"
-#include "hash_functions.h"
-#include "controller.h"
-#include "hci_layer.h"
-#include "bta_api.h"
+#include "common/bt_defs.h"
+#include "common/bt_common_types.h"
+#include "common/bte.h"
+#include "stack/btu.h"
+#include "common/bt_trace.h"
+#include "osi/osi.h"
+#include "osi/alarm.h"
+#include "osi/hash_map.h"
+#include "osi/hash_functions.h"
+#include "device/controller.h"
+#include "hci/hci_layer.h"
+#include "bta/bta_api.h"
 
 /*******************************************************************************
 **  Constants & Macros
index ce7e7514de6c5584c8c39ead21ab013cec4f36cb..f86332191e8e53c062e1b9f5cde8bae5cd896758 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
-#include "bt_defs.h"
-#include "bt_trace.h"
-#include "alarm.h"
-#include "allocator.h"
-#include "list.h"
+#include "common/bt_defs.h"
+#include "common/bt_trace.h"
+#include "osi/alarm.h"
+#include "osi/allocator.h"
+#include "osi/list.h"
 #include "esp_timer.h"
-#include "btc_task.h"
-#include "btc_alarm.h"
-#include "mutex.h"
+#include "btc/btc_task.h"
+#include "btc/btc_alarm.h"
+#include "osi/mutex.h"
 
 typedef struct alarm_t {
     /* timer id point to here */
index a6c2b8ea397f4e45ae9bd77fdbf8621ad3f8a1b7..113f32becdb325f543ab09a007f71ee246853c31 100644 (file)
@@ -18,8 +18,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "bt_defs.h"
-#include "allocator.h"
+#include "common/bt_defs.h"
+#include "osi/allocator.h"
 
 extern void *pvPortZalloc(size_t size);
 extern void vPortFree(void *pv);
index cb02f26a8ba0647d9db195477e002cebac625db7..42732cf977ad7fd328687681b134b9d66a0758e4 100644 (file)
  *
  ******************************************************************************/
 #include <stdint.h>
-#include "bt_trace.h"
-#include "allocator.h"
-#include "buffer.h"
-#include "bt_defs.h"
-#include "bt_trace.h"
+#include "common/bt_trace.h"
+#include "osi/allocator.h"
+#include "osi/buffer.h"
+#include "common/bt_defs.h"
+#include "common/bt_trace.h"
 
 struct buffer_t {
     buffer_t *root;
index c9b76e3502fdf1ce9b644094cba4f1c533845982..07f47c6d9db754ffbcedce3686a781a9e523479e 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#include "allocator.h"
-#include "config.h"
-#include "list.h"
-#include "bt_trace.h"
+#include "osi/allocator.h"
+#include "osi/config.h"
+#include "osi/list.h"
+#include "common/bt_trace.h"
 
 #define CONFIG_FILE_MAX_SIZE             (1536)//1.5k
 #define CONFIG_FILE_DEFAULE_LENGTH       (2048)
index 802354a21c3eb3e335f2f7ace3d155e63f7fc372..30290060aa6dabb70574c38c4cacbfd0d5d7c3a7 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_defs.h"
-#include "allocator.h"
-#include "fixed_queue.h"
-#include "list.h"
-#include "osi.h"
-#include "bt_trace.h"
-#include "mutex.h"
-#include "semaphore.h"
+#include "common/bt_defs.h"
+#include "osi/allocator.h"
+#include "osi/fixed_queue.h"
+#include "osi/list.h"
+#include "osi/osi.h"
+#include "common/bt_trace.h"
+#include "osi/mutex.h"
+#include "osi/semaphore.h"
 
 typedef struct fixed_queue_t {
 
index 415b44ebf15e272cd3f51e95086db00c7f617dec..835ccbcff15f04292d8282b78ffa94b6208aa20c 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_trace.h"
+#include "common/bt_trace.h"
 
-#include "allocator.h"
-#include "future.h"
-#include "osi.h"
+#include "osi/allocator.h"
+#include "osi/future.h"
+#include "osi/osi.h"
 
 void future_free(future_t *future);
 
index 0cfd3f52dfe708aed2b9f0f6aae34b6f2fdc7b91..78879421a7f14e2b0da90c54ad37c66454d3ae8e 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-#include "hash_functions.h"
+#include "osi/hash_functions.h"
 
 hash_index_t hash_function_naive(const void *key)
 {
index 41ae983397c9b042b20a42159a37b17374be93b4..fa33f5aa8e9b7e9e5e0f6a2c0177bbf56ee7fea0 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_defs.h"
-#include "bt_trace.h"
-#include "list.h"
-#include "hash_map.h"
-#include "allocator.h"
+#include "common/bt_defs.h"
+#include "common/bt_trace.h"
+#include "osi/list.h"
+#include "osi/hash_map.h"
+#include "osi/allocator.h"
 
 struct hash_map_t;
 
similarity index 99%
rename from components/bt/bluedroid/osi/include/fixed_queue.h
rename to components/bt/bluedroid/osi/include/osi/fixed_queue.h
index becafea1988e3a22495ea42b04c4cfe1d206c883..e3bf2f67b516313a61bea0177f5d6ac71f5ec2dc 100644 (file)
@@ -20,7 +20,7 @@
 #define _FIXED_QUEUE_H_
 
 #include <stdbool.h>
-#include "list.h"
+#include "osi/list.h"
 
 struct fixed_queue_t;
 
similarity index 98%
rename from components/bt/bluedroid/osi/include/future.h
rename to components/bt/bluedroid/osi/include/osi/future.h
index f001f1f1337d36000fc7de5ca4047aaebac20d8f..9d1cb521dfb04fb33ca0a90cb288afd8c3548615 100644 (file)
@@ -19,7 +19,7 @@
 #ifndef __FUTURE_H__
 #define __FUTURE_H__
 
-#include "semaphore.h"
+#include "osi/semaphore.h"
 
 struct future {
     bool ready_can_be_called;
similarity index 97%
rename from components/bt/bluedroid/osi/include/hash_functions.h
rename to components/bt/bluedroid/osi/include/osi/hash_functions.h
index 2edbeb8b74ad6a70a5f38f8abbbbd510ff3048ee..3d0b254ea3af2e7751e5d799beaa9c291cb653bb 100644 (file)
@@ -19,7 +19,7 @@
 #ifndef _HASH_FUNCTIONS_H_
 #define _HASH_FUNCTIONS_H_
 
-#include "hash_map.h"
+#include "osi/hash_map.h"
 
 hash_index_t hash_function_naive(const void *key);
 
similarity index 99%
rename from components/bt/bluedroid/osi/include/thread.h
rename to components/bt/bluedroid/osi/include/osi/thread.h
index 6a92388d37382f34d6576eafa245707bd2e26e08..8bb2fdc7c04add1fe7bdd5707777b5e8cd2a2c5c 100644 (file)
@@ -21,7 +21,7 @@
 #include "freertos/queue.h"
 #include "freertos/task.h"
 #include "esp_task.h"
-#include "bt_defs.h"
+#include "common/bt_defs.h"
 
 #define portBASE_TYPE int
 
index d93478274c6f55e52a1544a232bc6c277ece3606..eb46cda45ea30d108186ea1175b7ca8f11f041f1 100644 (file)
@@ -1,9 +1,9 @@
 
-#include "bt_defs.h"
+#include "common/bt_defs.h"
 
-#include "allocator.h"
-#include "list.h"
-#include "osi.h"
+#include "osi/allocator.h"
+#include "osi/list.h"
+#include "osi/osi.h"
 
 struct list_node_t {
     struct list_node_t *next;
index 9b679f463999c70325a7d6ad1b9b29106c82c676..b7fe38a1ee334d2edc5332d3f33adadb115fe5b9 100644 (file)
@@ -16,7 +16,7 @@
  *
  ******************************************************************************/
 
-#include "mutex.h"
+#include "osi/mutex.h"
 
 
 /* static section */
index 348ee0b05ba0760515cc2130457f25629853f9e4..43ce9b7804faa80064e0a2d825a51b778497ab7b 100644 (file)
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 
-#include "osi.h"
-#include "mutex.h"
+#include "osi/osi.h"
+#include "osi/mutex.h"
 
 int osi_init(void)
 {
index 86493ebcac64e31df947f0078f92b490bcaf3528..14823160e34bc5c21eb874e2bd4cbe92c8918f83 100644 (file)
@@ -17,7 +17,7 @@
  ******************************************************************************/
 
 
-#include "semaphore.h"
+#include "osi/semaphore.h"
 
 /*-----------------------------------------------------------------------------------*/
 //  Creates and returns a new semaphore. The "init_count" argument specifies
index 1d77e338ee25dd29d73a8d8248de9ab073bbd8c6..73b174e6147cc02d78824a10a1e7e3d1061e77c0 100644 (file)
  *
  ******************************************************************************/
 #include <string.h>
-#include "bt_target.h"
-#include "sdpdefs.h"
-#include "a2d_api.h"
+#include "common/bt_target.h"
+#include "stack/sdpdefs.h"
+#include "stack/a2d_api.h"
 #include "a2d_int.h"
-#include "avdt_api.h"
-#include "allocator.h"
+#include "stack/avdt_api.h"
+#include "osi/allocator.h"
 
 #if (defined(A2D_INCLUDED) && A2D_INCLUDED == TRUE)
 
index 0c2b4adc8872bb916fed34fa1a3afc5c2595ec7b..00977fc398b610239bf0b8db19a423e6c8b0e519 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #include <string.h>
-#include "a2d_api.h"
+#include "stack/a2d_api.h"
 #include "a2d_int.h"
-#include "a2d_sbc.h"
-#include "bt_defs.h"
+#include "stack/a2d_sbc.h"
+#include "common/bt_defs.h"
 
 #if (defined(A2D_INCLUDED) && A2D_INCLUDED == TRUE)
 
index 89055bce991c2103af25d1528c9d2d91d49ac0d4..ddd3e9646413f12179e281115200cb557d8a7721 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef A2D_INT_H
 #define A2D_INT_H
 
-#include "a2d_api.h"
+#include "stack/a2d_api.h"
 #if (A2D_INCLUDED == TRUE)
 /*****************************************************************************
 **  Constants
index 2d86ba8915d49c00c3fa4efd446c27e4040377b3..799bbf553c7b861840e6d13b6fd9e6b3c93c93c2 100644 (file)
  ******************************************************************************/
 
 #include <string.h>
-#include "bt_types.h"
-#include "bt_target.h"
-#include "bt_defs.h"
-#include "l2c_api.h"
-#include "l2cdefs.h"
-#include "btm_api.h"
-#include "avct_api.h"
+#include "stack/bt_types.h"
+#include "common/bt_target.h"
+#include "common/bt_defs.h"
+#include "stack/l2c_api.h"
+#include "stack/l2cdefs.h"
+#include "stack/btm_api.h"
+#include "stack/avct_api.h"
 #include "avct_int.h"
-#include "allocator.h"
+#include "osi/allocator.h"
 
 #if (defined(AVCT_INCLUDED) && AVCT_INCLUDED == TRUE)
 
index 06ff5014d0978d41a42d44967d656aee9ea81949..8cc9fc399697c21fdc077e2c597507e16d267534 100644 (file)
@@ -24,9 +24,9 @@
  ******************************************************************************/
 
 #include <string.h>
-#include "bt_types.h"
-#include "bt_target.h"
-#include "avct_api.h"
+#include "stack/bt_types.h"
+#include "common/bt_target.h"
+#include "stack/avct_api.h"
 #include "avct_int.h"
 
 #if (defined(AVCT_INCLUDED) && AVCT_INCLUDED == TRUE)
index 35abf45b2e984ea6faea1f3e92efc656444b90d7..a501b15755c680218590b210776363b48178f67a 100644 (file)
  ******************************************************************************/
 
 #include <string.h>
-#include "bt_types.h"
-#include "bt_target.h"
-#include "bt_defs.h"
-#include "avct_api.h"
+#include "stack/bt_types.h"
+#include "common/bt_target.h"
+#include "common/bt_defs.h"
+#include "stack/avct_api.h"
 #include "avct_int.h"
-#include "l2c_api.h"
-#include "l2cdefs.h"
-#include "allocator.h"
+#include "stack/l2c_api.h"
+#include "stack/l2cdefs.h"
+#include "osi/allocator.h"
 
 #if (defined(AVCT_INCLUDED) && AVCT_INCLUDED == TRUE)
 
index 71c70f7974e56edd162727d25197ab0c67cb6e18..7d5ba3a16e3a0f0f353392602f88a98cbd0f9128 100644 (file)
  ******************************************************************************/
 
 #include <string.h>
-#include "bt_types.h"
-#include "bt_target.h"
-#include "bt_defs.h"
-#include "avct_api.h"
+#include "stack/bt_types.h"
+#include "common/bt_target.h"
+#include "common/bt_defs.h"
+#include "stack/avct_api.h"
 #include "avct_int.h"
-#include "allocator.h"
+#include "osi/allocator.h"
 
 #if (defined(AVCT_INCLUDED) && AVCT_INCLUDED == TRUE)
 
index 8895f968e20efec97d30e0899f2817892d98b6c6..a958b1503b4ea762d7ea38a033056493107b489c 100644 (file)
  ******************************************************************************/
 
 #include <string.h>
-#include "bt_types.h"
-#include "bt_target.h"
-#include "bt_defs.h"
-#include "avct_api.h"
+#include "stack/bt_types.h"
+#include "common/bt_target.h"
+#include "common/bt_defs.h"
+#include "stack/avct_api.h"
 #include "avct_int.h"
-#include "btm_api.h"
-#include "allocator.h"
+#include "stack/btm_api.h"
+#include "osi/allocator.h"
 
 #if (defined(AVCT_INCLUDED) && AVCT_INCLUDED == TRUE)
 
index f70f516c0df6ee47d5323a034baf1bf6d1903a14..0a91a96fb847924c77473cf85b7cf949cca900b3 100644 (file)
 #ifndef AVCT_INT_H
 #define AVCT_INT_H
 
-#include "avct_api.h"
+#include "stack/avct_api.h"
 #include "avct_defs.h"
-#include "l2c_api.h"
-#include "fixed_queue.h"
+#include "stack/l2c_api.h"
+#include "osi/fixed_queue.h"
 
 /*****************************************************************************
 ** constants
index 9a85fcef46de5f5265aa1d9250432c9d00e2c492..361c5b276f8ae0aaf720b087d7039917cc33c0d6 100644 (file)
  ******************************************************************************/
 
 // #include <assert.h>
-#include "bt_trace.h"
+#include "common/bt_trace.h"
 #include <string.h>
 
-#include "bt_types.h"
-#include "bt_target.h"
-#include "bt_defs.h"
-#include "avdt_api.h"
-#include "avdtc_api.h"
+#include "stack/bt_types.h"
+#include "common/bt_target.h"
+#include "common/bt_defs.h"
+#include "stack/avdt_api.h"
+#include "stack/avdtc_api.h"
 #include "avdt_int.h"
-#include "l2c_api.h"
-#include "l2cdefs.h"
-#include "allocator.h"
+#include "stack/l2c_api.h"
+#include "stack/l2cdefs.h"
+#include "osi/allocator.h"
 
 #if (defined(AVDT_INCLUDED) && AVDT_INCLUDED == TRUE)
 /*******************************************************************************
index 5167af13f0ff0b90373d81d7b04b252104329ad3..88d3741306c7f19991d01b0b43e0b67a0d232780 100644 (file)
  ******************************************************************************/
 
 #include <string.h>
-#include "bt_types.h"
-#include "bt_target.h"
-#include "avdt_api.h"
-#include "avdtc_api.h"
+#include "stack/bt_types.h"
+#include "common/bt_target.h"
+#include "stack/avdt_api.h"
+#include "stack/avdtc_api.h"
 #include "avdt_int.h"
-#include "l2c_api.h"
-#include "btm_api.h"
-#include "btu.h"
-#include "allocator.h"
+#include "stack/l2c_api.h"
+#include "stack/btm_api.h"
+#include "stack/btu.h"
+#include "osi/allocator.h"
 
 #if (defined(AVDT_INCLUDED) && AVDT_INCLUDED == TRUE)
 
index 3910f76e4f334b5d2b88a070b26ad80fe1666474..5e1a1f46de28f6a408df3d5fb7652add6b876717 100644 (file)
  ******************************************************************************/
 
 #include <string.h>
-#include "bt_types.h"
-#include "bt_target.h"
-#include "bt_defs.h"
-#include "avdt_api.h"
-#include "avdtc_api.h"
+#include "stack/bt_types.h"
+#include "common/bt_target.h"
+#include "common/bt_defs.h"
+#include "stack/avdt_api.h"
+#include "stack/avdtc_api.h"
 #include "avdt_int.h"
-#include "btu.h"
+#include "stack/btu.h"
 
 #if (defined(AVDT_INCLUDED) && AVDT_INCLUDED == TRUE)
 
index 2a35906eb8afee35745a56458fc10696d582a576..9f7b0ee9d0a92b21e942a429e39f4d38ded1a3a0 100644 (file)
  ******************************************************************************/
 
 #include <string.h>
-#include "bt_types.h"
-#include "bt_target.h"
-#include "bt_defs.h"
-#include "avdt_api.h"
-#include "avdtc_api.h"
+#include "stack/bt_types.h"
+#include "common/bt_target.h"
+#include "common/bt_defs.h"
+#include "stack/avdt_api.h"
+#include "stack/avdtc_api.h"
 #include "avdt_int.h"
-#include "btu.h"
-#include "btm_api.h"
-#include "allocator.h"
+#include "stack/btu.h"
+#include "stack/btm_api.h"
+#include "osi/allocator.h"
 
 #if (defined(AVDT_INCLUDED) && AVDT_INCLUDED == TRUE)
 
index 8df482fccb8deedef3eab56feb5e9e60242d6c42..92e3dcad9ded13939215687e731e37930dd7ba79 100644 (file)
  ******************************************************************************/
 
 #include <string.h>
-#include "bt_types.h"
-#include "bt_target.h"
-#include "bt_defs.h"
-#include "avdt_api.h"
-#include "avdtc_api.h"
+#include "stack/bt_types.h"
+#include "common/bt_target.h"
+#include "common/bt_defs.h"
+#include "stack/avdt_api.h"
+#include "stack/avdtc_api.h"
 #include "avdt_int.h"
-#include "l2c_api.h"
-#include "l2cdefs.h"
-#include "btm_api.h"
+#include "stack/l2c_api.h"
+#include "stack/l2cdefs.h"
+#include "stack/btm_api.h"
 #include "btm_int.h"
-#include "allocator.h"
+#include "osi/allocator.h"
 
 #if (defined(AVDT_INCLUDED) && AVDT_INCLUDED == TRUE)
 
index 61378a6b19296b0a17a92d95ee91bbb0dd14ed71..91e993233d06f094743595f9f947681801f90c47 100644 (file)
  ******************************************************************************/
 
 #include <string.h>
-#include "bt_types.h"
-#include "bt_target.h"
-#include "bt_defs.h"
-#include "avdt_api.h"
-#include "avdtc_api.h"
+#include "stack/bt_types.h"
+#include "common/bt_target.h"
+#include "common/bt_defs.h"
+#include "stack/avdt_api.h"
+#include "stack/avdtc_api.h"
 #include "avdt_int.h"
-#include "btu.h"
-#include "allocator.h"
+#include "stack/btu.h"
+#include "osi/allocator.h"
 
 #if (defined(AVDT_INCLUDED) && AVDT_INCLUDED == TRUE)
 /*****************************************************************************
index 484270d034611471f737ad94eb4540ae87e452ea..cf3c1ad331bffad27a00f097a479656e17393e4b 100644 (file)
  ******************************************************************************/
 
 #include <string.h>
-#include "bt_types.h"
-#include "bt_target.h"
-#include "bt_defs.h"
-#include "avdt_api.h"
-#include "avdtc_api.h"
+#include "stack/bt_types.h"
+#include "common/bt_target.h"
+#include "common/bt_defs.h"
+#include "stack/avdt_api.h"
+#include "stack/avdtc_api.h"
 #include "avdt_int.h"
-#include "btu.h"
-#include "allocator.h"
-#include "fixed_queue.h"
+#include "stack/btu.h"
+#include "osi/allocator.h"
+#include "osi/fixed_queue.h"
 
 #if (defined(AVDT_INCLUDED) && AVDT_INCLUDED == TRUE)
 
index 963e8c3f175a2927472d5e7228c2be977e06c85a..154938f00809161f1515bd773510854c5c4316d8 100644 (file)
  ******************************************************************************/
 
 #include <string.h>
-#include "bt_types.h"
-#include "bt_target.h"
-#include "bt_defs.h"
-#include "avdt_api.h"
-#include "avdtc_api.h"
+#include "stack/bt_types.h"
+#include "common/bt_target.h"
+#include "common/bt_defs.h"
+#include "stack/avdt_api.h"
+#include "stack/avdtc_api.h"
 #include "avdt_int.h"
-#include "btu.h"
-#include "allocator.h"
+#include "stack/btu.h"
+#include "osi/allocator.h"
 
 #if (defined(AVDT_INCLUDED) && AVDT_INCLUDED == TRUE)
 
index ad1d9d1efabeab7fd7d92f41e7ddd32fae28461c..8b65c52d745e906790173547c1bdf5ee230bc4e3 100644 (file)
@@ -24,7 +24,7 @@
  ******************************************************************************/
 #ifndef AVDT_DEFS_H
 #define AVDT_DEFS_H
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if (AVDT_INCLUDED == TRUE)
 
index 6555152ac09b9778d314b52e4ccd9f35d330e380..06bedc3573ef857dd0c10fbee64f2c4cd50d917a 100644 (file)
 #ifndef AVDT_INT_H
 #define AVDT_INT_H
 
-#include "avdt_api.h"
-#include "avdtc_api.h"
+#include "stack/avdt_api.h"
+#include "stack/avdtc_api.h"
 #include "avdt_defs.h"
-#include "l2c_api.h"
-#include "btm_api.h"
-#include "fixed_queue.h"
+#include "stack/l2c_api.h"
+#include "stack/btm_api.h"
+#include "osi/fixed_queue.h"
 
 #if (AVRC_INCLUDED == TRUE)
 
index d9d614a0e26125cd72a821b6c79e0f387e6e2218..beb823eac99db6d9a5d2f4cc8d8791dd312f816e 100644 (file)
  *
  ******************************************************************************/
 // #include <assert.h>
-#include "bt_trace.h"
+#include "common/bt_trace.h"
 #include <string.h>
-#include "bt_target.h"
-#include "avrc_api.h"
+#include "common/bt_target.h"
+#include "stack/avrc_api.h"
 #include "avrc_int.h"
-#include "allocator.h"
+#include "osi/allocator.h"
 
 #if (defined(AVRC_INCLUDED) && AVRC_INCLUDED == TRUE)
 
index ecd804388cf602604e730eb5fc9f6a5b3ac191d0..122f971ed0b3de43f02e7d14f91f00eb7dc7d7da 100644 (file)
  *
  ******************************************************************************/
 #include <string.h>
-#include "bt_target.h"
-#include "avrc_api.h"
-#include "avrc_defs.h"
+#include "common/bt_target.h"
+#include "stack/avrc_api.h"
+#include "stack/avrc_defs.h"
 #include "avrc_int.h"
-#include "allocator.h"
+#include "osi/allocator.h"
 
 #if (defined(AVRC_INCLUDED) && AVRC_INCLUDED == TRUE)
 
index 2ab7c0534983196530e2b2ce9365f59894dc1773..d7df3b45199e8754ba8a0e2b017e28f4018e3715 100644 (file)
  *
  ******************************************************************************/
 #include <string.h>
-#include "bt_target.h"
-#include "avrc_api.h"
-#include "avrc_defs.h"
+#include "common/bt_target.h"
+#include "stack/avrc_api.h"
+#include "stack/avrc_defs.h"
 #include "avrc_int.h"
-#include "bt_defs.h"
-#include "allocator.h"
+#include "common/bt_defs.h"
+#include "osi/allocator.h"
 
 #if (defined(AVRC_INCLUDED) && AVRC_INCLUDED == TRUE)
 
index 7caaf375fd68c58d7a4a2f0cb22c9f7cb10467e2..9ecf966ee1bffed1e458b79189c54f58c2b0eb09 100644 (file)
  *
  ******************************************************************************/
 // #include <assert.h>
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include <string.h>
-#include "avrc_api.h"
+#include "stack/avrc_api.h"
 #include "avrc_int.h"
-#include "allocator.h"
+#include "osi/allocator.h"
 
 #if (defined(AVRC_INCLUDED) && AVRC_INCLUDED == TRUE)
 
index a108d7077088f9452e8b60ffd63170c94d34a45f..b847e78a5cb8336731122295ca011044f6e8b1d8 100644 (file)
  *
  ******************************************************************************/
 #include <string.h>
-#include "bt_target.h"
-#include "avrc_api.h"
-#include "avrc_defs.h"
+#include "common/bt_target.h"
+#include "stack/avrc_api.h"
+#include "stack/avrc_defs.h"
 #include "avrc_int.h"
-#include "bt_defs.h"
+#include "common/bt_defs.h"
 
 #if (defined(AVRC_INCLUDED) && AVRC_INCLUDED == TRUE)
 
index 5d5d79737f1eb937facdb6230f3234b2ec51cd72..c45019933dc021622d768d9e8cdfe8f0e7268325 100644 (file)
@@ -16,9 +16,9 @@
  *
  ******************************************************************************/
 #include <string.h>
-#include "bt_target.h"
-#include "avrc_api.h"
-#include "avrc_defs.h"
+#include "common/bt_target.h"
+#include "stack/avrc_api.h"
+#include "stack/avrc_defs.h"
 #include "avrc_int.h"
 
 #if (defined(AVRC_INCLUDED) && AVRC_INCLUDED == TRUE)
index 31d4aeeb90ad1966ae87973177d637092da4b51f..4ef993dcc82ddb26c1de0c0a19f1f0629f971566 100644 (file)
  *
  ******************************************************************************/
 #include <string.h>
-#include "bt_target.h"
-#include "avrc_api.h"
+#include "common/bt_target.h"
+#include "stack/avrc_api.h"
 #include "avrc_int.h"
-#include "allocator.h"
+#include "osi/allocator.h"
 
 #if (defined(AVRC_INCLUDED) && AVRC_INCLUDED == TRUE)
 
index 821f07c19b28b3f8ca3ea08172eda5f0c0f4e35a..547eeff0d85ff4118f2d6a7bb23d477a368f150f 100644 (file)
@@ -16,8 +16,8 @@
  *
  ******************************************************************************/
 #include <string.h>
-#include "bt_target.h"
-#include "avrc_api.h"
+#include "common/bt_target.h"
+#include "stack/avrc_api.h"
 #include "avrc_int.h"
 
 #if (defined(AVRC_INCLUDED) && AVRC_INCLUDED == TRUE)
index ed0be01b2132c4103ef35c8d0403b89319049451..f13e0ccb2dba76c1fc1943eb08031aef6309c637 100644 (file)
@@ -27,7 +27,7 @@
 #define AVRC_INT_H
 
 #include "avct_defs.h"
-#include "avrc_api.h"
+#include "stack/avrc_api.h"
 
 #if (AVRC_INCLUDED == TRUE)
 /*      DEBUG FLAGS
@@ -70,7 +70,7 @@
 #define AVRC_VENDOR_UNIQUE_MASK     0x70           /* vendor unique id */
 
 
-/* Company ID is 24-bit integer We can not use the macros in bt_types.h */
+/* Company ID is 24-bit integer We can not use the macros in stack/bt_types.h */
 #define AVRC_CO_ID_TO_BE_STREAM(p, u32) {*(p)++ = (UINT8)((u32) >> 16); *(p)++ = (UINT8)((u32) >> 8); *(p)++ = (UINT8)(u32); }
 #define AVRC_BE_STREAM_TO_CO_ID(u32, p) {u32 = (((UINT32)(*((p) + 2))) + (((UINT32)(*((p) + 1))) << 8) + (((UINT32)(*(p))) << 16)); (p) += 3;}
 
index 74a73b51d2fccb076e5e24eb3fc17f9a3b02cba7..8e786abb69fe8b9751737717f4144a2464cda296 100644 (file)
 //#include <stdio.h>
 #include <stddef.h>
 
-#include "bt_types.h"
-#include "bt_target.h"
-#include "controller.h"
-#include "hcimsgs.h"
-#include "btu.h"
-#include "btm_api.h"
+#include "stack/bt_types.h"
+#include "common/bt_target.h"
+#include "device/controller.h"
+#include "stack/hcimsgs.h"
+#include "stack/btu.h"
+#include "stack/btm_api.h"
 #include "btm_int.h"
 #include "l2c_int.h"
-#include "hcidefs.h"
+#include "stack/hcidefs.h"
 //#include "bt_utils.h"
 
 static void btm_read_remote_features (UINT16 handle);
index 507e3e7f64605e5400263d4a8961bd5bd529a16e..872a24e6fa329ba500f053a8f1d521f201e15f88 100644 (file)
  *  security functions.
  *
  ******************************************************************************/
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if BLE_INCLUDED == TRUE
 
 #include <string.h>
 
-#include "bt_types.h"
-#include "hcimsgs.h"
-#include "btu.h"
+#include "stack/bt_types.h"
+#include "stack/hcimsgs.h"
+#include "stack/btu.h"
 #include "btm_int.h"
-#include "btm_ble_api.h"
-#include "smp_api.h"
+#include "stack/btm_ble_api.h"
+#include "stack/smp_api.h"
 #include "l2c_int.h"
-#include "gap_api.h"
+#include "stack/gap_api.h"
 //#include "bt_utils.h"
-#include "controller.h"
+#include "device/controller.h"
 
 //#define LOG_TAG "bt_btm_ble"
 //#include "osi/include/log.h"
@@ -1223,7 +1223,7 @@ void btm_sec_save_le_key(BD_ADDR bd_addr, tBTM_LE_KEY_TYPE key_type, tBTM_LE_KEY
             p_rec->ble.keys.key_size = p_keys->lenc_key.key_size;
             p_rec->ble.key_type |= BTM_LE_KEY_LENC;
 
-            /* Set that link key is known since this shares field with BTM_SEC_FLAG_LKEY_KNOWN flag in btm_api.h*/
+            /* Set that link key is known since this shares field with BTM_SEC_FLAG_LKEY_KNOWN flag in stack/btm_api.h*/
             p_rec->sec_flags |=  BTM_SEC_LE_LINK_KEY_KNOWN;
             if ( p_keys->pcsrk_key.sec_level == SMP_SEC_AUTHENTICATED) {
                 p_rec->sec_flags |= BTM_SEC_LE_LINK_KEY_AUTHED;
index 9704c2ec4afe6e170362b1b0ca1459312939d422..d62717fae003ed5eabd4b897e0f5803731ac34f8 100644 (file)
 
 #include <string.h>
 
-#include "bt_types.h"
-#include "hcimsgs.h"
-#include "btu.h"
+#include "stack/bt_types.h"
+#include "stack/hcimsgs.h"
+#include "stack/btu.h"
 #include "btm_int.h"
-#include "gap_api.h"
-#include "controller.h"
+#include "stack/gap_api.h"
+#include "device/controller.h"
 
 #if (defined BLE_INCLUDED && BLE_INCLUDED == TRUE)
 #include "btm_ble_int.h"
-#include "smp_api.h"
+#include "stack/smp_api.h"
 
 
 /*******************************************************************************
index 3453b15dcef286ff567c2ae0858f930293b9c6c2..ae55635b5d9a58f34a610c679ab8a4847395cc8b 100644 (file)
 //#define LOG_TAG "bt_btm_ble"
 
 #include <string.h>
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if (BLE_INCLUDED == TRUE)
-#include "bt_types.h"
-#include "hcimsgs.h"
-#include "btu.h"
+#include "stack/bt_types.h"
+#include "stack/hcimsgs.h"
+#include "stack/btu.h"
 #include "btm_int.h"
-#include "allocator.h"
-#include "hcidefs.h"
-#include "btm_ble_api.h"
-#include "controller.h"
+#include "osi/allocator.h"
+#include "stack/hcidefs.h"
+#include "stack/btm_ble_api.h"
+#include "device/controller.h"
 
 #define BTM_BLE_ADV_FILT_META_HDR_LENGTH 3
 #define BTM_BLE_ADV_FILT_FEAT_SELN_LEN  13
index a758510504f3da597c12184470df01db1784052c..18183f0a292558e8e912141d8f80c4a713488cfe 100644 (file)
 #include <string.h>
 //#include <stdio.h>
 #include <stddef.h>
-#include "bt_target.h"
+#include "common/bt_target.h"
 
-#include "btm_ble_api.h"
-#include "bt_types.h"
+#include "stack/btm_ble_api.h"
+#include "stack/bt_types.h"
 //#include "bt_utils.h"
-#include "btu.h"
+#include "stack/btu.h"
 #include "btm_int.h"
-#include "controller.h"
-#include "hcimsgs.h"
+#include "device/controller.h"
+#include "stack/hcimsgs.h"
 
 #if (BLE_INCLUDED == TRUE)
 
index 828d5dd4393ad7418f2c8b7dd575bd603559b036..a39eb5afac9684d6ff32196f323b7d3a6b78c359 100644 (file)
  ******************************************************************************/
 
 #include <string.h>
-#include "bt_trace.h"
-#include "controller.h"
-#include "allocator.h"
-#include "hash_map.h"
-#include "bt_types.h"
-#include "btu.h"
+#include "common/bt_trace.h"
+#include "device/controller.h"
+#include "osi/allocator.h"
+#include "osi/hash_map.h"
+#include "stack/bt_types.h"
+#include "stack/btu.h"
 #include "btm_int.h"
 #include "l2c_int.h"
-#include "hcimsgs.h"
+#include "stack/hcimsgs.h"
 //#include "bt_utils.h"
 
 #ifndef BTM_BLE_SCAN_PARAM_TOUT
index 71251007493a3bf89231c2eb156bfa706e7102ac..f4eb3deb136ad7c3d9b480400d5cbc6e00185ff3 100644 (file)
  ******************************************************************************/
 
 #include <string.h>
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if (BLE_INCLUDED == TRUE)
-#include "bt_types.h"
-#include "hcimsgs.h"
-#include "btu.h"
+#include "stack/bt_types.h"
+#include "stack/hcimsgs.h"
+#include "stack/btu.h"
 #include "btm_int.h"
 //#include "bt_utils.h"
-#include "hcidefs.h"
-#include "btm_ble_api.h"
+#include "stack/hcidefs.h"
+#include "stack/btm_ble_api.h"
 
 tBTM_BLE_ENERGY_INFO_CB ble_energy_info_cb;
 
index 925ed0283c3e0cfe49b1ac3fcac178855dbf9bd3..090b3d53bd7cba6b4735a2f35145753fc4ff910c 100644 (file)
 //#include <stdio.h>
 #include <stddef.h>
 
-#include "bt_types.h"
+#include "stack/bt_types.h"
 //#include "bt_utils.h"
 #include "btm_int.h"
-#include "btm_ble_api.h"
-#include "btu.h"
-#include "controller.h"
-#include "hcimsgs.h"
-#include "gap_api.h"
+#include "stack/btm_ble_api.h"
+#include "stack/btu.h"
+#include "device/controller.h"
+#include "stack/hcimsgs.h"
+#include "stack/gap_api.h"
 
 #if BLE_INCLUDED == TRUE
 #include "l2c_int.h"
 
-#include "gattdefs.h"
+#include "stack/gattdefs.h"
 #include "gatt_int.h"
 
 #include "btm_ble_int.h"
index 4d9e7841eedc902f2ffc6adf297c68576cc2514f..dba7d56b2eeedc1c1f2fa70259680e80637babae 100644 (file)
 
 #include <string.h>
 
-#include "bt_target.h"
-#include "controller.h"
+#include "common/bt_target.h"
+#include "device/controller.h"
 
 #if (BLE_INCLUDED == TRUE)
-#include "bt_types.h"
-#include "hcimsgs.h"
-#include "btu.h"
+#include "stack/bt_types.h"
+#include "stack/hcimsgs.h"
+#include "stack/btu.h"
 #include "btm_int.h"
 //#include "bt_utils.h"
-#include "hcidefs.h"
-#include "btm_ble_api.h"
+#include "stack/hcidefs.h"
+#include "stack/btm_ble_api.h"
 
 /************************************************************************************
 **  Constants & Macros
index 43a812d2adfb0553924f4c5f1b713d1082055779..38afb74be009a4abf8c5035b2faf1a062c3053df 100644 (file)
  *
  ******************************************************************************/
 #include <string.h>
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if (BLE_INCLUDED == TRUE && BLE_PRIVACY_SPT == TRUE)
-#include "bt_types.h"
-#include "hcimsgs.h"
-#include "btu.h"
+#include "stack/bt_types.h"
+#include "stack/hcimsgs.h"
+#include "stack/btu.h"
 //#include "vendor_hcidefs.h"
 #include "btm_int.h"
-#include "controller.h"
-#include "hcidefs.h"
+#include "device/controller.h"
+#include "stack/hcidefs.h"
 
 #define HCI_VENDOR_BLE_RPA_VSC          (0x0155 | HCI_GRP_VENDOR_SPECIFIC)
 
index 2985b46ff94f0768cffd173ea2f0cf3a7d73452e..c7427863ea71baf4cbef4f04c762bd2be30d0b28 100644 (file)
 //#include <stdio.h>
 #include <stddef.h>
 
-#include "bt_types.h"
-#include "controller.h"
-#include "hcimsgs.h"
-#include "btu.h"
-#include "btm_api.h"
+#include "stack/bt_types.h"
+#include "device/controller.h"
+#include "stack/hcimsgs.h"
+#include "stack/btu.h"
+#include "stack/btm_api.h"
 #include "btm_int.h"
-#include "hcidefs.h"
-#include "l2c_api.h"
+#include "stack/hcidefs.h"
+#include "stack/l2c_api.h"
 
 static tBTM_SEC_DEV_REC *btm_find_oldest_dev (void);
 
index 94e143bfec26581c3ad8777112513f78b66443f8..085cda925410d655d45261b97ceb8247f083d857 100644 (file)
 #include <string.h>
 //#include <stdio.h>
 #include <stddef.h>
-#include "bt_trace.h"
-#include "bt_types.h"
+#include "common/bt_trace.h"
+#include "stack/bt_types.h"
 //#include "bt_utils.h"
 #include "btm_int.h"
-#include "btu.h"
-#include "controller.h"
-#include "hci_layer.h"
-#include "hcimsgs.h"
+#include "stack/btu.h"
+#include "device/controller.h"
+#include "hci/hci_layer.h"
+#include "stack/hcimsgs.h"
 #include "l2c_int.h"
 //#include "btcore/include/module.h"
-//#include "osi/include/thread.h"
+//#include "osi/include/osi/thread.h"
 
 #if BLE_INCLUDED == TRUE
 #include "gatt_int.h"
@@ -804,7 +804,7 @@ tBTM_STATUS BTM_WritePageTimeout(UINT16 timeout)
 ** Function         BTM_WriteVoiceSettings
 **
 ** Description      Send HCI Write Voice Settings command.
-**                  See hcidefs.h for settings bitmask values.
+**                  See stack/hcidefs.h for settings bitmask values.
 **
 ** Returns
 **      BTM_SUCCESS         Command sent.
index 010d1d93c507037104920e7dfa85da56c35eb7e3..968c416f307037a88918b028c6f590e60506559a 100644 (file)
 #include <stdio.h>
 #include <stddef.h>
 
-#include "alarm.h"
-#include "bt_types.h"
-#include "controller.h"
-#include "hcimsgs.h"
-#include "btu.h"
-#include "btm_api.h"
+#include "osi/alarm.h"
+#include "stack/bt_types.h"
+#include "device/controller.h"
+#include "stack/hcimsgs.h"
+#include "stack/btu.h"
+#include "stack/btm_api.h"
 #include "btm_int.h"
-#include "hcidefs.h"
+#include "stack/hcidefs.h"
 #if (defined(SDP_INCLUDED) && SDP_INCLUDED == TRUE)
-#include "sdpdefs.h"
+#include "stack/sdpdefs.h"
 #endif
 
 #define BTM_INQ_REPLY_TIMEOUT   3       /* 3 second timeout waiting for responses */
index 043e7fd01d97deb5887068c4bde2b9d4e37d9765..d1ba6acba6bbb9d5c86040b8a92343f672d2950a 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_types.h"
-#include "bt_target.h"
+#include "stack/bt_types.h"
+#include "common/bt_target.h"
 #include <string.h>
 #include "btm_int.h"
-#include "allocator.h"
+#include "osi/allocator.h"
 
 /* Global BTM control block structure
 */
index 56157fcd833b9ecc486022a53a4f5a0aa2ccb29c..758be72b8e329439aad38a13a99de80877ddbc3e 100644 (file)
 //#include <stdio.h>
 #include <stddef.h>
 
-#include "bt_types.h"
-#include "hcimsgs.h"
-#include "btu.h"
-#include "btm_api.h"
+#include "stack/bt_types.h"
+#include "stack/hcimsgs.h"
+#include "stack/btu.h"
+#include "stack/btm_api.h"
 #include "btm_int.h"
 #include "l2c_int.h"
-#include "hcidefs.h"
+#include "stack/hcidefs.h"
 //#include "bt_utils.h"
 //#include "osi/include/log.h"
 
index 04a510f78714b17c089f07ebb1e5c92a6de5d8b1..d9b257d171265e530ce165b8bc82fef46094aa9e 100644 (file)
  ******************************************************************************/
 
 #include <string.h>
-#include "bt_types.h"
-#include "bt_target.h"
-#include "bt_types.h"
-#include "hcimsgs.h"
-#include "btu.h"
-#include "btm_api.h"
+#include "stack/bt_types.h"
+#include "common/bt_target.h"
+#include "stack/bt_types.h"
+#include "stack/hcimsgs.h"
+#include "stack/btu.h"
+#include "stack/btm_api.h"
 #include "btm_int.h"
-#include "hcidefs.h"
+#include "stack/hcidefs.h"
 //#include "bt_utils.h"
 
 #if BTM_SCO_INCLUDED == TRUE
index 9a02c526d7c1fdaed91c92d6bf60ceb827ffa742..00923e9f8083ccf2c8d1d4ec27b8be3f2d77e881 100644 (file)
 #include <stdarg.h>
 #include <string.h>
 
-#include "bt_types.h"
-#include "controller.h"
-#include "hcimsgs.h"
-#include "btu.h"
+#include "stack/bt_types.h"
+#include "device/controller.h"
+#include "stack/hcimsgs.h"
+#include "stack/btu.h"
 #include "btm_int.h"
 #include "l2c_int.h"
-#include "fixed_queue.h"
-#include "alarm.h"
+#include "osi/fixed_queue.h"
+#include "osi/alarm.h"
 
 #if (BT_USE_TRACES == TRUE && BT_TRACE_VERBOSE == FALSE)
 /* needed for sprintf() */
similarity index 99%
rename from components/bt/bluedroid/stack/include/btm_ble_int.h
rename to components/bt/bluedroid/stack/btm/include/btm_ble_int.h
index e1f8f400d3a6c0d1bb84f3c733d015a49f58a000..88e56e070b58d9895d7f28b5e78afcbb34911857 100644 (file)
 #ifndef BTM_BLE_INT_H
 #define BTM_BLE_INT_H
 
-#include "bt_target.h"
-#include "fixed_queue.h"
-#include "hcidefs.h"
-#include "btm_ble_api.h"
+#include "common/bt_target.h"
+#include "osi/fixed_queue.h"
+#include "stack/hcidefs.h"
+#include "stack/btm_ble_api.h"
 #include "btm_int.h"
 
 #if BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE
-#include "smp_api.h"
+#include "stack/smp_api.h"
 #endif
 
 
similarity index 99%
rename from components/bt/bluedroid/stack/include/btm_int.h
rename to components/bt/bluedroid/stack/btm/include/btm_int.h
index c45e88f063510ff173b2c11d1a8d5120ff59df88..5922a5814556caf67a64c9f8c194d0fe53dac3cd 100644 (file)
 #ifndef BTM_INT_H
 #define BTM_INT_H
 
-#include "bt_defs.h"
-#include "bt_target.h"
-#include "hcidefs.h"
+#include "common/bt_defs.h"
+#include "common/bt_target.h"
+#include "stack/hcidefs.h"
 
-#include "rfcdefs.h"
+#include "stack/rfcdefs.h"
 
-#include "btm_api.h"
+#include "stack/btm_api.h"
 
 #if (BLE_INCLUDED == TRUE)
 #include "btm_ble_int.h"
 #if (SMP_INCLUDED == TRUE)
-#include "smp_api.h"
+#include "stack/smp_api.h"
 #endif
 #endif
 
index 933f517b4a2f70568dea714a4ac27e91e5e13e99..788cd41336939805e49fce9409edd6c4e40fddb0 100644 (file)
 //#include <stdlib.h>
 #include <string.h>
 
-#include "bt_types.h"
-#include "hcimsgs.h"
-#include "btu.h"
+#include "stack/bt_types.h"
+#include "stack/hcimsgs.h"
+#include "stack/btu.h"
 #include "l2c_int.h"
-#include "btm_api.h"
+#include "stack/btm_api.h"
 #include "btm_int.h"
 //#include "bt_utils.h"
-#include "controller.h"
-#include "osi.h"
-#include "hci_layer.h"
-#include "bt_trace.h"
+#include "device/controller.h"
+#include "osi/osi.h"
+#include "hci/hci_layer.h"
+#include "common/bt_trace.h"
 
-#include "thread.h"
+#include "osi/thread.h"
 
 // TODO(zachoverflow): remove this horrible hack
-#include "btu.h"
+#include "stack/btu.h"
 
 extern void btm_process_cancel_complete(UINT8 status, UINT8 mode);
 extern void btm_ble_test_command_complete(UINT8 *p);
index 586ffc4b15f698b19f42c1d334c4a3eb281c7fec..bf04bd14ddf517be6b35502d584fe716b4a06b05 100644 (file)
  ******************************************************************************/
 #include <string.h>
 
-#include "bt_defs.h"
-#include "bt_target.h"
-#include "bt_trace.h"
-#include "controller.h"
-#include "alarm.h"
-#include "hash_map.h"
-#include "hash_functions.h"
-#include "thread.h"
-#include "mutex.h"
+#include "common/bt_defs.h"
+#include "common/bt_target.h"
+#include "common/bt_trace.h"
+#include "device/controller.h"
+#include "osi/alarm.h"
+#include "osi/hash_map.h"
+#include "osi/hash_functions.h"
+#include "osi/thread.h"
+#include "osi/mutex.h"
 
 #include "l2c_int.h"
-#include "dyn_mem.h"
-#include "btu.h"
+#include "stack/dyn_mem.h"
+#include "stack/btu.h"
 #include "btm_int.h"
 
 #if SDP_INCLUDED == TRUE
@@ -37,7 +37,7 @@
 #endif
 
 #if (BLE_INCLUDED == TRUE)
-#include "gatt_api.h"
+#include "stack/gatt_api.h"
 #include "gatt_int.h"
 #if SMP_INCLUDED == TRUE
 #include "smp_int.h"
index 196aca4c93b8c732ebd80b2935efd655ad1d3144..af121c7050046c57ade6d217148e12088c72265f 100644 (file)
 #include <string.h>
 
 
-#include "alarm.h"
-#include "thread.h"
-#include "bt_target.h"
-#include "bt_trace.h"
-#include "bt_types.h"
-#include "allocator.h"
-#include "mutex.h"
-#include "btm_api.h"
+#include "osi/alarm.h"
+#include "osi/thread.h"
+#include "common/bt_target.h"
+#include "common/bt_trace.h"
+#include "stack/bt_types.h"
+#include "osi/allocator.h"
+#include "osi/mutex.h"
+#include "stack/btm_api.h"
 #include "btm_int.h"
-#include "btu.h"
-#include "hash_map.h"
-#include "hcimsgs.h"
+#include "stack/btu.h"
+#include "osi/hash_map.h"
+#include "stack/hcimsgs.h"
 #include "l2c_int.h"
-#include "osi.h"
+#include "osi/osi.h"
 #if (defined(SDP_INCLUDED) && SDP_INCLUDED == TRUE)
 #include "sdpint.h"
 #endif
 
 #if (defined(RFCOMM_INCLUDED) && RFCOMM_INCLUDED == TRUE)
-#include "port_api.h"
-#include "port_ext.h"
+#include "stack/port_api.h"
+#include "stack/port_ext.h"
 #endif
 
 #if (defined(GAP_INCLUDED) && GAP_INCLUDED == TRUE)
@@ -70,7 +70,7 @@ extern void avdt_rcv_sync_info (BT_HDR *p_buf);
 #endif
 
 #if (defined(BTA_INCLUDED) && BTA_INCLUDED == TRUE)
-#include "bta_sys.h"
+#include "bta/bta_sys.h"
 #endif
 
 #if (BLE_INCLUDED == TRUE)
index 32fa3b540760521344e77d8acb431f8c8034a145..305eadee0a8ad9c290fbe79bdef0b5b3fb7c8ecc 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 //#include "bt_utils.h"
 #include "gap_int.h"
 
index 76dfa13e6795e76dddabed15671460d24ee04fea..d6115fe419d97a9e0c07a93f257d198391f071a5 100644 (file)
  *  limitations under the License.
  *
  ******************************************************************************/
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if (defined BLE_INCLUDED && BLE_INCLUDED == TRUE && GATTS_INCLUDED == TRUE)
 
-#include "bt_defs.h"
-#include "allocator.h"
+#include "common/bt_defs.h"
+#include "osi/allocator.h"
 #include <string.h>
 #include "gap_int.h"
-#include "gap_api.h"
-#include "gattdefs.h"
-#include "gatt_api.h"
+#include "stack/gap_api.h"
+#include "stack/gattdefs.h"
+#include "stack/gatt_api.h"
 #include "gatt_int.h"
 #include "btm_int.h"
-#include "hcimsgs.h"
-#include "sdpdefs.h"
+#include "stack/hcimsgs.h"
+#include "stack/sdpdefs.h"
 
 #define GAP_CHAR_ICON_SIZE          2
 #define GAP_CHAR_DEV_NAME_SIZE      248
index eb5b20cef023dad61c93df11ceebc83a0150cb33..3ca81d082c97d23dad2cf39aebdaded2702c2924 100644 (file)
  ******************************************************************************/
 
 
-#include "bt_target.h"
-#include "bt_defs.h"
-#include "btu.h"
+#include "common/bt_target.h"
+#include "common/bt_defs.h"
+#include "stack/btu.h"
 #include "gap_int.h"
-#include "l2cdefs.h"
+#include "stack/l2cdefs.h"
 #include "l2c_int.h"
 #include <string.h>
-#include "mutex.h"
-#include "allocator.h"
+#include "osi/mutex.h"
+#include "osi/allocator.h"
 
 #if GAP_CONN_INCLUDED == TRUE
 #include "btm_int.h"
index 6e242122dbce16abb4b29a6647a287fc930a3c64..0e2952f0e0eeac80592c8b42f346da22eb685632 100644 (file)
@@ -17,7 +17,7 @@
  ******************************************************************************/
 
 #include <string.h>
-#include "bt_target.h"
+#include "common/bt_target.h"
 //#include "bt_utils.h"
 #include "gap_int.h"
 
index e9317a04b4b9b43c13c1e01437ff3d288d3be0e1..a328986f2e35d4dcc1e4441326c2115ca8cfdac1 100644 (file)
 #ifndef GAP_INT_H
 #define GAP_INT_H
 
-#include "bt_target.h"
-#include "fixed_queue.h"
-#include "gap_api.h"
-#include "gatt_api.h"
+#include "common/bt_target.h"
+#include "osi/fixed_queue.h"
+#include "stack/gap_api.h"
+#include "stack/gatt_api.h"
 #define GAP_MAX_BLOCKS 2        /* Concurrent GAP commands pending at a time*/
 /* Define the Generic Access Profile control structure */
 typedef struct {
index efc853a746fca160bf596aba55a830bfaa92dd3a..3adecfaef6e706d6304fe562a29a8f82423511a7 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
-#include "allocator.h"
+#include "common/bt_target.h"
+#include "osi/allocator.h"
 
 #if BLE_INCLUDED == TRUE
 
 #include "gatt_int.h"
-#include "l2c_api.h"
+#include "stack/l2c_api.h"
 
 #define GATT_HDR_FIND_TYPE_VALUE_LEN    21
 #define GATT_OP_CODE_SIZE   1
index 1267c0b76aeacf5315a6bb83807ec7fb421d31b2..10f66db4b6bd131e8354d81aaf117fad41ec1fbe 100644 (file)
  *  this file contains GATT interface functions
  *
  ******************************************************************************/
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 
 #if defined(BTA_GATT_INCLUDED) && (BTA_GATT_INCLUDED == TRUE)
 
-#include "allocator.h"
+#include "osi/allocator.h"
 #include <string.h>
-#include "gatt_api.h"
+#include "stack/gatt_api.h"
 #include "gatt_int.h"
-#include "l2c_api.h"
+#include "stack/l2c_api.h"
 #include "btm_int.h"
-#include "sdpdefs.h"
-#include "sdp_api.h"
+#include "stack/sdpdefs.h"
+#include "stack/sdp_api.h"
 
 /*******************************************************************************
 **
index eb1cb8b900bd2fe7db107022df9f033c2f9ae4f3..90505ad031e8dda254f8bda89d6109c2daedb1cb 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 //#include "bt_utils.h"
 
-#include "gatt_api.h"
+#include "stack/gatt_api.h"
 #include "gatt_int.h"
-#include "sdpdefs.h"
+#include "stack/sdpdefs.h"
 
 #if (BLE_INCLUDED == TRUE && GATTS_INCLUDED == TRUE)
 
index cee16dd7f9d5d84a618f852866dd94c04fe8853b..e233ea0cad509926ff818478ec65c096e0f3f270 100644 (file)
  *  this file contains GATT authentication handling functions
  *
  ******************************************************************************/
-#include "bt_target.h"
-#include "allocator.h"
+#include "common/bt_target.h"
+#include "osi/allocator.h"
 
 #if BLE_INCLUDED == TRUE
 #include <string.h>
 
 #include "gatt_int.h"
-#include "gatt_api.h"
+#include "stack/gatt_api.h"
 #include "btm_int.h"
 
 /*******************************************************************************
index 47576a07a94d2645581bc18a6aa9e54da55165c6..ba0202007119a04066d6b524fe38402433cdfec9 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if BLE_INCLUDED == TRUE && GATTC_INCLUDED == TRUE
 
 #include <string.h>
-#include "allocator.h"
+#include "osi/allocator.h"
 #include "gatt_int.h"
 #include "l2c_int.h"
 
index ec552d7bfe2dc42373161cb414fc1e220732307c..0a3a104a4b8cc0480a179e1bf79e18b9c1941d83 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if BLE_INCLUDED == TRUE && GATTS_INCLUDED == TRUE
 
-#include "bt_trace.h"
-#include "allocator.h"
+#include "common/bt_trace.h"
+#include "osi/allocator.h"
 
 //#include <stdio.h>
 #include <string.h>
 #include "gatt_int.h"
-#include "l2c_api.h"
+#include "stack/l2c_api.h"
 #include "btm_int.h"
 
 /********************************************************************************
index b7486a9ec7af09bf1398aa346e17cada022383ce..82059afd31d3d094456df58e4f1823d8eca2b04e 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if BLE_INCLUDED == TRUE
 
 #include "gatt_int.h"
-#include "l2c_api.h"
+#include "stack/l2c_api.h"
 #include "btm_int.h"
 #include "btm_ble_int.h"
-#include "allocator.h"
+#include "osi/allocator.h"
 
 /* Configuration flags. */
 #define GATT_L2C_CFG_IND_DONE   (1<<0)
index 63771083b7a38865647b65fa05f59e3ed95be5b4..b0036320b5b9a188bee69c8fa8489c0878646dea 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
-#include "allocator.h"
+#include "common/bt_target.h"
+#include "osi/allocator.h"
 
 #if BLE_INCLUDED == TRUE && GATTS_INCLUDED == TRUE
 #include <string.h>
 #include "gatt_int.h"
-#include "l2c_api.h"
+#include "stack/l2c_api.h"
 #include "l2c_int.h"
 #define GATT_MTU_REQ_MIN_LEN        2
 
index 3030fa410a6a86190c8ba5b37ad2a69936810598..95efcf6763eda974943a5a4f073dbb6b54047486 100644 (file)
  *  this file contains GATT utility functions
  *
  ******************************************************************************/
-#include "bt_target.h"
-#include "allocator.h"
+#include "common/bt_target.h"
+#include "osi/allocator.h"
 
 #if BLE_INCLUDED == TRUE
 #include <string.h>
 #include <stdio.h>
 
-#include "l2cdefs.h"
+#include "stack/l2cdefs.h"
 #include "gatt_int.h"
-#include "gatt_api.h"
-#include "gattdefs.h"
-#include "sdp_api.h"
+#include "stack/gatt_api.h"
+#include "stack/gattdefs.h"
+#include "stack/sdp_api.h"
 #include "btm_int.h"
 /* check if [x, y] and [a, b] have overlapping range */
 #define GATT_VALIDATE_HANDLE_RANGE(x, y, a, b)   (y >= a && x <= b)
index 6aaa42aa0a2de9b555f05b5630454ce3af3f6b54..ffbf8540fdae7cadefd58fb955cd0e1f70fc2dc9 100644 (file)
 #ifndef  GATT_INT_H
 #define  GATT_INT_H
 
-#include "bt_target.h"
-#include "bt_trace.h"
-#include "gatt_api.h"
-#include "btm_ble_api.h"
-#include "btu.h"
-#include "fixed_queue.h"
+#include "common/bt_target.h"
+#include "common/bt_trace.h"
+#include "stack/gatt_api.h"
+#include "stack/btm_ble_api.h"
+#include "stack/btu.h"
+#include "osi/fixed_queue.h"
 
 #include <string.h>
 
index 6cb692a7d09576fae91dcf9a8b291fd627bdbeee..634cb0452188a2d8988182f376e783a851547ac1 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
-#include "allocator.h"
-#include "hcidefs.h"
-#include "hcimsgs.h"
-#include "hcidefs.h"
-#include "btu.h"
+#include "common/bt_target.h"
+#include "osi/allocator.h"
+#include "stack/hcidefs.h"
+#include "stack/hcimsgs.h"
+#include "stack/hcidefs.h"
+#include "stack/btu.h"
 
 #include <stddef.h>
 #include <string.h>
index 1f0aa7235ae3b6b49892ffc1f306b2a0eceaa204..5c5f1f4a12a374c491e30bf1e93fa579bd3fbf59 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
-#include "allocator.h"
-#include "hcidefs.h"
-#include "hcimsgs.h"
-#include "hcidefs.h"
-#include "btu.h"
+#include "common/bt_target.h"
+#include "osi/allocator.h"
+#include "stack/hcidefs.h"
+#include "stack/hcimsgs.h"
+#include "stack/hcidefs.h"
+#include "stack/btu.h"
 
 #include <stddef.h>
 #include <string.h>
similarity index 99%
rename from components/bt/bluedroid/stack/include/a2d_api.h
rename to components/bt/bluedroid/stack/include/stack/a2d_api.h
index eaf6b37f140fdef5a89ae793cfa410d2ae4d16b8..7509544fb5ab5a6aba6be1976ccc0193e958a96e 100644 (file)
@@ -23,7 +23,7 @@
  ******************************************************************************/
 #ifndef A2D_API_H
 #define A2D_API_H
-#include "sdp_api.h"
+#include "stack/sdp_api.h"
 #if (A2D_INCLUDED == TRUE)
 /*****************************************************************************
 **  constants
similarity index 99%
rename from components/bt/bluedroid/stack/include/avct_api.h
rename to components/bt/bluedroid/stack/include/stack/avct_api.h
index c2713fdb47e3d7ea6c668a7dedf5c778d8130419..3d59df66e5478178be6614f7e5a785229bdcfc69 100644 (file)
@@ -25,8 +25,8 @@
 #ifndef AVCT_API_H
 #define AVCT_API_H
 
-#include "bt_types.h"
-#include "bt_target.h"
+#include "stack/bt_types.h"
+#include "common/bt_target.h"
 
 /*****************************************************************************
 **  Constants
similarity index 99%
rename from components/bt/bluedroid/stack/include/avdt_api.h
rename to components/bt/bluedroid/stack/include/stack/avdt_api.h
index a1e856b6fd685c68d6c247637ee5b01e0eb50a56..26919697b4a3a0cd2a62614ce05992153d0df885 100644 (file)
@@ -25,8 +25,8 @@
 #ifndef AVDT_API_H
 #define AVDT_API_H
 
-#include "bt_types.h"
-#include "bt_target.h"
+#include "stack/bt_types.h"
+#include "common/bt_target.h"
 
 /*****************************************************************************
 **  Constants
similarity index 99%
rename from components/bt/bluedroid/stack/include/avdtc_api.h
rename to components/bt/bluedroid/stack/include/stack/avdtc_api.h
index 96b20e77bf9079c0df58884cc737c97078a66657..083b0b1c515ed5403e8994f925f80fd1f1592271 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef AVDT_CAPI_H
 #define AVDT_CAPI_H
 
-#include "avdt_api.h"
+#include "stack/avdt_api.h"
 
 /* start AVDTC events here to distinguish from AVDT events */
 #define AVDTC_EVT_BEGIN             0x80
similarity index 99%
rename from components/bt/bluedroid/stack/include/avrc_api.h
rename to components/bt/bluedroid/stack/include/stack/avrc_api.h
index 2634c97fb726cea3b6d4c6b990cf06cbced2060d..c0c0a5ff3f0f660106bd198b8d202e5a6d4473cb 100644 (file)
  ******************************************************************************/
 #ifndef AVRC_API_H
 #define AVRC_API_H
-#include "bt_target.h"
-#include "avct_api.h"
-#include "sdp_api.h"
-#include "avrc_defs.h"
+#include "common/bt_target.h"
+#include "stack/avct_api.h"
+#include "stack/sdp_api.h"
+#include "stack/avrc_defs.h"
 #if (AVRC_INCLUDED == TRUE)
 /*****************************************************************************
 **  constants
similarity index 99%
rename from components/bt/bluedroid/stack/include/avrc_defs.h
rename to components/bt/bluedroid/stack/include/stack/avrc_defs.h
index 8a6254ef858d82219f39dc5b5e25fb17a1a1d688..1933d8a96c90f43e8f7ba800eab40f11022cd070 100644 (file)
@@ -23,7 +23,7 @@
  ******************************************************************************/
 #ifndef _AVRC_DEFS_H
 #define _AVRC_DEFS_H
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if (AVRC_INCLUDED == TRUE)
 /*****************************************************************************
@@ -848,7 +848,7 @@ typedef union {
 
 #define AVRC_IS_VALID_GROUP(a)    ((a <= AVRC_PDU_PREV_GROUP) ? TRUE : FALSE)
 
-/* Company ID is 24-bit integer We can not use the macros in bt_types.h */
+/* Company ID is 24-bit integer We can not use the macros in stack/bt_types.h */
 #define AVRC_CO_ID_TO_BE_STREAM(p, u32) {*(p)++ = (UINT8)((u32) >> 16); *(p)++ = (UINT8)((u32) >> 8); *(p)++ = (UINT8)(u32); }
 #define AVRC_BE_STREAM_TO_CO_ID(u32, p) {u32 = (((UINT32)(*((p) + 2))) + (((UINT32)(*((p) + 1))) << 8) + (((UINT32)(*(p))) << 16)); (p) += 3;}
 
similarity index 99%
rename from components/bt/bluedroid/stack/include/btm_api.h
rename to components/bt/bluedroid/stack/include/stack/btm_api.h
index 113040b2fb668bd0bf2561d83fd85ef5b398ac7b..294cf84cee71c0bcaba73ef4e12a9876de07bbfe 100644 (file)
 #ifndef BTM_API_H
 #define BTM_API_H
 
-#include "bt_defs.h"
-#include "bt_target.h"
-#include "hcidefs.h"
+#include "common/bt_defs.h"
+#include "common/bt_target.h"
+#include "stack/hcidefs.h"
 
 #if SDP_INCLUDED == TRUE
-#include "sdp_api.h"
+#include "stack/sdp_api.h"
 #endif
 
 #if SMP_INCLUDED == TRUE
-#include "smp_api.h"
+#include "stack/smp_api.h"
 #endif
 /*****************************************************************************
 **  DEVICE CONTROL and COMMON
@@ -2137,7 +2137,7 @@ tBTM_STATUS BTM_WritePageTimeout(UINT16 timeout);
 ** Function         BTM_WriteVoiceSettings
 **
 ** Description      Send HCI Write Voice Settings command.
-**                  See hcidefs.h for settings bitmask values.
+**                  See stack/hcidefs.h for settings bitmask values.
 **
 ** Returns
 **      BTM_SUCCESS         Command sent.
similarity index 99%
rename from components/bt/bluedroid/stack/include/btm_ble_api.h
rename to components/bt/bluedroid/stack/include/stack/btm_ble_api.h
index 2e47da16323f26428a508846cffc9d6930033aa9..796f8bbe207b89e5e6b923e832fdc451796d862b 100644 (file)
@@ -25,9 +25,9 @@
 #ifndef BTM_BLE_API_H
 #define BTM_BLE_API_H
 
-#include "bt_defs.h"
-#include "btm_api.h"
-#include "bt_common_types.h"
+#include "common/bt_defs.h"
+#include "stack/btm_api.h"
+#include "common/bt_common_types.h"
 
 #define CHANNEL_MAP_LEN    5
 typedef UINT8 tBTM_BLE_CHNL_MAP[CHANNEL_MAP_LEN];
similarity index 99%
rename from components/bt/bluedroid/stack/include/btu.h
rename to components/bt/bluedroid/stack/include/stack/btu.h
index c59fb7f56d5672e0ddfa588299b2cfbf226ca5a4..449b18da7e10555ca464fa03a07a75536635f567 100644 (file)
@@ -27,8 +27,8 @@
 #ifndef BTU_H
 #define BTU_H
 
-#include "bt_target.h"
-#include "bt_defs.h"
+#include "common/bt_target.h"
+#include "common/bt_defs.h"
 
 // HACK(zachoverflow): temporary dark magic
 #define BTU_POST_TO_TASK_NO_GOOD_HORRIBLE_HACK 0x1700 // didn't look used in bt_types...here goes nothing
similarity index 99%
rename from components/bt/bluedroid/stack/include/gap_api.h
rename to components/bt/bluedroid/stack/include/stack/gap_api.h
index 1f22db008dacd263501a837c334fdb2fbf4c88ef..031247f7c0dbf0e45597869bc44e73b4f501bba0 100644 (file)
 #ifndef GAP_API_H
 #define GAP_API_H
 
-#include "sdpdefs.h"
-#include "profiles_api.h"
-#include "btm_api.h"
-#include "l2c_api.h"
+#include "stack/sdpdefs.h"
+#include "stack/profiles_api.h"
+#include "stack/btm_api.h"
+#include "stack/l2c_api.h"
 
 /*****************************************************************************
 **  Constants
similarity index 99%
rename from components/bt/bluedroid/stack/include/gatt_api.h
rename to components/bt/bluedroid/stack/include/stack/gatt_api.h
index 7307f53c82651266452d205d612fd1bc8e6ce284..98cdcc7fa7e22daa4ea18ffa7b9155a6f0179db1 100644 (file)
@@ -18,9 +18,9 @@
 #ifndef GATT_API_H
 #define GATT_API_H
 
-#include "bt_target.h"
-#include "gattdefs.h"
-#include "btm_ble_api.h"
+#include "common/bt_target.h"
+#include "stack/gattdefs.h"
+#include "stack/btm_ble_api.h"
 
 /*****************************************************************************
 **  Constants
similarity index 99%
rename from components/bt/bluedroid/stack/include/hcidefs.h
rename to components/bt/bluedroid/stack/include/stack/hcidefs.h
index 44fff2e52131643e1c2a11fd6f7269eaad051d56..09320b1f1aa738be6ef3762ccad64e98f4c6d75e 100644 (file)
@@ -19,9 +19,9 @@
 #ifndef HCIDEFS_H
 #define HCIDEFS_H
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
-#include "bt_types.h"
+#include "stack/bt_types.h"
 
 #define HCI_PROTO_VERSION     0x01      /* Version for BT spec 1.1          */
 #define HCI_PROTO_VERSION_1_2 0x02      /* Version for BT spec 1.2          */
similarity index 99%
rename from components/bt/bluedroid/stack/include/hcimsgs.h
rename to components/bt/bluedroid/stack/include/stack/hcimsgs.h
index d360a9a121dd8d36f70a1679cbb7223c974254a1..c2067a2f8a5dd3dac983adc8a99d53a93b0272e5 100644 (file)
@@ -19,9 +19,9 @@
 #ifndef HCIMSGS_H
 #define HCIMSGS_H
 
-#include "bt_target.h"
-#include "hcidefs.h"
-#include "bt_types.h"
+#include "common/bt_target.h"
+#include "stack/hcidefs.h"
+#include "stack/bt_types.h"
 
 void bte_main_hci_send(BT_HDR *p_msg, UINT16 event);
 void bte_main_lpm_allow_bt_device_sleep(void);
similarity index 98%
rename from components/bt/bluedroid/stack/include/hiddefs.h
rename to components/bt/bluedroid/stack/include/stack/hiddefs.h
index 23777f3adf47f0aed4465d7d51c5d4338698a3f3..99d2c3c1cf92c3a317200f14a80d9f5b7f4cffcf 100644 (file)
 
 #ifndef HIDDEFS_H
 #define HIDDEFS_H
-#include "bt_target.h"
+#include "common/bt_target.h"
 #if (HID_HOST_INCLUDED == TRUE)
 
 #if (SDP_INCLUDED == TRUE)
-#include "sdp_api.h"
+#include "stack/sdp_api.h"
 #endif    ///SDP_INCLUDED == TRUE
 /*
 ** tHID_STATUS: HID result codes, returned by HID and device and host functions.
similarity index 99%
rename from components/bt/bluedroid/stack/include/hidh_api.h
rename to components/bt/bluedroid/stack/include/stack/hidh_api.h
index 29344df905cb04dc991f70ea7a6949bf99c08f1c..3211138cd400c8ba088c5cd908695a241da45a35 100644 (file)
@@ -18,8 +18,8 @@
 #ifndef HIDH_API_H
 #define HIDH_API_H
 
-#include "hiddefs.h"
-#include "sdp_api.h"
+#include "stack/hiddefs.h"
+#include "stack/sdp_api.h"
 
 #if (HID_HOST_INCLUDED == TRUE)
 /*****************************************************************************
similarity index 99%
rename from components/bt/bluedroid/stack/include/l2c_api.h
rename to components/bt/bluedroid/stack/include/stack/l2c_api.h
index 71e1f4816813cdb22d11d1cd500ff175a70ad7b4..641412f89d16320619cc6b72689b315b7ea6f995 100644 (file)
@@ -26,9 +26,9 @@
 
 #include <stdbool.h>
 
-#include "bt_target.h"
-#include "l2cdefs.h"
-#include "hcidefs.h"
+#include "common/bt_target.h"
+#include "stack/l2cdefs.h"
+#include "stack/hcidefs.h"
 
 /*****************************************************************************
 **  Constants
similarity index 99%
rename from components/bt/bluedroid/stack/include/port_api.h
rename to components/bt/bluedroid/stack/include/stack/port_api.h
index f37a56c9abaf3b6801d167671bb851a633985ffb..10b0378681796e87129da3c79389f6855e37320d 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef PORT_API_H
 #define PORT_API_H
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 /*****************************************************************************
 **  Constants and Types
similarity index 98%
rename from components/bt/bluedroid/stack/include/profiles_api.h
rename to components/bt/bluedroid/stack/include/stack/profiles_api.h
index 23306ff5a45ca1b7cf785dd255c681317e5a74e2..a9ad7b1e2c03ab6d70b9975e75dc7d517dfb0eb8 100644 (file)
@@ -19,8 +19,8 @@
 #ifndef PROFILES_API_H
 #define PROFILES_API_H
 
-#include "bt_target.h"
-#include "btm_api.h"
+#include "common/bt_target.h"
+#include "stack/btm_api.h"
 
 /*****************************************************************************
 **  Constants
similarity index 99%
rename from components/bt/bluedroid/stack/include/sdp_api.h
rename to components/bt/bluedroid/stack/include/stack/sdp_api.h
index db11df55803fe49599059ef12d8e9586815cd67a..a64e5f2604c187f69c3c23a63fa1c7ef2da5bf4e 100644 (file)
@@ -18,8 +18,8 @@
 #ifndef SDP_API_H
 #define SDP_API_H
 
-#include "bt_target.h"
-#include "sdpdefs.h"
+#include "common/bt_target.h"
+#include "stack/sdpdefs.h"
 #if (SDP_INCLUDED == TRUE)
 /*****************************************************************************
 **  Constants
similarity index 99%
rename from components/bt/bluedroid/stack/include/smp_api.h
rename to components/bt/bluedroid/stack/include/stack/smp_api.h
index 8cf278be551de0a1b7154cab5e452fb84bf9b143..722850c3d43a01dd033a6fe0b5102d6d8c727dd8 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef SMP_API_H
 #define SMP_API_H
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #define SMP_PIN_CODE_LEN_MAX    PIN_CODE_LEN
 #define SMP_PIN_CODE_LEN_MIN    6
index 2728261f30c68eae42e3c869e4062595e8ca862f..3699e7f05bcf062a9c9924f83cfa1f4bc3c6bb20 100644 (file)
 
 #include <stdbool.h>
 
-#include "btm_api.h"
-#include "l2c_api.h"
-#include "l2cdefs.h"
-#include "list.h"
-#include "fixed_queue.h"
+#include "stack/btm_api.h"
+#include "stack/l2c_api.h"
+#include "stack/l2cdefs.h"
+#include "osi/list.h"
+#include "osi/fixed_queue.h"
 
 #define L2CAP_MIN_MTU   48      /* Minimum acceptable MTU is 48 bytes */
 
index 4c2173e14c5fefbce0c398c7ffb97602693c00ac..d31b62a6f86ea91a73d6aa4774a584faa3a30919 100644 (file)
 //#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include "bt_trace.h"
-#include "bt_types.h"
-#include "hcidefs.h"
-#include "hcimsgs.h"
-#include "l2cdefs.h"
+#include "common/bt_trace.h"
+#include "stack/bt_types.h"
+#include "stack/hcidefs.h"
+#include "stack/hcimsgs.h"
+#include "stack/l2cdefs.h"
 #include "l2c_int.h"
-#include "btu.h"
-#include "btm_api.h"
-#include "allocator.h"
+#include "stack/btu.h"
+#include "stack/btm_api.h"
+#include "osi/allocator.h"
 
 #if (CLASSIC_BT_INCLUDED == TRUE)
 /*******************************************************************************
index 67ecae85f77f6f9a033efd97d3eaa2e3c4f74f18..6c9a287ac58ddbe7396ee4e308786ba029cf29a0 100644 (file)
  ******************************************************************************/
 
 #include <string.h>
-#include "bt_target.h"
+#include "common/bt_target.h"
 //#include "bt_utils.h"
-#include "l2cdefs.h"
+#include "stack/l2cdefs.h"
 #include "l2c_int.h"
-#include "btu.h"
+#include "stack/btu.h"
 #include "btm_int.h"
-#include "hcimsgs.h"
-#include "controller.h"
+#include "stack/hcimsgs.h"
+#include "device/controller.h"
 
 #if (BLE_INCLUDED == TRUE)
 static BOOLEAN l2cble_start_conn_update (tL2C_LCB *p_lcb);
index 0c6b3a53e3b598f18292c7396e84b94c67be8143..267890d70ac7004099d9477cbdf382e320c57755 100644 (file)
 #include <string.h>
 #include <stdio.h>
 
-#include "bt_target.h"
-#include "hcidefs.h"
-#include "hcimsgs.h"
-#include "l2cdefs.h"
+#include "common/bt_target.h"
+#include "stack/hcidefs.h"
+#include "stack/hcimsgs.h"
+#include "stack/l2cdefs.h"
 #include "l2c_int.h"
 #include "btm_int.h"
-#include "btu.h"
-#include "hcimsgs.h"
-#include "allocator.h"
+#include "stack/btu.h"
+#include "stack/hcimsgs.h"
+#include "osi/allocator.h"
 
 #if (CLASSIC_BT_INCLUDED == TRUE)
 /********************************************************************************/
index 10f0c595427bdfc7a5cf6d99a27ec7e6b5233bfe..cacdcc6f50053ee67ae00b9c4e0b9a27e898e149 100644 (file)
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "bt_trace.h"
-#include "bt_types.h"
-#include "hcimsgs.h"
-#include "l2c_api.h"
+#include "common/bt_trace.h"
+#include "stack/bt_types.h"
+#include "stack/hcimsgs.h"
+#include "stack/l2c_api.h"
 #include "l2c_int.h"
-#include "l2cdefs.h"
-#include "btm_api.h"
+#include "stack/l2cdefs.h"
+#include "stack/btm_api.h"
 #include "btm_int.h"
-#include "btu.h"
-#include "allocator.h"
+#include "stack/btu.h"
+#include "osi/allocator.h"
 
 #if (CLASSIC_BT_INCLUDED == TRUE)
 
index e7dd2e7759c5c1fd21907fe2fdd93e2f3912e344..96fef0677facc039d30fc36d71c8ad355f7ace32 100644 (file)
 #include <string.h>
 //#include <stdio.h>
 
-#include "controller.h"
+#include "device/controller.h"
 //#include "btcore/include/counter.h"
-#include "bt_types.h"
+#include "stack/bt_types.h"
 //#include "bt_utils.h"
-#include "hcimsgs.h"
-#include "l2cdefs.h"
+#include "stack/hcimsgs.h"
+#include "stack/l2cdefs.h"
 #include "l2c_int.h"
-#include "l2c_api.h"
-#include "btu.h"
-#include "btm_api.h"
+#include "stack/l2c_api.h"
+#include "stack/btu.h"
+#include "stack/btm_api.h"
 #include "btm_int.h"
 
 static BOOLEAN l2c_link_send_to_lower (tL2C_LCB *p_lcb, BT_HDR *p_buf);
index d52bc12286f3556be5e7a749746243364ca0afa1..9990db077b9963ba0ff61801c57ef5cebce1254d 100644 (file)
 #include <string.h>
 //#include <stdio.h>
 
-#include "controller.h"
+#include "device/controller.h"
 //#include "btcore/include/counter.h"
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "btm_int.h"
-#include "btu.h"
-#include "hcimsgs.h"
-#include "l2c_api.h"
+#include "stack/btu.h"
+#include "stack/hcimsgs.h"
+#include "stack/l2c_api.h"
 #include "l2c_int.h"
-#include "l2cdefs.h"
+#include "stack/l2cdefs.h"
 //#include "osi/include/log.h"
 
 /********************************************************************************/
index a3c92e47ead3e4a20311f1d58f12a9e9e7380569..8618042c5bff80d1b5caf3f9ca600d7c241a5d34 100644 (file)
 #include <string.h>
 //#include <stdio.h>
 
-#include "bt_types.h"
-#include "hcidefs.h"
-#include "hcimsgs.h"
-#include "l2cdefs.h"
+#include "stack/bt_types.h"
+#include "stack/hcidefs.h"
+#include "stack/hcimsgs.h"
+#include "stack/l2cdefs.h"
 #include "l2c_int.h"
-#include "btu.h"
-#include "btm_api.h"
+#include "stack/btu.h"
+#include "stack/btm_api.h"
 #include "btm_int.h"
 
 #if (L2CAP_UCD_INCLUDED == TRUE)
index 816deffcc6e02b1304662fec81a612519661669a..9c9385250d1ea57f177700f80ed8667e27f047be 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#include "allocator.h"
-#include "controller.h"
-#include "bt_types.h"
-#include "hcimsgs.h"
-#include "l2cdefs.h"
+#include "osi/allocator.h"
+#include "device/controller.h"
+#include "stack/bt_types.h"
+#include "stack/hcimsgs.h"
+#include "stack/l2cdefs.h"
 #include "l2c_int.h"
-#include "hcidefs.h"
-#include "btu.h"
-#include "btm_api.h"
+#include "stack/hcidefs.h"
+#include "stack/btu.h"
+#include "stack/btm_api.h"
 #include "btm_int.h"
-#include "hcidefs.h"
-#include "allocator.h"
+#include "stack/hcidefs.h"
+#include "osi/allocator.h"
 
 /*******************************************************************************
 **
index d8bf8c39439e3f386a176794df0558a834d8e25f..002ed6b809ce9764800e88b348723ea1c5754854 100644 (file)
  ******************************************************************************/
 #if (defined(L2CAP_CLIENT_INCLUDED) && L2CAP_CLIENT_INCLUDED == TRUE)
 #include <string.h>
-#include "bt_trace.h"
-#include "bt_defs.h"
-#include "bdaddr.h"
-#include "allocator.h"
-#include "buffer.h"
-#include "list.h"
-#include "osi.h"
-#include "l2cap_client.h"
-#include "l2c_api.h"
+#include "common/bt_trace.h"
+#include "common/bt_defs.h"
+#include "device/bdaddr.h"
+#include "osi/allocator.h"
+#include "osi/buffer.h"
+#include "osi/list.h"
+#include "osi/osi.h"
+#include "stack/l2cap_client.h"
+#include "stack/l2c_api.h"
 
 struct l2cap_client_t {
     l2cap_client_callbacks_t callbacks;
index 7b1065c6c05f8b1b057db0862b0ec9d136316dd7..a2e0e152788be97b69490ee5aa4ae6d2507cc4ef 100644 (file)
 #ifndef PORT_INT_H
 #define PORT_INT_H
 
-#include "bt_target.h"
-#include "rfcdefs.h"
-#include "port_api.h"
-#include "fixed_queue.h"
-#include "bt_defs.h"
+#include "common/bt_target.h"
+#include "stack/rfcdefs.h"
+#include "stack/port_api.h"
+#include "osi/fixed_queue.h"
+#include "common/bt_defs.h"
 
 /* Local events passed when application event is sent from the api to PORT */
 /* ???*/
index 35a706ce21d087621bbd8204100ccfdbe87a39db..b5f8e088b554ea796867da3615fba334cb97c950 100644 (file)
@@ -25,7 +25,7 @@
 #ifndef RFC_INT_H
 #define RFC_INT_H
 
-#include "l2c_api.h"
+#include "stack/l2c_api.h"
 #include "port_int.h"
 
 /*
index db84fe59842850fc05909aea5a53036002f189ae..ea3f7b6efc3edee4dcd43be86b77cc1613b6df5b 100644 (file)
  ******************************************************************************/
 
 #include <string.h>
-#include "bt_target.h"
-#include "rfcdefs.h"
-#include "port_api.h"
+#include "common/bt_target.h"
+#include "stack/rfcdefs.h"
+#include "stack/port_api.h"
 #include "port_int.h"
 #include "btm_int.h"
-#include "btm_api.h"
+#include "stack/btm_api.h"
 #include "rfc_int.h"
-#include "l2c_api.h"
-#include "sdp_api.h"
-#include "allocator.h"
-#include "mutex.h"
+#include "stack/l2c_api.h"
+#include "stack/sdp_api.h"
+#include "osi/allocator.h"
+#include "osi/mutex.h"
 
 #if (defined RFCOMM_INCLUDED && RFCOMM_INCLUDED == TRUE)
 /* duration of break in 200ms units */
index 6e77e529dc21fbc55d81b8a15a726e2686473103..b227ea5cf9c1cbd1b4f13218f09e8ce8f932ec62 100644 (file)
  ******************************************************************************/
 #include <string.h>
 
-#include "bt_target.h"
-#include "rfcdefs.h"
-#include "port_api.h"
+#include "common/bt_target.h"
+#include "stack/rfcdefs.h"
+#include "stack/port_api.h"
 #include "btm_int.h"
-#include "btm_api.h"
+#include "stack/btm_api.h"
 #include "port_int.h"
 #include "rfc_int.h"
-#include "bt_defs.h"
-#include "mutex.h"
-#include "allocator.h"
+#include "common/bt_defs.h"
+#include "osi/mutex.h"
+#include "osi/allocator.h"
 #if (defined RFCOMM_INCLUDED && RFCOMM_INCLUDED == TRUE)
 /*
 ** Local function definitions
index a4f6c05ff3f5eaa825c30404a0d21c211f109ced..a88ae016f874cf8d474c8e4d3c6c1be2954b9921 100644 (file)
  ******************************************************************************/
 #include <string.h>
 
-#include "bt_target.h"
-#include "rfcdefs.h"
-#include "port_api.h"
+#include "common/bt_target.h"
+#include "stack/rfcdefs.h"
+#include "stack/port_api.h"
 #include "port_int.h"
 #include "rfc_int.h"
-#include "l2cdefs.h"
+#include "stack/l2cdefs.h"
 #include "btm_int.h"
-#include "btu.h"
-#include "mutex.h"
-#include "allocator.h"
+#include "stack/btu.h"
+#include "osi/mutex.h"
+#include "osi/allocator.h"
 #if (defined RFCOMM_INCLUDED && RFCOMM_INCLUDED == TRUE)
 
 static const tPORT_STATE default_port_pars = {
index 0a8cf4be05d75af26133540168ee7b18924793d6..2e843c2b78ebb7811ddbc95fec3f29a40a753815 100644 (file)
  ******************************************************************************/
 
 #include <stddef.h>
-#include "bt_target.h"
+#include "common/bt_target.h"
 
-#include "rfcdefs.h"
-#include "port_api.h"
+#include "stack/rfcdefs.h"
+#include "stack/port_api.h"
 #include "port_int.h"
-#include "l2c_api.h"
-#include "l2cdefs.h"
+#include "stack/l2c_api.h"
+#include "stack/l2cdefs.h"
 #include "rfc_int.h"
-#include "bt_defs.h"
-#include "allocator.h"
-#include "mutex.h"
-#include "alarm.h"
+#include "common/bt_defs.h"
+#include "osi/allocator.h"
+#include "osi/mutex.h"
+#include "osi/alarm.h"
 #if (defined RFCOMM_INCLUDED && RFCOMM_INCLUDED == TRUE)
 /*
 ** Define Callback functions to be called by L2CAP
index 2ade69e53f362d29ea3265fa7d15cdb5064be047..6d1bf3c93a60079b11bc0f93d7d163b77ae796e5 100644 (file)
  *
  ******************************************************************************/
 #include <string.h>
-#include "bt_types.h"
-#include "rfcdefs.h"
-#include "l2cdefs.h"
-#include "port_api.h"
+#include "stack/bt_types.h"
+#include "stack/rfcdefs.h"
+#include "stack/l2cdefs.h"
+#include "stack/port_api.h"
 #include "port_int.h"
-#include "l2c_api.h"
+#include "stack/l2c_api.h"
 #include "rfc_int.h"
-#include "bt_defs.h"
-#include "allocator.h"
-#include "mutex.h"
-#include "bt_target.h"
+#include "common/bt_defs.h"
+#include "osi/allocator.h"
+#include "osi/mutex.h"
+#include "common/bt_target.h"
 #if (defined RFCOMM_INCLUDED && RFCOMM_INCLUDED == TRUE)
 
 #define L2CAP_SUCCESS   0
index b02574c44f3cc368a4f4bbde3d9db441f86195cc..a8c58b295a79dc0ecc7764bcd258169caaf20f1a 100644 (file)
  *
  ******************************************************************************/
 #include <string.h>
-#include "bt_target.h"
-#include "rfcdefs.h"
-#include "btm_api.h"
+#include "common/bt_target.h"
+#include "stack/rfcdefs.h"
+#include "stack/btm_api.h"
 #include "btm_int.h"
-#include "port_api.h"
+#include "stack/port_api.h"
 #include "port_int.h"
 #include "rfc_int.h"
-#include "bt_defs.h"
-#include "allocator.h"
-#include "mutex.h"
+#include "common/bt_defs.h"
+#include "osi/allocator.h"
+#include "osi/mutex.h"
 #if (defined RFCOMM_INCLUDED && RFCOMM_INCLUDED == TRUE)
 
 /********************************************************************************/
index d30b9a536d6570df3229e369d8319f6ccaf5a8e7..58dae435420c92cef89d6122222debcb824ac1d7 100644 (file)
  *****************************************************************************/
 
 #include <string.h>
-#include "bt_target.h"
-#include "rfcdefs.h"
-#include "port_api.h"
-#include "l2c_api.h"
+#include "common/bt_target.h"
+#include "stack/rfcdefs.h"
+#include "stack/port_api.h"
+#include "stack/l2c_api.h"
 #include "port_int.h"
 #include "rfc_int.h"
-#include "bt_defs.h"
+#include "common/bt_defs.h"
 
 #if (defined RFCOMM_INCLUDED && RFCOMM_INCLUDED == TRUE)
 
index 1c5f5d2044db9a722de8d6b99e4f346f593ff4bd..3a9a60b74f1d4e0d880981ede50b63517027aecf 100644 (file)
  ******************************************************************************/
 
 #include <stddef.h>
-#include "bt_target.h"
-#include "rfcdefs.h"
-#include "port_api.h"
-#include "l2c_api.h"
+#include "common/bt_target.h"
+#include "stack/rfcdefs.h"
+#include "stack/port_api.h"
+#include "stack/l2c_api.h"
 #include "port_int.h"
 #include "rfc_int.h"
-#include "mutex.h"
-#include "allocator.h"
+#include "osi/mutex.h"
+#include "osi/allocator.h"
 #if (defined RFCOMM_INCLUDED && RFCOMM_INCLUDED == TRUE)
 
 /*******************************************************************************
index 7214ffdd856f5cd6fb9c815d09cd655d9565c4bf..180632c04849c65538fede25e25c26c4a31ea763 100644 (file)
  *
  *****************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
-#include "btm_api.h"
+#include "stack/btm_api.h"
 #include "btm_int.h"
-#include "rfcdefs.h"
-#include "port_api.h"
-#include "port_ext.h"
+#include "stack/rfcdefs.h"
+#include "stack/port_api.h"
+#include "stack/port_ext.h"
 #include "port_int.h"
 #include "rfc_int.h"
-#include "btu.h"
-#include "bt_defs.h"
+#include "stack/btu.h"
+#include "common/bt_defs.h"
 
-#include "allocator.h"
-#include "mutex.h"
+#include "osi/allocator.h"
+#include "osi/mutex.h"
 
 #include <string.h>
 
index 058257b8ef170e476dfc749ce42772f08203c50a..c459edea0b215a61c6547ed75bc95f19574d0fb3 100644 (file)
 #ifndef  SDP_INT_H
 #define  SDP_INT_H
 
-#include "bt_target.h"
-#include "bt_defs.h"
-#include "sdp_api.h"
-#include "l2c_api.h"
+#include "common/bt_target.h"
+#include "common/bt_defs.h"
+#include "stack/sdp_api.h"
+#include "stack/l2c_api.h"
 
 #if (SDP_INCLUDED == TRUE)
 /* Continuation length - we use a 2-byte offset */
index 91b989eebd68aa8d8fc143d0c2e2176018106f45..529359a4fe2ecb3949dd5d3443a5a0fb2fc8a745 100644 (file)
 #include <string.h>
 //#include <stdio.h>
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 //#include "bt_utils.h"
-#include "l2cdefs.h"
-#include "hcidefs.h"
-#include "hcimsgs.h"
-#include "bt_defs.h"
-#include "sdp_api.h"
+#include "stack/l2cdefs.h"
+#include "stack/hcidefs.h"
+#include "stack/hcimsgs.h"
+#include "common/bt_defs.h"
+#include "stack/sdp_api.h"
 #include "sdpint.h"
-#include "btu.h"
+#include "stack/btu.h"
 
 #if (SDP_INCLUDED == TRUE)
 /**********************************************************************
index 4ecfab1481eb75b1e68fe76acc04daea2edb9809..5f049e4eb76d21e8f680444ed24f3f843a563cf8 100644 (file)
 #include <string.h>
 #include <stdio.h>
 
-#include "bt_target.h"
-#include "allocator.h"
+#include "common/bt_target.h"
+#include "osi/allocator.h"
 
 
-#include "l2cdefs.h"
-#include "hcidefs.h"
-#include "hcimsgs.h"
+#include "stack/l2cdefs.h"
+#include "stack/hcidefs.h"
+#include "stack/hcimsgs.h"
 
-#include "sdp_api.h"
+#include "stack/sdp_api.h"
 #include "sdpint.h"
 
 #if (SDP_INCLUDED == TRUE)
index 04a6ec7948bf2af8c3ac05de175d403bc67fadde..8f76f2022cad0b7ed2d090c519dee415f62e526b 100644 (file)
 #include <string.h>
 #include <stdio.h>
 
-#include "bt_target.h"
-#include "allocator.h"
-#include "l2cdefs.h"
-#include "hcidefs.h"
-#include "hcimsgs.h"
-#include "sdp_api.h"
+#include "common/bt_target.h"
+#include "osi/allocator.h"
+#include "stack/l2cdefs.h"
+#include "stack/hcidefs.h"
+#include "stack/hcimsgs.h"
+#include "stack/sdp_api.h"
 #include "sdpint.h"
-#include "btu.h"
-#include "btm_api.h"
+#include "stack/btu.h"
+#include "stack/btm_api.h"
 
 
 #ifndef SDP_DEBUG_RAW
index b8e76b1d8e13a1c9b79d0ef6f70ddd374d6b0fa3..af0571a10370479c743d19c3f53f8440cefcc8e1 100644 (file)
 #include <string.h>
 //#include <stdio.h>
 
-#include "bt_target.h"
-#include "allocator.h"
-#include "l2cdefs.h"
-#include "hcidefs.h"
-#include "hcimsgs.h"
+#include "common/bt_target.h"
+#include "osi/allocator.h"
+#include "stack/l2cdefs.h"
+#include "stack/hcidefs.h"
+#include "stack/hcimsgs.h"
 
-#include "l2c_api.h"
-#include "l2cdefs.h"
+#include "stack/l2c_api.h"
+#include "stack/l2cdefs.h"
 
-#include "btu.h"
-#include "btm_api.h"
+#include "stack/btu.h"
+#include "stack/btm_api.h"
 
-#include "sdp_api.h"
+#include "stack/sdp_api.h"
 #include "sdpint.h"
 
 #if (SDP_INCLUDED == TRUE)
index 84333b2b0b53393e9efff630b07e37ff68625308..856aba71d4ac36b5fd1a4d877d8d5113b5a5d991 100644 (file)
 #include <string.h>
 //#include <stdio.h>
 
-#include "bt_types.h"
-#include "allocator.h"
-#include "btu.h"
-#include "bt_defs.h"
-#include "l2cdefs.h"
-#include "hcidefs.h"
-#include "hcimsgs.h"
-
-#include "sdp_api.h"
+#include "stack/bt_types.h"
+#include "osi/allocator.h"
+#include "stack/btu.h"
+#include "common/bt_defs.h"
+#include "stack/l2cdefs.h"
+#include "stack/hcidefs.h"
+#include "stack/hcimsgs.h"
+
+#include "stack/sdp_api.h"
 #include "sdpint.h"
 
 
index 271013fca7e6d54291ce4bedeb6fb6209942f7f1..b93f3b7045312d7717aa17671f00330aed462b07 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#include "allocator.h"
+#include "osi/allocator.h"
 
-#include "bt_defs.h"
+#include "common/bt_defs.h"
 
-#include "bt_types.h"
+#include "stack/bt_types.h"
 
-#include "l2cdefs.h"
-#include "hcidefs.h"
-#include "hcimsgs.h"
+#include "stack/l2cdefs.h"
+#include "stack/hcidefs.h"
+#include "stack/hcimsgs.h"
 
-#include "sdp_api.h"
+#include "stack/sdp_api.h"
 #include "sdpint.h"
 
-#include "btu.h"
+#include "stack/btu.h"
 
 #if (SDP_INCLUDED == TRUE)
 static const UINT8  sdp_base_uuid[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
index 77811873d4ae79ce73f86579a264101d4041eb98..3ef0837397766a901a51298482f75e270eeefe42 100644 (file)
@@ -46,7 +46,7 @@
 #include <stdlib.h>
 
 /* add the target configuration to allow using internal data types and compilation options */
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 /* define if you have fast 32-bit types on your system */
 #if 1
index ac32320aad621982e8199fb7f9488ea44f7b1b10..c9a1a4ea520fff16d7ac1043dcd2bda01fe0ddda 100644 (file)
@@ -23,7 +23,7 @@
  ******************************************************************************/
 #pragma once
 
-#include "bt_types.h"
+#include "stack/bt_types.h"
 
 /* Type definitions */
 typedef unsigned long  DWORD;
index 734c3fcba36ce48c45493e0957fa04e07d4ffa4e..10d6f4bc69474996af23f04a6d7a242bd0d45100 100644 (file)
 
 #if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
 
-#include "btu.h"
-#include "btm_ble_api.h"
-#include "btm_api.h"
-#include "smp_api.h"
+#include "stack/btu.h"
+#include "stack/btm_ble_api.h"
+#include "stack/btm_api.h"
+#include "stack/smp_api.h"
 
 #define SMP_MODEL_ENCRYPTION_ONLY  0   /* Legacy mode, Just Works model */
 #define SMP_MODEL_PASSKEY       1   /* Legacy mode, Passkey Entry model, this side inputs the key */
index 2c11474d46a9b2335fbae2ce4841a7a5e7037fb7..0bb64adfb7d26178be8f33b1a0547d57045a14e4 100644 (file)
@@ -23,7 +23,7 @@
  ******************************************************************************/
 
 #include <string.h>
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include "p_256_ecc_pp.h"
 #include "p_256_multprecision.h"
 
index 10c8821f5d0bd5e1c5d1202a3342609cd0366e2f..65370e6776dce14a8c843b5c5b785a87d174d91b 100644 (file)
  ******************************************************************************/
 
 #include <string.h>
-#include "interop.h"
-#include "bt_target.h"
+#include "device/interop.h"
+#include "common/bt_target.h"
 #include "btm_int.h"
-#include "l2c_api.h"
+#include "stack/l2c_api.h"
 #include "smp_int.h"
 //#include "utils/include/bt_utils.h"
 
index fe90034c7d1d747d8b1cf1eadc1db7f0075c96ef..5e8b436ec818b4814076c1e007597f7880ccf97b 100644 (file)
  ******************************************************************************/
 #include <string.h>
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 //#include "bt_utils.h"
 #if SMP_INCLUDED == TRUE
 #include "smp_int.h"
-#include "smp_api.h"
-#include "l2cdefs.h"
+#include "stack/smp_api.h"
+#include "stack/l2cdefs.h"
 #include "l2c_int.h"
 #include "btm_int.h"
-#include "hcimsgs.h"
+#include "stack/hcimsgs.h"
 
-#include "btu.h"
+#include "stack/btu.h"
 #include "p_256_ecc_pp.h"
-#include "allocator.h"
+#include "osi/allocator.h"
 
 /*******************************************************************************
 **
index 8360bf97860a602f7e96d2041a493a6a35c314c5..ba2eb9745634c344f9117b031fecf842545db5bb 100644 (file)
@@ -16,7 +16,7 @@
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #include <string.h>
 #include "smp_int.h"
index e284b678f22f63417cf342fa09c62f48445ae708..753c5188f2272e25739f67d1d853c525fb4d2bc7 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
-#include "allocator.h"
+#include "common/bt_target.h"
+#include "osi/allocator.h"
 
 #if SMP_INCLUDED == TRUE
 //    #include <stdio.h>
 #include <string.h>
 
-#include "btm_ble_api.h"
+#include "stack/btm_ble_api.h"
 #include "smp_int.h"
-#include "hcimsgs.h"
+#include "stack/hcimsgs.h"
 
 typedef struct {
     UINT8               *text;
index cc1a25f80f4b56996a43b9ffa10762de09e49d4b..a147a158ffcc834b19ab04f069296b41f0a8d1ce 100644 (file)
@@ -21,7 +21,7 @@
  *  This file contains security manager protocol utility functions
  *
  ******************************************************************************/
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if SMP_INCLUDED == TRUE
 #if SMP_DEBUG == TRUE
 #endif
 #include <string.h>
 //#include "bt_utils.h"
-#include "btm_ble_api.h"
+#include "stack/btm_ble_api.h"
 #include "smp_int.h"
 #include "btm_int.h"
 #include "btm_ble_int.h"
-#include "hcimsgs.h"
+#include "stack/hcimsgs.h"
 #include "aes.h"
 #include "p_256_ecc_pp.h"
-#include "controller.h"
+#include "device/controller.h"
 
 #ifndef SMP_MAX_ENC_REPEAT
 #define SMP_MAX_ENC_REPEAT  3
index 24093d64cea14e92634955a96922100434f17ee7..7c5efa7ea43303b64b40578433a3c509e7c7265d 100644 (file)
  *
  ******************************************************************************/
 
-#include "bt_target.h"
-#include "allocator.h"
+#include "common/bt_target.h"
+#include "osi/allocator.h"
 
 #if SMP_INCLUDED == TRUE
 
 #include <string.h>
-#include "btm_ble_api.h"
-#include "l2c_api.h"
+#include "stack/btm_ble_api.h"
+#include "stack/l2c_api.h"
 
 #include "smp_int.h"
 
index 1bb0fcb470bbb8b0c6bfe630ede32e466dd9693e..0880fe910f77035565a2d595f35cd4c0deecc2a6 100644 (file)
@@ -16,7 +16,7 @@
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if SMP_INCLUDED == TRUE
 
index ba039bfcb420496753fbf85b05712e4529820acc..91dac6dec22da3459406cdaf8275d0ba957da9b9 100644 (file)
  *  This file contains functions for the SMP L2CAP utility functions
  *
  ******************************************************************************/
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if SMP_INCLUDED == TRUE
 
-#include "bt_types.h"
+#include "stack/bt_types.h"
 //#include "bt_utils.h"
 #include <string.h>
 //#include <ctype.h>
-#include "hcidefs.h"
-#include "btm_ble_api.h"
-#include "l2c_api.h"
+#include "stack/hcidefs.h"
+#include "stack/btm_ble_api.h"
+#include "stack/l2c_api.h"
 #include "l2c_int.h"
 #include "smp_int.h"
-#include "controller.h"
+#include "device/controller.h"
 #include "btm_int.h"
 
 #define SMP_PAIRING_REQ_SIZE    7
index a2682cdd1b053e93a606f02b867350bd0fe11325..8de4d6889cc7f43128aeeb2cc5af6de0cf1fe338 100644 (file)
@@ -22,86 +22,94 @@ endif
 
 ifdef CONFIG_BLUEDROID_ENABLED
 
-COMPONENT_ADD_INCLUDEDIRS +=   bluedroid/bta/include                   \
-                               bluedroid/bta/sys/include               \
-                               bluedroid/btcore/include                \
-                               bluedroid/device/include                \
-                               bluedroid/gki/include                   \
-                               bluedroid/hci/include                   \
-                               bluedroid/osi/include                   \
-                               bluedroid/utils/include                 \
-                               bluedroid/external/sbc/decoder/include  \
-                               bluedroid/external/sbc/encoder/include  \
-                               bluedroid/btc/core/include              \
-                               bluedroid/btc/profile/esp/blufi/include         \
-                               bluedroid/btc/profile/esp/include               \
-                               bluedroid/btc/profile/std/gatt/include  \
-                               bluedroid/btc/profile/std/gap/include   \
-                               bluedroid/btc/profile/std/a2dp/include  \
-                               bluedroid/btc/profile/std/include       \
-                               bluedroid/btc/include           \
-                               bluedroid/btif/include                  \
-                               bluedroid/stack/btm/include             \
-                               bluedroid/stack/btu/include             \
-                               bluedroid/stack/gap/include             \
-                               bluedroid/stack/gatt/include            \
-                               bluedroid/stack/hcic/include            \
-                               bluedroid/stack/l2cap/include           \
-                               bluedroid/stack/sdp/include             \
-                               bluedroid/stack/smp/include             \
-                               bluedroid/stack/avct/include            \
-                               bluedroid/stack/avrc/include            \
-                               bluedroid/stack/avdt/include            \
-                               bluedroid/stack/a2dp/include            \
-                               bluedroid/stack/rfcomm/include          \
-                               bluedroid/stack/include                 \
-                               bluedroid/utils/include                 \
-                               bluedroid/api/include                   \
-                               bluedroid/include                       \
+COMPONENT_PRIV_INCLUDEDIRS +=   bluedroid/bta/include                   \
+                                bluedroid/bta/ar/include                \
+                                bluedroid/bta/av/include                \
+                                bluedroid/bta/dm/include                \
+                                bluedroid/bta/gatt/include              \
+                                bluedroid/bta/hh/include                \
+                                bluedroid/bta/jv/include                \
+                                bluedroid/bta/sdp/include               \
+                                bluedroid/bta/sys/include               \
+                                bluedroid/btcore/include                \
+                                bluedroid/device/include                \
+                                bluedroid/gki/include                   \
+                                bluedroid/hci/include                   \
+                                bluedroid/osi/include                   \
+                                bluedroid/utils/include                 \
+                                bluedroid/external/sbc/decoder/include  \
+                                bluedroid/external/sbc/encoder/include  \
+                                bluedroid/btc/core/include              \
+                                bluedroid/btc/profile/esp/blufi/include \
+                                bluedroid/btc/profile/esp/include       \
+                                bluedroid/btc/profile/std/gatt/include  \
+                                bluedroid/btc/profile/std/gap/include   \
+                                bluedroid/btc/profile/std/a2dp/include  \
+                                bluedroid/btc/profile/std/include       \
+                                bluedroid/btc/include                   \
+                                bluedroid/btif/include                  \
+                                bluedroid/stack/btm/include             \
+                                bluedroid/stack/btu/include             \
+                                bluedroid/stack/gap/include             \
+                                bluedroid/stack/gatt/include            \
+                                bluedroid/stack/hcic/include            \
+                                bluedroid/stack/l2cap/include           \
+                                bluedroid/stack/sdp/include             \
+                                bluedroid/stack/smp/include             \
+                                bluedroid/stack/avct/include            \
+                                bluedroid/stack/avrc/include            \
+                                bluedroid/stack/avdt/include            \
+                                bluedroid/stack/a2dp/include            \
+                                bluedroid/stack/rfcomm/include          \
+                                bluedroid/stack/include                 \
+                                bluedroid/utils/include                 \
+                                bluedroid/common/include
 
-COMPONENT_SRCDIRS +=   bluedroid/bta/dm                        \
-                       bluedroid/bta/gatt                      \
-                       bluedroid/bta/hh                        \
-                       bluedroid/bta/sdp                       \
-                       bluedroid/bta/av                        \
-                       bluedroid/bta/ar                        \
-                       bluedroid/bta/sys                       \
-                       bluedroid/bta/jv                        \
-                       bluedroid/bta                           \
-                       bluedroid/btcore                        \
-                       bluedroid/btif                          \
-                       bluedroid/device                        \
-                       bluedroid/gki                           \
-                       bluedroid/hci                           \
-                       bluedroid/main                          \
-                       bluedroid/osi                           \
-                       bluedroid/external/sbc/decoder/srce     \
-                       bluedroid/external/sbc/encoder/srce     \
-                       bluedroid/btc/core              \
-                       bluedroid/btc/profile/esp/blufi \
-                       bluedroid/btc/profile/std/gap           \
-                       bluedroid/btc/profile/std/gatt          \
-                       bluedroid/btc/profile/std/a2dp          \
-                       bluedroid/btc/profile/std/avrc          \
-                       bluedroid/btc/profile/std/spp           \
-                       bluedroid/btc/profile                   \
-                       bluedroid/stack/btm                     \
-                       bluedroid/stack/btu                     \
-                       bluedroid/stack/gap                     \
-                       bluedroid/stack/gatt                    \
-                       bluedroid/stack/hcic                    \
-                       bluedroid/stack/include                 \
-                       bluedroid/stack/l2cap                   \
-                       bluedroid/stack/sdp                     \
-                       bluedroid/stack/smp                     \
-                       bluedroid/stack/avct                    \
-                       bluedroid/stack/avrc                    \
-                       bluedroid/stack/avdt                    \
-                       bluedroid/stack/a2dp                    \
-                       bluedroid/stack/rfcomm                  \
-                       bluedroid/stack                         \
-                       bluedroid/utils                         \
-                       bluedroid/api                   \
-                       bluedroid                               \
+COMPONENT_ADD_INCLUDEDIRS +=    bluedroid/api/include/api
+
+COMPONENT_SRCDIRS +=    bluedroid/bta/dm                      \
+                        bluedroid/bta/gatt                    \
+                        bluedroid/bta/hh                      \
+                        bluedroid/bta/sdp                     \
+                        bluedroid/bta/av                      \
+                        bluedroid/bta/ar                      \
+                        bluedroid/bta/sys                     \
+                        bluedroid/bta/jv                      \
+                        bluedroid/bta                         \
+                        bluedroid/btcore                      \
+                        bluedroid/btif                        \
+                        bluedroid/device                      \
+                        bluedroid/gki                         \
+                        bluedroid/hci                         \
+                        bluedroid/main                        \
+                        bluedroid/osi                         \
+                        bluedroid/external/sbc/decoder/srce   \
+                        bluedroid/external/sbc/encoder/srce   \
+                        bluedroid/btc/core                    \
+                        bluedroid/btc/profile/esp/blufi       \
+                        bluedroid/btc/profile/std/gap         \
+                        bluedroid/btc/profile/std/gatt        \
+                        bluedroid/btc/profile/std/a2dp        \
+                        bluedroid/btc/profile/std/avrc        \
+                        bluedroid/btc/profile/std/spp         \
+                        bluedroid/btc/profile                 \
+                        bluedroid/stack/btm                   \
+                        bluedroid/stack/btu                   \
+                        bluedroid/stack/gap                   \
+                        bluedroid/stack/gatt                  \
+                        bluedroid/stack/hcic                  \
+                        bluedroid/stack/include               \
+                        bluedroid/stack/l2cap                 \
+                        bluedroid/stack/sdp                   \
+                        bluedroid/stack/smp                   \
+                        bluedroid/stack/avct                  \
+                        bluedroid/stack/avrc                  \
+                        bluedroid/stack/avdt                  \
+                        bluedroid/stack/a2dp                  \
+                        bluedroid/stack/rfcomm                \
+                        bluedroid/stack                       \
+                        bluedroid/utils                       \
+                        bluedroid/api                         \
+                        bluedroid
 
 endif
index 8620ff8407443f7ebaa70a9201a4e40432b93ad6..7c1ac334d31552ecad61efce5e0568401883e4fa 100644 (file)
@@ -32,25 +32,25 @@ INPUT = \
     ../../components/esp32/include/esp_mesh.h \
     ## Bluetooth - API Reference
     ## Controller && VHCI
-    ../../components/bt/include/bt.h \
+    ../../components/bt/include/esp_bt.h \
     ## Bluetooth COMMON
     ## Issue with __attribute__
-    ../../components/bt/bluedroid/api/include/esp_bt_defs.h \
-    ../../components/bt/bluedroid/api/include/esp_bt_main.h \
-    ../../components/bt/bluedroid/api/include/esp_bt_device.h \
+    ../../components/bt/bluedroid/api/include/api/esp_bt_defs.h \
+    ../../components/bt/bluedroid/api/include/api/esp_bt_main.h \
+    ../../components/bt/bluedroid/api/include/api/esp_bt_device.h \
     ## Bluetooth LE
-    ../../components/bt/bluedroid/api/include/esp_gap_ble_api.h \
+    ../../components/bt/bluedroid/api/include/api/esp_gap_ble_api.h \
     ## Issue with __attribute__
-    ../../components/bt/bluedroid/api/include/esp_gatt_defs.h \
-    ../../components/bt/bluedroid/api/include/esp_gatts_api.h \
-    ../../components/bt/bluedroid/api/include/esp_gattc_api.h \
-    ../../components/bt/bluedroid/api/include/esp_blufi_api.h \
+    ../../components/bt/bluedroid/api/include/api/esp_gatt_defs.h \
+    ../../components/bt/bluedroid/api/include/api/esp_gatts_api.h \
+    ../../components/bt/bluedroid/api/include/api/esp_gattc_api.h \
+    ../../components/bt/bluedroid/api/include/api/esp_blufi_api.h \
     ## Bluetooth Classic
-    ../../components/bt/bluedroid/api/include/esp_gap_bt_api.h \
+    ../../components/bt/bluedroid/api/include/api/esp_gap_bt_api.h \
     ## Issue with __attribute__
-    ../../components/bt/bluedroid/api/include/esp_a2dp_api.h \
-    ../../components/bt/bluedroid/api/include/esp_avrc_api.h \
-    ../../components/bt/bluedroid/api/include/esp_spp_api.h \
+    ../../components/bt/bluedroid/api/include/api/esp_a2dp_api.h \
+    ../../components/bt/bluedroid/api/include/api/esp_avrc_api.h \
+    ../../components/bt/bluedroid/api/include/api/esp_spp_api.h \
     ##
     ## Ethernet - API Reference
     ##
index 17680a587216726ee6680c03b392bcd75cb7ec5a..3db69ca027da7a64a892e57a8463fb8a9db9854a 100644 (file)
@@ -18,4 +18,4 @@ Check :example:`bluetooth` folder in ESP-IDF examples, which contains the follow
 API Reference
 -------------
 
-.. include:: /_build/inc/bt.inc
+.. include:: /_build/inc/esp_bt.inc
index 277f007f70d288f6664b5ebfec30463a10ce275c..248db09ee48314ea22ddf4ddb22a3ad0c1a66891 100644 (file)
@@ -46,12 +46,12 @@ esp_ble_ibeacon_vendor_t vendor_config = {
     .measured_power = 0xC5
 };
 
-BOOLEAN esp_ble_is_ibeacon_packet (uint8_t *adv_data, uint8_t adv_data_len){
-    BOOLEAN result = FALSE;
+bool esp_ble_is_ibeacon_packet (uint8_t *adv_data, uint8_t adv_data_len){
+    bool result = false;
 
     if ((adv_data != NULL) && (adv_data_len == 0x1E)){
         if (!memcmp(adv_data, (uint8_t*)&ibeacon_common_head, sizeof(ibeacon_common_head))){
-            result = TRUE;
+            result = true;
         }
     }
 
index f04b638a0519e931ead74f9012ba9577c6dbe85f..7c3fce2be545fb4ad7329249bde025e134f0b620 100644 (file)
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include "controller.h"
 
 #include "esp_gap_ble_api.h"
 #include "esp_gattc_api.h"
@@ -73,6 +72,6 @@ typedef struct {
 /* Constant part of iBeacon data */
 extern esp_ble_ibeacon_head_t ibeacon_common_head;
 
-BOOLEAN esp_ble_is_ibeacon_packet (uint8_t *adv_data, uint8_t adv_data_len);
+bool esp_ble_is_ibeacon_packet (uint8_t *adv_data, uint8_t adv_data_len);
 
 esp_err_t esp_ble_config_ibeacon_data (esp_ble_ibeacon_vendor_t *vendor_config, esp_ble_ibeacon_t *ibeacon_adv_data);
index 899d96fe8d08a3c38f015a845841535178c2b933..5db17265a76ad112779e35465be6e1b476f9a102 100644 (file)
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include "controller.h"
 #include "nvs_flash.h"
 
 #include "esp_bt.h"
 #include "esp_gattc_api.h"
 #include "esp_gatt_defs.h"
 #include "esp_bt_main.h"
+#include "esp_bt_defs.h"
 #include "esp_ibeacon_api.h"
-
+#include "esp_log.h"
+#include "freertos/FreeRTOS.h"
 
 static const char* DEMO_TAG = "IBEACON_DEMO";
 extern esp_ble_ibeacon_vendor_t vendor_config;
@@ -99,7 +100,7 @@ static void esp_gap_cb(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *par
             if (esp_ble_is_ibeacon_packet(scan_result->scan_rst.ble_adv, scan_result->scan_rst.adv_data_len)){
                 esp_ble_ibeacon_t *ibeacon_data = (esp_ble_ibeacon_t*)(scan_result->scan_rst.ble_adv);
                 ESP_LOGI(DEMO_TAG, "----------iBeacon Found----------");
-                esp_log_buffer_hex("IBEACON_DEMO: Device address:", scan_result->scan_rst.bda, BD_ADDR_LEN );
+                esp_log_buffer_hex("IBEACON_DEMO: Device address:", scan_result->scan_rst.bda, ESP_BD_ADDR_LEN );
                 esp_log_buffer_hex("IBEACON_DEMO: Proximity UUID:", ibeacon_data->ibeacon_vendor.proximity_uuid, ESP_UUID_LEN_128);
 
                 uint16_t major = ENDIAN_CHANGE_U16(ibeacon_data->ibeacon_vendor.major);
index 5b82ab88b52974a893b2de0c711885b50fa0b6de..28711a2b4229d1b4055da73f772c07e3cbea8430 100644 (file)
@@ -16,7 +16,6 @@
 #include <string.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include "controller.h"
 #include "driver/uart.h"
 
 #include "esp_bt.h"
@@ -27,8 +26,9 @@
 #include "esp_gatt_defs.h"
 #include "esp_bt_main.h"
 #include "esp_system.h"
-#include "btc_main.h"
 #include "esp_gatt_common_api.h"
+#include "esp_log.h"
+#include "freertos/FreeRTOS.h"
 
 #define GATTC_TAG                   "GATTC_SPP_DEMO"
 #define PROFILE_NUM                 1
index 31704c0948b60176c1b97626d1c4ac88836c41f6..8817a935467622f19c63c39b332d59a547facd08 100644 (file)
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include "nvs.h"
 #include "nvs_flash.h"
-#include "controller.h"
 
 #include "esp_bt.h"
 #include "esp_gap_ble_api.h"
@@ -31,6 +30,8 @@
 #include "esp_gatt_defs.h"
 #include "esp_bt_main.h"
 #include "esp_gatt_common_api.h"
+#include "esp_log.h"
+#include "freertos/FreeRTOS.h"
 
 #define GATTC_TAG "GATTC_DEMO"
 #define REMOTE_SERVICE_UUID        0x00FF
index 2090c8bc00601ebd240d2039ccaf442673f91b46..aa068ff6f1f2dc1e72ddafcf67fd88ac91d75054 100644 (file)
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include "nvs.h"
 #include "nvs_flash.h"
-#include "controller.h"
 
 #include "esp_bt.h"
 #include "esp_gap_ble_api.h"
@@ -30,6 +29,8 @@
 #include "esp_gatt_defs.h"
 #include "esp_bt_main.h"
 #include "esp_gatt_common_api.h"
+#include "esp_log.h"
+#include "freertos/FreeRTOS.h"
 
 #define GATTC_TAG             "SEC_GATTC_DEMO"
 #define REMOTE_SERVICE_UUID   0x1809
index e5b44868e6948dd4a582c0145aa1f1f578d51729..84f48a5d0aa839c60e918be18af61f1e52b20902 100644 (file)
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include "nvs.h"
 #include "nvs_flash.h"
-#include "controller.h"
 
 #include "esp_bt.h"
 #include "esp_gap_ble_api.h"
@@ -34,6 +33,8 @@
 #include "esp_gatt_defs.h"
 #include "esp_bt_main.h"
 #include "esp_gatt_common_api.h"
+#include "esp_log.h"
+#include "freertos/FreeRTOS.h"
 
 #define GATTC_TAG "GATTC_MULTIPLE_DEMO"
 #define REMOTE_SERVICE_UUID        0x00FF