14 files changed, 28 insertions, 28 deletions
diff --git a/src/driver/am2320.cc b/src/driver/am2320.cc
index 7157add..f68b108 100644
--- a/src/driver/am2320.cc
+++ b/src/driver/am2320.cc
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 #include "driver/am2320.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
+#if defined(CONFIG_meta_driver_hardware_i2c)
 #include "driver/i2c.h"
-#else
+#elif defined(CONFIG_driver_softi2c)
 #include "driver/soft_i2c.h"
 #endif
 #include "arch.h"
diff --git a/src/driver/bme680_util.cc b/src/driver/bme680_util.cc
index f679a31..7993778 100644
--- a/src/driver/bme680_util.cc
+++ b/src/driver/bme680_util.cc
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 #include "arch.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
+#if defined(CONFIG_meta_driver_hardware_i2c)
 #include "driver/i2c.h"
-#else
+#elif defined(CONFIG_driver_softi2c)
 #include "driver/soft_i2c.h"
 #endif
 #include <stdint.h>
diff --git a/src/driver/ccs811.cc b/src/driver/ccs811.cc
index 0206a96..f71c149 100644
--- a/src/driver/ccs811.cc
+++ b/src/driver/ccs811.cc
@@ -5,9 +5,9 @@
  */
 #include "driver/ccs811.h"
 #include "driver/gpio.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
+#if defined(CONFIG_meta_driver_hardware_i2c)
 #include "driver/i2c.h"
-#else
+#elif defined(CONFIG_driver_softi2c)
 #include "driver/soft_i2c.h"
 #endif
 
diff --git a/src/driver/ds2482.cc b/src/driver/ds2482.cc
index 92bd9dd..929b9be 100644
--- a/src/driver/ds2482.cc
+++ b/src/driver/ds2482.cc
@@ -6,9 +6,9 @@
  * DS2482-100 Single-Channel 1-Wire Master
  */
 #include "driver/ds2482.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
+#if defined(CONFIG_meta_driver_hardware_i2c)
 #include "driver/i2c.h"
-#else
+#elif defined (CONFIG_driver_softi2c)
 #include "driver/soft_i2c.h"
 #endif
 #include "arch.h"
diff --git a/src/driver/eeprom24lc64.cc b/src/driver/eeprom24lc64.cc
index 1c8158a..ceafa5b 100644
--- a/src/driver/eeprom24lc64.cc
+++ b/src/driver/eeprom24lc64.cc
@@ -5,9 +5,9 @@
  */
 #include <stdlib.h>
 #include "driver/eeprom24lc64.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
+#if defined(CONFIG_meta_driver_hardware_i2c)
 #include "driver/i2c.h"
-#else
+#elif defined(CONFIG_driver_softi2c)
 #include "driver/soft_i2c.h"
 #endif
 
diff --git a/src/driver/hdc1080.cc b/src/driver/hdc1080.cc
index 2ac983d..8232200 100644
--- a/src/driver/hdc1080.cc
+++ b/src/driver/hdc1080.cc
@@ -5,9 +5,9 @@
  */
 #include "driver/hdc1080.h"
 #include "arch.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
+#if defined(CONFIG_meta_driver_hardware_i2c)
 #include "driver/i2c.h"
-#else
+#elif defined(CONFIG_driver_softi2c)
 #include "driver/soft_i2c.h"
 #endif
 
diff --git a/src/driver/lm75.cc b/src/driver/lm75.cc
index 8aab05d..3224d7a 100644
--- a/src/driver/lm75.cc
+++ b/src/driver/lm75.cc
@@ -6,9 +6,9 @@
  * Driver for LM75B Digital Temperature Sensor and Thermal Watchdog.
  */
 #include "driver/lm75.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
+#if defined(CONFIG_meta_driver_hardware_i2c)
 #include "driver/i2c.h"
-#else
+#elif defined(CONFIG_driver_softi2c)
 #include "driver/soft_i2c.h"
 #endif
 
diff --git a/src/driver/max44009.cc b/src/driver/max44009.cc
index 8a8ff3e..dabc7d4 100644
--- a/src/driver/max44009.cc
+++ b/src/driver/max44009.cc
@@ -7,9 +7,9 @@
  * Does not support interrupts.
  */
 #include "driver/max44009.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
+#if defined(CONFIG_meta_driver_hardware_i2c)
 #include "driver/i2c.h"
-#else
+#elif defined(CONFIG_driver_softi2c)
 #include "driver/soft_i2c.h"
 #endif
 
diff --git a/src/driver/mmsimple.cc b/src/driver/mmsimple.cc
index fa7d9e3..791ed19 100644
--- a/src/driver/mmsimple.cc
+++ b/src/driver/mmsimple.cc
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 #include "driver/mmsimple.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
+#if defined(CONFIG_meta_driver_hardware_i2c)
 #include "driver/i2c.h"
-#else
+#elif defined(CONFIG_driver_softi2c)
 #include "driver/soft_i2c.h"
 #endif
 
diff --git a/src/driver/mmsubstate.cc b/src/driver/mmsubstate.cc
index cce2526..8082b65 100644
--- a/src/driver/mmsubstate.cc
+++ b/src/driver/mmsubstate.cc
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 #include "driver/mmsubstate.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
+#if defined(CONFIG_meta_driver_hardware_i2c)
 #include "driver/i2c.h"
-#else
+#elif defined(CONFIG_driver_softi2c)
 #include "driver/soft_i2c.h"
 #endif
 
diff --git a/src/driver/s5851a.cc b/src/driver/s5851a.cc
index 4cda5fe..28870e6 100644
--- a/src/driver/s5851a.cc
+++ b/src/driver/s5851a.cc
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 #include "driver/s5851a.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
+#if defined(CONFIG_meta_driver_hardware_i2c)
 #include "driver/i2c.h"
-#else
+#elif defined(CONFIG_driver_softi2c)
 #include "driver/soft_i2c.h"
 #endif
 
diff --git a/src/driver/scd4x.cc b/src/driver/scd4x.cc
index d129bf7..dfb6ee0 100644
--- a/src/driver/scd4x.cc
+++ b/src/driver/scd4x.cc
@@ -5,9 +5,9 @@
  */
 #include "driver/scd4x.h"
 #include "driver/gpio.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
+#if defined(CONFIG_meta_driver_hardware_i2c)
 #include "driver/i2c.h"
-#else
+#elif defined(CONFIG_driver_softi2c)
 #include "driver/soft_i2c.h"
 #endif
 
diff --git a/src/driver/ssd1306.cc b/src/driver/ssd1306.cc
index e1c299e..8f689ad 100644
--- a/src/driver/ssd1306.cc
+++ b/src/driver/ssd1306.cc
@@ -7,9 +7,9 @@
  * 128x64 and 128x32 Displays.
  */
 #include "driver/ssd1306.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
+#if defined(CONFIG_meta_driver_hardware_i2c)
 #include "driver/i2c.h"
-#else
+#elif defined(CONFIG_driver_softi2c)
 #include "driver/soft_i2c.h"
 #endif
 
diff --git a/src/driver/tsl2591.cc b/src/driver/tsl2591.cc
index 1f6dd6c..67532ca 100644
--- a/src/driver/tsl2591.cc
+++ b/src/driver/tsl2591.cc
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 #include "driver/tsl2591.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
+#if defined(CONFIG_meta_driver_hardware_i2c)
 #include "driver/i2c.h"
-#else
+#elif defined(CONFIG_driver_softi2c)
 #include "driver/soft_i2c.h"
 #endif