Skip to content

Commit 0407879

Browse files
suda-morrissuda-morris
committed
Merge branch 'contrib/github_pr_15273' into 'master'
Fix spelling mistake in all soc/interrupts.h (GitHub PR) Closes IDFGH-14503 and IDFGH-14502 See merge request espressif/esp-idf!36597
2 parents 499e044 + 01abdcb commit 0407879

File tree

10 files changed

+31
-15
lines changed

10 files changed

+31
-15
lines changed

‎components/soc/esp32/include/soc/interrupts.h‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ typedef enum {
6262
ETS_TWAI_INTR_SOURCE, /**< interrupt of twai, level*/
6363
ETS_RTC_CORE_INTR_SOURCE, /**< interrupt of rtc core, level, include rtc watchdog*/
6464
ETS_RMT_INTR_SOURCE, /**< interrupt of remote controller, level*/
65-
ETS_PCNT_INTR_SOURCE, /**< interrupt of pluse count, level*/
65+
ETS_PCNT_INTR_SOURCE, /**< interrupt of pulse count, level*/
6666
ETS_I2C_EXT0_INTR_SOURCE, /**< interrupt of I2C controller1, level*/
6767
ETS_I2C_EXT1_INTR_SOURCE, /**< interrupt of I2C controller0, level*/
6868
ETS_RSA_INTR_SOURCE, /**< interrupt of RSA accelerator, level*/
@@ -82,9 +82,11 @@ typedef enum {
8282
ETS_TG1_LACT_EDGE_INTR_SOURCE, /**< interrupt of TIMER_GROUP0, LACT, EDGE*/
8383
ETS_MMU_IA_INTR_SOURCE, /**< interrupt of MMU Invalid Access, LEVEL*/
8484
ETS_MPU_IA_INTR_SOURCE, /**< interrupt of MPU Invalid Access, LEVEL*/
85-
ETS_CACHE_IA_INTR_SOURCE, /**< interrupt of Cache Invalied Access, LEVEL*/
85+
ETS_CACHE_IA_INTR_SOURCE, /**< interrupt of Cache Invalid Access, LEVEL*/
8686
ETS_MAX_INTR_SOURCE, /**< total number of interrupt sources*/
87-
} periph_interrput_t;
87+
} periph_interrupt_t;
88+
89+
typedef periph_interrupt_t periph_interrput_t __attribute__((deprecated("in favor of periph_interrupt_t")));
8890

8991
#define ETS_CAN_INTR_SOURCE ETS_TWAI_INTR_SOURCE
9092

‎components/soc/esp32c2/include/soc/interrupts.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ typedef enum {
4040
ETS_I2C_EXT0_INTR_SOURCE, /**< interrupt of I2C controller1, level*/
4141
ETS_TG0_T0_LEVEL_INTR_SOURCE, /**< interrupt of TIMER_GROUP0, TIMER0, level*/
4242
ETS_TG0_WDT_LEVEL_INTR_SOURCE, /**< interrupt of TIMER_GROUP0, WATCH DOG, level*/
43-
ETS_CACHE_IA_INTR_SOURCE, /**< interrupt of Cache Invalied Access, LEVEL*/
43+
ETS_CACHE_IA_INTR_SOURCE, /**< interrupt of Cache Invalid Access, LEVEL*/
4444
ETS_SYSTIMER_TARGET0_INTR_SOURCE, /**< interrupt of system timer 0 */
4545
ETS_SYSTIMER_TARGET1_INTR_SOURCE, /**< interrupt of system timer 1 */
4646
ETS_SYSTIMER_TARGET2_INTR_SOURCE, /**< interrupt of system timer 2 */
@@ -62,7 +62,9 @@ typedef enum {
6262
ETS_CORE0_PIF_PMS_SIZE_INTR_SOURCE,
6363
ETS_CACHE_CORE0_ACS_INTR_SOURCE,
6464
ETS_MAX_INTR_SOURCE,
65-
} periph_interrput_t;
65+
} periph_interrupt_t;
66+
67+
typedef periph_interrupt_t periph_interrput_t __attribute__((deprecated("in favor of periph_interrupt_t")));
6668

6769
extern const char * const esp_isr_names[ETS_MAX_INTR_SOURCE];
6870

‎components/soc/esp32c3/include/soc/interrupts.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ typedef enum {
8181
ETS_BAK_PMS_VIOLATE_INTR_SOURCE,
8282
ETS_CACHE_CORE0_ACS_INTR_SOURCE,
8383
ETS_MAX_INTR_SOURCE,
84-
} periph_interrput_t;
84+
} periph_interrupt_t;
85+
86+
typedef periph_interrupt_t periph_interrput_t __attribute__((deprecated("in favor of periph_interrupt_t")));
8587

8688
extern const char * const esp_isr_names[ETS_MAX_INTR_SOURCE];
8789

‎components/soc/esp32c6/include/soc/interrupts.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ typedef enum {
9797
ETS_RSA_INTR_SOURCE, /**< interrupt of RSA accelerator, level*/
9898
ETS_ECC_INTR_SOURCE, /**< interrupt of ECC accelerator, level*/
9999
ETS_MAX_INTR_SOURCE,
100-
} periph_interrput_t;
100+
} periph_interrupt_t;
101+
102+
typedef periph_interrupt_t periph_interrput_t __attribute__((deprecated("in favor of periph_interrupt_t")));
101103

102104
extern const char * const esp_isr_names[ETS_MAX_INTR_SOURCE];
103105

