diff options
| author | ZYH <[email protected]> | 2018-03-02 20:39:52 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-03-02 20:39:52 +0800 |
| commit | 78c83b364e910182d1c59331a2552526fbf7be1e (patch) | |
| tree | 21fcef4af98913cbd2f90626c603954f243378ec /bsp | |
| parent | b9c2acba8721541e3a295e57f44b4504ab9e8d52 (diff) | |
| parent | d3cb7478ec53f76f4b6b44871a56b1a106369b43 (diff) | |
Merge pull request #1236 from zhang-peter/patch-1
stm32f10x enters external interrupt handler forever
Diffstat (limited to 'bsp')
| -rwxr-xr-x | bsp/stm32f10x/drivers/gpio.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bsp/stm32f10x/drivers/gpio.c b/bsp/stm32f10x/drivers/gpio.c index 3d499bb5a2..fa46c71349 100755 --- a/bsp/stm32f10x/drivers/gpio.c +++ b/bsp/stm32f10x/drivers/gpio.c @@ -21,8 +21,8 @@ #define STM32F10X_PIN_NUMBERS 100 //[48, 64, 100, 144 ] -#define __STM32_PIN(index, rcc, gpio, gpio_index) { 0, RCC_##rcc##Periph_GPIO##gpio, GPIO##gpio, GPIO_Pin_##gpio_index} -#define __STM32_PIN_DEFAULT {-1, 0, 0, 0} +#define __STM32_PIN(index, rcc, gpio, gpio_index) { 0, RCC_##rcc##Periph_GPIO##gpio, GPIO##gpio, GPIO_Pin_##gpio_index, GPIO_PortSourceGPIO##gpio, GPIO_PinSource##gpio_index} +#define __STM32_PIN_DEFAULT {-1, 0, 0, 0, 0, 0} /* STM32 GPIO driver */ struct pin_index @@ -31,6 +31,8 @@ struct pin_index uint32_t rcc; GPIO_TypeDef *gpio; uint32_t pin; + uint8_t port_source; + uint8_t pin_source; }; static const struct pin_index pins[] = @@ -695,6 +697,7 @@ rt_err_t stm32_pin_irq_enable(struct rt_device *device, rt_base_t pin, NVIC_InitStructure.NVIC_IRQChannelCmd=ENABLE; NVIC_Init(&NVIC_InitStructure); + GPIO_EXTILineConfig(index->port_source, index->pin_source); EXTI_InitStructure.EXTI_Line = irqmap->irqbit; EXTI_InitStructure.EXTI_Mode = EXTI_Mode_Interrupt; switch(pin_irq_hdr_tab[irqindex].mode) |