Merge branch 'bugfix/btdm_modify_include_path' into 'master'

component/bt : modify header files to avoid conflict

See merge request idf/esp-idf!2195

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 <string.h>
 #include "esp_err.h"
 #include "esp_a2dp_api.h"
 #include "esp_bt_main.h"
-#include "btc_manage.h"
+#include "btc/btc_manage.h"
 #include "btc_av.h"
 
 #if BTC_AV_INCLUDED

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 <string.h>
 #include "esp_err.h"
 #include "esp_avrc_api.h"
 #include "esp_bt_main.h"
-#include "btc_manage.h"
+#include "btc/btc_manage.h"
 #include "btc_avrc.h"
 
 #if BTC_AV_INCLUDED

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"
 

components/bt/bluedroid/api/esp_bt_device.c

@@ -16,9 +16,9 @@
 #include <string.h>
 #include "esp_bt_device.h"
 #include "esp_bt_main.h"
-#include "controller.h"
-#include "btc_task.h"
-#include "btc_dev.h"
+#include "device/controller.h"
+#include "btc/btc_task.h"
+#include "btc/btc_dev.h"
 
 const uint8_t *esp_bt_dev_get_address(void)
 {

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;

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)

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 <string.h>
 #include "esp_bt_main.h"
 #include "esp_gap_bt_api.h"
-#include "bt_trace.h"
-#include "btc_manage.h"
+#include "common/bt_trace.h"
+#include "btc/btc_manage.h"
 #include "btc_gap_bt.h"
 
 #if (BTC_GAP_BT_INCLUDED == TRUE)

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"
 

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))
 

components/bt/bluedroid/api/esp_spp_api.c

@@ -15,11 +15,11 @@
 #include <string.h>
 
 #include "esp_bt_main.h"
-#include "btc_manage.h"
+#include "btc/btc_manage.h"
 
 #include "btc_spp.h"
 #include "esp_spp_api.h"
-#include "bt_target.h"
+#include "common/bt_target.h"
 
 #if (defined BTC_SPP_INCLUDED && BTC_SPP_INCLUDED == TRUE)
 

components/bt/bluedroid/api/include/esp_bt_defs.h → 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

components/bt/bluedroid/api/include/esp_gap_ble_api.h → 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

components/bt/bluedroid/api/include/esp_gatt_common_api.h → 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,

