Rename Kconfig options (components/bt)

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

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
 

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 */
 };
 
 /*****************************************************************************

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
 

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;

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

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

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

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

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)

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;

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

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                \

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

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

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

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

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

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
 

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

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

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

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=

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=

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=

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=

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=

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
 #

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
 #

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
 #

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

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

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

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

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

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

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

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=

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=

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=

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=

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

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

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

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
 
 #

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
+CONFIG_UNITY_FREERTOS_STACK_SIZE=12288