Rename Kconfig options (components/bt)

diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt
index 614ab3628c1e896ea65d857bcd012c6f038da20c..50ff9abf60145baac24ec3aab45aee92c8c28b78 100644 (file)
--- a/components/bt/CMakeLists.txt
+++ b/components/bt/CMakeLists.txt
@@ -3,7 +3,7 @@ if(CONFIG_BT_ENABLED)
     set(COMPONENT_SRCS "bt.c")
     set(COMPONENT_ADD_INCLUDEDIRS include)
 
-    if(CONFIG_BLUEDROID_ENABLED)
+    if(CONFIG_BT_BLUEDROID_ENABLED)
 
         list(APPEND COMPONENT_PRIV_INCLUDEDIRS
             bluedroid/bta/include

diff --git a/components/bt/Kconfig b/components/bt/Kconfig
index cc3066f3539ceacf084a14af9e67f4760b12e335..0dce796c399689d69ae4cdcd96ce6209511ad271 100644 (file)
--- a/components/bt/Kconfig
+++ b/components/bt/Kconfig
@@ -9,97 +9,97 @@ menu Bluetooth
     menu "Bluetooth controller"
         visible if BT_ENABLED
 
-        choice BTDM_CONTROLLER_MODE
+        choice BTDM_CTRL_MODE
             prompt "Bluetooth controller mode (BR/EDR/BLE/DUALMODE)"
             depends on BT_ENABLED
             help
                 Specify the bluetooth controller mode (BR/EDR, BLE or dual mode).
 
-            config BTDM_CONTROLLER_MODE_BLE_ONLY
+            config BTDM_CTRL_MODE_BLE_ONLY
                 bool "BLE Only"
 
-            config BTDM_CONTROLLER_MODE_BR_EDR_ONLY
+            config BTDM_CTRL_MODE_BR_EDR_ONLY
                 bool "BR/EDR Only"
 
-            config BTDM_CONTROLLER_MODE_BTDM
+            config BTDM_CTRL_MODE_BTDM
                 bool "Bluetooth Dual Mode"
 
         endchoice
 
-        config BTDM_CONTROLLER_BLE_MAX_CONN
+        config BTDM_CTRL_BLE_MAX_CONN
             int "BLE Max Connections"
-            depends on BTDM_CONTROLLER_MODE_BLE_ONLY || BTDM_CONTROLLER_MODE_BTDM
+            depends on BTDM_CTRL_MODE_BLE_ONLY || BTDM_CTRL_MODE_BTDM
             default 3
             range 1 9
             help
                 BLE maximum connections of bluetooth controller.
                 Each connection uses 1KB static DRAM whenever the BT controller is enabled.
 
-        config BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN
+        config BTDM_CTRL_BR_EDR_MAX_ACL_CONN
             int "BR/EDR ACL Max Connections"
-            depends on BTDM_CONTROLLER_MODE_BR_EDR_ONLY || BTDM_CONTROLLER_MODE_BTDM
+            depends on BTDM_CTRL_MODE_BR_EDR_ONLY || BTDM_CTRL_MODE_BTDM
             default 2
             range 1 7
             help
                 BR/EDR ACL maximum connections of bluetooth controller.
                 Each connection uses 1.2KB static DRAM whenever the BT controller is enabled.
 
-        config BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN
+        config BTDM_CTRL_BR_EDR_MAX_SYNC_CONN
             int "BR/EDR Sync(SCO/eSCO) Max Connections"
-            depends on BTDM_CONTROLLER_MODE_BR_EDR_ONLY || BTDM_CONTROLLER_MODE_BTDM
+            depends on BTDM_CTRL_MODE_BR_EDR_ONLY || BTDM_CTRL_MODE_BTDM
             default 0
             range 0 3
             help
                 BR/EDR Synchronize maximum connections of bluetooth controller.
                 Each connection uses 2KB static DRAM whenever the BT controller is enabled.
 
-        config BTDM_CONTROLLER_BLE_MAX_CONN_EFF
+        config BTDM_CTRL_BLE_MAX_CONN_EFF
             int
-            default BTDM_CONTROLLER_BLE_MAX_CONN if BTDM_CONTROLLER_MODE_BLE_ONLY || BTDM_CONTROLLER_MODE_BTDM
+            default BTDM_CTRL_BLE_MAX_CONN if BTDM_CTRL_MODE_BLE_ONLY || BTDM_CTRL_MODE_BTDM
             default 0
 
-        config BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF
+        config BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF
             int
-            default BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN if BTDM_CONTROLLER_MODE_BR_EDR_ONLY || BTDM_CONTROLLER_MODE_BTDM  # NOERROR
+            default BTDM_CTRL_BR_EDR_MAX_ACL_CONN if BTDM_CTRL_MODE_BR_EDR_ONLY || BTDM_CTRL_MODE_BTDM
             default 0
 
-        config BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF
+        config BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF
             int
-            default BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN if BTDM_CONTROLLER_MODE_BR_EDR_ONLY || BTDM_CONTROLLER_MODE_BTDM  # NOERROR
+            default BTDM_CTRL_BR_EDR_MAX_SYNC_CONN if BTDM_CTRL_MODE_BR_EDR_ONLY || BTDM_CTRL_MODE_BTDM
             default 0
 
-        choice BTDM_CONTROLLER_PINNED_TO_CORE_CHOICE
+        choice BTDM_CTRL_PINNED_TO_CORE_CHOICE
             prompt "The cpu core which bluetooth controller run"
             depends on BT_ENABLED && !FREERTOS_UNICORE
             help
                 Specify the cpu core to run bluetooth controller.
                 Can not specify no-affinity.
 
-            config BTDM_CONTROLLER_PINNED_TO_CORE_0
+            config BTDM_CTRL_PINNED_TO_CORE_0
                 bool "Core 0 (PRO CPU)"
-            config BTDM_CONTROLLER_PINNED_TO_CORE_1
+            config BTDM_CTRL_PINNED_TO_CORE_1
                 bool "Core 1 (APP CPU)"
                 depends on !FREERTOS_UNICORE
         endchoice
 
-        config BTDM_CONTROLLER_PINNED_TO_CORE
+        config BTDM_CTRL_PINNED_TO_CORE
             int
-            default 0 if BTDM_CONTROLLER_PINNED_TO_CORE_0
-            default 1 if BTDM_CONTROLLER_PINNED_TO_CORE_1
+            default 0 if BTDM_CTRL_PINNED_TO_CORE_0
+            default 1 if BTDM_CTRL_PINNED_TO_CORE_1
             default 0
 
-        choice BTDM_CONTROLLER_HCI_MODE_CHOICE
+        choice BTDM_CTRL_HCI_MODE_CHOICE
             prompt "HCI mode"
             depends on BT_ENABLED
             help
                 Speicify HCI mode as VHCI or UART(H4)
 
-            config BTDM_CONTROLLER_HCI_MODE_VHCI
+            config BTDM_CTRL_HCI_MODE_VHCI
                 bool "VHCI"
                 help
                     Normal option. Mostly, choose this VHCI when bluetooth host run on ESP32, too.
 
-            config BTDM_CONTROLLER_HCI_MODE_UART_H4
+            config BTDM_CTRL_HCI_MODE_UART_H4
                 bool "UART(H4)"
                 help
                     If use external bluetooth host which run on other hardware and use UART as the HCI interface,
@@ -107,11 +107,11 @@ menu Bluetooth
         endchoice
 
         menu "HCI UART(H4) Options"
-            visible if BTDM_CONTROLLER_HCI_MODE_UART_H4
+            visible if BTDM_CTRL_HCI_MODE_UART_H4
 
             config BT_HCI_UART_NO
                 int "UART Number for HCI"
-                depends on BTDM_CONTROLLER_HCI_MODE_UART_H4
+                depends on BTDM_CTRL_HCI_MODE_UART_H4
                 range 1 2
                 default 1
                 help
@@ -119,7 +119,7 @@ menu Bluetooth
 
             config BT_HCI_UART_BAUDRATE
                 int "UART Baudrate for HCI"
-                depends on BTDM_CONTROLLER_HCI_MODE_UART_H4
+                depends on BTDM_CTRL_HCI_MODE_UART_H4
                 range 115200 921600
                 default 921600
                 help
@@ -130,7 +130,7 @@ menu Bluetooth
         menu "MODEM SLEEP Options"
             visible if BT_ENABLED
 
-            config BTDM_CONTROLLER_MODEM_SLEEP
+            config BTDM_MODEM_SLEEP
                 bool "Bluetooth modem sleep"
                 depends on BT_ENABLED
                 default y
@@ -139,7 +139,7 @@ menu Bluetooth
 
             choice BTDM_MODEM_SLEEP_MODE
                 prompt "Bluetooth Modem sleep mode"
-                depends on BTDM_CONTROLLER_MODEM_SLEEP
+                depends on BTDM_MODEM_SLEEP
                 help
                     To select which strategy to use for modem sleep
 
@@ -178,17 +178,17 @@ menu Bluetooth
 
         endmenu
 
-        config BLE_SCAN_DUPLICATE
+        config BTDM_BLE_SCAN_DUPL
             bool "BLE Scan Duplicate Options"
-            depends on (BTDM_CONTROLLER_MODE_BTDM || BTDM_CONTROLLER_MODE_BLE_ONLY)
+            depends on (BTDM_CTRL_MODE_BTDM || BTDM_CTRL_MODE_BLE_ONLY)
             default y
             help
                 This select enables parameters setting of BLE scan duplicate.
 
-        choice SCAN_DUPLICATE_TYPE
+        choice BTDM_SCAN_DUPL_TYPE
             prompt "Scan Duplicate Type"
-            default SCAN_DUPLICATE_BY_DEVICE_ADDR
-            depends on BLE_SCAN_DUPLICATE
+            default BTDM_SCAN_DUPL_TYPE_DEVICE
+            depends on BTDM_BLE_SCAN_DUPL
             help
                 Scan duplicate have three ways. one is "Scan Duplicate By Device Address", This way is to use
                 advertiser address filtering. The adv packet of the same address is only allowed to be reported once.
@@ -198,204 +198,204 @@ menu Bluetooth
                 filtering. All same advertising data only allow to be reported once even though they are from
                 different devices.
 
-            config SCAN_DUPLICATE_BY_DEVICE_ADDR
+            config BTDM_SCAN_DUPL_TYPE_DEVICE
                 bool "Scan Duplicate By Device Address"
                 help
                     This way is to use advertiser address filtering. The adv packet of the same address is only
                     allowed to be reported once
 
-            config SCAN_DUPLICATE_BY_ADV_DATA
+            config BTDM_SCAN_DUPL_TYPE_DATA
                 bool "Scan Duplicate By Advertising Data"
                 help
                     This way is to use advertising data filtering. All same advertising data only allow to be reported
                     once even though they are from different devices.
 
-            config SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR
+            config BTDM_SCAN_DUPL_TYPE_DATA_DEVICE
                 bool "Scan Duplicate By Device Address And Advertising Data"
                 help
                     This way is to use advertising data and device address filtering. All different adv packets with
                     the same address are allowed to be reported.
         endchoice
 
-        config SCAN_DUPLICATE_TYPE
+        config BTDM_SCAN_DUPL_TYPE
             int
-            depends on BLE_SCAN_DUPLICATE
-            default 0 if SCAN_DUPLICATE_BY_DEVICE_ADDR
-            default 1 if SCAN_DUPLICATE_BY_ADV_DATA
-            default 2 if SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR
+            depends on BTDM_BLE_SCAN_DUPL
+            default 0 if BTDM_SCAN_DUPL_TYPE_DEVICE
+            default 1 if BTDM_SCAN_DUPL_TYPE_DATA
+            default 2 if BTDM_SCAN_DUPL_TYPE_DATA_DEVICE
             default 0
 
-        config DUPLICATE_SCAN_CACHE_SIZE
+        config BTDM_SCAN_DUPL_CACHE_SIZE
             int "Maximum number of devices in scan duplicate filter"
-            depends on BLE_SCAN_DUPLICATE
+            depends on BTDM_BLE_SCAN_DUPL
             range 10 1000
             default 200
             help
                 Maximum number of devices which can be recorded in scan duplicate filter.
                 When the maximum amount of device in the filter is reached, the cache will be refreshed.
 
-        config BLE_MESH_SCAN_DUPLICATE_EN
+        config BTDM_BLE_MESH_SCAN_DUPL_EN
             bool "Special duplicate scan mechanism for BLE Mesh scan"
-            depends on BLE_SCAN_DUPLICATE
+            depends on BTDM_BLE_SCAN_DUPL
             default n
             help
                 This enables the BLE scan duplicate for special BLE Mesh scan.
 
-        config MESH_DUPLICATE_SCAN_CACHE_SIZE
+        config BTDM_MESH_DUPL_SCAN_CACHE_SIZE
             int "Maximum number of Mesh adv packets in scan duplicate filter"
-            depends on BLE_MESH_SCAN_DUPLICATE_EN
+            depends on BTDM_BLE_MESH_SCAN_DUPL_EN
             range 10 1000
             default 200
             help
                 Maximum number of adv packets which can be recorded in duplicate scan cache for BLE Mesh.
                 When the maximum amount of device in the filter is reached, the cache will be refreshed.
 
-        config BTDM_CONTROLLER_FULL_SCAN_SUPPORTED
+        config BTDM_CTRL_FULL_SCAN_SUPPORTED
             bool "BLE full scan feature supported"
-            depends on BTDM_CONTROLLER_MODE_BLE_ONLY
+            depends on BTDM_CTRL_MODE_BLE_ONLY
             default n
             help
                 The full scan function is mainly used to provide BLE scan performance.
                 This is required for scenes with high scan performance requirements, such as BLE Mesh scenes.
 
-        config BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED
+        config BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP
             bool "BLE adv report flow control supported"
-            depends on (BTDM_CONTROLLER_MODE_BTDM || BTDM_CONTROLLER_MODE_BLE_ONLY)
+            depends on (BTDM_CTRL_MODE_BTDM || BTDM_CTRL_MODE_BLE_ONLY)
             default y
             help
                 The function is mainly used to enable flow control for advertising reports. When it is enabled,
                 advertising reports will be discarded by the controller if the number of unprocessed advertising
                 reports exceeds the size of BLE adv report flow control.
 
-        config BLE_ADV_REPORT_FLOW_CONTROL_NUM
+        config BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM
             int "BLE adv report flow control number"
-            depends on BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED
+            depends on BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP
             range 50 1000
             default 100
             help
                 The number of unprocessed advertising report that Bluedroid can save.If you set
-                `BLE_ADV_REPORT_FLOW_CONTROL_NUM` to a small value, this may cause adv packets lost.
-                If you set `BLE_ADV_REPORT_FLOW_CONTROL_NUM` to a large value, Bluedroid may cache a
+                `BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM` to a small value, this may cause adv packets lost.
+                If you set `BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM` to a large value, Bluedroid may cache a
                 lot of adv packets and this may cause system memory run out. For example, if you set
                 it to 50, the maximum memory consumed by host is 35 * 50 bytes. Please set
-                `BLE_ADV_REPORT_FLOW_CONTROL_NUM` according to your system free memory and handle adv
+                `BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM` according to your system free memory and handle adv
                 packets as fast as possible, otherwise it will cause adv packets lost.
 
-        config BLE_ADV_REPORT_DISCARD_THRSHOLD
+        config BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD
             int "BLE adv lost event threshold value"
-            depends on BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED
+            depends on BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP
             range 1 1000
             default 20
             help
                 When adv report flow control is enabled, The ADV lost event will be generated when the number
                 of ADV packets lost in the controller reaches this threshold. It is better to set a larger value.
-                If you set `BLE_ADV_REPORT_DISCARD_THRSHOLD` to a small value or printf every adv lost event, it
+                If you set `BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD` to a small value or printf every adv lost event, it
                 may cause adv packets lost more.
 
     endmenu
 
-    menuconfig BLUEDROID_ENABLED
+    menuconfig BT_BLUEDROID_ENABLED
         bool "Bluedroid Enable"
-        depends on BTDM_CONTROLLER_HCI_MODE_VHCI
+        depends on BTDM_CTRL_HCI_MODE_VHCI
         default y
         help
             This enables the default Bluedroid Bluetooth stack
 
-    choice BLUEDROID_PINNED_TO_CORE_CHOICE
+    choice BT_BLUEDROID_PINNED_TO_CORE_CHOICE
         prompt "The cpu core which Bluedroid run"
-        depends on BLUEDROID_ENABLED && !FREERTOS_UNICORE
+        depends on BT_BLUEDROID_ENABLED && !FREERTOS_UNICORE
         help
             Which the cpu core to run Bluedroid. Can choose core0 and core1.
             Can not specify no-affinity.
 
-        config BLUEDROID_PINNED_TO_CORE_0
+        config BT_BLUEDROID_PINNED_TO_CORE_0
             bool "Core 0 (PRO CPU)"
-        config BLUEDROID_PINNED_TO_CORE_1
+        config BT_BLUEDROID_PINNED_TO_CORE_1
             bool "Core 1 (APP CPU)"
             depends on !FREERTOS_UNICORE
     endchoice
 
-    config BLUEDROID_PINNED_TO_CORE
+    config BT_BLUEDROID_PINNED_TO_CORE
         int
-        depends on BLUEDROID_ENABLED
-        default 0 if BLUEDROID_PINNED_TO_CORE_0
-        default 1 if BLUEDROID_PINNED_TO_CORE_1
+        depends on BT_BLUEDROID_ENABLED
+        default 0 if BT_BLUEDROID_PINNED_TO_CORE_0
+        default 1 if BT_BLUEDROID_PINNED_TO_CORE_1
         default 0
 
-    config BTC_TASK_STACK_SIZE
+    config BT_BTC_TASK_STACK_SIZE
         int "Bluetooth event (callback to application) task stack size"
-        depends on BLUEDROID_ENABLED
+        depends on BT_BLUEDROID_ENABLED
         default 3072
         help
             This select btc task stack size
 
-    config BTU_TASK_STACK_SIZE
+    config BT_BTU_TASK_STACK_SIZE
         int "Bluetooth Bluedroid Host Stack task stack size"
-        depends on BLUEDROID_ENABLED
+        depends on BT_BLUEDROID_ENABLED
         default 4096
         help
             This select btu task stack size
 
-    config BLUEDROID_MEM_DEBUG
+    config BT_BLUEDROID_MEM_DEBUG
         bool "Bluedroid memory debug"
-        depends on BLUEDROID_ENABLED
+        depends on BT_BLUEDROID_ENABLED
         default n
         help
             Bluedroid memory debug
 
-    config CLASSIC_BT_ENABLED
+    config BT_CLASSIC_ENABLED
         bool "Classic Bluetooth"
-        depends on BLUEDROID_ENABLED
+        depends on BT_BLUEDROID_ENABLED
         default n
         help
             For now this option needs "SMP_ENABLE" to be set to yes
 
-    config A2DP_ENABLE
+    config BT_A2DP_ENABLE
         bool "A2DP"
-        depends on CLASSIC_BT_ENABLED
+        depends on BT_CLASSIC_ENABLED
         default n
         help
             Advanced Audio Distrubution Profile
 
-    config A2DP_SINK_TASK_STACK_SIZE
+    config BT_A2DP_SINK_TASK_STACK_SIZE
         int "A2DP sink (audio stream decoding) task stack size"
-        depends on A2DP_ENABLE
+        depends on BT_A2DP_ENABLE
         default 2048
 
-    config A2DP_SOURCE_TASK_STACK_SIZE
+    config BT_A2DP_SOURCE_TASK_STACK_SIZE
         int "A2DP source (audio stream encoding) task stack size"
-        depends on A2DP_ENABLE
+        depends on BT_A2DP_ENABLE
         default 2048
 
     config BT_SPP_ENABLED
         bool "SPP"
-        depends on CLASSIC_BT_ENABLED
+        depends on BT_CLASSIC_ENABLED
         default n
         help
             This enables the Serial Port Profile
 
-    config HFP_ENABLE
+    config BT_HFP_ENABLE
         bool "Hands Free/Handset Profile"
-        depends on CLASSIC_BT_ENABLED
+        depends on BT_CLASSIC_ENABLED
         default n
 
-    choice HFP_ROLE
+    choice BT_HFP_ROLE
         prompt "Hands-free Profile Role configuration"
-        depends on HFP_ENABLE
+        depends on BT_HFP_ENABLE
 
-        config HFP_CLIENT_ENABLE
+        config BT_HFP_CLIENT_ENABLE
             bool "Hands Free Unit"
     endchoice
 
-    choice HFP_AUDIO_DATA_PATH
+    choice BT_HFP_AUDIO_DATA_PATH
         prompt "audio(SCO) data path"
-        depends on HFP_ENABLE
+        depends on BT_HFP_ENABLE
 
-        config HFP_AUDIO_DATA_PATH_PCM
+        config BT_HFP_AUDIO_DATA_PATH_PCM
             bool "PCM"
             help
                 This enables the Serial Port Profile
-        config HFP_AUDIO_DATA_PATH_HCI
+        config BT_HFP_AUDIO_DATA_PATH_HCI
             bool "HCI"
             help
                 This enables the Serial Port Profile
@@ -403,815 +403,815 @@ menu Bluetooth
 
     config BT_SSP_ENABLED
         bool "Secure Simple Pairing"
-        depends on CLASSIC_BT_ENABLED
+        depends on BT_CLASSIC_ENABLED
         default y
         help
             This enables the Secure Simple Pairing. If disable this option, Bluedroid will only support Legacy Pairing
 
-    config GATTS_ENABLE
+    config BT_GATTS_ENABLE
         bool "Include GATT server module(GATTS)"
-        depends on BLUEDROID_ENABLED && (BTDM_CONTROLLER_MODE_BTDM || BTDM_CONTROLLER_MODE_BLE_ONLY)
+        depends on BT_BLUEDROID_ENABLED && (BTDM_CTRL_MODE_BTDM || BTDM_CTRL_MODE_BLE_ONLY)
         default y
         help
             This option can be disabled when the app work only on gatt client mode
 
-    choice GATTS_SEND_SERVICE_CHANGE_MODE
+    choice BT_GATTS_SEND_SERVICE_CHANGE_MODE
         prompt "GATTS Service Change Mode"
-        default GATTS_SEND_SERVICE_CHANGE_AUTO
-        depends on GATTS_ENABLE
+        default BT_GATTS_SEND_SERVICE_CHANGE_AUTO
+        depends on BT_GATTS_ENABLE
         help
             Service change indication mode for GATT Server.
 
-        config GATTS_SEND_SERVICE_CHANGE_MANUAL
+        config BT_GATTS_SEND_SERVICE_CHANGE_MANUAL
             bool "GATTS manually send service change indication"
             help
                 Manually send service change indication through API esp_ble_gatts_send_service_change_indication()
 
-        config GATTS_SEND_SERVICE_CHANGE_AUTO
+        config BT_GATTS_SEND_SERVICE_CHANGE_AUTO
             bool "GATTS automatically send service change indication"
             help
                 Let Bluedroid handle the service change indication internally
 
     endchoice
 
-    config GATTS_SEND_SERVICE_CHANGE_MODE
+    config BT_GATTS_SEND_SERVICE_CHANGE_MODE
         int
-        depends on GATTS_ENABLE
-        default 0 if GATTS_SEND_SERVICE_CHANGE_AUTO
-        default 1 if GATTS_SEND_SERVICE_CHANGE_MANUAL
+        depends on BT_GATTS_ENABLE
+        default 0 if BT_GATTS_SEND_SERVICE_CHANGE_AUTO
+        default 1 if BT_GATTS_SEND_SERVICE_CHANGE_MANUAL
         default 0
 
-    config GATTC_ENABLE
+    config BT_GATTC_ENABLE
         bool "Include GATT client module(GATTC)"
-        depends on BLUEDROID_ENABLED && (BTDM_CONTROLLER_MODE_BTDM || BTDM_CONTROLLER_MODE_BLE_ONLY)
+        depends on BT_BLUEDROID_ENABLED && (BTDM_CTRL_MODE_BTDM || BTDM_CTRL_MODE_BLE_ONLY)
         default y
         help
             This option can be close when the app work only on gatt server mode
 
-    config GATTC_CACHE_NVS_FLASH
+    config BT_GATTC_CACHE_NVS_FLASH
         bool "Save gattc cache data to nvs flash"
-        depends on GATTC_ENABLE && (BTDM_CONTROLLER_MODE_BTDM || BTDM_CONTROLLER_MODE_BLE_ONLY)
+        depends on BT_GATTC_ENABLE && (BTDM_CTRL_MODE_BTDM || BTDM_CTRL_MODE_BLE_ONLY)
         default n
         help
             This select can save gattc cache data to nvs flash
 
-    config BLE_SMP_ENABLE
+    config BT_BLE_SMP_ENABLE
         bool "Include BLE security module(SMP)"
-        depends on BLUEDROID_ENABLED && (BTDM_CONTROLLER_MODE_BTDM || BTDM_CONTROLLER_MODE_BLE_ONLY)
+        depends on BT_BLUEDROID_ENABLED && (BTDM_CTRL_MODE_BTDM || BTDM_CTRL_MODE_BLE_ONLY)
         default y
         help
             This option can be close when the app not used the ble security connect.
 
-    config SMP_SLAVE_CON_PARAMS_UPD_ENABLE
+    config BT_SMP_SLAVE_CON_PARAMS_UPD_ENABLE
         bool "Slave enable connection parameters update during pairing"
-        depends on BLE_SMP_ENABLE
+        depends on BT_BLE_SMP_ENABLE
         default n
         help
             In order to reduce the pairing time, slave actively initiates connection parameters update during pairing.
 
     config BT_STACK_NO_LOG
         bool "Disable BT debug logs (minimize bin size)"
-        depends on BLUEDROID_ENABLED
+        depends on BT_BLUEDROID_ENABLED
         default n
         help
             This select can save the rodata code size
 
     menu "BT DEBUG LOG LEVEL"
-        depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+        depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
 
-        choice HCI_INITIAL_TRACE_LEVEL
+        choice BT_LOG_HCI_TRACE_LEVEL
             prompt "HCI layer"
-            default HCI_TRACE_LEVEL_WARNING
-            depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+            default BT_LOG_HCI_TRACE_LEVEL_WARNING
+            depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
             help
                 Define BT trace level for HCI layer
 
-            config HCI_TRACE_LEVEL_NONE
+            config BT_LOG_HCI_TRACE_LEVEL_NONE
                 bool "NONE"
-            config HCI_TRACE_LEVEL_ERROR
+            config BT_LOG_HCI_TRACE_LEVEL_ERROR
                 bool "ERROR"
-            config HCI_TRACE_LEVEL_WARNING
+            config BT_LOG_HCI_TRACE_LEVEL_WARNING
                 bool "WARNING"
-            config HCI_TRACE_LEVEL_API
+            config BT_LOG_HCI_TRACE_LEVEL_API
                 bool "API"
-            config HCI_TRACE_LEVEL_EVENT
+            config BT_LOG_HCI_TRACE_LEVEL_EVENT
                 bool "EVENT"
-            config HCI_TRACE_LEVEL_DEBUG
+            config BT_LOG_HCI_TRACE_LEVEL_DEBUG
                 bool "DEBUG"
-            config HCI_TRACE_LEVEL_VERBOSE
+            config BT_LOG_HCI_TRACE_LEVEL_VERBOSE
                 bool "VERBOSE"
         endchoice
 
-        config HCI_INITIAL_TRACE_LEVEL
+        config BT_LOG_HCI_TRACE_LEVEL
             int
-            depends on BLUEDROID_ENABLED
-            default 0 if HCI_TRACE_LEVEL_NONE
-            default 1 if HCI_TRACE_LEVEL_ERROR
-            default 2 if HCI_TRACE_LEVEL_WARNING
-            default 3 if HCI_TRACE_LEVEL_API
-            default 4 if HCI_TRACE_LEVEL_EVENT
-            default 5 if HCI_TRACE_LEVEL_DEBUG
-            default 6 if HCI_TRACE_LEVEL_VERBOSE
+            depends on BT_BLUEDROID_ENABLED
+            default 0 if BT_LOG_HCI_TRACE_LEVEL_NONE
+            default 1 if BT_LOG_HCI_TRACE_LEVEL_ERROR
+            default 2 if BT_LOG_HCI_TRACE_LEVEL_WARNING
+            default 3 if BT_LOG_HCI_TRACE_LEVEL_API
+            default 4 if BT_LOG_HCI_TRACE_LEVEL_EVENT
+            default 5 if BT_LOG_HCI_TRACE_LEVEL_DEBUG
+            default 6 if BT_LOG_HCI_TRACE_LEVEL_VERBOSE
             default 2
 
-        choice BTM_INITIAL_TRACE_LEVEL
+        choice BT_LOG_BTM_TRACE_LEVEL
             prompt "BTM layer"
-            default BTM_TRACE_LEVEL_WARNING
-            depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+            default BT_LOG_BTM_TRACE_LEVEL_WARNING
+            depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
             help
                 Define BT trace level for BTM layer
 
-            config BTM_TRACE_LEVEL_NONE
+            config BT_LOG_BTM_TRACE_LEVEL_NONE
                 bool "NONE"
-            config BTM_TRACE_LEVEL_ERROR
+            config BT_LOG_BTM_TRACE_LEVEL_ERROR
                 bool "ERROR"
-            config BTM_TRACE_LEVEL_WARNING
+            config BT_LOG_BTM_TRACE_LEVEL_WARNING
                 bool "WARNING"
-            config BTM_TRACE_LEVEL_API
+            config BT_LOG_BTM_TRACE_LEVEL_API
                 bool "API"
-            config BTM_TRACE_LEVEL_EVENT
+            config BT_LOG_BTM_TRACE_LEVEL_EVENT
                 bool "EVENT"
-            config BTM_TRACE_LEVEL_DEBUG
+            config BT_LOG_BTM_TRACE_LEVEL_DEBUG
                 bool "DEBUG"
-            config BTM_TRACE_LEVEL_VERBOSE
+            config BT_LOG_BTM_TRACE_LEVEL_VERBOSE
                 bool "VERBOSE"
         endchoice
 
-        config BTM_INITIAL_TRACE_LEVEL
+        config BT_LOG_BTM_TRACE_LEVEL
             int
-            depends on BLUEDROID_ENABLED
-            default 0 if BTM_TRACE_LEVEL_NONE
-            default 1 if BTM_TRACE_LEVEL_ERROR
-            default 2 if BTM_TRACE_LEVEL_WARNING
-            default 3 if BTM_TRACE_LEVEL_API
-            default 4 if BTM_TRACE_LEVEL_EVENT
-            default 5 if BTM_TRACE_LEVEL_DEBUG
-            default 6 if BTM_TRACE_LEVEL_VERBOSE
+            depends on BT_BLUEDROID_ENABLED
+            default 0 if BT_LOG_BTM_TRACE_LEVEL_NONE
+            default 1 if BT_LOG_BTM_TRACE_LEVEL_ERROR
+            default 2 if BT_LOG_BTM_TRACE_LEVEL_WARNING
+            default 3 if BT_LOG_BTM_TRACE_LEVEL_API
+            default 4 if BT_LOG_BTM_TRACE_LEVEL_EVENT
+            default 5 if BT_LOG_BTM_TRACE_LEVEL_DEBUG
+            default 6 if BT_LOG_BTM_TRACE_LEVEL_VERBOSE
             default 2
 
-        choice L2CAP_INITIAL_TRACE_LEVEL
+        choice BT_LOG_L2CAP_TRACE_LEVEL
             prompt "L2CAP layer"
-            default L2CAP_TRACE_LEVEL_WARNING
-            depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+            default BT_LOG_L2CAP_TRACE_LEVEL_WARNING
+            depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
             help
                 Define BT trace level for L2CAP layer
 
-            config L2CAP_TRACE_LEVEL_NONE
+            config BT_LOG_L2CAP_TRACE_LEVEL_NONE
                 bool "NONE"
-            config L2CAP_TRACE_LEVEL_ERROR
+            config BT_LOG_L2CAP_TRACE_LEVEL_ERROR
                 bool "ERROR"
-            config L2CAP_TRACE_LEVEL_WARNING
+            config BT_LOG_L2CAP_TRACE_LEVEL_WARNING
                 bool "WARNING"
-            config L2CAP_TRACE_LEVEL_API
+            config BT_LOG_L2CAP_TRACE_LEVEL_API
                 bool "API"
-            config L2CAP_TRACE_LEVEL_EVENT
+            config BT_LOG_L2CAP_TRACE_LEVEL_EVENT
                 bool "EVENT"
-            config L2CAP_TRACE_LEVEL_DEBUG
+            config BT_LOG_L2CAP_TRACE_LEVEL_DEBUG
                 bool "DEBUG"
-            config L2CAP_TRACE_LEVEL_VERBOSE
+            config BT_LOG_L2CAP_TRACE_LEVEL_VERBOSE
                 bool "VERBOSE"
         endchoice
 
-        config L2CAP_INITIAL_TRACE_LEVEL
+        config BT_LOG_L2CAP_TRACE_LEVEL
             int
-            depends on BLUEDROID_ENABLED
-            default 0 if L2CAP_TRACE_LEVEL_NONE
-            default 1 if L2CAP_TRACE_LEVEL_ERROR
-            default 2 if L2CAP_TRACE_LEVEL_WARNING
-            default 3 if L2CAP_TRACE_LEVEL_API
-            default 4 if L2CAP_TRACE_LEVEL_EVENT
-            default 5 if L2CAP_TRACE_LEVEL_DEBUG
-            default 6 if L2CAP_TRACE_LEVEL_VERBOSE
+            depends on BT_BLUEDROID_ENABLED
+            default 0 if BT_LOG_L2CAP_TRACE_LEVEL_NONE
+            default 1 if BT_LOG_L2CAP_TRACE_LEVEL_ERROR
+            default 2 if BT_LOG_L2CAP_TRACE_LEVEL_WARNING
+            default 3 if BT_LOG_L2CAP_TRACE_LEVEL_API
+            default 4 if BT_LOG_L2CAP_TRACE_LEVEL_EVENT
+            default 5 if BT_LOG_L2CAP_TRACE_LEVEL_DEBUG
+            default 6 if BT_LOG_L2CAP_TRACE_LEVEL_VERBOSE
             default 2
 
-        choice RFCOMM_INITIAL_TRACE_LEVEL
+        choice BT_LOG_RFCOMM_TRACE_LEVEL
             prompt "RFCOMM layer"
-            default RFCOMM_TRACE_LEVEL_WARNING
-            depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+            default BT_LOG_RFCOMM_TRACE_LEVEL_WARNING
+            depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
             help
                 Define BT trace level for RFCOMM layer
 
-            config RFCOMM_TRACE_LEVEL_NONE
+            config BT_LOG_RFCOMM_TRACE_LEVEL_NONE
                 bool "NONE"
-            config RFCOMM_TRACE_LEVEL_ERROR
+            config BT_LOG_RFCOMM_TRACE_LEVEL_ERROR
                 bool "ERROR"
-            config RFCOMM_TRACE_LEVEL_WARNING
+            config BT_LOG_RFCOMM_TRACE_LEVEL_WARNING
                 bool "WARNING"
-            config RFCOMM_TRACE_LEVEL_API
+            config BT_LOG_RFCOMM_TRACE_LEVEL_API
                 bool "API"
-            config RFCOMM_TRACE_LEVEL_EVENT
+            config BT_LOG_RFCOMM_TRACE_LEVEL_EVENT
                 bool "EVENT"
-            config RFCOMM_TRACE_LEVEL_DEBUG
+            config BT_LOG_RFCOMM_TRACE_LEVEL_DEBUG
                 bool "DEBUG"
-            config RFCOMM_TRACE_LEVEL_VERBOSE
+            config BT_LOG_RFCOMM_TRACE_LEVEL_VERBOSE
                 bool "VERBOSE"
         endchoice
 
-        config RFCOMM_INITIAL_TRACE_LEVEL
+        config BT_LOG_RFCOMM_TRACE_LEVEL
             int
-            depends on BLUEDROID_ENABLED
-            default 0 if RFCOMM_TRACE_LEVEL_NONE
-            default 1 if RFCOMM_TRACE_LEVEL_ERROR
-            default 2 if RFCOMM_TRACE_LEVEL_WARNING
-            default 3 if RFCOMM_TRACE_LEVEL_API
-            default 4 if RFCOMM_TRACE_LEVEL_EVENT
-            default 5 if RFCOMM_TRACE_LEVEL_DEBUG
-            default 6 if RFCOMM_TRACE_LEVEL_VERBOSE
+            depends on BT_BLUEDROID_ENABLED
+            default 0 if BT_LOG_RFCOMM_TRACE_LEVEL_NONE
+            default 1 if BT_LOG_RFCOMM_TRACE_LEVEL_ERROR
+            default 2 if BT_LOG_RFCOMM_TRACE_LEVEL_WARNING
+            default 3 if BT_LOG_RFCOMM_TRACE_LEVEL_API
+            default 4 if BT_LOG_RFCOMM_TRACE_LEVEL_EVENT
+            default 5 if BT_LOG_RFCOMM_TRACE_LEVEL_DEBUG
+            default 6 if BT_LOG_RFCOMM_TRACE_LEVEL_VERBOSE
             default 2
 
-        choice SDP_INITIAL_TRACE_LEVEL
+        choice BT_LOG_SDP_TRACE_LEVEL
             prompt "SDP layer"
-            default SDP_TRACE_LEVEL_WARNING
-            depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+            default BT_LOG_SDP_TRACE_LEVEL_WARNING
+            depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
             help
                 Define BT trace level for SDP layer
 
-            config SDP_TRACE_LEVEL_NONE
+            config BT_LOG_SDP_TRACE_LEVEL_NONE
                 bool "NONE"
-            config SDP_TRACE_LEVEL_ERROR
+            config BT_LOG_SDP_TRACE_LEVEL_ERROR
                 bool "ERROR"
-            config SDP_TRACE_LEVEL_WARNING
+            config BT_LOG_SDP_TRACE_LEVEL_WARNING
                 bool "WARNING"
-            config SDP_TRACE_LEVEL_API
+            config BT_LOG_SDP_TRACE_LEVEL_API
                 bool "API"
-            config SDP_TRACE_LEVEL_EVENT
+            config BT_LOG_SDP_TRACE_LEVEL_EVENT
                 bool "EVENT"
-            config SDP_TRACE_LEVEL_DEBUG
+            config BT_LOG_SDP_TRACE_LEVEL_DEBUG
                 bool "DEBUG"
-            config SDP_TRACE_LEVEL_VERBOSE
+            config BT_LOG_SDP_TRACE_LEVEL_VERBOSE
                 bool "VERBOSE"
         endchoice
 
-        config SDP_INITIAL_TRACE_LEVEL
+        config BT_LOG_SDP_TRACE_LEVEL
             int
-            depends on BLUEDROID_ENABLED
-            default 0 if SDP_TRACE_LEVEL_NONE
-            default 1 if SDP_TRACE_LEVEL_ERROR
-            default 2 if SDP_TRACE_LEVEL_WARNING
-            default 3 if SDP_TRACE_LEVEL_API
-            default 4 if SDP_TRACE_LEVEL_EVENT
-            default 5 if SDP_TRACE_LEVEL_DEBUG
-            default 6 if SDP_TRACE_LEVEL_VERBOSE
+            depends on BT_BLUEDROID_ENABLED
+            default 0 if BT_LOG_SDP_TRACE_LEVEL_NONE
+            default 1 if BT_LOG_SDP_TRACE_LEVEL_ERROR
+            default 2 if BT_LOG_SDP_TRACE_LEVEL_WARNING
+            default 3 if BT_LOG_SDP_TRACE_LEVEL_API
+            default 4 if BT_LOG_SDP_TRACE_LEVEL_EVENT
+            default 5 if BT_LOG_SDP_TRACE_LEVEL_DEBUG
+            default 6 if BT_LOG_SDP_TRACE_LEVEL_VERBOSE
             default 2
 
-        choice GAP_INITIAL_TRACE_LEVEL
+        choice BT_LOG_GAP_TRACE_LEVEL
             prompt "GAP layer"
-            default GAP_TRACE_LEVEL_WARNING
-            depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+            default BT_LOG_GAP_TRACE_LEVEL_WARNING
+            depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
             help
                 Define BT trace level for GAP layer
 
-            config GAP_TRACE_LEVEL_NONE
+            config BT_LOG_GAP_TRACE_LEVEL_NONE
                 bool "NONE"
-            config GAP_TRACE_LEVEL_ERROR
+            config BT_LOG_GAP_TRACE_LEVEL_ERROR
                 bool "ERROR"
-            config GAP_TRACE_LEVEL_WARNING
+            config BT_LOG_GAP_TRACE_LEVEL_WARNING
                 bool "WARNING"
-            config GAP_TRACE_LEVEL_API
+            config BT_LOG_GAP_TRACE_LEVEL_API
                 bool "API"
-            config GAP_TRACE_LEVEL_EVENT
+            config BT_LOG_GAP_TRACE_LEVEL_EVENT
                 bool "EVENT"
-            config GAP_TRACE_LEVEL_DEBUG
+            config BT_LOG_GAP_TRACE_LEVEL_DEBUG
                 bool "DEBUG"
-            config GAP_TRACE_LEVEL_VERBOSE
+            config BT_LOG_GAP_TRACE_LEVEL_VERBOSE
                 bool "VERBOSE"
         endchoice
 
-        config GAP_INITIAL_TRACE_LEVEL
+        config BT_LOG_GAP_TRACE_LEVEL
             int
-            depends on BLUEDROID_ENABLED
-            default 0 if GAP_TRACE_LEVEL_NONE
-            default 1 if GAP_TRACE_LEVEL_ERROR
-            default 2 if GAP_TRACE_LEVEL_WARNING
-            default 3 if GAP_TRACE_LEVEL_API
-            default 4 if GAP_TRACE_LEVEL_EVENT
-            default 5 if GAP_TRACE_LEVEL_DEBUG
-            default 6 if GAP_TRACE_LEVEL_VERBOSE
+            depends on BT_BLUEDROID_ENABLED
+            default 0 if BT_LOG_GAP_TRACE_LEVEL_NONE
+            default 1 if BT_LOG_GAP_TRACE_LEVEL_ERROR
+            default 2 if BT_LOG_GAP_TRACE_LEVEL_WARNING
+            default 3 if BT_LOG_GAP_TRACE_LEVEL_API
+            default 4 if BT_LOG_GAP_TRACE_LEVEL_EVENT
+            default 5 if BT_LOG_GAP_TRACE_LEVEL_DEBUG
+            default 6 if BT_LOG_GAP_TRACE_LEVEL_VERBOSE
             default 2
 
-        choice BNEP_INITIAL_TRACE_LEVEL
+        choice BT_LOG_BNEP_TRACE_LEVEL
             prompt "BNEP layer"
-            default BNEP_TRACE_LEVEL_WARNING
-            depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+            default BT_LOG_BNEP_TRACE_LEVEL_WARNING
+            depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
             help
                 Define BT trace level for BNEP layer
 
-            config BNEP_TRACE_LEVEL_NONE
+            config BT_LOG_BNEP_TRACE_LEVEL_NONE
                 bool "NONE"
-            config BNEP_TRACE_LEVEL_ERROR
+            config BT_LOG_BNEP_TRACE_LEVEL_ERROR
                 bool "ERROR"
-            config BNEP_TRACE_LEVEL_WARNING
+            config BT_LOG_BNEP_TRACE_LEVEL_WARNING
                 bool "WARNING"
-            config BNEP_TRACE_LEVEL_API
+            config BT_LOG_BNEP_TRACE_LEVEL_API
                 bool "API"
-            config BNEP_TRACE_LEVEL_EVENT
+            config BT_LOG_BNEP_TRACE_LEVEL_EVENT
                 bool "EVENT"
-            config BNEP_TRACE_LEVEL_DEBUG
+            config BT_LOG_BNEP_TRACE_LEVEL_DEBUG
                 bool "DEBUG"
-            config BNEP_TRACE_LEVEL_VERBOSE
+            config BT_LOG_BNEP_TRACE_LEVEL_VERBOSE
                 bool "VERBOSE"
         endchoice
 
-        config BNEP_INITIAL_TRACE_LEVEL
+        config BT_LOG_BNEP_TRACE_LEVEL
             int
-            depends on BLUEDROID_ENABLED
-            default 0 if BNEP_TRACE_LEVEL_NONE
-            default 1 if BNEP_TRACE_LEVEL_ERROR
-            default 2 if BNEP_TRACE_LEVEL_WARNING
-            default 3 if BNEP_TRACE_LEVEL_API
-            default 4 if BNEP_TRACE_LEVEL_EVENT
-            default 5 if BNEP_TRACE_LEVEL_DEBUG
-            default 6 if BNEP_TRACE_LEVEL_VERBOSE
+            depends on BT_BLUEDROID_ENABLED
+            default 0 if BT_LOG_BNEP_TRACE_LEVEL_NONE
+            default 1 if BT_LOG_BNEP_TRACE_LEVEL_ERROR
+            default 2 if BT_LOG_BNEP_TRACE_LEVEL_WARNING
+            default 3 if BT_LOG_BNEP_TRACE_LEVEL_API
+            default 4 if BT_LOG_BNEP_TRACE_LEVEL_EVENT
+            default 5 if BT_LOG_BNEP_TRACE_LEVEL_DEBUG
+            default 6 if BT_LOG_BNEP_TRACE_LEVEL_VERBOSE
             default 2
 
-        choice PAN_INITIAL_TRACE_LEVEL
+        choice BT_LOG_PAN_TRACE_LEVEL
             prompt "PAN layer"
-            default PAN_TRACE_LEVEL_WARNING
-            depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+            default BT_LOG_PAN_TRACE_LEVEL_WARNING
+            depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
             help
                 Define BT trace level for PAN layer
 
-            config PAN_TRACE_LEVEL_NONE
+            config BT_LOG_PAN_TRACE_LEVEL_NONE
                 bool "NONE"
-            config PAN_TRACE_LEVEL_ERROR
+            config BT_LOG_PAN_TRACE_LEVEL_ERROR
                 bool "ERROR"
-            config PAN_TRACE_LEVEL_WARNING
+            config BT_LOG_PAN_TRACE_LEVEL_WARNING
                 bool "WARNING"
-            config PAN_TRACE_LEVEL_API
+            config BT_LOG_PAN_TRACE_LEVEL_API
                 bool "API"
-            config PAN_TRACE_LEVEL_EVENT
+            config BT_LOG_PAN_TRACE_LEVEL_EVENT
                 bool "EVENT"
-            config PAN_TRACE_LEVEL_DEBUG
+            config BT_LOG_PAN_TRACE_LEVEL_DEBUG
                 bool "DEBUG"
-            config PAN_TRACE_LEVEL_VERBOSE
+            config BT_LOG_PAN_TRACE_LEVEL_VERBOSE
                 bool "VERBOSE"
         endchoice
 
-        config PAN_INITIAL_TRACE_LEVEL
+        config BT_LOG_PAN_TRACE_LEVEL
             int
-            depends on BLUEDROID_ENABLED
-            default 0 if PAN_TRACE_LEVEL_NONE
-            default 1 if PAN_TRACE_LEVEL_ERROR
-            default 2 if PAN_TRACE_LEVEL_WARNING
-            default 3 if PAN_TRACE_LEVEL_API
-            default 4 if PAN_TRACE_LEVEL_EVENT
-            default 5 if PAN_TRACE_LEVEL_DEBUG
-            default 6 if PAN_TRACE_LEVEL_VERBOSE
+            depends on BT_BLUEDROID_ENABLED
+            default 0 if BT_LOG_PAN_TRACE_LEVEL_NONE
+            default 1 if BT_LOG_PAN_TRACE_LEVEL_ERROR
+            default 2 if BT_LOG_PAN_TRACE_LEVEL_WARNING
+            default 3 if BT_LOG_PAN_TRACE_LEVEL_API
+            default 4 if BT_LOG_PAN_TRACE_LEVEL_EVENT
+            default 5 if BT_LOG_PAN_TRACE_LEVEL_DEBUG
+            default 6 if BT_LOG_PAN_TRACE_LEVEL_VERBOSE
             default 2
 
-        choice A2D_INITIAL_TRACE_LEVEL
+        choice BT_LOG_A2D_TRACE_LEVEL
             prompt "A2D layer"
-            default A2D_TRACE_LEVEL_WARNING
-            depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+            default BT_LOG_A2D_TRACE_LEVEL_WARNING
+            depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
             help
                 Define BT trace level for A2D layer
 
-            config A2D_TRACE_LEVEL_NONE
+            config BT_LOG_A2D_TRACE_LEVEL_NONE
                 bool "NONE"
-            config A2D_TRACE_LEVEL_ERROR
+            config BT_LOG_A2D_TRACE_LEVEL_ERROR
                 bool "ERROR"
-            config A2D_TRACE_LEVEL_WARNING
+            config BT_LOG_A2D_TRACE_LEVEL_WARNING
                 bool "WARNING"
-            config A2D_TRACE_LEVEL_API
+            config BT_LOG_A2D_TRACE_LEVEL_API
                 bool "API"
-            config A2D_TRACE_LEVEL_EVENT
+            config BT_LOG_A2D_TRACE_LEVEL_EVENT
                 bool "EVENT"
-            config A2D_TRACE_LEVEL_DEBUG
+            config BT_LOG_A2D_TRACE_LEVEL_DEBUG
                 bool "DEBUG"
-            config A2D_TRACE_LEVEL_VERBOSE
+            config BT_LOG_A2D_TRACE_LEVEL_VERBOSE
                 bool "VERBOSE"
         endchoice
 
-        config A2D_INITIAL_TRACE_LEVEL
+        config BT_LOG_A2D_TRACE_LEVEL
             int
-            depends on BLUEDROID_ENABLED
-            default 0 if A2D_TRACE_LEVEL_NONE
-            default 1 if A2D_TRACE_LEVEL_ERROR
-            default 2 if A2D_TRACE_LEVEL_WARNING
-            default 3 if A2D_TRACE_LEVEL_API
-            default 4 if A2D_TRACE_LEVEL_EVENT
-            default 5 if A2D_TRACE_LEVEL_DEBUG
-            default 6 if A2D_TRACE_LEVEL_VERBOSE
+            depends on BT_BLUEDROID_ENABLED
+            default 0 if BT_LOG_A2D_TRACE_LEVEL_NONE
+            default 1 if BT_LOG_A2D_TRACE_LEVEL_ERROR
+            default 2 if BT_LOG_A2D_TRACE_LEVEL_WARNING
+            default 3 if BT_LOG_A2D_TRACE_LEVEL_API
+            default 4 if BT_LOG_A2D_TRACE_LEVEL_EVENT
+            default 5 if BT_LOG_A2D_TRACE_LEVEL_DEBUG
+            default 6 if BT_LOG_A2D_TRACE_LEVEL_VERBOSE
             default 2
 
-        choice AVDT_INITIAL_TRACE_LEVEL
+        choice BT_LOG_AVDT_TRACE_LEVEL
             prompt "AVDT layer"
-            default AVDT_TRACE_LEVEL_WARNING
-            depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+            default BT_LOG_AVDT_TRACE_LEVEL_WARNING
+            depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
             help
                 Define BT trace level for AVDT layer
 
-            config AVDT_TRACE_LEVEL_NONE
+            config BT_LOG_AVDT_TRACE_LEVEL_NONE
                 bool "NONE"
-            config AVDT_TRACE_LEVEL_ERROR
+            config BT_LOG_AVDT_TRACE_LEVEL_ERROR
                 bool "ERROR"
-            config AVDT_TRACE_LEVEL_WARNING
+            config BT_LOG_AVDT_TRACE_LEVEL_WARNING
                 bool "WARNING"
-            config AVDT_TRACE_LEVEL_API
+            config BT_LOG_AVDT_TRACE_LEVEL_API
                 bool "API"
-            config AVDT_TRACE_LEVEL_EVENT
+            config BT_LOG_AVDT_TRACE_LEVEL_EVENT
                 bool "EVENT"
-            config AVDT_TRACE_LEVEL_DEBUG
+            config BT_LOG_AVDT_TRACE_LEVEL_DEBUG
                 bool "DEBUG"
-            config AVDT_TRACE_LEVEL_VERBOSE
+            config BT_LOG_AVDT_TRACE_LEVEL_VERBOSE
                 bool "VERBOSE"
         endchoice
 
-        config AVDT_INITIAL_TRACE_LEVEL
+        config BT_LOG_AVDT_TRACE_LEVEL
             int
-            depends on BLUEDROID_ENABLED
-            default 0 if AVDT_TRACE_LEVEL_NONE
-            default 1 if AVDT_TRACE_LEVEL_ERROR
-            default 2 if AVDT_TRACE_LEVEL_WARNING
-            default 3 if AVDT_TRACE_LEVEL_API
-            default 4 if AVDT_TRACE_LEVEL_EVENT
-            default 5 if AVDT_TRACE_LEVEL_DEBUG
-            default 6 if AVDT_TRACE_LEVEL_VERBOSE
+            depends on BT_BLUEDROID_ENABLED
+            default 0 if BT_LOG_AVDT_TRACE_LEVEL_NONE
+            default 1 if BT_LOG_AVDT_TRACE_LEVEL_ERROR
+            default 2 if BT_LOG_AVDT_TRACE_LEVEL_WARNING
+            default 3 if BT_LOG_AVDT_TRACE_LEVEL_API
+            default 4 if BT_LOG_AVDT_TRACE_LEVEL_EVENT
+            default 5 if BT_LOG_AVDT_TRACE_LEVEL_DEBUG
+            default 6 if BT_LOG_AVDT_TRACE_LEVEL_VERBOSE
             default 2
 
-        choice AVCT_INITIAL_TRACE_LEVEL
+        choice BT_LOG_AVCT_TRACE_LEVEL
             prompt "AVCT layer"
-            default AVCT_TRACE_LEVEL_WARNING
-            depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+            default BT_LOG_AVCT_TRACE_LEVEL_WARNING
+            depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
             help
                 Define BT trace level for AVCT layer
 
-            config AVCT_TRACE_LEVEL_NONE
+            config BT_LOG_AVCT_TRACE_LEVEL_NONE
                 bool "NONE"
-            config AVCT_TRACE_LEVEL_ERROR
+            config BT_LOG_AVCT_TRACE_LEVEL_ERROR
                 bool "ERROR"
-            config AVCT_TRACE_LEVEL_WARNING
+            config BT_LOG_AVCT_TRACE_LEVEL_WARNING
                 bool "WARNING"
-            config AVCT_TRACE_LEVEL_API
+            config BT_LOG_AVCT_TRACE_LEVEL_API
                 bool "API"
-            config AVCT_TRACE_LEVEL_EVENT
+            config BT_LOG_AVCT_TRACE_LEVEL_EVENT
                 bool "EVENT"
-            config AVCT_TRACE_LEVEL_DEBUG
+            config BT_LOG_AVCT_TRACE_LEVEL_DEBUG
                 bool "DEBUG"
-            config AVCT_TRACE_LEVEL_VERBOSE
+            config BT_LOG_AVCT_TRACE_LEVEL_VERBOSE
                 bool "VERBOSE"
         endchoice
 
-        config AVCT_INITIAL_TRACE_LEVEL
+        config BT_LOG_AVCT_TRACE_LEVEL
             int
-            depends on BLUEDROID_ENABLED
-            default 0 if AVCT_TRACE_LEVEL_NONE
-            default 1 if AVCT_TRACE_LEVEL_ERROR
-            default 2 if AVCT_TRACE_LEVEL_WARNING
-            default 3 if AVCT_TRACE_LEVEL_API
-            default 4 if AVCT_TRACE_LEVEL_EVENT
-            default 5 if AVCT_TRACE_LEVEL_DEBUG
-            default 6 if AVCT_TRACE_LEVEL_VERBOSE
+            depends on BT_BLUEDROID_ENABLED
+            default 0 if BT_LOG_AVCT_TRACE_LEVEL_NONE
+            default 1 if BT_LOG_AVCT_TRACE_LEVEL_ERROR
+            default 2 if BT_LOG_AVCT_TRACE_LEVEL_WARNING
+            default 3 if BT_LOG_AVCT_TRACE_LEVEL_API
+            default 4 if BT_LOG_AVCT_TRACE_LEVEL_EVENT
+            default 5 if BT_LOG_AVCT_TRACE_LEVEL_DEBUG
+            default 6 if BT_LOG_AVCT_TRACE_LEVEL_VERBOSE
             default 2
 
-        choice AVRC_INITIAL_TRACE_LEVEL
+        choice BT_LOG_AVRC_TRACE_LEVEL
             prompt "AVRC layer"
-            default AVRC_TRACE_LEVEL_WARNING
-            depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+            default BT_LOG_AVRC_TRACE_LEVEL_WARNING
+            depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
             help
                 Define BT trace level for AVRC layer
 
-            config AVRC_TRACE_LEVEL_NONE
+            config BT_LOG_AVRC_TRACE_LEVEL_NONE
                 bool "NONE"
-            config AVRC_TRACE_LEVEL_ERROR
+            config BT_LOG_AVRC_TRACE_LEVEL_ERROR
                 bool "ERROR"
-            config AVRC_TRACE_LEVEL_WARNING
+            config BT_LOG_AVRC_TRACE_LEVEL_WARNING
                 bool "WARNING"
-            config AVRC_TRACE_LEVEL_API
+            config BT_LOG_AVRC_TRACE_LEVEL_API
                 bool "API"
-            config AVRC_TRACE_LEVEL_EVENT
+            config BT_LOG_AVRC_TRACE_LEVEL_EVENT
                 bool "EVENT"
-            config AVRC_TRACE_LEVEL_DEBUG
+            config BT_LOG_AVRC_TRACE_LEVEL_DEBUG
                 bool "DEBUG"
-            config AVRC_TRACE_LEVEL_VERBOSE
+            config BT_LOG_AVRC_TRACE_LEVEL_VERBOSE
                 bool "VERBOSE"
         endchoice
 
-        config AVRC_INITIAL_TRACE_LEVEL
+        config BT_LOG_AVRC_TRACE_LEVEL
             int
-            depends on BLUEDROID_ENABLED
-            default 0 if AVRC_TRACE_LEVEL_NONE
-            default 1 if AVRC_TRACE_LEVEL_ERROR
-            default 2 if AVRC_TRACE_LEVEL_WARNING
-            default 3 if AVRC_TRACE_LEVEL_API
-            default 4 if AVRC_TRACE_LEVEL_EVENT
-            default 5 if AVRC_TRACE_LEVEL_DEBUG
-            default 6 if AVRC_TRACE_LEVEL_VERBOSE
+            depends on BT_BLUEDROID_ENABLED
+            default 0 if BT_LOG_AVRC_TRACE_LEVEL_NONE
+            default 1 if BT_LOG_AVRC_TRACE_LEVEL_ERROR
+            default 2 if BT_LOG_AVRC_TRACE_LEVEL_WARNING
+            default 3 if BT_LOG_AVRC_TRACE_LEVEL_API
+            default 4 if BT_LOG_AVRC_TRACE_LEVEL_EVENT
+            default 5 if BT_LOG_AVRC_TRACE_LEVEL_DEBUG
+            default 6 if BT_LOG_AVRC_TRACE_LEVEL_VERBOSE
             default 2
 
-        choice MCA_INITIAL_TRACE_LEVEL
+        choice BT_LOG_MCA_TRACE_LEVEL
             prompt "MCA layer"
-            default MCA_TRACE_LEVEL_WARNING
-            depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+            default BT_LOG_MCA_TRACE_LEVEL_WARNING
+            depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
             help
                 Define BT trace level for MCA layer
 
-            config MCA_TRACE_LEVEL_NONE
+            config BT_LOG_MCA_TRACE_LEVEL_NONE
                 bool "NONE"
-            config MCA_TRACE_LEVEL_ERROR
+            config BT_LOG_MCA_TRACE_LEVEL_ERROR
                 bool "ERROR"
-            config MCA_TRACE_LEVEL_WARNING
+            config BT_LOG_MCA_TRACE_LEVEL_WARNING
                 bool "WARNING"
-            config MCA_TRACE_LEVEL_API
+            config BT_LOG_MCA_TRACE_LEVEL_API
                 bool "API"
-            config MCA_TRACE_LEVEL_EVENT
+            config BT_LOG_MCA_TRACE_LEVEL_EVENT
                 bool "EVENT"
-            config MCA_TRACE_LEVEL_DEBUG
+            config BT_LOG_MCA_TRACE_LEVEL_DEBUG
                 bool "DEBUG"
-            config MCA_TRACE_LEVEL_VERBOSE
+            config BT_LOG_MCA_TRACE_LEVEL_VERBOSE
                 bool "VERBOSE"
         endchoice
 
-        config MCA_INITIAL_TRACE_LEVEL
+        config BT_LOG_MCA_TRACE_LEVEL
             int
-            depends on BLUEDROID_ENABLED
-            default 0 if MCA_TRACE_LEVEL_NONE
-            default 1 if MCA_TRACE_LEVEL_ERROR
-            default 2 if MCA_TRACE_LEVEL_WARNING
-            default 3 if MCA_TRACE_LEVEL_API
-            default 4 if MCA_TRACE_LEVEL_EVENT
-            default 5 if MCA_TRACE_LEVEL_DEBUG
-            default 6 if MCA_TRACE_LEVEL_VERBOSE
+            depends on BT_BLUEDROID_ENABLED
+            default 0 if BT_LOG_MCA_TRACE_LEVEL_NONE
+            default 1 if BT_LOG_MCA_TRACE_LEVEL_ERROR
+            default 2 if BT_LOG_MCA_TRACE_LEVEL_WARNING
+            default 3 if BT_LOG_MCA_TRACE_LEVEL_API
+            default 4 if BT_LOG_MCA_TRACE_LEVEL_EVENT
+            default 5 if BT_LOG_MCA_TRACE_LEVEL_DEBUG
+            default 6 if BT_LOG_MCA_TRACE_LEVEL_VERBOSE
             default 2
 
-        choice HID_INITIAL_TRACE_LEVEL
+        choice BT_LOG_HID_TRACE_LEVEL
             prompt "HID layer"
-            default HID_TRACE_LEVEL_WARNING
-            depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+            default BT_LOG_HID_TRACE_LEVEL_WARNING
+            depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
             help
                 Define BT trace level for HID layer
 
-            config HID_TRACE_LEVEL_NONE
+            config BT_LOG_HID_TRACE_LEVEL_NONE
                 bool "NONE"
-            config HID_TRACE_LEVEL_ERROR
+            config BT_LOG_HID_TRACE_LEVEL_ERROR
                 bool "ERROR"
-            config HID_TRACE_LEVEL_WARNING
+            config BT_LOG_HID_TRACE_LEVEL_WARNING
                 bool "WARNING"
-            config HID_TRACE_LEVEL_API
+            config BT_LOG_HID_TRACE_LEVEL_API
                 bool "API"
-            config HID_TRACE_LEVEL_EVENT
+            config BT_LOG_HID_TRACE_LEVEL_EVENT
                 bool "EVENT"
-            config HID_TRACE_LEVEL_DEBUG
+            config BT_LOG_HID_TRACE_LEVEL_DEBUG
                 bool "DEBUG"
-            config HID_TRACE_LEVEL_VERBOSE
+            config BT_LOG_HID_TRACE_LEVEL_VERBOSE
                 bool "VERBOSE"
         endchoice
 
-        config HID_INITIAL_TRACE_LEVEL
+        config BT_LOG_HID_TRACE_LEVEL
             int
-            depends on BLUEDROID_ENABLED
-            default 0 if HID_TRACE_LEVEL_NONE
-            default 1 if HID_TRACE_LEVEL_ERROR
-            default 2 if HID_TRACE_LEVEL_WARNING
-            default 3 if HID_TRACE_LEVEL_API
-            default 4 if HID_TRACE_LEVEL_EVENT
-            default 5 if HID_TRACE_LEVEL_DEBUG
-            default 6 if HID_TRACE_LEVEL_VERBOSE
+            depends on BT_BLUEDROID_ENABLED
+            default 0 if BT_LOG_HID_TRACE_LEVEL_NONE
+            default 1 if BT_LOG_HID_TRACE_LEVEL_ERROR
+            default 2 if BT_LOG_HID_TRACE_LEVEL_WARNING
+            default 3 if BT_LOG_HID_TRACE_LEVEL_API
+            default 4 if BT_LOG_HID_TRACE_LEVEL_EVENT
+            default 5 if BT_LOG_HID_TRACE_LEVEL_DEBUG
+            default 6 if BT_LOG_HID_TRACE_LEVEL_VERBOSE
             default 2
 
-        choice APPL_INITIAL_TRACE_LEVEL
+        choice BT_LOG_APPL_TRACE_LEVEL
             prompt "APPL layer"
-            default APPL_TRACE_LEVEL_WARNING
-            depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+            default BT_LOG_APPL_TRACE_LEVEL_WARNING
+            depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
             help
                 Define BT trace level for APPL layer
 
-            config APPL_TRACE_LEVEL_NONE
+            config BT_LOG_APPL_TRACE_LEVEL_NONE
                 bool "NONE"
-            config APPL_TRACE_LEVEL_ERROR
+            config BT_LOG_APPL_TRACE_LEVEL_ERROR
                 bool "ERROR"
-            config APPL_TRACE_LEVEL_WARNING
+            config BT_LOG_APPL_TRACE_LEVEL_WARNING
                 bool "WARNING"
-            config APPL_TRACE_LEVEL_API
+            config BT_LOG_APPL_TRACE_LEVEL_API
                 bool "API"
-            config APPL_TRACE_LEVEL_EVENT
+            config BT_LOG_APPL_TRACE_LEVEL_EVENT
                 bool "EVENT"
-            config APPL_TRACE_LEVEL_DEBUG
+            config BT_LOG_APPL_TRACE_LEVEL_DEBUG
                 bool "DEBUG"
-            config APPL_TRACE_LEVEL_VERBOSE
+            config BT_LOG_APPL_TRACE_LEVEL_VERBOSE
                 bool "VERBOSE"
         endchoice
 
-        config APPL_INITIAL_TRACE_LEVEL
+        config BT_LOG_APPL_TRACE_LEVEL
             int
-            depends on BLUEDROID_ENABLED
-            default 0 if APPL_TRACE_LEVEL_NONE
-            default 1 if APPL_TRACE_LEVEL_ERROR
-            default 2 if APPL_TRACE_LEVEL_WARNING
-            default 3 if APPL_TRACE_LEVEL_API
-            default 4 if APPL_TRACE_LEVEL_EVENT
-            default 5 if APPL_TRACE_LEVEL_DEBUG
-            default 6 if APPL_TRACE_LEVEL_VERBOSE
+            depends on BT_BLUEDROID_ENABLED
+            default 0 if BT_LOG_APPL_TRACE_LEVEL_NONE
+            default 1 if BT_LOG_APPL_TRACE_LEVEL_ERROR
+            default 2 if BT_LOG_APPL_TRACE_LEVEL_WARNING
+            default 3 if BT_LOG_APPL_TRACE_LEVEL_API
+            default 4 if BT_LOG_APPL_TRACE_LEVEL_EVENT
+            default 5 if BT_LOG_APPL_TRACE_LEVEL_DEBUG
+            default 6 if BT_LOG_APPL_TRACE_LEVEL_VERBOSE
             default 2
 
-        choice GATT_INITIAL_TRACE_LEVEL
+        choice BT_LOG_GATT_TRACE_LEVEL
             prompt "GATT layer"
-            default GATT_TRACE_LEVEL_WARNING
-            depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+            default BT_LOG_GATT_TRACE_LEVEL_WARNING
+            depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
             help
                 Define BT trace level for GATT layer
 
-            config GATT_TRACE_LEVEL_NONE
+            config BT_LOG_GATT_TRACE_LEVEL_NONE
                 bool "NONE"
-            config GATT_TRACE_LEVEL_ERROR
+            config BT_LOG_GATT_TRACE_LEVEL_ERROR
                 bool "ERROR"
-            config GATT_TRACE_LEVEL_WARNING
+            config BT_LOG_GATT_TRACE_LEVEL_WARNING
                 bool "WARNING"
-            config GATT_TRACE_LEVEL_API
+            config BT_LOG_GATT_TRACE_LEVEL_API
                 bool "API"
-            config GATT_TRACE_LEVEL_EVENT
+            config BT_LOG_GATT_TRACE_LEVEL_EVENT
                 bool "EVENT"
-            config GATT_TRACE_LEVEL_DEBUG
+            config BT_LOG_GATT_TRACE_LEVEL_DEBUG
                 bool "DEBUG"
-            config GATT_TRACE_LEVEL_VERBOSE
+            config BT_LOG_GATT_TRACE_LEVEL_VERBOSE
                 bool "VERBOSE"
         endchoice
 
-        config GATT_INITIAL_TRACE_LEVEL
+        config BT_LOG_GATT_TRACE_LEVEL
             int
-            depends on BLUEDROID_ENABLED
-            default 0 if GATT_TRACE_LEVEL_NONE
-            default 1 if GATT_TRACE_LEVEL_ERROR
-            default 2 if GATT_TRACE_LEVEL_WARNING
-            default 3 if GATT_TRACE_LEVEL_API
-            default 4 if GATT_TRACE_LEVEL_EVENT
-            default 5 if GATT_TRACE_LEVEL_DEBUG
-            default 6 if GATT_TRACE_LEVEL_VERBOSE
+            depends on BT_BLUEDROID_ENABLED
+            default 0 if BT_LOG_GATT_TRACE_LEVEL_NONE
+            default 1 if BT_LOG_GATT_TRACE_LEVEL_ERROR
+            default 2 if BT_LOG_GATT_TRACE_LEVEL_WARNING
+            default 3 if BT_LOG_GATT_TRACE_LEVEL_API
+            default 4 if BT_LOG_GATT_TRACE_LEVEL_EVENT
+            default 5 if BT_LOG_GATT_TRACE_LEVEL_DEBUG
+            default 6 if BT_LOG_GATT_TRACE_LEVEL_VERBOSE
             default 2
 
-        choice SMP_INITIAL_TRACE_LEVEL
+        choice BT_LOG_SMP_TRACE_LEVEL
             prompt "SMP layer"
-            default SMP_TRACE_LEVEL_WARNING
-            depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+            default BT_LOG_SMP_TRACE_LEVEL_WARNING
+            depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
             help
                 Define BT trace level for SMP layer
 
-            config SMP_TRACE_LEVEL_NONE
+            config BT_LOG_SMP_TRACE_LEVEL_NONE
                 bool "NONE"
-            config SMP_TRACE_LEVEL_ERROR
+            config BT_LOG_SMP_TRACE_LEVEL_ERROR
                 bool "ERROR"
-            config SMP_TRACE_LEVEL_WARNING
+            config BT_LOG_SMP_TRACE_LEVEL_WARNING
                 bool "WARNING"
-            config SMP_TRACE_LEVEL_API
+            config BT_LOG_SMP_TRACE_LEVEL_API
                 bool "API"
-            config SMP_TRACE_LEVEL_EVENT
+            config BT_LOG_SMP_TRACE_LEVEL_EVENT
                 bool "EVENT"
-            config SMP_TRACE_LEVEL_DEBUG
+            config BT_LOG_SMP_TRACE_LEVEL_DEBUG
                 bool "DEBUG"
-            config SMP_TRACE_LEVEL_VERBOSE
+            config BT_LOG_SMP_TRACE_LEVEL_VERBOSE
                 bool "VERBOSE"
         endchoice
 
-        config SMP_INITIAL_TRACE_LEVEL
+        config BT_LOG_SMP_TRACE_LEVEL
             int
-            depends on BLUEDROID_ENABLED
-            default 0 if SMP_TRACE_LEVEL_NONE
-            default 1 if SMP_TRACE_LEVEL_ERROR
-            default 2 if SMP_TRACE_LEVEL_WARNING
-            default 3 if SMP_TRACE_LEVEL_API
-            default 4 if SMP_TRACE_LEVEL_EVENT
-            default 5 if SMP_TRACE_LEVEL_DEBUG
-            default 6 if SMP_TRACE_LEVEL_VERBOSE
+            depends on BT_BLUEDROID_ENABLED
+            default 0 if BT_LOG_SMP_TRACE_LEVEL_NONE
+            default 1 if BT_LOG_SMP_TRACE_LEVEL_ERROR
+            default 2 if BT_LOG_SMP_TRACE_LEVEL_WARNING
+            default 3 if BT_LOG_SMP_TRACE_LEVEL_API
+            default 4 if BT_LOG_SMP_TRACE_LEVEL_EVENT
+            default 5 if BT_LOG_SMP_TRACE_LEVEL_DEBUG
+            default 6 if BT_LOG_SMP_TRACE_LEVEL_VERBOSE
             default 2
 
-        choice BTIF_INITIAL_TRACE_LEVEL
+        choice BT_LOG_BTIF_TRACE_LEVEL
             prompt "BTIF layer"
-            default BTIF_TRACE_LEVEL_WARNING
-            depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+            default BT_LOG_BTIF_TRACE_LEVEL_WARNING
+            depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
             help
                 Define BT trace level for BTIF layer
 
-            config BTIF_TRACE_LEVEL_NONE
+            config BT_LOG_BTIF_TRACE_LEVEL_NONE
                 bool "NONE"
-            config BTIF_TRACE_LEVEL_ERROR
+            config BT_LOG_BTIF_TRACE_LEVEL_ERROR
                 bool "ERROR"
-            config BTIF_TRACE_LEVEL_WARNING
+            config BT_LOG_BTIF_TRACE_LEVEL_WARNING
                 bool "WARNING"
-            config BTIF_TRACE_LEVEL_API
+            config BT_LOG_BTIF_TRACE_LEVEL_API
                 bool "API"
-            config BTIF_TRACE_LEVEL_EVENT
+            config BT_LOG_BTIF_TRACE_LEVEL_EVENT
                 bool "EVENT"
-            config BTIF_TRACE_LEVEL_DEBUG
+            config BT_LOG_BTIF_TRACE_LEVEL_DEBUG
                 bool "DEBUG"
-            config BTIF_TRACE_LEVEL_VERBOSE
+            config BT_LOG_BTIF_TRACE_LEVEL_VERBOSE
                 bool "VERBOSE"
         endchoice
 
-        config BTIF_INITIAL_TRACE_LEVEL
+        config BT_LOG_BTIF_TRACE_LEVEL
             int
-            depends on BLUEDROID_ENABLED
-            default 0 if BTIF_TRACE_LEVEL_NONE
-            default 1 if BTIF_TRACE_LEVEL_ERROR
-            default 2 if BTIF_TRACE_LEVEL_WARNING
-            default 3 if BTIF_TRACE_LEVEL_API
-            default 4 if BTIF_TRACE_LEVEL_EVENT
-            default 5 if BTIF_TRACE_LEVEL_DEBUG
-            default 6 if BTIF_TRACE_LEVEL_VERBOSE
+            depends on BT_BLUEDROID_ENABLED
+            default 0 if BT_LOG_BTIF_TRACE_LEVEL_NONE
+            default 1 if BT_LOG_BTIF_TRACE_LEVEL_ERROR
+            default 2 if BT_LOG_BTIF_TRACE_LEVEL_WARNING
+            default 3 if BT_LOG_BTIF_TRACE_LEVEL_API
+            default 4 if BT_LOG_BTIF_TRACE_LEVEL_EVENT
+            default 5 if BT_LOG_BTIF_TRACE_LEVEL_DEBUG
+            default 6 if BT_LOG_BTIF_TRACE_LEVEL_VERBOSE
             default 2
 
-        choice BTC_INITIAL_TRACE_LEVEL
+        choice BT_LOG_BTC_TRACE_LEVEL
             prompt "BTC layer"
-            default BTC_TRACE_LEVEL_WARNING
-            depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+            default BT_LOG_BTC_TRACE_LEVEL_WARNING
+            depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
             help
                 Define BT trace level for BTC layer
 
-            config BTC_TRACE_LEVEL_NONE
+            config BT_LOG_BTC_TRACE_LEVEL_NONE
                 bool "NONE"
-            config BTC_TRACE_LEVEL_ERROR
+            config BT_LOG_BTC_TRACE_LEVEL_ERROR
                 bool "ERROR"
-            config BTC_TRACE_LEVEL_WARNING
+            config BT_LOG_BTC_TRACE_LEVEL_WARNING
                 bool "WARNING"
-            config BTC_TRACE_LEVEL_API
+            config BT_LOG_BTC_TRACE_LEVEL_API
                 bool "API"
-            config BTC_TRACE_LEVEL_EVENT
+            config BT_LOG_BTC_TRACE_LEVEL_EVENT
                 bool "EVENT"
-            config BTC_TRACE_LEVEL_DEBUG
+            config BT_LOG_BTC_TRACE_LEVEL_DEBUG
                 bool "DEBUG"
-            config BTC_TRACE_LEVEL_VERBOSE
+            config BT_LOG_BTC_TRACE_LEVEL_VERBOSE
                 bool "VERBOSE"
         endchoice
 
-        config BTC_INITIAL_TRACE_LEVEL
+        config BT_LOG_BTC_TRACE_LEVEL
             int
-            depends on BLUEDROID_ENABLED
-            default 0 if BTC_TRACE_LEVEL_NONE
-            default 1 if BTC_TRACE_LEVEL_ERROR
-            default 2 if BTC_TRACE_LEVEL_WARNING
-            default 3 if BTC_TRACE_LEVEL_API
-            default 4 if BTC_TRACE_LEVEL_EVENT
-            default 5 if BTC_TRACE_LEVEL_DEBUG
-            default 6 if BTC_TRACE_LEVEL_VERBOSE
+            depends on BT_BLUEDROID_ENABLED
+            default 0 if BT_LOG_BTC_TRACE_LEVEL_NONE
+            default 1 if BT_LOG_BTC_TRACE_LEVEL_ERROR
+            default 2 if BT_LOG_BTC_TRACE_LEVEL_WARNING
+            default 3 if BT_LOG_BTC_TRACE_LEVEL_API
+            default 4 if BT_LOG_BTC_TRACE_LEVEL_EVENT
+            default 5 if BT_LOG_BTC_TRACE_LEVEL_DEBUG
+            default 6 if BT_LOG_BTC_TRACE_LEVEL_VERBOSE
             default 2
 
-        choice OSI_INITIAL_TRACE_LEVEL
+        choice BT_LOG_OSI_TRACE_LEVEL
             prompt "OSI layer"
-            default OSI_TRACE_LEVEL_WARNING
-            depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+            default BT_LOG_OSI_TRACE_LEVEL_WARNING
+            depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
             help
                 Define BT trace level for OSI layer
 
-            config OSI_TRACE_LEVEL_NONE
+            config BT_LOG_OSI_TRACE_LEVEL_NONE
                 bool "NONE"
-            config OSI_TRACE_LEVEL_ERROR
+            config BT_LOG_OSI_TRACE_LEVEL_ERROR
                 bool "ERROR"
-            config OSI_TRACE_LEVEL_WARNING
+            config BT_LOG_OSI_TRACE_LEVEL_WARNING
                 bool "WARNING"
-            config OSI_TRACE_LEVEL_API
+            config BT_LOG_OSI_TRACE_LEVEL_API
                 bool "API"
-            config OSI_TRACE_LEVEL_EVENT
+            config BT_LOG_OSI_TRACE_LEVEL_EVENT
                 bool "EVENT"
-            config OSI_TRACE_LEVEL_DEBUG
+            config BT_LOG_OSI_TRACE_LEVEL_DEBUG
                 bool "DEBUG"
-            config OSI_TRACE_LEVEL_VERBOSE
+            config BT_LOG_OSI_TRACE_LEVEL_VERBOSE
                 bool "VERBOSE"
         endchoice
 
-        config OSI_INITIAL_TRACE_LEVEL
+        config BT_LOG_OSI_TRACE_LEVEL
             int
-            depends on BLUEDROID_ENABLED
-            default 0 if OSI_TRACE_LEVEL_NONE
-            default 1 if OSI_TRACE_LEVEL_ERROR
-            default 2 if OSI_TRACE_LEVEL_WARNING
-            default 3 if OSI_TRACE_LEVEL_API
-            default 4 if OSI_TRACE_LEVEL_EVENT
-            default 5 if OSI_TRACE_LEVEL_DEBUG
-            default 6 if OSI_TRACE_LEVEL_VERBOSE
+            depends on BT_BLUEDROID_ENABLED
+            default 0 if BT_LOG_OSI_TRACE_LEVEL_NONE
+            default 1 if BT_LOG_OSI_TRACE_LEVEL_ERROR
+            default 2 if BT_LOG_OSI_TRACE_LEVEL_WARNING
+            default 3 if BT_LOG_OSI_TRACE_LEVEL_API
+            default 4 if BT_LOG_OSI_TRACE_LEVEL_EVENT
+            default 5 if BT_LOG_OSI_TRACE_LEVEL_DEBUG
+            default 6 if BT_LOG_OSI_TRACE_LEVEL_VERBOSE
             default 2
 
-        choice BLUFI_INITIAL_TRACE_LEVEL
+        choice BT_LOG_BLUFI_TRACE_LEVEL
             prompt "BLUFI layer"
-            default BLUFI_TRACE_LEVEL_WARNING
-            depends on BLUEDROID_ENABLED && !BT_STACK_NO_LOG
+            default BT_LOG_BLUFI_TRACE_LEVEL_WARNING
+            depends on BT_BLUEDROID_ENABLED && !BT_STACK_NO_LOG
             help
                 Define BT trace level for BLUFI layer
 
-            config BLUFI_TRACE_LEVEL_NONE
+            config BT_LOG_BLUFI_TRACE_LEVEL_NONE
                 bool "NONE"
-            config BLUFI_TRACE_LEVEL_ERROR
+            config BT_LOG_BLUFI_TRACE_LEVEL_ERROR
                 bool "ERROR"
-            config BLUFI_TRACE_LEVEL_WARNING
+            config BT_LOG_BLUFI_TRACE_LEVEL_WARNING
                 bool "WARNING"
-            config BLUFI_TRACE_LEVEL_API
+            config BT_LOG_BLUFI_TRACE_LEVEL_API
                 bool "API"
-            config BLUFI_TRACE_LEVEL_EVENT
+            config BT_LOG_BLUFI_TRACE_LEVEL_EVENT
                 bool "EVENT"
-            config BLUFI_TRACE_LEVEL_DEBUG
+            config BT_LOG_BLUFI_TRACE_LEVEL_DEBUG
                 bool "DEBUG"
-            config BLUFI_TRACE_LEVEL_VERBOSE
+            config BT_LOG_BLUFI_TRACE_LEVEL_VERBOSE
                 bool "VERBOSE"
         endchoice
 
-        config BLUFI_INITIAL_TRACE_LEVEL
+        config BT_LOG_BLUFI_TRACE_LEVEL
             int
-            depends on BLUEDROID_ENABLED
-            default 0 if BLUFI_TRACE_LEVEL_NONE
-            default 1 if BLUFI_TRACE_LEVEL_ERROR
-            default 2 if BLUFI_TRACE_LEVEL_WARNING
-            default 3 if BLUFI_TRACE_LEVEL_API
-            default 4 if BLUFI_TRACE_LEVEL_EVENT
-            default 5 if BLUFI_TRACE_LEVEL_DEBUG
-            default 6 if BLUFI_TRACE_LEVEL_VERBOSE
+            depends on BT_BLUEDROID_ENABLED
+            default 0 if BT_LOG_BLUFI_TRACE_LEVEL_NONE
+            default 1 if BT_LOG_BLUFI_TRACE_LEVEL_ERROR
+            default 2 if BT_LOG_BLUFI_TRACE_LEVEL_WARNING
+            default 3 if BT_LOG_BLUFI_TRACE_LEVEL_API
+            default 4 if BT_LOG_BLUFI_TRACE_LEVEL_EVENT
+            default 5 if BT_LOG_BLUFI_TRACE_LEVEL_DEBUG
+            default 6 if BT_LOG_BLUFI_TRACE_LEVEL_VERBOSE
             default 2
 
     endmenu #BT DEBUG LOG LEVEL
@@ -1219,7 +1219,7 @@ menu Bluetooth
 
     config BT_ACL_CONNECTIONS
         int "BT/BLE MAX ACL CONNECTIONS(1~7)"
-        depends on BLUEDROID_ENABLED
+        depends on BT_BLUEDROID_ENABLED
         range 1 7
         default 4
         help
@@ -1227,35 +1227,35 @@ menu Bluetooth
 
     config BT_ALLOCATION_FROM_SPIRAM_FIRST
         bool "BT/BLE will first malloc the memory from the PSRAM"
-        depends on BLUEDROID_ENABLED
+        depends on BT_BLUEDROID_ENABLED
         default n
         help
             This select can save the internal RAM if there have the PSRAM
 
     config BT_BLE_DYNAMIC_ENV_MEMORY
         bool "Use dynamic memory allocation in BT/BLE stack"
-        depends on BLUEDROID_ENABLED
+        depends on BT_BLUEDROID_ENABLED
         default n
         help
             This select can make the allocation of memory will become more flexible
 
-    config BLE_HOST_QUEUE_CONGESTION_CHECK
+    config BT_BLE_HOST_QUEUE_CONG_CHECK
         bool "BLE queue congestion check"
-        depends on BLUEDROID_ENABLED
+        depends on BT_BLUEDROID_ENABLED
         default n
         help
             When scanning and scan duplicate is not enabled, if there are a lot of adv packets around or application
             layer handling adv packets is slow, it will cause the controller memory to run out. if enabled, adv
             packets will be lost when host queue is congested.
 
-    config SMP_ENABLE
+    config BT_SMP_ENABLE
         bool
-        depends on BLUEDROID_ENABLED
-        default CLASSIC_BT_ENABLED || BLE_SMP_ENABLE
+        depends on BT_BLUEDROID_ENABLED
+        default BT_CLASSIC_ENABLED || BT_BLE_SMP_ENABLE
 
-    config BLE_ACTIVE_SCAN_REPORT_ADV_SCAN_RSP_INDIVIDUALLY
+    config BT_BLE_ACT_SCAN_REP_ADV_SCAN
         bool "Report adv data and scan response individually when BLE active scan"
-        depends on BLUEDROID_ENABLED && (BTDM_CONTROLLER_MODE_BTDM || BTDM_CONTROLLER_MODE_BLE_ONLY)
+        depends on BT_BLUEDROID_ENABLED && (BTDM_CTRL_MODE_BTDM || BTDM_CTRL_MODE_BLE_ONLY)
         default n
         help
             Originally, when doing BLE active scan, Bluedroid will not report adv to application layer
@@ -1264,9 +1264,9 @@ menu Bluetooth
 
             # Memory reserved at start of DRAM for Bluetooth stack
 
-    config BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT
+    config BT_BLE_ESTAB_LINK_CONN_TOUT
         int "Timeout of BLE connection establishment"
-        depends on BLUEDROID_ENABLED
+        depends on BT_BLUEDROID_ENABLED
         range 1 60
         default 30
         help

diff --git a/components/bt/bluedroid/api/esp_bt_main.c b/components/bt/bluedroid/api/esp_bt_main.c
index 8aff98e8b931389fbb87a59a90e52bcc590e670b..1620ae9d80382e79d8878c173a620e6a6e2b12a4 100644 (file)
--- a/components/bt/bluedroid/api/esp_bt_main.c
+++ b/components/bt/bluedroid/api/esp_bt_main.c
@@ -128,7 +128,7 @@ esp_err_t esp_bluedroid_init(void)
         return ESP_ERR_INVALID_STATE;
     }
 
