clean

Author: soburi

cores/arduino/zephyrCommon.cpp

@@ -7,7 +7,6 @@
 #include <Arduino.h>
 #include "zephyrInternal.h"
 
-
 namespace {
 
 struct device gpio0;
@@ -17,41 +16,55 @@ static constexpr struct device *gpios[] = {&gpio0, &gpio1};
 static constexpr uint32_t pins[] = {16u, 32u}; // exclusive-upper
 static constexpr size_t NUM_PORTS = sizeof(gpios) / sizeof(gpios[0]);
 
-
-/* グローバル → gpio* を探す */
-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);
+static constexpr inline 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(pin_size_t gpin) {
-  return local_gpio_port_recursive(gpin, gpios, pins, NUM_PORTS);
+
+static constexpr inline pin_size_t port_index_recursive(const struct device *target,
+					  const struct device *const *table, 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);
 }
 
-/* ポートインデックスを取得（見つからなければ size_t(-1)） */
-constexpr pin_size_t port_index_recursive(const struct device *target,
-                                           const struct device *const *table,
-                                           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);
+static constexpr inline const struct device *local_gpio_port(pin_size_t gpin)
+{
+  return local_gpio_port_recursive(gpin, gpios, pins, NUM_PORTS);
 }
 
-constexpr pin_size_t local_gpio_pin(pin_size_t gpin) {
+static constexpr inline pin_size_t local_gpio_pin(pin_size_t gpin)
+{
   return gpin - pins[port_index_recursive(local_gpio_port(gpin), gpios, 0, NUM_PORTS)];
 }
 
-constexpr pin_size_t global_gpio_pin(const struct device *lport, pin_size_t lpin) noexcept {
+static constexpr inline 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) {
+static constexpr inline uint32_t local_gpio_dt_flags(int)
+{
   return 0;
 }
 
+static inline int global_gpio_pin_get(pin_size_t pinNumber)
+{
+  return gpio_pin_get(local_gpio_port(pinNumber), local_gpio_pin(pinNumber));
+}
+
+static 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);
+}
+
 template <class N, class Head> constexpr const N max_in_list(const N max, const Head &head)
 {
   return (max >= head) ? max : head;
@@ -185,14 +198,16 @@ struct pin_timer {
 struct pin_timer arduino_pin_timers[GPIO_PORT_NUMS];
 struct pin_timer arduino_pin_timers_timeout[GPIO_PORT_NUMS];
 
-void tone_expiry_cb(struct k_timer *timer) {
-  struct pin_timer* pt = (struct pin_timer*)k_timer_user_data_get(timer);
-  gpio_pin_toggle_dt(&pt->spec);
+void tone_expiry_cb(struct k_timer *timer)
+{
+	struct pin_timer *pt = (struct pin_timer *)k_timer_user_data_get(timer);
+	gpio_pin_toggle_dt(&pt->spec);
 }
 
-void tone_timeout_cb(struct k_timer *timer) {
-  struct pin_timer* pt = (struct pin_timer*)k_timer_user_data_get(timer);
-  noTone(global_gpio_pin(pt->spec.port, pt->spec.pin));
+void tone_timeout_cb(struct k_timer *timer)
+{
+	struct pin_timer *pt = (struct pin_timer *)k_timer_user_data_get(timer);
+	noTone(global_gpio_pin(pt->spec.port, pt->spec.pin));
 }
 
 } // namespace
@@ -208,17 +223,13 @@ void yield(void) {
  */
 void pinMode(pin_size_t pinNumber, PinMode pinMode) {
   if (pinMode == INPUT) { // input mode
-    gpio_pin_configure(local_gpio_port(pinNumber), local_gpio_pin(pinNumber),
-                          GPIO_INPUT | GPIO_ACTIVE_HIGH);
+    global_gpio_pin_configure(pinNumber, GPIO_INPUT | GPIO_ACTIVE_HIGH);
   } else if (pinMode == INPUT_PULLUP) { // input with internal pull-up
-    gpio_pin_configure(local_gpio_port(pinNumber), local_gpio_pin(pinNumber),
-                          GPIO_INPUT | GPIO_PULL_UP | GPIO_ACTIVE_HIGH);
+    global_gpio_pin_configure(pinNumber, GPIO_INPUT | GPIO_PULL_UP | GPIO_ACTIVE_HIGH);
   } else if (pinMode == INPUT_PULLDOWN) { // input with internal pull-down
-    gpio_pin_configure(local_gpio_port(pinNumber), local_gpio_pin(pinNumber),
-                          GPIO_INPUT | GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH);
+    global_gpio_pin_configure(pinNumber, GPIO_INPUT | GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH);
   } else if (pinMode == OUTPUT) { // output mode
-    gpio_pin_configure(local_gpio_port(pinNumber), local_gpio_pin(pinNumber),
-                          GPIO_OUTPUT_LOW | GPIO_ACTIVE_HIGH);
+    global_gpio_pin_configure(pinNumber, GPIO_OUTPUT_LOW | GPIO_ACTIVE_HIGH);
   }
 }
 
@@ -236,7 +247,7 @@ void tone(pin_size_t pinNumber, unsigned int frequency, unsigned long duration)
   k_timeout_t timeout;
 
   arduino_pin_timers[pinNumber].spec.port = local_gpio_port(pinNumber);
-  arduino_pin_timers[pinNumber].spec.pin  = local_gpio_pin(pinNumber);
+  arduino_pin_timers[pinNumber].spec.pin = local_gpio_pin(pinNumber);
   arduino_pin_timers[pinNumber].spec.dt_flags = local_gpio_dt_flags(pinNumber);
 
   pinMode(pinNumber, OUTPUT);
@@ -253,10 +264,10 @@ void tone(pin_size_t pinNumber, unsigned int frequency, unsigned long duration)
   gpio_pin_set_dt(&arduino_pin_timers[pinNumber].spec, 1);
   k_timer_start(timer, timeout, timeout);
 
-  if(duration > 0) {
+  if (duration > 0) {
     timer = &arduino_pin_timers_timeout[pinNumber].timer;
     arduino_pin_timers_timeout[pinNumber].spec.port = local_gpio_port(pinNumber);
-    arduino_pin_timers_timeout[pinNumber].spec.pin  = local_gpio_pin(pinNumber);
+    arduino_pin_timers_timeout[pinNumber].spec.pin = local_gpio_pin(pinNumber);
     arduino_pin_timers_timeout[pinNumber].spec.dt_flags = local_gpio_dt_flags(pinNumber);
     k_timer_init(timer, tone_timeout_cb, NULL);
     k_timer_user_data_set(timer, &arduino_pin_timers_timeout[pinNumber]);
@@ -436,18 +447,18 @@ unsigned long pulseIn(pin_size_t pinNumber, uint8_t state, unsigned long timeout
     goto cleanup;
   }
 
-  while(gpio_pin_get(local_gpio_port(pinNumber), local_gpio_pin(pinNumber)) == state && k_timer_status_get(&timer) == 0);
+  while (global_gpio_pin_get(pinNumber) == state && k_timer_status_get(&timer) == 0);
   if (k_timer_status_get(&timer) > 0) {
     goto cleanup;
   }
 
-  while(gpio_pin_get(local_gpio_port(pinNumber), local_gpio_pin(pinNumber)) != state && k_timer_status_get(&timer) == 0);
+  while (global_gpio_pin_get(pinNumber) != state && k_timer_status_get(&timer) == 0);
   if (k_timer_status_get(&timer) > 0) {
     goto cleanup;
   }
 
   start = k_uptime_ticks();
-  while(gpio_pin_get(local_gpio_port(pinNumber), local_gpio_pin(pinNumber)) == state && k_timer_status_get(&timer) == 0);
+  while (global_gpio_pin_get(pinNumber) == state && k_timer_status_get(&timer) == 0);
   if (k_timer_status_get(&timer) > 0) {
     goto cleanup;
   }