components/bt/bluedroid/api/include/esp_gatt_defs.h → 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_NO_RESOURCES           =   0x80,   /* 0x80 */    /* relate to BTA_GATT_NO_RESOURCES in bta_gatt_api.h */
-    ESP_GATT_INTERNAL_ERROR         =   0x81,   /* 0x81 */    /* relate to BTA_GATT_INTERNAL_ERROR in bta_gatt_api.h */
-    ESP_GATT_WRONG_STATE            =   0x82,   /* 0x82 */    /* relate to BTA_GATT_WRONG_STATE in bta_gatt_api.h */
-    ESP_GATT_DB_FULL                =   0x83,   /* 0x83 */    /* relate to BTA_GATT_DB_FULL in bta_gatt_api.h */
-    ESP_GATT_BUSY                   =   0x84,   /* 0x84 */    /* relate to BTA_GATT_BUSY in bta_gatt_api.h */
-    ESP_GATT_ERROR                  =   0x85,   /* 0x85 */    /* relate to BTA_GATT_ERROR in bta_gatt_api.h */
-    ESP_GATT_CMD_STARTED            =   0x86,   /* 0x86 */    /* relate to BTA_GATT_CMD_STARTED in bta_gatt_api.h */
-    ESP_GATT_ILLEGAL_PARAMETER      =   0x87,   /* 0x87 */    /* relate to BTA_GATT_ILLEGAL_PARAMETER in bta_gatt_api.h */
-    ESP_GATT_PENDING                =   0x88,   /* 0x88 */    /* relate to BTA_GATT_PENDING in bta_gatt_api.h */
-    ESP_GATT_AUTH_FAIL              =   0x89,   /* 0x89 */    /* relate to BTA_GATT_AUTH_FAIL in bta_gatt_api.h */
-    ESP_GATT_MORE                   =   0x8a,   /* 0x8a */    /* relate to BTA_GATT_MORE in bta_gatt_api.h */
-    ESP_GATT_INVALID_CFG            =   0x8b,   /* 0x8b */    /* relate to BTA_GATT_INVALID_CFG in bta_gatt_api.h */
-    ESP_GATT_SERVICE_STARTED        =   0x8c,   /* 0x8c */    /* relate to BTA_GATT_SERVICE_STARTED in bta_gatt_api.h */
-    ESP_GATT_ENCRYPED_MITM          =   ESP_GATT_OK,    /* relate to BTA_GATT_ENCRYPED_MITM in bta_gatt_api.h */
-    ESP_GATT_ENCRYPED_NO_MITM       =   0x8d,   /* 0x8d */    /* relate to BTA_GATT_ENCRYPED_NO_MITM in bta_gatt_api.h */
-    ESP_GATT_NOT_ENCRYPTED          =   0x8e,   /* 0x8e */    /* relate to BTA_GATT_NOT_ENCRYPTED in bta_gatt_api.h */
-    ESP_GATT_CONGESTED              =   0x8f,   /* 0x8f */    /* relate to BTA_GATT_CONGESTED in bta_gatt_api.h */
-    ESP_GATT_DUP_REG                =   0x90,   /* 0x90 */    /* relate to BTA_GATT_DUP_REG in bta_gatt_api.h */
-    ESP_GATT_ALREADY_OPEN           =   0x91,   /* 0x91 */    /* relate to BTA_GATT_ALREADY_OPEN in bta_gatt_api.h */
-    ESP_GATT_CANCEL                 =   0x92,   /* 0x92 */    /* relate to BTA_GATT_CANCEL in bta_gatt_api.h */
+    ESP_GATT_OK                     =   0x0,                    /* relate to BTA_GATT_OK in bta/bta_gatt_api.h */
+    ESP_GATT_INVALID_HANDLE         =   0x01,   /* 0x0001 */    /* relate to BTA_GATT_INVALID_HANDLE in bta/bta_gatt_api.h */
+    ESP_GATT_READ_NOT_PERMIT        =   0x02,   /* 0x0002 */    /* relate to BTA_GATT_READ_NOT_PERMIT in bta/bta_gatt_api.h */
+    ESP_GATT_WRITE_NOT_PERMIT       =   0x03,   /* 0x0003 */    /* relate to BTA_GATT_WRITE_NOT_PERMIT in bta/bta_gatt_api.h */
+    ESP_GATT_INVALID_PDU            =   0x04,   /* 0x0004 */    /* relate to BTA_GATT_INVALID_PDU in bta/bta_gatt_api.h */
+    ESP_GATT_INSUF_AUTHENTICATION   =   0x05,   /* 0x0005 */    /* relate to BTA_GATT_INSUF_AUTHENTICATION in bta/bta_gatt_api.h */
+    ESP_GATT_REQ_NOT_SUPPORTED      =   0x06,   /* 0x0006 */    /* relate to BTA_GATT_REQ_NOT_SUPPORTED in bta/bta_gatt_api.h */
+    ESP_GATT_INVALID_OFFSET         =   0x07,   /* 0x0007 */    /* relate to BTA_GATT_INVALID_OFFSET in bta/bta_gatt_api.h */
+    ESP_GATT_INSUF_AUTHORIZATION    =   0x08,   /* 0x0008 */    /* relate to BTA_GATT_INSUF_AUTHORIZATION in bta/bta_gatt_api.h */
+    ESP_GATT_PREPARE_Q_FULL         =   0x09,   /* 0x0009 */    /* relate to BTA_GATT_PREPARE_Q_FULL in bta/bta_gatt_api.h */
+    ESP_GATT_NOT_FOUND              =   0x0a,   /* 0x000a */    /* relate to BTA_GATT_NOT_FOUND in bta/bta_gatt_api.h */
+    ESP_GATT_NOT_LONG               =   0x0b,   /* 0x000b */    /* relate to BTA_GATT_NOT_LONG in bta/bta_gatt_api.h */
+    ESP_GATT_INSUF_KEY_SIZE         =   0x0c,   /* 0x000c */    /* relate to BTA_GATT_INSUF_KEY_SIZE in bta/bta_gatt_api.h */
+    ESP_GATT_INVALID_ATTR_LEN       =   0x0d,   /* 0x000d */    /* relate to BTA_GATT_INVALID_ATTR_LEN in bta/bta_gatt_api.h */
+    ESP_GATT_ERR_UNLIKELY           =   0x0e,   /* 0x000e */    /* relate to BTA_GATT_ERR_UNLIKELY in bta/bta_gatt_api.h */
+    ESP_GATT_INSUF_ENCRYPTION       =   0x0f,   /* 0x000f */    /* relate to BTA_GATT_INSUF_ENCRYPTION in bta/bta_gatt_api.h */
+    ESP_GATT_UNSUPPORT_GRP_TYPE     =   0x10,   /* 0x0010 */    /* relate to BTA_GATT_UNSUPPORT_GRP_TYPE in bta/bta_gatt_api.h */
+    ESP_GATT_INSUF_RESOURCE         =   0x11,   /* 0x0011 */    /* relate to BTA_GATT_INSUF_RESOURCE in bta/bta_gatt_api.h */
+
+    ESP_GATT_NO_RESOURCES           =   0x80,   /* 0x80 */    /* relate to BTA_GATT_NO_RESOURCES in bta/bta_gatt_api.h */
+    ESP_GATT_INTERNAL_ERROR         =   0x81,   /* 0x81 */    /* relate to BTA_GATT_INTERNAL_ERROR in bta/bta_gatt_api.h */
+    ESP_GATT_WRONG_STATE            =   0x82,   /* 0x82 */    /* relate to BTA_GATT_WRONG_STATE in bta/bta_gatt_api.h */
+    ESP_GATT_DB_FULL                =   0x83,   /* 0x83 */    /* relate to BTA_GATT_DB_FULL in bta/bta_gatt_api.h */
+    ESP_GATT_BUSY                   =   0x84,   /* 0x84 */    /* relate to BTA_GATT_BUSY in bta/bta_gatt_api.h */
+    ESP_GATT_ERROR                  =   0x85,   /* 0x85 */    /* relate to BTA_GATT_ERROR in bta/bta_gatt_api.h */
+    ESP_GATT_CMD_STARTED            =   0x86,   /* 0x86 */    /* relate to BTA_GATT_CMD_STARTED in bta/bta_gatt_api.h */
+    ESP_GATT_ILLEGAL_PARAMETER      =   0x87,   /* 0x87 */    /* relate to BTA_GATT_ILLEGAL_PARAMETER in bta/bta_gatt_api.h */
+    ESP_GATT_PENDING                =   0x88,   /* 0x88 */    /* relate to BTA_GATT_PENDING in bta/bta_gatt_api.h */
+    ESP_GATT_AUTH_FAIL              =   0x89,   /* 0x89 */    /* relate to BTA_GATT_AUTH_FAIL in bta/bta_gatt_api.h */
+    ESP_GATT_MORE                   =   0x8a,   /* 0x8a */    /* relate to BTA_GATT_MORE in bta/bta_gatt_api.h */
+    ESP_GATT_INVALID_CFG            =   0x8b,   /* 0x8b */    /* relate to BTA_GATT_INVALID_CFG in bta/bta_gatt_api.h */
+    ESP_GATT_SERVICE_STARTED        =   0x8c,   /* 0x8c */    /* relate to BTA_GATT_SERVICE_STARTED in bta/bta_gatt_api.h */
+    ESP_GATT_ENCRYPED_MITM          =   ESP_GATT_OK,    /* relate to BTA_GATT_ENCRYPED_MITM in bta/bta_gatt_api.h */
+    ESP_GATT_ENCRYPED_NO_MITM       =   0x8d,   /* 0x8d */    /* relate to BTA_GATT_ENCRYPED_NO_MITM in bta/bta_gatt_api.h */
+    ESP_GATT_NOT_ENCRYPTED          =   0x8e,   /* 0x8e */    /* relate to BTA_GATT_NOT_ENCRYPTED in bta/bta_gatt_api.h */
+    ESP_GATT_CONGESTED              =   0x8f,   /* 0x8f */    /* relate to BTA_GATT_CONGESTED in bta/bta_gatt_api.h */
+    ESP_GATT_DUP_REG                =   0x90,   /* 0x90 */    /* relate to BTA_GATT_DUP_REG in bta/bta_gatt_api.h */
+    ESP_GATT_ALREADY_OPEN           =   0x91,   /* 0x91 */    /* relate to BTA_GATT_ALREADY_OPEN in bta/bta_gatt_api.h */
+    ESP_GATT_CANCEL                 =   0x92,   /* 0x92 */    /* relate to BTA_GATT_CANCEL in bta/bta_gatt_api.h */
     /* 0xE0 ~ 0xFC reserved for future use */
-    ESP_GATT_STACK_RSP              =   0xe0,   /* 0xe0 */    /* relate to BTA_GATT_STACK_RSP in bta_gatt_api.h */
-    ESP_GATT_APP_RSP                =   0xe1,   /* 0xe1 */    /* relate to BTA_GATT_APP_RSP in bta_gatt_api.h */
+    ESP_GATT_STACK_RSP              =   0xe0,   /* 0xe0 */    /* relate to BTA_GATT_STACK_RSP in bta/bta_gatt_api.h */
+    ESP_GATT_APP_RSP                =   0xe1,   /* 0xe1 */    /* relate to BTA_GATT_APP_RSP in bta/bta_gatt_api.h */
     //Error caused by customer application or stack bug
