ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12067 from jeromecoutant/PR_IRQ_CRITICAL 

STM32 GPIO IRQ : add a critical section in gpio_irq_init
pull/12132/head
Anna Bridge 2019-12-17 16:23:44 +00:00 committed by GitHub
parent 9209b98478 9317bea756
commit 378f8c2b26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
targets/TARGET_STM/gpio_irq_api.c
View File

@ -37,6 +37,7 @@
#include "pinmap.h" #include "pinmap.h"
#include "mbed_error.h" #include "mbed_error.h"
#include "gpio_irq_device.h" #include "gpio_irq_device.h"
#include "platform/mbed_critical.h"
#define EDGE_NONE (0) #define EDGE_NONE (0)
#define EDGE_RISE (1) #define EDGE_RISE (1)
@ -194,6 +195,8 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
return -1; return -1;
} }
core_util_critical_section_enter();
/* Enable SYSCFG Clock */ /* Enable SYSCFG Clock */
#if !defined(TARGET_STM32WB) #if !defined(TARGET_STM32WB)
__HAL_RCC_SYSCFG_CLK_ENABLE(); __HAL_RCC_SYSCFG_CLK_ENABLE();
@ -266,19 +269,25 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
NVIC_SetVector(obj->irq_n, vector); NVIC_SetVector(obj->irq_n, vector);
gpio_irq_enable(obj); gpio_irq_enable(obj);
core_util_critical_section_exit();
return 0; return 0;
} }
void gpio_irq_free(gpio_irq_t *obj) void gpio_irq_free(gpio_irq_t *obj)
{ {
core_util_critical_section_enter();
uint32_t gpio_idx = pin_lines_desc[STM_PIN(obj->pin)].gpio_idx; uint32_t gpio_idx = pin_lines_desc[STM_PIN(obj->pin)].gpio_idx;
gpio_channel_t *gpio_channel = &channels[obj->irq_index]; gpio_channel_t *gpio_channel = &channels[obj->irq_index];
gpio_irq_disable(obj);
gpio_channel->pin_mask &= ~(1 << gpio_idx); gpio_channel->pin_mask &= ~(1 << gpio_idx);
gpio_channel->channel_ids[gpio_idx] = 0; gpio_channel->channel_ids[gpio_idx] = 0;
gpio_channel->channel_gpio[gpio_idx] = 0; gpio_channel->channel_gpio[gpio_idx] = 0;
gpio_channel->channel_pin[gpio_idx] = 0; gpio_channel->channel_pin[gpio_idx] = 0;
gpio_irq_disable(obj);
core_util_critical_section_exit();
} }
void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable) void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable)
@ -342,6 +351,13 @@ void gpio_irq_disable(gpio_irq_t *obj)
LL_EXTI_DisableFallingTrig_0_31(1 << pin_index); LL_EXTI_DisableFallingTrig_0_31(1 << pin_index);
LL_EXTI_DisableIT_0_31(1 << pin_index); LL_EXTI_DisableIT_0_31(1 << pin_index);
uint32_t pin = (uint32_t)(1 << (gpio_channel->channel_pin[gpio_idx]));
// Clear interrupt flag
if (__HAL_GPIO_EXTI_GET_FLAG(pin) != RESET) {
__HAL_GPIO_EXTI_CLEAR_FLAG(pin);
}
const bool no_more_pins_on_vector = (gpio_channel->pin_mask & ~pin_mask) == 0; const bool no_more_pins_on_vector = (gpio_channel->pin_mask & ~pin_mask) == 0;
if (no_more_pins_on_vector) { if (no_more_pins_on_vector) {
NVIC_DisableIRQ(obj->irq_n); NVIC_DisableIRQ(obj->irq_n);