-#ifdef CONFIG_BLUEDROID_MEM_DEBUG
+#ifdef CONFIG_BT_BLUEDROID_MEM_DEBUG
     osi_mem_dbg_init();
 #endif
 

diff --git a/components/bt/bluedroid/btc/core/btc_task.c b/components/bt/bluedroid/btc/core/btc_task.c
index 338d6841f085b8d73e8ba804acda9cbda77dadaf..86d2b4a63e39d6beb7ec74211ec113c79c091fc7 100644 (file)
--- a/components/bt/bluedroid/btc/core/btc_task.c
+++ b/components/bt/bluedroid/btc/core/btc_task.c
@@ -30,7 +30,7 @@
 #include "btc/btc_dm.h"
 #include "btc/btc_alarm.h"
 #include "bta/bta_gatt_api.h"
-#if CONFIG_CLASSIC_BT_ENABLED
+#if CONFIG_BT_CLASSIC_ENABLED
 #include "btc/btc_profile_queue.h"
 #if (BTC_GAP_BT_INCLUDED == TRUE)
 #include "btc_gap_bt.h"
@@ -45,7 +45,7 @@
 #if BTC_HF_CLIENT_INCLUDED
 #include "btc_hf_client.h"
 #endif  /* #if BTC_HF_CLIENT_INCLUDED */
