Merge branch 'bugfix/ble_update_lib_20240223_v5.1' into 'release/v5.1'

update lib on release/v5.1 See merge request espressif/esp-idf!29209
espressif · Feb 28, 2024 · b0107bd · b0107bd
2 parents 7cfe227 + 95a2ad9
commit b0107bd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/components/bt/controller/esp32c2/bt.c b/components/bt/controller/esp32c2/bt.c
@@ -156,7 +156,8 @@ extern int ble_txpwr_set(esp_ble_enhanced_power_type_t power_type, uint16_t hand
 extern int ble_txpwr_get(esp_ble_enhanced_power_type_t power_type, uint16_t handle);
 extern int ble_get_npl_element_info(esp_bt_controller_config_t *cfg, ble_npl_count_info_t * npl_info);
 extern void bt_track_pll_cap(void);
-
+extern char *ble_controller_get_compile_version(void);
+extern const char *r_ble_controller_get_rom_compile_version(void);
 #if CONFIG_BT_RELEASE_IRAM
 extern uint32_t _iram_bt_text_start;
 extern uint32_t _bss_bt_end;
@@ -650,6 +651,9 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
         goto modem_deint;
     }
 
+    ESP_LOGI(NIMBLE_PORT_LOG_TAG, "ble controller commit:[%s]", ble_controller_get_compile_version());
+    ESP_LOGI(NIMBLE_PORT_LOG_TAG, "ble rom commit:[%s]", r_ble_controller_get_rom_compile_version());
+
 #if CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
     interface_func_t bt_controller_log_interface;
     bt_controller_log_interface = esp_bt_controller_log_interface;

diff --git a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib
diff --git a/components/bt/controller/lib_esp32c6/esp32c6-bt-lib b/components/bt/controller/lib_esp32c6/esp32c6-bt-lib
diff --git a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib
diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@@ -1060,7 +1060,6 @@ r_ble_lll_adv_periodic_schedule_first = 0x40001448;
 r_ble_lll_adv_pri_schedule_tx_pdu = 0x40001458;
 r_ble_lll_adv_reschedule_event = 0x4000145c;
 r_ble_lll_adv_reschedule_periodic_event = 0x40001460;
-r_ble_lll_adv_sec_done = 0x40001468;
 r_ble_lll_adv_sec_event_done = 0x4000146c;
 r_ble_lll_adv_sec_schedule_next_aux = 0x40001470;
 r_ble_lll_adv_secondary_tx_start_cb = 0x40001474;
@@ -1157,7 +1156,6 @@ r_ble_lll_per_adv_coex_dpc_update = 0x40001634;
 r_ble_lll_per_adv_coex_dpc_update_on_data_updated = 0x40001638;
 r_ble_lll_per_adv_coex_dpc_update_on_scheduled = 0x4000163c;
 r_ble_lll_per_adv_coex_dpc_update_on_start = 0x40001640;
-r_ble_lll_reset = 0x40001644;
 r_ble_lll_rfmgmt_is_enabled = 0x40001660;
 r_ble_lll_rfmgmt_release = 0x40001664;
 r_ble_lll_rfmgmt_scan_changed = 0x40001670;
@@ -1168,7 +1166,6 @@ r_ble_lll_rx_pdu_in = 0x40001688;
 r_ble_lll_rx_pkt_in = 0x4000168c;
 r_ble_lll_rx_pkt_isr = 0x40001690;
 r_ble_lll_scan_abort_aux_sched = 0x40001694;
-r_ble_lll_scan_aux_data_free = 0x40001698;
 r_ble_lll_scan_chk_resume = 0x4000169c;
 r_ble_lll_scan_clean_cur_aux_data = 0x400016a0;
 r_ble_lll_scan_coex_event_cb = 0x400016a4;