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

drivers/bmp180: move SAUL config to params.h

Browse Source
This commit is contained in:
Hauke Petersen 2017-01-17 11:34:16 +01:00
parent b24be6a6ae
commit 232b8eb2a5
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/bmp180/include/bmp180_params.h
View File

@ -1,5 +1,6 @@
/* /*
* Copyright (C) 2016 Inria * Copyright (C) 2016 Inria
* 2017 Freie Universität Berlin
* *
* This file is subject to the terms and conditions of the GNU Lesser * 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 * General Public License v2.1. See the file LICENSE in the top level
@ -33,14 +34,14 @@ extern "C" {
* @{ * @{
*/ */
#ifndef BMP180_PARAM_I2C_DEV #ifndef BMP180_PARAM_I2C_DEV
#define BMP180_PARAM_I2C_DEV (0) #define BMP180_PARAM_I2C_DEV I2C_DEV(0)
#endif #endif
#ifndef BMP180_PARAM_MODE #ifndef BMP180_PARAM_MODE
#define BMP180_PARAM_MODE BMP180_ULTRALOWPOWER #define BMP180_PARAM_MODE BMP180_ULTRALOWPOWER
#endif #endif
#define BMP180_PARAMS_DEFAULT {.i2c_dev = BMP180_PARAM_I2C_DEV, \ #define BMP180_PARAMS_DEFAULT { .i2c_dev = BMP180_PARAM_I2C_DEV, \
.mode = BMP180_PARAM_MODE } .mode = BMP180_PARAM_MODE }
/**@}*/ /**@}*/
/** /**
@ -55,6 +56,17 @@ static const bmp180_params_t bmp180_params[] =
#endif #endif
}; };
/**
* @brief Configure SAUL registry entries
*/
static const saul_reg_info_t bmp180_saul_reg_info[][2] =
{
{
{ .name = "bmp180-temp" },
{ .name = "bmp180-press" }
}
};
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

17
sys/auto_init/saul/auto_init_bmp180.c
View File

@ -48,23 +48,6 @@ extern const saul_driver_t bmp180_temperature_saul_driver;
extern const saul_driver_t bmp180_pressure_saul_driver; extern const saul_driver_t bmp180_pressure_saul_driver;
/** @} */ /** @} */
/**
* @brief Allocate and configure entries to the SAUL registry
*/
saul_reg_t bmp180_saul_reg_info[][2] =
{
{
{
.name= "bmp180-temp",
.driver = &bmp180_temperature_saul_driver
},
{
.name = "bmp180-press",
.driver = &bmp180_pressure_saul_driver
}
}
};
void auto_init_bmp180(void) void auto_init_bmp180(void)
{ {
for (unsigned i = 0; i < BMP180_NUMOF; i++) { for (unsigned i = 0; i < BMP180_NUMOF; i++) {