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

drivers/bme680: fix conflict with libc function name

Browse Source
This commit is contained in:
Benjamin Valentin 2020-07-10 14:43:57 +02:00
parent cde098f60e
commit b9ed7e9ffd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/bme680/bme680_saul.c
View File

@ -54,7 +54,7 @@ static unsigned _dev2index (const bme680_t *dev)
return BME680_NUMOF; return BME680_NUMOF;
} }
static int read(int dev) static int _read(int dev)
{ {
/* measure and read sensor values */ /* measure and read sensor values */
int res; int res;
@ -101,7 +101,7 @@ static int read_temp(const void *dev, phydat_t *data)
} }
/* either local variable is valid or fetching it was successful */ /* either local variable is valid or fetching it was successful */
if (_temp_valid[dev_index] || read(dev_index) == BME680_OK) { if (_temp_valid[dev_index] || _read(dev_index) == BME680_OK) {
/* mark local variable as invalid */ /* mark local variable as invalid */
_temp_valid[dev_index] = false; _temp_valid[dev_index] = false;
@ -123,7 +123,7 @@ static int read_press(const void *dev, phydat_t *data)
} }
/* either local variable is valid or fetching it was successful */ /* either local variable is valid or fetching it was successful */
if (_press_valid[dev_index] || read(dev_index) == BME680_OK) { if (_press_valid[dev_index] || _read(dev_index) == BME680_OK) {
/* mark local variable as invalid */ /* mark local variable as invalid */
_press_valid[dev_index] = false; _press_valid[dev_index] = false;
@ -145,7 +145,7 @@ static int read_hum(const void *dev, phydat_t *data)
} }
/* either local variable is valid or fetching it was successful */ /* either local variable is valid or fetching it was successful */
if (_hum_valid[dev_index] || read(dev_index) == BME680_OK) { if (_hum_valid[dev_index] || _read(dev_index) == BME680_OK) {
/* mark local variable as invalid */ /* mark local variable as invalid */
_hum_valid[dev_index] = false; _hum_valid[dev_index] = false;
@ -167,7 +167,7 @@ static int read_gas(const void *dev, phydat_t *data)
} }
/* either local variable is valid or fetching it was successful */ /* either local variable is valid or fetching it was successful */
if (_gas_valid[dev_index] || read(dev_index) == BME680_OK) { if (_gas_valid[dev_index] || _read(dev_index) == BME680_OK) {
/* mark local variable as invalid */ /* mark local variable as invalid */
_gas_valid[dev_index] = false; _gas_valid[dev_index] = false;