-#endif /* #if CONFIG_CLASSIC_BT_ENABLED */
+#endif /* #if CONFIG_BT_CLASSIC_ENABLED */
 
 
 static xTaskHandle  xBtcTaskHandle = NULL;
@@ -71,7 +71,7 @@ static btc_func_t profile_tab[BTC_PID_NUM] = {
 #endif  ///GATTS_INCLUDED == TRUE
     [BTC_PID_DM_SEC]      = {NULL,                        btc_dm_sec_cb_handler   },
     [BTC_PID_ALARM]       = {btc_alarm_handler,           NULL                    },
-#if CONFIG_CLASSIC_BT_ENABLED
+#if CONFIG_BT_CLASSIC_ENABLED
 #if (BTC_GAP_BT_INCLUDED == TRUE)
     [BTC_PID_GAP_BT]    = {btc_gap_bt_call_handler,     btc_gap_bt_cb_handler   },
 #endif /* (BTC_GAP_BT_INCLUDED == TRUE) */
@@ -87,7 +87,7 @@ static btc_func_t profile_tab[BTC_PID_NUM] = {
 #if BTC_HF_CLIENT_INCLUDED
     [BTC_PID_HF_CLIENT]   = {btc_hf_client_call_handler,  btc_hf_client_cb_handler},
 #endif  /* #if BTC_HF_CLIENT_INCLUDED */
-#endif /* #if CONFIG_CLASSIC_BT_ENABLED */
+#endif /* #if CONFIG_BT_CLASSIC_ENABLED */
 };
 
 /*****************************************************************************

diff --git a/components/bt/bluedroid/btc/include/btc/btc_task.h b/components/bt/bluedroid/btc/include/btc/btc_task.h
index ca5abd37592c53468e0a515717b7c511e9a51c1e..2ea76c1772a6f69d91af3abe5612b6595bb1959f 100644 (file)
--- a/components/bt/bluedroid/btc/include/btc/btc_task.h
+++ b/components/bt/bluedroid/btc/include/btc/btc_task.h
@@ -53,7 +53,7 @@ typedef enum {
     BTC_PID_BLUFI,
     BTC_PID_DM_SEC,
     BTC_PID_ALARM,
-#if CONFIG_CLASSIC_BT_ENABLED
+#if CONFIG_BT_CLASSIC_ENABLED
     BTC_PID_GAP_BT,
     BTC_PID_PRF_QUE,
     BTC_PID_A2DP,
@@ -63,7 +63,7 @@ typedef enum {
 #if BTC_HF_CLIENT_INCLUDED
     BTC_PID_HF_CLIENT,
 #endif /* BTC_HF_CLIENT_INCLUDED */
-#endif  /* CONFIG_CLASSIC_BT_ENABLED */
+#endif  /* CONFIG_BT_CLASSIC_ENABLED */
     BTC_PID_NUM,
 } btc_pid_t; //btc profile id
 

