From 799d3309e87c7d8cc223b8eca801e117deb4a452 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Wed, 28 Feb 2018 16:15:53 +0100 Subject: [PATCH 1/2] drivers/adxl345: use new driver params scheme --- drivers/adxl345/include/adxl345_params.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/adxl345/include/adxl345_params.h b/drivers/adxl345/include/adxl345_params.h index 1bfe6e845e..ec106d7f15 100644 --- a/drivers/adxl345/include/adxl345_params.h +++ b/drivers/adxl345/include/adxl345_params.h @@ -62,6 +62,9 @@ extern "C" { .rate = ADXL345_PARAM_RATE, \ .full_res = ADXL345_PARAM_FULL_RES } #endif +#ifndef ADXL345_SAUL_INFO +#define ADXL345_SAUL_INFO { .name = "adxl345" } +#endif /**@}*/ /** @@ -77,9 +80,7 @@ static const adxl345_params_t adxl345_params[] = */ static const saul_reg_info_t adxl345_saul_info[] = { - { - .name = "adxl345" - } + ADXL345_SAUL_INFO }; #ifdef __cplusplus From 5e07118aeddc340cae76e64ab1e34a8bac677679 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Wed, 28 Feb 2018 16:16:17 +0100 Subject: [PATCH 2/2] sys/auto_init: update adxl345 auto_init --- sys/auto_init/saul/auto_init_adxl345.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/auto_init/saul/auto_init_adxl345.c b/sys/auto_init/saul/auto_init_adxl345.c index dae23f1bc3..7bb9e0d107 100644 --- a/sys/auto_init/saul/auto_init_adxl345.c +++ b/sys/auto_init/saul/auto_init_adxl345.c @@ -29,7 +29,7 @@ /** * @brief Define the number of configured sensors */ -#define ADXL345_NUM (sizeof(adxl345_params)/sizeof(adxl345_params[0])) +#define ADXL345_NUM (sizeof(adxl345_params) / sizeof(adxl345_params[0])) /** * @brief Allocate memory for the device descriptors @@ -41,15 +41,20 @@ static adxl345_t adxl345_devs[ADXL345_NUM]; */ static saul_reg_t saul_entries[ADXL345_NUM]; +/** + * @brief Define the number of saul info + */ +#define ADXL345_INFO_NUM (sizeof(adxl345_saul_info) / sizeof(adxl345_saul_info[0])) + /** * @brief Reference the driver structs - * @{ */ extern saul_driver_t adxl345_saul_driver; -/** @} */ void auto_init_adxl345(void) { + assert(ADXL345_INFO_NUM == ADXL345_NUM); + for (unsigned i = 0; i < ADXL345_NUM; i++) { LOG_DEBUG("[auto_init_saul] initializing adxl345 #%u\n", i);