-    ESP_GATT_UNKNOWN_ERROR          =   0xef,   /* 0xef */    /* relate to BTA_GATT_UNKNOWN_ERROR in bta_gatt_api.h */
-    ESP_GATT_CCC_CFG_ERR            =   0xfd,   /* 0xFD Client Characteristic Configuration Descriptor Improperly Configured */    /* relate to BTA_GATT_CCC_CFG_ERR in bta_gatt_api.h */
-    ESP_GATT_PRC_IN_PROGRESS        =   0xfe,   /* 0xFE Procedure Already in progress */  /* relate to BTA_GATT_PRC_IN_PROGRESS in bta_gatt_api.h */
-    ESP_GATT_OUT_OF_RANGE           =   0xff,   /* 0xFFAttribute value out of range */    /* relate to BTA_GATT_OUT_OF_RANGE in bta_gatt_api.h */
+    ESP_GATT_UNKNOWN_ERROR          =   0xef,   /* 0xef */    /* relate to BTA_GATT_UNKNOWN_ERROR in bta/bta_gatt_api.h */
+    ESP_GATT_CCC_CFG_ERR            =   0xfd,   /* 0xFD Client Characteristic Configuration Descriptor Improperly Configured */    /* relate to BTA_GATT_CCC_CFG_ERR in bta/bta_gatt_api.h */
+    ESP_GATT_PRC_IN_PROGRESS        =   0xfe,   /* 0xFE Procedure Already in progress */  /* relate to BTA_GATT_PRC_IN_PROGRESS in bta/bta_gatt_api.h */
+    ESP_GATT_OUT_OF_RANGE           =   0xff,   /* 0xFFAttribute value out of range */    /* relate to BTA_GATT_OUT_OF_RANGE in bta/bta_gatt_api.h */
 } esp_gatt_status_t;
 
-/* relate to BTA_GATT_CONN_xxx in bta_gatt_api.h */
+/* relate to BTA_GATT_CONN_xxx in bta/bta_gatt_api.h */
 /**
  * @brief Gatt Connection reason enum
  */
 typedef enum {
-    ESP_GATT_CONN_UNKNOWN = 0,                      /*!< Gatt connection unknown */               /* relate to BTA_GATT_CONN_UNKNOWN in bta_gatt_api.h */
-    ESP_GATT_CONN_L2C_FAILURE = 1,                  /*!< General L2cap failure  */                /* relate to BTA_GATT_CONN_L2C_FAILURE in bta_gatt_api.h */
-    ESP_GATT_CONN_TIMEOUT = 0x08,                   /*!< Connection timeout  */                   /* relate to BTA_GATT_CONN_TIMEOUT in bta_gatt_api.h */
-    ESP_GATT_CONN_TERMINATE_PEER_USER = 0x13,       /*!< Connection terminate by peer user  */    /* relate to BTA_GATT_CONN_TERMINATE_PEER_USER in bta_gatt_api.h */
-    ESP_GATT_CONN_TERMINATE_LOCAL_HOST = 0x16,      /*!< Connectionterminated by local host */    /* relate to BTA_GATT_CONN_TERMINATE_LOCAL_HOST in bta_gatt_api.h */
-    ESP_GATT_CONN_FAIL_ESTABLISH = 0x3e,            /*!< Connection fail to establish  */         /* relate to BTA_GATT_CONN_FAIL_ESTABLISH in bta_gatt_api.h */
-    ESP_GATT_CONN_LMP_TIMEOUT = 0x22,               /*!< Connection fail for LMP response tout */ /* relate to BTA_GATT_CONN_LMP_TIMEOUT in bta_gatt_api.h */
-    ESP_GATT_CONN_CONN_CANCEL = 0x0100,             /*!< L2CAP connection cancelled  */           /* relate to BTA_GATT_CONN_CONN_CANCEL in bta_gatt_api.h */
-    ESP_GATT_CONN_NONE = 0x0101                     /*!< No connection to cancel  */              /* relate to BTA_GATT_CONN_NONE in bta_gatt_api.h */
+    ESP_GATT_CONN_UNKNOWN = 0,                      /*!< Gatt connection unknown */               /* relate to BTA_GATT_CONN_UNKNOWN in bta/bta_gatt_api.h */
+    ESP_GATT_CONN_L2C_FAILURE = 1,                  /*!< General L2cap failure  */                /* relate to BTA_GATT_CONN_L2C_FAILURE in bta/bta_gatt_api.h */
+    ESP_GATT_CONN_TIMEOUT = 0x08,                   /*!< Connection timeout  */                   /* relate to BTA_GATT_CONN_TIMEOUT in bta/bta_gatt_api.h */
+    ESP_GATT_CONN_TERMINATE_PEER_USER = 0x13,       /*!< Connection terminate by peer user  */    /* relate to BTA_GATT_CONN_TERMINATE_PEER_USER in bta/bta_gatt_api.h */
+    ESP_GATT_CONN_TERMINATE_LOCAL_HOST = 0x16,      /*!< Connectionterminated by local host */    /* relate to BTA_GATT_CONN_TERMINATE_LOCAL_HOST in bta/bta_gatt_api.h */
+    ESP_GATT_CONN_FAIL_ESTABLISH = 0x3e,            /*!< Connection fail to establish  */         /* relate to BTA_GATT_CONN_FAIL_ESTABLISH in bta/bta_gatt_api.h */
+    ESP_GATT_CONN_LMP_TIMEOUT = 0x22,               /*!< Connection fail for LMP response tout */ /* relate to BTA_GATT_CONN_LMP_TIMEOUT in bta/bta_gatt_api.h */
+    ESP_GATT_CONN_CONN_CANCEL = 0x0100,             /*!< L2CAP connection cancelled  */           /* relate to BTA_GATT_CONN_CONN_CANCEL in bta/bta_gatt_api.h */
+    ESP_GATT_CONN_NONE = 0x0101                     /*!< No connection to cancel  */              /* relate to BTA_GATT_CONN_NONE in bta/bta_gatt_api.h */
 } esp_gatt_conn_reason_t;
 
 /**
@@ -248,42 +248,42 @@ typedef struct {
     bool            is_primary;             /*!< This service is primary or not */
 } __attribute__((packed)) esp_gatt_srvc_id_t;
 
