Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport/ble_log_host_init_v6.0' into 'release/v6.0'

Browse Source 
fix(bt): initialize BLE Log in host-only mode (v6.0)

See merge request espressif/esp-idf!53030
This commit is contained in:
Island
2026-09-23 11:45:49 +08:00
parent 776dd21304 f4ec0e19b6
commit 7083227751
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bt/common/ble_log/src/ble_log_lbm.c
+4 -4
View File
@@ -13,9 +13,9 @@
#include "ble_log_rt.h" #include "ble_log_rt.h"
#include "esp_log.h" #include "esp_log.h"
#if CONFIG_SOC_ESP_NIMBLE_CONTROLLER #if CONFIG_BLE_LOG_LL_ENABLED && CONFIG_SOC_ESP_NIMBLE_CONTROLLER
#include "os/os_mbuf.h" #include "os/os_mbuf.h"
#endif /* CONFIG_SOC_ESP_NIMBLE_CONTROLLER */ #endif /* CONFIG_BLE_LOG_LL_ENABLED && CONFIG_SOC_ESP_NIMBLE_CONTROLLER */
/* VARIABLE */ /* VARIABLE */
#define TAG "ble_log" #define TAG "ble_log"
@@ -200,13 +200,13 @@ void ble_log_lbm_write_trans(ble_log_prph_trans_t **trans, ble_log_src_t src_cod
BLE_LOG_MEMCPY(buf + BLE_LOG_FRAME_HEAD_LEN, addr, len); BLE_LOG_MEMCPY(buf + BLE_LOG_FRAME_HEAD_LEN, addr, len);
} }
if (len_append) { if (len_append) {
#if CONFIG_SOC_ESP_NIMBLE_CONTROLLER #if CONFIG_BLE_LOG_LL_ENABLED && CONFIG_SOC_ESP_NIMBLE_CONTROLLER
if (omdata) { if (omdata) {
os_mbuf_copydata((struct os_mbuf *)addr_append, 0, os_mbuf_copydata((struct os_mbuf *)addr_append, 0,
len_append, buf + BLE_LOG_FRAME_HEAD_LEN + len); len_append, buf + BLE_LOG_FRAME_HEAD_LEN + len);
} }
else else
#endif /* CONFIG_SOC_ESP_NIMBLE_CONTROLLER */ #endif /* CONFIG_BLE_LOG_LL_ENABLED && CONFIG_SOC_ESP_NIMBLE_CONTROLLER */
{ {
BLE_LOG_MEMCPY(buf + BLE_LOG_FRAME_HEAD_LEN + len, addr_append, len_append); BLE_LOG_MEMCPY(buf + BLE_LOG_FRAME_HEAD_LEN + len, addr_append, len_append);
} }
components/bt/host/bluedroid/api/esp_bt_main.c
+13
View File
@@ -19,6 +19,9 @@
#include "bt_common.h" #include "bt_common.h"
#include "bt_osal.h" #include "bt_osal.h"
#include "bt_prf_task.h" #include "bt_prf_task.h"
#if CONFIG_BLE_LOG_ENABLED && !CONFIG_BT_CONTROLLER_ENABLED
#include "ble_log.h"
#endif
static esp_bluedroid_status_t s_bt_host_state = ESP_BLUEDROID_STATUS_UNINITIALIZED; static esp_bluedroid_status_t s_bt_host_state = ESP_BLUEDROID_STATUS_UNINITIALIZED;
@@ -246,6 +249,12 @@ esp_err_t esp_bluedroid_init_with_cfg(esp_bluedroid_config_t *cfg)
} }
#endif #endif
#if CONFIG_BLE_LOG_ENABLED && !CONFIG_BT_CONTROLLER_ENABLED
if (!ble_log_init()) {
LOG_WARN("BLE Log init failed");
}
#endif
s_bt_host_state = ESP_BLUEDROID_STATUS_INITIALIZED; s_bt_host_state = ESP_BLUEDROID_STATUS_INITIALIZED;
return ESP_OK; return ESP_OK;
@@ -274,6 +283,10 @@ esp_err_t esp_bluedroid_deinit(void)
return ESP_ERR_NO_MEM; return ESP_ERR_NO_MEM;
} }
#if CONFIG_BLE_LOG_ENABLED && !CONFIG_BT_CONTROLLER_ENABLED
ble_log_deinit();
#endif
msg.sig = BTC_SIG_API_CALL; msg.sig = BTC_SIG_API_CALL;
msg.pid = BTC_PID_MAIN_INIT; msg.pid = BTC_PID_MAIN_INIT;
msg.act = BTC_MAIN_ACT_DEINIT; msg.act = BTC_MAIN_ACT_DEINIT;
components/bt/host/nimble/nimble
+1 -1
Submodule components/bt/host/nimble/nimble updated: 2a74e09fab...b6e2f93db2