diff --git a/components/bt/controller/esp32c3/Kconfig.in b/components/bt/controller/esp32c3/Kconfig.in index 7ceed951f9..0363a98034 100644 --- a/components/bt/controller/esp32c3/Kconfig.in +++ b/components/bt/controller/esp32c3/Kconfig.in @@ -83,13 +83,16 @@ choice BT_BLE_CCA_MODE default BT_BLE_CCA_MODE_NONE help Define BT BLE CCA mode + Note that if CCA feature is enabled, the hardware may not transmit packets due to channel busy. + Therefore, it may potentially lead to an increase in the time taken for scanning advertising packet + and establishing connections, or a decrease in the throughput rate of the connection. config BT_BLE_CCA_MODE_NONE bool "NONE" config BT_BLE_CCA_MODE_HW bool "Hardware" config BT_BLE_CCA_MODE_SW - bool "Software" + bool "Software (experimental)" endchoice config BT_BLE_CCA_MODE diff --git a/components/bt/controller/lib_esp32c3_family b/components/bt/controller/lib_esp32c3_family index 2ce747aec8..0cfafa1e0a 160000 --- a/components/bt/controller/lib_esp32c3_family +++ b/components/bt/controller/lib_esp32c3_family @@ -1 +1 @@ -Subproject commit 2ce747aec8008d008fe34fa375a2aea3e7e48e9a +Subproject commit 0cfafa1e0aa30b7d59f53c38588f0598e228d127 diff --git a/components/bt/include/esp32c3/include/esp_bt.h b/components/bt/include/esp32c3/include/esp_bt.h index d6aa093a2b..cc21bcab8b 100644 --- a/components/bt/include/esp32c3/include/esp_bt.h +++ b/components/bt/include/esp32c3/include/esp_bt.h @@ -491,7 +491,7 @@ typedef struct { uint8_t ble_cca_mode; /*!< BLE CCA mode. Configurable in menuconfig - 0 - Disable (default) - 1 - Hardware-triggered CCA - - 2 - Software-based CCA */ + - 2 - Software-based CCA (experimental) */ uint8_t ble_data_lenth_zero_aux; /*!< Enable / disable auxiliary packets when the extended ADV data length is zero. Configurable in menuconfig. - 0 - Disable (default) - 1 - Enable */ diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.bt_funcs.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.bt_funcs.ld index 3604d3235f..580217eb5b 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.bt_funcs.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.bt_funcs.ld @@ -421,7 +421,7 @@ r_llc_ll_reject_ind_pdu_send = 0x40000f3c; r_llc_ll_start_enc_rsp_ack_handler = 0x40000f40; r_llc_ll_terminate_ind_ack = 0x40000f44; r_llc_ll_unknown_ind_handler = 0x40000f48; -r_llc_llcp_send = 0x40000f4c; +/* r_llc_llcp_send = 0x40000f4c; */ r_llc_llcp_state_set = 0x40000f50; r_llc_llcp_trans_timer_set = 0x40000f54; r_llc_llcp_tx_check = 0x40000f58; @@ -506,7 +506,7 @@ r_lld_con_data_len_update = 0x400010a0; r_lld_con_data_tx = 0x400010a4; r_lld_con_enc_key_load = 0x400010a8; r_lld_con_event_counter_get = 0x400010ac; -r_lld_con_evt_canceled_cbk = 0x400010b0; +/* r_lld_con_evt_canceled_cbk = 0x400010b0; */ r_lld_con_evt_duration_min_get = 0x400010b4; r_lld_con_evt_max_eff_time_cal = 0x400010b8; r_lld_con_evt_sd_evt_time_get = 0x400010bc; diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.bt_funcs.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.bt_funcs.ld index 4db94d9779..946f9c2088 100644 --- a/components/esp_rom/esp32s3/ld/esp32s3.rom.bt_funcs.ld +++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.bt_funcs.ld @@ -421,7 +421,7 @@ r_llc_ll_reject_ind_pdu_send = 0x40003d98; r_llc_ll_start_enc_rsp_ack_handler = 0x40003da4; r_llc_ll_terminate_ind_ack = 0x40003db0; r_llc_ll_unknown_ind_handler = 0x40003dbc; -r_llc_llcp_send = 0x40003dc8; +/* r_llc_llcp_send = 0x40003dc8; */ r_llc_llcp_state_set = 0x40003dd4; r_llc_llcp_trans_timer_set = 0x40003de0; r_llc_llcp_tx_check = 0x40003dec; @@ -507,7 +507,7 @@ r_lld_con_data_len_update = 0x400041c4; r_lld_con_data_tx = 0x400041d0; r_lld_con_enc_key_load = 0x400041dc; r_lld_con_event_counter_get = 0x400041e8; -r_lld_con_evt_canceled_cbk = 0x400041f4; +/* r_lld_con_evt_canceled_cbk = 0x400041f4; */ r_lld_con_evt_duration_min_get = 0x40004200; r_lld_con_evt_max_eff_time_cal = 0x4000420c; r_lld_con_evt_sd_evt_time_get = 0x40004218;