riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu/lpc2387: gpio: Don't discriminate between rising & falling pins

Browse Source 
The `test_irq()` function does not discriminate between rising and
falling pins, so there is no need to handle them separately.
This commit is contained in:
Benjamin Valentin 2020-04-12 21:06:56 +02:00 committed by Benjamin Valentin
parent 6233175f16
commit cfe606b601
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,11 +268,10 @@ void gpio_irq_disable(gpio_t dev)
_gpio_configure(dev, 0, 0); _gpio_configure(dev, 0, 0);
} }
static void test_irq(int port, unsigned long f_mask, unsigned long r_mask) static void test_irq(int port, unsigned long active_pins)
{ {
/* Test each bit of rising and falling masks, if set trigger interrupt /* Test each bit of rising and falling masks, if set trigger interrupt
* on corresponding device */ * on corresponding device */
unsigned long active_pins = f_mask | r_mask;
while (active_pins) { while (active_pins) {
/* we want the position of the first one bit, so N_bits - (N_leading_zeros + 1) */ /* we want the position of the first one bit, so N_bits - (N_leading_zeros + 1) */
@ -295,24 +294,18 @@ void GPIO_IRQHandler(void) __attribute__((interrupt("IRQ")));
void GPIO_IRQHandler(void) void GPIO_IRQHandler(void)
{ {
unsigned long int_stat;
if (IO_INT_STAT & BIT0) { /* interrupt(s) on PORT0 pending */ if (IO_INT_STAT & BIT0) { /* interrupt(s) on PORT0 pending */
unsigned long int_stat_f = IO0_INT_STAT_F; /* save content */ int_stat = IO0_INT_STAT_F | IO0_INT_STAT_R; /* get risen & fallen pin IRQs */
unsigned long int_stat_r = IO0_INT_STAT_R; /* save content */ IO0_INT_CLR = int_stat; /* clear IRQ flags */
test_irq(0, int_stat);
IO0_INT_CLR = int_stat_f; /* clear flags of fallen pins */
IO0_INT_CLR = int_stat_r; /* clear flags of risen pins */
test_irq(0, int_stat_f, int_stat_r);
} }
if (IO_INT_STAT & BIT2) { /* interrupt(s) on PORT2 pending */ if (IO_INT_STAT & BIT2) { /* interrupt(s) on PORT2 pending */
unsigned long int_stat_f = IO2_INT_STAT_F; /* save content */ int_stat = IO2_INT_STAT_F | IO2_INT_STAT_R; /* get risen & fallen pin IRQs */
unsigned long int_stat_r = IO2_INT_STAT_R; /* save content */ IO2_INT_CLR = int_stat; /* clear IRQ flags */
test_irq(2, int_stat);
IO2_INT_CLR = int_stat_f; /* clear flags of fallen pins */
IO2_INT_CLR = int_stat_r; /* clear flags of risen pins */
test_irq(2, int_stat_f, int_stat_r);
} }
VICVectAddr = 0; /* Acknowledge Interrupt */ VICVectAddr = 0; /* Acknowledge Interrupt */