-/* relate to BTA_GATT_AUTH_REQ_xxx in bta_gatt_api.h */
+/* relate to BTA_GATT_AUTH_REQ_xxx in bta/bta_gatt_api.h */
 /**
  * @brief Gatt authentication request type
  */
 typedef enum {
-    ESP_GATT_AUTH_REQ_NONE                  = 0,                                       /* relate to BTA_GATT_AUTH_REQ_NONE in bta_gatt_api.h */
-    ESP_GATT_AUTH_REQ_NO_MITM               = 1,   /* unauthenticated encryption */    /* relate to BTA_GATT_AUTH_REQ_NO_MITM in bta_gatt_api.h */
-    ESP_GATT_AUTH_REQ_MITM                  = 2,   /* authenticated encryption */      /* relate to BTA_GATT_AUTH_REQ_MITM in bta_gatt_api.h */
-    ESP_GATT_AUTH_REQ_SIGNED_NO_MITM        = 3,                                       /* relate to BTA_GATT_AUTH_REQ_SIGNED_NO_MITM in bta_gatt_api.h */
-    ESP_GATT_AUTH_REQ_SIGNED_MITM           = 4,                                       /* relate to BTA_GATT_AUTH_REQ_SIGNED_MITM in bta_gatt_api.h */
+    ESP_GATT_AUTH_REQ_NONE                  = 0,                                       /* relate to BTA_GATT_AUTH_REQ_NONE in bta/bta_gatt_api.h */
+    ESP_GATT_AUTH_REQ_NO_MITM               = 1,   /* unauthenticated encryption */    /* relate to BTA_GATT_AUTH_REQ_NO_MITM in bta/bta_gatt_api.h */
+    ESP_GATT_AUTH_REQ_MITM                  = 2,   /* authenticated encryption */      /* relate to BTA_GATT_AUTH_REQ_MITM in bta/bta_gatt_api.h */
+    ESP_GATT_AUTH_REQ_SIGNED_NO_MITM        = 3,                                       /* relate to BTA_GATT_AUTH_REQ_SIGNED_NO_MITM in bta/bta_gatt_api.h */
+    ESP_GATT_AUTH_REQ_SIGNED_MITM           = 4,                                       /* relate to BTA_GATT_AUTH_REQ_SIGNED_MITM in bta/bta_gatt_api.h */
 } esp_gatt_auth_req_t;
 
-/* relate to BTA_GATT_PERM_xxx in bta_gatt_api.h */
+/* relate to BTA_GATT_PERM_xxx in bta/bta_gatt_api.h */
 /**
  * @brief Attribute permissions
  */
-#define    ESP_GATT_PERM_READ                  (1 << 0)   /* bit 0 -  0x0001 */    /* relate to BTA_GATT_PERM_READ in bta_gatt_api.h */
-#define    ESP_GATT_PERM_READ_ENCRYPTED        (1 << 1)   /* bit 1 -  0x0002 */    /* relate to BTA_GATT_PERM_READ_ENCRYPTED in bta_gatt_api.h */
-#define    ESP_GATT_PERM_READ_ENC_MITM         (1 << 2)   /* bit 2 -  0x0004 */    /* relate to BTA_GATT_PERM_READ_ENC_MITM in bta_gatt_api.h */
-#define    ESP_GATT_PERM_WRITE                 (1 << 4)   /* bit 4 -  0x0010 */    /* relate to BTA_GATT_PERM_WRITE in bta_gatt_api.h */
-#define    ESP_GATT_PERM_WRITE_ENCRYPTED       (1 << 5)   /* bit 5 -  0x0020 */    /* relate to BTA_GATT_PERM_WRITE_ENCRYPTED in bta_gatt_api.h */
-#define    ESP_GATT_PERM_WRITE_ENC_MITM        (1 << 6)   /* bit 6 -  0x0040 */    /* relate to BTA_GATT_PERM_WRITE_ENC_MITM in bta_gatt_api.h */
-#define    ESP_GATT_PERM_WRITE_SIGNED          (1 << 7)   /* bit 7 -  0x0080 */    /* relate to BTA_GATT_PERM_WRITE_SIGNED in bta_gatt_api.h */
-#define    ESP_GATT_PERM_WRITE_SIGNED_MITM     (1 << 8)   /* bit 8 -  0x0100 */    /* relate to BTA_GATT_PERM_WRITE_SIGNED_MITM in bta_gatt_api.h */
+#define    ESP_GATT_PERM_READ                  (1 << 0)   /* bit 0 -  0x0001 */    /* relate to BTA_GATT_PERM_READ in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_READ_ENCRYPTED        (1 << 1)   /* bit 1 -  0x0002 */    /* relate to BTA_GATT_PERM_READ_ENCRYPTED in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_READ_ENC_MITM         (1 << 2)   /* bit 2 -  0x0004 */    /* relate to BTA_GATT_PERM_READ_ENC_MITM in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_WRITE                 (1 << 4)   /* bit 4 -  0x0010 */    /* relate to BTA_GATT_PERM_WRITE in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_WRITE_ENCRYPTED       (1 << 5)   /* bit 5 -  0x0020 */    /* relate to BTA_GATT_PERM_WRITE_ENCRYPTED in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_WRITE_ENC_MITM        (1 << 6)   /* bit 6 -  0x0040 */    /* relate to BTA_GATT_PERM_WRITE_ENC_MITM in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_WRITE_SIGNED          (1 << 7)   /* bit 7 -  0x0080 */    /* relate to BTA_GATT_PERM_WRITE_SIGNED in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_WRITE_SIGNED_MITM     (1 << 8)   /* bit 8 -  0x0100 */    /* relate to BTA_GATT_PERM_WRITE_SIGNED_MITM in bta/bta_gatt_api.h */
 typedef uint16_t esp_gatt_perm_t;
 
-/* relate to BTA_GATT_CHAR_PROP_BIT_xxx in bta_gatt_api.h */
+/* relate to BTA_GATT_CHAR_PROP_BIT_xxx in bta/bta_gatt_api.h */
 /* definition of characteristic properties */
-#define    ESP_GATT_CHAR_PROP_BIT_BROADCAST    (1 << 0)       /* 0x01 */    /* relate to BTA_GATT_CHAR_PROP_BIT_BROADCAST in bta_gatt_api.h */
-#define    ESP_GATT_CHAR_PROP_BIT_READ         (1 << 1)       /* 0x02 */    /* relate to BTA_GATT_CHAR_PROP_BIT_READ in bta_gatt_api.h */
-#define    ESP_GATT_CHAR_PROP_BIT_WRITE_NR     (1 << 2)       /* 0x04 */    /* relate to BTA_GATT_CHAR_PROP_BIT_WRITE_NR in bta_gatt_api.h */
-#define    ESP_GATT_CHAR_PROP_BIT_WRITE        (1 << 3)       /* 0x08 */    /* relate to BTA_GATT_CHAR_PROP_BIT_WRITE in bta_gatt_api.h */
-#define    ESP_GATT_CHAR_PROP_BIT_NOTIFY       (1 << 4)       /* 0x10 */    /* relate to BTA_GATT_CHAR_PROP_BIT_NOTIFY in bta_gatt_api.h */
-#define    ESP_GATT_CHAR_PROP_BIT_INDICATE     (1 << 5)       /* 0x20 */    /* relate to BTA_GATT_CHAR_PROP_BIT_INDICATE in bta_gatt_api.h */
-#define    ESP_GATT_CHAR_PROP_BIT_AUTH         (1 << 6)       /* 0x40 */    /* relate to BTA_GATT_CHAR_PROP_BIT_AUTH in bta_gatt_api.h */
-#define    ESP_GATT_CHAR_PROP_BIT_EXT_PROP     (1 << 7)       /* 0x80 */    /* relate to BTA_GATT_CHAR_PROP_BIT_EXT_PROP in bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_BROADCAST    (1 << 0)       /* 0x01 */    /* relate to BTA_GATT_CHAR_PROP_BIT_BROADCAST in bta/bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_READ         (1 << 1)       /* 0x02 */    /* relate to BTA_GATT_CHAR_PROP_BIT_READ in bta/bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_WRITE_NR     (1 << 2)       /* 0x04 */    /* relate to BTA_GATT_CHAR_PROP_BIT_WRITE_NR in bta/bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_WRITE        (1 << 3)       /* 0x08 */    /* relate to BTA_GATT_CHAR_PROP_BIT_WRITE in bta/bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_NOTIFY       (1 << 4)       /* 0x10 */    /* relate to BTA_GATT_CHAR_PROP_BIT_NOTIFY in bta/bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_INDICATE     (1 << 5)       /* 0x20 */    /* relate to BTA_GATT_CHAR_PROP_BIT_INDICATE in bta/bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_AUTH         (1 << 6)       /* 0x40 */    /* relate to BTA_GATT_CHAR_PROP_BIT_AUTH in bta/bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_EXT_PROP     (1 << 7)       /* 0x80 */    /* relate to BTA_GATT_CHAR_PROP_BIT_EXT_PROP in bta/bta_gatt_api.h */
 typedef uint8_t esp_gatt_char_prop_t;
 
 /// GATT maximum attribute length

