Skip to content

Commit 5b11d5b

Browse files
committed
Merge branch 'change/ble_update_lib_20250630' into 'master'
change(ble): [AUTO_MR] 20250630 - Update ESP BLE Controller Lib Closes BLERP-2051, BLERP-2040, BLERP-2052, BLERP-2053, BLERP-2054, BLERP-1800, BLERP-2047, BLERP-2038, BLERP-2037, BLERP-2017, BLERP-2055, and BLERP-2056 See merge request espressif/esp-idf!40253
2 parents 323e942 + cbe6f68 commit 5b11d5b

File tree

6 files changed

+11
-12
lines changed

6 files changed

+11
-12
lines changed

components/bt/controller/esp32c2/bt.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ extern void esp_panic_handler_feed_wdts(void);
141141
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
142142
extern int ble_controller_deinit(void);
143143
extern int ble_controller_enable(uint8_t mode);
144-
extern int ble_controller_disable(void);
144+
extern void ble_controller_disable(void);
145145
extern int esp_register_ext_funcs (struct ext_funcs_t *);
146146
extern void esp_unregister_ext_funcs (void);
147147
extern int esp_ble_ll_set_public_addr(const uint8_t *addr);
@@ -1077,9 +1077,9 @@ esp_err_t esp_bt_controller_disable(void)
10771077
ESP_LOGW(NIMBLE_PORT_LOG_TAG, "invalid controller state");
10781078
return ESP_FAIL;
10791079
}
1080-
if (ble_controller_disable() != 0) {
1081-
return ESP_FAIL;
1082-
}
1080+
ble_controller_status = ESP_BT_CONTROLLER_STATUS_INITED;
1081+
1082+
ble_controller_disable();
10831083
ble_stack_disable();
10841084
if (s_ble_active) {
10851085
esp_phy_disable(PHY_MODEM_BT);
@@ -1091,7 +1091,6 @@ esp_err_t esp_bt_controller_disable(void)
10911091
#if CONFIG_SW_COEXIST_ENABLE
10921092
coex_disable();
10931093
#endif
1094-
ble_controller_status = ESP_BT_CONTROLLER_STATUS_INITED;
10951094
return ESP_OK;
10961095
}
10971096

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,7 @@ r_ble_lll_scan_process_rsp_in_isr = 0x400016e8;
806806
r_ble_lll_scan_restart = 0x400016f0;
807807
r_ble_lll_scan_rx_isr_on_aux = 0x400016f4;
808808
r_ble_lll_scan_rx_isr_on_legacy = 0x400016f8;
809-
r_ble_lll_scan_rx_pkt_isr = 0x400016fc;
809+
//r_ble_lll_scan_rx_pkt_isr = 0x400016fc;
810810
r_ble_lll_scan_sched_next_aux = 0x40001700;
811811
r_ble_lll_scan_sched_remove = 0x40001704;
812812
r_ble_lll_scan_start = 0x40001708;
@@ -1156,8 +1156,8 @@ r_hal_timer_env_deinit = 0x40002f18;
11561156
r_ble_ll_env_deinit = 0x40002f1c;
11571157
r_ble_ll_generic_data_deinit = 0x40002f20;
11581158
//r_ble_hci_trans_env_deinit = 0x40002f24;
1159-
r_ble_ll_conn_callout_env_init = 0x40002f28;
1160-
r_ble_ll_conn_callout_env_deinit = 0x40002f2c;
1159+
//r_ble_ll_conn_callout_env_init = 0x40002f28;
1160+
//r_ble_ll_conn_callout_env_deinit = 0x40002f2c;
11611161
r_ble_ll_scan_callout_env_init = 0x40002f30;
11621162
r_ble_ll_scan_callout_env_deinit = 0x40002f34;
11631163
r_ble_ll_callout_env_init = 0x40002f38;

0 commit comments

Comments
 (0)