RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #8762 from aabadie/pr/drivers/fix_saul_io_xplained

Browse Source 
sys/auto_init: fix crash with io1_xplained driver
This commit is contained in:
Martine Lenders 2018-03-09 13:41:36 +01:00 committed by GitHub
commit 607757a39d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/auto_init/saul/auto_init_io1_xplained.c
View File

@ -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]));
}
}