espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 21:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'change/ble_update_lib_20250630_v5.2' into 'release/v5.2'

Browse Source 
change(ble): [AUTO_MR] 20250630 - Update ESP BLE Controller Lib (v5.2)

See merge request espressif/esp-idf!40298
This commit is contained in:
Island
2025-07-03 15:32:28 +08:00
parent 2d1c1a3d20 840e704a23
commit 22c184ef77
5 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/bt/controller/esp32c2/bt.c
View File

@@ -139,7 +139,7 @@ extern void esp_panic_handler_feed_wdts(void);
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED #endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
extern int ble_controller_deinit(void); extern int ble_controller_deinit(void);
extern int ble_controller_enable(uint8_t mode); extern int ble_controller_enable(uint8_t mode);
extern int ble_controller_disable(void); extern void ble_controller_disable(void);
extern int esp_register_ext_funcs (struct ext_funcs_t *); extern int esp_register_ext_funcs (struct ext_funcs_t *);
extern void esp_unregister_ext_funcs (void); extern void esp_unregister_ext_funcs (void);
extern int esp_ble_ll_set_public_addr(const uint8_t *addr); extern int esp_ble_ll_set_public_addr(const uint8_t *addr);
@@ -1075,9 +1075,9 @@ esp_err_t esp_bt_controller_disable(void)
ESP_LOGW(NIMBLE_PORT_LOG_TAG, "invalid controller state"); ESP_LOGW(NIMBLE_PORT_LOG_TAG, "invalid controller state");
return ESP_FAIL; return ESP_FAIL;
} }
if (ble_controller_disable() != 0) { ble_controller_status = ESP_BT_CONTROLLER_STATUS_INITED;
return ESP_FAIL;
} ble_controller_disable();
ble_stack_disable(); ble_stack_disable();
if (s_ble_active) { if (s_ble_active) {
esp_phy_disable(PHY_MODEM_BT); esp_phy_disable(PHY_MODEM_BT);
@@ -1089,7 +1089,6 @@ esp_err_t esp_bt_controller_disable(void)
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE
coex_disable(); coex_disable();
#endif #endif
ble_controller_status = ESP_BT_CONTROLLER_STATUS_INITED;
return ESP_OK; return ESP_OK;
} }

2
components/bt/controller/lib_esp32c2/esp32c2-bt-lib

Submodule components/bt/controller/lib_esp32c2/esp32c2-bt-lib updated: 64ba4e23f3...7be8be96db

2
components/bt/controller/lib_esp32c6/esp32c6-bt-lib

Submodule components/bt/controller/lib_esp32c6/esp32c6-bt-lib updated: fa4b7f913d...80f6b7e6e4

2
components/bt/controller/lib_esp32h2/esp32h2-bt-lib

Submodule components/bt/controller/lib_esp32h2/esp32h2-bt-lib updated: e90088b356...513c3fb61e

6
components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld
View File

@@ -806,7 +806,7 @@ r_ble_lll_scan_process_rsp_in_isr = 0x400016e8;
r_ble_lll_scan_restart = 0x400016f0; r_ble_lll_scan_restart = 0x400016f0;
r_ble_lll_scan_rx_isr_on_aux = 0x400016f4; r_ble_lll_scan_rx_isr_on_aux = 0x400016f4;
r_ble_lll_scan_rx_isr_on_legacy = 0x400016f8; r_ble_lll_scan_rx_isr_on_legacy = 0x400016f8;
r_ble_lll_scan_rx_pkt_isr = 0x400016fc; //r_ble_lll_scan_rx_pkt_isr = 0x400016fc;
r_ble_lll_scan_sched_next_aux = 0x40001700; r_ble_lll_scan_sched_next_aux = 0x40001700;
r_ble_lll_scan_sched_remove = 0x40001704; r_ble_lll_scan_sched_remove = 0x40001704;
r_ble_lll_scan_start = 0x40001708; r_ble_lll_scan_start = 0x40001708;
@@ -1156,8 +1156,8 @@ r_hal_timer_env_deinit = 0x40002f18;
r_ble_ll_env_deinit = 0x40002f1c; r_ble_ll_env_deinit = 0x40002f1c;
r_ble_ll_generic_data_deinit = 0x40002f20; r_ble_ll_generic_data_deinit = 0x40002f20;
//r_ble_hci_trans_env_deinit = 0x40002f24; //r_ble_hci_trans_env_deinit = 0x40002f24;
r_ble_ll_conn_callout_env_init = 0x40002f28; //r_ble_ll_conn_callout_env_init = 0x40002f28;
r_ble_ll_conn_callout_env_deinit = 0x40002f2c; //r_ble_ll_conn_callout_env_deinit = 0x40002f2c;
r_ble_ll_scan_callout_env_init = 0x40002f30; r_ble_ll_scan_callout_env_init = 0x40002f30;
r_ble_ll_scan_callout_env_deinit = 0x40002f34; r_ble_ll_scan_callout_env_deinit = 0x40002f34;
r_ble_ll_callout_env_init = 0x40002f38; r_ble_ll_callout_env_init = 0x40002f38;