drivers/bmp180: move SAUL config to params.h

RIOT-OS · Jan 17, 2017 · 232b8eb · 232b8eb
1 parent b24be6a
commit 232b8eb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 20 deletions.
diff --git a/drivers/bmp180/include/bmp180_params.h b/drivers/bmp180/include/bmp180_params.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2016 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
@@ -33,14 +34,14 @@ extern "C" {
  * @{
  */
 #ifndef BMP180_PARAM_I2C_DEV
-#define BMP180_PARAM_I2C_DEV         (0)
+#define BMP180_PARAM_I2C_DEV         I2C_DEV(0)
 #endif
 #ifndef BMP180_PARAM_MODE
 #define BMP180_PARAM_MODE            BMP180_ULTRALOWPOWER
 #endif
 
-#define BMP180_PARAMS_DEFAULT        {.i2c_dev = BMP180_PARAM_I2C_DEV,  \
-                                      .mode    = BMP180_PARAM_MODE }
+#define BMP180_PARAMS_DEFAULT        { .i2c_dev = BMP180_PARAM_I2C_DEV,  \
+                                       .mode    = BMP180_PARAM_MODE }
 /**@}*/
 
 /**
@@ -55,6 +56,17 @@ static const bmp180_params_t bmp180_params[] =
 #endif
 };
 
+/**
+ * @brief   Configure SAUL registry entries
+ */
+static const saul_reg_info_t bmp180_saul_reg_info[][2] =
+{
+    {
+        { .name = "bmp180-temp" },
+        { .name = "bmp180-press" }
+    }
+};
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/sys/auto_init/saul/auto_init_bmp180.c b/sys/auto_init/saul/auto_init_bmp180.c
@@ -48,23 +48,6 @@ extern const saul_driver_t bmp180_temperature_saul_driver;
 extern const saul_driver_t bmp180_pressure_saul_driver;
 /** @} */
 
-/**
- * @brief   Allocate and configure entries to the SAUL registry
- */
-saul_reg_t bmp180_saul_reg_info[][2] =
-{
-    {
-        {
-            .name= "bmp180-temp",
-            .driver = &bmp180_temperature_saul_driver
-        },
-        {
-            .name = "bmp180-press",
-            .driver = &bmp180_pressure_saul_driver
-        }
-    }
-};
-
 void auto_init_bmp180(void)
 {
     for (unsigned i = 0; i < BMP180_NUMOF; i++) {