Merge pull request RIOT-OS#8762 from aabadie/pr/drivers/fix_saul_io_x…

…plained sys/auto_init: fix crash with io1_xplained driver
miri64 · Mar 9, 2018 · 607757a · 607757a
2 parents 780f604 + 2fce7c7
commit 607757a
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/sys/auto_init/saul/auto_init_io1_xplained.c b/sys/auto_init/saul/auto_init_io1_xplained.c
@@ -49,14 +49,14 @@ static saul_reg_t saul_entries[IO1_XPLAINED_NUM * 4];
  * @name    Reference the driver structs.
  * @{
  */
-extern const saul_driver_t _saul_driver;
+extern const saul_driver_t gpio_out_saul_driver;
 extern const saul_driver_t io1_xplained_temperature_saul_driver;
 /** @} */
 
 void auto_init_io1_xplained(void)
 {
     /* There are 4 saul reg info for each configured device */
-    assert(IO1_XPLAINED_NUM == (IO1_XPLAINED_INFO_NUM >> 2));
+    assert(IO1_XPLAINED_NUM == IO1_XPLAINED_INFO_NUM);
 
     for (unsigned i = 0; i < IO1_XPLAINED_NUM; i++) {
         if (io1_xplained_init(&io1_xplained_devs[i],
@@ -73,8 +73,9 @@ void auto_init_io1_xplained(void)
 
         /* GPIOs */
         for (unsigned j = 1; j < 4; j++) {
-            saul_entries[i * 4 + j].dev = &(io1_xplained_saul_gpios[j - 1]);
-            saul_entries[i * 4 + j].name = io1_xplained_saul_info[i][j - 1].name;
+            saul_entries[i * 4 + j].dev = &(io1_xplained_saul_gpios[j]);
+            saul_entries[i * 4 + j].name = io1_xplained_saul_info[i][j].name;
+            saul_entries[i * 4 + j].driver = &gpio_out_saul_driver;
             saul_reg_add(&(saul_entries[i * 4 + j]));
         }
     }