riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8676 from aabadie/pr/drivers/params/veml6070

Browse Source 
drivers/veml6070: apply unified params definition scheme
This commit is contained in:
Martine Lenders 2018-03-07 14:18:51 +01:00 committed by GitHub
commit e2089fce7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/veml6070/include/veml6070_params.h
View File

@ -38,8 +38,13 @@ extern "C" {
#define VEML6070_PARAM_ITIME VEML6070_1_T #define VEML6070_PARAM_ITIME VEML6070_1_T
#endif #endif
#define VEML6070_PARAMS_DEFAULT { .i2c_dev = VEML6070_PARAM_I2C_DEV, \ #ifndef VEML6070_PARAMS
#define VEML6070_PARAMS { .i2c_dev = VEML6070_PARAM_I2C_DEV, \
.itime = VEML6070_PARAM_ITIME } .itime = VEML6070_PARAM_ITIME }
#endif
#ifndef VEML6070_SAUL_INFO
#define VEML6070_SAUL_INFO { .name = "veml6070" }
#endif
/**@}*/ /**@}*/
/** /**
@ -47,19 +52,15 @@ extern "C" {
*/ */
static const veml6070_params_t veml6070_params[] = static const veml6070_params_t veml6070_params[] =
{ {
#ifdef VEML6070_PARAMS_BOARD VEML6070_PARAMS
VEML6070_PARAMS_BOARD,
#else
VEML6070_PARAMS_DEFAULT,
#endif
}; };
/** /**
* @brief Configure SAUL registry entries * @brief Configure SAUL registry entries
*/ */
static const saul_reg_info_t veml6070_saul_reg_info[] = static const saul_reg_info_t veml6070_saul_info[] =
{ {
{ .name = "veml6070" } VEML6070_SAUL_INFO
}; };
#ifdef __cplusplus #ifdef __cplusplus

11
sys/auto_init/saul/auto_init_veml6070.c
View File

@ -40,15 +40,20 @@ static veml6070_t veml6070_devs[VEML6070_NUMOF];
*/ */
static saul_reg_t saul_entries[VEML6070_NUMOF]; static saul_reg_t saul_entries[VEML6070_NUMOF];
/**
* @brief Define the number of saul info
*/
#define VEML6070_INFO_NUM (sizeof(veml6070_saul_info) / sizeof(veml6070_saul_info[0]))
/** /**
* @brief Reference the driver structs. * @brief Reference the driver structs.
* @{
*/ */
extern const saul_driver_t veml6070_uv_saul_driver; extern const saul_driver_t veml6070_uv_saul_driver;
/** @} */
void auto_init_veml6070(void) void auto_init_veml6070(void)
{ {
assert(VEML6070_NUM == VEML6070_INFO_NUM);
for (unsigned i = 0; i < VEML6070_NUMOF; i++) { for (unsigned i = 0; i < VEML6070_NUMOF; i++) {
LOG_DEBUG("[auto_init_saul] initializing veml6070 #%u\n", i); LOG_DEBUG("[auto_init_saul] initializing veml6070 #%u\n", i);
@ -59,7 +64,7 @@ void auto_init_veml6070(void)
} }
saul_entries[(i)].dev = &(veml6070_devs[i]); saul_entries[(i)].dev = &(veml6070_devs[i]);
saul_entries[(i)].name = veml6070_saul_reg_info[i].name; saul_entries[(i)].name = veml6070_saul_info[i].name;
saul_entries[(i)].driver = &veml6070_uv_saul_driver; saul_entries[(i)].driver = &veml6070_uv_saul_driver;
/* register to saul */ /* register to saul */