x

Author: soburi

cores/arduino/zephyrCommon.cpp

@@ -7,6 +7,7 @@
 #include <Arduino.h>
 #include "zephyrInternal.h"
 
+
 namespace {
 
 struct device gpio0;
@@ -17,47 +18,40 @@ static constexpr uint32_t pins[] = {16u, 32u}; // exclusive-upper
 static constexpr size_t NUM_PORTS = sizeof(gpios) / sizeof(gpios[0]);
 
 
-constexpr pin_size_t local_gpio_pin(int) {
-  return 0;
-}
-
 /* グローバル → gpio* を探す */
-constexpr const struct device *
-local_gpio_port_recursive(size_t pin, const struct device *const *ctrl,
+constexpr const struct device * local_gpio_port_recursive(pin_size_t pin, const struct device *const *ctrl,
                      const uint32_t *end, size_t n) {
   return (n == 0)         ? nullptr
          : (pin < end[0]) ? ctrl[0]
                           : local_gpio_port_recursive(pin, ctrl + 1, end + 1, n - 1);
 }
 
-constexpr const struct device *local_gpio_port(size_t pin) {
-  return local_gpio_port_recursive(pin, gpios, pins, NUM_PORTS);
+constexpr const struct device *local_gpio_port(pin_size_t gpin) {
+  return local_gpio_port_recursive(gpin, gpios, pins, NUM_PORTS);
 }
 
 /* ポートインデックスを取得（見つからなければ size_t(-1)） */
-constexpr size_t port_index_recursive(const struct device *target,
+constexpr pin_size_t port_index_recursive(const struct device *target,
                                            const struct device *const *table,
-                                           size_t idx, size_t n) {
+                                           pin_size_t idx, size_t n) {
   return (n == 0) ? size_t(-1)
          : (target == table[0])
              ? idx
              : port_index_recursive(target, table + 1, idx + 1, n - 1);
 }
 
-pin_size_t global_gpio_pin(const struct device *port, size_t local_pin) noexcept {
-  size_t pidx = port_index_recursive(port, gpios, 0, NUM_PORTS);
-  size_t base = (pidx == 0) ? 0 : pins[pidx - 1];
-  size_t width = pins[pidx] - base;
+constexpr pin_size_t local_gpio_pin(pin_size_t gpin) {
+  return gpin - pins[port_index_recursive(local_gpio_port(gpin), gpios, 0, NUM_PORTS)];
+}
 
-  return ((local_pin < width) ? base + local_pin : size_t(-1));
+constexpr pin_size_t global_gpio_pin(const struct device *lport, pin_size_t lpin) noexcept {
+  return pins[port_index_recursive(lport, gpios, 0, NUM_PORTS)] + lpin;
 }
 
 constexpr uint32_t local_gpio_dt_flags(int) {
   return 0;
 }
 
-
-
 template <class N, class Head> constexpr const N max_in_list(const N max, const Head &head)
 {
   return (max >= head) ? max : head;