drivers/si70xx: move SAUL config to params.h

drivers/si70xx/include/si70xx_params.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2017 Inria
+ *               2017 Freie Universität Berlin
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -14,12 +15,15 @@
  * @brief       Default configuration for Si7006/13/20/21
  *
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
+ * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
 #ifndef SI70XX_PARAMS_H
 #define SI70XX_PARAMS_H
 
+#include "board.h"
 #include "si70xx.h"
+#include "saul_reg.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -30,14 +34,14 @@ extern "C" {
  * @{
  */
 #ifndef SI70XX_PARAM_I2C_DEV
-#define SI70XX_PARAM_I2C_DEV         (0)
+#define SI70XX_PARAM_I2C_DEV         I2C_DEV(0)
 #endif
 #ifndef SI70XX_PARAM_ADDR
 #define SI70XX_PARAM_ADDR            (0x80)
 #endif
 
-#define SI70XX_PARAMS_DEFAULT        {.i2c_dev = SI70XX_PARAM_I2C_DEV,  \
-                                      .address = SI70XX_PARAM_ADDR }
+#define SI70XX_PARAMS_DEFAULT        { .i2c_dev = SI70XX_PARAM_I2C_DEV,  \
+                                       .address = SI70XX_PARAM_ADDR }
 /**@}*/
 
 /**
@@ -52,6 +56,17 @@ static const si70xx_params_t si70xx_params[] =
 #endif
 };
 
+/**
+ * @brief   Configure SAUL registry entries
+ */
+static const saul_reg_info_t si70xx_saul_reg_info[][2] =
+{
+    {
+        { .name = "si70xx-temp" },
+        { .name = "si70xx-hum" }
+    }
+};
+
 #ifdef __cplusplus
 }
 #endif

sys/auto_init/saul/auto_init_si70xx.c

@@ -49,23 +49,6 @@ extern const saul_driver_t si70xx_temperature_saul_driver;
 extern const saul_driver_t si70xx_relative_humidity_saul_driver;
 /** @} */
 
-/**
- * @brief   Allocate and configure entries to the SAUL registry
- */
-saul_reg_t si70xx_saul_reg_info[][2] =
-{
-    {
-        {
-            .name = "si70xx-temp",
-            .driver = &si70xx_temperature_saul_driver
-        },
-        {
-            .name = "si70xx-hum",
-            .driver = &si70xx_relative_humidity_saul_driver
-        }
-    }
-};
-
 void auto_init_si70xx(void)
 {
     for (unsigned i = 0; i < SI70XX_NUMOF; i++) {
@@ -73,7 +56,7 @@ void auto_init_si70xx(void)
                               si70xx_params[i].i2c_dev,
                               si70xx_params[i].address);
         if (res < 0) {
-            LOG_ERROR("Unable to initialize BMP180 sensor #%i\n", i);
+            LOG_ERROR("Unable to initialize SI70xx sensor #%i\n", i);
             return;
         }