From adada3f67e2651fa895715cfa2c7f2990c0a3cb7 Mon Sep 17 00:00:00 2001 From: Tian Hao Date: Sun, 8 Apr 2018 12:10:50 +0800 Subject: [PATCH] component/bt : modify header files to avoid conflict 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 --- components/bt/bluedroid/api/esp_a2dp_api.c | 4 +- components/bt/bluedroid/api/esp_avrc_api.c | 4 +- components/bt/bluedroid/api/esp_blufi_api.c | 8 +- components/bt/bluedroid/api/esp_bt_device.c | 6 +- components/bt/bluedroid/api/esp_bt_main.c | 8 +- components/bt/bluedroid/api/esp_gap_ble_api.c | 8 +- components/bt/bluedroid/api/esp_gap_bt_api.c | 6 +- components/bt/bluedroid/api/esp_gattc_api.c | 2 +- components/bt/bluedroid/api/esp_gatts_api.c | 4 +- components/bt/bluedroid/api/esp_spp_api.c | 4 +- .../api/include/{ => api}/esp_a2dp_api.h | 0 .../api/include/{ => api}/esp_avrc_api.h | 0 .../api/include/{ => api}/esp_blufi_api.h | 0 .../api/include/{ => api}/esp_bt_defs.h | 28 +-- .../api/include/{ => api}/esp_bt_device.h | 0 .../api/include/{ => api}/esp_bt_main.h | 0 .../api/include/{ => api}/esp_gap_ble_api.h | 130 +++++++------- .../api/include/{ => api}/esp_gap_bt_api.h | 0 .../include/{ => api}/esp_gatt_common_api.h | 4 +- .../api/include/{ => api}/esp_gatt_defs.h | 164 ++++++++--------- .../api/include/{ => api}/esp_gattc_api.h | 0 .../api/include/{ => api}/esp_gatts_api.h | 0 .../api/include/{ => api}/esp_spp_api.h | 14 +- components/bt/bluedroid/bta/ar/bta_ar.c | 4 +- .../bta/{ => ar}/include/bta_ar_int.h | 2 +- components/bt/bluedroid/bta/av/bta_av_aact.c | 16 +- components/bt/bluedroid/bta/av/bta_av_act.c | 18 +- components/bt/bluedroid/bta/av/bta_av_api.c | 10 +- components/bt/bluedroid/bta/av/bta_av_cfg.c | 4 +- components/bt/bluedroid/bta/av/bta_av_ci.c | 10 +- components/bt/bluedroid/bta/av/bta_av_main.c | 18 +- components/bt/bluedroid/bta/av/bta_av_sbc.c | 12 +- components/bt/bluedroid/bta/av/bta_av_ssm.c | 4 +- .../bta/{ => av}/include/bta_av_int.h | 12 +- components/bt/bluedroid/bta/dm/bta_dm_act.c | 32 ++-- components/bt/bluedroid/bta/dm/bta_dm_api.c | 10 +- components/bt/bluedroid/bta/dm/bta_dm_cfg.c | 14 +- components/bt/bluedroid/bta/dm/bta_dm_ci.c | 8 +- .../bt/bluedroid/{btif => bta/dm}/bta_dm_co.c | 14 +- components/bt/bluedroid/bta/dm/bta_dm_main.c | 6 +- components/bt/bluedroid/bta/dm/bta_dm_pm.c | 6 +- components/bt/bluedroid/bta/dm/bta_dm_sco.c | 4 +- .../bta/{ => dm}/include/bta_dm_int.h | 4 +- .../bt/bluedroid/bta/gatt/bta_gatt_common.c | 2 +- .../bt/bluedroid/bta/gatt/bta_gattc_act.c | 12 +- .../bt/bluedroid/bta/gatt/bta_gattc_api.c | 8 +- .../bt/bluedroid/bta/gatt/bta_gattc_cache.c | 18 +- .../bt/bluedroid/bta/gatt/bta_gattc_ci.c | 12 +- .../{btif => bta/gatt}/bta_gattc_co.c | 8 +- .../bt/bluedroid/bta/gatt/bta_gattc_main.c | 4 +- .../bt/bluedroid/bta/gatt/bta_gattc_utils.c | 12 +- .../bt/bluedroid/bta/gatt/bta_gatts_act.c | 12 +- .../bt/bluedroid/bta/gatt/bta_gatts_api.c | 8 +- .../{btif => bta/gatt}/bta_gatts_co.c | 4 +- .../bt/bluedroid/bta/gatt/bta_gatts_main.c | 4 +- .../bt/bluedroid/bta/gatt/bta_gatts_utils.c | 6 +- .../bta/{ => gatt}/include/bta_gattc_int.h | 14 +- .../bta/{ => gatt}/include/bta_gatts_int.h | 8 +- components/bt/bluedroid/bta/hh/bta_hh_act.c | 12 +- components/bt/bluedroid/bta/hh/bta_hh_api.c | 8 +- components/bt/bluedroid/bta/hh/bta_hh_cfg.c | 4 +- components/bt/bluedroid/bta/hh/bta_hh_le.c | 14 +- components/bt/bluedroid/bta/hh/bta_hh_main.c | 4 +- components/bt/bluedroid/bta/hh/bta_hh_utils.c | 2 +- .../bta/{ => hh}/include/bta_hh_int.h | 10 +- .../bluedroid/bta/include/{ => bta}/bta_api.h | 12 +- .../bta/include/{ => bta}/bta_ar_api.h | 12 +- .../bta/include/{ => bta}/bta_av_api.h | 8 +- .../bta/include/{ => bta}/bta_av_ci.h | 2 +- .../bta/include/{ => bta}/bta_av_co.h | 4 +- .../bta/include/{ => bta}/bta_av_sbc.h | 0 .../bta/include/{ => bta}/bta_dm_ci.h | 2 +- .../bta/include/{ => bta}/bta_dm_co.h | 2 +- .../bta/include/{ => bta}/bta_gatt_api.h | 6 +- .../bta/include/{ => bta}/bta_gatt_common.h | 2 +- .../bta/include/{ => bta}/bta_gattc_ci.h | 2 +- .../bta/include/{ => bta}/bta_gattc_co.h | 4 +- .../bta/include/{ => bta}/bta_gatts_co.h | 2 +- .../bta/include/{ => bta}/bta_hh_api.h | 6 +- .../bta/include/{ => bta}/bta_hh_co.h | 2 +- .../bta/include/{ => bta}/bta_jv_api.h | 14 +- .../bta/include/{ => bta}/bta_jv_co.h | 2 +- .../bta/include/{ => bta}/bta_sdp_api.h | 8 +- .../bluedroid/bta/include/{ => bta}/bta_sys.h | 4 +- .../bt/bluedroid/bta/include/{ => bta}/utl.h | 2 +- components/bt/bluedroid/bta/jv/bta_jv_act.c | 32 ++-- components/bt/bluedroid/bta/jv/bta_jv_api.c | 20 +-- components/bt/bluedroid/bta/jv/bta_jv_cfg.c | 8 +- components/bt/bluedroid/bta/jv/bta_jv_main.c | 8 +- .../bta/{ => jv}/include/bta_jv_int.h | 14 +- components/bt/bluedroid/bta/sdp/bta_sdp.c | 8 +- components/bt/bluedroid/bta/sdp/bta_sdp_act.c | 20 +-- components/bt/bluedroid/bta/sdp/bta_sdp_api.c | 12 +- components/bt/bluedroid/bta/sdp/bta_sdp_cfg.c | 6 +- .../bta/{ => sdp}/include/bta_sdp_int.h | 6 +- .../bt/bluedroid/bta/sys/bta_sys_conn.c | 6 +- .../bt/bluedroid/bta/sys/bta_sys_main.c | 28 +-- components/bt/bluedroid/bta/sys/utl.c | 6 +- components/bt/bluedroid/btc/core/btc_alarm.c | 4 +- .../bt/bluedroid/btc/core/btc_ble_storage.c | 12 +- components/bt/bluedroid/btc/core/btc_config.c | 22 +-- components/bt/bluedroid/btc/core/btc_dev.c | 8 +- components/bt/bluedroid/btc/core/btc_dm.c | 22 +-- components/bt/bluedroid/btc/core/btc_main.c | 14 +- components/bt/bluedroid/btc/core/btc_manage.c | 6 +- .../bt/bluedroid/btc/core/btc_profile_queue.c | 12 +- components/bt/bluedroid/btc/core/btc_sm.c | 10 +- .../bt/bluedroid/btc/core/btc_storage.c | 14 +- components/bt/bluedroid/btc/core/btc_task.c | 24 +-- components/bt/bluedroid/btc/core/btc_util.c | 6 +- .../btc/include/{ => btc}/btc_alarm.h | 2 +- .../btc/include/{ => btc}/btc_ble_storage.h | 4 +- .../btc/include/{ => btc}/btc_common.h | 6 +- .../btc/include/{ => btc}/btc_config.h | 2 +- .../bluedroid/btc/include/{ => btc}/btc_dev.h | 2 +- .../bluedroid/btc/include/{ => btc}/btc_dm.h | 4 +- .../btc/include/{ => btc}/btc_main.h | 10 +- .../btc/include/{ => btc}/btc_manage.h | 4 +- .../btc/include/{ => btc}/btc_profile_queue.h | 6 +- .../bluedroid/btc/include/{ => btc}/btc_sm.h | 2 +- .../btc/include/{ => btc}/btc_storage.h | 4 +- .../btc/include/{ => btc}/btc_task.h | 6 +- .../btc/include/{ => btc}/btc_util.h | 4 +- .../btc/profile/esp/ble_button/button_pro.c | 12 +- .../btc/profile/esp/blufi/blufi_prf.c | 18 +- .../btc/profile/esp/blufi/blufi_protocol.c | 16 +- .../btc/profile/esp/include/btc_blufi_prf.h | 4 +- .../btc/profile/esp/include/button_pro.h | 6 +- .../btc/profile/esp/include/wx_airsync_prf.h | 6 +- .../esp/wechat_AirSync/wx_airsync_prf.c | 12 +- .../btc/profile/std/a2dp/bta_av_co.c | 20 +-- .../bluedroid/btc/profile/std/a2dp/btc_a2dp.c | 8 +- .../btc/profile/std/a2dp/btc_a2dp_control.c | 10 +- .../btc/profile/std/a2dp/btc_a2dp_sink.c | 28 +-- .../btc/profile/std/a2dp/btc_a2dp_source.c | 32 ++-- .../bluedroid/btc/profile/std/a2dp/btc_av.c | 22 +-- .../bluedroid/btc/profile/std/avrc/btc_avrc.c | 18 +- .../btc/profile/std/battery/battery_prf.c | 12 +- .../std/battery/include/srvc_battery_int.h | 4 +- .../btc/profile/std/dis/dis_profile.c | 16 +- .../profile/std/dis/include/srvc_dis_int.h | 4 +- .../btc/profile/std/gap/btc_gap_ble.c | 18 +- .../btc/profile/std/gap/btc_gap_bt.c | 12 +- .../btc/profile/std/gatt/btc_gatt_common.c | 16 +- .../btc/profile/std/gatt/btc_gattc.c | 10 +- .../btc/profile/std/gatt/btc_gatts.c | 12 +- .../btc/profile/std/hid/include/hidh_int.h | 4 +- .../btc/profile/std/include/bt_sdp.h | 2 +- .../btc/profile/std/include/btc_a2dp.h | 4 +- .../profile/std/include/btc_a2dp_control.h | 4 +- .../btc/profile/std/include/btc_a2dp_sink.h | 4 +- .../btc/profile/std/include/btc_a2dp_source.h | 4 +- .../btc/profile/std/include/btc_av.h | 10 +- .../btc/profile/std/include/btc_av_api.h | 8 +- .../btc/profile/std/include/btc_avrc.h | 6 +- .../btc/profile/std/include/btc_gap_bt.h | 6 +- .../btc/profile/std/include/btc_gatt_common.h | 10 +- .../btc/profile/std/include/btc_gatt_util.h | 4 +- .../btc/profile/std/include/btc_gattc.h | 2 +- .../btc/profile/std/include/btc_gatts.h | 2 +- .../btc/profile/std/include/btc_spp.h | 6 +- .../btc/profile/std/include/dis_api.h | 6 +- .../btc/profile/std/include/hid_le_prf.h | 6 +- .../btc/profile/std/include/srvc_api.h | 6 +- .../btc/profile/std/smp/include/esp_sec_api.h | 2 +- .../bluedroid/btc/profile/std/spp/btc_spp.c | 14 +- .../include/common}/bt_common_types.h | 4 +- .../include/common}/bt_defs.h | 6 +- .../include/common}/bt_target.h | 6 +- .../include/common}/bt_trace.h | 2 +- .../include/common}/bt_vendor_lib.h | 0 .../{include => common/include/common}/bte.h | 4 +- .../include/common}/bte_appl.h | 0 .../bt/bluedroid/{btcore => device}/bdaddr.c | 4 +- components/bt/bluedroid/device/controller.c | 24 +-- .../include/device}/bdaddr.h | 4 +- .../device/include/{ => device}/controller.h | 12 +- .../include/device}/device_features.h | 0 .../include/device}/event_mask.h | 0 .../device/include/{ => device}/interop.h | 4 +- .../include/{ => device}/interop_database.h | 2 +- .../include/device}/version.h | 0 components/bt/bluedroid/device/interop.c | 8 +- .../external/sbc/decoder/srce/alloc.c | 2 +- .../external/sbc/decoder/srce/bitalloc-sbc.c | 2 +- .../external/sbc/decoder/srce/bitalloc.c | 2 +- .../sbc/decoder/srce/bitstream-decode.c | 2 +- .../external/sbc/decoder/srce/decoder-oina.c | 2 +- .../sbc/decoder/srce/decoder-private.c | 2 +- .../external/sbc/decoder/srce/decoder-sbc.c | 2 +- .../external/sbc/decoder/srce/dequant.c | 2 +- .../external/sbc/decoder/srce/framing-sbc.c | 2 +- .../external/sbc/decoder/srce/framing.c | 2 +- .../sbc/decoder/srce/oi_codec_version.c | 2 +- .../sbc/decoder/srce/synthesis-8-generated.c | 2 +- .../sbc/decoder/srce/synthesis-dct8.c | 2 +- .../external/sbc/decoder/srce/synthesis-sbc.c | 2 +- .../sbc/encoder/include/sbc_encoder.h | 2 +- .../external/sbc/encoder/include/sbc_types.h | 4 +- .../external/sbc/encoder/srce/sbc_analysis.c | 2 +- .../external/sbc/encoder/srce/sbc_dct.c | 2 +- .../sbc/encoder/srce/sbc_dct_coeffs.c | 2 +- .../sbc/encoder/srce/sbc_enc_bit_alloc_mono.c | 2 +- .../sbc/encoder/srce/sbc_enc_bit_alloc_ste.c | 2 +- .../sbc/encoder/srce/sbc_enc_coeffs.c | 2 +- .../external/sbc/encoder/srce/sbc_encoder.c | 2 +- .../external/sbc/encoder/srce/sbc_packing.c | 2 +- .../bt/bluedroid/hci/buffer_allocator.c | 4 +- components/bt/bluedroid/hci/hci_hal_h4.c | 18 +- components/bt/bluedroid/hci/hci_layer.c | 32 ++-- .../bt/bluedroid/hci/hci_packet_factory.c | 18 +- .../bt/bluedroid/hci/hci_packet_parser.c | 12 +- .../include/hci}/bt_vendor_lib.h | 0 .../hci/include/{ => hci}/buffer_allocator.h | 2 +- .../bluedroid/hci/include/{ => hci}/hci_hal.h | 2 +- .../hci/include/{ => hci}/hci_internals.h | 0 .../hci/include/{ => hci}/hci_layer.h | 8 +- .../include/{ => hci}/hci_packet_factory.h | 4 +- .../hci/include/{ => hci}/hci_packet_parser.h | 10 +- .../hci/include/{ => hci}/packet_fragmenter.h | 6 +- .../bt/bluedroid/hci/packet_fragmenter.c | 20 +-- components/bt/bluedroid/main/bte_init.c | 22 +-- components/bt/bluedroid/main/bte_main.c | 24 +-- components/bt/bluedroid/osi/alarm.c | 16 +- components/bt/bluedroid/osi/allocator.c | 4 +- components/bt/bluedroid/osi/buffer.c | 10 +- components/bt/bluedroid/osi/config.c | 8 +- components/bt/bluedroid/osi/fixed_queue.c | 16 +- components/bt/bluedroid/osi/future.c | 8 +- components/bt/bluedroid/osi/hash_functions.c | 2 +- components/bt/bluedroid/osi/hash_map.c | 10 +- .../bluedroid/osi/include/{ => osi}/alarm.h | 0 .../osi/include/{ => osi}/allocator.h | 0 .../bluedroid/osi/include/{ => osi}/buffer.h | 0 .../bluedroid/osi/include/{ => osi}/config.h | 0 .../osi/include/{ => osi}/fixed_queue.h | 2 +- .../bluedroid/osi/include/{ => osi}/future.h | 2 +- .../osi/include/{ => osi}/hash_functions.h | 2 +- .../osi/include/{ => osi}/hash_map.h | 0 .../bt/bluedroid/osi/include/{ => osi}/list.h | 0 .../bluedroid/osi/include/{ => osi}/mutex.h | 0 .../bt/bluedroid/osi/include/{ => osi}/osi.h | 0 .../osi/include/{ => osi}/semaphore.h | 0 .../bluedroid/osi/include/{ => osi}/thread.h | 2 +- components/bt/bluedroid/osi/list.c | 8 +- components/bt/bluedroid/osi/mutex.c | 2 +- components/bt/bluedroid/osi/osi.c | 4 +- components/bt/bluedroid/osi/semaphore.c | 2 +- components/bt/bluedroid/stack/a2dp/a2d_api.c | 10 +- components/bt/bluedroid/stack/a2dp/a2d_sbc.c | 8 +- .../bt/bluedroid/stack/a2dp/include/a2d_int.h | 2 +- components/bt/bluedroid/stack/avct/avct_api.c | 16 +- components/bt/bluedroid/stack/avct/avct_ccb.c | 6 +- components/bt/bluedroid/stack/avct/avct_l2c.c | 14 +- components/bt/bluedroid/stack/avct/avct_lcb.c | 10 +- .../bt/bluedroid/stack/avct/avct_lcb_act.c | 12 +- .../bluedroid/stack/avct/include/avct_int.h | 6 +- components/bt/bluedroid/stack/avdt/avdt_ad.c | 18 +- components/bt/bluedroid/stack/avdt/avdt_api.c | 16 +- components/bt/bluedroid/stack/avdt/avdt_ccb.c | 12 +- .../bt/bluedroid/stack/avdt/avdt_ccb_act.c | 16 +- components/bt/bluedroid/stack/avdt/avdt_l2c.c | 18 +- components/bt/bluedroid/stack/avdt/avdt_msg.c | 14 +- components/bt/bluedroid/stack/avdt/avdt_scb.c | 16 +- .../bt/bluedroid/stack/avdt/avdt_scb_act.c | 14 +- .../bluedroid/stack/avdt/include/avdt_defs.h | 2 +- .../bluedroid/stack/avdt/include/avdt_int.h | 10 +- components/bt/bluedroid/stack/avrc/avrc_api.c | 8 +- .../bt/bluedroid/stack/avrc/avrc_bld_ct.c | 8 +- .../bt/bluedroid/stack/avrc/avrc_bld_tg.c | 10 +- components/bt/bluedroid/stack/avrc/avrc_opt.c | 6 +- .../bt/bluedroid/stack/avrc/avrc_pars_ct.c | 8 +- .../bt/bluedroid/stack/avrc/avrc_pars_tg.c | 6 +- components/bt/bluedroid/stack/avrc/avrc_sdp.c | 6 +- .../bt/bluedroid/stack/avrc/avrc_utils.c | 4 +- .../bluedroid/stack/avrc/include/avrc_int.h | 4 +- components/bt/bluedroid/stack/btm/btm_acl.c | 14 +- components/bt/bluedroid/stack/btm/btm_ble.c | 18 +- .../bt/bluedroid/stack/btm/btm_ble_addr.c | 12 +- .../bluedroid/stack/btm/btm_ble_adv_filter.c | 16 +- .../bluedroid/stack/btm/btm_ble_batchscan.c | 12 +- .../bt/bluedroid/stack/btm/btm_ble_bgconn.c | 14 +- .../bluedroid/stack/btm/btm_ble_cont_energy.c | 12 +- .../bt/bluedroid/stack/btm/btm_ble_gap.c | 14 +- .../bluedroid/stack/btm/btm_ble_multi_adv.c | 14 +- .../bt/bluedroid/stack/btm/btm_ble_privacy.c | 12 +- components/bt/bluedroid/stack/btm/btm_dev.c | 14 +- .../bt/bluedroid/stack/btm/btm_devctl.c | 16 +- components/bt/bluedroid/stack/btm/btm_inq.c | 16 +- components/bt/bluedroid/stack/btm/btm_main.c | 6 +- components/bt/bluedroid/stack/btm/btm_pm.c | 10 +- components/bt/bluedroid/stack/btm/btm_sco.c | 14 +- components/bt/bluedroid/stack/btm/btm_sec.c | 12 +- .../stack/{ => btm}/include/btm_ble_int.h | 10 +- .../stack/{ => btm}/include/btm_int.h | 12 +- components/bt/bluedroid/stack/btu/btu_hcif.c | 20 +-- components/bt/bluedroid/stack/btu/btu_init.c | 24 +-- components/bt/bluedroid/stack/btu/btu_task.c | 30 ++-- components/bt/bluedroid/stack/gap/gap_api.c | 2 +- components/bt/bluedroid/stack/gap/gap_ble.c | 16 +- components/bt/bluedroid/stack/gap/gap_conn.c | 12 +- components/bt/bluedroid/stack/gap/gap_utils.c | 2 +- .../bt/bluedroid/stack/gap/include/gap_int.h | 8 +- .../bt/bluedroid/stack/gatt/att_protocol.c | 6 +- components/bt/bluedroid/stack/gatt/gatt_api.c | 12 +- .../bt/bluedroid/stack/gatt/gatt_attr.c | 6 +- .../bt/bluedroid/stack/gatt/gatt_auth.c | 6 +- components/bt/bluedroid/stack/gatt/gatt_cl.c | 4 +- components/bt/bluedroid/stack/gatt/gatt_db.c | 8 +- .../bt/bluedroid/stack/gatt/gatt_main.c | 6 +- components/bt/bluedroid/stack/gatt/gatt_sr.c | 6 +- .../bt/bluedroid/stack/gatt/gatt_utils.c | 12 +- .../bluedroid/stack/gatt/include/gatt_int.h | 12 +- .../bt/bluedroid/stack/hcic/hciblecmds.c | 12 +- components/bt/bluedroid/stack/hcic/hcicmds.c | 12 +- .../stack/include/{ => stack}/a2d_api.h | 2 +- .../stack/include/{ => stack}/a2d_sbc.h | 0 .../stack/include/{ => stack}/avct_api.h | 4 +- .../stack/include/{ => stack}/avdt_api.h | 4 +- .../stack/include/{ => stack}/avdtc_api.h | 2 +- .../stack/include/{ => stack}/avrc_api.h | 8 +- .../stack/include/{ => stack}/avrc_defs.h | 4 +- .../stack/include/{ => stack}/bt_types.h | 0 .../stack/include/{ => stack}/btm_api.h | 12 +- .../stack/include/{ => stack}/btm_ble_api.h | 6 +- .../bluedroid/stack/include/{ => stack}/btu.h | 4 +- .../stack/include/{ => stack}/dyn_mem.h | 0 .../stack/include/{ => stack}/gap_api.h | 8 +- .../stack/include/{ => stack}/gatt_api.h | 6 +- .../stack/include/{ => stack}/gattdefs.h | 0 .../stack/include/{ => stack}/hcidefs.h | 4 +- .../stack/include/{ => stack}/hcimsgs.h | 6 +- .../stack/include/{ => stack}/hiddefs.h | 4 +- .../stack/include/{ => stack}/hidh_api.h | 4 +- .../stack/include/{ => stack}/l2c_api.h | 6 +- .../stack/include/{ => stack}/l2cap_client.h | 0 .../stack/include/{ => stack}/l2cdefs.h | 0 .../stack/include/{ => stack}/port_api.h | 2 +- .../stack/include/{ => stack}/port_ext.h | 0 .../stack/include/{ => stack}/profiles_api.h | 4 +- .../stack/include/{ => stack}/rfcdefs.h | 0 .../stack/include/{ => stack}/sdp_api.h | 4 +- .../stack/include/{ => stack}/sdpdefs.h | 0 .../stack/include/{ => stack}/smp_api.h | 2 +- .../bluedroid/stack/l2cap/include/l2c_int.h | 10 +- components/bt/bluedroid/stack/l2cap/l2c_api.c | 16 +- components/bt/bluedroid/stack/l2cap/l2c_ble.c | 10 +- components/bt/bluedroid/stack/l2cap/l2c_csm.c | 14 +- components/bt/bluedroid/stack/l2cap/l2c_fcr.c | 16 +- .../bt/bluedroid/stack/l2cap/l2c_link.c | 14 +- .../bt/bluedroid/stack/l2cap/l2c_main.c | 12 +- components/bt/bluedroid/stack/l2cap/l2c_ucd.c | 12 +- .../bt/bluedroid/stack/l2cap/l2c_utils.c | 20 +-- .../bt/bluedroid/stack/l2cap/l2cap_client.c | 18 +- .../bluedroid/stack/rfcomm/include/port_int.h | 10 +- .../bluedroid/stack/rfcomm/include/rfc_int.h | 2 +- .../bt/bluedroid/stack/rfcomm/port_api.c | 16 +- .../bt/bluedroid/stack/rfcomm/port_rfc.c | 14 +- .../bt/bluedroid/stack/rfcomm/port_utils.c | 14 +- .../bt/bluedroid/stack/rfcomm/rfc_l2cap_if.c | 18 +- .../bt/bluedroid/stack/rfcomm/rfc_mx_fsm.c | 18 +- .../bt/bluedroid/stack/rfcomm/rfc_port_fsm.c | 14 +- .../bt/bluedroid/stack/rfcomm/rfc_port_if.c | 10 +- .../bt/bluedroid/stack/rfcomm/rfc_ts_frames.c | 12 +- .../bt/bluedroid/stack/rfcomm/rfc_utils.c | 18 +- .../bt/bluedroid/stack/sdp/include/sdpint.h | 8 +- components/bt/bluedroid/stack/sdp/sdp_api.c | 14 +- components/bt/bluedroid/stack/sdp/sdp_db.c | 12 +- .../bt/bluedroid/stack/sdp/sdp_discovery.c | 16 +- components/bt/bluedroid/stack/sdp/sdp_main.c | 20 +-- .../bt/bluedroid/stack/sdp/sdp_server.c | 16 +- components/bt/bluedroid/stack/sdp/sdp_utils.c | 16 +- components/bt/bluedroid/stack/smp/aes.c | 2 +- .../stack/smp/include/p_256_multprecision.h | 2 +- .../bt/bluedroid/stack/smp/include/smp_int.h | 8 +- .../bluedroid/stack/smp/p_256_multprecision.c | 2 +- components/bt/bluedroid/stack/smp/smp_act.c | 6 +- components/bt/bluedroid/stack/smp/smp_api.c | 12 +- .../bt/bluedroid/stack/smp/smp_br_main.c | 2 +- components/bt/bluedroid/stack/smp/smp_cmac.c | 8 +- components/bt/bluedroid/stack/smp/smp_keys.c | 8 +- components/bt/bluedroid/stack/smp/smp_l2c.c | 8 +- components/bt/bluedroid/stack/smp/smp_main.c | 2 +- components/bt/bluedroid/stack/smp/smp_utils.c | 12 +- components/bt/component.mk | 168 +++++++++--------- docs/Doxyfile | 26 +-- .../bluetooth/controller_vhci.rst | 2 +- .../ble_ibeacon/main/esp_ibeacon_api.c | 6 +- .../ble_ibeacon/main/esp_ibeacon_api.h | 3 +- .../bluetooth/ble_ibeacon/main/ibeacon_demo.c | 7 +- .../ble_spp_client/main/spp_client_demo.c | 4 +- .../bluetooth/gatt_client/main/gattc_demo.c | 3 +- .../main/example_ble_sec_gattc_demo.c | 3 +- .../main/gattc_multi_connect.c | 3 +- 394 files changed, 1821 insertions(+), 1810 deletions(-) rename components/bt/bluedroid/api/include/{ => api}/esp_a2dp_api.h (100%) rename components/bt/bluedroid/api/include/{ => api}/esp_avrc_api.h (100%) rename components/bt/bluedroid/api/include/{ => api}/esp_blufi_api.h (100%) rename components/bt/bluedroid/api/include/{ => api}/esp_bt_defs.h (88%) rename components/bt/bluedroid/api/include/{ => api}/esp_bt_device.h (100%) rename components/bt/bluedroid/api/include/{ => api}/esp_bt_main.h (100%) rename components/bt/bluedroid/api/include/{ => api}/esp_gap_ble_api.h (93%) rename components/bt/bluedroid/api/include/{ => api}/esp_gap_bt_api.h (100%) rename components/bt/bluedroid/api/include/{ => api}/esp_gatt_common_api.h (95%) rename components/bt/bluedroid/api/include/{ => api}/esp_gatt_defs.h (85%) rename components/bt/bluedroid/api/include/{ => api}/esp_gattc_api.h (100%) rename components/bt/bluedroid/api/include/{ => api}/esp_gatts_api.h (100%) rename components/bt/bluedroid/api/include/{ => api}/esp_spp_api.h (97%) rename components/bt/bluedroid/bta/{ => ar}/include/bta_ar_int.h (98%) rename components/bt/bluedroid/bta/{ => av}/include/bta_av_int.h (99%) rename components/bt/bluedroid/{btif => bta/dm}/bta_dm_co.c (98%) rename components/bt/bluedroid/bta/{ => dm}/include/bta_dm_int.h (99%) rename components/bt/bluedroid/{btif => bta/gatt}/bta_gattc_co.c (99%) rename components/bt/bluedroid/{btif => bta/gatt}/bta_gatts_co.c (99%) rename components/bt/bluedroid/bta/{ => gatt}/include/bta_gattc_int.h (99%) rename components/bt/bluedroid/bta/{ => gatt}/include/bta_gatts_int.h (98%) rename components/bt/bluedroid/bta/{ => hh}/include/bta_hh_int.h (99%) rename components/bt/bluedroid/bta/include/{ => bta}/bta_api.h (99%) rename components/bt/bluedroid/bta/include/{ => bta}/bta_ar_api.h (96%) rename components/bt/bluedroid/bta/include/{ => bta}/bta_av_api.h (99%) rename components/bt/bluedroid/bta/include/{ => bta}/bta_av_ci.h (98%) rename components/bt/bluedroid/bta/include/{ => bta}/bta_av_co.h (99%) rename components/bt/bluedroid/bta/include/{ => bta}/bta_av_sbc.h (100%) rename components/bt/bluedroid/bta/include/{ => bta}/bta_dm_ci.h (99%) rename components/bt/bluedroid/bta/include/{ => bta}/bta_dm_co.h (99%) rename components/bt/bluedroid/bta/include/{ => bta}/bta_gatt_api.h (99%) rename components/bt/bluedroid/bta/include/{ => bta}/bta_gatt_common.h (97%) rename components/bt/bluedroid/bta/include/{ => bta}/bta_gattc_ci.h (99%) rename components/bt/bluedroid/bta/include/{ => bta}/bta_gattc_co.h (99%) rename components/bt/bluedroid/bta/include/{ => bta}/bta_gatts_co.h (99%) rename components/bt/bluedroid/bta/include/{ => bta}/bta_hh_api.h (99%) rename components/bt/bluedroid/bta/include/{ => bta}/bta_hh_co.h (99%) rename components/bt/bluedroid/bta/include/{ => bta}/bta_jv_api.h (99%) rename components/bt/bluedroid/bta/include/{ => bta}/bta_jv_co.h (98%) rename components/bt/bluedroid/bta/include/{ => bta}/bta_sdp_api.h (98%) rename components/bt/bluedroid/bta/include/{ => bta}/bta_sys.h (99%) rename components/bt/bluedroid/bta/include/{ => bta}/utl.h (99%) rename components/bt/bluedroid/bta/{ => jv}/include/bta_jv_int.h (98%) rename components/bt/bluedroid/bta/{ => sdp}/include/bta_sdp_int.h (97%) rename components/bt/bluedroid/btc/include/{ => btc}/btc_alarm.h (97%) rename components/bt/bluedroid/btc/include/{ => btc}/btc_ble_storage.h (98%) rename components/bt/bluedroid/btc/include/{ => btc}/btc_common.h (93%) rename components/bt/bluedroid/btc/include/{ => btc}/btc_config.h (98%) rename components/bt/bluedroid/btc/include/{ => btc}/btc_dev.h (97%) rename components/bt/bluedroid/btc/include/{ => btc}/btc_dm.h (98%) rename components/bt/bluedroid/btc/include/{ => btc}/btc_main.h (92%) rename components/bt/bluedroid/btc/include/{ => btc}/btc_manage.h (94%) rename components/bt/bluedroid/btc/include/{ => btc}/btc_profile_queue.h (94%) rename components/bt/bluedroid/btc/include/{ => btc}/btc_sm.h (99%) rename components/bt/bluedroid/btc/include/{ => btc}/btc_storage.h (97%) rename components/bt/bluedroid/btc/include/{ => btc}/btc_task.h (96%) rename components/bt/bluedroid/btc/include/{ => btc}/btc_util.h (96%) rename components/bt/bluedroid/{include => common/include/common}/bt_common_types.h (95%) rename components/bt/bluedroid/{include => common/include/common}/bt_defs.h (96%) rename components/bt/bluedroid/{include => common/include/common}/bt_target.h (99%) rename components/bt/bluedroid/{include => common/include/common}/bt_trace.h (99%) rename components/bt/bluedroid/{hci/include => common/include/common}/bt_vendor_lib.h (100%) rename components/bt/bluedroid/{include => common/include/common}/bte.h (98%) rename components/bt/bluedroid/{include => common/include/common}/bte_appl.h (100%) rename components/bt/bluedroid/{btcore => device}/bdaddr.c (98%) rename components/bt/bluedroid/{btcore/include => device/include/device}/bdaddr.h (97%) rename components/bt/bluedroid/device/include/{ => device}/controller.h (93%) rename components/bt/bluedroid/{btcore/include => device/include/device}/device_features.h (100%) rename components/bt/bluedroid/{btcore/include => device/include/device}/event_mask.h (100%) rename components/bt/bluedroid/device/include/{ => device}/interop.h (96%) rename components/bt/bluedroid/device/include/{ => device}/interop_database.h (98%) rename components/bt/bluedroid/{btcore/include => device/include/device}/version.h (100%) rename components/bt/bluedroid/{include => hci/include/hci}/bt_vendor_lib.h (100%) rename components/bt/bluedroid/hci/include/{ => hci}/buffer_allocator.h (97%) rename components/bt/bluedroid/hci/include/{ => hci}/hci_hal.h (99%) rename components/bt/bluedroid/hci/include/{ => hci}/hci_internals.h (100%) rename components/bt/bluedroid/hci/include/{ => hci}/hci_layer.h (97%) rename components/bt/bluedroid/hci/include/{ => hci}/hci_packet_factory.h (97%) rename components/bt/bluedroid/hci/include/{ => hci}/hci_packet_parser.h (95%) rename components/bt/bluedroid/hci/include/{ => hci}/packet_fragmenter.h (96%) rename components/bt/bluedroid/osi/include/{ => osi}/alarm.h (100%) rename components/bt/bluedroid/osi/include/{ => osi}/allocator.h (100%) rename components/bt/bluedroid/osi/include/{ => osi}/buffer.h (100%) rename components/bt/bluedroid/osi/include/{ => osi}/config.h (100%) rename components/bt/bluedroid/osi/include/{ => osi}/fixed_queue.h (99%) rename components/bt/bluedroid/osi/include/{ => osi}/future.h (98%) rename components/bt/bluedroid/osi/include/{ => osi}/hash_functions.h (97%) rename components/bt/bluedroid/osi/include/{ => osi}/hash_map.h (100%) rename components/bt/bluedroid/osi/include/{ => osi}/list.h (100%) rename components/bt/bluedroid/osi/include/{ => osi}/mutex.h (100%) rename components/bt/bluedroid/osi/include/{ => osi}/osi.h (100%) rename components/bt/bluedroid/osi/include/{ => osi}/semaphore.h (100%) rename components/bt/bluedroid/osi/include/{ => osi}/thread.h (99%) rename components/bt/bluedroid/stack/{ => btm}/include/btm_ble_int.h (99%) rename components/bt/bluedroid/stack/{ => btm}/include/btm_int.h (99%) rename components/bt/bluedroid/stack/include/{ => stack}/a2d_api.h (99%) rename components/bt/bluedroid/stack/include/{ => stack}/a2d_sbc.h (100%) rename components/bt/bluedroid/stack/include/{ => stack}/avct_api.h (99%) rename components/bt/bluedroid/stack/include/{ => stack}/avdt_api.h (99%) rename components/bt/bluedroid/stack/include/{ => stack}/avdtc_api.h (99%) rename components/bt/bluedroid/stack/include/{ => stack}/avrc_api.h (99%) rename components/bt/bluedroid/stack/include/{ => stack}/avrc_defs.h (99%) rename components/bt/bluedroid/stack/include/{ => stack}/bt_types.h (100%) rename components/bt/bluedroid/stack/include/{ => stack}/btm_api.h (99%) rename components/bt/bluedroid/stack/include/{ => stack}/btm_ble_api.h (99%) rename components/bt/bluedroid/stack/include/{ => stack}/btu.h (99%) rename components/bt/bluedroid/stack/include/{ => stack}/dyn_mem.h (100%) rename components/bt/bluedroid/stack/include/{ => stack}/gap_api.h (99%) rename components/bt/bluedroid/stack/include/{ => stack}/gatt_api.h (99%) rename components/bt/bluedroid/stack/include/{ => stack}/gattdefs.h (100%) rename components/bt/bluedroid/stack/include/{ => stack}/hcidefs.h (99%) rename components/bt/bluedroid/stack/include/{ => stack}/hcimsgs.h (99%) rename components/bt/bluedroid/stack/include/{ => stack}/hiddefs.h (98%) rename components/bt/bluedroid/stack/include/{ => stack}/hidh_api.h (99%) rename components/bt/bluedroid/stack/include/{ => stack}/l2c_api.h (99%) rename components/bt/bluedroid/stack/include/{ => stack}/l2cap_client.h (100%) rename components/bt/bluedroid/stack/include/{ => stack}/l2cdefs.h (100%) rename components/bt/bluedroid/stack/include/{ => stack}/port_api.h (99%) rename components/bt/bluedroid/stack/include/{ => stack}/port_ext.h (100%) rename components/bt/bluedroid/stack/include/{ => stack}/profiles_api.h (98%) rename components/bt/bluedroid/stack/include/{ => stack}/rfcdefs.h (100%) rename components/bt/bluedroid/stack/include/{ => stack}/sdp_api.h (99%) rename components/bt/bluedroid/stack/include/{ => stack}/sdpdefs.h (100%) rename components/bt/bluedroid/stack/include/{ => stack}/smp_api.h (99%) diff --git a/components/bt/bluedroid/api/esp_a2dp_api.c b/components/bt/bluedroid/api/esp_a2dp_api.c index 2141ce0c23..a7a2df08d7 100644 --- a/components/bt/bluedroid/api/esp_a2dp_api.c +++ b/components/bt/bluedroid/api/esp_a2dp_api.c @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "bt_target.h" +#include "common/bt_target.h" #include #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 diff --git a/components/bt/bluedroid/api/esp_avrc_api.c b/components/bt/bluedroid/api/esp_avrc_api.c index 2523665c20..3c80c53816 100644 --- a/components/bt/bluedroid/api/esp_avrc_api.c +++ b/components/bt/bluedroid/api/esp_avrc_api.c @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "bt_target.h" +#include "common/bt_target.h" #include #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 diff --git a/components/bt/bluedroid/api/esp_blufi_api.c b/components/bt/bluedroid/api/esp_blufi_api.c index 4ecb6f0061..e6d8648ab8 100644 --- a/components/bt/bluedroid/api/esp_blufi_api.c +++ b/components/bt/bluedroid/api/esp_blufi_api.c @@ -16,11 +16,11 @@ #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" diff --git a/components/bt/bluedroid/api/esp_bt_device.c b/components/bt/bluedroid/api/esp_bt_device.c index c50ada980e..212157e06d 100644 --- a/components/bt/bluedroid/api/esp_bt_device.c +++ b/components/bt/bluedroid/api/esp_bt_device.c @@ -16,9 +16,9 @@ #include #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) { diff --git a/components/bt/bluedroid/api/esp_bt_main.c b/components/bt/bluedroid/api/esp_bt_main.c index b904a0509b..1b4f46c52d 100644 --- a/components/bt/bluedroid/api/esp_bt_main.c +++ b/components/bt/bluedroid/api/esp_bt_main.c @@ -14,11 +14,11 @@ #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; diff --git a/components/bt/bluedroid/api/esp_gap_ble_api.c b/components/bt/bluedroid/api/esp_gap_ble_api.c index 49ec7137a9..a73eca9d67 100644 --- a/components/bt/bluedroid/api/esp_gap_ble_api.c +++ b/components/bt/bluedroid/api/esp_gap_ble_api.c @@ -16,11 +16,11 @@ #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) diff --git a/components/bt/bluedroid/api/esp_gap_bt_api.c b/components/bt/bluedroid/api/esp_gap_bt_api.c index 5d887fa28c..9f3f427861 100644 --- a/components/bt/bluedroid/api/esp_gap_bt_api.c +++ b/components/bt/bluedroid/api/esp_gap_bt_api.c @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "bt_target.h" +#include "common/bt_target.h" #include #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) diff --git a/components/bt/bluedroid/api/esp_gattc_api.c b/components/bt/bluedroid/api/esp_gattc_api.c index 6246cc8fd9..32d840fe95 100644 --- a/components/bt/bluedroid/api/esp_gattc_api.c +++ b/components/bt/bluedroid/api/esp_gattc_api.c @@ -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" diff --git a/components/bt/bluedroid/api/esp_gatts_api.c b/components/bt/bluedroid/api/esp_gatts_api.c index 4d2a6f5f8e..fc1dc81ca2 100644 --- a/components/bt/bluedroid/api/esp_gatts_api.c +++ b/components/bt/bluedroid/api/esp_gatts_api.c @@ -16,10 +16,10 @@ #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)) diff --git a/components/bt/bluedroid/api/esp_spp_api.c b/components/bt/bluedroid/api/esp_spp_api.c index d893525996..fe4db951be 100644 --- a/components/bt/bluedroid/api/esp_spp_api.c +++ b/components/bt/bluedroid/api/esp_spp_api.c @@ -15,11 +15,11 @@ #include #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) diff --git a/components/bt/bluedroid/api/include/esp_a2dp_api.h b/components/bt/bluedroid/api/include/api/esp_a2dp_api.h similarity index 100% rename from components/bt/bluedroid/api/include/esp_a2dp_api.h rename to components/bt/bluedroid/api/include/api/esp_a2dp_api.h diff --git a/components/bt/bluedroid/api/include/esp_avrc_api.h b/components/bt/bluedroid/api/include/api/esp_avrc_api.h similarity index 100% rename from components/bt/bluedroid/api/include/esp_avrc_api.h rename to components/bt/bluedroid/api/include/api/esp_avrc_api.h diff --git a/components/bt/bluedroid/api/include/esp_blufi_api.h b/components/bt/bluedroid/api/include/api/esp_blufi_api.h similarity index 100% rename from components/bt/bluedroid/api/include/esp_blufi_api.h rename to components/bt/bluedroid/api/include/api/esp_blufi_api.h diff --git a/components/bt/bluedroid/api/include/esp_bt_defs.h b/components/bt/bluedroid/api/include/api/esp_bt_defs.h 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 aa3cdb45ad..33f46e8d47 100644 --- a/components/bt/bluedroid/api/include/esp_bt_defs.h +++ b/components/bt/bluedroid/api/include/api/esp_bt_defs.h @@ -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 diff --git a/components/bt/bluedroid/api/include/esp_bt_device.h b/components/bt/bluedroid/api/include/api/esp_bt_device.h similarity index 100% rename from components/bt/bluedroid/api/include/esp_bt_device.h rename to components/bt/bluedroid/api/include/api/esp_bt_device.h diff --git a/components/bt/bluedroid/api/include/esp_bt_main.h b/components/bt/bluedroid/api/include/api/esp_bt_main.h similarity index 100% rename from components/bt/bluedroid/api/include/esp_bt_main.h rename to components/bt/bluedroid/api/include/api/esp_bt_main.h diff --git a/components/bt/bluedroid/api/include/esp_gap_ble_api.h b/components/bt/bluedroid/api/include/api/esp_gap_ble_api.h 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 495c8fb156..fe5bd04eeb 100644 --- a/components/bt/bluedroid/api/include/esp_gap_ble_api.h +++ b/components/bt/bluedroid/api/include/api/esp_gap_ble_api.h @@ -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 diff --git a/components/bt/bluedroid/api/include/esp_gap_bt_api.h b/components/bt/bluedroid/api/include/api/esp_gap_bt_api.h similarity index 100% rename from components/bt/bluedroid/api/include/esp_gap_bt_api.h rename to components/bt/bluedroid/api/include/api/esp_gap_bt_api.h diff --git a/components/bt/bluedroid/api/include/esp_gatt_common_api.h b/components/bt/bluedroid/api/include/api/esp_gatt_common_api.h 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 33bc11250a..6e6d9253b9 100644 --- a/components/bt/bluedroid/api/include/esp_gatt_common_api.h +++ b/components/bt/bluedroid/api/include/api/esp_gatt_common_api.h @@ -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, diff --git a/components/bt/bluedroid/api/include/esp_gatt_defs.h b/components/bt/bluedroid/api/include/api/esp_gatt_defs.h 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 a98069eadb..5383f70e0e 100644 --- a/components/bt/bluedroid/api/include/esp_gatt_defs.h +++ b/components/bt/bluedroid/api/include/api/esp_gatt_defs.h @@ -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_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_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_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 diff --git a/components/bt/bluedroid/api/include/esp_gattc_api.h b/components/bt/bluedroid/api/include/api/esp_gattc_api.h similarity index 100% rename from components/bt/bluedroid/api/include/esp_gattc_api.h rename to components/bt/bluedroid/api/include/api/esp_gattc_api.h diff --git a/components/bt/bluedroid/api/include/esp_gatts_api.h b/components/bt/bluedroid/api/include/api/esp_gatts_api.h similarity index 100% rename from components/bt/bluedroid/api/include/esp_gatts_api.h rename to components/bt/bluedroid/api/include/api/esp_gatts_api.h diff --git a/components/bt/bluedroid/api/include/esp_spp_api.h b/components/bt/bluedroid/api/include/api/esp_spp_api.h similarity index 97% rename from components/bt/bluedroid/api/include/esp_spp_api.h rename to components/bt/bluedroid/api/include/api/esp_spp_api.h index 5a6bb7d463..86e52c8cc8 100644 --- a/components/bt/bluedroid/api/include/esp_spp_api.h +++ b/components/bt/bluedroid/api/include/api/esp_spp_api.h @@ -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 { diff --git a/components/bt/bluedroid/bta/ar/bta_ar.c b/components/bt/bluedroid/bta/ar/bta_ar.c index 9323aa8aa3..c94910cd04 100644 --- a/components/bt/bluedroid/bta/ar/bta_ar.c +++ b/components/bt/bluedroid/bta/ar/bta_ar.c @@ -22,9 +22,9 @@ * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #include -#include "bta_ar_api.h" +#include "bta/bta_ar_api.h" #include "bta_ar_int.h" #if BTA_AR_INCLUDED diff --git a/components/bt/bluedroid/bta/include/bta_ar_int.h b/components/bt/bluedroid/bta/ar/include/bta_ar_int.h 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 e9997ec788..c4af8269aa 100644 --- a/components/bt/bluedroid/bta/include/bta_ar_int.h +++ b/components/bt/bluedroid/bta/ar/include/bta_ar_int.h @@ -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) diff --git a/components/bt/bluedroid/bta/av/bta_av_aact.c b/components/bt/bluedroid/bta/av/bta_av_aact.c index d146607c91..5c0d15de7d 100644 --- a/components/bt/bluedroid/bta/av/bta_av_aact.c +++ b/components/bt/bluedroid/bta/av/bta_av_aact.c @@ -24,22 +24,22 @@ * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #if defined(BTA_AV_INCLUDED) && (BTA_AV_INCLUDED == TRUE) // #include -#include "bt_trace.h" +#include "common/bt_trace.h" #include -#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 /***************************************************************************** diff --git a/components/bt/bluedroid/bta/av/bta_av_act.c b/components/bt/bluedroid/bta/av/bta_av_act.c index 97d240f167..5aa91b84d6 100644 --- a/components/bt/bluedroid/bta/av/bta_av_act.c +++ b/components/bt/bluedroid/bta/av/bta_av_act.c @@ -23,24 +23,24 @@ * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #if defined(BTA_AV_INCLUDED) && (BTA_AV_INCLUDED == TRUE) #include -#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 diff --git a/components/bt/bluedroid/bta/av/bta_av_api.c b/components/bt/bluedroid/bta/av/bta_av_api.c index 7ea9855d8a..0a75551a0e 100644 --- a/components/bt/bluedroid/bta/av/bta_av_api.c +++ b/components/bt/bluedroid/bta/av/bta_av_api.c @@ -24,13 +24,13 @@ * ******************************************************************************/ -#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 diff --git a/components/bt/bluedroid/bta/av/bta_av_cfg.c b/components/bt/bluedroid/bta/av/bta_av_cfg.c index 5774be1d33..144df6ea31 100644 --- a/components/bt/bluedroid/bta/av/bta_av_cfg.c +++ b/components/bt/bluedroid/bta/av/bta_av_cfg.c @@ -25,8 +25,8 @@ #include -#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) diff --git a/components/bt/bluedroid/bta/av/bta_av_ci.c b/components/bt/bluedroid/bta/av/bta_av_ci.c index 8f1426e00c..3c4c95d04e 100644 --- a/components/bt/bluedroid/bta/av/bta_av_ci.c +++ b/components/bt/bluedroid/bta/av/bta_av_ci.c @@ -23,12 +23,12 @@ * ******************************************************************************/ -#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 diff --git a/components/bt/bluedroid/bta/av/bta_av_main.c b/components/bt/bluedroid/bta/av/bta_av_main.c index be141b6e4b..8a376f58c6 100644 --- a/components/bt/bluedroid/bta/av/bta_av_main.c +++ b/components/bt/bluedroid/bta/av/bta_av_main.c @@ -25,20 +25,20 @@ // #include #include -#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 diff --git a/components/bt/bluedroid/bta/av/bta_av_sbc.c b/components/bt/bluedroid/bta/av/bta_av_sbc.c index 9ea59170a3..30f178efb3 100644 --- a/components/bt/bluedroid/bta/av/bta_av_sbc.c +++ b/components/bt/bluedroid/bta/av/bta_av_sbc.c @@ -23,12 +23,12 @@ * ******************************************************************************/ -#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) diff --git a/components/bt/bluedroid/bta/av/bta_av_ssm.c b/components/bt/bluedroid/bta/av/bta_av_ssm.c index c08d77c999..45fa9242be 100644 --- a/components/bt/bluedroid/bta/av/bta_av_ssm.c +++ b/components/bt/bluedroid/bta/av/bta_av_ssm.c @@ -22,11 +22,11 @@ * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #if defined(BTA_AV_INCLUDED) && (BTA_AV_INCLUDED == TRUE) #include -#include "bta_av_co.h" +#include "bta/bta_av_co.h" #include "bta_av_int.h" /***************************************************************************** diff --git a/components/bt/bluedroid/bta/include/bta_av_int.h b/components/bt/bluedroid/bta/av/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 2409c3a480..3a13c0cc52 100644 --- a/components/bt/bluedroid/bta/include/bta_av_int.h +++ b/components/bt/bluedroid/bta/av/include/bta_av_int.h @@ -24,12 +24,12 @@ #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) diff --git a/components/bt/bluedroid/bta/dm/bta_dm_act.c b/components/bt/bluedroid/bta/dm/bta_dm_act.c index df1c453339..fa87d3fe6c 100644 --- a/components/bt/bluedroid/bta/dm/bta_dm_act.c +++ b/components/bt/bluedroid/bta/dm/bta_dm_act.c @@ -23,28 +23,28 @@ * ******************************************************************************/ -#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 -#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 */ diff --git a/components/bt/bluedroid/bta/dm/bta_dm_api.c b/components/bt/bluedroid/bta/dm/bta_dm_api.c index 7558788beb..fdd5f97a93 100644 --- a/components/bt/bluedroid/bta/dm/bta_dm_api.c +++ b/components/bt/bluedroid/bta/dm/bta_dm_api.c @@ -22,15 +22,15 @@ * ******************************************************************************/ -#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 -#include "utl.h" -#include "allocator.h" +#include "bta/utl.h" +#include "osi/allocator.h" /***************************************************************************** ** Constants diff --git a/components/bt/bluedroid/bta/dm/bta_dm_cfg.c b/components/bt/bluedroid/bta/dm/bta_dm_cfg.c index e122177b87..2e22aa77c5 100644 --- a/components/bt/bluedroid/bta/dm/bta_dm_cfg.c +++ b/components/bt/bluedroid/bta/dm/bta_dm_cfg.c @@ -24,11 +24,11 @@ ******************************************************************************/ #include -#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 diff --git a/components/bt/bluedroid/bta/dm/bta_dm_ci.c b/components/bt/bluedroid/bta/dm/bta_dm_ci.c index afceda0c28..e7385013c5 100644 --- a/components/bt/bluedroid/bta/dm/bta_dm_ci.c +++ b/components/bt/bluedroid/bta/dm/bta_dm_ci.c @@ -22,12 +22,12 @@ * ******************************************************************************/ -#include "bta_sys.h" -#include "bta_api.h" +#include "bta/bta_sys.h" +#include "bta/bta_api.h" #include "bta_dm_int.h" #include -#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) diff --git a/components/bt/bluedroid/btif/bta_dm_co.c b/components/bt/bluedroid/bta/dm/bta_dm_co.c 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 f71ebfc44a..9b0b89b3a4 100644 --- a/components/bt/bluedroid/btif/bta_dm_co.c +++ b/components/bt/bluedroid/bta/dm/bta_dm_co.c @@ -18,19 +18,19 @@ #include #include -#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 diff --git a/components/bt/bluedroid/bta/dm/bta_dm_main.c b/components/bt/bluedroid/bta/dm/bta_dm_main.c index 9d3b42d637..75d5ad44c6 100644 --- a/components/bt/bluedroid/bta/dm/bta_dm_main.c +++ b/components/bt/bluedroid/bta/dm/bta_dm_main.c @@ -22,10 +22,10 @@ * ******************************************************************************/ -#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 diff --git a/components/bt/bluedroid/bta/dm/bta_dm_pm.c b/components/bt/bluedroid/bta/dm/bta_dm_pm.c index 7afec045a1..3354a33b2a 100644 --- a/components/bt/bluedroid/bta/dm/bta_dm_pm.c +++ b/components/bt/bluedroid/bta/dm/bta_dm_pm.c @@ -26,10 +26,10 @@ // #include #include -#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) diff --git a/components/bt/bluedroid/bta/dm/bta_dm_sco.c b/components/bt/bluedroid/bta/dm/bta_dm_sco.c index 06e58e9637..45d098f442 100644 --- a/components/bt/bluedroid/bta/dm/bta_dm_sco.c +++ b/components/bt/bluedroid/bta/dm/bta_dm_sco.c @@ -26,8 +26,8 @@ * ******************************************************************************/ #include -#include "bta_api.h" -#include "bta_sys.h" +#include "bta/bta_api.h" +#include "bta/bta_sys.h" #if (BTM_SCO_HCI_INCLUDED == TRUE) diff --git a/components/bt/bluedroid/bta/include/bta_dm_int.h b/components/bt/bluedroid/bta/dm/include/bta_dm_int.h 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 a27c94979f..6461bd4986 100644 --- a/components/bt/bluedroid/bta/include/bta_dm_int.h +++ b/components/bt/bluedroid/bta/dm/include/bta_dm_int.h @@ -24,10 +24,10 @@ #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 diff --git a/components/bt/bluedroid/bta/gatt/bta_gatt_common.c b/components/bt/bluedroid/bta/gatt/bta_gatt_common.c index 3e4a0f73d8..cd36966a58 100644 --- a/components/bt/bluedroid/bta/gatt/bta_gatt_common.c +++ b/components/bt/bluedroid/bta/gatt/bta_gatt_common.c @@ -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) diff --git a/components/bt/bluedroid/bta/gatt/bta_gattc_act.c b/components/bt/bluedroid/bta/gatt/bta_gattc_act.c index c3e729f48b..bc907d2035 100644 --- a/components/bt/bluedroid/bta/gatt/bta_gattc_act.c +++ b/components/bt/bluedroid/bta/gatt/bta_gattc_act.c @@ -24,17 +24,17 @@ ******************************************************************************/ #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" diff --git a/components/bt/bluedroid/bta/gatt/bta_gattc_api.c b/components/bt/bluedroid/bta/gatt/bta_gattc_api.c index ec971d88b4..b7c292a51e 100644 --- a/components/bt/bluedroid/bta/gatt/bta_gattc_api.c +++ b/components/bt/bluedroid/bta/gatt/bta_gattc_api.c @@ -22,14 +22,14 @@ * ******************************************************************************/ -#include "bt_target.h" -#include "allocator.h" +#include "common/bt_target.h" +#include "osi/allocator.h" #if defined(GATTC_INCLUDED) && (GATTC_INCLUDED == TRUE) #include -#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" /***************************************************************************** diff --git a/components/bt/bluedroid/bta/gatt/bta_gattc_cache.c b/components/bt/bluedroid/bta/gatt/bta_gattc_cache.c index c43a2d4911..b17dc9ec0e 100644 --- a/components/bt/bluedroid/bta/gatt/bta_gattc_cache.c +++ b/components/bt/bluedroid/bta/gatt/bta_gattc_cache.c @@ -23,20 +23,20 @@ * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #if defined(GATTC_INCLUDED) && (GATTC_INCLUDED == TRUE) #include -#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" diff --git a/components/bt/bluedroid/bta/gatt/bta_gattc_ci.c b/components/bt/bluedroid/bta/gatt/bta_gattc_ci.c index 19e7748fce..cfe085603a 100644 --- a/components/bt/bluedroid/bta/gatt/bta_gattc_ci.c +++ b/components/bt/bluedroid/bta/gatt/bta_gattc_ci.c @@ -22,17 +22,17 @@ * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #if defined(GATTC_INCLUDED) && (GATTC_INCLUDED == TRUE) #include -#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" /******************************************************************************* diff --git a/components/bt/bluedroid/btif/bta_gattc_co.c b/components/bt/bluedroid/bta/gatt/bta_gattc_co.c 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 56feb4df60..b3d73b6a5e 100644 --- a/components/bt/bluedroid/btif/bta_gattc_co.c +++ b/components/bt/bluedroid/bta/gatt/bta_gattc_co.c @@ -20,15 +20,15 @@ #include #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) diff --git a/components/bt/bluedroid/bta/gatt/bta_gattc_main.c b/components/bt/bluedroid/bta/gatt/bta_gattc_main.c index 5ee5613d71..e20efe499e 100644 --- a/components/bt/bluedroid/bta/gatt/bta_gattc_main.c +++ b/components/bt/bluedroid/bta/gatt/bta_gattc_main.c @@ -22,14 +22,14 @@ * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #if (GATTC_INCLUDED == TRUE && BLE_INCLUDED == TRUE) #include #include "bta_gattc_int.h" -#include "allocator.h" +#include "osi/allocator.h" /***************************************************************************** diff --git a/components/bt/bluedroid/bta/gatt/bta_gattc_utils.c b/components/bt/bluedroid/bta/gatt/bta_gattc_utils.c index 22a6f24b89..35dcb0929e 100644 --- a/components/bt/bluedroid/bta/gatt/bta_gattc_utils.c +++ b/components/bt/bluedroid/bta/gatt/bta_gattc_utils.c @@ -22,19 +22,19 @@ * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #if defined(GATTC_INCLUDED) && (GATTC_INCLUDED == TRUE) #include -#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" /***************************************************************************** diff --git a/components/bt/bluedroid/bta/gatt/bta_gatts_act.c b/components/bt/bluedroid/bta/gatt/bta_gatts_act.c index c93fbe0e05..42f6d97aee 100644 --- a/components/bt/bluedroid/bta/gatt/bta_gatts_act.c +++ b/components/bt/bluedroid/bta/gatt/bta_gatts_act.c @@ -24,17 +24,17 @@ ******************************************************************************/ -#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 -#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, diff --git a/components/bt/bluedroid/bta/gatt/bta_gatts_api.c b/components/bt/bluedroid/bta/gatt/bta_gatts_api.c index 67bc847e03..2985da2e20 100644 --- a/components/bt/bluedroid/bta/gatt/bta_gatts_api.c +++ b/components/bt/bluedroid/bta/gatt/bta_gatts_api.c @@ -22,15 +22,15 @@ * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #if defined(GATTS_INCLUDED) && (GATTS_INCLUDED == TRUE) #include -#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 diff --git a/components/bt/bluedroid/btif/bta_gatts_co.c b/components/bt/bluedroid/bta/gatt/bta_gatts_co.c 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 9469c15832..1bc7881cc9 100644 --- a/components/bt/bluedroid/btif/bta_gatts_co.c +++ b/components/bt/bluedroid/bta/gatt/bta_gatts_co.c @@ -16,14 +16,14 @@ * ******************************************************************************/ -#include "bta_api.h" +#include "bta/bta_api.h" #if( defined BLE_INCLUDED ) && (BLE_INCLUDED == TRUE) #if( defined GATTS_INCLUDED ) && (GATTS_INCLUDED == TRUE) #include #include -#include "bta_gatts_co.h" +#include "bta/bta_gatts_co.h" // #include "btif_util.h" #if (defined(BTIF_INCLUDED) && BTIF_INCLUDED == TRUE) diff --git a/components/bt/bluedroid/bta/gatt/bta_gatts_main.c b/components/bt/bluedroid/bta/gatt/bta_gatts_main.c index 2ca2da566b..3401c2bba1 100644 --- a/components/bt/bluedroid/bta/gatt/bta_gatts_main.c +++ b/components/bt/bluedroid/bta/gatt/bta_gatts_main.c @@ -22,14 +22,14 @@ * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #if defined(GATTS_INCLUDED) && (GATTS_INCLUDED == TRUE) #include #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); diff --git a/components/bt/bluedroid/bta/gatt/bta_gatts_utils.c b/components/bt/bluedroid/bta/gatt/bta_gatts_utils.c index 1862c72d34..e7a0a23f07 100644 --- a/components/bt/bluedroid/bta/gatt/bta_gatts_utils.c +++ b/components/bt/bluedroid/bta/gatt/bta_gatts_utils.c @@ -22,13 +22,13 @@ * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #if defined(GATTS_INCLUDED) && (GATTS_INCLUDED == TRUE) #include -#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, diff --git a/components/bt/bluedroid/bta/include/bta_gattc_int.h b/components/bt/bluedroid/bta/gatt/include/bta_gattc_int.h 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 6df2529f77..26ab73bf56 100644 --- a/components/bt/bluedroid/bta/include/bta_gattc_int.h +++ b/components/bt/bluedroid/bta/gatt/include/bta_gattc_int.h @@ -24,13 +24,13 @@ #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 diff --git a/components/bt/bluedroid/bta/include/bta_gatts_int.h b/components/bt/bluedroid/bta/gatt/include/bta_gatts_int.h 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 9d04423f3d..7f92ec8cb6 100644 --- a/components/bt/bluedroid/bta/include/bta_gatts_int.h +++ b/components/bt/bluedroid/bta/gatt/include/bta_gatts_int.h @@ -24,10 +24,10 @@ #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" /***************************************************************************** diff --git a/components/bt/bluedroid/bta/hh/bta_hh_act.c b/components/bt/bluedroid/bta/hh/bta_hh_act.c index eb0cf7a2af..88a26192a7 100644 --- a/components/bt/bluedroid/bta/hh/bta_hh_act.c +++ b/components/bt/bluedroid/bta/hh/bta_hh_act.c @@ -22,18 +22,18 @@ * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #if defined(BTA_HH_INCLUDED) && (BTA_HH_INCLUDED == TRUE) #include -#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 diff --git a/components/bt/bluedroid/bta/hh/bta_hh_api.c b/components/bt/bluedroid/bta/hh/bta_hh_api.c index 3887ed8d11..ed96d8ee72 100644 --- a/components/bt/bluedroid/bta/hh/bta_hh_api.c +++ b/components/bt/bluedroid/bta/hh/bta_hh_api.c @@ -22,7 +22,7 @@ * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #if defined(BTA_HH_INCLUDED) && (BTA_HH_INCLUDED == TRUE) @@ -30,10 +30,10 @@ #include #include -#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" diff --git a/components/bt/bluedroid/bta/hh/bta_hh_cfg.c b/components/bt/bluedroid/bta/hh/bta_hh_cfg.c index 9362a5d75f..65e06c7345 100644 --- a/components/bt/bluedroid/bta/hh/bta_hh_cfg.c +++ b/components/bt/bluedroid/bta/hh/bta_hh_cfg.c @@ -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) diff --git a/components/bt/bluedroid/bta/hh/bta_hh_le.c b/components/bt/bluedroid/bta/hh/bta_hh_le.c index e933771534..78eca9c2b8 100644 --- a/components/bt/bluedroid/bta/hh/bta_hh_le.c +++ b/components/bt/bluedroid/bta/hh/bta_hh_le.c @@ -16,20 +16,20 @@ * ******************************************************************************/ -#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 -#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" diff --git a/components/bt/bluedroid/bta/hh/bta_hh_main.c b/components/bt/bluedroid/bta/hh/bta_hh_main.c index 0737d40805..fd74672780 100644 --- a/components/bt/bluedroid/bta/hh/bta_hh_main.c +++ b/components/bt/bluedroid/bta/hh/bta_hh_main.c @@ -22,13 +22,13 @@ * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #if defined(BTA_HH_INCLUDED) && (BTA_HH_INCLUDED == TRUE) #include -#include "bta_hh_api.h" +#include "bta/bta_hh_api.h" #include "bta_hh_int.h" /***************************************************************************** diff --git a/components/bt/bluedroid/bta/hh/bta_hh_utils.c b/components/bt/bluedroid/bta/hh/bta_hh_utils.c index 16abfee730..bc2b0db358 100644 --- a/components/bt/bluedroid/bta/hh/bta_hh_utils.c +++ b/components/bt/bluedroid/bta/hh/bta_hh_utils.c @@ -17,7 +17,7 @@ ******************************************************************************/ #include -#include "bt_target.h" +#include "common/bt_target.h" #if defined(BTA_HH_INCLUDED) && (BTA_HH_INCLUDED == TRUE) diff --git a/components/bt/bluedroid/bta/include/bta_hh_int.h b/components/bt/bluedroid/bta/hh/include/bta_hh_int.h 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 e3d296ee76..0eba2dd2dd 100644 --- a/components/bt/bluedroid/bta/include/bta_hh_int.h +++ b/components/bt/bluedroid/bta/hh/include/bta_hh_int.h @@ -25,16 +25,16 @@ #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) diff --git a/components/bt/bluedroid/bta/include/bta_api.h b/components/bt/bluedroid/bta/include/bta/bta_api.h 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 8df5952d62..b2ef0ecd3a 100644 --- a/components/bt/bluedroid/bta/include/bta_api.h +++ b/components/bt/bluedroid/bta/include/bta/bta_api.h @@ -25,14 +25,14 @@ #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. */ diff --git a/components/bt/bluedroid/bta/include/bta_ar_api.h b/components/bt/bluedroid/bta/include/bta/bta_ar_api.h 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 acfac9df44..99cc511e95 100644 --- a/components/bt/bluedroid/bta/include/bta_ar_api.h +++ b/components/bt/bluedroid/bta/include/bta/bta_ar_api.h @@ -26,12 +26,12 @@ #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) diff --git a/components/bt/bluedroid/bta/include/bta_av_api.h b/components/bt/bluedroid/bta/include/bta/bta_av_api.h 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 a7560c9ebc..6e70acf946 100644 --- a/components/bt/bluedroid/bta/include/bta_av_api.h +++ b/components/bt/bluedroid/bta/include/bta/bta_av_api.h @@ -26,10 +26,10 @@ #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) diff --git a/components/bt/bluedroid/bta/include/bta_av_ci.h b/components/bt/bluedroid/bta/include/bta/bta_av_ci.h 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 a537b8a4ca..b39acace6d 100644 --- a/components/bt/bluedroid/bta/include/bta_av_ci.h +++ b/components/bt/bluedroid/bta/include/bta/bta_av_ci.h @@ -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) diff --git a/components/bt/bluedroid/bta/include/bta_av_co.h b/components/bt/bluedroid/bta/include/bta/bta_av_co.h 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 3f7f989d6c..403b7a9217 100644 --- a/components/bt/bluedroid/bta/include/bta_av_co.h +++ b/components/bt/bluedroid/bta/include/bta/bta_av_co.h @@ -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) diff --git a/components/bt/bluedroid/bta/include/bta_av_sbc.h b/components/bt/bluedroid/bta/include/bta/bta_av_sbc.h similarity index 100% rename from components/bt/bluedroid/bta/include/bta_av_sbc.h rename to components/bt/bluedroid/bta/include/bta/bta_av_sbc.h diff --git a/components/bt/bluedroid/bta/include/bta_dm_ci.h b/components/bt/bluedroid/bta/include/bta/bta_dm_ci.h 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 9f8a87437a..90565aac85 100644 --- a/components/bt/bluedroid/bta/include/bta_dm_ci.h +++ b/components/bt/bluedroid/bta/include/bta/bta_dm_ci.h @@ -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 diff --git a/components/bt/bluedroid/bta/include/bta_dm_co.h b/components/bt/bluedroid/bta/include/bta/bta_dm_co.h 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 2a80aefe86..7d62857191 100644 --- a/components/bt/bluedroid/bta/include/bta_dm_co.h +++ b/components/bt/bluedroid/bta/include/bta/bta_dm_co.h @@ -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 diff --git a/components/bt/bluedroid/bta/include/bta_gatt_api.h b/components/bt/bluedroid/bta/include/bta/bta_gatt_api.h 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 936cb3b420..72eb3643b6 100644 --- a/components/bt/bluedroid/bta/include/bta_gatt_api.h +++ b/components/bt/bluedroid/bta/include/bta/bta_gatt_api.h @@ -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 diff --git a/components/bt/bluedroid/bta/include/bta_gatt_common.h b/components/bt/bluedroid/bta/include/bta/bta_gatt_common.h 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 f6bc884b6a..96bd348021 100644 --- a/components/bt/bluedroid/bta/include/bta_gatt_common.h +++ b/components/bt/bluedroid/bta/include/bta/bta_gatt_common.h @@ -21,7 +21,7 @@ * ******************************************************************************/ -#include "bt_types.h" +#include "stack/bt_types.h" #ifdef __cplusplus diff --git a/components/bt/bluedroid/bta/include/bta_gattc_ci.h b/components/bt/bluedroid/bta/include/bta/bta_gattc_ci.h 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 c4caf14990..d523e87ba2 100644 --- a/components/bt/bluedroid/bta/include/bta_gattc_ci.h +++ b/components/bt/bluedroid/bta/include/bta/bta_gattc_ci.h @@ -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 diff --git a/components/bt/bluedroid/bta/include/bta_gattc_co.h b/components/bt/bluedroid/bta/include/bta/bta_gattc_co.h 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 0f4d473bfd..561986f882 100644 --- a/components/bt/bluedroid/bta/include/bta_gattc_co.h +++ b/components/bt/bluedroid/bta/include/bta/bta_gattc_co.h @@ -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" /******************************************************************************* ** diff --git a/components/bt/bluedroid/bta/include/bta_gatts_co.h b/components/bt/bluedroid/bta/include/bta/bta_gatts_co.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 78e001b764..79c70c8b0e 100644 --- a/components/bt/bluedroid/bta/include/bta_gatts_co.h +++ b/components/bt/bluedroid/bta/include/bta/bta_gatts_co.h @@ -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" /******************************************************************************* ** diff --git a/components/bt/bluedroid/bta/include/bta_hh_api.h b/components/bt/bluedroid/bta/include/bta/bta_hh_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 aa9fd0a236..e1bf4017fb 100644 --- a/components/bt/bluedroid/bta/include/bta_hh_api.h +++ b/components/bt/bluedroid/bta/include/bta/bta_hh_api.h @@ -18,12 +18,12 @@ #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 /***************************************************************************** diff --git a/components/bt/bluedroid/bta/include/bta_hh_co.h b/components/bt/bluedroid/bta/include/bta/bta_hh_co.h 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 9cbb155025..f0fef370c8 100644 --- a/components/bt/bluedroid/bta/include/bta_hh_co.h +++ b/components/bt/bluedroid/bta/include/bta/bta_hh_co.h @@ -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; diff --git a/components/bt/bluedroid/bta/include/bta_jv_api.h b/components/bt/bluedroid/bta/include/bta/bta_jv_api.h 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 a9279a846b..bf23aab4e4 100644 --- a/components/bt/bluedroid/bta/include/bta_jv_api.h +++ b/components/bt/bluedroid/bta/include/bta/bta_jv_api.h @@ -24,13 +24,13 @@ #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) /***************************************************************************** diff --git a/components/bt/bluedroid/bta/include/bta_jv_co.h b/components/bt/bluedroid/bta/include/bta/bta_jv_co.h 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 e68096c15c..b37625cfe8 100644 --- a/components/bt/bluedroid/bta/include/bta_jv_co.h +++ b/components/bt/bluedroid/bta/include/bta/bta_jv_co.h @@ -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) /***************************************************************************** diff --git a/components/bt/bluedroid/bta/include/bta_sdp_api.h b/components/bt/bluedroid/bta/include/bta/bta_sdp_api.h 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 6f27f5ccb0..b88c0c263c 100644 --- a/components/bt/bluedroid/bta/include/bta_sdp_api.h +++ b/components/bt/bluedroid/bta/include/bta/bta_sdp_api.h @@ -25,10 +25,10 @@ #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 */ diff --git a/components/bt/bluedroid/bta/include/bta_sys.h b/components/bt/bluedroid/bta/include/bta/bta_sys.h 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 0119008693..a58773de73 100644 --- a/components/bt/bluedroid/bta/include/bta_sys.h +++ b/components/bt/bluedroid/bta/include/bta/bta_sys.h @@ -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 diff --git a/components/bt/bluedroid/bta/include/utl.h b/components/bt/bluedroid/bta/include/bta/utl.h similarity index 99% rename from components/bt/bluedroid/bta/include/utl.h rename to components/bt/bluedroid/bta/include/bta/utl.h index 74653c26e0..a140832f32 100644 --- a/components/bt/bluedroid/bta/include/utl.h +++ b/components/bt/bluedroid/bta/include/bta/utl.h @@ -24,7 +24,7 @@ #ifndef UTL_H #define UTL_H -#include "bt_types.h" +#include "stack/bt_types.h" // #include "bt_utils.h" /***************************************************************************** diff --git a/components/bt/bluedroid/bta/jv/bta_jv_act.c b/components/bt/bluedroid/bta/jv/bta_jv_act.c index b3fe83ae9e..9ce6677456 100644 --- a/components/bt/bluedroid/bta/jv/bta_jv_act.c +++ b/components/bt/bluedroid/bta/jv/bta_jv_act.c @@ -26,25 +26,25 @@ #include #include -#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 -#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) diff --git a/components/bt/bluedroid/bta/jv/bta_jv_api.c b/components/bt/bluedroid/bta/jv/bta_jv_api.c index 3af262a136..e6a686e46f 100644 --- a/components/bt/bluedroid/bta/jv/bta_jv_api.c +++ b/components/bt/bluedroid/bta/jv/bta_jv_api.c @@ -23,19 +23,19 @@ * ******************************************************************************/ -#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 -#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) diff --git a/components/bt/bluedroid/bta/jv/bta_jv_cfg.c b/components/bt/bluedroid/bta/jv/bta_jv_cfg.c index e88aa8cd35..f617dfc513 100644 --- a/components/bt/bluedroid/bta/jv/bta_jv_cfg.c +++ b/components/bt/bluedroid/bta/jv/bta_jv_cfg.c @@ -24,10 +24,10 @@ * ******************************************************************************/ -#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 diff --git a/components/bt/bluedroid/bta/jv/bta_jv_main.c b/components/bt/bluedroid/bta/jv/bta_jv_main.c index 9cce6e07f4..9523d6e893 100644 --- a/components/bt/bluedroid/bta/jv/bta_jv_main.c +++ b/components/bt/bluedroid/bta/jv/bta_jv_main.c @@ -22,11 +22,11 @@ * ******************************************************************************/ -#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) /***************************************************************************** diff --git a/components/bt/bluedroid/bta/include/bta_jv_int.h b/components/bt/bluedroid/bta/jv/include/bta_jv_int.h 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 2ef9ace3ef..4f0ce4405d 100644 --- a/components/bt/bluedroid/bta/include/bta_jv_int.h +++ b/components/bt/bluedroid/bta/jv/include/bta_jv_int.h @@ -24,14 +24,14 @@ #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 "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 "bt_target.h" +#include "common/bt_target.h" #if (defined BTA_JV_INCLUDED && BTA_JV_INCLUDED == TRUE) /***************************************************************************** ** Constants diff --git a/components/bt/bluedroid/bta/sdp/bta_sdp.c b/components/bt/bluedroid/bta/sdp/bta_sdp.c index 61cbbd62e5..4deabe9aff 100644 --- a/components/bt/bluedroid/bta/sdp/bta_sdp.c +++ b/components/bt/bluedroid/bta/sdp/bta_sdp.c @@ -23,10 +23,10 @@ ******************************************************************************/ #include -#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) diff --git a/components/bt/bluedroid/bta/sdp/bta_sdp_act.c b/components/bt/bluedroid/bta/sdp/bta_sdp_act.c index 21e3fd1735..c235800b1d 100644 --- a/components/bt/bluedroid/bta/sdp/bta_sdp_act.c +++ b/components/bt/bluedroid/bta/sdp/bta_sdp_act.c @@ -23,20 +23,20 @@ // #include #include "bt_sdp.h" // #include -#include "bt_defs.h" +#include "common/bt_defs.h" #include #include -#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) diff --git a/components/bt/bluedroid/bta/sdp/bta_sdp_api.c b/components/bt/bluedroid/bta/sdp/bta_sdp_api.c index c49d38e8c0..1d027cb79e 100644 --- a/components/bt/bluedroid/bta/sdp/bta_sdp_api.c +++ b/components/bt/bluedroid/bta/sdp/bta_sdp_api.c @@ -22,14 +22,14 @@ * ******************************************************************************/ -#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 -#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) /***************************************************************************** diff --git a/components/bt/bluedroid/bta/sdp/bta_sdp_cfg.c b/components/bt/bluedroid/bta/sdp/bta_sdp_cfg.c index c515c090c7..fff5e321a2 100644 --- a/components/bt/bluedroid/bta/sdp/bta_sdp_cfg.c +++ b/components/bt/bluedroid/bta/sdp/bta_sdp_cfg.c @@ -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) diff --git a/components/bt/bluedroid/bta/include/bta_sdp_int.h b/components/bt/bluedroid/bta/sdp/include/bta_sdp_int.h 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 9dee3fc963..dfe3546f13 100644 --- a/components/bt/bluedroid/bta/include/bta_sdp_int.h +++ b/components/bt/bluedroid/bta/sdp/include/bta_sdp_int.h @@ -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) /***************************************************************************** diff --git a/components/bt/bluedroid/bta/sys/bta_sys_conn.c b/components/bt/bluedroid/bta/sys/bta_sys_conn.c index 55824e7a7a..4324a6b569 100644 --- a/components/bt/bluedroid/bta/sys/bta_sys_conn.c +++ b/components/bt/bluedroid/bta/sys/bta_sys_conn.c @@ -23,10 +23,10 @@ ******************************************************************************/ #include -#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" /******************************************************************************* ** diff --git a/components/bt/bluedroid/bta/sys/bta_sys_main.c b/components/bt/bluedroid/bta/sys/bta_sys_main.c index 590c907efc..3efd2a39d8 100644 --- a/components/bt/bluedroid/bta/sys/bta_sys_main.c +++ b/components/bt/bluedroid/bta/sys/bta_sys_main.c @@ -26,23 +26,23 @@ // #include #include -#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 */ diff --git a/components/bt/bluedroid/bta/sys/utl.c b/components/bt/bluedroid/bta/sys/utl.c index c0b7bcd8b5..ddaec5aa83 100644 --- a/components/bt/bluedroid/bta/sys/utl.c +++ b/components/bt/bluedroid/bta/sys/utl.c @@ -22,9 +22,9 @@ * ******************************************************************************/ #include -#include "utl.h" -#include "btm_api.h" -#include "allocator.h" +#include "bta/utl.h" +#include "stack/btm_api.h" +#include "osi/allocator.h" /******************************************************************************* ** diff --git a/components/bt/bluedroid/btc/core/btc_alarm.c b/components/bt/bluedroid/btc/core/btc_alarm.c index 15587d6749..9d8d52bcac 100644 --- a/components/bt/bluedroid/btc/core/btc_alarm.c +++ b/components/bt/bluedroid/btc/core/btc_alarm.c @@ -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) { diff --git a/components/bt/bluedroid/btc/core/btc_ble_storage.c b/components/bt/bluedroid/btc/core/btc_ble_storage.c index e2c2b6d3f8..b0dbf2f9e5 100644 --- a/components/bt/bluedroid/btc/core/btc_ble_storage.c +++ b/components/bt/bluedroid/btc/core/btc_ble_storage.c @@ -14,12 +14,12 @@ #include -#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) diff --git a/components/bt/bluedroid/btc/core/btc_config.c b/components/bt/bluedroid/btc/core/btc_config.c index df95701385..4a859340b2 100644 --- a/components/bt/bluedroid/btc/core/btc_config.c +++ b/components/bt/bluedroid/btc/core/btc_config.c @@ -16,18 +16,18 @@ #include #include -#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 "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 "bt_types.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; diff --git a/components/bt/bluedroid/btc/core/btc_dev.c b/components/bt/bluedroid/btc/core/btc_dev.c index b75100055a..976e5a16c6 100644 --- a/components/bt/bluedroid/btc/core/btc_dev.c +++ b/components/bt/bluedroid/btc/core/btc_dev.c @@ -13,10 +13,10 @@ // limitations under the License. #include -#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) { diff --git a/components/bt/bluedroid/btc/core/btc_dm.c b/components/bt/bluedroid/btc/core/btc_dm.c index e073889723..ff82b45f58 100644 --- a/components/bt/bluedroid/btc/core/btc_dm.c +++ b/components/bt/bluedroid/btc/core/btc_dm.c @@ -12,21 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "bt_target.h" +#include "common/bt_target.h" #include #include -#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" diff --git a/components/bt/bluedroid/btc/core/btc_main.c b/components/bt/bluedroid/btc/core/btc_main.c index cb5975be1f..b6c9606be6 100644 --- a/components/bt/bluedroid/btc/core/btc_main.c +++ b/components/bt/bluedroid/btc/core/btc_main.c @@ -12,14 +12,14 @@ // 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" diff --git a/components/bt/bluedroid/btc/core/btc_manage.c b/components/bt/bluedroid/btc/core/btc_manage.c index 32df4440bc..81ecad4103 100644 --- a/components/bt/bluedroid/btc/core/btc_manage.c +++ b/components/bt/bluedroid/btc/core/btc_manage.c @@ -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" diff --git a/components/bt/bluedroid/btc/core/btc_profile_queue.c b/components/bt/bluedroid/btc/core/btc_profile_queue.c index d72f822e70..cd495f0e5f 100644 --- a/components/bt/bluedroid/btc/core/btc_profile_queue.c +++ b/components/bt/bluedroid/btc/core/btc_profile_queue.c @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "bt_target.h" +#include "common/bt_target.h" #include #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 /******************************************************************************* diff --git a/components/bt/bluedroid/btc/core/btc_sm.c b/components/bt/bluedroid/btc/core/btc_sm.c index b3d87f8ee0..cdf75548f7 100644 --- a/components/bt/bluedroid/btc/core/btc_sm.c +++ b/components/bt/bluedroid/btc/core/btc_sm.c @@ -20,11 +20,11 @@ * 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 /***************************************************************************** diff --git a/components/bt/bluedroid/btc/core/btc_storage.c b/components/bt/bluedroid/btc/core/btc_storage.c index 333b768af4..4109bb7a84 100644 --- a/components/bt/bluedroid/btc/core/btc_storage.c +++ b/components/bt/bluedroid/btc/core/btc_storage.c @@ -12,14 +12,14 @@ // 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" /******************************************************************************* ** diff --git a/components/bt/bluedroid/btc/core/btc_task.c b/components/bt/bluedroid/btc/core/btc_task.c index a99751cb2d..be198082cf 100644 --- a/components/bt/bluedroid/btc/core/btc_task.c +++ b/components/bt/bluedroid/btc/core/btc_task.c @@ -14,24 +14,24 @@ #include #include -#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 */ diff --git a/components/bt/bluedroid/btc/core/btc_util.c b/components/bt/bluedroid/btc/core/btc_util.c index 3668e4e9f4..fa95f42163 100644 --- a/components/bt/bluedroid/btc/core/btc_util.c +++ b/components/bt/bluedroid/btc/core/btc_util.c @@ -26,11 +26,11 @@ #include #include -#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 diff --git a/components/bt/bluedroid/btc/include/btc_alarm.h b/components/bt/bluedroid/btc/include/btc/btc_alarm.h 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 ca9640a3f4..39348f0f56 100644 --- a/components/bt/bluedroid/btc/include/btc_alarm.h +++ b/components/bt/bluedroid/btc/include/btc/btc_alarm.h @@ -17,7 +17,7 @@ #define __BTC_ALARM_H__ #include -#include "alarm.h" +#include "osi/alarm.h" /* btc_alarm_args_t */ typedef struct { diff --git a/components/bt/bluedroid/btc/include/btc_ble_storage.h b/components/bt/bluedroid/btc/include/btc/btc_ble_storage.h 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 0d4d43e7c7..9b336815e5 100644 --- a/components/bt/bluedroid/btc/include/btc_ble_storage.h +++ b/components/bt/bluedroid/btc/include/btc/btc_ble_storage.h @@ -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) diff --git a/components/bt/bluedroid/btc/include/btc_common.h b/components/bt/bluedroid/btc/include/btc/btc_common.h 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 6224628971..ae4501b5a8 100644 --- a/components/bt/bluedroid/btc/include/btc_common.h +++ b/components/bt/bluedroid/btc/include/btc/btc_common.h @@ -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);} diff --git a/components/bt/bluedroid/btc/include/btc_config.h b/components/bt/bluedroid/btc/include/btc/btc_config.h 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 dfbdcdbadf..6aec264b6c 100644 --- a/components/bt/bluedroid/btc/include/btc_config.h +++ b/components/bt/bluedroid/btc/include/btc/btc_config.h @@ -18,7 +18,7 @@ #include #include -#include "bt_types.h" +#include "stack/bt_types.h" typedef struct btc_config_section_iter_t btc_config_section_iter_t; diff --git a/components/bt/bluedroid/btc/include/btc_dev.h b/components/bt/bluedroid/btc/include/btc/btc_dev.h 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 dd2e8663a9..1d17663303 100644 --- a/components/bt/bluedroid/btc/include/btc_dev.h +++ b/components/bt/bluedroid/btc/include/btc/btc_dev.h @@ -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 diff --git a/components/bt/bluedroid/btc/include/btc_dm.h b/components/bt/bluedroid/btc/include/btc/btc_dm.h 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 44f4d84c19..b6e7741ef6 100644 --- a/components/bt/bluedroid/btc/include/btc_dm.h +++ b/components/bt/bluedroid/btc/include/btc/btc_dm.h @@ -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 diff --git a/components/bt/bluedroid/btc/include/btc_main.h b/components/bt/bluedroid/btc/include/btc/btc_main.h 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 b95ae0bbec..40b9ef32c2 100644 --- a/components/bt/bluedroid/btc/include/btc_main.h +++ b/components/bt/bluedroid/btc/include/btc/btc_main.h @@ -15,11 +15,11 @@ #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, diff --git a/components/bt/bluedroid/btc/include/btc_manage.h b/components/bt/bluedroid/btc/include/btc/btc_manage.h 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 8789f543dd..46f746e8df 100644 --- a/components/bt/bluedroid/btc/include/btc_manage.h +++ b/components/bt/bluedroid/btc/include/btc/btc_manage.h @@ -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 */ diff --git a/components/bt/bluedroid/btc/include/btc_profile_queue.h b/components/bt/bluedroid/btc/include/btc/btc_profile_queue.h 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 39b897e96c..93270ff4cf 100644 --- a/components/bt/bluedroid/btc/include/btc_profile_queue.h +++ b/components/bt/bluedroid/btc/include/btc/btc_profile_queue.h @@ -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, diff --git a/components/bt/bluedroid/btc/include/btc_sm.h b/components/bt/bluedroid/btc/include/btc/btc_sm.h 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 b8e95b9900..92acc6a1f3 100644 --- a/components/bt/bluedroid/btc/include/btc_sm.h +++ b/components/bt/bluedroid/btc/include/btc/btc_sm.h @@ -15,7 +15,7 @@ /***************************************************************************** * - * Filename: btc_sm.h + * Filename: btc/btc_sm.h * * Description: Generic BTC state machine API * diff --git a/components/bt/bluedroid/btc/include/btc_storage.h b/components/bt/bluedroid/btc/include/btc/btc_storage.h 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 9e69b4139e..5e54cb705b 100644 --- a/components/bt/bluedroid/btc/include/btc_storage.h +++ b/components/bt/bluedroid/btc/include/btc/btc_storage.h @@ -16,8 +16,8 @@ #define __BTC_STORAGE_H__ #include -#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" diff --git a/components/bt/bluedroid/btc/include/btc_task.h b/components/bt/bluedroid/btc/include/btc/btc_task.h 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 16388c685b..401f8ee7bb 100644 --- a/components/bt/bluedroid/btc/include/btc_task.h +++ b/components/bt/bluedroid/btc/include/btc/btc_task.h @@ -16,9 +16,9 @@ #define __BTC_TASK_H__ #include -#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 diff --git a/components/bt/bluedroid/btc/include/btc_util.h b/components/bt/bluedroid/btc/include/btc/btc_util.h 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 d2bfdcca87..9787a91946 100644 --- a/components/bt/bluedroid/btc/include/btc_util.h +++ b/components/bt/bluedroid/btc/include/btc/btc_util.h @@ -16,8 +16,8 @@ #define __BTC_UTIL_H__ #include -#include "bt_types.h" -#include "bt_defs.h" +#include "stack/bt_types.h" +#include "common/bt_defs.h" #include "esp_bt_defs.h" /******************************************************************************* diff --git a/components/bt/bluedroid/btc/profile/esp/ble_button/button_pro.c b/components/bt/bluedroid/btc/profile/esp/ble_button/button_pro.c index 74d496c3e5..506356b33c 100644 --- a/components/bt/bluedroid/btc/profile/esp/ble_button/button_pro.c +++ b/components/bt/bluedroid/btc/profile/esp/ble_button/button_pro.c @@ -19,12 +19,12 @@ #include -#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" diff --git a/components/bt/bluedroid/btc/profile/esp/blufi/blufi_prf.c b/components/bt/bluedroid/btc/profile/esp/blufi/blufi_prf.c index 08b9e8287c..de58b0201e 100644 --- a/components/bt/bluedroid/btc/profile/esp/blufi/blufi_prf.c +++ b/components/bt/bluedroid/btc/profile/esp/blufi/blufi_prf.c @@ -19,18 +19,18 @@ #include -#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" diff --git a/components/bt/bluedroid/btc/profile/esp/blufi/blufi_protocol.c b/components/bt/bluedroid/btc/profile/esp/blufi/blufi_protocol.c index 50e8d275ef..19ab994ba6 100644 --- a/components/bt/bluedroid/btc/profile/esp/blufi/blufi_protocol.c +++ b/components/bt/bluedroid/btc/profile/esp/blufi/blufi_protocol.c @@ -19,17 +19,17 @@ #include -#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" diff --git a/components/bt/bluedroid/btc/profile/esp/include/btc_blufi_prf.h b/components/bt/bluedroid/btc/profile/esp/include/btc_blufi_prf.h index 06154673a8..e79b896f88 100644 --- a/components/bt/bluedroid/btc/profile/esp/include/btc_blufi_prf.h +++ b/components/bt/bluedroid/btc/profile/esp/include/btc_blufi_prf.h @@ -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 { diff --git a/components/bt/bluedroid/btc/profile/esp/include/button_pro.h b/components/bt/bluedroid/btc/profile/esp/include/button_pro.h index cbc2d68d51..489acf5931 100644 --- a/components/bt/bluedroid/btc/profile/esp/include/button_pro.h +++ b/components/bt/bluedroid/btc/profile/esp/include/button_pro.h @@ -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 diff --git a/components/bt/bluedroid/btc/profile/esp/include/wx_airsync_prf.h b/components/bt/bluedroid/btc/profile/esp/include/wx_airsync_prf.h index f008ce6438..42b9036f34 100644 --- a/components/bt/bluedroid/btc/profile/esp/include/wx_airsync_prf.h +++ b/components/bt/bluedroid/btc/profile/esp/include/wx_airsync_prf.h @@ -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" diff --git a/components/bt/bluedroid/btc/profile/esp/wechat_AirSync/wx_airsync_prf.c b/components/bt/bluedroid/btc/profile/esp/wechat_AirSync/wx_airsync_prf.c index 06d159aa32..2620b60d82 100644 --- a/components/bt/bluedroid/btc/profile/esp/wechat_AirSync/wx_airsync_prf.c +++ b/components/bt/bluedroid/btc/profile/esp/wechat_AirSync/wx_airsync_prf.c @@ -22,12 +22,12 @@ #include #include -#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" diff --git a/components/bt/bluedroid/btc/profile/std/a2dp/bta_av_co.c b/components/bt/bluedroid/btc/profile/std/a2dp/bta_av_co.c index d6c3605441..fc1f3e836f 100644 --- a/components/bt/bluedroid/btc/profile/std/a2dp/bta_av_co.c +++ b/components/bt/bluedroid/btc/profile/std/a2dp/bta_av_co.c @@ -23,19 +23,19 @@ * ******************************************************************************/ #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 diff --git a/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp.c b/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp.c index 29004c2f2a..3987d05c87 100644 --- a/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp.c +++ b/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp.c @@ -17,10 +17,10 @@ * 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" diff --git a/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_control.c b/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_control.c index c3ae55572e..6c6f30f1a9 100644 --- a/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_control.c +++ b/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_control.c @@ -17,12 +17,12 @@ * Filename: btc_a2dp_control.c * *****************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #include -#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" diff --git a/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_sink.c b/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_sink.c index 28de53691e..e5747e62be 100644 --- a/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_sink.c +++ b/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_sink.c @@ -17,30 +17,30 @@ ** Name: btc_a2dp_sink.c ** ******************************************************************************/ -#include "bt_target.h" -#include "bt_trace.h" +#include "common/bt_target.h" +#include "common/bt_trace.h" #include #include -#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 #if (BTC_AV_SINK_INCLUDED == TRUE) diff --git a/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_source.c b/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_source.c index ea138ab4fb..827542dc18 100644 --- a/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_source.c +++ b/components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_source.c @@ -17,35 +17,35 @@ ** Name: btc_a2dp_source.c ** ******************************************************************************/ -#include "bt_target.h" -#include "bt_trace.h" +#include "common/bt_target.h" +#include "common/bt_trace.h" #include #include #include #include #include #include -#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 #if BTC_AV_SRC_INCLUDED diff --git a/components/bt/bluedroid/btc/profile/std/a2dp/btc_av.c b/components/bt/bluedroid/btc/profile/std/a2dp/btc_av.c index 3d54d79770..b9099a76d6 100644 --- a/components/bt/bluedroid/btc/profile/std/a2dp/btc_av.c +++ b/components/bt/bluedroid/btc/profile/std/a2dp/btc_av.c @@ -19,20 +19,20 @@ * Description: AV implementation * *****************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #include -#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" diff --git a/components/bt/bluedroid/btc/profile/std/avrc/btc_avrc.c b/components/bt/bluedroid/btc/profile/std/avrc/btc_avrc.c index eb6be23de7..4d061aed90 100644 --- a/components/bt/bluedroid/btc/profile/std/avrc/btc_avrc.c +++ b/components/bt/bluedroid/btc/profile/std/avrc/btc_avrc.c @@ -19,19 +19,19 @@ * Description: Bluetooth AVRC implementation * *****************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #include -#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 diff --git a/components/bt/bluedroid/btc/profile/std/battery/battery_prf.c b/components/bt/bluedroid/btc/profile/std/battery/battery_prf.c index 63558cd621..d11a09f1bb 100644 --- a/components/bt/bluedroid/btc/profile/std/battery/battery_prf.c +++ b/components/bt/bluedroid/btc/profile/std/battery/battery_prf.c @@ -18,14 +18,14 @@ #include //#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 diff --git a/components/bt/bluedroid/btc/profile/std/battery/include/srvc_battery_int.h b/components/bt/bluedroid/btc/profile/std/battery/include/srvc_battery_int.h index 4979f101ed..7aee0ff15d 100644 --- a/components/bt/bluedroid/btc/profile/std/battery/include/srvc_battery_int.h +++ b/components/bt/bluedroid/btc/profile/std/battery/include/srvc_battery_int.h @@ -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 diff --git a/components/bt/bluedroid/btc/profile/std/dis/dis_profile.c b/components/bt/bluedroid/btc/profile/std/dis/dis_profile.c index f880428353..117219de2c 100644 --- a/components/bt/bluedroid/btc/profile/std/dis/dis_profile.c +++ b/components/bt/bluedroid/btc/profile/std/dis/dis_profile.c @@ -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" @@ -26,14 +26,14 @@ #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 diff --git a/components/bt/bluedroid/btc/profile/std/dis/include/srvc_dis_int.h b/components/bt/bluedroid/btc/profile/std/dis/include/srvc_dis_int.h index 5da32d1e46..4d5913ab25 100644 --- a/components/bt/bluedroid/btc/profile/std/dis/include/srvc_dis_int.h +++ b/components/bt/bluedroid/btc/profile/std/dis/include/srvc_dis_int.h @@ -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 diff --git a/components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c b/components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c index 93df5ba0d2..741a76dfbf 100644 --- a/components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c +++ b/components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c @@ -14,19 +14,19 @@ #include -#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; diff --git a/components/bt/bluedroid/btc/profile/std/gap/btc_gap_bt.c b/components/bt/bluedroid/btc/profile/std/gap/btc_gap_bt.c index aef3e10ded..20f7d32811 100644 --- a/components/bt/bluedroid/btc/profile/std/gap/btc_gap_bt.c +++ b/components/bt/bluedroid/btc/profile/std/gap/btc_gap_bt.c @@ -16,12 +16,12 @@ #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) diff --git a/components/bt/bluedroid/btc/profile/std/gatt/btc_gatt_common.c b/components/bt/bluedroid/btc/profile/std/gatt/btc_gatt_common.c index af34c7108f..c78ddedbf4 100644 --- a/components/bt/bluedroid/btc/profile/std/gatt/btc_gatt_common.c +++ b/components/bt/bluedroid/btc/profile/std/gatt/btc_gatt_common.c @@ -12,16 +12,16 @@ // 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) diff --git a/components/bt/bluedroid/btc/profile/std/gatt/btc_gattc.c b/components/bt/bluedroid/btc/profile/std/gatt/btc_gattc.c index 24017aece1..a6273d14bb 100644 --- a/components/bt/bluedroid/btc/profile/std/gatt/btc_gattc.c +++ b/components/bt/bluedroid/btc/profile/std/gatt/btc_gattc.c @@ -14,13 +14,13 @@ #include -#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) diff --git a/components/bt/bluedroid/btc/profile/std/gatt/btc_gatts.c b/components/bt/bluedroid/btc/profile/std/gatt/btc_gatts.c index ae74c5ad38..a265057d5b 100644 --- a/components/bt/bluedroid/btc/profile/std/gatt/btc_gatts.c +++ b/components/bt/bluedroid/btc/profile/std/gatt/btc_gatts.c @@ -14,15 +14,15 @@ #include -#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) diff --git a/components/bt/bluedroid/btc/profile/std/hid/include/hidh_int.h b/components/bt/bluedroid/btc/profile/std/hid/include/hidh_int.h index a1d40781d7..20eda6e3a0 100644 --- a/components/bt/bluedroid/btc/profile/std/hid/include/hidh_int.h +++ b/components/bt/bluedroid/btc/profile/std/hid/include/hidh_int.h @@ -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) diff --git a/components/bt/bluedroid/btc/profile/std/include/bt_sdp.h b/components/bt/bluedroid/btc/profile/std/include/bt_sdp.h index da7f7744d3..b2da0873a5 100644 --- a/components/bt/bluedroid/btc/profile/std/include/bt_sdp.h +++ b/components/bt/bluedroid/btc/profile/std/include/bt_sdp.h @@ -19,7 +19,7 @@ #include // #include "bluetooth.h" -#include "bt_defs.h" +#include "common/bt_defs.h" #define SDP_OPP_SUPPORTED_FORMATS_MAX_LENGTH 15 diff --git a/components/bt/bluedroid/btc/profile/std/include/btc_a2dp.h b/components/bt/bluedroid/btc/profile/std/include/btc_a2dp.h index 6243eb43bd..8421cc46af 100644 --- a/components/bt/bluedroid/btc/profile/std/include/btc_a2dp.h +++ b/components/bt/bluedroid/btc/profile/std/include/btc_a2dp.h @@ -24,8 +24,8 @@ #define __BTC_A2DP_H__ #include -#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" diff --git a/components/bt/bluedroid/btc/profile/std/include/btc_a2dp_control.h b/components/bt/bluedroid/btc/profile/std/include/btc_a2dp_control.h index e1d5e2ff66..a3ba543268 100644 --- a/components/bt/bluedroid/btc/profile/std/include/btc_a2dp_control.h +++ b/components/bt/bluedroid/btc/profile/std/include/btc_a2dp_control.h @@ -22,8 +22,8 @@ #define __BTC_A2DP_CONTROL_H__ #include -#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" diff --git a/components/bt/bluedroid/btc/profile/std/include/btc_a2dp_sink.h b/components/bt/bluedroid/btc/profile/std/include/btc_a2dp_sink.h index 772ffea6d8..baf5b65a6d 100644 --- a/components/bt/bluedroid/btc/profile/std/include/btc_a2dp_sink.h +++ b/components/bt/bluedroid/btc/profile/std/include/btc_a2dp_sink.h @@ -22,8 +22,8 @@ #define __BTC_A2DP_SINK_H__ #include -#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" diff --git a/components/bt/bluedroid/btc/profile/std/include/btc_a2dp_source.h b/components/bt/bluedroid/btc/profile/std/include/btc_a2dp_source.h index 214c9e7235..cfde021640 100644 --- a/components/bt/bluedroid/btc/profile/std/include/btc_a2dp_source.h +++ b/components/bt/bluedroid/btc/profile/std/include/btc_a2dp_source.h @@ -22,8 +22,8 @@ #define __BTC_A2DP_SOURCE_H__ #include -#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" diff --git a/components/bt/bluedroid/btc/profile/std/include/btc_av.h b/components/bt/bluedroid/btc/profile/std/include/btc_av.h index 312958b0c9..78cf7cf0d9 100644 --- a/components/bt/bluedroid/btc/profile/std/include/btc_av.h +++ b/components/bt/bluedroid/btc/profile/std/include/btc_av.h @@ -25,12 +25,12 @@ #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) /******************************************************************************* diff --git a/components/bt/bluedroid/btc/profile/std/include/btc_av_api.h b/components/bt/bluedroid/btc/profile/std/include/btc_av_api.h index 7d5f376d6f..39dafa238d 100644 --- a/components/bt/bluedroid/btc/profile/std/include/btc_av_api.h +++ b/components/bt/bluedroid/btc/profile/std/include/btc_av_api.h @@ -25,10 +25,10 @@ #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) /***************************************************************************** diff --git a/components/bt/bluedroid/btc/profile/std/include/btc_avrc.h b/components/bt/bluedroid/btc/profile/std/include/btc_avrc.h index 836696433f..2a66b8b275 100644 --- a/components/bt/bluedroid/btc/profile/std/include/btc_avrc.h +++ b/components/bt/bluedroid/btc/profile/std/include/btc_avrc.h @@ -19,9 +19,9 @@ #include #include -#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 diff --git a/components/bt/bluedroid/btc/profile/std/include/btc_gap_bt.h b/components/bt/bluedroid/btc/profile/std/include/btc_gap_bt.h index 440fb4e053..1dc6653125 100644 --- a/components/bt/bluedroid/btc/profile/std/include/btc_gap_bt.h +++ b/components/bt/bluedroid/btc/profile/std/include/btc_gap_bt.h @@ -15,11 +15,11 @@ #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) diff --git a/components/bt/bluedroid/btc/profile/std/include/btc_gatt_common.h b/components/bt/bluedroid/btc/profile/std/include/btc_gatt_common.h index 41b0fee54e..4cb6e9277b 100644 --- a/components/bt/bluedroid/btc/profile/std/include/btc_gatt_common.h +++ b/components/bt/bluedroid/btc/profile/std/include/btc_gatt_common.h @@ -15,11 +15,11 @@ #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, diff --git a/components/bt/bluedroid/btc/profile/std/include/btc_gatt_util.h b/components/bt/bluedroid/btc/profile/std/include/btc_gatt_util.h index 99083f74f9..3daffa15e5 100644 --- a/components/bt/bluedroid/btc/profile/std/include/btc_gatt_util.h +++ b/components/bt/bluedroid/btc/profile/std/include/btc_gatt_util.h @@ -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" diff --git a/components/bt/bluedroid/btc/profile/std/include/btc_gattc.h b/components/bt/bluedroid/btc/profile/std/include/btc_gattc.h index 68d6e57664..afc3e4ba91 100644 --- a/components/bt/bluedroid/btc/profile/std/include/btc_gattc.h +++ b/components/bt/bluedroid/btc/profile/std/include/btc_gattc.h @@ -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" diff --git a/components/bt/bluedroid/btc/profile/std/include/btc_gatts.h b/components/bt/bluedroid/btc/profile/std/include/btc_gatts.h index 00f73875c1..e4b57589d5 100644 --- a/components/bt/bluedroid/btc/profile/std/include/btc_gatts.h +++ b/components/bt/bluedroid/btc/profile/std/include/btc_gatts.h @@ -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" diff --git a/components/bt/bluedroid/btc/profile/std/include/btc_spp.h b/components/bt/bluedroid/btc/profile/std/include/btc_spp.h index 631c69646e..a75fc1d626 100644 --- a/components/bt/bluedroid/btc/profile/std/include/btc_spp.h +++ b/components/bt/bluedroid/btc/profile/std/include/btc_spp.h @@ -15,11 +15,11 @@ #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) diff --git a/components/bt/bluedroid/btc/profile/std/include/dis_api.h b/components/bt/bluedroid/btc/profile/std/include/dis_api.h index 5b8cfc5f78..7edbd67dcc 100644 --- a/components/bt/bluedroid/btc/profile/std/include/dis_api.h +++ b/components/bt/bluedroid/btc/profile/std/include/dis_api.h @@ -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 diff --git a/components/bt/bluedroid/btc/profile/std/include/hid_le_prf.h b/components/bt/bluedroid/btc/profile/std/include/hid_le_prf.h index 6436573f81..3b567d0c2d 100644 --- a/components/bt/bluedroid/btc/profile/std/include/hid_le_prf.h +++ b/components/bt/bluedroid/btc/profile/std/include/hid_le_prf.h @@ -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 diff --git a/components/bt/bluedroid/btc/profile/std/include/srvc_api.h b/components/bt/bluedroid/btc/profile/std/include/srvc_api.h index a7a46b8e8f..e84a86beb6 100644 --- a/components/bt/bluedroid/btc/profile/std/include/srvc_api.h +++ b/components/bt/bluedroid/btc/profile/std/include/srvc_api.h @@ -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 diff --git a/components/bt/bluedroid/btc/profile/std/smp/include/esp_sec_api.h b/components/bt/bluedroid/btc/profile/std/smp/include/esp_sec_api.h index f9b0f9ec14..d576a6cd0e 100644 --- a/components/bt/bluedroid/btc/profile/std/smp/include/esp_sec_api.h +++ b/components/bt/bluedroid/btc/profile/std/smp/include/esp_sec_api.h @@ -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 diff --git a/components/bt/bluedroid/btc/profile/std/spp/btc_spp.c b/components/bt/bluedroid/btc/profile/std/spp/btc_spp.c index b08e5eec8b..d39bcc804b 100644 --- a/components/bt/bluedroid/btc/profile/std/spp/btc_spp.c +++ b/components/bt/bluedroid/btc/profile/std/spp/btc_spp.c @@ -15,15 +15,15 @@ #include #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 #include #include diff --git a/components/bt/bluedroid/include/bt_common_types.h b/components/bt/bluedroid/common/include/common/bt_common_types.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 abd213fbf4..a6b3491885 100644 --- a/components/bt/bluedroid/include/bt_common_types.h +++ b/components/bt/bluedroid/common/include/common/bt_common_types.h @@ -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); diff --git a/components/bt/bluedroid/include/bt_defs.h b/components/bt/bluedroid/common/include/common/bt_defs.h similarity index 96% rename from components/bt/bluedroid/include/bt_defs.h rename to components/bt/bluedroid/common/include/common/bt_defs.h index db3ce4bff4..51ba9a9de1 100644 --- a/components/bt/bluedroid/include/bt_defs.h +++ b/components/bt/bluedroid/common/include/common/bt_defs.h @@ -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 #include -#include "bt_trace.h" -#include "bt_target.h" +#include "common/bt_trace.h" +#include "common/bt_target.h" #define UNUSED(x) (void)(x) diff --git a/components/bt/bluedroid/include/bt_target.h b/components/bt/bluedroid/common/include/common/bt_target.h similarity index 99% rename from components/bt/bluedroid/include/bt_target.h rename to components/bt/bluedroid/common/include/common/bt_target.h index 5be76cc0a1..55b84b808f 100644 --- a/components/bt/bluedroid/include/bt_target.h +++ b/components/bt/bluedroid/common/include/common/bt_target.h @@ -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 */ diff --git a/components/bt/bluedroid/include/bt_trace.h b/components/bt/bluedroid/common/include/common/bt_trace.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 d6ded21967..b95dd3a8b7 100644 --- a/components/bt/bluedroid/include/bt_trace.h +++ b/components/bt/bluedroid/common/include/common/bt_trace.h @@ -21,7 +21,7 @@ #include "sdkconfig.h" #include -#include "bt_types.h" +#include "stack/bt_types.h" #include "esp_log.h" diff --git a/components/bt/bluedroid/hci/include/bt_vendor_lib.h b/components/bt/bluedroid/common/include/common/bt_vendor_lib.h similarity index 100% rename from components/bt/bluedroid/hci/include/bt_vendor_lib.h rename to components/bt/bluedroid/common/include/common/bt_vendor_lib.h diff --git a/components/bt/bluedroid/include/bte.h b/components/bt/bluedroid/common/include/common/bte.h similarity index 98% rename from components/bt/bluedroid/include/bte.h rename to components/bt/bluedroid/common/include/common/bte.h index 171967cfc3..4bef635af6 100644 --- a/components/bt/bluedroid/include/bte.h +++ b/components/bt/bluedroid/common/include/common/bte.h @@ -24,10 +24,10 @@ #ifndef BTE_H #define BTE_H -//#include +//#include //#include //#include -#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 diff --git a/components/bt/bluedroid/include/bte_appl.h b/components/bt/bluedroid/common/include/common/bte_appl.h similarity index 100% rename from components/bt/bluedroid/include/bte_appl.h rename to components/bt/bluedroid/common/include/common/bte_appl.h diff --git a/components/bt/bluedroid/btcore/bdaddr.c b/components/bt/bluedroid/device/bdaddr.c similarity index 98% rename from components/bt/bluedroid/btcore/bdaddr.c rename to components/bt/bluedroid/device/bdaddr.c index e2466fa6bb..6317979ab5 100644 --- a/components/bt/bluedroid/btcore/bdaddr.c +++ b/components/bt/bluedroid/device/bdaddr.c @@ -18,8 +18,8 @@ #include #include -#include "bt_trace.h" -#include "bdaddr.h" +#include "common/bt_trace.h" +#include "device/bdaddr.h" static inline bool ets_isxdigit(char c) { diff --git a/components/bt/bluedroid/device/controller.c b/components/bt/bluedroid/device/controller.c index 176eb8f29b..93ef5384e8 100644 --- a/components/bt/bluedroid/device/controller.c +++ b/components/bt/bluedroid/device/controller.c @@ -16,18 +16,18 @@ * ******************************************************************************/ #include -#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" }; diff --git a/components/bt/bluedroid/btcore/include/bdaddr.h b/components/bt/bluedroid/device/include/device/bdaddr.h similarity index 97% rename from components/bt/bluedroid/btcore/include/bdaddr.h rename to components/bt/bluedroid/device/include/device/bdaddr.h index 87acad2e00..611fcf0e25 100644 --- a/components/bt/bluedroid/btcore/include/bdaddr.h +++ b/components/bt/bluedroid/device/include/device/bdaddr.h @@ -22,8 +22,8 @@ #include #include -#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 diff --git a/components/bt/bluedroid/device/include/controller.h b/components/bt/bluedroid/device/include/device/controller.h similarity index 93% rename from components/bt/bluedroid/device/include/controller.h rename to components/bt/bluedroid/device/include/device/controller.h index bffa714f43..b2806d69b8 100644 --- a/components/bt/bluedroid/device/include/controller.h +++ b/components/bt/bluedroid/device/include/device/controller.h @@ -22,12 +22,12 @@ #include #include -#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); diff --git a/components/bt/bluedroid/btcore/include/device_features.h b/components/bt/bluedroid/device/include/device/device_features.h similarity index 100% rename from components/bt/bluedroid/btcore/include/device_features.h rename to components/bt/bluedroid/device/include/device/device_features.h diff --git a/components/bt/bluedroid/btcore/include/event_mask.h b/components/bt/bluedroid/device/include/device/event_mask.h similarity index 100% rename from components/bt/bluedroid/btcore/include/event_mask.h rename to components/bt/bluedroid/device/include/device/event_mask.h diff --git a/components/bt/bluedroid/device/include/interop.h b/components/bt/bluedroid/device/include/device/interop.h similarity index 96% rename from components/bt/bluedroid/device/include/interop.h rename to components/bt/bluedroid/device/include/device/interop.h index a90c44ad29..64f27adb39 100644 --- a/components/bt/bluedroid/device/include/interop.h +++ b/components/bt/bluedroid/device/include/device/interop.h @@ -20,8 +20,8 @@ #define _INTEROP_H_ #include -#include "bt_defs.h" -#include "bt_target.h" +#include "common/bt_defs.h" +#include "common/bt_target.h" typedef enum { // Disable secure connections diff --git a/components/bt/bluedroid/device/include/interop_database.h b/components/bt/bluedroid/device/include/device/interop_database.h 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 5b9bc934a7..7122490557 100644 --- a/components/bt/bluedroid/device/include/interop_database.h +++ b/components/bt/bluedroid/device/include/device/interop_database.h @@ -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; diff --git a/components/bt/bluedroid/btcore/include/version.h b/components/bt/bluedroid/device/include/device/version.h similarity index 100% rename from components/bt/bluedroid/btcore/include/version.h rename to components/bt/bluedroid/device/include/device/version.h diff --git a/components/bt/bluedroid/device/interop.c b/components/bt/bluedroid/device/interop.c index 18d2a84fb7..22c073acf3 100644 --- a/components/bt/bluedroid/device/interop.c +++ b/components/bt/bluedroid/device/interop.c @@ -19,10 +19,10 @@ #define LOG_TAG "bt_device_interop" */ #include // 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; diff --git a/components/bt/bluedroid/external/sbc/decoder/srce/alloc.c b/components/bt/bluedroid/external/sbc/decoder/srce/alloc.c index 4ed459d841..3ce6dd7a46 100644 --- a/components/bt/bluedroid/external/sbc/decoder/srce/alloc.c +++ b/components/bt/bluedroid/external/sbc/decoder/srce/alloc.c @@ -16,7 +16,7 @@ * limitations under the License. * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #include #include diff --git a/components/bt/bluedroid/external/sbc/decoder/srce/bitalloc-sbc.c b/components/bt/bluedroid/external/sbc/decoder/srce/bitalloc-sbc.c index bba67e079d..66521630dc 100644 --- a/components/bt/bluedroid/external/sbc/decoder/srce/bitalloc-sbc.c +++ b/components/bt/bluedroid/external/sbc/decoder/srce/bitalloc-sbc.c @@ -27,7 +27,7 @@ /**@addgroup codec_internal*/ /**@{*/ -#include "bt_target.h" +#include "common/bt_target.h" #include #if (defined(SBC_DEC_INCLUDED) && SBC_DEC_INCLUDED == TRUE) diff --git a/components/bt/bluedroid/external/sbc/decoder/srce/bitalloc.c b/components/bt/bluedroid/external/sbc/decoder/srce/bitalloc.c index ce8156be80..105876dbb9 100644 --- a/components/bt/bluedroid/external/sbc/decoder/srce/bitalloc.c +++ b/components/bt/bluedroid/external/sbc/decoder/srce/bitalloc.c @@ -36,7 +36,7 @@ frame length and bitrate. @{ */ -#include "bt_target.h" +#include "common/bt_target.h" #include "oi_utils.h" #include diff --git a/components/bt/bluedroid/external/sbc/decoder/srce/bitstream-decode.c b/components/bt/bluedroid/external/sbc/decoder/srce/bitstream-decode.c index 743a7c1aa2..c1b9d6e90e 100644 --- a/components/bt/bluedroid/external/sbc/decoder/srce/bitstream-decode.c +++ b/components/bt/bluedroid/external/sbc/decoder/srce/bitstream-decode.c @@ -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" diff --git a/components/bt/bluedroid/external/sbc/decoder/srce/decoder-oina.c b/components/bt/bluedroid/external/sbc/decoder/srce/decoder-oina.c index 471864bd48..6673295de3 100644 --- a/components/bt/bluedroid/external/sbc/decoder/srce/decoder-oina.c +++ b/components/bt/bluedroid/external/sbc/decoder/srce/decoder-oina.c @@ -33,7 +33,7 @@ This file exposes OINA-specific interfaces to decoder functions. @{ */ -#include "bt_target.h" +#include "common/bt_target.h" #include #if (defined(SBC_DEC_INCLUDED) && SBC_DEC_INCLUDED == TRUE) diff --git a/components/bt/bluedroid/external/sbc/decoder/srce/decoder-private.c b/components/bt/bluedroid/external/sbc/decoder/srce/decoder-private.c index 09b8e5fa6e..86c4fdf596 100644 --- a/components/bt/bluedroid/external/sbc/decoder/srce/decoder-private.c +++ b/components/bt/bluedroid/external/sbc/decoder/srce/decoder-private.c @@ -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 diff --git a/components/bt/bluedroid/external/sbc/decoder/srce/decoder-sbc.c b/components/bt/bluedroid/external/sbc/decoder/srce/decoder-sbc.c index 7dd29ed8f9..80a1f33546 100644 --- a/components/bt/bluedroid/external/sbc/decoder/srce/decoder-sbc.c +++ b/components/bt/bluedroid/external/sbc/decoder/srce/decoder-sbc.c @@ -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" diff --git a/components/bt/bluedroid/external/sbc/decoder/srce/dequant.c b/components/bt/bluedroid/external/sbc/decoder/srce/dequant.c index 65c340a1ce..5c529e0b12 100644 --- a/components/bt/bluedroid/external/sbc/decoder/srce/dequant.c +++ b/components/bt/bluedroid/external/sbc/decoder/srce/dequant.c @@ -95,7 +95,7 @@ */ -#include "bt_target.h" +#include "common/bt_target.h" #include #if (defined(SBC_DEC_INCLUDED) && SBC_DEC_INCLUDED == TRUE) diff --git a/components/bt/bluedroid/external/sbc/decoder/srce/framing-sbc.c b/components/bt/bluedroid/external/sbc/decoder/srce/framing-sbc.c index 7085c80848..4f6056018c 100644 --- a/components/bt/bluedroid/external/sbc/decoder/srce/framing-sbc.c +++ b/components/bt/bluedroid/external/sbc/decoder/srce/framing-sbc.c @@ -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) diff --git a/components/bt/bluedroid/external/sbc/decoder/srce/framing.c b/components/bt/bluedroid/external/sbc/decoder/srce/framing.c index 8d46cd5e1b..f819ae9aa0 100644 --- a/components/bt/bluedroid/external/sbc/decoder/srce/framing.c +++ b/components/bt/bluedroid/external/sbc/decoder/srce/framing.c @@ -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" diff --git a/components/bt/bluedroid/external/sbc/decoder/srce/oi_codec_version.c b/components/bt/bluedroid/external/sbc/decoder/srce/oi_codec_version.c index 1de00db185..95f8883016 100644 --- a/components/bt/bluedroid/external/sbc/decoder/srce/oi_codec_version.c +++ b/components/bt/bluedroid/external/sbc/decoder/srce/oi_codec_version.c @@ -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" diff --git a/components/bt/bluedroid/external/sbc/decoder/srce/synthesis-8-generated.c b/components/bt/bluedroid/external/sbc/decoder/srce/synthesis-8-generated.c index 571cd4e03b..137b01e991 100644 --- a/components/bt/bluedroid/external/sbc/decoder/srce/synthesis-8-generated.c +++ b/components/bt/bluedroid/external/sbc/decoder/srce/synthesis-8-generated.c @@ -30,7 +30,7 @@ */ -#include "bt_target.h" +#include "common/bt_target.h" #include #if (defined(SBC_DEC_INCLUDED) && SBC_DEC_INCLUDED == TRUE) diff --git a/components/bt/bluedroid/external/sbc/decoder/srce/synthesis-dct8.c b/components/bt/bluedroid/external/sbc/decoder/srce/synthesis-dct8.c index a34032804c..1a12774e71 100644 --- a/components/bt/bluedroid/external/sbc/decoder/srce/synthesis-dct8.c +++ b/components/bt/bluedroid/external/sbc/decoder/srce/synthesis-dct8.c @@ -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) diff --git a/components/bt/bluedroid/external/sbc/decoder/srce/synthesis-sbc.c b/components/bt/bluedroid/external/sbc/decoder/srce/synthesis-sbc.c index c7cf50e590..158ba6fbf5 100644 --- a/components/bt/bluedroid/external/sbc/decoder/srce/synthesis-sbc.c +++ b/components/bt/bluedroid/external/sbc/decoder/srce/synthesis-sbc.c @@ -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) diff --git a/components/bt/bluedroid/external/sbc/encoder/include/sbc_encoder.h b/components/bt/bluedroid/external/sbc/encoder/include/sbc_encoder.h index 8e2e6dd364..8a507a7d30 100644 --- a/components/bt/bluedroid/external/sbc/encoder/include/sbc_encoder.h +++ b/components/bt/bluedroid/external/sbc/encoder/include/sbc_encoder.h @@ -28,7 +28,7 @@ #define ENCODER_VERSION "0025" #ifdef BUILDCFG -#include "bt_target.h" +#include "common/bt_target.h" #endif /*DEFINES*/ diff --git a/components/bt/bluedroid/external/sbc/encoder/include/sbc_types.h b/components/bt/bluedroid/external/sbc/encoder/include/sbc_types.h index 4bb8829c70..c6e4575bee 100644 --- a/components/bt/bluedroid/external/sbc/encoder/include/sbc_types.h +++ b/components/bt/bluedroid/external/sbc/encoder/include/sbc_types.h @@ -28,10 +28,10 @@ #include #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; diff --git a/components/bt/bluedroid/external/sbc/encoder/srce/sbc_analysis.c b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_analysis.c index 2de5a81aa5..12878f3156 100644 --- a/components/bt/bluedroid/external/sbc/encoder/srce/sbc_analysis.c +++ b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_analysis.c @@ -22,7 +22,7 @@ * stream. * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #include #include "sbc_encoder.h" #include "sbc_enc_func_declare.h" diff --git a/components/bt/bluedroid/external/sbc/encoder/srce/sbc_dct.c b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_dct.c index 23ddd386ca..73c981ac95 100644 --- a/components/bt/bluedroid/external/sbc/encoder/srce/sbc_dct.c +++ b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_dct.c @@ -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" diff --git a/components/bt/bluedroid/external/sbc/encoder/srce/sbc_dct_coeffs.c b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_dct_coeffs.c index 671ca4bab8..44c6162948 100644 --- a/components/bt/bluedroid/external/sbc/encoder/srce/sbc_dct_coeffs.c +++ b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_dct_coeffs.c @@ -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) diff --git a/components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_mono.c b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_mono.c index d4a1e84477..d4975189ca 100644 --- a/components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_mono.c +++ b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_mono.c @@ -24,7 +24,7 @@ ******************************************************************************/ /*Includes*/ -#include "bt_target.h" +#include "common/bt_target.h" #include "sbc_encoder.h" #include "sbc_enc_func_declare.h" diff --git a/components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_ste.c b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_ste.c index 5363d3559a..939f749c8f 100644 --- a/components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_ste.c +++ b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_ste.c @@ -24,7 +24,7 @@ ******************************************************************************/ /*Includes*/ -#include "bt_target.h" +#include "common/bt_target.h" #include "sbc_encoder.h" #include "sbc_enc_func_declare.h" diff --git a/components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_coeffs.c b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_coeffs.c index d1cfe74312..a3099f8a0c 100644 --- a/components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_coeffs.c +++ b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_enc_coeffs.c @@ -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) diff --git a/components/bt/bluedroid/external/sbc/encoder/srce/sbc_encoder.c b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_encoder.c index 748f85f6f2..c08d4a5cce 100644 --- a/components/bt/bluedroid/external/sbc/encoder/srce/sbc_encoder.c +++ b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_encoder.c @@ -23,7 +23,7 @@ ******************************************************************************/ #include -#include "bt_target.h" +#include "common/bt_target.h" #include "sbc_encoder.h" #include "sbc_enc_func_declare.h" diff --git a/components/bt/bluedroid/external/sbc/encoder/srce/sbc_packing.c b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_packing.c index 47d7a6b965..d2019baaf1 100644 --- a/components/bt/bluedroid/external/sbc/encoder/srce/sbc_packing.c +++ b/components/bt/bluedroid/external/sbc/encoder/srce/sbc_packing.c @@ -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" diff --git a/components/bt/bluedroid/hci/buffer_allocator.c b/components/bt/bluedroid/hci/buffer_allocator.c index 1a5fc69b7c..591cc390f3 100644 --- a/components/bt/bluedroid/hci/buffer_allocator.c +++ b/components/bt/bluedroid/hci/buffer_allocator.c @@ -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) diff --git a/components/bt/bluedroid/hci/hci_hal_h4.c b/components/bt/bluedroid/hci/hci_hal_h4.c index b9231b1b6f..ec700dd15d 100644 --- a/components/bt/bluedroid/hci/hci_hal_h4.c +++ b/components/bt/bluedroid/hci/hci_hal_h4.c @@ -16,15 +16,15 @@ * ******************************************************************************/ #include -#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 diff --git a/components/bt/bluedroid/hci/hci_layer.c b/components/bt/bluedroid/hci/hci_layer.c index 10b0959aae..eaeb59fea4 100644 --- a/components/bt/bluedroid/hci/hci_layer.c +++ b/components/bt/bluedroid/hci/hci_layer.c @@ -17,22 +17,22 @@ ******************************************************************************/ #include #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; diff --git a/components/bt/bluedroid/hci/hci_packet_factory.c b/components/bt/bluedroid/hci/hci_packet_factory.c index c4bb96b162..549323be61 100644 --- a/components/bt/bluedroid/hci/hci_packet_factory.c +++ b/components/bt/bluedroid/hci/hci_packet_factory.c @@ -16,16 +16,16 @@ * ******************************************************************************/ -#include "bt_defs.h" +#include "common/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 "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; diff --git a/components/bt/bluedroid/hci/hci_packet_parser.c b/components/bt/bluedroid/hci/hci_packet_parser.c index 8936a7d537..6866872425 100644 --- a/components/bt/bluedroid/hci/hci_packet_parser.c +++ b/components/bt/bluedroid/hci/hci_packet_parser.c @@ -16,13 +16,13 @@ * ******************************************************************************/ -#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; diff --git a/components/bt/bluedroid/include/bt_vendor_lib.h b/components/bt/bluedroid/hci/include/hci/bt_vendor_lib.h similarity index 100% rename from components/bt/bluedroid/include/bt_vendor_lib.h rename to components/bt/bluedroid/hci/include/hci/bt_vendor_lib.h diff --git a/components/bt/bluedroid/hci/include/buffer_allocator.h b/components/bt/bluedroid/hci/include/hci/buffer_allocator.h 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 9dd7ba7c45..da44bf6c51 100644 --- a/components/bt/bluedroid/hci/include/buffer_allocator.h +++ b/components/bt/bluedroid/hci/include/hci/buffer_allocator.h @@ -18,7 +18,7 @@ #ifndef _BUFFER_ALLOCATOR_H_ -#include "allocator.h" +#include "osi/allocator.h" const allocator_t *buffer_allocator_get_interface(); diff --git a/components/bt/bluedroid/hci/include/hci_hal.h b/components/bt/bluedroid/hci/include/hci/hci_hal.h 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 9853211df4..2928f29ad3 100644 --- a/components/bt/bluedroid/hci/include/hci_hal.h +++ b/components/bt/bluedroid/hci/include/hci/hci_hal.h @@ -22,7 +22,7 @@ #include #include -#include "bt_types.h" +#include "stack/bt_types.h" typedef enum { DATA_TYPE_COMMAND = 1, diff --git a/components/bt/bluedroid/hci/include/hci_internals.h b/components/bt/bluedroid/hci/include/hci/hci_internals.h similarity index 100% rename from components/bt/bluedroid/hci/include/hci_internals.h rename to components/bt/bluedroid/hci/include/hci/hci_internals.h diff --git a/components/bt/bluedroid/hci/include/hci_layer.h b/components/bt/bluedroid/hci/include/hci/hci_layer.h 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 5e9b8c695b..4b1018098b 100644 --- a/components/bt/bluedroid/hci/include/hci_layer.h +++ b/components/bt/bluedroid/hci/include/hci/hci_layer.h @@ -19,10 +19,10 @@ #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 */ diff --git a/components/bt/bluedroid/hci/include/hci_packet_factory.h b/components/bt/bluedroid/hci/include/hci/hci_packet_factory.h 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 11f0053a58..b98b80d5d7 100644 --- a/components/bt/bluedroid/hci/include/hci_packet_factory.h +++ b/components/bt/bluedroid/hci/include/hci/hci_packet_factory.h @@ -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); diff --git a/components/bt/bluedroid/hci/include/hci_packet_parser.h b/components/bt/bluedroid/hci/include/hci/hci_packet_parser.h 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 7090708f0d..2e5b5ef986 100644 --- a/components/bt/bluedroid/hci/include/hci_packet_parser.h +++ b/components/bt/bluedroid/hci/include/hci/hci_packet_parser.h @@ -21,12 +21,12 @@ #include -#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); diff --git a/components/bt/bluedroid/hci/include/packet_fragmenter.h b/components/bt/bluedroid/hci/include/hci/packet_fragmenter.h 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 7227e0af2c..80b442f287 100644 --- a/components/bt/bluedroid/hci/include/packet_fragmenter.h +++ b/components/bt/bluedroid/hci/include/hci/packet_fragmenter.h @@ -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); diff --git a/components/bt/bluedroid/hci/packet_fragmenter.c b/components/bt/bluedroid/hci/packet_fragmenter.c index 67e89c28af..8bc593dd20 100644 --- a/components/bt/bluedroid/hci/packet_fragmenter.c +++ b/components/bt/bluedroid/hci/packet_fragmenter.c @@ -16,17 +16,17 @@ * ******************************************************************************/ #include -#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 "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 "hash_map.h" -#include "hash_functions.h" -#include "bt_trace.h" +#include "osi/hash_map.h" +#include "osi/hash_functions.h" +#include "common/bt_trace.h" #define APPLY_CONTINUATION_FLAG(handle) (((handle) & 0xCFFF) | 0x1000) diff --git a/components/bt/bluedroid/main/bte_init.c b/components/bt/bluedroid/main/bte_init.c index df463280f6..1b1395f4b4 100644 --- a/components/bt/bluedroid/main/bte_init.c +++ b/components/bt/bluedroid/main/bte_init.c @@ -23,7 +23,7 @@ * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #include @@ -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) @@ -53,11 +53,11 @@ #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) @@ -77,17 +77,17 @@ #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" diff --git a/components/bt/bluedroid/main/bte_main.c b/components/bt/bluedroid/main/bte_main.c index 32ae87d347..2db4fa03da 100644 --- a/components/bt/bluedroid/main/bte_main.c +++ b/components/bt/bluedroid/main/bte_main.c @@ -25,18 +25,18 @@ ******************************************************************************/ -#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 diff --git a/components/bt/bluedroid/osi/alarm.c b/components/bt/bluedroid/osi/alarm.c index ce7e7514de..f86332191e 100644 --- a/components/bt/bluedroid/osi/alarm.c +++ b/components/bt/bluedroid/osi/alarm.c @@ -18,15 +18,15 @@ #include #include #include -#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 */ diff --git a/components/bt/bluedroid/osi/allocator.c b/components/bt/bluedroid/osi/allocator.c index a6c2b8ea39..113f32becd 100644 --- a/components/bt/bluedroid/osi/allocator.c +++ b/components/bt/bluedroid/osi/allocator.c @@ -18,8 +18,8 @@ #include #include -#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); diff --git a/components/bt/bluedroid/osi/buffer.c b/components/bt/bluedroid/osi/buffer.c index cb02f26a8b..42732cf977 100644 --- a/components/bt/bluedroid/osi/buffer.c +++ b/components/bt/bluedroid/osi/buffer.c @@ -16,11 +16,11 @@ * ******************************************************************************/ #include -#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; diff --git a/components/bt/bluedroid/osi/config.c b/components/bt/bluedroid/osi/config.c index c9b76e3502..07f47c6d9d 100644 --- a/components/bt/bluedroid/osi/config.c +++ b/components/bt/bluedroid/osi/config.c @@ -23,10 +23,10 @@ #include #include -#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) diff --git a/components/bt/bluedroid/osi/fixed_queue.c b/components/bt/bluedroid/osi/fixed_queue.c index 802354a21c..30290060aa 100644 --- a/components/bt/bluedroid/osi/fixed_queue.c +++ b/components/bt/bluedroid/osi/fixed_queue.c @@ -16,14 +16,14 @@ * ******************************************************************************/ -#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 { diff --git a/components/bt/bluedroid/osi/future.c b/components/bt/bluedroid/osi/future.c index 415b44ebf1..835ccbcff1 100644 --- a/components/bt/bluedroid/osi/future.c +++ b/components/bt/bluedroid/osi/future.c @@ -16,11 +16,11 @@ * ******************************************************************************/ -#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); diff --git a/components/bt/bluedroid/osi/hash_functions.c b/components/bt/bluedroid/osi/hash_functions.c index 0cfd3f52df..78879421a7 100644 --- a/components/bt/bluedroid/osi/hash_functions.c +++ b/components/bt/bluedroid/osi/hash_functions.c @@ -18,7 +18,7 @@ #include -#include "hash_functions.h" +#include "osi/hash_functions.h" hash_index_t hash_function_naive(const void *key) { diff --git a/components/bt/bluedroid/osi/hash_map.c b/components/bt/bluedroid/osi/hash_map.c index 41ae983397..fa33f5aa8e 100644 --- a/components/bt/bluedroid/osi/hash_map.c +++ b/components/bt/bluedroid/osi/hash_map.c @@ -16,11 +16,11 @@ * ******************************************************************************/ -#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; diff --git a/components/bt/bluedroid/osi/include/alarm.h b/components/bt/bluedroid/osi/include/osi/alarm.h similarity index 100% rename from components/bt/bluedroid/osi/include/alarm.h rename to components/bt/bluedroid/osi/include/osi/alarm.h diff --git a/components/bt/bluedroid/osi/include/allocator.h b/components/bt/bluedroid/osi/include/osi/allocator.h similarity index 100% rename from components/bt/bluedroid/osi/include/allocator.h rename to components/bt/bluedroid/osi/include/osi/allocator.h diff --git a/components/bt/bluedroid/osi/include/buffer.h b/components/bt/bluedroid/osi/include/osi/buffer.h similarity index 100% rename from components/bt/bluedroid/osi/include/buffer.h rename to components/bt/bluedroid/osi/include/osi/buffer.h diff --git a/components/bt/bluedroid/osi/include/config.h b/components/bt/bluedroid/osi/include/osi/config.h similarity index 100% rename from components/bt/bluedroid/osi/include/config.h rename to components/bt/bluedroid/osi/include/osi/config.h diff --git a/components/bt/bluedroid/osi/include/fixed_queue.h b/components/bt/bluedroid/osi/include/osi/fixed_queue.h 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 becafea198..e3bf2f67b5 100644 --- a/components/bt/bluedroid/osi/include/fixed_queue.h +++ b/components/bt/bluedroid/osi/include/osi/fixed_queue.h @@ -20,7 +20,7 @@ #define _FIXED_QUEUE_H_ #include -#include "list.h" +#include "osi/list.h" struct fixed_queue_t; diff --git a/components/bt/bluedroid/osi/include/future.h b/components/bt/bluedroid/osi/include/osi/future.h similarity index 98% rename from components/bt/bluedroid/osi/include/future.h rename to components/bt/bluedroid/osi/include/osi/future.h index f001f1f133..9d1cb521df 100644 --- a/components/bt/bluedroid/osi/include/future.h +++ b/components/bt/bluedroid/osi/include/osi/future.h @@ -19,7 +19,7 @@ #ifndef __FUTURE_H__ #define __FUTURE_H__ -#include "semaphore.h" +#include "osi/semaphore.h" struct future { bool ready_can_be_called; diff --git a/components/bt/bluedroid/osi/include/hash_functions.h b/components/bt/bluedroid/osi/include/osi/hash_functions.h 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 2edbeb8b74..3d0b254ea3 100644 --- a/components/bt/bluedroid/osi/include/hash_functions.h +++ b/components/bt/bluedroid/osi/include/osi/hash_functions.h @@ -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); diff --git a/components/bt/bluedroid/osi/include/hash_map.h b/components/bt/bluedroid/osi/include/osi/hash_map.h similarity index 100% rename from components/bt/bluedroid/osi/include/hash_map.h rename to components/bt/bluedroid/osi/include/osi/hash_map.h diff --git a/components/bt/bluedroid/osi/include/list.h b/components/bt/bluedroid/osi/include/osi/list.h similarity index 100% rename from components/bt/bluedroid/osi/include/list.h rename to components/bt/bluedroid/osi/include/osi/list.h diff --git a/components/bt/bluedroid/osi/include/mutex.h b/components/bt/bluedroid/osi/include/osi/mutex.h similarity index 100% rename from components/bt/bluedroid/osi/include/mutex.h rename to components/bt/bluedroid/osi/include/osi/mutex.h diff --git a/components/bt/bluedroid/osi/include/osi.h b/components/bt/bluedroid/osi/include/osi/osi.h similarity index 100% rename from components/bt/bluedroid/osi/include/osi.h rename to components/bt/bluedroid/osi/include/osi/osi.h diff --git a/components/bt/bluedroid/osi/include/semaphore.h b/components/bt/bluedroid/osi/include/osi/semaphore.h similarity index 100% rename from components/bt/bluedroid/osi/include/semaphore.h rename to components/bt/bluedroid/osi/include/osi/semaphore.h diff --git a/components/bt/bluedroid/osi/include/thread.h b/components/bt/bluedroid/osi/include/osi/thread.h similarity index 99% rename from components/bt/bluedroid/osi/include/thread.h rename to components/bt/bluedroid/osi/include/osi/thread.h index 6a92388d37..8bb2fdc7c0 100644 --- a/components/bt/bluedroid/osi/include/thread.h +++ b/components/bt/bluedroid/osi/include/osi/thread.h @@ -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 diff --git a/components/bt/bluedroid/osi/list.c b/components/bt/bluedroid/osi/list.c index d93478274c..eb46cda45e 100644 --- a/components/bt/bluedroid/osi/list.c +++ b/components/bt/bluedroid/osi/list.c @@ -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; diff --git a/components/bt/bluedroid/osi/mutex.c b/components/bt/bluedroid/osi/mutex.c index 9b679f4639..b7fe38a1ee 100644 --- a/components/bt/bluedroid/osi/mutex.c +++ b/components/bt/bluedroid/osi/mutex.c @@ -16,7 +16,7 @@ * ******************************************************************************/ -#include "mutex.h" +#include "osi/mutex.h" /* static section */ diff --git a/components/bt/bluedroid/osi/osi.c b/components/bt/bluedroid/osi/osi.c index 348ee0b05b..43ce9b7804 100644 --- a/components/bt/bluedroid/osi/osi.c +++ b/components/bt/bluedroid/osi/osi.c @@ -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) { diff --git a/components/bt/bluedroid/osi/semaphore.c b/components/bt/bluedroid/osi/semaphore.c index 86493ebcac..14823160e3 100644 --- a/components/bt/bluedroid/osi/semaphore.c +++ b/components/bt/bluedroid/osi/semaphore.c @@ -17,7 +17,7 @@ ******************************************************************************/ -#include "semaphore.h" +#include "osi/semaphore.h" /*-----------------------------------------------------------------------------------*/ // Creates and returns a new semaphore. The "init_count" argument specifies diff --git a/components/bt/bluedroid/stack/a2dp/a2d_api.c b/components/bt/bluedroid/stack/a2dp/a2d_api.c index 1d77e338ee..73b174e614 100644 --- a/components/bt/bluedroid/stack/a2dp/a2d_api.c +++ b/components/bt/bluedroid/stack/a2dp/a2d_api.c @@ -22,12 +22,12 @@ * ******************************************************************************/ #include -#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) diff --git a/components/bt/bluedroid/stack/a2dp/a2d_sbc.c b/components/bt/bluedroid/stack/a2dp/a2d_sbc.c index 0c2b4adc88..00977fc398 100644 --- a/components/bt/bluedroid/stack/a2dp/a2d_sbc.c +++ b/components/bt/bluedroid/stack/a2dp/a2d_sbc.c @@ -23,13 +23,13 @@ * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #include -#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) diff --git a/components/bt/bluedroid/stack/a2dp/include/a2d_int.h b/components/bt/bluedroid/stack/a2dp/include/a2d_int.h index 89055bce99..ddd3e96464 100644 --- a/components/bt/bluedroid/stack/a2dp/include/a2d_int.h +++ b/components/bt/bluedroid/stack/a2dp/include/a2d_int.h @@ -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 diff --git a/components/bt/bluedroid/stack/avct/avct_api.c b/components/bt/bluedroid/stack/avct/avct_api.c index 2d86ba8915..799bbf553c 100644 --- a/components/bt/bluedroid/stack/avct/avct_api.c +++ b/components/bt/bluedroid/stack/avct/avct_api.c @@ -23,15 +23,15 @@ ******************************************************************************/ #include -#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) diff --git a/components/bt/bluedroid/stack/avct/avct_ccb.c b/components/bt/bluedroid/stack/avct/avct_ccb.c index 06ff5014d0..8cc9fc3996 100644 --- a/components/bt/bluedroid/stack/avct/avct_ccb.c +++ b/components/bt/bluedroid/stack/avct/avct_ccb.c @@ -24,9 +24,9 @@ ******************************************************************************/ #include -#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) diff --git a/components/bt/bluedroid/stack/avct/avct_l2c.c b/components/bt/bluedroid/stack/avct/avct_l2c.c index 35abf45b2e..a501b15755 100644 --- a/components/bt/bluedroid/stack/avct/avct_l2c.c +++ b/components/bt/bluedroid/stack/avct/avct_l2c.c @@ -23,14 +23,14 @@ ******************************************************************************/ #include -#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) diff --git a/components/bt/bluedroid/stack/avct/avct_lcb.c b/components/bt/bluedroid/stack/avct/avct_lcb.c index 71c70f7974..7d5ba3a16e 100644 --- a/components/bt/bluedroid/stack/avct/avct_lcb.c +++ b/components/bt/bluedroid/stack/avct/avct_lcb.c @@ -24,12 +24,12 @@ ******************************************************************************/ #include -#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) diff --git a/components/bt/bluedroid/stack/avct/avct_lcb_act.c b/components/bt/bluedroid/stack/avct/avct_lcb_act.c index 8895f968e2..a958b1503b 100644 --- a/components/bt/bluedroid/stack/avct/avct_lcb_act.c +++ b/components/bt/bluedroid/stack/avct/avct_lcb_act.c @@ -23,13 +23,13 @@ ******************************************************************************/ #include -#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) diff --git a/components/bt/bluedroid/stack/avct/include/avct_int.h b/components/bt/bluedroid/stack/avct/include/avct_int.h index f70f516c0d..0a91a96fb8 100644 --- a/components/bt/bluedroid/stack/avct/include/avct_int.h +++ b/components/bt/bluedroid/stack/avct/include/avct_int.h @@ -24,10 +24,10 @@ #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 diff --git a/components/bt/bluedroid/stack/avdt/avdt_ad.c b/components/bt/bluedroid/stack/avdt/avdt_ad.c index 9a85fcef46..361c5b276f 100644 --- a/components/bt/bluedroid/stack/avdt/avdt_ad.c +++ b/components/bt/bluedroid/stack/avdt/avdt_ad.c @@ -23,18 +23,18 @@ ******************************************************************************/ // #include -#include "bt_trace.h" +#include "common/bt_trace.h" #include -#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) /******************************************************************************* diff --git a/components/bt/bluedroid/stack/avdt/avdt_api.c b/components/bt/bluedroid/stack/avdt/avdt_api.c index 5167af13f0..88d3741306 100644 --- a/components/bt/bluedroid/stack/avdt/avdt_api.c +++ b/components/bt/bluedroid/stack/avdt/avdt_api.c @@ -24,15 +24,15 @@ ******************************************************************************/ #include -#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) diff --git a/components/bt/bluedroid/stack/avdt/avdt_ccb.c b/components/bt/bluedroid/stack/avdt/avdt_ccb.c index 3910f76e4f..5e1a1f46de 100644 --- a/components/bt/bluedroid/stack/avdt/avdt_ccb.c +++ b/components/bt/bluedroid/stack/avdt/avdt_ccb.c @@ -24,13 +24,13 @@ ******************************************************************************/ #include -#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) diff --git a/components/bt/bluedroid/stack/avdt/avdt_ccb_act.c b/components/bt/bluedroid/stack/avdt/avdt_ccb_act.c index 2a35906eb8..9f7b0ee9d0 100644 --- a/components/bt/bluedroid/stack/avdt/avdt_ccb_act.c +++ b/components/bt/bluedroid/stack/avdt/avdt_ccb_act.c @@ -24,15 +24,15 @@ ******************************************************************************/ #include -#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) diff --git a/components/bt/bluedroid/stack/avdt/avdt_l2c.c b/components/bt/bluedroid/stack/avdt/avdt_l2c.c index 8df482fccb..92e3dcad9d 100644 --- a/components/bt/bluedroid/stack/avdt/avdt_l2c.c +++ b/components/bt/bluedroid/stack/avdt/avdt_l2c.c @@ -23,17 +23,17 @@ ******************************************************************************/ #include -#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) diff --git a/components/bt/bluedroid/stack/avdt/avdt_msg.c b/components/bt/bluedroid/stack/avdt/avdt_msg.c index 61378a6b19..91e993233d 100644 --- a/components/bt/bluedroid/stack/avdt/avdt_msg.c +++ b/components/bt/bluedroid/stack/avdt/avdt_msg.c @@ -27,14 +27,14 @@ ******************************************************************************/ #include -#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) /***************************************************************************** diff --git a/components/bt/bluedroid/stack/avdt/avdt_scb.c b/components/bt/bluedroid/stack/avdt/avdt_scb.c index 484270d034..cf3c1ad331 100644 --- a/components/bt/bluedroid/stack/avdt/avdt_scb.c +++ b/components/bt/bluedroid/stack/avdt/avdt_scb.c @@ -24,15 +24,15 @@ ******************************************************************************/ #include -#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) diff --git a/components/bt/bluedroid/stack/avdt/avdt_scb_act.c b/components/bt/bluedroid/stack/avdt/avdt_scb_act.c index 963e8c3f17..154938f008 100644 --- a/components/bt/bluedroid/stack/avdt/avdt_scb_act.c +++ b/components/bt/bluedroid/stack/avdt/avdt_scb_act.c @@ -24,14 +24,14 @@ ******************************************************************************/ #include -#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) diff --git a/components/bt/bluedroid/stack/avdt/include/avdt_defs.h b/components/bt/bluedroid/stack/avdt/include/avdt_defs.h index ad1d9d1efa..8b65c52d74 100644 --- a/components/bt/bluedroid/stack/avdt/include/avdt_defs.h +++ b/components/bt/bluedroid/stack/avdt/include/avdt_defs.h @@ -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) diff --git a/components/bt/bluedroid/stack/avdt/include/avdt_int.h b/components/bt/bluedroid/stack/avdt/include/avdt_int.h index 6555152ac0..06bedc3573 100644 --- a/components/bt/bluedroid/stack/avdt/include/avdt_int.h +++ b/components/bt/bluedroid/stack/avdt/include/avdt_int.h @@ -24,12 +24,12 @@ #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) diff --git a/components/bt/bluedroid/stack/avrc/avrc_api.c b/components/bt/bluedroid/stack/avrc/avrc_api.c index d9d614a0e2..beb823eac9 100644 --- a/components/bt/bluedroid/stack/avrc/avrc_api.c +++ b/components/bt/bluedroid/stack/avrc/avrc_api.c @@ -22,12 +22,12 @@ * ******************************************************************************/ // #include -#include "bt_trace.h" +#include "common/bt_trace.h" #include -#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) diff --git a/components/bt/bluedroid/stack/avrc/avrc_bld_ct.c b/components/bt/bluedroid/stack/avrc/avrc_bld_ct.c index ecd804388c..122f971ed0 100644 --- a/components/bt/bluedroid/stack/avrc/avrc_bld_ct.c +++ b/components/bt/bluedroid/stack/avrc/avrc_bld_ct.c @@ -16,11 +16,11 @@ * ******************************************************************************/ #include -#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) diff --git a/components/bt/bluedroid/stack/avrc/avrc_bld_tg.c b/components/bt/bluedroid/stack/avrc/avrc_bld_tg.c index 2ab7c05349..d7df3b4519 100644 --- a/components/bt/bluedroid/stack/avrc/avrc_bld_tg.c +++ b/components/bt/bluedroid/stack/avrc/avrc_bld_tg.c @@ -16,12 +16,12 @@ * ******************************************************************************/ #include -#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) diff --git a/components/bt/bluedroid/stack/avrc/avrc_opt.c b/components/bt/bluedroid/stack/avrc/avrc_opt.c index 7caaf375fd..9ecf966ee1 100644 --- a/components/bt/bluedroid/stack/avrc/avrc_opt.c +++ b/components/bt/bluedroid/stack/avrc/avrc_opt.c @@ -22,11 +22,11 @@ * ******************************************************************************/ // #include -#include "bt_target.h" +#include "common/bt_target.h" #include -#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) diff --git a/components/bt/bluedroid/stack/avrc/avrc_pars_ct.c b/components/bt/bluedroid/stack/avrc/avrc_pars_ct.c index a108d70770..b847e78a5c 100644 --- a/components/bt/bluedroid/stack/avrc/avrc_pars_ct.c +++ b/components/bt/bluedroid/stack/avrc/avrc_pars_ct.c @@ -16,11 +16,11 @@ * ******************************************************************************/ #include -#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) diff --git a/components/bt/bluedroid/stack/avrc/avrc_pars_tg.c b/components/bt/bluedroid/stack/avrc/avrc_pars_tg.c index 5d5d79737f..c45019933d 100644 --- a/components/bt/bluedroid/stack/avrc/avrc_pars_tg.c +++ b/components/bt/bluedroid/stack/avrc/avrc_pars_tg.c @@ -16,9 +16,9 @@ * ******************************************************************************/ #include -#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) diff --git a/components/bt/bluedroid/stack/avrc/avrc_sdp.c b/components/bt/bluedroid/stack/avrc/avrc_sdp.c index 31d4aeeb90..4ef993dcc8 100644 --- a/components/bt/bluedroid/stack/avrc/avrc_sdp.c +++ b/components/bt/bluedroid/stack/avrc/avrc_sdp.c @@ -22,10 +22,10 @@ * ******************************************************************************/ #include -#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) diff --git a/components/bt/bluedroid/stack/avrc/avrc_utils.c b/components/bt/bluedroid/stack/avrc/avrc_utils.c index 821f07c19b..547eeff0d8 100644 --- a/components/bt/bluedroid/stack/avrc/avrc_utils.c +++ b/components/bt/bluedroid/stack/avrc/avrc_utils.c @@ -16,8 +16,8 @@ * ******************************************************************************/ #include -#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) diff --git a/components/bt/bluedroid/stack/avrc/include/avrc_int.h b/components/bt/bluedroid/stack/avrc/include/avrc_int.h index ed0be01b21..f13e0ccb2d 100644 --- a/components/bt/bluedroid/stack/avrc/include/avrc_int.h +++ b/components/bt/bluedroid/stack/avrc/include/avrc_int.h @@ -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;} diff --git a/components/bt/bluedroid/stack/btm/btm_acl.c b/components/bt/bluedroid/stack/btm/btm_acl.c index 74a73b51d2..8e786abb69 100644 --- a/components/bt/bluedroid/stack/btm/btm_acl.c +++ b/components/bt/bluedroid/stack/btm/btm_acl.c @@ -36,15 +36,15 @@ //#include #include -#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); diff --git a/components/bt/bluedroid/stack/btm/btm_ble.c b/components/bt/bluedroid/stack/btm/btm_ble.c index 507e3e7f64..872a24e6fa 100644 --- a/components/bt/bluedroid/stack/btm/btm_ble.c +++ b/components/bt/bluedroid/stack/btm/btm_ble.c @@ -22,22 +22,22 @@ * security functions. * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #if BLE_INCLUDED == TRUE #include -#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; diff --git a/components/bt/bluedroid/stack/btm/btm_ble_addr.c b/components/bt/bluedroid/stack/btm/btm_ble_addr.c index 9704c2ec4a..d62717fae0 100644 --- a/components/bt/bluedroid/stack/btm/btm_ble_addr.c +++ b/components/bt/bluedroid/stack/btm/btm_ble_addr.c @@ -24,16 +24,16 @@ #include -#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" /******************************************************************************* diff --git a/components/bt/bluedroid/stack/btm/btm_ble_adv_filter.c b/components/bt/bluedroid/stack/btm/btm_ble_adv_filter.c index 3453b15dce..ae55635b5d 100644 --- a/components/bt/bluedroid/stack/btm/btm_ble_adv_filter.c +++ b/components/bt/bluedroid/stack/btm/btm_ble_adv_filter.c @@ -19,17 +19,17 @@ //#define LOG_TAG "bt_btm_ble" #include -#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 diff --git a/components/bt/bluedroid/stack/btm/btm_ble_batchscan.c b/components/bt/bluedroid/stack/btm/btm_ble_batchscan.c index a758510504..18183f0a29 100644 --- a/components/bt/bluedroid/stack/btm/btm_ble_batchscan.c +++ b/components/bt/bluedroid/stack/btm/btm_ble_batchscan.c @@ -18,15 +18,15 @@ #include //#include #include -#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) diff --git a/components/bt/bluedroid/stack/btm/btm_ble_bgconn.c b/components/bt/bluedroid/stack/btm/btm_ble_bgconn.c index 828d5dd439..a39eb5afac 100644 --- a/components/bt/bluedroid/stack/btm/btm_ble_bgconn.c +++ b/components/bt/bluedroid/stack/btm/btm_ble_bgconn.c @@ -23,15 +23,15 @@ ******************************************************************************/ #include -#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 diff --git a/components/bt/bluedroid/stack/btm/btm_ble_cont_energy.c b/components/bt/bluedroid/stack/btm/btm_ble_cont_energy.c index 7125100749..f4eb3deb13 100644 --- a/components/bt/bluedroid/stack/btm/btm_ble_cont_energy.c +++ b/components/bt/bluedroid/stack/btm/btm_ble_cont_energy.c @@ -17,16 +17,16 @@ ******************************************************************************/ #include -#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; diff --git a/components/bt/bluedroid/stack/btm/btm_ble_gap.c b/components/bt/bluedroid/stack/btm/btm_ble_gap.c index 925ed0283c..090b3d53bd 100644 --- a/components/bt/bluedroid/stack/btm/btm_ble_gap.c +++ b/components/bt/bluedroid/stack/btm/btm_ble_gap.c @@ -26,19 +26,19 @@ //#include #include -#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" diff --git a/components/bt/bluedroid/stack/btm/btm_ble_multi_adv.c b/components/bt/bluedroid/stack/btm/btm_ble_multi_adv.c index 4d9e7841ee..dba7d56b2e 100644 --- a/components/bt/bluedroid/stack/btm/btm_ble_multi_adv.c +++ b/components/bt/bluedroid/stack/btm/btm_ble_multi_adv.c @@ -18,17 +18,17 @@ #include -#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 diff --git a/components/bt/bluedroid/stack/btm/btm_ble_privacy.c b/components/bt/bluedroid/stack/btm/btm_ble_privacy.c index 43a812d2ad..38afb74be0 100644 --- a/components/bt/bluedroid/stack/btm/btm_ble_privacy.c +++ b/components/bt/bluedroid/stack/btm/btm_ble_privacy.c @@ -22,16 +22,16 @@ * ******************************************************************************/ #include -#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) diff --git a/components/bt/bluedroid/stack/btm/btm_dev.c b/components/bt/bluedroid/stack/btm/btm_dev.c index 2985b46ff9..c7427863ea 100644 --- a/components/bt/bluedroid/stack/btm/btm_dev.c +++ b/components/bt/bluedroid/stack/btm/btm_dev.c @@ -27,14 +27,14 @@ //#include #include -#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); diff --git a/components/bt/bluedroid/stack/btm/btm_devctl.c b/components/bt/bluedroid/stack/btm/btm_devctl.c index 94e143bfec..085cda9254 100644 --- a/components/bt/bluedroid/stack/btm/btm_devctl.c +++ b/components/bt/bluedroid/stack/btm/btm_devctl.c @@ -27,17 +27,17 @@ #include //#include #include -#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. diff --git a/components/bt/bluedroid/stack/btm/btm_inq.c b/components/bt/bluedroid/stack/btm/btm_inq.c index 010d1d93c5..968c416f30 100644 --- a/components/bt/bluedroid/stack/btm/btm_inq.c +++ b/components/bt/bluedroid/stack/btm/btm_inq.c @@ -29,16 +29,16 @@ #include #include -#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 */ diff --git a/components/bt/bluedroid/stack/btm/btm_main.c b/components/bt/bluedroid/stack/btm/btm_main.c index 043e7fd01d..d1ba6acba6 100644 --- a/components/bt/bluedroid/stack/btm/btm_main.c +++ b/components/bt/bluedroid/stack/btm/btm_main.c @@ -23,11 +23,11 @@ * ******************************************************************************/ -#include "bt_types.h" -#include "bt_target.h" +#include "stack/bt_types.h" +#include "common/bt_target.h" #include #include "btm_int.h" -#include "allocator.h" +#include "osi/allocator.h" /* Global BTM control block structure */ diff --git a/components/bt/bluedroid/stack/btm/btm_pm.c b/components/bt/bluedroid/stack/btm/btm_pm.c index 56157fcd83..758be72b8e 100644 --- a/components/bt/bluedroid/stack/btm/btm_pm.c +++ b/components/bt/bluedroid/stack/btm/btm_pm.c @@ -35,13 +35,13 @@ //#include #include -#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" diff --git a/components/bt/bluedroid/stack/btm/btm_sco.c b/components/bt/bluedroid/stack/btm/btm_sco.c index 04a510f787..d9b257d171 100644 --- a/components/bt/bluedroid/stack/btm/btm_sco.c +++ b/components/bt/bluedroid/stack/btm/btm_sco.c @@ -24,14 +24,14 @@ ******************************************************************************/ #include -#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 diff --git a/components/bt/bluedroid/stack/btm/btm_sec.c b/components/bt/bluedroid/stack/btm/btm_sec.c index 9a02c526d7..00923e9f80 100644 --- a/components/bt/bluedroid/stack/btm/btm_sec.c +++ b/components/bt/bluedroid/stack/btm/btm_sec.c @@ -27,14 +27,14 @@ #include #include -#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() */ diff --git a/components/bt/bluedroid/stack/include/btm_ble_int.h b/components/bt/bluedroid/stack/btm/include/btm_ble_int.h 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 e1f8f400d3..88e56e070b 100644 --- a/components/bt/bluedroid/stack/include/btm_ble_int.h +++ b/components/bt/bluedroid/stack/btm/include/btm_ble_int.h @@ -26,14 +26,14 @@ #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 diff --git a/components/bt/bluedroid/stack/include/btm_int.h b/components/bt/bluedroid/stack/btm/include/btm_int.h 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 c45e88f063..5922a58145 100644 --- a/components/bt/bluedroid/stack/include/btm_int.h +++ b/components/bt/bluedroid/stack/btm/include/btm_int.h @@ -25,18 +25,18 @@ #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 diff --git a/components/bt/bluedroid/stack/btu/btu_hcif.c b/components/bt/bluedroid/stack/btu/btu_hcif.c index 933f517b4a..788cd41336 100644 --- a/components/bt/bluedroid/stack/btu/btu_hcif.c +++ b/components/bt/bluedroid/stack/btu/btu_hcif.c @@ -30,22 +30,22 @@ //#include #include -#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); diff --git a/components/bt/bluedroid/stack/btu/btu_init.c b/components/bt/bluedroid/stack/btu/btu_init.c index 586ffc4b15..bf04bd14dd 100644 --- a/components/bt/bluedroid/stack/btu/btu_init.c +++ b/components/bt/bluedroid/stack/btu/btu_init.c @@ -17,19 +17,19 @@ ******************************************************************************/ #include -#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" diff --git a/components/bt/bluedroid/stack/btu/btu_task.c b/components/bt/bluedroid/stack/btu/btu_task.c index 196aca4c93..af121c7050 100644 --- a/components/bt/bluedroid/stack/btu/btu_task.c +++ b/components/bt/bluedroid/stack/btu/btu_task.c @@ -18,27 +18,27 @@ #include -#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) diff --git a/components/bt/bluedroid/stack/gap/gap_api.c b/components/bt/bluedroid/stack/gap/gap_api.c index 32fa3b5407..305eadee0a 100644 --- a/components/bt/bluedroid/stack/gap/gap_api.c +++ b/components/bt/bluedroid/stack/gap/gap_api.c @@ -18,7 +18,7 @@ #include -#include "bt_target.h" +#include "common/bt_target.h" //#include "bt_utils.h" #include "gap_int.h" diff --git a/components/bt/bluedroid/stack/gap/gap_ble.c b/components/bt/bluedroid/stack/gap/gap_ble.c index 76dfa13e67..d6115fe419 100644 --- a/components/bt/bluedroid/stack/gap/gap_ble.c +++ b/components/bt/bluedroid/stack/gap/gap_ble.c @@ -15,21 +15,21 @@ * 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 #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 diff --git a/components/bt/bluedroid/stack/gap/gap_conn.c b/components/bt/bluedroid/stack/gap/gap_conn.c index eb5b20cef0..3ca81d082c 100644 --- a/components/bt/bluedroid/stack/gap/gap_conn.c +++ b/components/bt/bluedroid/stack/gap/gap_conn.c @@ -17,15 +17,15 @@ ******************************************************************************/ -#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 -#include "mutex.h" -#include "allocator.h" +#include "osi/mutex.h" +#include "osi/allocator.h" #if GAP_CONN_INCLUDED == TRUE #include "btm_int.h" diff --git a/components/bt/bluedroid/stack/gap/gap_utils.c b/components/bt/bluedroid/stack/gap/gap_utils.c index 6e242122db..0e2952f0e0 100644 --- a/components/bt/bluedroid/stack/gap/gap_utils.c +++ b/components/bt/bluedroid/stack/gap/gap_utils.c @@ -17,7 +17,7 @@ ******************************************************************************/ #include -#include "bt_target.h" +#include "common/bt_target.h" //#include "bt_utils.h" #include "gap_int.h" diff --git a/components/bt/bluedroid/stack/gap/include/gap_int.h b/components/bt/bluedroid/stack/gap/include/gap_int.h index e9317a04b4..a328986f2e 100644 --- a/components/bt/bluedroid/stack/gap/include/gap_int.h +++ b/components/bt/bluedroid/stack/gap/include/gap_int.h @@ -20,10 +20,10 @@ #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 { diff --git a/components/bt/bluedroid/stack/gatt/att_protocol.c b/components/bt/bluedroid/stack/gatt/att_protocol.c index efc853a746..3adecfaef6 100644 --- a/components/bt/bluedroid/stack/gatt/att_protocol.c +++ b/components/bt/bluedroid/stack/gatt/att_protocol.c @@ -22,13 +22,13 @@ * ******************************************************************************/ -#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 diff --git a/components/bt/bluedroid/stack/gatt/gatt_api.c b/components/bt/bluedroid/stack/gatt/gatt_api.c index 1267c0b76a..10f66db4b6 100644 --- a/components/bt/bluedroid/stack/gatt/gatt_api.c +++ b/components/bt/bluedroid/stack/gatt/gatt_api.c @@ -21,19 +21,19 @@ * 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 -#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" /******************************************************************************* ** diff --git a/components/bt/bluedroid/stack/gatt/gatt_attr.c b/components/bt/bluedroid/stack/gatt/gatt_attr.c index eb1cb8b900..90505ad031 100644 --- a/components/bt/bluedroid/stack/gatt/gatt_attr.c +++ b/components/bt/bluedroid/stack/gatt/gatt_attr.c @@ -23,12 +23,12 @@ * ******************************************************************************/ -#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) diff --git a/components/bt/bluedroid/stack/gatt/gatt_auth.c b/components/bt/bluedroid/stack/gatt/gatt_auth.c index cee16dd7f9..e233ea0cad 100644 --- a/components/bt/bluedroid/stack/gatt/gatt_auth.c +++ b/components/bt/bluedroid/stack/gatt/gatt_auth.c @@ -21,14 +21,14 @@ * 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 #include "gatt_int.h" -#include "gatt_api.h" +#include "stack/gatt_api.h" #include "btm_int.h" /******************************************************************************* diff --git a/components/bt/bluedroid/stack/gatt/gatt_cl.c b/components/bt/bluedroid/stack/gatt/gatt_cl.c index 47576a07a9..ba02020071 100644 --- a/components/bt/bluedroid/stack/gatt/gatt_cl.c +++ b/components/bt/bluedroid/stack/gatt/gatt_cl.c @@ -22,12 +22,12 @@ * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #if BLE_INCLUDED == TRUE && GATTC_INCLUDED == TRUE #include -#include "allocator.h" +#include "osi/allocator.h" #include "gatt_int.h" #include "l2c_int.h" diff --git a/components/bt/bluedroid/stack/gatt/gatt_db.c b/components/bt/bluedroid/stack/gatt/gatt_db.c index ec552d7bfe..0a3a104a4b 100644 --- a/components/bt/bluedroid/stack/gatt/gatt_db.c +++ b/components/bt/bluedroid/stack/gatt/gatt_db.c @@ -22,17 +22,17 @@ * ******************************************************************************/ -#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 #include #include "gatt_int.h" -#include "l2c_api.h" +#include "stack/l2c_api.h" #include "btm_int.h" /******************************************************************************** diff --git a/components/bt/bluedroid/stack/gatt/gatt_main.c b/components/bt/bluedroid/stack/gatt/gatt_main.c index b7486a9ec7..82059afd31 100644 --- a/components/bt/bluedroid/stack/gatt/gatt_main.c +++ b/components/bt/bluedroid/stack/gatt/gatt_main.c @@ -22,15 +22,15 @@ * ******************************************************************************/ -#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) diff --git a/components/bt/bluedroid/stack/gatt/gatt_sr.c b/components/bt/bluedroid/stack/gatt/gatt_sr.c index 63771083b7..b0036320b5 100644 --- a/components/bt/bluedroid/stack/gatt/gatt_sr.c +++ b/components/bt/bluedroid/stack/gatt/gatt_sr.c @@ -22,13 +22,13 @@ * ******************************************************************************/ -#include "bt_target.h" -#include "allocator.h" +#include "common/bt_target.h" +#include "osi/allocator.h" #if BLE_INCLUDED == TRUE && GATTS_INCLUDED == TRUE #include #include "gatt_int.h" -#include "l2c_api.h" +#include "stack/l2c_api.h" #include "l2c_int.h" #define GATT_MTU_REQ_MIN_LEN 2 diff --git a/components/bt/bluedroid/stack/gatt/gatt_utils.c b/components/bt/bluedroid/stack/gatt/gatt_utils.c index 3030fa410a..95efcf6763 100644 --- a/components/bt/bluedroid/stack/gatt/gatt_utils.c +++ b/components/bt/bluedroid/stack/gatt/gatt_utils.c @@ -21,18 +21,18 @@ * 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 #include -#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) diff --git a/components/bt/bluedroid/stack/gatt/include/gatt_int.h b/components/bt/bluedroid/stack/gatt/include/gatt_int.h index 6aaa42aa0a..ffbf8540fd 100644 --- a/components/bt/bluedroid/stack/gatt/include/gatt_int.h +++ b/components/bt/bluedroid/stack/gatt/include/gatt_int.h @@ -19,12 +19,12 @@ #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 diff --git a/components/bt/bluedroid/stack/hcic/hciblecmds.c b/components/bt/bluedroid/stack/hcic/hciblecmds.c index 6cb692a7d0..634cb04521 100644 --- a/components/bt/bluedroid/stack/hcic/hciblecmds.c +++ b/components/bt/bluedroid/stack/hcic/hciblecmds.c @@ -23,12 +23,12 @@ * ******************************************************************************/ -#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 #include diff --git a/components/bt/bluedroid/stack/hcic/hcicmds.c b/components/bt/bluedroid/stack/hcic/hcicmds.c index 1f0aa7235a..5c5f1f4a12 100644 --- a/components/bt/bluedroid/stack/hcic/hcicmds.c +++ b/components/bt/bluedroid/stack/hcic/hcicmds.c @@ -23,12 +23,12 @@ * ******************************************************************************/ -#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 #include diff --git a/components/bt/bluedroid/stack/include/a2d_api.h b/components/bt/bluedroid/stack/include/stack/a2d_api.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 eaf6b37f14..7509544fb5 100644 --- a/components/bt/bluedroid/stack/include/a2d_api.h +++ b/components/bt/bluedroid/stack/include/stack/a2d_api.h @@ -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 diff --git a/components/bt/bluedroid/stack/include/a2d_sbc.h b/components/bt/bluedroid/stack/include/stack/a2d_sbc.h similarity index 100% rename from components/bt/bluedroid/stack/include/a2d_sbc.h rename to components/bt/bluedroid/stack/include/stack/a2d_sbc.h diff --git a/components/bt/bluedroid/stack/include/avct_api.h b/components/bt/bluedroid/stack/include/stack/avct_api.h 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 c2713fdb47..3d59df66e5 100644 --- a/components/bt/bluedroid/stack/include/avct_api.h +++ b/components/bt/bluedroid/stack/include/stack/avct_api.h @@ -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 diff --git a/components/bt/bluedroid/stack/include/avdt_api.h b/components/bt/bluedroid/stack/include/stack/avdt_api.h 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 a1e856b6fd..26919697b4 100644 --- a/components/bt/bluedroid/stack/include/avdt_api.h +++ b/components/bt/bluedroid/stack/include/stack/avdt_api.h @@ -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 diff --git a/components/bt/bluedroid/stack/include/avdtc_api.h b/components/bt/bluedroid/stack/include/stack/avdtc_api.h 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 96b20e77bf..083b0b1c51 100644 --- a/components/bt/bluedroid/stack/include/avdtc_api.h +++ b/components/bt/bluedroid/stack/include/stack/avdtc_api.h @@ -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 diff --git a/components/bt/bluedroid/stack/include/avrc_api.h b/components/bt/bluedroid/stack/include/stack/avrc_api.h 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 2634c97fb7..c0c0a5ff3f 100644 --- a/components/bt/bluedroid/stack/include/avrc_api.h +++ b/components/bt/bluedroid/stack/include/stack/avrc_api.h @@ -23,10 +23,10 @@ ******************************************************************************/ #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 diff --git a/components/bt/bluedroid/stack/include/avrc_defs.h b/components/bt/bluedroid/stack/include/stack/avrc_defs.h 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 8a6254ef85..1933d8a96c 100644 --- a/components/bt/bluedroid/stack/include/avrc_defs.h +++ b/components/bt/bluedroid/stack/include/stack/avrc_defs.h @@ -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;} diff --git a/components/bt/bluedroid/stack/include/bt_types.h b/components/bt/bluedroid/stack/include/stack/bt_types.h similarity index 100% rename from components/bt/bluedroid/stack/include/bt_types.h rename to components/bt/bluedroid/stack/include/stack/bt_types.h diff --git a/components/bt/bluedroid/stack/include/btm_api.h b/components/bt/bluedroid/stack/include/stack/btm_api.h 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 113040b2fb..294cf84cee 100644 --- a/components/bt/bluedroid/stack/include/btm_api.h +++ b/components/bt/bluedroid/stack/include/stack/btm_api.h @@ -25,16 +25,16 @@ #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. diff --git a/components/bt/bluedroid/stack/include/btm_ble_api.h b/components/bt/bluedroid/stack/include/stack/btm_ble_api.h 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 2e47da1632..796f8bbe20 100644 --- a/components/bt/bluedroid/stack/include/btm_ble_api.h +++ b/components/bt/bluedroid/stack/include/stack/btm_ble_api.h @@ -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]; diff --git a/components/bt/bluedroid/stack/include/btu.h b/components/bt/bluedroid/stack/include/stack/btu.h similarity index 99% rename from components/bt/bluedroid/stack/include/btu.h rename to components/bt/bluedroid/stack/include/stack/btu.h index c59fb7f56d..449b18da7e 100644 --- a/components/bt/bluedroid/stack/include/btu.h +++ b/components/bt/bluedroid/stack/include/stack/btu.h @@ -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 diff --git a/components/bt/bluedroid/stack/include/dyn_mem.h b/components/bt/bluedroid/stack/include/stack/dyn_mem.h similarity index 100% rename from components/bt/bluedroid/stack/include/dyn_mem.h rename to components/bt/bluedroid/stack/include/stack/dyn_mem.h diff --git a/components/bt/bluedroid/stack/include/gap_api.h b/components/bt/bluedroid/stack/include/stack/gap_api.h 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 1f22db008d..031247f7c0 100644 --- a/components/bt/bluedroid/stack/include/gap_api.h +++ b/components/bt/bluedroid/stack/include/stack/gap_api.h @@ -19,10 +19,10 @@ #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 diff --git a/components/bt/bluedroid/stack/include/gatt_api.h b/components/bt/bluedroid/stack/include/stack/gatt_api.h 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 7307f53c82..98cdcc7fa7 100644 --- a/components/bt/bluedroid/stack/include/gatt_api.h +++ b/components/bt/bluedroid/stack/include/stack/gatt_api.h @@ -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 diff --git a/components/bt/bluedroid/stack/include/gattdefs.h b/components/bt/bluedroid/stack/include/stack/gattdefs.h similarity index 100% rename from components/bt/bluedroid/stack/include/gattdefs.h rename to components/bt/bluedroid/stack/include/stack/gattdefs.h diff --git a/components/bt/bluedroid/stack/include/hcidefs.h b/components/bt/bluedroid/stack/include/stack/hcidefs.h similarity index 99% rename from components/bt/bluedroid/stack/include/hcidefs.h rename to components/bt/bluedroid/stack/include/stack/hcidefs.h index 44fff2e521..09320b1f1a 100644 --- a/components/bt/bluedroid/stack/include/hcidefs.h +++ b/components/bt/bluedroid/stack/include/stack/hcidefs.h @@ -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 */ diff --git a/components/bt/bluedroid/stack/include/hcimsgs.h b/components/bt/bluedroid/stack/include/stack/hcimsgs.h similarity index 99% rename from components/bt/bluedroid/stack/include/hcimsgs.h rename to components/bt/bluedroid/stack/include/stack/hcimsgs.h index d360a9a121..c2067a2f8a 100644 --- a/components/bt/bluedroid/stack/include/hcimsgs.h +++ b/components/bt/bluedroid/stack/include/stack/hcimsgs.h @@ -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); diff --git a/components/bt/bluedroid/stack/include/hiddefs.h b/components/bt/bluedroid/stack/include/stack/hiddefs.h similarity index 98% rename from components/bt/bluedroid/stack/include/hiddefs.h rename to components/bt/bluedroid/stack/include/stack/hiddefs.h index 23777f3adf..99d2c3c1cf 100644 --- a/components/bt/bluedroid/stack/include/hiddefs.h +++ b/components/bt/bluedroid/stack/include/stack/hiddefs.h @@ -24,11 +24,11 @@ #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. diff --git a/components/bt/bluedroid/stack/include/hidh_api.h b/components/bt/bluedroid/stack/include/stack/hidh_api.h 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 29344df905..3211138cd4 100644 --- a/components/bt/bluedroid/stack/include/hidh_api.h +++ b/components/bt/bluedroid/stack/include/stack/hidh_api.h @@ -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) /***************************************************************************** diff --git a/components/bt/bluedroid/stack/include/l2c_api.h b/components/bt/bluedroid/stack/include/stack/l2c_api.h 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 71e1f48168..641412f89d 100644 --- a/components/bt/bluedroid/stack/include/l2c_api.h +++ b/components/bt/bluedroid/stack/include/stack/l2c_api.h @@ -26,9 +26,9 @@ #include -#include "bt_target.h" -#include "l2cdefs.h" -#include "hcidefs.h" +#include "common/bt_target.h" +#include "stack/l2cdefs.h" +#include "stack/hcidefs.h" /***************************************************************************** ** Constants diff --git a/components/bt/bluedroid/stack/include/l2cap_client.h b/components/bt/bluedroid/stack/include/stack/l2cap_client.h similarity index 100% rename from components/bt/bluedroid/stack/include/l2cap_client.h rename to components/bt/bluedroid/stack/include/stack/l2cap_client.h diff --git a/components/bt/bluedroid/stack/include/l2cdefs.h b/components/bt/bluedroid/stack/include/stack/l2cdefs.h similarity index 100% rename from components/bt/bluedroid/stack/include/l2cdefs.h rename to components/bt/bluedroid/stack/include/stack/l2cdefs.h diff --git a/components/bt/bluedroid/stack/include/port_api.h b/components/bt/bluedroid/stack/include/stack/port_api.h 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 f37a56c9ab..10b0378681 100644 --- a/components/bt/bluedroid/stack/include/port_api.h +++ b/components/bt/bluedroid/stack/include/stack/port_api.h @@ -24,7 +24,7 @@ #ifndef PORT_API_H #define PORT_API_H -#include "bt_target.h" +#include "common/bt_target.h" /***************************************************************************** ** Constants and Types diff --git a/components/bt/bluedroid/stack/include/port_ext.h b/components/bt/bluedroid/stack/include/stack/port_ext.h similarity index 100% rename from components/bt/bluedroid/stack/include/port_ext.h rename to components/bt/bluedroid/stack/include/stack/port_ext.h diff --git a/components/bt/bluedroid/stack/include/profiles_api.h b/components/bt/bluedroid/stack/include/stack/profiles_api.h 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 23306ff5a4..a9ad7b1e2c 100644 --- a/components/bt/bluedroid/stack/include/profiles_api.h +++ b/components/bt/bluedroid/stack/include/stack/profiles_api.h @@ -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 diff --git a/components/bt/bluedroid/stack/include/rfcdefs.h b/components/bt/bluedroid/stack/include/stack/rfcdefs.h similarity index 100% rename from components/bt/bluedroid/stack/include/rfcdefs.h rename to components/bt/bluedroid/stack/include/stack/rfcdefs.h diff --git a/components/bt/bluedroid/stack/include/sdp_api.h b/components/bt/bluedroid/stack/include/stack/sdp_api.h 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 db11df5580..a64e5f2604 100644 --- a/components/bt/bluedroid/stack/include/sdp_api.h +++ b/components/bt/bluedroid/stack/include/stack/sdp_api.h @@ -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 diff --git a/components/bt/bluedroid/stack/include/sdpdefs.h b/components/bt/bluedroid/stack/include/stack/sdpdefs.h similarity index 100% rename from components/bt/bluedroid/stack/include/sdpdefs.h rename to components/bt/bluedroid/stack/include/stack/sdpdefs.h diff --git a/components/bt/bluedroid/stack/include/smp_api.h b/components/bt/bluedroid/stack/include/stack/smp_api.h 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 8cf278be55..722850c3d4 100644 --- a/components/bt/bluedroid/stack/include/smp_api.h +++ b/components/bt/bluedroid/stack/include/stack/smp_api.h @@ -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 diff --git a/components/bt/bluedroid/stack/l2cap/include/l2c_int.h b/components/bt/bluedroid/stack/l2cap/include/l2c_int.h index 2728261f30..3699e7f05b 100644 --- a/components/bt/bluedroid/stack/l2cap/include/l2c_int.h +++ b/components/bt/bluedroid/stack/l2cap/include/l2c_int.h @@ -26,11 +26,11 @@ #include -#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 */ diff --git a/components/bt/bluedroid/stack/l2cap/l2c_api.c b/components/bt/bluedroid/stack/l2cap/l2c_api.c index 4c2173e14c..d31b62a6f8 100644 --- a/components/bt/bluedroid/stack/l2cap/l2c_api.c +++ b/components/bt/bluedroid/stack/l2cap/l2c_api.c @@ -27,15 +27,15 @@ //#include #include #include -#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) /******************************************************************************* diff --git a/components/bt/bluedroid/stack/l2cap/l2c_ble.c b/components/bt/bluedroid/stack/l2cap/l2c_ble.c index 67ecae85f7..6c9a287ac5 100644 --- a/components/bt/bluedroid/stack/l2cap/l2c_ble.c +++ b/components/bt/bluedroid/stack/l2cap/l2c_ble.c @@ -23,14 +23,14 @@ ******************************************************************************/ #include -#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); diff --git a/components/bt/bluedroid/stack/l2cap/l2c_csm.c b/components/bt/bluedroid/stack/l2cap/l2c_csm.c index 0c6b3a53e3..267890d70a 100644 --- a/components/bt/bluedroid/stack/l2cap/l2c_csm.c +++ b/components/bt/bluedroid/stack/l2cap/l2c_csm.c @@ -26,15 +26,15 @@ #include #include -#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) /********************************************************************************/ diff --git a/components/bt/bluedroid/stack/l2cap/l2c_fcr.c b/components/bt/bluedroid/stack/l2cap/l2c_fcr.c index 10f0c59542..cacdcc6f50 100644 --- a/components/bt/bluedroid/stack/l2cap/l2c_fcr.c +++ b/components/bt/bluedroid/stack/l2cap/l2c_fcr.c @@ -26,16 +26,16 @@ #include #include #include -#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) diff --git a/components/bt/bluedroid/stack/l2cap/l2c_link.c b/components/bt/bluedroid/stack/l2cap/l2c_link.c index e7dd2e7759..96fef0677f 100644 --- a/components/bt/bluedroid/stack/l2cap/l2c_link.c +++ b/components/bt/bluedroid/stack/l2cap/l2c_link.c @@ -28,16 +28,16 @@ #include //#include -#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); diff --git a/components/bt/bluedroid/stack/l2cap/l2c_main.c b/components/bt/bluedroid/stack/l2cap/l2c_main.c index d52bc12286..9990db077b 100644 --- a/components/bt/bluedroid/stack/l2cap/l2c_main.c +++ b/components/bt/bluedroid/stack/l2cap/l2c_main.c @@ -26,15 +26,15 @@ #include //#include -#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" /********************************************************************************/ diff --git a/components/bt/bluedroid/stack/l2cap/l2c_ucd.c b/components/bt/bluedroid/stack/l2cap/l2c_ucd.c index a3c92e47ea..8618042c5b 100644 --- a/components/bt/bluedroid/stack/l2cap/l2c_ucd.c +++ b/components/bt/bluedroid/stack/l2cap/l2c_ucd.c @@ -26,13 +26,13 @@ #include //#include -#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) diff --git a/components/bt/bluedroid/stack/l2cap/l2c_utils.c b/components/bt/bluedroid/stack/l2cap/l2c_utils.c index 816deffcc6..9c9385250d 100644 --- a/components/bt/bluedroid/stack/l2cap/l2c_utils.c +++ b/components/bt/bluedroid/stack/l2cap/l2c_utils.c @@ -25,18 +25,18 @@ #include #include -#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" /******************************************************************************* ** diff --git a/components/bt/bluedroid/stack/l2cap/l2cap_client.c b/components/bt/bluedroid/stack/l2cap/l2cap_client.c index d8bf8c3943..002ed6b809 100644 --- a/components/bt/bluedroid/stack/l2cap/l2cap_client.c +++ b/components/bt/bluedroid/stack/l2cap/l2cap_client.c @@ -17,15 +17,15 @@ ******************************************************************************/ #if (defined(L2CAP_CLIENT_INCLUDED) && L2CAP_CLIENT_INCLUDED == TRUE) #include -#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; diff --git a/components/bt/bluedroid/stack/rfcomm/include/port_int.h b/components/bt/bluedroid/stack/rfcomm/include/port_int.h index 7b1065c6c0..a2e0e15278 100644 --- a/components/bt/bluedroid/stack/rfcomm/include/port_int.h +++ b/components/bt/bluedroid/stack/rfcomm/include/port_int.h @@ -25,11 +25,11 @@ #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 */ /* ???*/ diff --git a/components/bt/bluedroid/stack/rfcomm/include/rfc_int.h b/components/bt/bluedroid/stack/rfcomm/include/rfc_int.h index 35a706ce21..b5f8e088b5 100644 --- a/components/bt/bluedroid/stack/rfcomm/include/rfc_int.h +++ b/components/bt/bluedroid/stack/rfcomm/include/rfc_int.h @@ -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" /* diff --git a/components/bt/bluedroid/stack/rfcomm/port_api.c b/components/bt/bluedroid/stack/rfcomm/port_api.c index db84fe5984..ea3f7b6efc 100644 --- a/components/bt/bluedroid/stack/rfcomm/port_api.c +++ b/components/bt/bluedroid/stack/rfcomm/port_api.c @@ -23,17 +23,17 @@ ******************************************************************************/ #include -#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 */ diff --git a/components/bt/bluedroid/stack/rfcomm/port_rfc.c b/components/bt/bluedroid/stack/rfcomm/port_rfc.c index 6e77e529dc..b227ea5cf9 100644 --- a/components/bt/bluedroid/stack/rfcomm/port_rfc.c +++ b/components/bt/bluedroid/stack/rfcomm/port_rfc.c @@ -24,16 +24,16 @@ ******************************************************************************/ #include -#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 diff --git a/components/bt/bluedroid/stack/rfcomm/port_utils.c b/components/bt/bluedroid/stack/rfcomm/port_utils.c index a4f6c05ff3..a88ae016f8 100644 --- a/components/bt/bluedroid/stack/rfcomm/port_utils.c +++ b/components/bt/bluedroid/stack/rfcomm/port_utils.c @@ -23,16 +23,16 @@ ******************************************************************************/ #include -#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 = { diff --git a/components/bt/bluedroid/stack/rfcomm/rfc_l2cap_if.c b/components/bt/bluedroid/stack/rfcomm/rfc_l2cap_if.c index 0a8cf4be05..2e843c2b78 100644 --- a/components/bt/bluedroid/stack/rfcomm/rfc_l2cap_if.c +++ b/components/bt/bluedroid/stack/rfcomm/rfc_l2cap_if.c @@ -23,18 +23,18 @@ ******************************************************************************/ #include -#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 diff --git a/components/bt/bluedroid/stack/rfcomm/rfc_mx_fsm.c b/components/bt/bluedroid/stack/rfcomm/rfc_mx_fsm.c index 2ade69e53f..6d1bf3c93a 100644 --- a/components/bt/bluedroid/stack/rfcomm/rfc_mx_fsm.c +++ b/components/bt/bluedroid/stack/rfcomm/rfc_mx_fsm.c @@ -23,17 +23,17 @@ * ******************************************************************************/ #include -#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 diff --git a/components/bt/bluedroid/stack/rfcomm/rfc_port_fsm.c b/components/bt/bluedroid/stack/rfcomm/rfc_port_fsm.c index b02574c44f..a8c58b295a 100644 --- a/components/bt/bluedroid/stack/rfcomm/rfc_port_fsm.c +++ b/components/bt/bluedroid/stack/rfcomm/rfc_port_fsm.c @@ -23,16 +23,16 @@ * ******************************************************************************/ #include -#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) /********************************************************************************/ diff --git a/components/bt/bluedroid/stack/rfcomm/rfc_port_if.c b/components/bt/bluedroid/stack/rfcomm/rfc_port_if.c index d30b9a536d..58dae43542 100644 --- a/components/bt/bluedroid/stack/rfcomm/rfc_port_if.c +++ b/components/bt/bluedroid/stack/rfcomm/rfc_port_if.c @@ -24,13 +24,13 @@ *****************************************************************************/ #include -#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) diff --git a/components/bt/bluedroid/stack/rfcomm/rfc_ts_frames.c b/components/bt/bluedroid/stack/rfcomm/rfc_ts_frames.c index 1c5f5d2044..3a9a60b74f 100644 --- a/components/bt/bluedroid/stack/rfcomm/rfc_ts_frames.c +++ b/components/bt/bluedroid/stack/rfcomm/rfc_ts_frames.c @@ -23,14 +23,14 @@ ******************************************************************************/ #include -#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) /******************************************************************************* diff --git a/components/bt/bluedroid/stack/rfcomm/rfc_utils.c b/components/bt/bluedroid/stack/rfcomm/rfc_utils.c index 7214ffdd85..180632c048 100644 --- a/components/bt/bluedroid/stack/rfcomm/rfc_utils.c +++ b/components/bt/bluedroid/stack/rfcomm/rfc_utils.c @@ -22,20 +22,20 @@ * *****************************************************************************/ -#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 diff --git a/components/bt/bluedroid/stack/sdp/include/sdpint.h b/components/bt/bluedroid/stack/sdp/include/sdpint.h index 058257b8ef..c459edea0b 100644 --- a/components/bt/bluedroid/stack/sdp/include/sdpint.h +++ b/components/bt/bluedroid/stack/sdp/include/sdpint.h @@ -25,10 +25,10 @@ #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 */ diff --git a/components/bt/bluedroid/stack/sdp/sdp_api.c b/components/bt/bluedroid/stack/sdp/sdp_api.c index 91b989eebd..529359a4fe 100644 --- a/components/bt/bluedroid/stack/sdp/sdp_api.c +++ b/components/bt/bluedroid/stack/sdp/sdp_api.c @@ -26,15 +26,15 @@ #include //#include -#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) /********************************************************************** diff --git a/components/bt/bluedroid/stack/sdp/sdp_db.c b/components/bt/bluedroid/stack/sdp/sdp_db.c index 4ecfab1481..5f049e4eb7 100644 --- a/components/bt/bluedroid/stack/sdp/sdp_db.c +++ b/components/bt/bluedroid/stack/sdp/sdp_db.c @@ -26,15 +26,15 @@ #include #include -#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) diff --git a/components/bt/bluedroid/stack/sdp/sdp_discovery.c b/components/bt/bluedroid/stack/sdp/sdp_discovery.c index 04a6ec7948..8f76f2022c 100644 --- a/components/bt/bluedroid/stack/sdp/sdp_discovery.c +++ b/components/bt/bluedroid/stack/sdp/sdp_discovery.c @@ -26,15 +26,15 @@ #include #include -#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 diff --git a/components/bt/bluedroid/stack/sdp/sdp_main.c b/components/bt/bluedroid/stack/sdp/sdp_main.c index b8e76b1d8e..af0571a103 100644 --- a/components/bt/bluedroid/stack/sdp/sdp_main.c +++ b/components/bt/bluedroid/stack/sdp/sdp_main.c @@ -26,19 +26,19 @@ #include //#include -#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) diff --git a/components/bt/bluedroid/stack/sdp/sdp_server.c b/components/bt/bluedroid/stack/sdp/sdp_server.c index 84333b2b0b..856aba71d4 100644 --- a/components/bt/bluedroid/stack/sdp/sdp_server.c +++ b/components/bt/bluedroid/stack/sdp/sdp_server.c @@ -27,15 +27,15 @@ #include //#include -#include "bt_types.h" -#include "allocator.h" -#include "btu.h" -#include "bt_defs.h" -#include "l2cdefs.h" -#include "hcidefs.h" -#include "hcimsgs.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 "sdp_api.h" +#include "stack/sdp_api.h" #include "sdpint.h" diff --git a/components/bt/bluedroid/stack/sdp/sdp_utils.c b/components/bt/bluedroid/stack/sdp/sdp_utils.c index 271013fca7..b93f3b7045 100644 --- a/components/bt/bluedroid/stack/sdp/sdp_utils.c +++ b/components/bt/bluedroid/stack/sdp/sdp_utils.c @@ -25,20 +25,20 @@ #include #include -#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, diff --git a/components/bt/bluedroid/stack/smp/aes.c b/components/bt/bluedroid/stack/smp/aes.c index 77811873d4..3ef0837397 100644 --- a/components/bt/bluedroid/stack/smp/aes.c +++ b/components/bt/bluedroid/stack/smp/aes.c @@ -46,7 +46,7 @@ #include /* 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 diff --git a/components/bt/bluedroid/stack/smp/include/p_256_multprecision.h b/components/bt/bluedroid/stack/smp/include/p_256_multprecision.h index ac32320aad..c9a1a4ea52 100644 --- a/components/bt/bluedroid/stack/smp/include/p_256_multprecision.h +++ b/components/bt/bluedroid/stack/smp/include/p_256_multprecision.h @@ -23,7 +23,7 @@ ******************************************************************************/ #pragma once -#include "bt_types.h" +#include "stack/bt_types.h" /* Type definitions */ typedef unsigned long DWORD; diff --git a/components/bt/bluedroid/stack/smp/include/smp_int.h b/components/bt/bluedroid/stack/smp/include/smp_int.h index 734c3fcba3..10d6f4bc69 100644 --- a/components/bt/bluedroid/stack/smp/include/smp_int.h +++ b/components/bt/bluedroid/stack/smp/include/smp_int.h @@ -26,10 +26,10 @@ #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 */ diff --git a/components/bt/bluedroid/stack/smp/p_256_multprecision.c b/components/bt/bluedroid/stack/smp/p_256_multprecision.c index 2c11474d46..0bb64adfb7 100644 --- a/components/bt/bluedroid/stack/smp/p_256_multprecision.c +++ b/components/bt/bluedroid/stack/smp/p_256_multprecision.c @@ -23,7 +23,7 @@ ******************************************************************************/ #include -#include "bt_target.h" +#include "common/bt_target.h" #include "p_256_ecc_pp.h" #include "p_256_multprecision.h" diff --git a/components/bt/bluedroid/stack/smp/smp_act.c b/components/bt/bluedroid/stack/smp/smp_act.c index 10c8821f5d..65370e6776 100644 --- a/components/bt/bluedroid/stack/smp/smp_act.c +++ b/components/bt/bluedroid/stack/smp/smp_act.c @@ -17,10 +17,10 @@ ******************************************************************************/ #include -#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" diff --git a/components/bt/bluedroid/stack/smp/smp_api.c b/components/bt/bluedroid/stack/smp/smp_api.c index fe90034c7d..5e8b436ec8 100644 --- a/components/bt/bluedroid/stack/smp/smp_api.c +++ b/components/bt/bluedroid/stack/smp/smp_api.c @@ -24,19 +24,19 @@ ******************************************************************************/ #include -#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" /******************************************************************************* ** diff --git a/components/bt/bluedroid/stack/smp/smp_br_main.c b/components/bt/bluedroid/stack/smp/smp_br_main.c index 8360bf9786..ba2eb97456 100644 --- a/components/bt/bluedroid/stack/smp/smp_br_main.c +++ b/components/bt/bluedroid/stack/smp/smp_br_main.c @@ -16,7 +16,7 @@ * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #include #include "smp_int.h" diff --git a/components/bt/bluedroid/stack/smp/smp_cmac.c b/components/bt/bluedroid/stack/smp/smp_cmac.c index e284b678f2..753c5188f2 100644 --- a/components/bt/bluedroid/stack/smp/smp_cmac.c +++ b/components/bt/bluedroid/stack/smp/smp_cmac.c @@ -22,16 +22,16 @@ * ******************************************************************************/ -#include "bt_target.h" -#include "allocator.h" +#include "common/bt_target.h" +#include "osi/allocator.h" #if SMP_INCLUDED == TRUE // #include #include -#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; diff --git a/components/bt/bluedroid/stack/smp/smp_keys.c b/components/bt/bluedroid/stack/smp/smp_keys.c index cc1a25f80f..a147a158ff 100644 --- a/components/bt/bluedroid/stack/smp/smp_keys.c +++ b/components/bt/bluedroid/stack/smp/smp_keys.c @@ -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 @@ -29,14 +29,14 @@ #endif #include //#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 diff --git a/components/bt/bluedroid/stack/smp/smp_l2c.c b/components/bt/bluedroid/stack/smp/smp_l2c.c index 24093d64ce..7c5efa7ea4 100644 --- a/components/bt/bluedroid/stack/smp/smp_l2c.c +++ b/components/bt/bluedroid/stack/smp/smp_l2c.c @@ -22,14 +22,14 @@ * ******************************************************************************/ -#include "bt_target.h" -#include "allocator.h" +#include "common/bt_target.h" +#include "osi/allocator.h" #if SMP_INCLUDED == TRUE #include -#include "btm_ble_api.h" -#include "l2c_api.h" +#include "stack/btm_ble_api.h" +#include "stack/l2c_api.h" #include "smp_int.h" diff --git a/components/bt/bluedroid/stack/smp/smp_main.c b/components/bt/bluedroid/stack/smp/smp_main.c index 1bb0fcb470..0880fe910f 100644 --- a/components/bt/bluedroid/stack/smp/smp_main.c +++ b/components/bt/bluedroid/stack/smp/smp_main.c @@ -16,7 +16,7 @@ * ******************************************************************************/ -#include "bt_target.h" +#include "common/bt_target.h" #if SMP_INCLUDED == TRUE diff --git a/components/bt/bluedroid/stack/smp/smp_utils.c b/components/bt/bluedroid/stack/smp/smp_utils.c index ba039bfcb4..91dac6dec2 100644 --- a/components/bt/bluedroid/stack/smp/smp_utils.c +++ b/components/bt/bluedroid/stack/smp/smp_utils.c @@ -21,20 +21,20 @@ * 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 //#include -#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 diff --git a/components/bt/component.mk b/components/bt/component.mk index a2682cdd1b..8de4d6889c 100644 --- a/components/bt/component.mk +++ b/components/bt/component.mk @@ -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 diff --git a/docs/Doxyfile b/docs/Doxyfile index 8620ff8407..7c1ac334d3 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -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 ## diff --git a/docs/en/api-reference/bluetooth/controller_vhci.rst b/docs/en/api-reference/bluetooth/controller_vhci.rst index 17680a5872..3db69ca027 100644 --- a/docs/en/api-reference/bluetooth/controller_vhci.rst +++ b/docs/en/api-reference/bluetooth/controller_vhci.rst @@ -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 diff --git a/examples/bluetooth/ble_ibeacon/main/esp_ibeacon_api.c b/examples/bluetooth/ble_ibeacon/main/esp_ibeacon_api.c index 277f007f70..248db09ee4 100644 --- a/examples/bluetooth/ble_ibeacon/main/esp_ibeacon_api.c +++ b/examples/bluetooth/ble_ibeacon/main/esp_ibeacon_api.c @@ -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; } } diff --git a/examples/bluetooth/ble_ibeacon/main/esp_ibeacon_api.h b/examples/bluetooth/ble_ibeacon/main/esp_ibeacon_api.h index f04b638a05..7c3fce2be5 100644 --- a/examples/bluetooth/ble_ibeacon/main/esp_ibeacon_api.h +++ b/examples/bluetooth/ble_ibeacon/main/esp_ibeacon_api.h @@ -22,7 +22,6 @@ #include #include #include -#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); diff --git a/examples/bluetooth/ble_ibeacon/main/ibeacon_demo.c b/examples/bluetooth/ble_ibeacon/main/ibeacon_demo.c index 899d96fe8d..5db17265a7 100644 --- a/examples/bluetooth/ble_ibeacon/main/ibeacon_demo.c +++ b/examples/bluetooth/ble_ibeacon/main/ibeacon_demo.c @@ -22,7 +22,6 @@ #include #include #include -#include "controller.h" #include "nvs_flash.h" #include "esp_bt.h" @@ -30,8 +29,10 @@ #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); diff --git a/examples/bluetooth/ble_spp_client/main/spp_client_demo.c b/examples/bluetooth/ble_spp_client/main/spp_client_demo.c index 5b82ab88b5..28711a2b42 100644 --- a/examples/bluetooth/ble_spp_client/main/spp_client_demo.c +++ b/examples/bluetooth/ble_spp_client/main/spp_client_demo.c @@ -16,7 +16,6 @@ #include #include #include -#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 diff --git a/examples/bluetooth/gatt_client/main/gattc_demo.c b/examples/bluetooth/gatt_client/main/gattc_demo.c index 31704c0948..8817a93546 100644 --- a/examples/bluetooth/gatt_client/main/gattc_demo.c +++ b/examples/bluetooth/gatt_client/main/gattc_demo.c @@ -23,7 +23,6 @@ #include #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 diff --git a/examples/bluetooth/gatt_security_client/main/example_ble_sec_gattc_demo.c b/examples/bluetooth/gatt_security_client/main/example_ble_sec_gattc_demo.c index 2090c8bc00..aa068ff6f1 100644 --- a/examples/bluetooth/gatt_security_client/main/example_ble_sec_gattc_demo.c +++ b/examples/bluetooth/gatt_security_client/main/example_ble_sec_gattc_demo.c @@ -22,7 +22,6 @@ #include #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 diff --git a/examples/bluetooth/gattc_multi_connect/main/gattc_multi_connect.c b/examples/bluetooth/gattc_multi_connect/main/gattc_multi_connect.c index e5b44868e6..84f48a5d0a 100644 --- a/examples/bluetooth/gattc_multi_connect/main/gattc_multi_connect.c +++ b/examples/bluetooth/gattc_multi_connect/main/gattc_multi_connect.c @@ -26,7 +26,6 @@ #include #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