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

drivers/sps30: fix conflict with libc function name

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

12
drivers/sps30/sps30_saul.c
View File

@ -65,7 +65,7 @@ static void _float_fit(float *src, phydat_t *data, size_t dim, uint32_t mul)
phydat_fit(data, &i32[0], dim); phydat_fit(data, &i32[0], dim);
} }
static int read(const void *dev, phydat_t *data, unsigned int val_idx) static int _read(const void *dev, phydat_t *data, unsigned int val_idx)
{ {
/* find the device index */ /* find the device index */
unsigned dev_idx = _dev2index((sps30_t*)dev); unsigned dev_idx = _dev2index((sps30_t*)dev);
@ -131,27 +131,27 @@ static int read(const void *dev, phydat_t *data, unsigned int val_idx)
static int read_mc_pm_1_2p5_4(const void *dev, phydat_t *data) static int read_mc_pm_1_2p5_4(const void *dev, phydat_t *data)
{ {
return read(dev, data, SPS30_SAUL_VAL_IDX_MC_PM_1_2P5_4); return _read(dev, data, SPS30_SAUL_VAL_IDX_MC_PM_1_2P5_4);
} }
static int read_mc_pm_10(const void *dev, phydat_t *data) static int read_mc_pm_10(const void *dev, phydat_t *data)
{ {
return read(dev, data, SPS30_SAUL_VAL_IDX_MC_PM_10); return _read(dev, data, SPS30_SAUL_VAL_IDX_MC_PM_10);
} }
static int read_nc_pm_0p5_1_2p5(const void *dev, phydat_t *data) static int read_nc_pm_0p5_1_2p5(const void *dev, phydat_t *data)
{ {
return read(dev, data, SPS30_SAUL_VAL_IDX_NC_PM_0P5_1_2P5); return _read(dev, data, SPS30_SAUL_VAL_IDX_NC_PM_0P5_1_2P5);
} }
static int read_nc_pm_4_10(const void *dev, phydat_t *data) static int read_nc_pm_4_10(const void *dev, phydat_t *data)
{ {
return read(dev, data, SPS30_SAUL_VAL_IDX_NC_PM_4_10); return _read(dev, data, SPS30_SAUL_VAL_IDX_NC_PM_4_10);
} }
static int read_ps(const void *dev, phydat_t *data) static int read_ps(const void *dev, phydat_t *data)
{ {
return read(dev, data, SPS30_SAUL_VAL_IDX_PS); return _read(dev, data, SPS30_SAUL_VAL_IDX_PS);
} }
const saul_driver_t sps30_saul_driver_mc_pm_1_2p5_4 = { const saul_driver_t sps30_saul_driver_mc_pm_1_2p5_4 = {