Merge branch 'fix/assert_1024_in_rwbt_isr_v5.0' into 'release/v5.0'

fix(bt/ble): fix some issues in bluetooth controller(backport v5.0) See merge request espressif/esp-idf!30816
espressif · May 16, 2024 · d4f35fc · d4f35fc
2 parents 4e5e8aa + 2c45c9d
commit d4f35fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/components/bt/controller/lib_esp32 b/components/bt/controller/lib_esp32
diff --git a/components/esp_rom/esp32/ld/esp32.rom.ld b/components/esp_rom/esp32/ld/esp32.rom.ld
@@ -1474,7 +1474,7 @@ PROVIDE ( uart_tx_switch = 0x40009028 );
 
 /*
 These functions are part of the ROM GPIO driver. We do not use them; the provided esp-idf functions
-replace them and this way we can re-use the fixed RAM addresses these routines need.
+replace them and this way we can reuse the fixed RAM addresses these routines need.
 */
 /* <-- So you don't read over it: This comment disables the next lines.
 PROVIDE ( gpio_init = 0x40009c20 );
@@ -1623,6 +1623,7 @@ PROVIDE ( ld_acl_sniff_trans_sched = 0x40033734 );
 PROVIDE ( lc_pwr_decr_ind_handler = 0x4002859c );
 PROVIDE ( lc_pwr_incr_ind_handler = 0x400284a8 );
 PROVIDE ( lc_pwr_max_ind_handler = 0x40028690 );
+PROVIDE ( lc_setup_sync_param_check = 0x4002354c );
 
 PROVIDE ( lm_sync_conf = 0x3ffb8348 );
 PROVIDE ( lm_nb_sync_active = 0x3ffb8346 );