From a760bbc784054f3b493bee70647f53b6a8f1958a Mon Sep 17 00:00:00 2001 From: Zhao Wei Liang Date: Wed, 18 Sep 2024 15:58:02 +0800 Subject: [PATCH 1/4] fix(ble): fixed occasional acl data packet loss issue when using UHCI on ESP32-H2 (cherry picked from commit c929a019318472d0faf80f1b2e9b88066e36b71a) Co-authored-by: zwl --- components/bt/controller/lib_esp32h2/esp32h2-bt-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib index 58a293a2b4..50f567fff5 160000 --- a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib +++ b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib @@ -1 +1 @@ -Subproject commit 58a293a2b4c305157723908ea29c2776f5803bbc +Subproject commit 50f567fff506f63b4d06ebea80d0405fe9e39568 From dbfc55c11193e7eeb9cd878dbb430a55e0f674f7 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liang Date: Wed, 18 Sep 2024 15:58:05 +0800 Subject: [PATCH 2/4] fix(ble): fixed occasional assertion issue when enabling logging on ESP32-C2 (cherry picked from commit 0ef9ecb715f93bd0c4c4785357cabcaa36b31273) Co-authored-by: zwl --- components/bt/controller/lib_esp32c2/esp32c2-bt-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib index e652624750..e5c7ef0bf7 160000 --- a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib +++ b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib @@ -1 +1 @@ -Subproject commit e652624750341aca124e9f850e261b0c1ac63529 +Subproject commit e5c7ef0bf701d02c2203e26081fdd348d45935e5 From 1ae74c4dd44c2430dfdb26dc04cbb82cce95c110 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liang Date: Wed, 18 Sep 2024 15:58:07 +0800 Subject: [PATCH 3/4] fix(ble): fixed memory leak issue when using uart hci (cherry picked from commit 4d2c44f511ee00f6e491790e2bc9fbdc6726dbd6) Co-authored-by: zwl --- components/bt/porting/transport/driver/uart/hci_driver_uart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/porting/transport/driver/uart/hci_driver_uart.c b/components/bt/porting/transport/driver/uart/hci_driver_uart.c index 6ac2a462fa..933a6584ef 100644 --- a/components/bt/porting/transport/driver/uart/hci_driver_uart.c +++ b/components/bt/porting/transport/driver/uart/hci_driver_uart.c @@ -154,7 +154,7 @@ hci_driver_uart_deinit(void) ESP_ERROR_CHECK(uart_driver_delete(s_hci_driver_uart_env.hci_uart_params->hci_uart_port)); - if (!s_hci_driver_uart_env.tx_sem) { + if (s_hci_driver_uart_env.tx_sem) { vSemaphoreDelete(s_hci_driver_uart_env.tx_sem); } From 8650436d6bf6e41acf7ac021416d2326f9b10368 Mon Sep 17 00:00:00 2001 From: zwl Date: Wed, 18 Sep 2024 17:03:37 +0800 Subject: [PATCH 4/4] fix(ble): fixed occasional crash issue in multi-connect scenarios on ESP32-C6 --- components/bt/CMakeLists.txt | 6 +++++- components/bt/controller/lib_esp32c6/esp32c6-bt-lib | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt index a56403fa5d..d9707fc965 100644 --- a/components/bt/CMakeLists.txt +++ b/components/bt/CMakeLists.txt @@ -872,7 +872,11 @@ if(CONFIG_BT_ENABLED) "${CMAKE_CURRENT_LIST_DIR}/controller/lib_esp32c3_family/esp32s3") target_link_libraries(${COMPONENT_LIB} PUBLIC btdm_app) elseif(CONFIG_BT_CONTROLLER_ENABLED) - add_prebuilt_library(libble_app "controller/lib_${target}/${target}-bt-lib/libble_app.a") + if(CONFIG_IDF_TARGET_ESP32C6) + add_prebuilt_library(libble_app "controller/lib_${target}/${target}-bt-lib/esp32c6/libble_app.a") + else() + add_prebuilt_library(libble_app "controller/lib_${target}/${target}-bt-lib/libble_app.a") + endif() target_link_libraries(${COMPONENT_LIB} PRIVATE libble_app) endif() diff --git a/components/bt/controller/lib_esp32c6/esp32c6-bt-lib b/components/bt/controller/lib_esp32c6/esp32c6-bt-lib index f95513f22b..3f15aa1d60 160000 --- a/components/bt/controller/lib_esp32c6/esp32c6-bt-lib +++ b/components/bt/controller/lib_esp32c6/esp32c6-bt-lib @@ -1 +1 @@ -Subproject commit f95513f22be7b21429b01ba05dbfbc98097b5e67 +Subproject commit 3f15aa1d602aedf510dd9c686b3f7e5ea8a44002