From cb93d684ffd237c9d93b008b3395b65de4300712 Mon Sep 17 00:00:00 2001
From: Alexandre Abadie <alexandre.abadie@inria.fr>
Date: Wed, 28 Feb 2018 17:09:20 +0100
Subject: [PATCH 1/2] drivers/mma8x5x: use new driver params scheme

---
 drivers/mma8x5x/include/mma8x5x_params.h | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/mma8x5x/include/mma8x5x_params.h b/drivers/mma8x5x/include/mma8x5x_params.h
index c0c3e5e3f0..e9170afb23 100644
--- a/drivers/mma8x5x/include/mma8x5x_params.h
+++ b/drivers/mma8x5x/include/mma8x5x_params.h
@@ -51,13 +51,16 @@ extern "C" {
 #endif
 
 #ifndef MMA8X5X_PARAMS
-#define MMA8X5X_PARAMS          { .i2c    = MMA8X5X_PARAM_I2C, \
-                                  .addr   = MMA8X5X_PARAM_ADDR, \
-                                  .type   = MMA8X5X_PARAM_TYPE, \
-                                  .rate   = MMA8X5X_PARAM_RATE, \
+#define MMA8X5X_PARAMS          { .i2c    = MMA8X5X_PARAM_I2C,   \
+                                  .addr   = MMA8X5X_PARAM_ADDR,  \
+                                  .type   = MMA8X5X_PARAM_TYPE,  \
+                                  .rate   = MMA8X5X_PARAM_RATE,  \
                                   .range  = MMA8X5X_PARAM_RANGE, \
                                   .offset = MMA8X5X_PARAM_OFFSET }
 #endif
+#ifndef MMA8X5X_SAUL_INFO
+#define MMA8X5X_SAUL_INFO       { .name = "mma8652" }
+#endif
 /**@}*/
 
 /**
@@ -73,9 +76,7 @@ static const mma8x5x_params_t mma8x5x_params[] =
  */
 static const saul_reg_info_t mma8x5x_saul_info[] =
 {
-    {
-        .name = "mma8652"
-    }
+    MMA8X5X_SAUL_INFO
 };
 
 #ifdef __cplusplus

From 2090189baca63dc65dc7e00ac7b89f60e9a43865 Mon Sep 17 00:00:00 2001
From: Alexandre Abadie <alexandre.abadie@inria.fr>
Date: Wed, 28 Feb 2018 17:09:37 +0100
Subject: [PATCH 2/2] sys/auto_init: update mma8x5x auto_init

---
 sys/auto_init/saul/auto_init_mma8x5x.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/sys/auto_init/saul/auto_init_mma8x5x.c b/sys/auto_init/saul/auto_init_mma8x5x.c
index c52999ea0e..f5b1b4fa8c 100644
--- a/sys/auto_init/saul/auto_init_mma8x5x.c
+++ b/sys/auto_init/saul/auto_init_mma8x5x.c
@@ -42,15 +42,20 @@ static mma8x5x_t mma8x5x_devs[MMA8X5X_NUM];
  */
 static saul_reg_t saul_entries[MMA8X5X_NUM];
 
+/**
+ * @brief   Define the number of saul info
+ */
+#define MMA8X5X_INFO_NUM    (sizeof(mma8x5x_saul_info) / sizeof(mma8x5x_saul_info[0]))
+
 /**
  * @brief   Reference the driver struct
- * @{
  */
 extern saul_driver_t mma8x5x_saul_driver;
-/** @} */
 
 void auto_init_mma8x5x(void)
 {
+    assert(MMA8X5X_NUM == MMA8X5X_INFO_NUM);
+
     for (unsigned i = 0; i < MMA8X5X_NUM; i++) {
         LOG_DEBUG("[auto_init_saul] initializing mma8x5x #%u\n", i);