components/bt/bluedroid/api/include/esp_spp_api.h → 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 {

components/bt/bluedroid/bta/ar/bta_ar.c

@@ -22,9 +22,9 @@
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #include <string.h>
-#include "bta_ar_api.h"
+#include "bta/bta_ar_api.h"
 #include "bta_ar_int.h"
 
 #if BTA_AR_INCLUDED

components/bt/bluedroid/bta/include/bta_ar_int.h → 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)
 

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 <assert.h>
-#include "bt_trace.h"
+#include "common/bt_trace.h"
 #include <string.h>
 
-#include "allocator.h"
+#include "osi/allocator.h"
 
 #include "bta_av_int.h"
-#include "avdt_api.h"
-#include "utl.h"
-#include "l2c_api.h"
-#include "l2cdefs.h"
+#include "stack/avdt_api.h"
+#include "bta/utl.h"
+#include "stack/l2c_api.h"
+#include "stack/l2cdefs.h"
 #if( defined BTA_AR_INCLUDED ) && (BTA_AR_INCLUDED == TRUE)
-#include "bta_ar_api.h"
+#include "bta/bta_ar_api.h"
 #endif
 
 /*****************************************************************************

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 <string.h>
-#include "bta_av_api.h"
+#include "bta/bta_av_api.h"
 #include "bta_av_int.h"
-#include "avdt_api.h"
-#include "utl.h"
-#include "l2c_api.h"
-#include "allocator.h"
-#include "list.h"
+#include "stack/avdt_api.h"
+#include "bta/utl.h"
+#include "stack/l2c_api.h"
+#include "osi/allocator.h"
+#include "osi/list.h"
 #if( defined BTA_AR_INCLUDED ) && (BTA_AR_INCLUDED == TRUE)
-#include "bta_ar_api.h"
+#include "bta/bta_ar_api.h"
 #endif
 
 #define LOG_TAG "bt_bta_av"
 // #include "osi/include/log.h"
-#include "bt_trace.h"
+#include "common/bt_trace.h"
 
 /*****************************************************************************
 **  Constants

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 <string.h>
 

components/bt/bluedroid/bta/av/bta_av_cfg.c

@@ -25,8 +25,8 @@
 
 #include <stddef.h>
 
-#include "bt_target.h"
-#include "bta_api.h"
+#include "common/bt_target.h"
+#include "bta/bta_api.h"
 #include "bta_av_int.h"
 
 #if defined(BTA_AV_INCLUDED) && (BTA_AV_INCLUDED == TRUE)

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 <string.h>
 

components/bt/bluedroid/bta/av/bta_av_main.c

@@ -25,20 +25,20 @@
 // #include <assert.h>
 #include <string.h>
 
-#include "bt_target.h"
-#include "bt_trace.h"
-#include "allocator.h"
+#include "common/bt_target.h"
+#include "common/bt_trace.h"
+#include "osi/allocator.h"
 
 #if defined(BTA_AV_INCLUDED) && (BTA_AV_INCLUDED == TRUE)
 #include "bta_av_int.h"
-#include "utl.h"
-#include "l2c_api.h"
-#include "l2cdefs.h"
-#include "bta_av_co.h"
+#include "bta/utl.h"
+#include "stack/l2c_api.h"
+#include "stack/l2cdefs.h"
+#include "bta/bta_av_co.h"
 #if( defined BTA_AR_INCLUDED ) && (BTA_AR_INCLUDED == TRUE)
-#include "bta_ar_api.h"
+#include "bta/bta_ar_api.h"
 #endif
-#include "osi.h"
+#include "osi/osi.h"
 
 /*****************************************************************************
 ** Constants and types

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)
 

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 <string.h>
-#include "bta_av_co.h"
+#include "bta/bta_av_co.h"
 #include "bta_av_int.h"
 
 /*****************************************************************************

components/bt/bluedroid/bta/include/bta_av_int.h → 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)
 

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 <string.h>
-#include "controller.h"
+#include "device/controller.h"
 
 #define LOG_TAG "bt_bta_dm"
 // #include "osi/include/log.h"
 
 #if (GAP_INCLUDED == TRUE)
-#include "gap_api.h"
+#include "stack/gap_api.h"
 #endif
 
 static void bta_dm_inq_results_cb (tBTM_INQ_RESULTS *p_inq, UINT8 *p_eir);
@@ -169,10 +169,10 @@ const UINT16 bta_service_id_to_uuid_lkup_tbl [BTA_MAX_SERVICE_ID] = {
 
 /*
  * NOTE : The number of element in bta_service_id_to_btm_srv_id_lkup_tbl should be matching with
- *        the value BTA_MAX_SERVICE_ID in bta_api.h
+ *        the value BTA_MAX_SERVICE_ID in bta/bta_api.h
  *
  *        i.e., If you add new Service ID for BTA, the correct security ID of the new service
- *              from Security service definitions (btm_api.h) should be added to this lookup table.
+ *              from Security service definitions (stack/btm_api.h) should be added to this lookup table.
  */
 const UINT32 bta_service_id_to_btm_srv_id_lkup_tbl [BTA_MAX_SERVICE_ID] = {
     0,                                      /* Reserved */

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 <string.h>
-#include "utl.h"
-#include "allocator.h"
+#include "bta/utl.h"
+#include "osi/allocator.h"
 
 /*****************************************************************************
 **  Constants

components/bt/bluedroid/bta/dm/bta_dm_cfg.c

@@ -24,11 +24,11 @@
  ******************************************************************************/
 
 #include <stddef.h>
-#include "bt_target.h"
-#include "bta_sys.h"
-#include "bta_api.h"
+#include "common/bt_target.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_api.h"
 #include "bta_dm_int.h"
-// #include "bta_jv_api.h"
+// #include "bta/bta_jv_api.h"
 
 #ifndef BTA_DM_LINK_POLICY_SETTINGS
 #define BTA_DM_LINK_POLICY_SETTINGS    (HCI_ENABLE_MASTER_SLAVE_SWITCH | HCI_ENABLE_HOLD_MODE | HCI_ENABLE_SNIFF_MODE | HCI_ENABLE_PARK_MODE)
@@ -459,13 +459,13 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = {
 #endif  /* BTE_SIM_APP */
 };
 
-/* Please refer to the SNIFF table definitions in bta_api.h.
+/* Please refer to the SNIFF table definitions in bta/bta_api.h.
  *
  * Adding to or Modifying the Table
  * Additional sniff parameter entries can be added for BTA_DM_PM_SNIFF5 - BTA_DM_PM_SNIFF7.
  * Overrides of additional table entries can be specified in bdroid_buildcfg.h.  If additional
  * sniff parameter entries are added or an override of an existing entry is specified in
- * bdroid_buildcfg.h then the BTA_DM_PM_*_IDX defines in bta_api.h will need to be match the new
+ * bdroid_buildcfg.h then the BTA_DM_PM_*_IDX defines in bta/bta_api.h will need to be match the new
  * ordering.
  *
  * Table Ordering
@@ -478,7 +478,7 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTM_PM_PWR_MD bta_dm_pm_md[] = {
      * More sniff parameter entries can be added for
      * BTA_DM_PM_SNIFF3 - BTA_DM_PM_SNIFF7, if needed. When entries are added or
      * removed, BTA_DM_PM_PARK_IDX needs to be updated to reflect the actual index
-     * BTA_DM_PM_PARK_IDX is defined in bta_api.h and can be override by the
+     * BTA_DM_PM_PARK_IDX is defined in bta/bta_api.h and can be override by the
      * bdroid_buildcfg.h settings.
      * The SNIFF table entries must be in the order from highest latency (biggest
      * interval) to lowest latency. If there's a conflict among the connected

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 <string.h>
-#include "bta_dm_ci.h"
-#include "allocator.h"
+#include "bta/bta_dm_ci.h"
+#include "osi/allocator.h"
 
 
 #if (BTM_OOB_INCLUDED == TRUE && SMP_INCLUDED == TRUE)

components/bt/bluedroid/btif/bta_dm_co.c → components/bt/bluedroid/bta/dm/bta_dm_co.c

@@ -18,19 +18,19 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "bta_api.h"
-#include "bta_sys.h"
-#include "bta_dm_co.h"
-#include "bta_dm_ci.h"
-#include "btc_dm.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_dm_co.h"
+#include "bta/bta_dm_ci.h"
+#include "btc/btc_dm.h"
 #if (defined(BTIF_INCLUDED) && BTIF_INCLUDED == TRUE)
-#include "bt_defs.h"
+#include "common/bt_defs.h"
 #if (BTM_OOB_INCLUDED == TRUE)
 #include "btif_dm.h"
 #endif
 #endif /* #if (defined(BTIF_INCLUDED) && BTIF_INCLUDED == TRUE) */
 #if (defined BLE_INCLUDED && BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
-#include "bte_appl.h"
+#include "common/bte_appl.h"
 tBTE_APPL_CFG bte_appl_cfg = {
 #if SMP_INCLUDED == TRUE
     BTA_LE_AUTH_REQ_SC_MITM_BOND, // Authentication requirements

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 <string.h>
 
 

components/bt/bluedroid/bta/dm/bta_dm_pm.c

@@ -26,10 +26,10 @@
 // #include <assert.h>
 #include <string.h>
 
-#include "bta_sys.h"
-#include "bta_api.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_api.h"
 #include "bta_dm_int.h"
-#include "btm_api.h"
+#include "stack/btm_api.h"
 
 #if (BTM_SSR_INCLUDED == TRUE)
 

components/bt/bluedroid/bta/dm/bta_dm_sco.c

@@ -26,8 +26,8 @@
  *
  ******************************************************************************/
 #include <string.h>
-#include "bta_api.h"
-#include "bta_sys.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sys.h"
 
 #if (BTM_SCO_HCI_INCLUDED == TRUE)
 

components/bt/bluedroid/bta/include/bta_dm_int.h → 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
 
 

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)

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"

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 <string.h>
-#include "bta_sys.h"
-#include "bta_gatt_api.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_gatt_api.h"
 #include "bta_gattc_int.h"
 
 /*****************************************************************************

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 <string.h>
-#include "utl.h"
-#include "bta_sys.h"
-#include "sdp_api.h"
-#include "sdpdefs.h"
+#include "bta/utl.h"
+#include "bta/bta_sys.h"
+#include "stack/sdp_api.h"
+#include "stack/sdpdefs.h"
 #include "bta_gattc_int.h"
-#include "btm_api.h"
-#include "btm_ble_api.h"
-#include "allocator.h"
-#include "l2c_api.h"
+#include "stack/btm_api.h"
+#include "stack/btm_ble_api.h"
+#include "osi/allocator.h"
+#include "stack/l2c_api.h"
 #include "btm_int.h"
 #include "errno.h"
 

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 <string.h>
 
-#include "bta_api.h"
-#include "bta_sys.h"
-#include "bta_gattc_ci.h"
-#include "utl.h"
-#include "allocator.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_gattc_ci.h"
+#include "bta/utl.h"
+#include "osi/allocator.h"
 
 
 /*******************************************************************************

components/bt/bluedroid/btif/bta_gattc_co.c → components/bt/bluedroid/bta/gatt/bta_gattc_co.c

@@ -20,15 +20,15 @@
 #include <unistd.h>
 #endif /* BT_SUPPORT_NVM */
 
-#include "bta_gattc_co.h"
-#include "bta_gattc_ci.h"
+#include "bta/bta_gattc_co.h"
+#include "bta/bta_gattc_ci.h"
 // #include "btif_util.h"
 #include "btm_int.h"
 #include "nvs.h"
 #include "nvs_flash.h"
-#include "list.h"
+#include "osi/list.h"
 #include "esp_err.h"
-#include "allocator.h"
+#include "osi/allocator.h"
 
 #if( defined BLE_INCLUDED ) && (BLE_INCLUDED == TRUE)
 #if( defined BTA_GATT_INCLUDED ) && (GATTC_INCLUDED == TRUE)

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 <string.h>
 
 #include "bta_gattc_int.h"
-#include "allocator.h"
+#include "osi/allocator.h"
 
 
 /*****************************************************************************

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 <string.h>
 
-#include "bdaddr.h"
+#include "device/bdaddr.h"
 // #include "btif/include/btif_util.h"
-#include "utl.h"
-#include "bta_sys.h"
+#include "bta/utl.h"
+#include "bta/bta_sys.h"
 #include "bta_gattc_int.h"
-#include "l2c_api.h"
-#include "allocator.h"
+#include "stack/l2c_api.h"
+#include "osi/allocator.h"
 
 #define LOG_TAG "bt_bta_gattc"
 /*****************************************************************************

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 <string.h>
-#include "allocator.h"
+#include "osi/allocator.h"
 
 static void bta_gatts_nv_save_cback(BOOLEAN is_saved, tGATTS_HNDL_RANGE *p_hndl_range);
 static BOOLEAN bta_gatts_nv_srv_chg_cback(tGATTS_SRV_CHG_CMD cmd, tGATTS_SRV_CHG_REQ *p_req,

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 <string.h>
-#include "bta_sys.h"
-#include "bta_gatt_api.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_gatt_api.h"
 #include "bta_gatts_int.h"
-#include "allocator.h"
+#include "osi/allocator.h"
 
 /*****************************************************************************
 **  Constants

components/bt/bluedroid/btif/bta_gatts_co.c → 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 <stdlib.h>
 #include <string.h>
-#include "bta_gatts_co.h"
+#include "bta/bta_gatts_co.h"
 // #include "btif_util.h"
 
 #if (defined(BTIF_INCLUDED) && BTIF_INCLUDED == TRUE)

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 <string.h>
 
 #include "bta_gatts_int.h"
-#include "allocator.h"
+#include "osi/allocator.h"
 
 /* type for service building action functions */
 typedef void (*tBTA_GATTS_SRVC_ACT)(tBTA_GATTS_SRVC_CB *p_rcb, tBTA_GATTS_DATA *p_data);

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 <string.h>
-#include "utl.h"
-#include "bta_sys.h"
+#include "bta/utl.h"
+#include "bta/bta_sys.h"
 #include "bta_gatts_int.h"
 
 static const UINT8  base_uuid[LEN_UUID_128] = {0xFB, 0x34, 0x9B, 0x5F, 0x80, 0x00, 0x00, 0x80,

components/bt/bluedroid/bta/include/bta_gattc_int.h → 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

components/bt/bluedroid/bta/include/bta_gatts_int.h → 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"
 
 
 /*****************************************************************************

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 <string.h>
 
-#include "bta_sys.h"
-#include "btm_api.h"
-#include "l2c_api.h"
+#include "bta/bta_sys.h"
+#include "stack/btm_api.h"
+#include "stack/l2c_api.h"
 #include "bta_hh_int.h"
-#include "bta_hh_co.h"
-#include "utl.h"
+#include "bta/bta_hh_co.h"
+#include "bta/utl.h"
 
 /*****************************************************************************
 **  Constants

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 <string.h>
 #include <stdio.h>
 
-#include "bta_hh_api.h"
+#include "bta/bta_hh_api.h"
 #include "bta_hh_int.h"
-#include "l2c_api.h"
-#include "utl.h"
+#include "stack/l2c_api.h"
+#include "bta/utl.h"
 
 #define LOG_TAG "bt_bta_hh"
 #include "osi/include/log.h"

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)
 

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 <string.h>
-#include "btm_api.h"
-#include "btm_ble_api.h"
-#include "bta_hh_co.h"
-#include "bta_gatt_api.h"
+#include "stack/btm_api.h"
+#include "stack/btm_ble_api.h"
+#include "bta/bta_hh_co.h"
+#include "bta/bta_gatt_api.h"
 #include "srvc_api.h"
 #include "btm_int.h"
-#include "utl.h"
+#include "bta/utl.h"
 
 #define LOG_TAG "bt_bta_hh"
 #include "osi/include/log.h"

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 <string.h>
 
-#include "bta_hh_api.h"
+#include "bta/bta_hh_api.h"
 #include "bta_hh_int.h"
 
 /*****************************************************************************

components/bt/bluedroid/bta/hh/bta_hh_utils.c

@@ -17,7 +17,7 @@
  ******************************************************************************/
 #include <string.h>
 
-#include "bt_target.h"
+#include "common/bt_target.h"
 #if defined(BTA_HH_INCLUDED) && (BTA_HH_INCLUDED == TRUE)
 
 

components/bt/bluedroid/bta/include/bta_hh_int.h → 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)

components/bt/bluedroid/bta/include/bta_api.h → 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.
  */
 

components/bt/bluedroid/bta/include/bta_ar_api.h → 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)
 