diff --git a/components/bt/bluedroid/btc/profile/std/hf_client/btc_hf_client.c b/components/bt/bluedroid/btc/profile/std/hf_client/btc_hf_client.c
index a4fabfecdfc55ebcbea206265e21e778c8571247..3ae296cf0f0aeb2ad2452031d9a08bccefc64a45 100644 (file)
--- a/components/bt/bluedroid/btc/profile/std/hf_client/btc_hf_client.c
+++ b/components/bt/bluedroid/btc/profile/std/hf_client/btc_hf_client.c
@@ -174,7 +174,7 @@ bt_status_t btc_hf_client_init(void)
 
     btc_hf_client_cb.initialized = true;
 
-#if CONFIG_HFP_AUDIO_DATA_PATH_HCI
+#if CONFIG_BT_HFP_AUDIO_DATA_PATH_HCI
     data_path = ESP_SCO_DATA_PATH_HCI;
 #else
     data_path = ESP_SCO_DATA_PATH_PCM;

diff --git a/components/bt/bluedroid/common/include/common/bt_target.h b/components/bt/bluedroid/common/include/common/bt_target.h
index 7f7027fb98b44ab4458a1f182e1fc324ee613a55..98dbe7a16cbfea1a92b32acfd4a456316086b5bb 100644 (file)
--- a/components/bt/bluedroid/common/include/common/bt_target.h
+++ b/components/bt/bluedroid/common/include/common/bt_target.h
@@ -44,7 +44,7 @@
 ** Classic BT features
 **
 ******************************************************************************/
-#if CONFIG_CLASSIC_BT_ENABLED
+#if CONFIG_BT_CLASSIC_ENABLED
 #define CLASSIC_BT_INCLUDED         TRUE
 #define BTC_SM_INCLUDED             TRUE
 #define BTC_PRF_QUEUE_INCLUDED      TRUE
@@ -53,7 +53,7 @@
 #define BTA_DM_PM_INCLUDED          TRUE
 #define SDP_INCLUDED                TRUE
 
-#if CONFIG_A2DP_ENABLE
+#if CONFIG_BT_A2DP_ENABLE
 #define BTA_AR_INCLUDED             TRUE
 #define BTA_AV_INCLUDED             TRUE
 #define AVDT_INCLUDED               TRUE
@@ -66,7 +66,7 @@
 #define SBC_DEC_INCLUDED            TRUE
 #define BTC_AV_SRC_INCLUDED         TRUE
 #define SBC_ENC_INCLUDED            TRUE
-#endif /* CONFIG_A2DP_ENABLE */
+#endif /* CONFIG_BT_A2DP_ENABLE */
 
 #if CONFIG_BT_SPP_ENABLED
 #define RFCOMM_INCLUDED             TRUE
@@ -74,7 +74,7 @@
 #define BTC_SPP_INCLUDED            TRUE
 #endif /* CONFIG_BT_SPP_ENABLED */
 
