From 1e7afa2e2940e4a62c517afb359dad434b94dcf2 Mon Sep 17 00:00:00 2001 From: Zhou Xiao Date: Mon, 15 Sep 2025 15:57:15 +0800 Subject: [PATCH] feat(ble): supported ble log v2 for ESP32 --- components/bt/controller/esp32/bt.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/components/bt/controller/esp32/bt.c b/components/bt/controller/esp32/bt.c index a88fca9c72..9243426b97 100644 --- a/components/bt/controller/esp32/bt.c +++ b/components/bt/controller/esp32/bt.c @@ -48,9 +48,13 @@ #include "esp_rom_sys.h" #include "hli_api.h" +#if CONFIG_BLE_LOG_ENABLED +#include "ble_log.h" +#else /* !CONFIG_BLE_LOG_ENABLED */ #if CONFIG_BT_BLE_LOG_SPI_OUT_ENABLED #include "ble_log/ble_log_spi_out.h" #endif // CONFIG_BT_BLE_LOG_SPI_OUT_ENABLED +#endif /* CONFIG_BLE_LOG_ENABLED */ #if CONFIG_BT_ENABLED @@ -1702,6 +1706,13 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg) coex_init(); #endif +#if CONFIG_BLE_LOG_ENABLED + if (!ble_log_init()) { + ESP_LOGE(BTDM_LOG_TAG, "BLE Log v2 init failed"); + err = ESP_ERR_NO_MEM; + goto error; + } +#else /* !CONFIG_BLE_LOG_ENABLED */ #if CONFIG_BT_BLE_LOG_SPI_OUT_ENABLED if (ble_log_spi_out_init() != 0) { ESP_LOGE(BTDM_LOG_TAG, "BLE Log SPI output init failed"); @@ -1709,6 +1720,7 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg) goto error; } #endif // CONFIG_BT_BLE_LOG_SPI_OUT_ENABLED +#endif /* CONFIG_BLE_LOG_ENABLED */ btdm_cfg_mask = btdm_config_mask_load(); @@ -1737,9 +1749,13 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg) error: +#if CONFIG_BLE_LOG_ENABLED + ble_log_deinit(); +#else /* !CONFIG_BLE_LOG_ENABLED */ #if CONFIG_BT_BLE_LOG_SPI_OUT_ENABLED ble_log_spi_out_deinit(); #endif // CONFIG_BT_BLE_LOG_SPI_OUT_ENABLED +#endif /* CONFIG_BLE_LOG_ENABLED */ bt_controller_deinit_internal(); @@ -1752,9 +1768,13 @@ esp_err_t esp_bt_controller_deinit(void) return ESP_ERR_INVALID_STATE; } +#if CONFIG_BLE_LOG_ENABLED + ble_log_deinit(); +#else /* !CONFIG_BLE_LOG_ENABLED */ #if CONFIG_BT_BLE_LOG_SPI_OUT_ENABLED ble_log_spi_out_deinit(); #endif // CONFIG_BT_BLE_LOG_SPI_OUT_ENABLED +#endif /* CONFIG_BLE_LOG_ENABLED */ btdm_controller_deinit();