Skip to content

Commit b452748

Browse files
wmy-espressifwmy-espressif
committed
Merge branch 'change/ble_update_lib_20250516' into 'master'
change(ble): [AUTO_MR] 20250516 - Update ESP BLE Controller Lib Closes BLERP-1833, BLERP-1838, BLERP-1753, BLERP-1708, BLERP-1849, BLERP-1821, BLERP-1840, BLERP-1778, BLERP-1865, BLERP-1879, BLERP-1880, BLERP-1881, BLERP-1866, BLERP-1882, BLERP-1883, BLERP-1887, BLERP-1889, BLERP-1890, and BLERP-1892 See merge request espressif/esp-idf!39200
2 parents 1637e27 + d12e072 commit b452748

File tree

17 files changed

+162
-56
lines changed

17 files changed

+162
-56
lines changed

‎components/bt/controller/esp32c2/bt.c‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@ struct ext_funcs_t {
119119

120120
#if CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
121121
typedef void (*interface_func_t) (uint32_t len, const uint8_t *addr, uint32_t len_append, const uint8_t *addr_append, uint32_t flag);
122+
123+
enum {
124+
BLE_LOG_INTERFACE_FLAG_CONTINUE = 0,
125+
BLE_LOG_INTERFACE_FLAG_END,
126+
};
122127
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
123128

124129
/* External functions or variables
@@ -411,20 +416,22 @@ void esp_bt_read_ctrl_log_from_flash(bool output)
411416
#if !CONFIG_BT_LE_CONTROLLER_LOG_SPI_OUT_ENABLED
412417
static void esp_bt_controller_log_interface(uint32_t len, const uint8_t *addr, uint32_t len_append, const uint8_t *addr_append, uint32_t flag)
413418
{
414-
bool end = flag ? true : false;
419+
bool end = (flag & BIT(BLE_LOG_INTERFACE_FLAG_END));
415420
#if CONFIG_BT_LE_CONTROLLER_LOG_STORAGE_ENABLE
416421
esp_bt_controller_log_storage(len, addr, end);
417422
#else // !CONFIG_BT_LE_CONTROLLER_LOG_STORAGE_ENABLE
418423
portMUX_TYPE spinlock = portMUX_INITIALIZER_UNLOCKED;
419424
portENTER_CRITICAL_SAFE(&spinlock);
420425
esp_panic_handler_feed_wdts();
421-
for (int i = 0; i < len; i++) {
422-
esp_rom_printf("%02x ", addr[i]);
423-
}
424426

425-
if (end) {
426-
esp_rom_printf("\n");
427+
if (len && addr) {
428+
for (int i = 0; i < len; i++) { esp_rom_printf("%02x ", addr[i]); }
427429
}
430+
if (len_append && addr_append) {
431+
for (int i = 0; i < len_append; i++) { esp_rom_printf("%02x ", addr_append[i]); }
432+
}
433+
if (end) { esp_rom_printf("\n"); }
434+
428435
portEXIT_CRITICAL_SAFE(&spinlock);
429436
#endif // CONFIG_BT_LE_CONTROLLER_LOG_STORAGE_ENABLE
430437
}

‎components/bt/controller/esp32c5/Kconfig.in‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -805,3 +805,10 @@ config BT_LE_CTRL_ADV_DATA_LENGTH_ZERO_AUX
805805
config BT_LE_RXBUF_OPT_ENABLED
806806
bool "Enable rxbuf optimization feature"
807807
default y
808+
809+
config BT_LE_CTRL_FAST_CONN_DATA_TX_EN
810+
bool "Enable fast sending of connection data"
811+
default y
812+
help
813+
If this option is enabled, The Controller will continue to
814+
Send an empty PDU after sending valid connection data within an interval.

‎components/bt/controller/esp32c5/bt.c‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
#define OSI_COEX_VERSION 0x00010006
6868
#define OSI_COEX_MAGIC_VALUE 0xFADEBEAD
6969

70-
#define EXT_FUNC_VERSION 0x20240422
70+
#define EXT_FUNC_VERSION 0x20250415
7171
#define EXT_FUNC_MAGIC_VALUE 0xA5A5A5A5
7272

7373
#define BT_ASSERT_PRINT ets_printf
@@ -98,14 +98,17 @@ struct ext_funcs_t {
9898
int (* _ecc_gen_key_pair)(uint8_t *public, uint8_t *priv);
9999
int (* _ecc_gen_dh_key)(const uint8_t *remote_pub_key_x, const uint8_t *remote_pub_key_y,
100100
const uint8_t *local_priv_key, uint8_t *dhkey);
101-
void (* _esp_reset_rpa_moudle)(void);
102101
uint32_t magic;
103102
};
104103

105104
#if CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
106105
typedef void (*interface_func_t) (uint32_t len, const uint8_t *addr, uint32_t len_append, const uint8_t *addr_append, uint32_t flag);
107-
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
108106

107+
enum {
108+
BLE_LOG_INTERFACE_FLAG_CONTINUE = 0,
109+
BLE_LOG_INTERFACE_FLAG_END,
110+
};
111+
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
109112
/* External functions or variables
110113
************************************************************************
111114
*/
@@ -182,7 +185,6 @@ static int esp_intr_alloc_wrapper(int source, int flags, intr_handler_t handler,
182185
static int esp_intr_free_wrapper(void **ret_handle);
183186
static void osi_assert_wrapper(const uint32_t ln, const char *fn, uint32_t param1, uint32_t param2);
184187
static uint32_t osi_random_wrapper(void);
185-
static void esp_reset_rpa_moudle(void);
186188
static int esp_ecc_gen_key_pair(uint8_t *pub, uint8_t *priv);
187189
static int esp_ecc_gen_dh_key(const uint8_t *peer_pub_key_x, const uint8_t *peer_pub_key_y,
188190
const uint8_t *our_priv_key, uint8_t *out_dhkey);
@@ -459,15 +461,9 @@ struct ext_funcs_t ext_funcs_ro = {
459461
._os_random = osi_random_wrapper,
460462
._ecc_gen_key_pair = esp_ecc_gen_key_pair,
461463
._ecc_gen_dh_key = esp_ecc_gen_dh_key,
462-
._esp_reset_rpa_moudle = esp_reset_rpa_moudle,
463464
.magic = EXT_FUNC_MAGIC_VALUE,
464465
};
465466

466-
static void IRAM_ATTR esp_reset_rpa_moudle(void)
467-
{
468-
469-
}
470-
471467
static void IRAM_ATTR osi_assert_wrapper(const uint32_t ln, const char *fn,
472468
uint32_t param1, uint32_t param2)
473469
{
@@ -1419,20 +1415,22 @@ esp_power_level_t esp_ble_tx_power_get_enhanced(esp_ble_enhanced_power_type_t po
14191415
#if !CONFIG_BT_LE_CONTROLLER_LOG_SPI_OUT_ENABLED
14201416
static void esp_bt_controller_log_interface(uint32_t len, const uint8_t *addr, uint32_t len_append, const uint8_t *addr_append, uint32_t flag)
14211417
{
1422-
bool end = flag ? true : false;
1418+
bool end = (flag & BIT(BLE_LOG_INTERFACE_FLAG_END));
14231419
#if CONFIG_BT_LE_CONTROLLER_LOG_STORAGE_ENABLE
14241420
esp_bt_controller_log_storage(len, addr, end);
14251421
#else // !CONFIG_BT_LE_CONTROLLER_LOG_STORAGE_ENABLE
14261422
portMUX_TYPE spinlock = portMUX_INITIALIZER_UNLOCKED;
14271423
portENTER_CRITICAL_SAFE(&spinlock);
14281424
esp_panic_handler_feed_wdts();
1429-
for (int i = 0; i < len; i++) {
1430-
esp_rom_printf("%02x ", addr[i]);
1431-
}
14321425

1433-
if (end) {
1434-
esp_rom_printf("\n");
1426+
if (len && addr) {
1427+
for (int i = 0; i < len; i++) { esp_rom_printf("%02x ", addr[i]); }
14351428
}
1429+
if (len_append && addr_append) {
1430+
for (int i = 0; i < len_append; i++) { esp_rom_printf("%02x ", addr_append[i]); }
1431+
}
1432+
if (end) { esp_rom_printf("\n"); }
1433+
14361434
portEXIT_CRITICAL_SAFE(&spinlock);
14371435
#endif // CONFIG_BT_LE_CONTROLLER_LOG_STORAGE_ENABLE
14381436
}

‎components/bt/controller/esp32c5/esp_bt_cfg.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,12 @@ extern "C" {
192192
#define DEFAULT_BT_LE_CTRL_ADV_DATA_LENGTH_ZERO_AUX (0)
193193
#endif
194194

195+
#if defined(CONFIG_BT_LE_CTRL_FAST_CONN_DATA_TX_EN)
196+
#define DEFAULT_BT_LE_CTRL_FAST_CONN_DATA_TX_EN (CONFIG_BT_LE_CTRL_FAST_CONN_DATA_TX_EN)
197+
#else
198+
#define DEFAULT_BT_LE_CTRL_FAST_CONN_DATA_TX_EN (0)
199+
#endif
200+
195201
#ifdef CONFIG_BT_LE_HCI_INTERFACE_USE_UART
196202
#define HCI_UART_EN CONFIG_BT_LE_HCI_INTERFACE_USE_UART
197203
#else

‎components/bt/controller/esp32c6/Kconfig.in‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -839,3 +839,10 @@ config BT_LE_CTRL_ADV_DATA_LENGTH_ZERO_AUX
839839
config BT_LE_RXBUF_OPT_ENABLED
840840
bool "Enable rxbuf optimization feature"
841841
default y
842+
843+
config BT_LE_CTRL_FAST_CONN_DATA_TX_EN
844+
bool "Enable fast sending of connection data"
845+
default y
846+
help
847+
If this option is enabled, The Controller will continue to
848+
Send an empty PDU after sending valid connection data within an interval.

‎components/bt/controller/esp32c6/bt.c‎

Lines changed: 47 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858

5959
#include "hal/efuse_hal.h"
6060
#include "soc/rtc.h"
61+
#include "modem/modem_syscon_struct.h"
6162

6263
#if CONFIG_BT_BLE_LOG_SPI_OUT_ENABLED
6364
#include "ble_log/ble_log_spi_out.h"
@@ -70,7 +71,7 @@
7071
#define OSI_COEX_VERSION 0x00010006
7172
#define OSI_COEX_MAGIC_VALUE 0xFADEBEAD
7273

73-
#define EXT_FUNC_VERSION 0x20240422
74+
#define EXT_FUNC_VERSION 0x20250415
7475
#define EXT_FUNC_MAGIC_VALUE 0xA5A5A5A5
7576

7677
#define BT_ASSERT_PRINT ets_printf
@@ -101,17 +102,29 @@ struct ext_funcs_t {
101102
int (* _ecc_gen_key_pair)(uint8_t *public, uint8_t *priv);
102103
int (* _ecc_gen_dh_key)(const uint8_t *remote_pub_key_x, const uint8_t *remote_pub_key_y,
103104
const uint8_t *local_priv_key, uint8_t *dhkey);
104-
void (* _esp_reset_rpa_moudle)(void);
105+
#if CONFIG_IDF_TARGET_ESP32C6
106+
void (* _esp_reset_modem)(uint8_t mdl_opts, uint8_t start);
107+
#endif // CONFIG_IDF_TARGET_ESP32C6
105108
uint32_t magic;
106109
};
107110

108111
#if CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
109112
typedef void (*interface_func_t) (uint32_t len, const uint8_t *addr, uint32_t len_append, const uint8_t *addr_append, uint32_t flag);
113+
114+
enum {
115+
BLE_LOG_INTERFACE_FLAG_CONTINUE = 0,
116+
BLE_LOG_INTERFACE_FLAG_END,
117+
};
110118
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
111119

112120
/* External functions or variables
113121
************************************************************************
114122
*/
123+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
124+
extern void coex_hw_timer_set(uint8_t idx,uint8_t src, uint8_t pti,uint32_t latency, uint32_t perioidc);
125+
extern void coex_hw_timer_enable(uint8_t idx);
126+
extern void coex_hw_timer_disable(uint8_t idx);
127+
#endif // CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
115128
extern int ble_osi_coex_funcs_register(struct osi_coex_funcs_t *coex_funcs);
116129
extern int r_ble_controller_init(esp_bt_controller_config_t *cfg);
117130
extern void esp_ble_controller_info_capture(uint32_t cycle_times);
@@ -185,7 +198,9 @@ static int esp_intr_alloc_wrapper(int source, int flags, intr_handler_t handler,
185198
static int esp_intr_free_wrapper(void **ret_handle);
186199
static void osi_assert_wrapper(const uint32_t ln, const char *fn, uint32_t param1, uint32_t param2);
187200
static uint32_t osi_random_wrapper(void);
188-
static void esp_reset_rpa_moudle(void);
201+
#if CONFIG_IDF_TARGET_ESP32C6
202+
static void esp_reset_modem(uint8_t mdl_opts,uint8_t start);
203+
#endif // CONFIG_IDF_TARGET_ESP32C6
189204
static int esp_ecc_gen_key_pair(uint8_t *pub, uint8_t *priv);
190205
static int esp_ecc_gen_dh_key(const uint8_t *peer_pub_key_x, const uint8_t *peer_pub_key_y,
191206
const uint8_t *our_priv_key, uint8_t *out_dhkey);
@@ -463,15 +478,34 @@ struct ext_funcs_t ext_funcs_ro = {
463478
._os_random = osi_random_wrapper,
464479
._ecc_gen_key_pair = esp_ecc_gen_key_pair,
465480
._ecc_gen_dh_key = esp_ecc_gen_dh_key,
466-
._esp_reset_rpa_moudle = esp_reset_rpa_moudle,
481+
#if CONFIG_IDF_TARGET_ESP32C6
482+
._esp_reset_modem = esp_reset_modem,
483+
#endif // CONFIG_IDF_TARGET_ESP32C6
467484
.magic = EXT_FUNC_MAGIC_VALUE,
468485
};
469486

470-
static void IRAM_ATTR esp_reset_rpa_moudle(void)
487+
#if CONFIG_IDF_TARGET_ESP32C6
488+
static void IRAM_ATTR esp_reset_modem(uint8_t mdl_opts,uint8_t start)
471489
{
490+
if (mdl_opts == 0x05) {
491+
if (start) {
492+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
493+
coex_hw_timer_set(0x04, 0x02, 15, 0, 5000);
494+
coex_hw_timer_enable(0x04);
495+
#endif // CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
496+
MODEM_SYSCON.modem_rst_conf.val |= (BIT(16) | BIT(18));
497+
MODEM_SYSCON.modem_rst_conf.val &= ~(BIT(16) | BIT(18));
498+
} else {
499+
#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
500+
coex_hw_timer_disable(0x04);
501+
#endif // CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
502+
}
472503

504+
}
473505
}
474506

507+
#endif // CONFIG_IDF_TARGET_ESP32C6
508+
475509
static void IRAM_ATTR osi_assert_wrapper(const uint32_t ln, const char *fn,
476510
uint32_t param1, uint32_t param2)
477511
{
@@ -1452,20 +1486,22 @@ esp_power_level_t esp_ble_tx_power_get_enhanced(esp_ble_enhanced_power_type_t po
14521486
#if !CONFIG_BT_LE_CONTROLLER_LOG_SPI_OUT_ENABLED
14531487
static void esp_bt_controller_log_interface(uint32_t len, const uint8_t *addr, uint32_t len_append, const uint8_t *addr_append, uint32_t flag)
14541488
{
1455-
bool end = flag ? true : false;
1489+
bool end = (flag & BIT(BLE_LOG_INTERFACE_FLAG_END));
14561490
#if CONFIG_BT_LE_CONTROLLER_LOG_STORAGE_ENABLE
14571491
esp_bt_controller_log_storage(len, addr, end);
14581492
#else // !CONFIG_BT_LE_CONTROLLER_LOG_STORAGE_ENABLE
14591493
portMUX_TYPE spinlock = portMUX_INITIALIZER_UNLOCKED;
14601494
portENTER_CRITICAL_SAFE(&spinlock);
14611495
esp_panic_handler_feed_wdts();
1462-
for (int i = 0; i < len; i++) {
1463-
esp_rom_printf("%02x ", addr[i]);
1464-
}
14651496

1466-
if (end) {
1467-
esp_rom_printf("\n");
1497+
if (len && addr) {
1498+
for (int i = 0; i < len; i++) { esp_rom_printf("%02x ", addr[i]); }
14681499
}
1500+
if (len_append && addr_append) {
1501+
for (int i = 0; i < len_append; i++) { esp_rom_printf("%02x ", addr_append[i]); }
1502+
}
1503+
if (end) { esp_rom_printf("\n"); }
1504+
14691505
portEXIT_CRITICAL_SAFE(&spinlock);
14701506
#endif // CONFIG_BT_LE_CONTROLLER_LOG_STORAGE_ENABLE
14711507
}

‎components/bt/controller/esp32c6/esp_bt_cfg.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,12 @@ extern "C" {
195195
#define DEFAULT_BT_LE_CTRL_ADV_DATA_LENGTH_ZERO_AUX (0)
196196
#endif
197197

198+
#if defined(CONFIG_BT_LE_CTRL_FAST_CONN_DATA_TX_EN)
199+
#define DEFAULT_BT_LE_CTRL_FAST_CONN_DATA_TX_EN (CONFIG_BT_LE_CTRL_FAST_CONN_DATA_TX_EN)
200+
#else
201+
#define DEFAULT_BT_LE_CTRL_FAST_CONN_DATA_TX_EN (0)
202+
#endif
203+
198204
#ifdef CONFIG_BT_LE_HCI_INTERFACE_USE_UART
199205
#define HCI_UART_EN CONFIG_BT_LE_HCI_INTERFACE_USE_UART
200206
#else

‎components/bt/controller/esp32h2/Kconfig.in‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -843,3 +843,10 @@ config BT_LE_CTRL_ADV_DATA_LENGTH_ZERO_AUX
843843
config BT_LE_RXBUF_OPT_ENABLED
844844
bool "Enable rxbuf optimization feature"
845845
default y
846+
847+
config BT_LE_CTRL_FAST_CONN_DATA_TX_EN
848+
bool "Enable fast sending of connection data"
849+
default y
850+
help
851+
If this option is enabled, The Controller will continue to
852+
Send an empty PDU after sending valid connection data within an interval.

‎components/bt/controller/esp32h2/bt.c‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
#define OSI_COEX_VERSION 0x00010006
6767
#define OSI_COEX_MAGIC_VALUE 0xFADEBEAD
6868

69-
#define EXT_FUNC_VERSION 0x20240422
69+
#define EXT_FUNC_VERSION 0x20250415
7070
#define EXT_FUNC_MAGIC_VALUE 0xA5A5A5A5
7171

7272
#define BT_ASSERT_PRINT ets_printf
@@ -97,12 +97,16 @@ struct ext_funcs_t {
9797
int (* _ecc_gen_key_pair)(uint8_t *public, uint8_t *priv);
9898
int (* _ecc_gen_dh_key)(const uint8_t *remote_pub_key_x, const uint8_t *remote_pub_key_y,
9999
const uint8_t *local_priv_key, uint8_t *dhkey);
100-
void (* _esp_reset_rpa_moudle)(void);
101100
uint32_t magic;
102101
};
103102

104103
#if CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
105104
typedef void (*interface_func_t) (uint32_t len, const uint8_t *addr, uint32_t len_append, const uint8_t *addr_append, uint32_t flag);
105+
106+
enum {
107+
BLE_LOG_INTERFACE_FLAG_CONTINUE = 0,
108+
BLE_LOG_INTERFACE_FLAG_END,
109+
};
106110
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
107111
/* External functions or variables
108112
************************************************************************
@@ -183,7 +187,6 @@ static int esp_intr_alloc_wrapper(int source, int flags, intr_handler_t handler,
183187
static int esp_intr_free_wrapper(void **ret_handle);
184188
static void osi_assert_wrapper(const uint32_t ln, const char *fn, uint32_t param1, uint32_t param2);
185189
static uint32_t osi_random_wrapper(void);
186-
static void esp_reset_rpa_moudle(void);
187190
static int esp_ecc_gen_key_pair(uint8_t *pub, uint8_t *priv);
188191
static int esp_ecc_gen_dh_key(const uint8_t *peer_pub_key_x, const uint8_t *peer_pub_key_y,
189192
const uint8_t *our_priv_key, uint8_t *out_dhkey);
@@ -460,15 +463,9 @@ struct ext_funcs_t ext_funcs_ro = {
460463
._os_random = osi_random_wrapper,
461464
._ecc_gen_key_pair = esp_ecc_gen_key_pair,
462465
._ecc_gen_dh_key = esp_ecc_gen_dh_key,
463-
._esp_reset_rpa_moudle = esp_reset_rpa_moudle,
464466
.magic = EXT_FUNC_MAGIC_VALUE,
465467
};
466468

467-
static void IRAM_ATTR esp_reset_rpa_moudle(void)
468-
{
469-
470-
}
471-
472469
static void IRAM_ATTR osi_assert_wrapper(const uint32_t ln, const char *fn,
473470
uint32_t param1, uint32_t param2)
474471
{
@@ -1412,20 +1409,22 @@ esp_power_level_t esp_ble_tx_power_get_enhanced(esp_ble_enhanced_power_type_t po
14121409
#if !CONFIG_BT_LE_CONTROLLER_LOG_SPI_OUT_ENABLED
14131410
static void esp_bt_controller_log_interface(uint32_t len, const uint8_t *addr, uint32_t len_append, const uint8_t *addr_append, uint32_t flag)
14141411
{
1415-
bool end = flag ? true : false;
1412+
bool end = (flag & BIT(BLE_LOG_INTERFACE_FLAG_END));
14161413
#if CONFIG_BT_LE_CONTROLLER_LOG_STORAGE_ENABLE
14171414
esp_bt_controller_log_storage(len, addr, end);
14181415
#else // !CONFIG_BT_LE_CONTROLLER_LOG_STORAGE_ENABLE
14191416
portMUX_TYPE spinlock = portMUX_INITIALIZER_UNLOCKED;
14201417
portENTER_CRITICAL_SAFE(&spinlock);
14211418
esp_panic_handler_feed_wdts();
1422-
for (int i = 0; i < len; i++) {
1423-
esp_rom_printf("%02x ", addr[i]);
1424-
}
14251419

1426-
if (end) {
1427-
esp_rom_printf("\n");
1420+
if (len && addr) {
1421+
for (int i = 0; i < len; i++) { esp_rom_printf("%02x ", addr[i]); }
14281422
}
1423+
if (len_append && addr_append) {
1424+
for (int i = 0; i < len_append; i++) { esp_rom_printf("%02x ", addr_append[i]); }
1425+
}
1426+
if (end) { esp_rom_printf("\n"); }
1427+
14291428
portEXIT_CRITICAL_SAFE(&spinlock);
14301429
#endif // CONFIG_BT_LE_CONTROLLER_LOG_STORAGE_ENABLE
14311430
}

‎components/bt/controller/esp32h2/esp_bt_cfg.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,12 @@ extern "C" {
192192
#define DEFAULT_BT_LE_CTRL_ADV_DATA_LENGTH_ZERO_AUX (0)
193193
#endif
194194

195+
#if defined(CONFIG_BT_LE_CTRL_FAST_CONN_DATA_TX_EN)
196+
#define DEFAULT_BT_LE_CTRL_FAST_CONN_DATA_TX_EN (CONFIG_BT_LE_CTRL_FAST_CONN_DATA_TX_EN)
197+
#else
198+
#define DEFAULT_BT_LE_CTRL_FAST_CONN_DATA_TX_EN (0)
199+
#endif
200+
195201
#ifdef CONFIG_BT_LE_HCI_INTERFACE_USE_UART
196202
#define HCI_UART_EN CONFIG_BT_LE_HCI_INTERFACE_USE_UART
197203
#else

0 commit comments

Comments
 (0)