-#if CONFIG_HFP_CLIENT_ENABLE
+#if CONFIG_BT_HFP_CLIENT_ENABLE
 #define BTC_HF_CLIENT_INCLUDED      TRUE
 #define BTA_HF_INCLUDED             TRUE
 #ifndef RFCOMM_INCLUDED
@@ -92,49 +92,49 @@
 #define BT_SSP_INCLUDED             TRUE
 #endif /* CONFIG_BT_SSP_ENABLED */
 
-#endif /* #if CONFIG_CLASSIC_BT_ENABLED */
+#endif /* #if CONFIG_BT_CLASSIC_ENABLED */
 
 #ifndef CLASSIC_BT_INCLUDED
 #define CLASSIC_BT_INCLUDED         FALSE
 #endif /* CLASSIC_BT_INCLUDED */
 
-#ifndef CONFIG_GATTC_CACHE_NVS_FLASH
-#define CONFIG_GATTC_CACHE_NVS_FLASH         FALSE
-#endif /* CONFIG_GATTC_CACHE_NVS_FLASH */
+#ifndef CONFIG_BT_GATTC_CACHE_NVS_FLASH
+#define CONFIG_BT_GATTC_CACHE_NVS_FLASH         FALSE
+#endif /* CONFIG_BT_GATTC_CACHE_NVS_FLASH */
 
 /******************************************************************************
 **
 ** BLE features
 **
 ******************************************************************************/
-#if (CONFIG_GATTS_ENABLE)
+#if (CONFIG_BT_GATTS_ENABLE)
 #define GATTS_INCLUDED              TRUE
 #else
 #define GATTS_INCLUDED              FALSE
-#endif /* CONFIG_GATTS_ENABLE */
+#endif /* CONFIG_BT_GATTS_ENABLE */
 
-#if (CONFIG_GATTC_ENABLE)
+#if (CONFIG_BT_GATTC_ENABLE)
 #define GATTC_INCLUDED              TRUE
 #else
 #define GATTC_INCLUDED              FALSE
-#endif  /* CONFIG_GATTC_ENABLE */
+#endif  /* CONFIG_BT_GATTC_ENABLE */
 
-#if (CONFIG_GATTC_ENABLE && CONFIG_GATTC_CACHE_NVS_FLASH)
+#if (CONFIG_BT_GATTC_ENABLE && CONFIG_BT_GATTC_CACHE_NVS_FLASH)
 #define GATTC_CACHE_NVS              TRUE
 #else
 #define GATTC_CACHE_NVS              FALSE
-#endif  /* CONFIG_GATTC_CACHE_NVS_FLASH */
+#endif  /* CONFIG_BT_GATTC_CACHE_NVS_FLASH */
 
-#if (CONFIG_SMP_ENABLE)
+#if (CONFIG_BT_SMP_ENABLE)
 #define SMP_INCLUDED              TRUE
 #define BLE_PRIVACY_SPT           TRUE
 #else
 #define SMP_INCLUDED              FALSE
 #define BLE_PRIVACY_SPT           FALSE
-#endif  /* CONFIG_SMP_ENABLE */
+#endif  /* CONFIG_BT_SMP_ENABLE */
 
-#ifdef CONFIG_SMP_SLAVE_CON_PARAMS_UPD_ENABLE
-#if(CONFIG_SMP_SLAVE_CON_PARAMS_UPD_ENABLE)
+#ifdef CONFIG_BT_SMP_SLAVE_CON_PARAMS_UPD_ENABLE
+#if(CONFIG_BT_SMP_SLAVE_CON_PARAMS_UPD_ENABLE)
 #define SMP_SLAVE_CON_PARAMS_UPD_ENABLE  TRUE
 #else
 #define SMP_SLAVE_CON_PARAMS_UPD_ENABLE  FALSE
@@ -143,31 +143,31 @@
 #define SMP_SLAVE_CON_PARAMS_UPD_ENABLE  FALSE
 #endif
 
-#ifndef CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED
+#ifndef CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP
 #define BLE_ADV_REPORT_FLOW_CONTROL  FALSE
 #else
-#define BLE_ADV_REPORT_FLOW_CONTROL  CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED
-#endif /* CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED */
+#define BLE_ADV_REPORT_FLOW_CONTROL  CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP
+#endif /* CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP */
 
-#ifndef CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM
+#ifndef CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM
 #define BLE_ADV_REPORT_FLOW_CONTROL_NUM   100
 #else 
-#define BLE_ADV_REPORT_FLOW_CONTROL_NUM     CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM
-#endif /* CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM */
+#define BLE_ADV_REPORT_FLOW_CONTROL_NUM     CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM
+#endif /* CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM */
 
-#ifndef CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD
+#ifndef CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD
 #define BLE_ADV_REPORT_DISCARD_THRSHOLD  20
 #else 
-#define BLE_ADV_REPORT_DISCARD_THRSHOLD  CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD
-#endif /* CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD */
+#define BLE_ADV_REPORT_DISCARD_THRSHOLD  CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD
+#endif /* CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD */
 
 #if (CONFIG_BT_ACL_CONNECTIONS)
 #define MAX_ACL_CONNECTIONS  CONFIG_BT_ACL_CONNECTIONS
 #define GATT_MAX_PHY_CHANNEL CONFIG_BT_ACL_CONNECTIONS
 #endif  /* CONFIG_BT_ACL_CONNECTIONS */
 
-#if(CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT)
-#define BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT
+#if(CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT)
+#define BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT
 #else
 #define BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT 30
 #endif
@@ -349,22 +349,22 @@
 #define  QUEUE_CONGEST_SIZE    40
 #endif
 
-#ifndef CONFIG_BLE_HOST_QUEUE_CONGESTION_CHECK
+#ifndef CONFIG_BT_BLE_HOST_QUEUE_CONG_CHECK
 #define SCAN_QUEUE_CONGEST_CHECK  FALSE
 #else
-#define SCAN_QUEUE_CONGEST_CHECK  CONFIG_BLE_HOST_QUEUE_CONGESTION_CHECK
+#define SCAN_QUEUE_CONGEST_CHECK  CONFIG_BT_BLE_HOST_QUEUE_CONG_CHECK
 #endif
 
-#ifndef CONFIG_GATTS_SEND_SERVICE_CHANGE_MODE
+#ifndef CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MODE
 #define GATTS_SEND_SERVICE_CHANGE_MODE GATTS_SEND_SERVICE_CHANGE_AUTO
 #else
-#define GATTS_SEND_SERVICE_CHANGE_MODE CONFIG_GATTS_SEND_SERVICE_CHANGE_MODE
+#define GATTS_SEND_SERVICE_CHANGE_MODE CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MODE
 #endif
 
-#ifndef CONFIG_BLE_ACTIVE_SCAN_REPORT_ADV_SCAN_RSP_INDIVIDUALLY
+#ifndef CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN
 #define BTM_BLE_ACTIVE_SCAN_REPORT_ADV_SCAN_RSP_INDIVIDUALLY    FALSE
 #else
-#define BTM_BLE_ACTIVE_SCAN_REPORT_ADV_SCAN_RSP_INDIVIDUALLY    CONFIG_BLE_ACTIVE_SCAN_REPORT_ADV_SCAN_RSP_INDIVIDUALLY
+#define BTM_BLE_ACTIVE_SCAN_REPORT_ADV_SCAN_RSP_INDIVIDUALLY    CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN
 #endif
 
 /* This feature is used to eanble interleaved scan*/
@@ -582,11 +582,11 @@
 
 /* Includes SCO if TRUE */
 #ifndef BTM_SCO_HCI_INCLUDED
-#if CONFIG_HFP_AUDIO_DATA_PATH_HCI
+#if CONFIG_BT_HFP_AUDIO_DATA_PATH_HCI
 #define BTM_SCO_HCI_INCLUDED            TRUE       /* TRUE includes SCO over HCI code */
 #else
 #define BTM_SCO_HCI_INCLUDED            FALSE
-#endif /* CONFIG_HFP_AUDIO_DATA_PATH_HCI */
+#endif /* CONFIG_BT_HFP_AUDIO_DATA_PATH_HCI */
 #endif
 
 /* Includes WBS if TRUE */

diff --git a/components/bt/bluedroid/common/include/common/bt_trace.h b/components/bt/bluedroid/common/include/common/bt_trace.h
index 0cda79f3a3fc2b3277294e0e0eb58f9b500aba5d..7c4f25a51ff61cdfa5a87b17434fee61f6972f4b 100644 (file)
--- a/components/bt/bluedroid/common/include/common/bt_trace.h
+++ b/components/bt/bluedroid/common/include/common/bt_trace.h
@@ -217,26 +217,26 @@ inline void trc_dump_buffer(const char *prefix, uint8_t *data, uint16_t len)
 
 // btla-specific ++
 /* Core Stack default trace levels */
-#ifdef  CONFIG_HCI_INITIAL_TRACE_LEVEL
-#define HCI_INITIAL_TRACE_LEVEL             CONFIG_HCI_INITIAL_TRACE_LEVEL
+#ifdef  CONFIG_BT_LOG_HCI_TRACE_LEVEL
+#define HCI_INITIAL_TRACE_LEVEL             CONFIG_BT_LOG_HCI_TRACE_LEVEL
 #else
 #define HCI_INITIAL_TRACE_LEVEL             BT_TRACE_LEVEL_WARNING
 #endif
 
-#ifdef  CONFIG_BTM_INITIAL_TRACE_LEVEL
-#define BTM_INITIAL_TRACE_LEVEL             CONFIG_BTM_INITIAL_TRACE_LEVEL
+#ifdef  CONFIG_BT_LOG_BTM_TRACE_LEVEL
+#define BTM_INITIAL_TRACE_LEVEL             CONFIG_BT_LOG_BTM_TRACE_LEVEL
 #else
 #define BTM_INITIAL_TRACE_LEVEL             BT_TRACE_LEVEL_WARNING
 #endif
 
-#ifdef  CONFIG_L2CAP_INITIAL_TRACE_LEVEL
-#define L2CAP_INITIAL_TRACE_LEVEL           CONFIG_L2CAP_INITIAL_TRACE_LEVEL
+#ifdef  CONFIG_BT_LOG_L2CAP_TRACE_LEVEL
+#define L2CAP_INITIAL_TRACE_LEVEL           CONFIG_BT_LOG_L2CAP_TRACE_LEVEL
 #else
 #define L2CAP_INITIAL_TRACE_LEVEL           BT_TRACE_LEVEL_WARNING
 #endif
 
-#ifdef  CONFIG_RFCOMM_INITIAL_TRACE_LEVEL
-#define RFCOMM_INITIAL_TRACE_LEVEL          CONFIG_RFCOMM_INITIAL_TRACE_LEVEL
+#ifdef  CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL
+#define RFCOMM_INITIAL_TRACE_LEVEL          CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL
 #else
 #define RFCOMM_INITIAL_TRACE_LEVEL          BT_TRACE_LEVEL_WARNING
 #endif
@@ -247,98 +247,98 @@ inline void trc_dump_buffer(const char *prefix, uint8_t *data, uint16_t len)
 #define SDP_INITIAL_TRACE_LEVEL             BT_TRACE_LEVEL_WARNING
 #endif
 
-#ifdef  CONFIG_GAP_INITIAL_TRACE_LEVEL
-#define GAP_INITIAL_TRACE_LEVEL             CONFIG_GAP_INITIAL_TRACE_LEVEL
+#ifdef  CONFIG_BT_LOG_GAP_TRACE_LEVEL
+#define GAP_INITIAL_TRACE_LEVEL             CONFIG_BT_LOG_GAP_TRACE_LEVEL
 #else
 #define GAP_INITIAL_TRACE_LEVEL             BT_TRACE_LEVEL_WARNING
 #endif
 
-#ifdef  CONFIG_BNEP_INITIAL_TRACE_LEVEL
-#define BNEP_INITIAL_TRACE_LEVEL            CONFIG_BNEP_INITIAL_TRACE_LEVEL
+#ifdef  CONFIG_BT_LOG_BNEP_TRACE_LEVEL
+#define BNEP_INITIAL_TRACE_LEVEL            CONFIG_BT_LOG_BNEP_TRACE_LEVEL
 #else
 #define BNEP_INITIAL_TRACE_LEVEL            BT_TRACE_LEVEL_WARNING
 #endif
 
-#ifdef  CONFIG_PAN_INITIAL_TRACE_LEVEL
-#define PAN_INITIAL_TRACE_LEVEL             CONFIG_PAN_INITIAL_TRACE_LEVEL
+#ifdef  CONFIG_BT_LOG_PAN_TRACE_LEVEL
+#define PAN_INITIAL_TRACE_LEVEL             CONFIG_BT_LOG_PAN_TRACE_LEVEL
 #else
 #define PAN_INITIAL_TRACE_LEVEL             BT_TRACE_LEVEL_WARNING
 #endif
 
-#ifdef  CONFIG_A2D_INITIAL_TRACE_LEVEL
-#define A2D_INITIAL_TRACE_LEVEL             CONFIG_A2D_INITIAL_TRACE_LEVEL
+#ifdef  CONFIG_BT_LOG_A2D_TRACE_LEVEL
+#define A2D_INITIAL_TRACE_LEVEL             CONFIG_BT_LOG_A2D_TRACE_LEVEL
 #else
 #define A2D_INITIAL_TRACE_LEVEL             BT_TRACE_LEVEL_WARNING
 #endif
 
-#ifdef  CONFIG_AVDT_INITIAL_TRACE_LEVEL
-#define AVDT_INITIAL_TRACE_LEVEL            CONFIG_AVDT_INITIAL_TRACE_LEVEL
+#ifdef  CONFIG_BT_LOG_AVDT_TRACE_LEVEL
+#define AVDT_INITIAL_TRACE_LEVEL            CONFIG_BT_LOG_AVDT_TRACE_LEVEL
 #else
 #define AVDT_INITIAL_TRACE_LEVEL            BT_TRACE_LEVEL_WARNING
 #endif
 
-#ifdef  CONFIG_AVCT_INITIAL_TRACE_LEVEL
-#define AVCT_INITIAL_TRACE_LEVEL            CONFIG_AVCT_INITIAL_TRACE_LEVEL
+#ifdef  CONFIG_BT_LOG_AVCT_TRACE_LEVEL
+#define AVCT_INITIAL_TRACE_LEVEL            CONFIG_BT_LOG_AVCT_TRACE_LEVEL
 #else
 #define AVCT_INITIAL_TRACE_LEVEL            BT_TRACE_LEVEL_WARNING
 #endif
 
-#ifdef  CONFIG_AVRC_INITIAL_TRACE_LEVEL
-#define AVRC_INITIAL_TRACE_LEVEL            CONFIG_AVRC_INITIAL_TRACE_LEVEL
+#ifdef  CONFIG_BT_LOG_AVRC_TRACE_LEVEL
+#define AVRC_INITIAL_TRACE_LEVEL            CONFIG_BT_LOG_AVRC_TRACE_LEVEL
 #else
 #define AVRC_INITIAL_TRACE_LEVEL            BT_TRACE_LEVEL_WARNING
 #endif
 
-#ifdef  CONFIG_MCA_INITIAL_TRACE_LEVEL
-#define MCA_INITIAL_TRACE_LEVEL             CONFIG_MCA_INITIAL_TRACE_LEVEL
+#ifdef  CONFIG_BT_LOG_MCA_TRACE_LEVEL
+#define MCA_INITIAL_TRACE_LEVEL             CONFIG_BT_LOG_MCA_TRACE_LEVEL
 #else
 #define MCA_INITIAL_TRACE_LEVEL             BT_TRACE_LEVEL_WARNING
 #endif
 
-#ifdef  CONFIG_HID_INITIAL_TRACE_LEVEL
-#define HID_INITIAL_TRACE_LEVEL             CONFIG_HID_INITIAL_TRACE_LEVEL
+#ifdef  CONFIG_BT_LOG_HID_TRACE_LEVEL
+#define HID_INITIAL_TRACE_LEVEL             CONFIG_BT_LOG_HID_TRACE_LEVEL
 #else
 #define HID_INITIAL_TRACE_LEVEL             BT_TRACE_LEVEL_WARNING
 #endif
 
-#ifdef  CONFIG_APPL_INITIAL_TRACE_LEVEL
-#define APPL_INITIAL_TRACE_LEVEL            CONFIG_APPL_INITIAL_TRACE_LEVEL
+#ifdef  CONFIG_BT_LOG_APPL_TRACE_LEVEL
+#define APPL_INITIAL_TRACE_LEVEL            CONFIG_BT_LOG_APPL_TRACE_LEVEL
 #else
 #define APPL_INITIAL_TRACE_LEVEL            BT_TRACE_LEVEL_WARNING
 #endif
 
-#ifdef  CONFIG_GATT_INITIAL_TRACE_LEVEL
-#define GATT_INITIAL_TRACE_LEVEL            CONFIG_GATT_INITIAL_TRACE_LEVEL
+#ifdef  CONFIG_BT_LOG_GATT_TRACE_LEVEL
+#define GATT_INITIAL_TRACE_LEVEL            CONFIG_BT_LOG_GATT_TRACE_LEVEL
 #else
 #define GATT_INITIAL_TRACE_LEVEL            BT_TRACE_LEVEL_WARNING
 #endif
 
-#ifdef  CONFIG_SMP_INITIAL_TRACE_LEVEL
-#define SMP_INITIAL_TRACE_LEVEL             CONFIG_SMP_INITIAL_TRACE_LEVEL
+#ifdef  CONFIG_BT_LOG_SMP_TRACE_LEVEL
+#define SMP_INITIAL_TRACE_LEVEL             CONFIG_BT_LOG_SMP_TRACE_LEVEL
 #else
 #define SMP_INITIAL_TRACE_LEVEL             BT_TRACE_LEVEL_WARNING
 #endif
 
-#ifdef  CONFIG_BTIF_INITIAL_TRACE_LEVEL
-#define BTIF_INITIAL_TRACE_LEVEL            CONFIG_BTIF_INITIAL_TRACE_LEVEL
+#ifdef  CONFIG_BT_LOG_BTIF_TRACE_LEVEL
+#define BTIF_INITIAL_TRACE_LEVEL            CONFIG_BT_LOG_BTIF_TRACE_LEVEL
 #else
 #define BTIF_INITIAL_TRACE_LEVEL            BT_TRACE_LEVEL_WARNING
 #endif
 
-#ifdef  CONFIG_BTC_INITIAL_TRACE_LEVEL
-#define BTC_INITIAL_TRACE_LEVEL             CONFIG_BTC_INITIAL_TRACE_LEVEL
+#ifdef  CONFIG_BT_LOG_BTC_TRACE_LEVEL
+#define BTC_INITIAL_TRACE_LEVEL             CONFIG_BT_LOG_BTC_TRACE_LEVEL
 #else
 #define BTC_INITIAL_TRACE_LEVEL             BT_TRACE_LEVEL_WARNING
 #endif
 
-#ifdef  CONFIG_OSI_INITIAL_TRACE_LEVEL
-#define OSI_INITIAL_TRACE_LEVEL            CONFIG_OSI_INITIAL_TRACE_LEVEL
+#ifdef  CONFIG_BT_LOG_OSI_TRACE_LEVEL
+#define OSI_INITIAL_TRACE_LEVEL            CONFIG_BT_LOG_OSI_TRACE_LEVEL
 #else
 #define OSI_INITIAL_TRACE_LEVEL            BT_TRACE_LEVEL_WARNING
 #endif
 
-#ifdef  CONFIG_BLUFI_INITIAL_TRACE_LEVEL
-#define BLUFI_INITIAL_TRACE_LEVEL            CONFIG_BLUFI_INITIAL_TRACE_LEVEL
+#ifdef  CONFIG_BT_LOG_BLUFI_TRACE_LEVEL
+#define BLUFI_INITIAL_TRACE_LEVEL            CONFIG_BT_LOG_BLUFI_TRACE_LEVEL
 #else
 #define BLUFI_INITIAL_TRACE_LEVEL            BT_TRACE_LEVEL_WARNING
 #endif

diff --git a/components/bt/bluedroid/osi/allocator.c b/components/bt/bluedroid/osi/allocator.c
index 7a06015e257c17faa89c3f5981e9f09202283f4d..866ccc2e2643103c36501f3a3632d33a20633dda 100644 (file)
--- a/components/bt/bluedroid/osi/allocator.c
+++ b/components/bt/bluedroid/osi/allocator.c
@@ -24,7 +24,7 @@
 extern void *pvPortZalloc(size_t size);
 extern void vPortFree(void *pv);
 
