x

Author: soburi

cores/arduino/Arduino.h

@@ -96,6 +96,7 @@
 #define ZARD_DN_ENUMS(n, p, i) DX##i = ZARD_GLOBAL_GPIO_NUM(n, p, i)
 enum digitalPinsx {
   DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), digital_pin_gpios, ZARD_DN_ENUMS, (,))
+  , NUM_OF_DIGIAL_PINSX
 };
 
 enum digitalPins {

cores/arduino/zephyrCommon.cpp

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2022 Dhruva Gole
+ * Copyright (c) 2025 TOKITA Hiroshi
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -91,22 +92,6 @@ inline int global_gpio_pin_configure(pin_size_t pinNumber, int flags)
   return gpio_pin_configure(local_gpio_port(pinNumber), local_gpio_pin(pinNumber), flags);
 }
 
-
-/*
- * Calculate GPIO ports/pins number statically from devicetree configuration
- */
-
-template <class N, class Head> constexpr const N sum_of_list(const N sum, const Head &head)
-{
-  return sum + head;
-}
-
-template <class N, class Head, class... Tail>
-constexpr const N sum_of_list(const N sum, const Head &head, const Tail &...tail)
-{
-  return sum_of_list(sum + head, tail...);
-}
-
 template <class N, class Head> constexpr const N max_in_list(const N max, const Head &head)
 {
   return (max >= head) ? max : head;
@@ -118,32 +103,6 @@ constexpr const N max_in_list(const N max, const Head &head, const Tail &...tail
   return max_in_list((max >= head) ? max : head, tail...);
 }
 
-template <class Query, class Head>
-constexpr const size_t is_first_appearance(const size_t &idx, const size_t &at, const size_t &found,
-             const Query &query, const Head &head)
-{
-  return ((found == ((size_t)-1)) && (query == head) && (idx == at)) ? 1 : 0;
-}
-
-template <class Query, class Head, class... Tail>
-constexpr const size_t is_first_appearance(const size_t &idx, const size_t &at, const size_t &found,
-             const Query &query, const Head &head,
-             const Tail &...tail)
-{
-  return ((found == ((size_t)-1)) && (query == head) && (idx == at))
-           ? 1
-           : is_first_appearance(idx + 1, at, (query == head ? idx : found), query,
-               tail...);
-}
-
-#define GET_DEVICE_VARGS(n, p, i, _) DEVICE_DT_GET(DT_GPIO_CTLR_BY_IDX(n, p, i))
-#define FIRST_APPEARANCE(n, p, i)                                                                  \
-  is_first_appearance(0, i, ((size_t)-1), DEVICE_DT_GET(DT_GPIO_CTLR_BY_IDX(n, p, i)),       \
-          DT_FOREACH_PROP_ELEM_SEP_VARGS(n, p, GET_DEVICE_VARGS, (, ), 0))
-const int port_num =
-  sum_of_list(0, DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), digital_pin_gpios,
-            FIRST_APPEARANCE, (, )));
-
 #define GPIO_NGPIOS(n, p, i) DT_PROP(DT_GPIO_CTLR_BY_IDX(n, p, i), ngpios)
 const int max_ngpios = max_in_list(
   0, DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), digital_pin_gpios, GPIO_NGPIOS, (, )));
@@ -162,7 +121,7 @@ struct gpio_port_callback {
   struct arduino_callback handlers[max_ngpios];
   gpio_port_pins_t pins;
   const struct device *dev;
-} port_callback[port_num] = {0};
+} port_callback[ARRAY_SIZE(gpios)] = {0};
 
 struct gpio_port_callback *find_gpio_port_callback(const struct device *dev)
 {
@@ -258,17 +217,8 @@ size_t analog_pin_index(pin_size_t pinNumber) {
 static unsigned int irq_key;
 static bool interrupts_disabled = false;
 } // namespace
-  //
-
-#define Dx(x) D ## x
-#define DXx(x) DX ## x
-#define PRINT_PIN(p, _) printf(STRINGIFY(Dx(p)) ":%d:%p:%d - " STRINGIFY(DXx(p)) ":%d:%p:%d\n", Dx(p), arduino_pins[Dx(p)].port, arduino_pins[Dx(p)].pin, DXx(p), local_gpio_port(DXx(p)), local_gpio_pin(DXx(p)));
 
 void yield(void) {
-
-  LISTIFY(23, PRINT_PIN, ());
-
-
   k_yield();
 }
 
@@ -581,3 +531,11 @@ int digitalPinToInterrupt(pin_size_t pin) {
 
   return (pcb) ? pin : -1;
 }
+
+#define Dx(x) D ## x
+#define DXx(x) DX ## x
+#define PRINT_PIN(p, _) printf(STRINGIFY(Dx(p)) ":%d:%p:%d - " STRINGIFY(DXx(p)) ":%d:%p:%d\n", Dx(p), arduino_pins[Dx(p)].port, arduino_pins[Dx(p)].pin, DXx(p), local_gpio_port(DXx(p)), local_gpio_pin(DXx(p)));
+
+void debug_dump(void) {
+  LISTIFY(DT_PROP_LEN(DT_PATH(zephyr_user), digital_pin_gpios), PRINT_PIN, ());
+}

samples/hello_arduino/src/app.cpp

@@ -10,7 +10,10 @@ void setup() {
   // put your setup code here, to run once:
   Serial.begin(115200); // dummy as of now, need to study and refer https://docs.zephyrproject.org/latest/hardware/peripherals/uart.html
 }
+
+void debug_dump();
+
 void loop() {
-	yield();
+	debug_dump();
 	while(true);
 }