From 5338d0403f42282281ab9c56bc4ef56aff4b8a52 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Sun, 30 Dec 2018 15:15:52 +0100 Subject: [PATCH] sys/auto_init: rename lps331ap to lpsxxx unified version --- sys/auto_init/auto_init.c | 6 +- sys/auto_init/saul/auto_init_lps331ap.c | 82 ------------------------ sys/auto_init/saul/auto_init_lpsxxx.c | 84 +++++++++++++++++++++++++ 3 files changed, 87 insertions(+), 85 deletions(-) delete mode 100644 sys/auto_init/saul/auto_init_lps331ap.c create mode 100644 sys/auto_init/saul/auto_init_lpsxxx.c diff --git a/sys/auto_init/auto_init.c b/sys/auto_init/auto_init.c index 73cff40e39..f3b776b1be 100644 --- a/sys/auto_init/auto_init.c +++ b/sys/auto_init/auto_init.c @@ -414,9 +414,9 @@ void auto_init(void) extern void auto_init_lis3mdl(void); auto_init_lis3mdl(); #endif -#ifdef MODULE_LPS331AP - extern void auto_init_lps331ap(void); - auto_init_lps331ap(); +#ifdef MODULE_LPSXXX + extern void auto_init_lpsxxx(void); + auto_init_lpsxxx(); #endif #ifdef MODULE_LSM303DLHC extern void auto_init_lsm303dlhc(void); diff --git a/sys/auto_init/saul/auto_init_lps331ap.c b/sys/auto_init/saul/auto_init_lps331ap.c deleted file mode 100644 index c1725c0bb2..0000000000 --- a/sys/auto_init/saul/auto_init_lps331ap.c +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (C) 2015 Freie Universität Berlin - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License v2.1. See the file LICENSE in the top level - * directory for more details. - * - */ - -/* - * @ingroup sys_auto_init_saul - * @{ - * - * @file - * @brief Auto initialization of LPS331AP pressure sensors - * - * @author Hauke Petersen - * - * @} - */ - -#ifdef MODULE_LPS331AP - -#include "assert.h" -#include "log.h" -#include "saul_reg.h" -#include "lps331ap.h" -#include "lps331ap_params.h" - -/** - * @brief Define the number of configured sensors - */ -#define LPS331AP_NUM (sizeof(lps331ap_params) / sizeof(lps331ap_params[0])) - -/** - * @brief Allocate memory for the device descriptors - */ -static lps331ap_t lps331ap_devs[LPS331AP_NUM]; - -/** - * @brief Memory for the SAUL registry entries - */ -static saul_reg_t saul_entries[LPS331AP_NUM * 2]; - -/** - * @brief Define the number of saul info - */ -#define LPS331AP_INFO_NUM (sizeof(lps331ap_saul_info) / sizeof(lps331ap_saul_info[0])) - -/** - * @brief Reference the driver struct - */ -extern saul_driver_t lps331ap_saul_pres_driver; -extern saul_driver_t lps331ap_saul_temp_driver; - - -void auto_init_lps331ap(void) -{ - assert(LPS331AP_NUM == LPS331AP_INFO_NUM); - - for (unsigned int i = 0; i < LPS331AP_NUM; i++) { - LOG_DEBUG("[auto_init_saul] initializing lps331ap #%u\n", i); - - if (lps331ap_init(&lps331ap_devs[i], &lps331ap_params[i]) < 0) { - LOG_ERROR("[auto_init_saul] error initializing lps331ap #%u\n", i); - continue; - } - - saul_entries[i].dev = &(lps331ap_devs[i]); - saul_entries[i].name = lps331ap_saul_info[i].name; - saul_entries[i].driver = &lps331ap_saul_pres_driver; - saul_reg_add(&(saul_entries[i])); - saul_entries[(i * 2) + 1].dev = &(lps331ap_devs[i]); - saul_entries[(i * 2) + 1].name = lps331ap_saul_info[i].name; - saul_entries[(i * 2) + 1].driver = &lps331ap_saul_temp_driver; - saul_reg_add(&(saul_entries[(i * 2) + 1])); - } -} - -#else -typedef int dont_be_pedantic; -#endif /* MODULE_LPS331AP */ diff --git a/sys/auto_init/saul/auto_init_lpsxxx.c b/sys/auto_init/saul/auto_init_lpsxxx.c new file mode 100644 index 0000000000..5a190cff48 --- /dev/null +++ b/sys/auto_init/saul/auto_init_lpsxxx.c @@ -0,0 +1,84 @@ +/* + * Copyright (C) 2015 Freie Universität Berlin + * + * This file is subject to the terms and conditions of the GNU Lesser + * General Public License v2.1. See the file LICENSE in the top level + * directory for more details. + * + */ + +/* + * @ingroup sys_auto_init_saul + * @{ + * + * @file + * @brief Auto initialization of LPSXXX family of pressure sensors + * + * @author Hauke Petersen + * + * @} + */ + +#ifdef MODULE_LPSXXX + +#include "assert.h" +#include "log.h" +#include "saul_reg.h" +#include "lpsxxx.h" +#include "lpsxxx_params.h" + +/** + * @brief Define the number of configured sensors + */ +#define LPSXXX_NUM (sizeof(lpsxxx_params) / sizeof(lpsxxx_params[0])) + +/** + * @brief Allocate memory for the device descriptors + */ +static lpsxxx_t lpsxxx_devs[LPSXXX_NUM]; + +/** + * @brief Memory for the SAUL registry entries + */ +static saul_reg_t saul_entries[LPSXXX_NUM * 2]; + +/** + * @brief Define the number of saul info + */ +#define LPSXXX_INFO_NUM (sizeof(lpsxxx_saul_info) / sizeof(lpsxxx_saul_info[0])) + +/** + * @brief Reference the driver struct + */ +extern saul_driver_t lpsxxx_saul_pres_driver; +extern saul_driver_t lpsxxx_saul_temp_driver; + + +void auto_init_lpsxxx(void) +{ + assert(LPSXXX_NUM == LPSXXX_INFO_NUM); + + for (unsigned int i = 0; i < LPSXXX_NUM; i++) { + LOG_DEBUG("[auto_init_saul] initializing %s #%u\n", + LPSXXX_SAUL_NAME, i); + + if (lpsxxx_init(&lpsxxx_devs[i], &lpsxxx_params[i]) < 0) { + LOG_ERROR("[auto_init_saul] error initializing %s #%u\n", + LPSXXX_SAUL_NAME, i); + continue; + } + + saul_entries[i].dev = &(lpsxxx_devs[i]); + saul_entries[i].name = lpsxxx_saul_info[i].name; + saul_entries[i].driver = &lpsxxx_saul_pres_driver; + saul_reg_add(&(saul_entries[i])); + saul_entries[(i * 2) + 1].dev = &(lpsxxx_devs[i]); + saul_entries[(i * 2) + 1].name = lpsxxx_saul_info[i].name; + saul_entries[(i * 2) + 1].driver = &lpsxxx_saul_temp_driver; + saul_reg_add(&(saul_entries[(i * 2) + 1])); + } +} + +#else +typedef int dont_be_pedantic; +#endif /* MODULE_LPSXXX */