components/bt/bluedroid/bta/include/bta_av_api.h → 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)
 

components/bt/bluedroid/bta/include/bta_av_ci.h → 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)
 

components/bt/bluedroid/bta/include/bta_av_co.h → 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)
 

components/bt/bluedroid/bta/include/bta_dm_ci.h → 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

components/bt/bluedroid/bta/include/bta_dm_co.h → 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

components/bt/bluedroid/bta/include/bta_gatt_api.h → 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

components/bt/bluedroid/bta/include/bta_gatt_common.h → 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

components/bt/bluedroid/bta/include/bta_gattc_ci.h → 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

components/bt/bluedroid/bta/include/bta_gattc_co.h → 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"
 
 /*******************************************************************************
 **

components/bt/bluedroid/bta/include/bta_gatts_co.h → 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"
 
 /*******************************************************************************
 **

components/bt/bluedroid/bta/include/bta_hh_api.h → 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
 
 /*****************************************************************************

components/bt/bluedroid/bta/include/bta_hh_co.h → 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;

components/bt/bluedroid/bta/include/bta_jv_api.h → 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)
 /*****************************************************************************

components/bt/bluedroid/bta/include/bta_jv_co.h → 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)
 /*****************************************************************************

components/bt/bluedroid/bta/include/bta_sdp_api.h → 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 */

