blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-09 17:19:09 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix/feed_wdts_during_ble_log_dump_c2' into 'master'

Browse Source 
fix(ble): add feed wdts during ble log dump for ESP32-C2

Closes BLERP-1598

See merge request espressif/esp-idf!37265
This commit is contained in:
Island 2025-02-26 10:42:59 +08:00
commit efdce75bb1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -393,11 +393,11 @@ void esp_bt_read_ctrl_log_from_flash(bool output)
portENTER_CRITICAL_SAFE(&spinlock); portENTER_CRITICAL_SAFE(&spinlock);
esp_panic_handler_feed_wdts(); esp_panic_handler_feed_wdts();
ble_log_async_output_dump_all(true); ble_log_async_output_dump_all(true);
stop_write = true;
esp_bt_ontroller_log_deinit(); esp_bt_ontroller_log_deinit();
portEXIT_CRITICAL_SAFE(&spinlock); stop_write = true;
buffer = (const uint8_t *)mapped_ptr; buffer = (const uint8_t *)mapped_ptr;
esp_panic_handler_feed_wdts();
if (is_filled) { if (is_filled) {
read_index = next_erase_index; read_index = next_erase_index;
} else { } else {
@ -409,7 +409,7 @@ void esp_bt_read_ctrl_log_from_flash(bool output)
while (read_index != write_index) { while (read_index != write_index) {
esp_rom_printf("%02x ", buffer[read_index]); esp_rom_printf("%02x ", buffer[read_index]);
if (print_len > max_print_len) { if (print_len > max_print_len) {
vTaskDelay(2); esp_panic_handler_feed_wdts();
print_len = 0; print_len = 0;
} }
@ -417,6 +417,7 @@ void esp_bt_read_ctrl_log_from_flash(bool output)
read_index = (read_index + 1) % MAX_STORAGE_SIZE; read_index = (read_index + 1) % MAX_STORAGE_SIZE;
} }
esp_rom_printf(":DUMP_END]\r\n"); esp_rom_printf(":DUMP_END]\r\n");
portEXIT_CRITICAL_SAFE(&spinlock);
esp_partition_munmap(mmap_handle); esp_partition_munmap(mmap_handle);
err = esp_bt_controller_log_init(log_output_mode); err = esp_bt_controller_log_init(log_output_mode);
assert(err == ESP_OK); assert(err == ESP_OK);
@ -430,6 +431,9 @@ static void esp_bt_controller_log_interface(uint32_t len, const uint8_t *addr, b
esp_bt_controller_log_storage(len, addr, end); esp_bt_controller_log_storage(len, addr, end);
#endif //CONFIG_BT_LE_CONTROLLER_LOG_STORAGE_ENABLE #endif //CONFIG_BT_LE_CONTROLLER_LOG_STORAGE_ENABLE
} else { } else {
portMUX_TYPE spinlock = portMUX_INITIALIZER_UNLOCKED;
portENTER_CRITICAL_SAFE(&spinlock);
esp_panic_handler_feed_wdts();
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
esp_rom_printf("%02x ", addr[i]); esp_rom_printf("%02x ", addr[i]);
} }
@ -437,6 +441,7 @@ static void esp_bt_controller_log_interface(uint32_t len, const uint8_t *addr, b
if (end) { if (end) {
esp_rom_printf("\n"); esp_rom_printf("\n");
} }
portEXIT_CRITICAL_SAFE(&spinlock);
} }
} }