From f4e9ede7bcd1a21848987acf0588b67e16ddb5d9 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Fri, 10 Jul 2020 14:44:35 +0200 Subject: [PATCH] drivers/sps30: fix conflict with libc function name --- drivers/sps30/sps30_saul.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/sps30/sps30_saul.c b/drivers/sps30/sps30_saul.c index 30b9ba3686..db6f7db8f8 100644 --- a/drivers/sps30/sps30_saul.c +++ b/drivers/sps30/sps30_saul.c @@ -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); } -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 */ 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) { - 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) { - 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) { - 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) { - 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) { - 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 = {