components/bt/bluedroid/bta/include/bta_sys.h → 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

components/bt/bluedroid/bta/include/utl.h → 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"
 
 /*****************************************************************************

components/bt/bluedroid/bta/jv/bta_jv_act.c

@@ -26,25 +26,25 @@
 #include <pthread.h>
 #include <stdlib.h>
 
-#include "allocator.h"
-#include "bt_types.h"
-#include "utl.h"
-#include "bta_sys.h"
-#include "bta_api.h"
-#include "bta_jv_api.h"
+#include "osi/allocator.h"
+#include "stack/bt_types.h"
+#include "bta/utl.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_api.h"
+#include "bta/bta_jv_api.h"
 #include "bta_jv_int.h"
-#include "bta_jv_co.h"
-#include "btm_api.h"
+#include "bta/bta_jv_co.h"
+#include "stack/btm_api.h"
 #include "btm_int.h"
-#include "sdp_api.h"
-#include "l2c_api.h"
-#include "port_api.h"
+#include "stack/sdp_api.h"
+#include "stack/l2c_api.h"
+#include "stack/port_api.h"
 #include <string.h>
-#include "rfcdefs.h"
-#include "avct_api.h"
-#include "avdt_api.h"
-#include "gap_api.h"
-#include "l2c_api.h"
+#include "stack/rfcdefs.h"
+#include "stack/avct_api.h"
+#include "stack/avdt_api.h"
+#include "stack/gap_api.h"
+#include "stack/l2c_api.h"
 
 
 #if (defined BTA_JV_INCLUDED && BTA_JV_INCLUDED == TRUE)

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 <string.h>
-#include "port_api.h"
-#include "sdp_api.h"
-#include "utl.h"
-#include "gap_api.h"
+#include "stack/port_api.h"
+#include "stack/sdp_api.h"
+#include "bta/utl.h"
+#include "stack/gap_api.h"
 
-#include "bt_target.h"
-#include "sdp_api.h"
+#include "common/bt_target.h"
+#include "stack/sdp_api.h"
 
 
 #if (defined BTA_JV_INCLUDED && BTA_JV_INCLUDED == TRUE)

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

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)
 /*****************************************************************************

components/bt/bluedroid/bta/include/bta_jv_int.h → 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 "bt_target.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_api.h"
+#include "bta/bta_jv_api.h"
+#include "stack/rfcdefs.h"
+#include "stack/port_api.h"
+#include "stack/sdp_api.h"
+
+#include "common/bt_target.h"
 #if (defined BTA_JV_INCLUDED && BTA_JV_INCLUDED == TRUE)
 /*****************************************************************************
 **  Constants

components/bt/bluedroid/bta/sdp/bta_sdp.c

@@ -23,10 +23,10 @@
  ******************************************************************************/
 
 #include <stdlib.h>
