ports

Author: soburi

cores/arduino/Arduino.h

@@ -20,7 +20,7 @@
   COND_CODE_1(DT_SAME_NODE(DT_PROP_BY_IDX(n, p, i), nd),      \
 		                                   (LISTIFY(i, ZARD_ADD_NGPIOS, (), n, p)), ())
 #define ZARD_GLOBAL_GPIO_NUM(n, p, i)                                                              \
-  DT_FOREACH_PROP_ELEM_VARGS(DT_PATH(zephyr_user), gpios, ZARD_ACCUM_NGPIOS,                       \
+  DT_FOREACH_PROP_ELEM_VARGS(DT_PATH(zephyr_user), gpio_ports, ZARD_ACCUM_NGPIOS,                       \
 			     DT_PHANDLE_BY_IDX(n, p, i))                                           \
   DT_PHA_BY_IDX(n, p, i, pin)
 #define DIGITAL_PIN_EXISTS(n, p, i, dev, num)                                                      \

cores/arduino/zephyrCommon.cpp

@@ -15,12 +15,12 @@ namespace {
 
 #define DEVICE_GPIO(n, p, i) DEVICE_DT_GET(DT_PROP_BY_IDX(n, p, i))
 constexpr const struct device *gpios[] = {
-  DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), gpios, DEVICE_GPIO, (,))
+  DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), gpio_ports, DEVICE_GPIO, (,))
 };
 
 #define PROP_NGPIOS(n, p, i) DT_PROP(DT_PROP_BY_IDX(n, p, i), ngpios)
 constexpr uint32_t pins[] = {
-  DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), gpios, PROP_NGPIOS, (,))
+  DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), gpio_ports, PROP_NGPIOS, (,))
 };
 
 constexpr inline const struct device *local_gpio_port_recursive(pin_size_t pin,
@@ -46,9 +46,14 @@ constexpr inline const struct device *local_gpio_port(pin_size_t gpin)
   return local_gpio_port_recursive(gpin, gpios, pins, ARRAY_SIZE(gpios));
 }
 
+constexpr inline pin_size_t port_idx(pin_size_t gpin)
+{
+  return port_index_recursive(local_gpio_port(gpin), gpios, 0, ARRAY_SIZE(gpios));
+}
+
 constexpr inline pin_size_t local_gpio_pin(pin_size_t gpin)
 {
-  return gpin - pins[port_index_recursive(local_gpio_port(gpin), gpios, 0, ARRAY_SIZE(gpios))];
+  return port_idx(gpin) == pin_size_t(-1) ? pin_size_t(-1) : gpin - pins[port_idx(gpin)];
 }
 
 constexpr inline pin_size_t global_gpio_pin_(size_t port_idx, pin_size_t lpin)

variants/arduino_mkrzero/arduino_mkrzero.overlay

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

variants/arduino_nano_33_ble/arduino_nano_33_ble.overlay

@@ -59,7 +59,7 @@
 				<&adc 4>,
 				<&adc 1>;
 
-		gpios = <&gpio0>, <&gpio1>;
+		gpio-ports = <&gpio0>, <&gpio1>;
 		serials = <&uart0>;
 		i2cs = <&arduino_nano_i2c>;
 	};

variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense.overlay

@@ -59,7 +59,7 @@
 				<&adc 4>,
 				<&adc 1>;
 
-		gpios = <&gpio0>, <&gpio1>;
+		gpio-ports = <&gpio0>, <&gpio1>;
 		serials = <&uart0>;
 		i2cs = <&arduino_nano_i2c>;
 	};

variants/arduino_nano_33_iot/arduino_nano_33_iot.overlay

@@ -60,7 +60,7 @@
 				<&adc 6>,
 				<&adc 7>;
 
-		gpios = <&porta>, <&portb>;
+		gpio-ports = <&porta>, <&portb>;
 		serials = <&sercom5>;
 		i2cs = <&arduino_nano_i2c>;
 	};

variants/beagleconnect_freedom/beagleconnect_freedom.overlay

@@ -59,7 +59,7 @@
 
  	builtin-led-gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>;	/*  2.4GHz TX/RX  */
 
-	gpios = <&gpio0>;
+	gpio-ports = <&gpio0>;
  	serials = <&uart0 &uart1>;
  	i2cs = <&i2c0>;
 	spis = <&spi0>;

variants/cc3220sf_launchxl/cc3220sf_launchxl.overlay

@@ -31,7 +31,7 @@
 				<&boosterpack_header 32 0>;	/* GPIO_23 */
 		builtin-led-gpios = <&boosterpack_header 10 0>;	/*  GREEN_LED  */
 
-		gpios = <&gpioa0>, <&gpioa1>, <&gpioa2>, <&gpioa3>;
+		gpio-ports = <&gpioa0>, <&gpioa1>, <&gpioa2>, <&gpioa3>;
 		serials = <&boosterpack_serial>;
 		i2cs = <&boosterpack_i2c>;
 	};

variants/nrf52840dk_nrf52840/nrf52840dk_nrf52840.overlay

@@ -53,7 +53,7 @@
 				<&arduino_adc 4>,
 				<&arduino_adc 5>;
 
-		gpios = <&gpio0>, <&gpio1>;
+		gpio-ports = <&gpio0>, <&gpio1>;
 	};
 };
 

variants/nrf9160dk_nrf9160/nrf9160dk_nrf9160.overlay

@@ -58,7 +58,7 @@
 			<&arduino_adc 4>,
 			<&arduino_adc 5>;
 
-		gpios = <&gpio0>;
+		gpio-ports = <&gpio0>;
 	};
 };