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 #2372 from anangl/gpio_irq_fix 

Fixed irq handling in gpio_api.
pull/2347/merge
Sam Grove 2016-08-04 14:54:50 -05:00 committed by GitHub
parent 0edef2da82 41c9d1d67c
commit e9cebde193
1 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/gpio_api.c
View File

@ -22,13 +22,6 @@
#define GPIO_PIN_COUNT 31 #define GPIO_PIN_COUNT 31
typedef enum {
GPIO_NOT_USED = 0,
GPIO_USED = 1,
GPIO_USED_IRQ = 2,
GPIO_USED_IRQ_DISABLED = 3
} gpio_usage_t;
typedef struct { typedef struct {
bool used_as_gpio : 1; bool used_as_gpio : 1;
PinDirection direction : 1; PinDirection direction : 1;
@ -116,7 +109,7 @@ static void gpio_apply_config(uint8_t pin)
if ((m_gpio_irq_enabled & (1 << pin)) if ((m_gpio_irq_enabled & (1 << pin))
&& (m_gpio_cfg[pin].irq_rise || m_gpio_cfg[pin].irq_fall)) && (m_gpio_cfg[pin].irq_rise || m_gpio_cfg[pin].irq_fall))
{ {
nrf_drv_gpiote_in_event_enable(pin, false); nrf_drv_gpiote_in_event_enable(pin, true);
} }
} }
else { else {
@ -198,30 +191,25 @@ void gpio_irq_free(gpio_irq_t *obj)
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)
{ {
bool event_enabled_before = false; gpio_cfg_t* cfg = &m_gpio_cfg[obj->ch];
if ((m_gpio_irq_enabled & (1 << obj->ch)) bool irq_enabled_before =
&& (m_gpio_cfg[obj->ch].irq_rise || m_gpio_cfg[obj->ch].irq_fall)) { (m_gpio_irq_enabled & (1 << obj->ch)) &&
event_enabled_before = true; (cfg->irq_rise || cfg->irq_fall);
}
if (event == IRQ_RISE) { if (event == IRQ_RISE) {
m_gpio_cfg[obj->ch].irq_rise = enable ? true : false; cfg->irq_rise = enable ? true : false;
} }
else if (event == IRQ_FALL) { else if (event == IRQ_FALL) {
m_gpio_cfg[obj->ch].irq_fall = enable ? true : false; cfg->irq_fall = enable ? true : false;
} }
bool event_enabled_after = false; bool irq_enabled_after = cfg->irq_rise || cfg->irq_fall;
if ((m_gpio_irq_enabled & (1 << obj->ch))
&& (m_gpio_cfg[obj->ch].irq_rise || m_gpio_cfg[obj->ch].irq_fall)) {
event_enabled_after = true;
}
if (event_enabled_before != event_enabled_after) { if (irq_enabled_before != irq_enabled_after) {
if (event_enabled_after) { if (irq_enabled_after) {
nrf_drv_gpiote_in_event_enable(obj->ch,false); gpio_irq_enable(obj);
} else { } else {
nrf_drv_gpiote_in_event_disable(obj->ch); gpio_irq_disable(obj);
} }
} }
} }
@ -239,7 +227,5 @@ void gpio_irq_enable(gpio_irq_t *obj)
void gpio_irq_disable(gpio_irq_t *obj) void gpio_irq_disable(gpio_irq_t *obj)
{ {
m_gpio_irq_enabled &= ~(1 << obj->ch); m_gpio_irq_enabled &= ~(1 << obj->ch);
if (m_gpio_cfg[obj->ch].irq_rise || m_gpio_cfg[obj->ch].irq_fall) { nrf_drv_gpiote_in_event_disable(obj->ch);
nrf_drv_gpiote_in_event_enable(obj->ch, false);
}
} }