-#include "bt_target.h"
-#include "bta_api.h"
-#include "bta_sys.h"
-#include "bta_sdp_api.h"
+#include "common/bt_target.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_sdp_api.h"
 #include "bta_sdp_int.h"
 
 #if defined(BTA_SDP_INCLUDED) && (BTA_SDP_INCLUDED == TRUE)

components/bt/bluedroid/bta/sdp/bta_sdp_act.c

@@ -23,20 +23,20 @@
 // #include <hardware/bluetooth.h>
 #include "bt_sdp.h"
 // #include <arpa/inet.h>
-#include "bt_defs.h"
+#include "common/bt_defs.h"
 #include <stdlib.h>
 #include <string.h>
-#include "bt_target.h"
-#include "allocator.h"
-#include "bt_types.h"
-#include "utl.h"
-#include "bta_sys.h"
-#include "bta_api.h"
-#include "bta_sdp_api.h"
+#include "common/bt_target.h"
+#include "osi/allocator.h"
+#include "stack/bt_types.h"
+#include "bta/utl.h"
+#include "bta/bta_sys.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sdp_api.h"
 #include "bta_sdp_int.h"
-#include "btm_api.h"
+#include "stack/btm_api.h"
 #include "btm_int.h"
-#include "sdp_api.h"
+#include "stack/sdp_api.h"
 
 #if (SDP_INCLUDED == TRUE)
 

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 <string.h>
-#include "allocator.h"
-#include "sdp_api.h"
+#include "osi/allocator.h"
+#include "stack/sdp_api.h"
 
 #if defined(BTA_SDP_INCLUDED) && (BTA_SDP_INCLUDED == TRUE)
 /*****************************************************************************

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)
 

components/bt/bluedroid/bta/include/bta_sdp_int.h → 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)
 /*****************************************************************************

components/bt/bluedroid/bta/sys/bta_sys_conn.c

@@ -23,10 +23,10 @@
  ******************************************************************************/
 
 #include <stddef.h>
-#include "bta_api.h"
-#include "bta_sys.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sys.h"
 #include "bta_sys_int.h"
-#include "utl.h"
+#include "bta/utl.h"
 
 /*******************************************************************************
 **

components/bt/bluedroid/bta/sys/bta_sys_main.c

@@ -26,23 +26,23 @@
 // #include <assert.h>
 #include <string.h>
 
-#include "alarm.h"
-#include "thread.h"
-#include "btm_api.h"
-#include "bta_api.h"
-#include "bta_sys.h"
+#include "osi/alarm.h"
+#include "osi/thread.h"
+#include "stack/btm_api.h"
+#include "bta/bta_api.h"
+#include "bta/bta_sys.h"
 #include "bta_sys_int.h"
 
-#include "fixed_queue.h"
-#include "hash_map.h"
-#include "osi.h"
-#include "hash_functions.h"
+#include "osi/fixed_queue.h"
+#include "osi/hash_map.h"
+#include "osi/osi.h"
+#include "osi/hash_functions.h"
 #if( defined BTA_AR_INCLUDED ) && (BTA_AR_INCLUDED == TRUE)
-#include "bta_ar_api.h"
+#include "bta/bta_ar_api.h"
 #endif
-#include "utl.h"
-#include "allocator.h"
-#include "mutex.h"
+#include "bta/utl.h"
+#include "osi/allocator.h"
+#include "osi/mutex.h"
 
 
 /* system manager control block definition */
@@ -75,7 +75,7 @@ typedef void (*tBTA_SYS_ACTION)(tBTA_SYS_HW_MSG *p_data);
 
 /* action function list */
 const tBTA_SYS_ACTION bta_sys_action[] = {
-    /* device manager local device API events - cf bta_sys.h for events */
+    /* device manager local device API events - cf bta/bta_sys.h for events */
     bta_sys_hw_api_enable,             /* 0  BTA_SYS_HW_API_ENABLE_EVT    */
     bta_sys_hw_evt_enabled,           /* 1  BTA_SYS_HW_EVT_ENABLED_EVT */
     bta_sys_hw_evt_stack_enabled,       /* 2  BTA_SYS_HW_EVT_STACK_ENABLED_EVT */

components/bt/bluedroid/bta/sys/utl.c

@@ -22,9 +22,9 @@
  *
  ******************************************************************************/
 #include <stddef.h>
-#include "utl.h"
-#include "btm_api.h"
-#include "allocator.h"
+#include "bta/utl.h"
+#include "stack/btm_api.h"
+#include "osi/allocator.h"
 
 /*******************************************************************************
 **

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)
 {

components/bt/bluedroid/btc/core/btc_ble_storage.c

@@ -14,12 +14,12 @@
 
 #include <string.h>
 
-#include "bta_api.h"
-#include "btc_config.h"
-#include "bdaddr.h"
-#include "btc_ble_storage.h"
-#include "bta_gatts_co.h"
-#include "btc_util.h"
+#include "bta/bta_api.h"
+#include "btc/btc_config.h"
+#include "device/bdaddr.h"
+#include "btc/btc_ble_storage.h"
+#include "bta/bta_gatts_co.h"
+#include "btc/btc_util.h"
 
 #if (SMP_INCLUDED == TRUE)