-#ifdef CONFIG_BLUEDROID_MEM_DEBUG
+#ifdef CONFIG_BT_BLUEDROID_MEM_DEBUG
 
 #define OSI_MEM_DBG_INFO_MAX    1024*3
 typedef struct {
@@ -130,7 +130,7 @@ char *osi_strdup(const char *str)
 
 void *osi_malloc_func(size_t size)
 {
-#ifdef CONFIG_BLUEDROID_MEM_DEBUG
+#ifdef CONFIG_BT_BLUEDROID_MEM_DEBUG
     void *p;
 #if CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST
     p = heap_caps_malloc_prefer(size, 2, MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL);
@@ -145,12 +145,12 @@ void *osi_malloc_func(size_t size)
 #else
     return malloc(size);
 #endif /* #if CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST */
-#endif /* #ifdef CONFIG_BLUEDROID_MEM_DEBUG */
+#endif /* #ifdef CONFIG_BT_BLUEDROID_MEM_DEBUG */
 }
 
 void *osi_calloc_func(size_t size)
 {
-#ifdef CONFIG_BLUEDROID_MEM_DEBUG
+#ifdef CONFIG_BT_BLUEDROID_MEM_DEBUG
     void *p;
 #if CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST
     p = heap_caps_calloc_prefer(1, size, 2, MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL);
@@ -165,12 +165,12 @@ void *osi_calloc_func(size_t size)
 #else
     return calloc(1, size);
 #endif /* #if CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST */ 
-#endif /* #ifdef CONFIG_BLUEDROID_MEM_DEBUG */
+#endif /* #ifdef CONFIG_BT_BLUEDROID_MEM_DEBUG */
 }
 
 void osi_free_func(void *ptr)
 {
-#ifdef CONFIG_BLUEDROID_MEM_DEBUG
+#ifdef CONFIG_BT_BLUEDROID_MEM_DEBUG
     osi_mem_dbg_clean(ptr, __func__, __LINE__); 
 #endif
     free(ptr);

diff --git a/components/bt/bluedroid/osi/include/osi/allocator.h b/components/bt/bluedroid/osi/include/osi/allocator.h
index 888d8134642c2ae854fae6adaef92a40dd009680..3be366e76ad25e1199e48674b2174a33bb4df486 100644 (file)
--- a/components/bt/bluedroid/osi/include/osi/allocator.h
+++ b/components/bt/bluedroid/osi/include/osi/allocator.h
@@ -30,7 +30,7 @@ void *osi_malloc_func(size_t size);
 void *osi_calloc_func(size_t size);
 void osi_free_func(void *ptr);
 
-#ifdef CONFIG_BLUEDROID_MEM_DEBUG
+#ifdef CONFIG_BT_BLUEDROID_MEM_DEBUG
 
 void osi_mem_dbg_init(void);
 void osi_mem_dbg_record(void *p, int size, const char *func, int line);
@@ -127,7 +127,7 @@ do {                                                    \
 #endif /* #if CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST */
 #define osi_free(p)                       free((p))
 
-#endif /* CONFIG_BLUEDROID_MEM_DEBUG */
+#endif /* CONFIG_BT_BLUEDROID_MEM_DEBUG */
 
 #define FREE_AND_RESET(a)   \
 do {                        \

diff --git a/components/bt/bluedroid/osi/include/osi/thread.h b/components/bt/bluedroid/osi/include/osi/thread.h
index e3b51ed281426d19f941a6d931b08cdc4838a611..86bb3d21e3033b027bc562a31c2b766a3366d1e0 100644 (file)
--- a/components/bt/bluedroid/osi/include/osi/thread.h
+++ b/components/bt/bluedroid/osi/include/osi/thread.h
@@ -57,7 +57,7 @@ typedef enum {
     SIG_BTU_NUM,
 } SIG_BTU_t;
 
-#define TASK_PINNED_TO_CORE             (CONFIG_BLUEDROID_PINNED_TO_CORE < portNUM_PROCESSORS ? CONFIG_BLUEDROID_PINNED_TO_CORE : tskNO_AFFINITY)
+#define TASK_PINNED_TO_CORE             (CONFIG_BT_BLUEDROID_PINNED_TO_CORE < portNUM_PROCESSORS ? CONFIG_BT_BLUEDROID_PINNED_TO_CORE : tskNO_AFFINITY)
 
 #define HCI_HOST_TASK_PINNED_TO_CORE    (TASK_PINNED_TO_CORE)
 #define HCI_HOST_TASK_STACK_SIZE        (2048 + BT_TASK_EXTRA_STACK_SIZE)
@@ -72,19 +72,19 @@ typedef enum {
 #define HCI_H4_QUEUE_LEN                1
 
 #define BTU_TASK_PINNED_TO_CORE         (TASK_PINNED_TO_CORE)
-#define BTU_TASK_STACK_SIZE             (CONFIG_BTU_TASK_STACK_SIZE + BT_TASK_EXTRA_STACK_SIZE)
+#define BTU_TASK_STACK_SIZE             (CONFIG_BT_BTU_TASK_STACK_SIZE + BT_TASK_EXTRA_STACK_SIZE)
 #define BTU_TASK_PRIO                   (configMAX_PRIORITIES - 5)
 #define BTU_TASK_NAME                   "btuT"
 #define BTU_QUEUE_LEN                   50
 
 #define BTC_TASK_PINNED_TO_CORE         (TASK_PINNED_TO_CORE)
-#define BTC_TASK_STACK_SIZE             (CONFIG_BTC_TASK_STACK_SIZE + BT_TASK_EXTRA_STACK_SIZE)        //by menuconfig
+#define BTC_TASK_STACK_SIZE             (CONFIG_BT_BTC_TASK_STACK_SIZE + BT_TASK_EXTRA_STACK_SIZE)     //by menuconfig
 #define BTC_TASK_NAME                   "btcT"
 #define BTC_TASK_PRIO                   (configMAX_PRIORITIES - 6)
 #define BTC_TASK_QUEUE_LEN              60
 
 #define BTC_A2DP_SINK_TASK_PINNED_TO_CORE     (TASK_PINNED_TO_CORE)
-#define BTC_A2DP_SINK_TASK_STACK_SIZE         (CONFIG_A2DP_SINK_TASK_STACK_SIZE + BT_TASK_EXTRA_STACK_SIZE) // by menuconfig
+#define BTC_A2DP_SINK_TASK_STACK_SIZE         (CONFIG_BT_A2DP_SINK_TASK_STACK_SIZE + BT_TASK_EXTRA_STACK_SIZE) // by menuconfig
 #define BTC_A2DP_SINK_TASK_NAME               "BtA2dSinkT"
 #define BTC_A2DP_SINK_TASK_PRIO               (configMAX_PRIORITIES - 3)
 #define BTC_A2DP_SINK_DATA_QUEUE_LEN          (3)
@@ -92,7 +92,7 @@ typedef enum {
 #define BTC_A2DP_SINK_TASK_QUEUE_SET_LEN      (BTC_A2DP_SINK_DATA_QUEUE_LEN + BTC_A2DP_SINK_CTRL_QUEUE_LEN)
 
 #define BTC_A2DP_SOURCE_TASK_PINNED_TO_CORE   (TASK_PINNED_TO_CORE)
-#define BTC_A2DP_SOURCE_TASK_STACK_SIZE       (CONFIG_A2DP_SOURCE_TASK_STACK_SIZE + BT_TASK_EXTRA_STACK_SIZE) // by menuconfig
+#define BTC_A2DP_SOURCE_TASK_STACK_SIZE       (CONFIG_BT_A2DP_SOURCE_TASK_STACK_SIZE + BT_TASK_EXTRA_STACK_SIZE) // by menuconfig
 #define BTC_A2DP_SOURCE_TASK_NAME             "BtA2dSourceT"
 #define BTC_A2DP_SOURCE_TASK_PRIO             (configMAX_PRIORITIES - 3)
 #define BTC_A2DP_SOURCE_DATA_QUEUE_LEN        (3)

diff --git a/components/bt/bluedroid/stack/btm/include/btm_int.h b/components/bt/bluedroid/stack/btm/include/btm_int.h
index 47ddfd3449b3885b9d1fb5953931ffdb8698e93c..79c3eff72731144d04b3026bccc134035db8d48a 100644 (file)
--- a/components/bt/bluedroid/stack/btm/include/btm_int.h
+++ b/components/bt/bluedroid/stack/btm/include/btm_int.h
@@ -871,7 +871,7 @@ typedef struct {
 #endif  ///SMP_INCLUDED == TRUE
 #if SMP_INCLUDED == TRUE || CLASSIC_BT_INCLUDED == TRUE
     tBTM_SEC_SERV_REC        sec_serv_rec[BTM_SEC_MAX_SERVICE_RECORDS];
-#endif // SMP_INCLUDED == TRUE || CLASSIC_BT_ENABLED == TRUE
+#endif // SMP_INCLUDED == TRUE || BT_CLASSIC_ENABLED == TRUE
     tBTM_SEC_DEV_REC         sec_dev_rec[BTM_SEC_MAX_DEVICE_RECORDS];
     tBTM_SEC_SERV_REC       *p_out_serv;
     tBTM_MKEY_CALLBACK      *mkey_cback;

diff --git a/components/bt/bt.c b/components/bt/bt.c
index c35f42e4ad9efbed5945fae6b7ffff2f81112f01..f35af1c7418edf785435707cc19534390832ad77 100644 (file)
--- a/components/bt/bt.c
+++ b/components/bt/bt.c
@@ -900,15 +900,15 @@ static uint32_t btdm_config_mask_load(void)
 {
     uint32_t mask = 0x0;
 
-#if CONFIG_BTDM_CONTROLLER_HCI_MODE_UART_H4
+#if CONFIG_BTDM_CTRL_HCI_MODE_UART_H4
     mask |= BTDM_CFG_HCI_UART;
 #endif
-#if CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE == 1
+#if CONFIG_BTDM_CTRL_PINNED_TO_CORE == 1
     mask |= BTDM_CFG_CONTROLLER_RUN_APP_CPU;
 #endif
-#if CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED
+#if CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED
     mask |= BTDM_CFG_BLE_FULL_SCAN_SUPPORTED;
-#endif /* CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED */
+#endif /* CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED */
     mask |= BTDM_CFG_SCAN_DUPLICATE_OPTIONS;
 
     mask |= BTDM_CFG_SEND_ADV_RESERVED_SIZE;
@@ -1073,7 +1073,7 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
     }
 
     //overwrite some parameters
-    cfg->bt_max_sync_conn = CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF;
+    cfg->bt_max_sync_conn = CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF;
     cfg->magic  = ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL;
 
     if (((cfg->mode & ESP_BT_MODE_BLE) && (cfg->ble_max_conn <= 0 || cfg->ble_max_conn > BTDM_CONTROLLER_BLE_MAX_CONN_LIMIT))

diff --git a/components/bt/component.mk b/components/bt/component.mk
index eb9b39c02d4bff7128cefdfd412f48823edcd9bb..d04846919cafc40824a3514b8d95e2d8b667c50d 100644 (file)
--- a/components/bt/component.mk
+++ b/components/bt/component.mk
@@ -25,7 +25,7 @@ endif
 endif
 
 
-ifdef CONFIG_BLUEDROID_ENABLED
+ifdef CONFIG_BT_BLUEDROID_ENABLED
 
 COMPONENT_PRIV_INCLUDEDIRS +=   bluedroid/bta/include                   \
                                 bluedroid/bta/ar/include                \

diff --git a/components/bt/include/esp_bt.h b/components/bt/include/esp_bt.h
index b098c133d997ab92aa3259c4128dc1013d82ba10..7a0971b13e3d25a82fa7688b4114591583eab863 100644 (file)
--- a/components/bt/include/esp_bt.h
+++ b/components/bt/include/esp_bt.h
@@ -56,30 +56,30 @@ the adv packet will be discarded until the memory is restored. */
 #define BT_HCI_UART_BAUDRATE_DEFAULT                921600
 #endif /* BT_HCI_UART_BAUDRATE_DEFAULT */
 
-#ifdef CONFIG_SCAN_DUPLICATE_TYPE
-#define SCAN_DUPLICATE_TYPE_VALUE  CONFIG_SCAN_DUPLICATE_TYPE
+#ifdef CONFIG_BTDM_SCAN_DUPL_TYPE
+#define SCAN_DUPLICATE_TYPE_VALUE  CONFIG_BTDM_SCAN_DUPL_TYPE
 #else
 #define SCAN_DUPLICATE_TYPE_VALUE  0
 #endif
 
 /* normal adv cache size */
-#ifdef CONFIG_DUPLICATE_SCAN_CACHE_SIZE
-#define NORMAL_SCAN_DUPLICATE_CACHE_SIZE            CONFIG_DUPLICATE_SCAN_CACHE_SIZE
+#ifdef CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE
+#define NORMAL_SCAN_DUPLICATE_CACHE_SIZE            CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE
 #else
 #define NORMAL_SCAN_DUPLICATE_CACHE_SIZE            20
 #endif
 
-#ifndef CONFIG_BLE_MESH_SCAN_DUPLICATE_EN
-#define CONFIG_BLE_MESH_SCAN_DUPLICATE_EN FALSE
+#ifndef CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN
+#define CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN FALSE
 #endif
 
 #define SCAN_DUPLICATE_MODE_NORMAL_ADV_ONLY         0
 #define SCAN_DUPLICATE_MODE_NORMAL_ADV_MESH_ADV     1
 
-#if CONFIG_BLE_MESH_SCAN_DUPLICATE_EN
+#if CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN
     #define SCAN_DUPLICATE_MODE                     SCAN_DUPLICATE_MODE_NORMAL_ADV_MESH_ADV
-    #ifdef CONFIG_MESH_DUPLICATE_SCAN_CACHE_SIZE
-    #define MESH_DUPLICATE_SCAN_CACHE_SIZE          CONFIG_MESH_DUPLICATE_SCAN_CACHE_SIZE
+    #ifdef CONFIG_BTDM_MESH_DUPL_SCAN_CACHE_SIZE
+    #define MESH_DUPLICATE_SCAN_CACHE_SIZE          CONFIG_BTDM_MESH_DUPL_SCAN_CACHE_SIZE
     #else
     #define MESH_DUPLICATE_SCAN_CACHE_SIZE          50
     #endif
@@ -88,9 +88,9 @@ the adv packet will be discarded until the memory is restored. */
     #define MESH_DUPLICATE_SCAN_CACHE_SIZE          0
 #endif
 
-#if defined(CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY)
+#if defined(CONFIG_BTDM_CTRL_MODE_BLE_ONLY)
 #define BTDM_CONTROLLER_MODE_EFF                    ESP_BT_MODE_BLE
-#elif defined(CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY)
+#elif defined(CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY)
 #define BTDM_CONTROLLER_MODE_EFF                    ESP_BT_MODE_CLASSIC_BT
 #else
 #define BTDM_CONTROLLER_MODE_EFF                    ESP_BT_MODE_BTDM
@@ -112,9 +112,9 @@ the adv packet will be discarded until the memory is restored. */
     .send_adv_reserved_size = SCAN_SEND_ADV_RESERVED_SIZE,                 \
     .controller_debug_flag = CONTROLLER_ADV_LOST_DEBUG_BIT,                \
     .mode = BTDM_CONTROLLER_MODE_EFF,                                      \
-    .ble_max_conn = CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF,               \
-    .bt_max_acl_conn = CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF,     \
-    .bt_max_sync_conn = CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF,   \
+    .ble_max_conn = CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF,               \
+    .bt_max_acl_conn = CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF,     \
+    .bt_max_sync_conn = CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF,   \
     .magic = ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL,                           \
 };
 
@@ -408,7 +408,7 @@ esp_err_t esp_bt_mem_release(esp_bt_mode_t mode);
  * There are currently two options for bluetooth modem sleep, one is ORIG mode, and another is EVED Mode. EVED Mode is intended for BLE only.
  *
  * For ORIG mode:
- * Bluetooth modem sleep is enabled in controller start up by default if CONFIG_BTDM_CONTROLLER_MODEM_SLEEP is set and "ORIG mode" is selected. In ORIG modem sleep mode, bluetooth controller will switch off some components and pause to work every now and then, if there is no event to process; and wakeup according to the scheduled interval and resume the work. It can also wakeup earlier upon external request using function "esp_bt_controller_wakeup_request".
+ * Bluetooth modem sleep is enabled in controller start up by default if CONFIG_BTDM_MODEM_SLEEP is set and "ORIG mode" is selected. In ORIG modem sleep mode, bluetooth controller will switch off some components and pause to work every now and then, if there is no event to process; and wakeup according to the scheduled interval and resume the work. It can also wakeup earlier upon external request using function "esp_bt_controller_wakeup_request".
  *
  * @return
  *                  - ESP_OK : success

diff --git a/components/bt/sdkconfig.rename b/components/bt/sdkconfig.rename
new file mode 100644 (file)
index 0000000..73c2226
--- /dev/null
+++ b/components/bt/sdkconfig.rename
@@ -0,0 +1,227 @@
+# sdkconfig replacement configurations for deprecated options formatted as
+# CONFIG_DEPRECATED_OPTION CONFIG_NEW_OPTION
+
+CONFIG_BTDM_CONTROLLER_MODE                                 CONFIG_BTDM_CTRL_MODE
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY                        CONFIG_BTDM_CTRL_MODE_BLE_ONLY
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY                     CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY
+CONFIG_BTDM_CONTROLLER_MODE_BTDM                            CONFIG_BTDM_CTRL_MODE_BTDM
+CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN                         CONFIG_BTDM_CTRL_BLE_MAX_CONN
+CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN                  CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN
+CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN                 CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN
+CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF                     CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF
+CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF              CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF
+CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF             CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF
+CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_CHOICE                CONFIG_BTDM_CTRL_PINNED_TO_CORE_CHOICE
+CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE                       CONFIG_BTDM_CTRL_PINNED_TO_CORE
+CONFIG_BTDM_CONTROLLER_HCI_MODE_CHOICE                      CONFIG_BTDM_CTRL_HCI_MODE_CHOICE
+CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI                        CONFIG_BTDM_CTRL_HCI_MODE_VHCI
+CONFIG_BTDM_CONTROLLER_HCI_MODE_UART_H4                     CONFIG_BTDM_CTRL_HCI_MODE_UART_H4
+
+CONFIG_BTDM_CONTROLLER_MODEM_SLEEP                          CONFIG_BTDM_MODEM_SLEEP
+
+CONFIG_BLE_SCAN_DUPLICATE                                   CONFIG_BTDM_BLE_SCAN_DUPL
+CONFIG_SCAN_DUPLICATE_TYPE                                  CONFIG_BTDM_SCAN_DUPL_TYPE
+CONFIG_SCAN_DUPLICATE_BY_DEVICE_ADDR                        CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE
+CONFIG_SCAN_DUPLICATE_BY_ADV_DATA                           CONFIG_BTDM_SCAN_DUPL_TYPE_DATA
+CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR           CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE
+CONFIG_DUPLICATE_SCAN_CACHE_SIZE                            CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE
+CONFIG_BLE_MESH_SCAN_DUPLICATE_EN                           CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN
+CONFIG_MESH_DUPLICATE_SCAN_CACHE_SIZE                       CONFIG_BTDM_MESH_DUPL_SCAN_CACHE_SIZE
+CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED                  CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED
+CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED                CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP
+CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM                      CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM
+CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD                      CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD
+
+CONFIG_BLUEDROID_ENABLED                                    CONFIG_BT_BLUEDROID_ENABLED
+CONFIG_BLUEDROID_PINNED_TO_CORE_CHOICE                      CONFIG_BT_BLUEDROID_PINNED_TO_CORE_CHOICE
+CONFIG_BLUEDROID_PINNED_TO_CORE                             CONFIG_BT_BLUEDROID_PINNED_TO_CORE
+CONFIG_BLUEDROID_PINNED_TO_CORE_0                           CONFIG_BT_BLUEDROID_PINNED_TO_CORE_0
+CONFIG_BLUEDROID_PINNED_TO_CORE_1                           CONFIG_BT_BLUEDROID_PINNED_TO_CORE_1
+CONFIG_BTC_TASK_STACK_SIZE                                  CONFIG_BT_BTC_TASK_STACK_SIZE
+CONFIG_BTU_TASK_STACK_SIZE                                  CONFIG_BT_BTU_TASK_STACK_SIZE
+CONFIG_BLUEDROID_MEM_DEBUG                                  CONFIG_BT_BLUEDROID_MEM_DEBUG
+CONFIG_CLASSIC_BT_ENABLED                                   CONFIG_BT_CLASSIC_ENABLED
+CONFIG_A2DP_ENABLE                                          CONFIG_BT_A2DP_ENABLE
+CONFIG_A2DP_SINK_TASK_STACK_SIZE                            CONFIG_BT_A2DP_SINK_TASK_STACK_SIZE
+CONFIG_A2DP_SOURCE_TASK_STACK_SIZE                          CONFIG_BT_A2DP_SOURCE_TASK_STACK_SIZE
+CONFIG_HFP_ENABLE                                           CONFIG_BT_HFP_ENABLE
+CONFIG_HFP_ROLE                                             CONFIG_BT_HFP_ROLE
+CONFIG_HFP_CLIENT_ENABLE                                    CONFIG_BT_HFP_CLIENT_ENABLE
+CONFIG_HFP_AUDIO_DATA_PATH                                  CONFIG_BT_HFP_AUDIO_DATA_PATH
+CONFIG_HFP_AUDIO_DATA_PATH_PCM                              CONFIG_BT_HFP_AUDIO_DATA_PATH_PCM
+CONFIG_HFP_AUDIO_DATA_PATH_HCI                              CONFIG_BT_HFP_AUDIO_DATA_PATH_HCI
+CONFIG_GATTS_ENABLE                                         CONFIG_BT_GATTS_ENABLE
+CONFIG_GATTS_SEND_SERVICE_CHANGE_MODE                       CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MODE
+CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL                     CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL
+CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO                       CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_AUTO
+CONFIG_GATTC_ENABLE                                         CONFIG_BT_GATTC_ENABLE
+CONFIG_GATTC_CACHE_NVS_FLASH                                CONFIG_BT_GATTC_CACHE_NVS_FLASH
+CONFIG_BLE_SMP_ENABLE                                       CONFIG_BT_BLE_SMP_ENABLE
+CONFIG_SMP_SLAVE_CON_PARAMS_UPD_ENABLE                      CONFIG_BT_SMP_SLAVE_CON_PARAMS_UPD_ENABLE
+
+CONFIG_HCI_INITIAL_TRACE_LEVEL                              CONFIG_BT_LOG_HCI_TRACE_LEVEL
+CONFIG_HCI_TRACE_LEVEL_NONE                                 CONFIG_BT_LOG_HCI_TRACE_LEVEL_NONE
+CONFIG_HCI_TRACE_LEVEL_ERROR                                CONFIG_BT_LOG_HCI_TRACE_LEVEL_ERROR
+CONFIG_HCI_TRACE_LEVEL_WARNING                              CONFIG_BT_LOG_HCI_TRACE_LEVEL_WARNING
+CONFIG_HCI_TRACE_LEVEL_API                                  CONFIG_BT_LOG_HCI_TRACE_LEVEL_API
+CONFIG_HCI_TRACE_LEVEL_EVENT                                CONFIG_BT_LOG_HCI_TRACE_LEVEL_EVENT
+CONFIG_HCI_TRACE_LEVEL_DEBUG                                CONFIG_BT_LOG_HCI_TRACE_LEVEL_DEBUG
+CONFIG_HCI_TRACE_LEVEL_VERBOSE                              CONFIG_BT_LOG_HCI_TRACE_LEVEL_VERBOSE
+CONFIG_BTM_INITIAL_TRACE_LEVEL                              CONFIG_BT_LOG_BTM_TRACE_LEVEL
+CONFIG_BTM_TRACE_LEVEL_NONE                                 CONFIG_BT_LOG_BTM_TRACE_LEVEL_NONE
+CONFIG_BTM_TRACE_LEVEL_ERROR                                CONFIG_BT_LOG_BTM_TRACE_LEVEL_ERROR
+CONFIG_BTM_TRACE_LEVEL_WARNING                              CONFIG_BT_LOG_BTM_TRACE_LEVEL_WARNING
+CONFIG_BTM_TRACE_LEVEL_API                                  CONFIG_BT_LOG_BTM_TRACE_LEVEL_API
+CONFIG_BTM_TRACE_LEVEL_EVENT                                CONFIG_BT_LOG_BTM_TRACE_LEVEL_EVENT
+CONFIG_BTM_TRACE_LEVEL_DEBUG                                CONFIG_BT_LOG_BTM_TRACE_LEVEL_DEBUG
+CONFIG_BTM_TRACE_LEVEL_VERBOSE                              CONFIG_BT_LOG_BTM_TRACE_LEVEL_VERBOSE
+CONFIG_L2CAP_INITIAL_TRACE_LEVEL                            CONFIG_BT_LOG_L2CAP_TRACE_LEVEL
+CONFIG_L2CAP_TRACE_LEVEL_NONE                               CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_NONE
+CONFIG_L2CAP_TRACE_LEVEL_ERROR                              CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_ERROR
+CONFIG_L2CAP_TRACE_LEVEL_WARNING                            CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_WARNING
+CONFIG_L2CAP_TRACE_LEVEL_API                                CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_API
+CONFIG_L2CAP_TRACE_LEVEL_EVENT                              CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_EVENT
+CONFIG_L2CAP_TRACE_LEVEL_DEBUG                              CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_DEBUG
+CONFIG_L2CAP_TRACE_LEVEL_VERBOSE                            CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_VERBOSE
+CONFIG_RFCOMM_INITIAL_TRACE_LEVEL                           CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL
+CONFIG_RFCOMM_TRACE_LEVEL_NONE                              CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_NONE
+CONFIG_RFCOMM_TRACE_LEVEL_ERROR                             CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_ERROR
+CONFIG_RFCOMM_TRACE_LEVEL_WARNING                           CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_WARNING
+CONFIG_RFCOMM_TRACE_LEVEL_API                               CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_API
+CONFIG_RFCOMM_TRACE_LEVEL_EVENT                             CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_EVENT
+CONFIG_RFCOMM_TRACE_LEVEL_DEBUG                             CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_DEBUG
+CONFIG_RFCOMM_TRACE_LEVEL_VERBOSE                           CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_VERBOSE
+CONFIG_BTH_LOG_SDP_INITIAL_TRACE_LEVEL                      CONFIG_BT_LOG_SDP_TRACE_LEVEL
+CONFIG_SDP_TRACE_LEVEL_NONE                                 CONFIG_BT_LOG_SDP_TRACE_LEVEL_NONE
+CONFIG_SDP_TRACE_LEVEL_ERROR                                CONFIG_BT_LOG_SDP_TRACE_LEVEL_ERROR
+CONFIG_SDP_TRACE_LEVEL_WARNING                              CONFIG_BT_LOG_SDP_TRACE_LEVEL_WARNING
+CONFIG_SDP_TRACE_LEVEL_API                                  CONFIG_BT_LOG_SDP_TRACE_LEVEL_API
+CONFIG_SDP_TRACE_LEVEL_EVENT                                CONFIG_BT_LOG_SDP_TRACE_LEVEL_EVENT
+CONFIG_SDP_TRACE_LEVEL_DEBUG                                CONFIG_BT_LOG_SDP_TRACE_LEVEL_DEBUG
+CONFIG_SDP_TRACE_LEVEL_VERBOSE                              CONFIG_BT_LOG_SDP_TRACE_LEVEL_VERBOSE
+CONFIG_GAP_INITIAL_TRACE_LEVEL                              CONFIG_BT_LOG_GAP_TRACE_LEVEL
+CONFIG_GAP_TRACE_LEVEL_NONE                                 CONFIG_BT_LOG_GAP_TRACE_LEVEL_NONE
+CONFIG_GAP_TRACE_LEVEL_ERROR                                CONFIG_BT_LOG_GAP_TRACE_LEVEL_ERROR
+CONFIG_GAP_TRACE_LEVEL_WARNING                              CONFIG_BT_LOG_GAP_TRACE_LEVEL_WARNING
+CONFIG_GAP_TRACE_LEVEL_API                                  CONFIG_BT_LOG_GAP_TRACE_LEVEL_API
+CONFIG_GAP_TRACE_LEVEL_EVENT                                CONFIG_BT_LOG_GAP_TRACE_LEVEL_EVENT
+CONFIG_GAP_TRACE_LEVEL_DEBUG                                CONFIG_BT_LOG_GAP_TRACE_LEVEL_DEBUG
+CONFIG_GAP_TRACE_LEVEL_VERBOSE                              CONFIG_BT_LOG_GAP_TRACE_LEVEL_VERBOSE
+CONFIG_BNEP_INITIAL_TRACE_LEVEL                             CONFIG_BT_LOG_BNEP_TRACE_LEVEL
+CONFIG_PAN_INITIAL_TRACE_LEVEL                              CONFIG_BT_LOG_PAN_TRACE_LEVEL
+CONFIG_PAN_TRACE_LEVEL_NONE                                 CONFIG_BT_LOG_PAN_TRACE_LEVEL_NONE
+CONFIG_PAN_TRACE_LEVEL_ERROR                                CONFIG_BT_LOG_PAN_TRACE_LEVEL_ERROR
+CONFIG_PAN_TRACE_LEVEL_WARNING                              CONFIG_BT_LOG_PAN_TRACE_LEVEL_WARNING
+CONFIG_PAN_TRACE_LEVEL_API                                  CONFIG_BT_LOG_PAN_TRACE_LEVEL_API
+CONFIG_PAN_TRACE_LEVEL_EVENT                                CONFIG_BT_LOG_PAN_TRACE_LEVEL_EVENT
+CONFIG_PAN_TRACE_LEVEL_DEBUG                                CONFIG_BT_LOG_PAN_TRACE_LEVEL_DEBUG
+CONFIG_PAN_TRACE_LEVEL_VERBOSE                              CONFIG_BT_LOG_PAN_TRACE_LEVEL_VERBOSE
+CONFIG_A2D_INITIAL_TRACE_LEVEL                              CONFIG_BT_LOG_A2D_TRACE_LEVEL
+CONFIG_A2D_TRACE_LEVEL_NONE                                 CONFIG_BT_LOG_A2D_TRACE_LEVEL_NONE
+CONFIG_A2D_TRACE_LEVEL_ERROR                                CONFIG_BT_LOG_A2D_TRACE_LEVEL_ERROR
+CONFIG_A2D_TRACE_LEVEL_WARNING                              CONFIG_BT_LOG_A2D_TRACE_LEVEL_WARNING
+CONFIG_A2D_TRACE_LEVEL_API                                  CONFIG_BT_LOG_A2D_TRACE_LEVEL_API
+CONFIG_A2D_TRACE_LEVEL_EVENT                                CONFIG_BT_LOG_A2D_TRACE_LEVEL_EVENT
+CONFIG_A2D_TRACE_LEVEL_DEBUG                                CONFIG_BT_LOG_A2D_TRACE_LEVEL_DEBUG
+CONFIG_A2D_TRACE_LEVEL_VERBOSE                              CONFIG_BT_LOG_A2D_TRACE_LEVEL_VERBOSE
+CONFIG_AVDT_INITIAL_TRACE_LEVEL                             CONFIG_BT_LOG_AVDT_TRACE_LEVEL
+CONFIG_AVDT_TRACE_LEVEL_NONE                                CONFIG_BT_LOG_AVDT_TRACE_LEVEL_NONE
+CONFIG_AVDT_TRACE_LEVEL_ERROR                               CONFIG_BT_LOG_AVDT_TRACE_LEVEL_ERROR
+CONFIG_AVDT_TRACE_LEVEL_WARNING                             CONFIG_BT_LOG_AVDT_TRACE_LEVEL_WARNING
+CONFIG_AVDT_TRACE_LEVEL_API                                 CONFIG_BT_LOG_AVDT_TRACE_LEVEL_API
+CONFIG_AVDT_TRACE_LEVEL_EVENT                               CONFIG_BT_LOG_AVDT_TRACE_LEVEL_EVENT
+CONFIG_AVDT_TRACE_LEVEL_DEBUG                               CONFIG_BT_LOG_AVDT_TRACE_LEVEL_DEBUG
+CONFIG_AVDT_TRACE_LEVEL_VERBOSE                             CONFIG_BT_LOG_AVDT_TRACE_LEVEL_VERBOSE
+CONFIG_AVCT_INITIAL_TRACE_LEVEL                             CONFIG_BT_LOG_AVCT_TRACE_LEVEL
+CONFIG_AVCT_TRACE_LEVEL_NONE                                CONFIG_BT_LOG_AVCT_TRACE_LEVEL_NONE
+CONFIG_AVCT_TRACE_LEVEL_ERROR                               CONFIG_BT_LOG_AVCT_TRACE_LEVEL_ERROR
+CONFIG_AVCT_TRACE_LEVEL_WARNING                             CONFIG_BT_LOG_AVCT_TRACE_LEVEL_WARNING
+CONFIG_AVCT_TRACE_LEVEL_API                                 CONFIG_BT_LOG_AVCT_TRACE_LEVEL_API
+CONFIG_AVCT_TRACE_LEVEL_EVENT                               CONFIG_BT_LOG_AVCT_TRACE_LEVEL_EVENT
+CONFIG_AVCT_TRACE_LEVEL_DEBUG                               CONFIG_BT_LOG_AVCT_TRACE_LEVEL_DEBUG
+CONFIG_AVCT_TRACE_LEVEL_VERBOSE                             CONFIG_BT_LOG_AVCT_TRACE_LEVEL_VERBOSE
+CONFIG_AVRC_INITIAL_TRACE_LEVEL                             CONFIG_BT_LOG_AVRC_TRACE_LEVEL
+CONFIG_AVRC_TRACE_LEVEL_NONE                                CONFIG_BT_LOG_AVRC_TRACE_LEVEL_NONE
+CONFIG_AVRC_TRACE_LEVEL_ERROR                               CONFIG_BT_LOG_AVRC_TRACE_LEVEL_ERROR
+CONFIG_AVRC_TRACE_LEVEL_WARNING                             CONFIG_BT_LOG_AVRC_TRACE_LEVEL_WARNING
+CONFIG_AVRC_TRACE_LEVEL_API                                 CONFIG_BT_LOG_AVRC_TRACE_LEVEL_API
+CONFIG_AVRC_TRACE_LEVEL_EVENT                               CONFIG_BT_LOG_AVRC_TRACE_LEVEL_EVENT
+CONFIG_AVRC_TRACE_LEVEL_DEBUG                               CONFIG_BT_LOG_AVRC_TRACE_LEVEL_DEBUG
+CONFIG_AVRC_TRACE_LEVEL_VERBOSE                             CONFIG_BT_LOG_AVRC_TRACE_LEVEL_VERBOSE
+CONFIG_MCA_INITIAL_TRACE_LEVEL                              CONFIG_BT_LOG_MCA_TRACE_LEVEL
+CONFIG_MCA_TRACE_LEVEL_NONE                                 CONFIG_BT_LOG_MCA_TRACE_LEVEL_NONE
+CONFIG_MCA_TRACE_LEVEL_ERROR                                CONFIG_BT_LOG_MCA_TRACE_LEVEL_ERROR
+CONFIG_MCA_TRACE_LEVEL_WARNING                              CONFIG_BT_LOG_MCA_TRACE_LEVEL_WARNING
+CONFIG_MCA_TRACE_LEVEL_API                                  CONFIG_BT_LOG_MCA_TRACE_LEVEL_API
+CONFIG_MCA_TRACE_LEVEL_EVENT                                CONFIG_BT_LOG_MCA_TRACE_LEVEL_EVENT
+CONFIG_MCA_TRACE_LEVEL_DEBUG                                CONFIG_BT_LOG_MCA_TRACE_LEVEL_DEBUG
+CONFIG_MCA_TRACE_LEVEL_VERBOSE                              CONFIG_BT_LOG_MCA_TRACE_LEVEL_VERBOSE
+CONFIG_HID_INITIAL_TRACE_LEVEL                              CONFIG_BT_LOG_HID_TRACE_LEVEL
+CONFIG_HID_TRACE_LEVEL_NONE                                 CONFIG_BT_LOG_HID_TRACE_LEVEL_NONE
+CONFIG_HID_TRACE_LEVEL_ERROR                                CONFIG_BT_LOG_HID_TRACE_LEVEL_ERROR
+CONFIG_HID_TRACE_LEVEL_WARNING                              CONFIG_BT_LOG_HID_TRACE_LEVEL_WARNING
+CONFIG_HID_TRACE_LEVEL_API                                  CONFIG_BT_LOG_HID_TRACE_LEVEL_API
+CONFIG_HID_TRACE_LEVEL_EVENT                                CONFIG_BT_LOG_HID_TRACE_LEVEL_EVENT
+CONFIG_HID_TRACE_LEVEL_DEBUG                                CONFIG_BT_LOG_HID_TRACE_LEVEL_DEBUG
+CONFIG_HID_TRACE_LEVEL_VERBOSE                              CONFIG_BT_LOG_HID_TRACE_LEVEL_VERBOSE
+CONFIG_APPL_INITIAL_TRACE_LEVEL                             CONFIG_BT_LOG_APPL_TRACE_LEVEL
+CONFIG_APPL_TRACE_LEVEL_NONE                                CONFIG_BT_LOG_APPL_TRACE_LEVEL_NONE
+CONFIG_APPL_TRACE_LEVEL_ERROR                               CONFIG_BT_LOG_APPL_TRACE_LEVEL_ERROR
+CONFIG_APPL_TRACE_LEVEL_WARNING                             CONFIG_BT_LOG_APPL_TRACE_LEVEL_WARNING
+CONFIG_APPL_TRACE_LEVEL_API                                 CONFIG_BT_LOG_APPL_TRACE_LEVEL_API
+CONFIG_APPL_TRACE_LEVEL_EVENT                               CONFIG_BT_LOG_APPL_TRACE_LEVEL_EVENT
+CONFIG_APPL_TRACE_LEVEL_DEBUG                               CONFIG_BT_LOG_APPL_TRACE_LEVEL_DEBUG
+CONFIG_APPL_TRACE_LEVEL_VERBOSE                             CONFIG_BT_LOG_APPL_TRACE_LEVEL_VERBOSE
+CONFIG_GATT_INITIAL_TRACE_LEVEL                             CONFIG_BT_LOG_GATT_TRACE_LEVEL
+CONFIG_GATT_TRACE_LEVEL_NONE                                CONFIG_BT_LOG_GATT_TRACE_LEVEL_NONE
+CONFIG_GATT_TRACE_LEVEL_ERROR                               CONFIG_BT_LOG_GATT_TRACE_LEVEL_ERROR
+CONFIG_GATT_TRACE_LEVEL_WARNING                             CONFIG_BT_LOG_GATT_TRACE_LEVEL_WARNING
+CONFIG_GATT_TRACE_LEVEL_API                                 CONFIG_BT_LOG_GATT_TRACE_LEVEL_API
+CONFIG_GATT_TRACE_LEVEL_EVENT                               CONFIG_BT_LOG_GATT_TRACE_LEVEL_EVENT
+CONFIG_GATT_TRACE_LEVEL_DEBUG                               CONFIG_BT_LOG_GATT_TRACE_LEVEL_DEBUG
+CONFIG_GATT_TRACE_LEVEL_VERBOSE                             CONFIG_BT_LOG_GATT_TRACE_LEVEL_VERBOSE
+CONFIG_SMP_INITIAL_TRACE_LEVEL                              CONFIG_BT_LOG_SMP_TRACE_LEVEL
+CONFIG_SMP_TRACE_LEVEL_NONE                                 CONFIG_BT_LOG_SMP_TRACE_LEVEL_NONE
+CONFIG_SMP_TRACE_LEVEL_ERROR                                CONFIG_BT_LOG_SMP_TRACE_LEVEL_ERROR
+CONFIG_SMP_TRACE_LEVEL_WARNING                              CONFIG_BT_LOG_SMP_TRACE_LEVEL_WARNING
+CONFIG_SMP_TRACE_LEVEL_API                                  CONFIG_BT_LOG_SMP_TRACE_LEVEL_API
+CONFIG_SMP_TRACE_LEVEL_EVENT                                CONFIG_BT_LOG_SMP_TRACE_LEVEL_EVENT
+CONFIG_SMP_TRACE_LEVEL_DEBUG                                CONFIG_BT_LOG_SMP_TRACE_LEVEL_DEBUG
+CONFIG_SMP_TRACE_LEVEL_VERBOSE                              CONFIG_BT_LOG_SMP_TRACE_LEVEL_VERBOSE
+CONFIG_BTIF_INITIAL_TRACE_LEVEL                             CONFIG_BT_LOG_BTIF_TRACE_LEVEL
+CONFIG_BTIF_TRACE_LEVEL_NONE                                CONFIG_BT_LOG_BTIF_TRACE_LEVEL_NONE
+CONFIG_BTIF_TRACE_LEVEL_ERROR                               CONFIG_BT_LOG_BTIF_TRACE_LEVEL_ERROR
+CONFIG_BTIF_TRACE_LEVEL_WARNING                             CONFIG_BT_LOG_BTIF_TRACE_LEVEL_WARNING
+CONFIG_BTIF_TRACE_LEVEL_API                                 CONFIG_BT_LOG_BTIF_TRACE_LEVEL_API
+CONFIG_BTIF_TRACE_LEVEL_EVENT                               CONFIG_BT_LOG_BTIF_TRACE_LEVEL_EVENT
+CONFIG_BTIF_TRACE_LEVEL_DEBUG                               CONFIG_BT_LOG_BTIF_TRACE_LEVEL_DEBUG
+CONFIG_BTIF_TRACE_LEVEL_VERBOSE                             CONFIG_BT_LOG_BTIF_TRACE_LEVEL_VERBOSE
+CONFIG_BTC_INITIAL_TRACE_LEVEL                              CONFIG_BT_LOG_BTC_TRACE_LEVEL
+CONFIG_BTC_TRACE_LEVEL_NONE                                 CONFIG_BT_LOG_BTC_TRACE_LEVEL_NONE
+CONFIG_BTC_TRACE_LEVEL_ERROR                                CONFIG_BT_LOG_BTC_TRACE_LEVEL_ERROR
+CONFIG_BTC_TRACE_LEVEL_WARNING                              CONFIG_BT_LOG_BTC_TRACE_LEVEL_WARNING
+CONFIG_BTC_TRACE_LEVEL_API                                  CONFIG_BT_LOG_BTC_TRACE_LEVEL_API
+CONFIG_BTC_TRACE_LEVEL_EVENT                                CONFIG_BT_LOG_BTC_TRACE_LEVEL_EVENT
+CONFIG_BTC_TRACE_LEVEL_DEBUG                                CONFIG_BT_LOG_BTC_TRACE_LEVEL_DEBUG
+CONFIG_BTC_TRACE_LEVEL_VERBOSE                              CONFIG_BT_LOG_BTC_TRACE_LEVEL_VERBOSE
+CONFIG_OSI_INITIAL_TRACE_LEVEL                              CONFIG_BT_LOG_OSI_TRACE_LEVEL
+CONFIG_OSI_TRACE_LEVEL_NONE                                 CONFIG_BT_LOG_OSI_TRACE_LEVEL_NONE
+CONFIG_OSI_TRACE_LEVEL_ERROR                                CONFIG_BT_LOG_OSI_TRACE_LEVEL_ERROR
+CONFIG_OSI_TRACE_LEVEL_WARNING                              CONFIG_BT_LOG_OSI_TRACE_LEVEL_WARNING
+CONFIG_OSI_TRACE_LEVEL_API                                  CONFIG_BT_LOG_OSI_TRACE_LEVEL_API
+CONFIG_OSI_TRACE_LEVEL_EVENT                                CONFIG_BT_LOG_OSI_TRACE_LEVEL_EVENT
+CONFIG_OSI_TRACE_LEVEL_DEBUG                                CONFIG_BT_LOG_OSI_TRACE_LEVEL_DEBUG
+CONFIG_OSI_TRACE_LEVEL_VERBOSE                              CONFIG_BT_LOG_OSI_TRACE_LEVEL_VERBOSE
+CONFIG_BLUFI_INITIAL_TRACE_LEVEL                            CONFIG_BT_LOG_BLUFI_TRACE_LEVEL
+CONFIG_BLUFI_TRACE_LEVEL_NONE                               CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_NONE
+CONFIG_BLUFI_TRACE_LEVEL_ERROR                              CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_ERROR
+CONFIG_BLUFI_TRACE_LEVEL_WARNING                            CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_WARNING
+CONFIG_BLUFI_TRACE_LEVEL_API                                CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_API
+CONFIG_BLUFI_TRACE_LEVEL_EVENT                              CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_EVENT
+CONFIG_BLUFI_TRACE_LEVEL_DEBUG                              CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_DEBUG
+CONFIG_BLUFI_TRACE_LEVEL_VERBOSE                            CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_VERBOSE
+
+CONFIG_BLE_HOST_QUEUE_CONGESTION_CHECK                      CONFIG_BT_BLE_HOST_QUEUE_CONG_CHECK
+CONFIG_SMP_ENABLE                                           CONFIG_BT_SMP_ENABLE
+CONFIG_BLE_ACTIVE_SCAN_REPORT_ADV_SCAN_RSP_INDIVIDUALLY     CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN
+CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT                CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT

diff --git a/components/protocomm/CMakeLists.txt b/components/protocomm/CMakeLists.txt
index ec3a7365ba90bdde4e92fcdc96fa6eb662a455bc..9f9343815fbf62569f182218b13cb74cd047564b 100644 (file)
--- a/components/protocomm/CMakeLists.txt
+++ b/components/protocomm/CMakeLists.txt
@@ -15,7 +15,7 @@ set(COMPONENT_SRCS  "src/common/protocomm.c"
 set(COMPONENT_PRIV_REQUIRES protobuf-c mbedtls console esp_http_server bt)
 
 if(CONFIG_BT_ENABLED)
-    if(CONFIG_BLUEDROID_ENABLED)
+    if(CONFIG_BT_BLUEDROID_ENABLED)
         list(APPEND COMPONENT_SRCS
             "src/simple_ble/simple_ble.c"
             "src/transports/protocomm_ble.c")

diff --git a/components/protocomm/component.mk b/components/protocomm/component.mk
index 3ed61cbc19cb1781523f46cf30ca9d6fb8bfb344..918fed4dedde266687c619dfa918b895b63ab3da 100644 (file)
--- a/components/protocomm/component.mk
+++ b/components/protocomm/component.mk
@@ -2,6 +2,6 @@ COMPONENT_ADD_INCLUDEDIRS := include/common include/security include/transports
 COMPONENT_PRIV_INCLUDEDIRS := proto-c src/common src/simple_ble
 COMPONENT_SRCDIRS := src/common src/security proto-c src/simple_ble src/transports
 
-ifneq ($(filter y, $(CONFIG_BT_ENABLED) $(CONFIG_BLUEDROID_ENABLED)),y y)
+ifneq ($(filter y, $(CONFIG_BT_ENABLED) $(CONFIG_BT_BLUEDROID_ENABLED)),y y)
        COMPONENT_OBJEXCLUDE := src/simple_ble/simple_ble.o src/transports/protocomm_ble.o
 endif

diff --git a/components/protocomm/src/simple_ble/simple_ble.c b/components/protocomm/src/simple_ble/simple_ble.c
index ee5091168b5a66e68d0841da7ff80c42b12e5968..ff57b95950e366e4de1a982ec540f3b00e223586 100644 (file)
--- a/components/protocomm/src/simple_ble/simple_ble.c
+++ b/components/protocomm/src/simple_ble/simple_ble.c
@@ -210,9 +210,9 @@ esp_err_t simple_ble_start(simple_ble_cfg_t *cfg)
         return ret;
     }
 
-#ifdef CONFIG_BTDM_CONTROLLER_MODE_BTDM
+#ifdef CONFIG_BTDM_CTRL_MODE_BTDM
     ret = esp_bt_controller_enable(ESP_BT_MODE_BTDM);
-#elif defined CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY
+#elif defined CONFIG_BTDM_CTRL_MODE_BLE_ONLY
     ret = esp_bt_controller_enable(ESP_BT_MODE_BLE);
 #else
     ESP_LOGE(TAG, "Configuration mismatch. Select BLE Only or BTDM mode from menuconfig");

diff --git a/components/soc/include/soc/soc_memory_layout.h b/components/soc/include/soc/soc_memory_layout.h
index 87454aa5cfa45a503abe646548383d27841b59ab..118f1d3ac821725ca740c05e09917d902247f6c9 100644 (file)
--- a/components/soc/include/soc/soc_memory_layout.h
+++ b/components/soc/include/soc/soc_memory_layout.h
@@ -48,7 +48,7 @@
 
 #define SOC_MEM_BT_EM_PER_SYNC_SIZE         0x870
 
-#define SOC_MEM_BT_EM_BREDR_REAL_END        (SOC_MEM_BT_EM_BREDR_NO_SYNC_END + CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF * SOC_MEM_BT_EM_PER_SYNC_SIZE)
+#define SOC_MEM_BT_EM_BREDR_REAL_END        (SOC_MEM_BT_EM_BREDR_NO_SYNC_END + CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF * SOC_MEM_BT_EM_PER_SYNC_SIZE)
 
 #endif //CONFIG_BT_ENABLED
 

diff --git a/examples/bluetooth/a2dp_gatts_coex/sdkconfig.defaults b/examples/bluetooth/a2dp_gatts_coex/sdkconfig.defaults
index 1a4822bb363a7059d21bebc24a33489c706b441e..9c42997e133a210ec185caf6e52d2761555f9035 100644 (file)
--- a/examples/bluetooth/a2dp_gatts_coex/sdkconfig.defaults
+++ b/examples/bluetooth/a2dp_gatts_coex/sdkconfig.defaults
@@ -1,32 +1,32 @@
 # Override some defaults so BT stack is enabled and
 # Classic BT is enabled and BT_DRAM_RELEASE is disabled
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=y
-CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_0=y
-CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_1=n
-CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0
-CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI=y
-CONFIG_BTDM_CONTROLLER_HCI_MODE_UART_H4=n
-CONFIG_BLUEDROID_ENABLED=y
-CONFIG_BLUEDROID_PINNED_TO_CORE_0=y
-CONFIG_BLUEDROID_PINNED_TO_CORE_1=n
-CONFIG_BLUEDROID_PINNED_TO_CORE=0
-CONFIG_BTC_TASK_STACK_SIZE=3072
-CONFIG_BLUEDROID_MEM_DEBUG=n
-CONFIG_CLASSIC_BT_ENABLED=y
-CONFIG_A2DP_ENABLE=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=y
+CONFIG_BTDM_CTRL_PINNED_TO_CORE_0=y
+CONFIG_BTDM_CTRL_PINNED_TO_CORE_1=n
+CONFIG_BTDM_CTRL_PINNED_TO_CORE=0
+CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y
+CONFIG_BTDM_CTRL_HCI_MODE_UART_H4=n
+CONFIG_BT_BLUEDROID_ENABLED=y
+CONFIG_BT_BLUEDROID_PINNED_TO_CORE_0=y
+CONFIG_BT_BLUEDROID_PINNED_TO_CORE_1=n
+CONFIG_BT_BLUEDROID_PINNED_TO_CORE=0
+CONFIG_BT_BTC_TASK_STACK_SIZE=3072
+CONFIG_BT_BLUEDROID_MEM_DEBUG=n
+CONFIG_BT_CLASSIC_ENABLED=y
+CONFIG_BT_A2DP_ENABLE=y
 CONFIG_A2DP_SINK_ENABLE=y
 CONFIG_A2DP_SRC_ENABLE=n
-CONFIG_A2DP_SINK_TASK_STACK_SIZE=2048
+CONFIG_BT_A2DP_SINK_TASK_STACK_SIZE=2048
 CONFIG_BT_SPP_ENABLED=n
-CONFIG_GATTS_ENABLE=y
-CONFIG_GATTC_ENABLE=n
-CONFIG_BLE_SMP_ENABLE=n
+CONFIG_BT_GATTS_ENABLE=y
+CONFIG_BT_GATTC_ENABLE=n
+CONFIG_BT_BLE_SMP_ENABLE=n
 CONFIG_BLE_ENABLE_SRVCHG_REG=y
 CONFIG_BT_STACK_NO_LOG=n
 CONFIG_BT_ACL_CONNECTIONS=4
 CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST=n
 CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=n
-CONFIG_SMP_ENABLE=y
+CONFIG_BT_SMP_ENABLE=y

diff --git a/examples/bluetooth/a2dp_sink/sdkconfig.defaults b/examples/bluetooth/a2dp_sink/sdkconfig.defaults
index 193dc1c8deb23c3227ae4078a4c66d561e9d46b5..132f512cb21f171cb9fa74e0276e540eb4494da2 100644 (file)
--- a/examples/bluetooth/a2dp_sink/sdkconfig.defaults
+++ b/examples/bluetooth/a2dp_sink/sdkconfig.defaults
@@ -1,13 +1,13 @@
 # Override some defaults so BT stack is enabled and
 # Classic BT is enabled and BT_DRAM_RELEASE is disabled
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
-CONFIG_BLUEDROID_ENABLED=y
-CONFIG_CLASSIC_BT_ENABLED=y
-CONFIG_A2DP_ENABLE=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BTDM=
+CONFIG_BT_BLUEDROID_ENABLED=y
+CONFIG_BT_CLASSIC_ENABLED=y
+CONFIG_BT_A2DP_ENABLE=y
 CONFIG_BT_SPP_ENABLED=n
-CONFIG_GATTS_ENABLE=n
-CONFIG_GATTC_ENABLE=n
-CONFIG_BLE_SMP_ENABLE=n
+CONFIG_BT_GATTS_ENABLE=n
+CONFIG_BT_GATTC_ENABLE=n
+CONFIG_BT_BLE_SMP_ENABLE=n

diff --git a/examples/bluetooth/a2dp_source/sdkconfig.defaults b/examples/bluetooth/a2dp_source/sdkconfig.defaults
index 7741a34288b5230baf172cfcc3859b01fb3339fe..fbee6265001c73d9b309c2d14c218e244e524a7e 100644 (file)
--- a/examples/bluetooth/a2dp_source/sdkconfig.defaults
+++ b/examples/bluetooth/a2dp_source/sdkconfig.defaults
@@ -1,13 +1,13 @@
 # Override some defaults so BT stack is enabled and
 # Classic BT is enabled
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
-CONFIG_BLUEDROID_ENABLED=y
-CONFIG_CLASSIC_BT_ENABLED=y
-CONFIG_A2DP_ENABLE=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BTDM=
+CONFIG_BT_BLUEDROID_ENABLED=y
+CONFIG_BT_CLASSIC_ENABLED=y
+CONFIG_BT_A2DP_ENABLE=y
 CONFIG_BT_SPP_ENABLED=n
-CONFIG_GATTS_ENABLE=n
-CONFIG_GATTC_ENABLE=n
-CONFIG_BLE_SMP_ENABLE=n
+CONFIG_BT_GATTS_ENABLE=n
+CONFIG_BT_GATTC_ENABLE=n
+CONFIG_BT_BLE_SMP_ENABLE=n

diff --git a/examples/bluetooth/ble_adv/sdkconfig.defaults b/examples/bluetooth/ble_adv/sdkconfig.defaults
index c617298b5f3297cfacd47d2b262b95da51c6ac1d..b3e4032220a7abd051a4b4a1ae305723f0cd6cca 100644 (file)
--- a/examples/bluetooth/ble_adv/sdkconfig.defaults
+++ b/examples/bluetooth/ble_adv/sdkconfig.defaults
@@ -5,6 +5,6 @@
 # BT config
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=

diff --git a/examples/bluetooth/ble_eddystone/sdkconfig.defaults b/examples/bluetooth/ble_eddystone/sdkconfig.defaults
index 9ea4208841cf058a7358c149856b2575d2d40caa..f0f9acf9fee092a0361a6eb5defffcbef8265ece 100644 (file)
--- a/examples/bluetooth/ble_eddystone/sdkconfig.defaults
+++ b/examples/bluetooth/ble_eddystone/sdkconfig.defaults
@@ -1,6 +1,6 @@
 # Override some defaults so BT stack is enabled
 # and WiFi disabled by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=

diff --git a/examples/bluetooth/ble_hid_device_demo/sdkconfig.defaults b/examples/bluetooth/ble_hid_device_demo/sdkconfig.defaults
index 50fc4ba9d817c99354eedf4ec038fd3b475bcdf3..8dbe56f4f4a4add11275150247cb8606ba76c6c7 100644 (file)
--- a/examples/bluetooth/ble_hid_device_demo/sdkconfig.defaults
+++ b/examples/bluetooth/ble_hid_device_demo/sdkconfig.defaults
@@ -1,6 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=

diff --git a/examples/bluetooth/ble_ibeacon/sdkconfig.defaults b/examples/bluetooth/ble_ibeacon/sdkconfig.defaults
index 9ea4208841cf058a7358c149856b2575d2d40caa..f0f9acf9fee092a0361a6eb5defffcbef8265ece 100644 (file)
--- a/examples/bluetooth/ble_ibeacon/sdkconfig.defaults
+++ b/examples/bluetooth/ble_ibeacon/sdkconfig.defaults
@@ -1,6 +1,6 @@
 # Override some defaults so BT stack is enabled
 # and WiFi disabled by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=

diff --git a/examples/bluetooth/ble_spp_client/sdkconfig.defaults b/examples/bluetooth/ble_spp_client/sdkconfig.defaults
index 9ea4208841cf058a7358c149856b2575d2d40caa..f0f9acf9fee092a0361a6eb5defffcbef8265ece 100644 (file)
--- a/examples/bluetooth/ble_spp_client/sdkconfig.defaults
+++ b/examples/bluetooth/ble_spp_client/sdkconfig.defaults
@@ -1,6 +1,6 @@
 # Override some defaults so BT stack is enabled
 # and WiFi disabled by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=

diff --git a/examples/bluetooth/ble_spp_server/sdkconfig.defaults b/examples/bluetooth/ble_spp_server/sdkconfig.defaults
index 87546674f8ec7e1f4ed21e06501b0b755b4f2330..ee02dcb06ea9e3873f80cf43cbcf699e3aa27d25 100644 (file)
--- a/examples/bluetooth/ble_spp_server/sdkconfig.defaults
+++ b/examples/bluetooth/ble_spp_server/sdkconfig.defaults
@@ -5,9 +5,9 @@
 # BT config
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=
 #
 # ESP32-specific config
 #

diff --git a/examples/bluetooth/ble_throughput/throughput_client/sdkconfig.defaults b/examples/bluetooth/ble_throughput/throughput_client/sdkconfig.defaults
index 6d5a62b19d6ebe5c316d7ce90cdc064da948d679..fd65ffed2e7ebb138b70b58dc4f9fbc06e060996 100644 (file)
--- a/examples/bluetooth/ble_throughput/throughput_client/sdkconfig.defaults
+++ b/examples/bluetooth/ble_throughput/throughput_client/sdkconfig.defaults
@@ -1,14 +1,14 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
-CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN=9
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=
+CONFIG_BTDM_CTRL_BLE_MAX_CONN=9
 CONFIG_GATTS_NOTIFY_THROUGHPUT=y
-CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
-CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_1=y
-CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=1
+CONFIG_BTDM_MODEM_SLEEP=n
+CONFIG_BTDM_CTRL_PINNED_TO_CORE_1=y
+CONFIG_BTDM_CTRL_PINNED_TO_CORE=1
 #
 # Serial flasher config
 #

diff --git a/examples/bluetooth/ble_throughput/throughput_server/sdkconfig.defaults b/examples/bluetooth/ble_throughput/throughput_server/sdkconfig.defaults
index 6d5a62b19d6ebe5c316d7ce90cdc064da948d679..fd65ffed2e7ebb138b70b58dc4f9fbc06e060996 100644 (file)
--- a/examples/bluetooth/ble_throughput/throughput_server/sdkconfig.defaults
+++ b/examples/bluetooth/ble_throughput/throughput_server/sdkconfig.defaults
@@ -1,14 +1,14 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
-CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN=9
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=
+CONFIG_BTDM_CTRL_BLE_MAX_CONN=9
 CONFIG_GATTS_NOTIFY_THROUGHPUT=y
-CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
-CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_1=y
-CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=1
+CONFIG_BTDM_MODEM_SLEEP=n
+CONFIG_BTDM_CTRL_PINNED_TO_CORE_1=y
+CONFIG_BTDM_CTRL_PINNED_TO_CORE=1
 #
 # Serial flasher config
 #

diff --git a/examples/bluetooth/blufi/sdkconfig.defaults b/examples/bluetooth/blufi/sdkconfig.defaults
index f0f3f8c1a0c887092ae9b8e03355cfdc3f0b97b7..aba8be090e08331a01f878ddb5fea16ce34e5826 100644 (file)
--- a/examples/bluetooth/blufi/sdkconfig.defaults
+++ b/examples/bluetooth/blufi/sdkconfig.defaults
@@ -5,27 +5,27 @@
 # BT config
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
-CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_0=y
-CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_1=n
-CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0
-CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI=y
-CONFIG_BTDM_CONTROLLER_HCI_MODE_UART_H4=n
-CONFIG_BLUEDROID_ENABLED=y
-CONFIG_BLUEDROID_PINNED_TO_CORE_0=y
-CONFIG_BLUEDROID_PINNED_TO_CORE_1=n
-CONFIG_BLUEDROID_PINNED_TO_CORE=0
-CONFIG_BTC_TASK_STACK_SIZE=3072
-CONFIG_BLUEDROID_MEM_DEBUG=n
-CONFIG_CLASSIC_BT_ENABLED=n
-CONFIG_GATTS_ENABLE=y
-CONFIG_GATTC_ENABLE=n
-CONFIG_BLE_SMP_ENABLE=n
-CONFIG_BLE_ENABLE_SRVCHG_REG=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=
+CONFIG_BTDM_CTRL_PINNED_TO_CORE_0=y
+CONFIG_BTDM_CTRL_PINNED_TO_CORE_1=n
+CONFIG_BTDM_CTRL_PINNED_TO_CORE=0
+CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y
+CONFIG_BTDM_CTRL_HCI_MODE_UART_H4=n
+CONFIG_BT_BLUEDROID_ENABLED=y
+CONFIG_BT_BLUEDROID_PINNED_TO_CORE_0=y
+CONFIG_BT_BLUEDROID_PINNED_TO_CORE_1=n
+CONFIG_BT_BLUEDROID_PINNED_TO_CORE=0
+CONFIG_BT_BTC_TASK_STACK_SIZE=3072
+CONFIG_BT_BLUEDROID_MEM_DEBUG=n
+CONFIG_BT_CLASSIC_ENABLED=n
+CONFIG_BT_GATTS_ENABLE=y
+CONFIG_BT_GATTC_ENABLE=n
+CONFIG_BT_BLE_SMP_ENABLE=n
+CONFIG_BL_ENABLE_SRVCHG_REG=y
 CONFIG_BT_STACK_NO_LOG=n
 CONFIG_BT_ACL_CONNECTIONS=4
 CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST=n
 CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=n
-CONFIG_SMP_ENABLE=n
+CONFIG_BT_SMP_ENABLE=n

diff --git a/examples/bluetooth/bt_discovery/sdkconfig.defaults b/examples/bluetooth/bt_discovery/sdkconfig.defaults
index 2c792c747dc8a3481b58d112abd9c8c477ec034d..af5b5d9d66eee08733f63e76dc5a97ca715df46c 100644 (file)
--- a/examples/bluetooth/bt_discovery/sdkconfig.defaults
+++ b/examples/bluetooth/bt_discovery/sdkconfig.defaults
@@ -1,11 +1,11 @@
 # Override some defaults so BT stack is enabled and
 # Classic BT is enabled and BT_DRAM_RELEASE is disabled
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
-CONFIG_CLASSIC_BT_ENABLED=y
-CONFIG_A2DP_ENABLE=n
-CONFIG_GATTS_ENABLE=n
-CONFIG_GATTC_ENABLE=n
-CONFIG_BLE_SMP_ENABLE=n
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BTDM=
+CONFIG_BT_CLASSIC_ENABLED=y
+CONFIG_BT_A2DP_ENABLE=n
+CONFIG_BT_GATTS_ENABLE=n
+CONFIG_BT_GATTC_ENABLE=n
+CONFIG_BT_BLE_SMP_ENABLE=n

diff --git a/examples/bluetooth/bt_spp_acceptor/sdkconfig.defaults b/examples/bluetooth/bt_spp_acceptor/sdkconfig.defaults
index dbd886f79b116aacaf54881fa552f02e16c71029..7320428221361cb4efe5be5bbf24d4fa59917dd1 100644 (file)
--- a/examples/bluetooth/bt_spp_acceptor/sdkconfig.defaults
+++ b/examples/bluetooth/bt_spp_acceptor/sdkconfig.defaults
@@ -1,9 +1,9 @@
 # Override some defaults so BT stack is enabled
 # and WiFi disabled by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
-CONFIG_CLASSIC_BT_ENABLED=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BTDM=
+CONFIG_BT_CLASSIC_ENABLED=y
 CONFIG_WIFI_ENABLED=n
 CONFIG_BT_SPP_ENABLED=y

diff --git a/examples/bluetooth/bt_spp_initiator/sdkconfig.defaults b/examples/bluetooth/bt_spp_initiator/sdkconfig.defaults
index dbd886f79b116aacaf54881fa552f02e16c71029..7320428221361cb4efe5be5bbf24d4fa59917dd1 100644 (file)
--- a/examples/bluetooth/bt_spp_initiator/sdkconfig.defaults
+++ b/examples/bluetooth/bt_spp_initiator/sdkconfig.defaults
@@ -1,9 +1,9 @@
 # Override some defaults so BT stack is enabled
 # and WiFi disabled by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
-CONFIG_CLASSIC_BT_ENABLED=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BTDM=
+CONFIG_BT_CLASSIC_ENABLED=y
 CONFIG_WIFI_ENABLED=n
 CONFIG_BT_SPP_ENABLED=y

diff --git a/examples/bluetooth/bt_spp_vfs_acceptor/sdkconfig.defaults b/examples/bluetooth/bt_spp_vfs_acceptor/sdkconfig.defaults
index dbd886f79b116aacaf54881fa552f02e16c71029..7320428221361cb4efe5be5bbf24d4fa59917dd1 100644 (file)
--- a/examples/bluetooth/bt_spp_vfs_acceptor/sdkconfig.defaults
+++ b/examples/bluetooth/bt_spp_vfs_acceptor/sdkconfig.defaults
@@ -1,9 +1,9 @@
 # Override some defaults so BT stack is enabled
 # and WiFi disabled by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
-CONFIG_CLASSIC_BT_ENABLED=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BTDM=
+CONFIG_BT_CLASSIC_ENABLED=y
 CONFIG_WIFI_ENABLED=n
 CONFIG_BT_SPP_ENABLED=y

diff --git a/examples/bluetooth/bt_spp_vfs_initiator/sdkconfig.defaults b/examples/bluetooth/bt_spp_vfs_initiator/sdkconfig.defaults
index dbd886f79b116aacaf54881fa552f02e16c71029..7320428221361cb4efe5be5bbf24d4fa59917dd1 100644 (file)
--- a/examples/bluetooth/bt_spp_vfs_initiator/sdkconfig.defaults
+++ b/examples/bluetooth/bt_spp_vfs_initiator/sdkconfig.defaults
@@ -1,9 +1,9 @@
 # Override some defaults so BT stack is enabled
 # and WiFi disabled by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
-CONFIG_CLASSIC_BT_ENABLED=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BTDM=
+CONFIG_BT_CLASSIC_ENABLED=y
 CONFIG_WIFI_ENABLED=n
 CONFIG_BT_SPP_ENABLED=y

diff --git a/examples/bluetooth/controller_hci_uart/sdkconfig.defaults b/examples/bluetooth/controller_hci_uart/sdkconfig.defaults
index 51fe6ac9021ff03944b6031f132ff1a11b2ad579..13c28e405dd6eacf89f226b752fdef4c2708ab03 100644 (file)
--- a/examples/bluetooth/controller_hci_uart/sdkconfig.defaults
+++ b/examples/bluetooth/controller_hci_uart/sdkconfig.defaults
@@ -5,13 +5,13 @@
 # BT config
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=y
-CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN=9
-CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN=7
-CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN=3
-CONFIG_BLUEDROID_ENABLED=n
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=y
+CONFIG_BTDM_CTRL_BLE_MAX_CONN=9
+CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN=7
+CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN=3
+CONFIG_BT_BLUEDROID_ENABLED=n
 CONFIG_BT_HCI_UART=y
 CONFIG_BT_HCI_UART_NO_DEFAULT=1
 CONFIG_BT_HCI_UART_BAUDRATE_DEFAULT=921600

diff --git a/examples/bluetooth/gatt_client/sdkconfig.defaults b/examples/bluetooth/gatt_client/sdkconfig.defaults
index 50fc4ba9d817c99354eedf4ec038fd3b475bcdf3..8dbe56f4f4a4add11275150247cb8606ba76c6c7 100644 (file)
--- a/examples/bluetooth/gatt_client/sdkconfig.defaults
+++ b/examples/bluetooth/gatt_client/sdkconfig.defaults
@@ -1,6 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=

diff --git a/examples/bluetooth/gatt_security_client/sdkconfig.defaults b/examples/bluetooth/gatt_security_client/sdkconfig.defaults
index 9ea4208841cf058a7358c149856b2575d2d40caa..f0f9acf9fee092a0361a6eb5defffcbef8265ece 100644 (file)
--- a/examples/bluetooth/gatt_security_client/sdkconfig.defaults
+++ b/examples/bluetooth/gatt_security_client/sdkconfig.defaults
@@ -1,6 +1,6 @@
 # Override some defaults so BT stack is enabled
 # and WiFi disabled by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=

diff --git a/examples/bluetooth/gatt_security_server/sdkconfig.defaults b/examples/bluetooth/gatt_security_server/sdkconfig.defaults
index 50fc4ba9d817c99354eedf4ec038fd3b475bcdf3..8dbe56f4f4a4add11275150247cb8606ba76c6c7 100644 (file)
--- a/examples/bluetooth/gatt_security_server/sdkconfig.defaults
+++ b/examples/bluetooth/gatt_security_server/sdkconfig.defaults
@@ -1,6 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=

diff --git a/examples/bluetooth/gatt_server/sdkconfig.defaults b/examples/bluetooth/gatt_server/sdkconfig.defaults
index 50fc4ba9d817c99354eedf4ec038fd3b475bcdf3..8dbe56f4f4a4add11275150247cb8606ba76c6c7 100644 (file)
--- a/examples/bluetooth/gatt_server/sdkconfig.defaults
+++ b/examples/bluetooth/gatt_server/sdkconfig.defaults
@@ -1,6 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=

diff --git a/examples/bluetooth/gatt_server_service_table/sdkconfig.defaults b/examples/bluetooth/gatt_server_service_table/sdkconfig.defaults
index a24c32100ad7f74a106f464f030a5bc247039263..e8587bbc2b27e2612cc712b9e51b0932e4fb8391 100644 (file)
--- a/examples/bluetooth/gatt_server_service_table/sdkconfig.defaults
+++ b/examples/bluetooth/gatt_server_service_table/sdkconfig.defaults
@@ -5,9 +5,9 @@
 # BT config
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=
 
 #
 # ESP32-specific config

diff --git a/examples/bluetooth/gattc_multi_connect/sdkconfig.defaults b/examples/bluetooth/gattc_multi_connect/sdkconfig.defaults
index 71131252082704eabc8544c617cb917030a38fb3..0f7207aeebd4d7bf6a02876c1b7e93036430cf59 100644 (file)
--- a/examples/bluetooth/gattc_multi_connect/sdkconfig.defaults
+++ b/examples/bluetooth/gattc_multi_connect/sdkconfig.defaults
@@ -1,7 +1,7 @@
 # Override some defaults so BT stack is enabled
 # and WiFi disabled by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
-CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN=9
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=
+CONFIG_BTDM_CTRL_BLE_MAX_CONN=9

diff --git a/examples/provisioning/ble_prov/sdkconfig.defaults b/examples/provisioning/ble_prov/sdkconfig.defaults
index 47e5783140a0ec17c0fb69bb40a1a2667d485b7a..e28cc05069303d755b64dbab6dc778cef3d702d2 100644 (file)
--- a/examples/provisioning/ble_prov/sdkconfig.defaults
+++ b/examples/provisioning/ble_prov/sdkconfig.defaults
@@ -1,8 +1,8 @@
 # Override some defaults so BT stack is enabled and
 CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=
 
 # Binary is larger than default size
 CONFIG_PARTITION_TABLE_CUSTOM=y

diff --git a/tools/ldgen/samples/sdkconfig b/tools/ldgen/samples/sdkconfig
index 9530a7f32185237181b24917e8474fa64bf2060a..c2c1cceed094e96f3ea3b55a7845871d4acf710a 100644 (file)
--- a/tools/ldgen/samples/sdkconfig
+++ b/tools/ldgen/samples/sdkconfig
@@ -118,7 +118,7 @@ CONFIG_AWS_IOT_SDK=
 # Bluetooth
 #
 CONFIG_BT_ENABLED=
-CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0
+CONFIG_BTDM_CTRL_PINNED_TO_CORE=0
 CONFIG_BT_RESERVE_DRAM=0
 
 #

diff --git a/tools/unit-test-app/configs/bt b/tools/unit-test-app/configs/bt
index 9bb4864713159181addebc4515ce0660b5d1a4fd..4eb4677ec8508f2226abc4f49aab7712215e6ef8 100644 (file)
--- a/tools/unit-test-app/configs/bt
+++ b/tools/unit-test-app/configs/bt
@@ -1,4 +1,4 @@
 TEST_COMPONENTS=bt
 TEST_EXCLUDE_COMPONENTS=app_update
 CONFIG_BT_ENABLED=y
-CONFIG_UNITY_FREERTOS_STACK_SIZE=12288
\ No newline at end of file
+CONFIG_UNITY_FREERTOS_STACK_SIZE=12288