‎components/soc/esp32c61/include/soc/interrupts.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ typedef enum {
8080
ETS_ECC_INTR_SOURCE,
8181
ETS_ECDSA_INTR_SOURCE,
8282
ETS_MAX_INTR_SOURCE,
83-
} periph_interrput_t;
83+
} periph_interrupt_t;
8484

8585
extern const char * const esp_isr_names[ETS_MAX_INTR_SOURCE];
8686

‎components/soc/esp32h2/include/soc/interrupts.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@ typedef enum {
8585
ETS_ECC_INTR_SOURCE, /**< interrupt of ECC accelerator, level*/
8686
ETS_ECDSA_INTR_SOURCE, /**< interrupt of ECDSA accelerator, level*/
8787
ETS_MAX_INTR_SOURCE,
88-
} periph_interrput_t;
88+
} periph_interrupt_t;
89+
90+
typedef periph_interrupt_t periph_interrput_t __attribute__((deprecated("in favor of periph_interrupt_t")));
8991

9092
extern const char * const esp_isr_names[ETS_MAX_INTR_SOURCE];
9193

‎components/soc/esp32h21/include/soc/interrupts.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ typedef enum {
8282
ETS_ECC_INTR_SOURCE,
8383
ETS_ECDSA_INTR_SOURCE,
8484
ETS_MAX_INTR_SOURCE,
85-
} periph_interrput_t;
85+
} periph_interrupt_t;
8686

8787
extern const char * const esp_isr_names[ETS_MAX_INTR_SOURCE];
8888

‎components/soc/esp32p4/include/soc/interrupts.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,9 @@ typedef enum {
153153
ETS_ASSIST_DEBUG_INTR_SOURCE,
154154

155155
ETS_MAX_INTR_SOURCE, /**< number of interrupt sources */
156-
} periph_interrput_t;
156+
} periph_interrupt_t;
157+
158+
typedef periph_interrupt_t periph_interrput_t __attribute__((deprecated("in favor of periph_interrupt_t")));
157159

158160
extern const char *const esp_isr_names[ETS_MAX_INTR_SOURCE];
159161

‎components/soc/esp32s2/include/soc/interrupts.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,9 @@ typedef enum {
114114
ETS_DCACHE_SYNC_INTR_SOURCE, /**< interrupt of data cache sync done, LEVEL*/
115115
ETS_ICACHE_SYNC_INTR_SOURCE, /**< interrupt of instruction cache sync done, LEVEL*/
116116
ETS_MAX_INTR_SOURCE, /**< number of interrupt sources */
117-
} periph_interrput_t;
117+
} periph_interrupt_t;
118+
119+
typedef periph_interrupt_t periph_interrput_t __attribute__((deprecated("in favor of periph_interrupt_t")));
118120

119121
extern const char * const esp_isr_names[ETS_MAX_INTR_SOURCE];
120122

‎components/soc/esp32s3/include/soc/interrupts.h‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ typedef enum {
5454
ETS_USB_INTR_SOURCE, /**< interrupt of USB, level*/
5555
ETS_RTC_CORE_INTR_SOURCE, /**< interrupt of rtc core, level, include rtc watchdog*/
5656
ETS_RMT_INTR_SOURCE, /**< interrupt of remote controller, level*/
57-
ETS_PCNT_INTR_SOURCE, /**< interrupt of pluse count, level*/
57+
ETS_PCNT_INTR_SOURCE, /**< interrupt of pulse count, level*/
5858
ETS_I2C_EXT0_INTR_SOURCE, /**< interrupt of I2C controller1, level*/
5959
ETS_I2C_EXT1_INTR_SOURCE, /**< interrupt of I2C controller0, level*/
6060
ETS_SPI2_DMA_INTR_SOURCE, /**< interrupt of SPI2 DMA, level*/
@@ -69,7 +69,7 @@ typedef enum {
6969
ETS_TG1_T0_LEVEL_INTR_SOURCE, /**< interrupt of TIMER_GROUP1, TIMER0, EDGE*/
7070
ETS_TG1_T1_LEVEL_INTR_SOURCE, /**< interrupt of TIMER_GROUP1, TIMER1, EDGE*/
7171
ETS_TG1_WDT_LEVEL_INTR_SOURCE, /**< interrupt of TIMER_GROUP1, WATCHDOG, EDGE*/
72-
ETS_CACHE_IA_INTR_SOURCE, /**< interrupt of Cache Invalied Access, LEVEL*/
72+
ETS_CACHE_IA_INTR_SOURCE, /**< interrupt of Cache Invalid Access, LEVEL*/
7373
ETS_SYSTIMER_TARGET0_INTR_SOURCE, /**< interrupt of system timer 0 */
7474
ETS_SYSTIMER_TARGET1_INTR_SOURCE, /**< interrupt of system timer 1 */
7575
ETS_SYSTIMER_TARGET2_INTR_SOURCE, /**< interrupt of system timer 2 */
@@ -116,7 +116,9 @@ typedef enum {
116116
ETS_PERI_BACKUP_INTR_SOURCE,
117117
ETS_DMA_EXTMEM_REJECT_SOURCE,
118118
ETS_MAX_INTR_SOURCE, /**< number of interrupt sources */
119-
} periph_interrput_t;
119+
} periph_interrupt_t;
120+
121+
typedef periph_interrupt_t periph_interrput_t __attribute__((deprecated("in favor of periph_interrupt_t")));
120122

121123
extern const char * const esp_isr_names[ETS_MAX_INTR_SOURCE];
122124

0 commit comments

Comments
 (0)