x

Author: soburi

cores/arduino/Arduino.h

@@ -21,6 +21,14 @@
 #define ARDUINO_HEADER_LABEL arduino_mkr_header
 #endif
 
+#define SUM_NGPIOS(i, n, p) \
+        DT_PROP(DT_PROP_BY_IDX(n, p, i), ngpios)
+
+#define GPIO_OFFSET_IDX_0 1
+
+#define GPIO_OFFSET(n, p, i) \
+        int hoge##i = COND_CODE_1(UTIL_CAT(GPIO_OFFSET_IDX_, i), (0), (LISTIFY(i, SUM_NGPIOS, (+), n, p)));
+
 #define DIGITAL_PIN_EXISTS(n, p, i, dev, num)                                                      \
 	(((dev == DT_REG_ADDR(DT_PHANDLE_BY_IDX(n, p, i))) &&                                      \
 	  (num == DT_PHA_BY_IDX(n, p, i, pin)))                                                    \

cores/arduino/zephyrCommon.cpp

@@ -7,6 +7,8 @@
 #include <Arduino.h>
 #include "zephyrInternal.h"
 
+DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), gpios, GPIO_OFFSET)
+
 static const struct gpio_dt_spec arduino_pins[] = {DT_FOREACH_PROP_ELEM_SEP(
 	DT_PATH(zephyr_user), digital_pin_gpios, GPIO_DT_SPEC_GET_BY_IDX, (, ))};
 

libraries/SPI/SPI.h

@@ -22,7 +22,7 @@
 /* Count the number of GPIOs for limit of number of interrupts */
 #define INTERRUPT_HELPER(n, p, i) 1
 #define INTERRUPT_COUNT                                                        \
-  DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), digital_pin_gpios,            \
+  DT_FOREACH_PROP_ELEM_SEP(DT_NODELABEL(ARDUINO_HEADER_LABEL), gpio_map,            \
                            INTERRUPT_HELPER, (+))
 
 namespace arduino {

variants/arduino_mkrzero/arduino_mkrzero.overlay

@@ -54,6 +54,7 @@
 				<&adc 6>,
 				<&adc 7>;
 
+		gpios = <&porta>, <&portb>, <&porta>;
 		serials = <&sercom5>;
 		i2cs = <&sercom0>;
 	};