interrupt_enable

Author: soburi

cores/arduino/zephyrCommon.cpp

@@ -125,15 +125,10 @@ const int sum_ngpios = sum_in_list(
  * GPIO callback implementation
  */
 
-struct arduino_callback {
-  voidFuncPtr handler;
-  bool enabled;
-};
-
 struct gpio_port_callback {
   struct gpio_callback callback;
-  struct arduino_callback handlers[max_ngpios];
-  gpio_port_pins_t pins;
+  voidFuncPtr handlers[max_ngpios];
+  uint64_t enabled_pins;
   const struct device *dev;
 } port_callback[ARRAY_SIZE(gpios)] = {0};
 
@@ -157,7 +152,7 @@ void setInterruptHandler(pin_size_t pinNumber, voidFuncPtr func)
   struct gpio_port_callback *pcb = find_gpio_port_callback(local_gpio_port(pinNumber));
 
   if (pcb) {
-    pcb->handlers[local_gpio_pin(pinNumber)].handler = func;
+    pcb->handlers[local_gpio_pin(pinNumber)] = func;
   }
 }
 
@@ -166,8 +161,10 @@ void handleGpioCallback(const struct device *port, struct gpio_callback *cb, uin
   struct gpio_port_callback *pcb = (struct gpio_port_callback *)cb;
 
   for (uint32_t i = 0; i < max_ngpios; i++) {
-    if (pins & BIT(i) && pcb->handlers[i].enabled) {
-      pcb->handlers[i].handler();
+    if (pins & BIT(i) && pcb->enabled_pins & BIT(i) {
+      if (pcb->handlers[i]) {
+        pcb->handlers[i]();
+      }
     }
   }
 }
@@ -517,15 +514,15 @@ void enableInterrupt(pin_size_t pinNumber) {
   struct gpio_port_callback *pcb = find_gpio_port_callback(local_gpio_port(pinNumber));
 
   if (pcb) {
-    pcb->handlers[local_gpio_pin(pinNumber)].enabled = true;
+    pcb->enabled_pins |= 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->handlers[local_gpio_pin(pinNumber)].enabled = false;
+    pcb->enabled_pins &= ~BIT(local_gpio_pin(pinNumber));
   }
 }