From adb848fbbfa8669eb8375d85b91fced0ab04bb39 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Wed, 28 Feb 2018 16:04:32 +0100 Subject: [PATCH] drivers/adcxx1c: use new driver params scheme --- drivers/adcxx1c/include/adcxx1c_params.h | 27 ++++++++++++------------ 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/adcxx1c/include/adcxx1c_params.h b/drivers/adcxx1c/include/adcxx1c_params.h index 3a2dd0a2fc..ab2e4e4dbb 100644 --- a/drivers/adcxx1c/include/adcxx1c_params.h +++ b/drivers/adcxx1c/include/adcxx1c_params.h @@ -56,14 +56,19 @@ extern "C" { #define ADCXX1C_PARAM_HYSTERESIS (0) #endif -#define ADCXX1C_PARAMS_DEFAULT { .i2c = ADCXX1C_PARAM_I2C, \ - .addr = ADCXX1C_PARAM_ADDR, \ - .bits = ADCXX1C_PARAM_BITS, \ - .cycle = ADCXX1C_PARAM_CYCLE, \ - .alert_pin = ADCXX1C_PARAM_ALERT_PIN, \ - .low_limit = ADCXX1C_PARAM_LOW_LIMIT, \ +#ifndef ADCXX1C_PARAMS +#define ADCXX1C_PARAMS { .i2c = ADCXX1C_PARAM_I2C, \ + .addr = ADCXX1C_PARAM_ADDR, \ + .bits = ADCXX1C_PARAM_BITS, \ + .cycle = ADCXX1C_PARAM_CYCLE, \ + .alert_pin = ADCXX1C_PARAM_ALERT_PIN, \ + .low_limit = ADCXX1C_PARAM_LOW_LIMIT, \ .high_limit = ADCXX1C_PARAM_HIGH_LIMIT, \ .hysteresis = ADCXX1C_PARAM_HYSTERESIS } +#endif +#ifndef ADCXX1C_SAUL_INFO +#define ADCXX1C_SAUL_INFO { .name = "adcxx1c" } +#endif /** @} */ /** @@ -71,11 +76,7 @@ extern "C" { */ static const adcxx1c_params_t adcxx1c_params[] = { -#ifdef ADCXX1C_PARAMS_BOARD - ADCXX1C_PARAMS_BOARD, -#else - ADCXX1C_PARAMS_DEFAULT, -#endif + ADCXX1C_PARAMS }; @@ -84,9 +85,7 @@ static const adcxx1c_params_t adcxx1c_params[] = */ static const saul_reg_info_t adcxx1c_saul_info[] = { - { - .name = "adcxx1c", - }, + ADCXX1C_SAUL_INFO }; #ifdef __cplusplus