espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(bt): Update bt lib for ESP32-C3 and ESP32-S3 (03d0f8a6)

Browse Source 
- Remove unused functions in the controller
This commit is contained in:
zhiweijian
2025-03-15 16:16:53 +08:00
committed by Shen Weilong
parent 53bfeae58a
commit 5548f98339
5 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/bt/controller/esp32c3/Kconfig.in
View File

@ -66,7 +66,7 @@ endchoice
config BT_CTRL_HCI_TL config BT_CTRL_HCI_TL
int int
default 0 if BT_CTRL_HCI_MODE_UART_H4 default 0 if BT_CTRL_HCI_MODE_UART_H4
default 1 if BT_CTRL_HCI_M0DE_VHCI default 1 if BT_CTRL_HCI_MODE_VHCI
default 1 default 1
help help
HCI mode as VHCI or UART(H4) HCI mode as VHCI or UART(H4)
@ -448,7 +448,7 @@ config BT_CTRL_SLEEP_CLOCK_EFF
config BT_CTRL_HCI_TL_EFF config BT_CTRL_HCI_TL_EFF
int int
default 0 if BT_CTRL_HCI_MODE_UART_H4 default 0 if BT_CTRL_HCI_MODE_UART_H4
default 1 if BT_CTRL_HCI_M0DE_VHCI default 1 if BT_CTRL_HCI_MODE_VHCI
default 1 default 1
config BT_CTRL_AGC_RECORRECT_EN config BT_CTRL_AGC_RECORRECT_EN

20
components/bt/controller/esp32c3/bt.c
View File

@ -301,6 +301,12 @@ extern void r_ble_log_async_select_dump_buffers(uint8_t buffers);
extern void r_ble_log_async_output_dump_all(bool output); extern void r_ble_log_async_output_dump_all(bool output);
extern void esp_panic_handler_feed_wdts(void); extern void esp_panic_handler_feed_wdts(void);
#endif // CONFIG_BT_CTRL_LE_LOG_EN #endif // CONFIG_BT_CTRL_LE_LOG_EN
#if (CONFIG_BT_BLUEDROID_ENABLED || CONFIG_BT_NIMBLE_ENABLED)
extern void scan_stack_enableAdvFlowCtrlVsCmd(bool en);
extern void adv_stack_enableClearLegacyAdvVsCmd(bool en);
extern void advFilter_stack_enableDupExcListVsCmd(bool en);
extern void chanSel_stack_enableSetCsaVsCmd(bool en);
#endif // (CONFIG_BT_BLUEDROID_ENABLED || CONFIG_BT_NIMBLE_ENABLED)
extern uint32_t _bt_bss_start; extern uint32_t _bt_bss_start;
extern uint32_t _bt_bss_end; extern uint32_t _bt_bss_end;
@ -1771,6 +1777,13 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
goto error; goto error;
} }
#if (CONFIG_BT_BLUEDROID_ENABLED || CONFIG_BT_NIMBLE_ENABLED)
scan_stack_enableAdvFlowCtrlVsCmd(true);
adv_stack_enableClearLegacyAdvVsCmd(true);
advFilter_stack_enableDupExcListVsCmd(true);
chanSel_stack_enableSetCsaVsCmd(true);
#endif // (CONFIG_BT_BLUEDROID_ENABLED || CONFIG_BT_NIMBLE_ENABLED)
btdm_controller_status = ESP_BT_CONTROLLER_STATUS_INITED; btdm_controller_status = ESP_BT_CONTROLLER_STATUS_INITED;
return ESP_OK; return ESP_OK;
@ -1796,6 +1809,13 @@ esp_err_t esp_bt_controller_deinit(void)
ble_log_spi_out_deinit(); ble_log_spi_out_deinit();
#endif // CONFIG_BT_BLE_LOG_SPI_OUT_ENABLED #endif // CONFIG_BT_BLE_LOG_SPI_OUT_ENABLED
#if (CONFIG_BT_BLUEDROID_ENABLED || CONFIG_BT_NIMBLE_ENABLED)
scan_stack_enableAdvFlowCtrlVsCmd(false);
adv_stack_enableClearLegacyAdvVsCmd(false);
advFilter_stack_enableDupExcListVsCmd(false);
chanSel_stack_enableSetCsaVsCmd(false);
#endif // (CONFIG_BT_BLUEDROID_ENABLED || CONFIG_BT_NIMBLE_ENABLED)
btdm_controller_deinit(); btdm_controller_deinit();
bt_controller_deinit_internal(); bt_controller_deinit_internal();

2
components/bt/controller/lib_esp32c3_family

Submodule components/bt/controller/lib_esp32c3_family updated: b5ead6b6d5...d2414a5dd9

2
examples/bluetooth/hci/controller_hci_uart_esp32/sdkconfig.defaults
View File

@ -17,3 +17,5 @@ CONFIG_BTDM_CTRL_HCI_MODE_UART_H4=y
CONFIG_BTDM_CTRL_HCI_UART_NO=1 CONFIG_BTDM_CTRL_HCI_UART_NO=1
CONFIG_BTDM_CTRL_HCI_UART_BAUDRATE=921600 CONFIG_BTDM_CTRL_HCI_UART_BAUDRATE=921600
CONFIG_BTDM_CTRL_MODEM_SLEEP=n CONFIG_BTDM_CTRL_MODEM_SLEEP=n
CONFIG_BT_CONTROLLER_ONLY=y
CONFIG_BT_CONTROLLER_ENABLED=y

2
examples/bluetooth/hci/controller_hci_uart_esp32c3_and_esp32s3/sdkconfig.defaults
View File

@ -8,4 +8,6 @@ CONFIG_BT_CTRL_HCI_MODE_UART_H4=y
CONFIG_BT_CTRL_HCI_TL=0 CONFIG_BT_CTRL_HCI_TL=0
CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_SUPP=n CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_SUPP=n
CONFIG_BT_CTRL_BLE_SCAN_DUPL=n CONFIG_BT_CTRL_BLE_SCAN_DUPL=n
CONFIG_BT_CONTROLLER_ONLY=y
CONFIG_BT_CONTROLLER_ENABLED=y
# End of deprecated options # End of deprecated options