From 82dff2a2a3238267758aa3bf30960a1f8fe27f9a Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Fri, 10 Jul 2020 14:43:13 +0200 Subject: [PATCH 1/5] tests/driver_pca9633: fix conflict with libc function name --- tests/driver_pca9633/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/driver_pca9633/main.c b/tests/driver_pca9633/main.c index 6f4eebae5b..7150205823 100644 --- a/tests/driver_pca9633/main.c +++ b/tests/driver_pca9633/main.c @@ -52,7 +52,7 @@ int wakeup(int argc, char **argv) return 0; } -int sleep(int argc, char **argv) +int enter_sleep(int argc, char **argv) { (void) argc; (void) argv; @@ -454,7 +454,7 @@ static const shell_command_t shell_commands[] = { { "turn_on", "Turn on all LEDs.", turn_on }, { "turn_off", "Turn off all LEDs.", turn_off }, { "wakeup", "Switch to normal mode.", wakeup }, - { "sleep", "Switch to low power mode.", sleep }, + { "sleep", "Switch to low power mode.", enter_sleep }, { "pwm", "Set individual PWM signal for a given channel.", pwm }, { "grp_pwm", "Set global PWM signal.", grp_pwm }, { "blinking", "Set up values for blinking mode.", blinking }, From cde098f60e73f01353229c96d7841935f4d97765 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Fri, 10 Jul 2020 14:43:35 +0200 Subject: [PATCH 2/5] tests/periph_gpio: fix conflict with libc function name --- tests/periph_gpio/main.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/periph_gpio/main.c b/tests/periph_gpio/main.c index f882c609b7..59396d7662 100644 --- a/tests/periph_gpio/main.c +++ b/tests/periph_gpio/main.c @@ -188,7 +188,7 @@ static int enable_int(int argc, char **argv) } #endif -static int read(int argc, char **argv) +static int cmd_read(int argc, char **argv) { int port, pin; @@ -210,7 +210,7 @@ static int read(int argc, char **argv) return 0; } -static int set(int argc, char **argv) +static int cmd_set(int argc, char **argv) { if (argc < 3) { printf("usage: %s \n", argv[0]); @@ -222,7 +222,7 @@ static int set(int argc, char **argv) return 0; } -static int clear(int argc, char **argv) +static int cmd_clear(int argc, char **argv) { if (argc < 3) { printf("usage: %s \n", argv[0]); @@ -234,7 +234,7 @@ static int clear(int argc, char **argv) return 0; } -static int toggle(int argc, char **argv) +static int cmd_toggle(int argc, char **argv) { if (argc < 3) { printf("usage: %s \n", argv[0]); @@ -281,10 +281,10 @@ static const shell_command_t shell_commands[] = { { "init_int", "init as external INT w/o pull resistor", init_int }, { "enable_int", "enable or disable gpio interrupt", enable_int }, #endif - { "read", "read pin status", read }, - { "set", "set pin to HIGH", set }, - { "clear", "set pin to LOW", clear }, - { "toggle", "toggle pin", toggle }, + { "read", "read pin status", cmd_read }, + { "set", "set pin to HIGH", cmd_set }, + { "clear", "set pin to LOW", cmd_clear }, + { "toggle", "toggle pin", cmd_toggle }, { "bench", "run a set of predefined benchmarks", bench }, { NULL, NULL, NULL } }; From b9ed7e9ffd949f16f0eb4335f2ebbeeaea100fcc Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Fri, 10 Jul 2020 14:43:57 +0200 Subject: [PATCH 3/5] drivers/bme680: fix conflict with libc function name --- drivers/bme680/bme680_saul.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/bme680/bme680_saul.c b/drivers/bme680/bme680_saul.c index 024d22f401..a5a7c9be54 100644 --- a/drivers/bme680/bme680_saul.c +++ b/drivers/bme680/bme680_saul.c @@ -54,7 +54,7 @@ static unsigned _dev2index (const bme680_t *dev) return BME680_NUMOF; } -static int read(int dev) +static int _read(int dev) { /* measure and read sensor values */ 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 */ - 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 */ _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 */ - 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 */ _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 */ - 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 */ _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 */ - 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 */ _gas_valid[dev_index] = false; From 5f4838e7160f7ca6d3a81409a3848627c8b72b40 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Fri, 10 Jul 2020 14:44:15 +0200 Subject: [PATCH 4/5] drivers/sht3x: fix conflict with libc function name --- drivers/sht3x/sht3x_saul.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/sht3x/sht3x_saul.c b/drivers/sht3x/sht3x_saul.c index 2c22fff369..350c511889 100644 --- a/drivers/sht3x/sht3x_saul.c +++ b/drivers/sht3x/sht3x_saul.c @@ -51,7 +51,7 @@ static unsigned _dev2index (const sht3x_dev_t *dev) return SHT3X_NUM; } -static int read(int dev) +static int _read(int dev) { /* read both sensor values */ unsigned res = sht3x_read(&sht3x_devs[dev], &_temp[dev], &_hum[dev]); @@ -74,7 +74,7 @@ static int read_temp(const void *dev, phydat_t *data) } /* either local variable is valid or fetching it was successful */ - if (_temp_valid[dev_index] || read(dev_index) == SHT3X_OK) { + if (_temp_valid[dev_index] || _read(dev_index) == SHT3X_OK) { /* mark local variable as invalid */ _temp_valid[dev_index] = false; @@ -96,7 +96,7 @@ static int read_hum(const void *dev, phydat_t *data) } /* either local variable is valid or fetching it was successful */ - if (_hum_valid[dev_index] || read(dev_index) == SHT3X_OK) { + if (_hum_valid[dev_index] || _read(dev_index) == SHT3X_OK) { /* mark local variable as invalid */ _hum_valid[dev_index] = false; From f4e9ede7bcd1a21848987acf0588b67e16ddb5d9 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Fri, 10 Jul 2020 14:44:35 +0200 Subject: [PATCH 5/5] 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 = {