fixup! cpu/atmega_common: adds pin change interrupts.

maribu · Jul 24, 2019 · 8f28ebd · 8f28ebd
1 parent 4d0e694
commit 8f28ebd
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/cpu/atmega_common/periph/gpio.c b/cpu/atmega_common/periph/gpio.c
@@ -35,6 +35,9 @@
 #include "periph_conf.h"
 #include "periph_cpu.h"
 
+#define ENABLE_DEBUG            (0)
+#include "debug.h"
+
 #define GPIO_BASE_PORT_A        (0x20)
 #define GPIO_OFFSET_PORT_H      (0xCB)
 #define GPIO_OFFSET_PIN_PORT    (0x02)
@@ -319,6 +322,7 @@ int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank,
         }
 
         unsigned bank = offset / 8;
+        DEBUG("PCINT enabled for bank %u offset %u\n", bank, (unsigned)offset);
 
         /* save configuration for pin change interrupt */
         pcint_config[offset].flank = flank;
@@ -434,27 +438,23 @@ static inline void pcint_handler(uint8_t bank, volatile uint8_t *mask_reg)
 {
     __enter_isr();
     /* Find right item */
-    uint8_t pin_num = 0;
+    uint8_t idx = 0;
     uint8_t enabled_pcints = *mask_reg;
 
     while (enabled_pcints > 0) {
         /* check if this pin is enabled & has changed */
         if (enabled_pcints & 0x1) {
-            /* re-construct mask from pin number*/
-            uint8_t pin_mask = (1 << pin_num);
             /* get pin from mapping (assumes 8 entries per bank!) */
-            gpio_t pin = pcint_mapping[ bank * 8 + pin_num ];
+            gpio_t pin = pcint_mapping[ bank * 8 + idx ];
+            /* re-construct mask from pin */
+            uint8_t pin_mask = (1 << (_pin_num(pin)));
+            uint8_t idx_mask = (1 << idx);
             uint8_t port_value = (_SFR_MEM8(_pin_addr( pin )));
             uint8_t pin_value = ((port_value & pin_mask) != 0);
-            uint8_t old_state = ((pcint_state[ bank ] & pin_mask) != 0);
-            gpio_isr_ctx_pcint_t *conf = &pcint_config[ bank * 8 + pin_num ];
+            uint8_t old_state = ((pcint_state[ bank ] & idx_mask) != 0);
+            gpio_isr_ctx_pcint_t *conf = &pcint_config[ bank * 8 + idx ];
             if (old_state != pin_value) {
-                if (pin_value) {
-                    pcint_state[ bank ] |= (pin_mask);
-                }
-                else {
-                    pcint_state[ bank ] &= ~(pin_mask);
-                }
+                pcint_state[ bank] ^= idx_mask;
                 if ((conf->flank == GPIO_BOTH ||
                      (pin_value && conf->flank == GPIO_RISING) ||
                      (!pin_value && conf->flank == GPIO_FALLING))) {
@@ -464,7 +464,7 @@ static inline void pcint_handler(uint8_t bank, volatile uint8_t *mask_reg)
             }
         }
         enabled_pcints = enabled_pcints >> 1;
-        pin_num++;
+        idx++;
     }
 
     __exit_isr();