libraries: Wire: Hanlde multiple Wire instances

Create multiple Wire instance if i2cs array contains plural elements.
Declare these as 'Wire1', 'Wire2', ..., from second element of the array.
(First element is already declare as 'Wire'.)

Signed-off-by: TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>

Author: soburi

libraries/Wire/Wire.cpp

@@ -5,6 +5,8 @@
  */
 
 #include <Wire.h>
+#include <zephyr/sys/util_macro.h>
+
 arduino::ZephyrI2C::ZephyrI2C(const struct device *i2c) : i2c_dev(i2c)
 {
 }
@@ -104,8 +106,25 @@ void arduino::ZephyrI2C::flush() {}
 void arduino::ZephyrI2C::onReceive(voidFuncPtrParamInt cb) {}
 void arduino::ZephyrI2C::onRequest(voidFuncPtr cb) {}
 
-#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), i2cs) && (DT_PROP_LEN(DT_PATH(zephyr_user), i2cs) > 0)
+#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), i2cs)
+#if (DT_PROP_LEN(DT_PATH(zephyr_user), i2cs) > 1)
+#define ARDUINO_WIRE_DEFINED_0 1
+#define DECL_WIRE_0(n, p, i)   arduino::ZephyrI2C Wire(DEVICE_DT_GET(DT_PHANDLE_BY_IDX(n, p, i)));
+#define DECL_WIRE_N(n, p, i)   arduino::ZephyrI2C Wire##i(DEVICE_DT_GET(DT_PHANDLE_BY_IDX(n, p, i)));
+#define DECLARE_WIRE_N(n, p, i)                                                                    \
+	COND_CODE_1(ARDUINO_WIRE_DEFINED_##i, (DECL_WIRE_0(n, p, i)), (DECL_WIRE_N(n, p, i)))
+
+/* Declare Wire, Wire1, Wire2, ... */
+DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), i2cs, DECLARE_WIRE_N)
+
+#undef DECLARE_WIRE_N
+#undef DECL_WIRE_N
+#undef DECL_WIRE_0
+#undef ARDUINO_WIRE_DEFINED_0
+#else  // PROP_LEN(i2cs) > 1
+/* When PROP_LEN(i2cs) == 1, DT_FOREACH_PROP_ELEM work not correctly. */
 arduino::ZephyrI2C Wire(DEVICE_DT_GET(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), i2cs, 0)));
+#endif // HAS_PORP(i2cs)
 /* If i2cs node is not defined, tries to use arduino_i2c */
 #elif DT_NODE_EXISTS(DT_NODELABEL(arduino_i2c))
 arduino::ZephyrI2C Wire(DEVICE_DT_GET(DT_NODELABEL(arduino_i2c)));

libraries/Wire/Wire.h

@@ -57,9 +57,21 @@ class ZephyrI2C : public HardwareI2C {
 
 } // namespace arduino
 
-#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), i2cs) &&                                                \
-		(DT_PROP_LEN(DT_PATH(zephyr_user), i2cs) > 0) ||                                   \
-	DT_NODE_EXISTS(DT_NODELABEL(arduino_i2c))
+#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), i2cs) && (DT_PROP_LEN(DT_PATH(zephyr_user), i2cs) > 1)
+#define ARDUINO_WIRE_DEFINED_0 1
+#define DECL_EXTERN_WIRE_0(i)  extern arduino::ZephyrI2C Wire;
+#define DECL_EXTERN_WIRE_N(i)  extern arduino::ZephyrI2C Wire##i;
+#define DECLARE_EXTERN_WIRE_N(n, p, i)                                                             \
+	COND_CODE_1(ARDUINO_WIRE_DEFINED_##i, (DECL_EXTERN_WIRE_0(i)), (DECL_EXTERN_WIRE_N(i)))
+
+/* Declare Wire, Wire1, Wire2, ... */
+DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), i2cs, DECLARE_EXTERN_WIRE_N)
+
+#undef DECLARE_EXTERN_WIRE_N
+#undef DECL_EXTERN_WIRE_N
+#undef DECL_EXTERN_WIRE_0
+#undef ARDUINO_WIRE_DEFINED_0
+#else
 extern arduino::ZephyrI2C Wire;
 #endif