From f39b3099f60f9b84b538ed897c008b81933678f9 Mon Sep 17 00:00:00 2001 From: Omar Chebib Date: Tue, 16 Apr 2024 18:17:00 +0800 Subject: [PATCH] fix(esp32c5): fix interrupt sources number for the Beta3 version --- .../soc/esp32c5/beta3/include/soc/interrupts.h | 15 ++++++++++----- components/soc/esp32c5/beta3/interrupts.c | 11 ++++++++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/components/soc/esp32c5/beta3/include/soc/interrupts.h b/components/soc/esp32c5/beta3/include/soc/interrupts.h index a66ab66242..18031cc2af 100644 --- a/components/soc/esp32c5/beta3/include/soc/interrupts.h +++ b/components/soc/esp32c5/beta3/include/soc/interrupts.h @@ -48,6 +48,7 @@ typedef enum { ETS_CPU_PERI_TIMEOUT_INTR_SOURCE, ETS_GPIO_INTR_SOURCE, /**< interrupt of GPIO, level*/ ETS_GPIO_NMI_SOURCE, /**< interrupt of GPIO, NMI*/ + ETS_GPIO_SD_INTR_SOURCE, ETS_PAU_INTR_SOURCE, ETS_HP_PERI_TIMEOUT_INTR_SOURCE, ETS_MODEM_PERI_TIMEOUT_INTR_SOURCE, @@ -55,7 +56,6 @@ typedef enum { ETS_HP_APM_M1_INTR_SOURCE, ETS_HP_APM_M2_INTR_SOURCE, ETS_HP_APM_M3_INTR_SOURCE, - ETS_HP_APM_M4_INTR_SOURCE, ETS_LP_APM0_INTR_SOURCE, ETS_MSPI_INTR_SOURCE, ETS_I2S1_INTR_SOURCE, /**< interrupt of I2S1, level*/ @@ -63,16 +63,16 @@ typedef enum { ETS_UART0_INTR_SOURCE, /**< interrupt of UART0, level*/ ETS_UART1_INTR_SOURCE, /**< interrupt of UART1, level*/ ETS_LEDC_INTR_SOURCE, /**< interrupt of LED PWM, level*/ - ETS_TWAI0_INTR_SOURCE, /**< interrupt of can0, level*/ - ETS_TWAI0_TIMER_INTR_SOURCE, /**< interrupt of can0 timer, level*/ - ETS_TWAI1_INTR_SOURCE, /**< interrupt of can1, level*/ - ETS_TWAI1_TIMER_INTR_SOURCE, /**< interrupt of can0 timer, level*/ + ETS_TWAI0_INTR_SOURCE, /**< interrupt of twai0, level*/ + ETS_TWAI1_INTR_SOURCE, /**< interrupt of twai1, level*/ ETS_USB_SERIAL_JTAG_INTR_SOURCE, /**< interrupt of USB, level*/ ETS_RMT_INTR_SOURCE, /**< interrupt of remote controller, level*/ ETS_I2C_EXT0_INTR_SOURCE, /**< interrupt of I2C controller1, level*/ ETS_TG0_T0_LEVEL_INTR_SOURCE, /**< interrupt of TIMER_GROUP0, TIMER0, level*/ + ETS_TG0_T1_LEVEL_INTR_SOURCE, /**< interrupt of TIMER_GROUP0, TIMER1, level*/ ETS_TG0_WDT_LEVEL_INTR_SOURCE, /**< interrupt of TIMER_GROUP0, WATCH DOG, level*/ ETS_TG1_T0_LEVEL_INTR_SOURCE, /**< interrupt of TIMER_GROUP1, TIMER0, level*/ + ETS_TG1_T1_LEVEL_INTR_SOURCE, /**< interrupt of TIMER_GROUP1, TIMER1, level*/ ETS_TG1_WDT_LEVEL_INTR_SOURCE, /**< interrupt of TIMER_GROUP1, WATCHDOG, level*/ ETS_SYSTIMER_TARGET0_INTR_SOURCE, /**< interrupt of system timer 0 */ ETS_SYSTIMER_TARGET1_INTR_SOURCE, /**< interrupt of system timer 1 */ @@ -82,6 +82,11 @@ typedef enum { ETS_PCNT_INTR_SOURCE, ETS_PARL_IO_TX_INTR_SOURCE, ETS_PARL_IO_RX_INTR_SOURCE, + ETS_SLC0_INTR_SOURCE, + ETS_SLC1_INTR_SOURCE, + ETS_USB_OTG20_INTR_SOURCE, + ETS_USB_OTG20_MULTI_PROC_INTR_SOURCE, + ETS_USB_OTG20_MISC_INTR_SOURCE, ETS_DMA_IN_CH0_INTR_SOURCE, /**< interrupt of general DMA IN channel 0, LEVEL*/ ETS_DMA_IN_CH1_INTR_SOURCE, /**< interrupt of general DMA IN channel 1, LEVEL*/ ETS_DMA_IN_CH2_INTR_SOURCE, /**< interrupt of general DMA IN channel 2, LEVEL*/ diff --git a/components/soc/esp32c5/beta3/interrupts.c b/components/soc/esp32c5/beta3/interrupts.c index eb4a89c989..d688b00afe 100644 --- a/components/soc/esp32c5/beta3/interrupts.c +++ b/components/soc/esp32c5/beta3/interrupts.c @@ -40,6 +40,7 @@ const char *const esp_isr_names[] = { [ETS_CPU_PERI_TIMEOUT_INTR_SOURCE] = "CPU_PERI_TIMEOUT", [ETS_GPIO_INTR_SOURCE] = "GPIO_INTR", [ETS_GPIO_NMI_SOURCE] = "GPIO_NMI", + [ETS_GPIO_SD_INTR_SOURCE] = "GPIO_SD_INTR", [ETS_PAU_INTR_SOURCE] = "PAU", [ETS_HP_PERI_TIMEOUT_INTR_SOURCE] = "HP_PERI_TIMEOUT", [ETS_MODEM_PERI_TIMEOUT_INTR_SOURCE] = "MODEM_PERI_TIMEOUT", @@ -47,7 +48,6 @@ const char *const esp_isr_names[] = { [ETS_HP_APM_M1_INTR_SOURCE] = "HP_APM_M1", [ETS_HP_APM_M2_INTR_SOURCE] = "HP_APM_M2", [ETS_HP_APM_M3_INTR_SOURCE] = "HP_APM_M3", - [ETS_HP_APM_M4_INTR_SOURCE] = "HP_APM_M4", [ETS_LP_APM0_INTR_SOURCE] = "LP_APM0", [ETS_MSPI_INTR_SOURCE] = "MSPI", [ETS_I2S1_INTR_SOURCE] = "I2S1", @@ -56,15 +56,15 @@ const char *const esp_isr_names[] = { [ETS_UART1_INTR_SOURCE] = "UART1", [ETS_LEDC_INTR_SOURCE] = "LEDC", [ETS_TWAI0_INTR_SOURCE] = "TWAI0", - [ETS_TWAI0_TIMER_INTR_SOURCE] = "TWAI0_TIMER", [ETS_TWAI1_INTR_SOURCE] = "TWAI1", - [ETS_TWAI1_TIMER_INTR_SOURCE] = "TWAI1_TIMER", [ETS_USB_SERIAL_JTAG_INTR_SOURCE] = "USB_SERIAL_JTAG", [ETS_RMT_INTR_SOURCE] = "RMT", [ETS_I2C_EXT0_INTR_SOURCE] = "I2C_EXT0", [ETS_TG0_T0_LEVEL_INTR_SOURCE] = "TG0_T0_LEVEL", + [ETS_TG0_T1_LEVEL_INTR_SOURCE] = "TG0_T1_LEVEL", [ETS_TG0_WDT_LEVEL_INTR_SOURCE] = "TG0_WDT_LEVEL", [ETS_TG1_T0_LEVEL_INTR_SOURCE] = "TG1_T0_LEVEL", + [ETS_TG1_T1_LEVEL_INTR_SOURCE] = "TG1_T1_LEVEL", [ETS_TG1_WDT_LEVEL_INTR_SOURCE] = "TG1_WDT_LEVEL", [ETS_SYSTIMER_TARGET0_INTR_SOURCE] = "SYSTIMER_TARGET0", [ETS_SYSTIMER_TARGET1_INTR_SOURCE] = "SYSTIMER_TARGET1", @@ -74,6 +74,11 @@ const char *const esp_isr_names[] = { [ETS_PCNT_INTR_SOURCE] = "PCNT", [ETS_PARL_IO_TX_INTR_SOURCE] = "PARL_IO_TX", [ETS_PARL_IO_RX_INTR_SOURCE] = "PARL_IO_RX", + [ETS_SLC0_INTR_SOURCE] = "SLC0_INTR", + [ETS_SLC1_INTR_SOURCE] = "SLC1_INTR", + [ETS_USB_OTG20_INTR_SOURCE] = "USB_OTG_INTR", + [ETS_USB_OTG20_MULTI_PROC_INTR_SOURCE] = "USB_OTG_MULTI", + [ETS_USB_OTG20_MISC_INTR_SOURCE] = "USB_OTG_MISC", [ETS_DMA_IN_CH0_INTR_SOURCE] = "DMA_IN_CH0", [ETS_DMA_IN_CH1_INTR_SOURCE] = "DMA_IN_CH1", [ETS_DMA_IN_CH2_INTR_SOURCE] = "DMA_IN_CH2",