kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-26 06:53:52 +01:00
Code Releases Activity

cpu/lpc2387: gpio: Fix interrupts on PORT2

Browse Source 
The calculation of `_state_index` is broken for `port = 2`

    _gpio_isr_map[n + (port<<1)];

Will not yield the right result. As a consequence, IRQs on Port 2
are not working.
The right thing here would be

    _gpio_isr_map[n + (port ? 32 : 0)];

But we might just re-using the `_isr_map_entry()` function.
Also only iterate as many times as there are set interrupt bits.
This commit is contained in:
Benjamin Valentin 2020-04-12 21:01:46 +02:00 committed by Benjamin Valentin
parent 58beead805
commit 6233175f16
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cpu/lpc2387/periph/gpio.c
View File

@ -43,6 +43,11 @@ static uint8_t _gpio_isr_map[64]; /* only ports 0+2 can have ISRs */
static void _gpio_configure(gpio_t pin, unsigned rising, unsigned falling);
static inline int _isr_map_entry2(unsigned port, unsigned pin)
{
return pin + (port ? 32 : 0);
}
static int _isr_map_entry(gpio_t pin) {
unsigned _pin = pin & 31;
unsigned port = pin >> 5;
@ -52,11 +57,7 @@ static int _isr_map_entry(gpio_t pin) {
return -1;
}
if (port) {
_pin += 32;
}
return _pin;
return _isr_map_entry2(port, _pin);
}
#endif /* MODULE_PERIPH_GPIO_IRQ */
@ -271,18 +272,22 @@ static void test_irq(int port, unsigned long f_mask, unsigned long r_mask)
{
/* Test each bit of rising and falling masks, if set trigger interrupt
* on corresponding device */
unsigned bit = 0x1;
int n = 0;
while (bit) {
if ((r_mask & bit) | (f_mask & bit)) {
int _state_index = _gpio_isr_map[n + (port<<1)];
if (_state_index != 0xff) {
_gpio_states[_state_index].cb(_gpio_states[_state_index].arg);
}
unsigned long active_pins = f_mask | r_mask;
while (active_pins) {
/* we want the position of the first one bit, so N_bits - (N_leading_zeros + 1) */
unsigned pin = 32 - __builtin_clz(active_pins) - 1;
/* get the index of the configured interrupt */
int _state_index = _gpio_isr_map[_isr_map_entry2(port, pin)];
/* check if interrupt is configured */
if (_state_index != 0xff) {
_gpio_states[_state_index].cb(_gpio_states[_state_index].arg);
}
bit <<= 1;
n++;
/* clear bit */
active_pins &= ~(1 << pin);
}
}