Skip to content
Snippets Groups Projects
Unverified Commit 2b32af84 authored by Alexandre Abadie's avatar Alexandre Abadie Committed by GitHub
Browse files

Merge pull request #8960 from aabadie/pr/drivers/io1_xplained_gpio_fix

drivers/io1_xplained: fix gpios devices initialization
parents 462cc783 f62818ea
No related branches found
No related tags found
No related merge requests found
...@@ -65,16 +65,27 @@ saul_reg_info_t io1_xplained_saul_info[][4] = ...@@ -65,16 +65,27 @@ saul_reg_info_t io1_xplained_saul_info[][4] =
IO1_XPLAINED_SAUL_INFO IO1_XPLAINED_SAUL_INFO
}; };
#ifdef MODULE_SAUL_GPIO
/** /**
* @brief Allocate and configure the extension LED gpios * @brief Allocate and configure the extension LED gpios
*/ */
gpio_t io1_xplained_saul_gpios[3] = saul_gpio_params_t io1_xplained_saul_gpios[] =
{ {
IO1_LED_PIN, {
IO1_GPIO1_PIN, .pin = IO1_LED_PIN,
IO1_GPIO2_PIN, .mode = GPIO_OUT,
.flags = SAUL_GPIO_INVERTED,
},
{
.pin = IO1_GPIO1_PIN,
.mode = GPIO_OUT,
},
{
.pin = IO1_GPIO2_PIN,
.mode = GPIO_OUT
}
}; };
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
......
...@@ -72,11 +72,14 @@ void auto_init_io1_xplained(void) ...@@ -72,11 +72,14 @@ void auto_init_io1_xplained(void)
saul_reg_add(&(saul_entries[i * 4])); saul_reg_add(&(saul_entries[i * 4]));
/* GPIOs */ /* GPIOs */
for (unsigned j = 1; j < 4; j++) { for (unsigned j = 0;
saul_entries[i * 4 + j].dev = &(io1_xplained_saul_gpios[j]); j < sizeof(io1_xplained_saul_gpios) / sizeof(io1_xplained_saul_gpios[0]);
saul_entries[i * 4 + j].name = io1_xplained_saul_info[i][j].name; j++) {
saul_entries[i * 4 + j].driver = &gpio_out_saul_driver; saul_reg_t *entry = &saul_entries[i * 4 + j + 1];
saul_reg_add(&(saul_entries[i * 4 + j])); entry->dev = &(io1_xplained_saul_gpios[j]);
entry->name = io1_xplained_saul_info[i][j + 1].name;
entry->driver = &gpio_out_saul_driver;
saul_reg_add(entry);
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment