Skip to content

Commit 6e07162

Browse files
committed
Merge branch 'bugfix/fix_c2_light_sleep_coex_v5.2' into 'release/v5.2'
fix(ble): fix ble light sleep error on esp32c2 (v5.2) See merge request espressif/esp-idf!35054
2 parents cac1db6 + 61b29d8 commit 6e07162

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

components/bt/controller/esp32c2/bt.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,9 @@ static void esp_bt_ctrl_log_partition_get_and_erase_first_block(void);
197197
/* Local variable definition
198198
***************************************************************************
199199
*/
200+
#if CONFIG_ESP32C2_REV_MIN_FULL < 200
201+
void *g_ble_lll_rfmgmt_env_p;
202+
#endif
200203
/* Static variable declare */
201204
static DRAM_ATTR esp_bt_controller_status_t ble_controller_status = ESP_BT_CONTROLLER_STATUS_IDLE;
202205
#if CONFIG_BT_LE_CONTROLLER_LOG_ENABLED

components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -766,9 +766,9 @@ r_ble_lll_per_adv_coex_dpc_update_on_start = 0x40001640;
766766
r_ble_lll_reset = 0x40001644;
767767
r_ble_lll_rfmgmt_controller_sleep_en = 0x40001648;
768768
r_ble_lll_rfmgmt_deinit = 0x4000164c;
769-
r_ble_lll_rfmgmt_disable = 0x40001650;
770-
r_ble_lll_rfmgmt_enable = 0x40001654;
771-
r_ble_lll_rfmgmt_enable_now = 0x40001658;
769+
//r_ble_lll_rfmgmt_disable = 0x40001650;
770+
//r_ble_lll_rfmgmt_enable = 0x40001654;
771+
//r_ble_lll_rfmgmt_enable_now = 0x40001658;
772772
r_ble_lll_rfmgmt_init = 0x4000165c;
773773
r_ble_lll_rfmgmt_is_enabled = 0x40001660;
774774
r_ble_lll_rfmgmt_release = 0x40001664;
@@ -778,16 +778,16 @@ r_ble_lll_rfmgmt_scan_changed = 0x40001670;
778778
r_ble_lll_rfmgmt_sched_changed = 0x40001674;
779779
r_ble_lll_rfmgmt_set_sleep_cb = 0x40001678;
780780
r_ble_lll_rfmgmt_ticks_to_enabled = 0x4000167c;
781-
r_ble_lll_rfmgmt_timer_exp = 0x40001680;
782-
r_ble_lll_rfmgmt_timer_reschedule = 0x40001684;
781+
//r_ble_lll_rfmgmt_timer_exp = 0x40001680;
782+
//r_ble_lll_rfmgmt_timer_reschedule = 0x40001684;
783783
r_ble_lll_rx_pdu_in = 0x40001688;
784784
r_ble_lll_rx_pkt_in = 0x4000168c;
785785
r_ble_lll_rx_pkt_isr = 0x40001690;
786786
r_ble_lll_scan_abort_aux_sched = 0x40001694;
787787
r_ble_lll_scan_aux_data_free = 0x40001698;
788788
r_ble_lll_scan_chk_resume = 0x4000169c;
789789
r_ble_lll_scan_clean_cur_aux_data = 0x400016a0;
790-
r_ble_lll_scan_coex_event_cb = 0x400016a4;
790+
//r_ble_lll_scan_coex_event_cb = 0x400016a4;
791791
r_ble_lll_scan_common_init = 0x400016a8;
792792
r_ble_lll_scan_deinit = 0x400016ac;
793793
r_ble_lll_scan_duration_period_timers_restart = 0x400016b0;
@@ -1146,7 +1146,7 @@ r_ble_phy_get_txdbm_by_level = 0x40002edc;
11461146
r_hal_timer_disable_intr = 0x40002ee0;
11471147
r_hal_timer_enable_intr = 0x40002ee4;
11481148
r_hal_timer_task_stop = 0x40002ee8;
1149-
r_ble_lll_rfmgmt_env_init = 0x40002eec;
1149+
//r_ble_lll_rfmgmt_env_init = 0x40002eec;
11501150
r_ble_ll_scan_set_aux_ll_flag = 0x40002ef0;
11511151
r_ble_ll_rf_temp_calibration = 0x40002ef4;
11521152
r_ble_ll_adv_env_deinit = 0x40002ef8;
@@ -1225,5 +1225,6 @@ r_ble_lll_adv_ext_event_rmvd_from_sched = 0x40003018;
12251225
r_ble_lll_conn_process_rx_data_after_halt = 0x4000301c;
12261226
r_ble_phy_global_rxbuf_get = 0x40003020;
12271227
/* Data (.data, .bss, .rodata) */
1228+
g_ble_lll_rfmgmt_env_p = 0x3fcdf3cc;
12281229
priv_config_additional_opts_ptr = 0x3fcdfa70;
12291230
g_ble_ll_ctrl_pkt_lengths_eco4_ro = 0x3ff4fbac;

components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ r_ble_lll_rx_pkt_isr = 0x40001690;
622622
r_ble_lll_scan_abort_aux_sched = 0x40001694;
623623
r_ble_lll_scan_chk_resume = 0x4000169c;
624624
r_ble_lll_scan_clean_cur_aux_data = 0x400016a0;
625-
r_ble_lll_scan_coex_event_cb = 0x400016a4;
625+
//r_ble_lll_scan_coex_event_cb = 0x400016a4;
626626
r_ble_lll_scan_common_init = 0x400016a8;
627627
r_ble_lll_scan_deinit = 0x400016ac;
628628
r_ble_lll_scan_duration_period_timers_restart = 0x400016b0;

0 commit comments

Comments
 (0)