espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 10:47:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/esp_log_from_critical_v3.3' into 'release/v3.3'

Browse Source 
intr_alloc: don't call ESP_LOG from a critical section (backport v3.3)

See merge request espressif/esp-idf!7160
This commit is contained in:
Ivan Grokhotkov
2020-01-22 00:14:32 +08:00
parent 552eb63ec4 a8b974f245
commit d3cc7c0daf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp32/intr_alloc.c
View File

@ -743,11 +743,11 @@ esp_err_t esp_intr_free(intr_handle_t handle)
} }
//If nothing left, disable interrupt. //If nothing left, disable interrupt.
if (handle->vector_desc->shared_vec_info==NULL) free_shared_vector=true; if (handle->vector_desc->shared_vec_info==NULL) free_shared_vector=true;
ESP_LOGV(TAG, "esp_intr_free: Deleting shared int: %s. Shared int is %s", svd?"not found or last one":"deleted", free_shared_vector?"empty now.":"still in use"); ESP_EARLY_LOGV(TAG, "esp_intr_free: Deleting shared int: %s. Shared int is %s", svd?"not found or last one":"deleted", free_shared_vector?"empty now.":"still in use");
} }
if ((handle->vector_desc->flags&VECDESC_FL_NONSHARED) || free_shared_vector) { if ((handle->vector_desc->flags&VECDESC_FL_NONSHARED) || free_shared_vector) {
ESP_LOGV(TAG, "esp_intr_free: Disabling int, killing handler"); ESP_EARLY_LOGV(TAG, "esp_intr_free: Disabling int, killing handler");
#if CONFIG_SYSVIEW_ENABLE #if CONFIG_SYSVIEW_ENABLE
if (!free_shared_vector) { if (!free_shared_vector) {
void *isr_arg = xt_get_interrupt_handler_arg(handle->vector_desc->intno); void *isr_arg = xt_get_interrupt_handler_arg(handle->vector_desc->intno);