interrupt

Author: soburi

cores/arduino/zephyrCommon.cpp

@@ -128,7 +128,6 @@ const int sum_ngpios = sum_in_list(
 struct gpio_port_callback {
   struct gpio_callback callback;
   voidFuncPtr handlers[max_ngpios];
-  uint64_t enabled_pins;
   const struct device *dev;
 } port_callback[ARRAY_SIZE(gpios)] = {0};
 
@@ -158,13 +157,11 @@ void setInterruptHandler(pin_size_t pinNumber, voidFuncPtr func)
 
 void handleGpioCallback(const struct device *port, struct gpio_callback *cb, uint32_t pins)
 {
-  struct gpio_port_callback *pcb = (struct gpio_port_callback *)cb;
+  struct gpio_port_callback *pcb = CONTAINER_OF(cb, struct gpio_port_callback, callback);
 
   for (uint32_t i = 0; i < max_ngpios; i++) {
-    if (pins & BIT(i) && pcb->enabled_pins & BIT(i) {
-      if (pcb->handlers[i]) {
-        pcb->handlers[i]();
-      }
+    if (pins & BIT(i) && pcb->handlers[i]) {
+      pcb->handlers[i]();
     }
   }
 }
@@ -434,13 +431,15 @@ void attachInterrupt(pin_size_t pinNumber, voidFuncPtr callback, PinStatus pinSt
   pcb = find_gpio_port_callback(local_gpio_port(pinNumber));
   __ASSERT(pcb != nullptr, "gpio_port_callback not found");
 
-  pcb->pins |= BIT(local_gpio_pin(pinNumber));
   setInterruptHandler(pinNumber, callback);
-  enableInterrupt(pinNumber);
 
   gpio_pin_interrupt_configure(local_gpio_port(pinNumber), local_gpio_pin(pinNumber), intmode);
-  gpio_init_callback(&pcb->callback, handleGpioCallback, pcb->pins);
-  gpio_add_callback(local_gpio_port(pinNumber), &pcb->callback);
+  if (pcb->callback.handler == NULL) {
+    gpio_init_callback(&pcb->callback, handleGpioCallback, 0);
+    gpio_add_callback(local_gpio_port(pinNumber), &pcb->callback);
+  }
+
+  enableInterrupt(pinNumber);
 }
 
 void detachInterrupt(pin_size_t pinNumber)
@@ -514,15 +513,15 @@ void enableInterrupt(pin_size_t pinNumber) {
   struct gpio_port_callback *pcb = find_gpio_port_callback(local_gpio_port(pinNumber));
 
   if (pcb) {
-    pcb->enabled_pins |= BIT(local_gpio_pin(pinNumber));
+    pcb->callback.pin_mask |= BIT(local_gpio_pin(pinNumber));
   }
 }
 
 void disableInterrupt(pin_size_t pinNumber) {
   struct gpio_port_callback *pcb = find_gpio_port_callback(local_gpio_port(pinNumber));
 
   if (pcb) {
-    pcb->enabled_pins &= ~BIT(local_gpio_pin(pinNumber));
+    pcb->callback.pin_mask &= ~BIT(local_gpio_pin(pinNumber));
   }
 }