Skip to content

Commit a491a77

Browse files
fpistmfpistm
committed
Remove unused .pin field of gpio_irq_conf_str structure
Reduce gpio_irq_conf array of 64 bytes. Pin is the index. Signed-off-by: Frederic.Pillon <[email protected]>
1 parent c1568cb commit a491a77

File tree

1 file changed

+32
-34
lines changed

1 file changed

+32
-34
lines changed

‎cores/arduino/stm32/interrupt.c

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363

6464
/*As we can have only one interrupt/pin id, don't need to get the port info*/
6565
typedef struct {
66-
uint32_t pin;
6766
uint32_t irqnb;
6867
void (*callback)(void);
6968
uint32_t mode;
@@ -94,42 +93,41 @@ typedef struct {
9493
*/
9594
static gpio_irq_conf_str gpio_irq_conf[NB_EXTI] = {
9695
#if defined (STM32F0xx) || defined (STM32L0xx)
97-
{.pin = GPIO_PIN_0, .irqnb = EXTI0_1_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
98-
{.pin = GPIO_PIN_1, .irqnb = EXTI0_1_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
99-
{.pin = GPIO_PIN_2, .irqnb = EXTI2_3_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
100-
{.pin = GPIO_PIN_3, .irqnb = EXTI2_3_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
101-
{.pin = GPIO_PIN_4, .irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
102-
{.pin = GPIO_PIN_5, .irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
103-
{.pin = GPIO_PIN_6, .irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
104-
{.pin = GPIO_PIN_7, .irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
105-
{.pin = GPIO_PIN_8, .irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
106-
{.pin = GPIO_PIN_9, .irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
107-
{.pin = GPIO_PIN_10, .irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
108-
{.pin = GPIO_PIN_11, .irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
109-
{.pin = GPIO_PIN_12, .irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
110-
{.pin = GPIO_PIN_13, .irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
111-
{.pin = GPIO_PIN_14, .irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
112-
{.pin = GPIO_PIN_15, .irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}
96+
{.irqnb = EXTI0_1_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_0
97+
{.irqnb = EXTI0_1_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_1
98+
{.irqnb = EXTI2_3_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_2
99+
{.irqnb = EXTI2_3_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_3
100+
{.irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_4
101+
{.irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_5
102+
{.irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_6
103+
{.irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_7
104+
{.irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_8
105+
{.irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_9
106+
{.irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_10
107+
{.irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_11
108+
{.irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_12
109+
{.irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_13
110+
{.irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_14
111+
{.irqnb = EXTI4_15_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING} //GPIO_PIN_15
113112
#else
114-
{.pin = GPIO_PIN_0, .irqnb = EXTI0_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
115-
{.pin = GPIO_PIN_1, .irqnb = EXTI1_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
116-
{.pin = GPIO_PIN_2, .irqnb = EXTI2_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
117-
{.pin = GPIO_PIN_3, .irqnb = EXTI3_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
118-
{.pin = GPIO_PIN_4, .irqnb = EXTI4_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
119-
{.pin = GPIO_PIN_5, .irqnb = EXTI9_5_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
120-
{.pin = GPIO_PIN_6, .irqnb = EXTI9_5_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
121-
{.pin = GPIO_PIN_7, .irqnb = EXTI9_5_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
122-
{.pin = GPIO_PIN_8, .irqnb = EXTI9_5_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
123-
{.pin = GPIO_PIN_9, .irqnb = EXTI9_5_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
124-
{.pin = GPIO_PIN_10, .irqnb = EXTI15_10_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
125-
{.pin = GPIO_PIN_11, .irqnb = EXTI15_10_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
126-
{.pin = GPIO_PIN_12, .irqnb = EXTI15_10_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
127-
{.pin = GPIO_PIN_13, .irqnb = EXTI15_10_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
128-
{.pin = GPIO_PIN_14, .irqnb = EXTI15_10_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING},
129-
{.pin = GPIO_PIN_15, .irqnb = EXTI15_10_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}
113+
{.irqnb = EXTI0_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_0
114+
{.irqnb = EXTI1_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_1
115+
{.irqnb = EXTI2_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_2
116+
{.irqnb = EXTI3_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_3
117+
{.irqnb = EXTI4_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_4
118+
{.irqnb = EXTI9_5_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_5
119+
{.irqnb = EXTI9_5_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_6
120+
{.irqnb = EXTI9_5_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_7
121+
{.irqnb = EXTI9_5_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_8
122+
{.irqnb = EXTI9_5_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_9
123+
{.irqnb = EXTI15_10_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_10
124+
{.irqnb = EXTI15_10_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_11
125+
{.irqnb = EXTI15_10_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_12
126+
{.irqnb = EXTI15_10_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_13
127+
{.irqnb = EXTI15_10_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING}, //GPIO_PIN_14
128+
{.irqnb = EXTI15_10_IRQn, .callback = NULL, .mode = GPIO_MODE_IT_RISING} //GPIO_PIN_15
130129
#endif
131130
};
132-
133131
/**
134132
* @}
135133
*/

0 commit comments

Comments
 (0)