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

Merge pull request #14489 from benpicco/libc_conflict

Browse Source 
drivers/tests: rename private read() and sleep() functions to avoid conflicts with libc
This commit is contained in:
Koen Zandberg 2020-07-17 20:44:02 +02:00 committed by GitHub
commit 5c3c22f31c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 24 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;

6
drivers/sht3x/sht3x_saul.c
View File

@ -51,7 +51,7 @@ static unsigned _dev2index (const sht3x_dev_t *dev)
return SHT3X_NUM; return SHT3X_NUM;
} }
static int read(int dev) static int _read(int dev)
{ {
/* read both sensor values */ /* read both sensor values */
unsigned res = sht3x_read(&sht3x_devs[dev], &_temp[dev], &_hum[dev]); 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 */ /* 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 */ /* mark local variable as invalid */
_temp_valid[dev_index] = false; _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 */ /* 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 */ /* mark local variable as invalid */
_hum_valid[dev_index] = false; _hum_valid[dev_index] = false;

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 = {

4
tests/driver_pca9633/main.c
View File

@ -52,7 +52,7 @@ int wakeup(int argc, char **argv)
return 0; return 0;
} }
int sleep(int argc, char **argv) int enter_sleep(int argc, char **argv)
{ {
(void) argc; (void) argc;
(void) argv; (void) argv;
@ -454,7 +454,7 @@ static const shell_command_t shell_commands[] = {
{ "turn_on", "Turn on all LEDs.", turn_on }, { "turn_on", "Turn on all LEDs.", turn_on },
{ "turn_off", "Turn off all LEDs.", turn_off }, { "turn_off", "Turn off all LEDs.", turn_off },
{ "wakeup", "Switch to normal mode.", wakeup }, { "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 }, { "pwm", "Set individual PWM signal for a given channel.", pwm },
{ "grp_pwm", "Set global PWM signal.", grp_pwm }, { "grp_pwm", "Set global PWM signal.", grp_pwm },
{ "blinking", "Set up values for blinking mode.", blinking }, { "blinking", "Set up values for blinking mode.", blinking },

16
tests/periph_gpio/main.c
View File

@ -188,7 +188,7 @@ static int enable_int(int argc, char **argv)
} }
#endif #endif
static int read(int argc, char **argv) static int cmd_read(int argc, char **argv)
{ {
int port, pin; int port, pin;
@ -210,7 +210,7 @@ static int read(int argc, char **argv)
return 0; return 0;
} }
static int set(int argc, char **argv) static int cmd_set(int argc, char **argv)
{ {
if (argc < 3) { if (argc < 3) {
printf("usage: %s <port> <pin>\n", argv[0]); printf("usage: %s <port> <pin>\n", argv[0]);
@ -222,7 +222,7 @@ static int set(int argc, char **argv)
return 0; return 0;
} }
static int clear(int argc, char **argv) static int cmd_clear(int argc, char **argv)
{ {
if (argc < 3) { if (argc < 3) {
printf("usage: %s <port> <pin>\n", argv[0]); printf("usage: %s <port> <pin>\n", argv[0]);
@ -234,7 +234,7 @@ static int clear(int argc, char **argv)
return 0; return 0;
} }
static int toggle(int argc, char **argv) static int cmd_toggle(int argc, char **argv)
{ {
if (argc < 3) { if (argc < 3) {
printf("usage: %s <port> <pin>\n", argv[0]); printf("usage: %s <port> <pin>\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 }, { "init_int", "init as external INT w/o pull resistor", init_int },
{ "enable_int", "enable or disable gpio interrupt", enable_int }, { "enable_int", "enable or disable gpio interrupt", enable_int },
#endif #endif
{ "read", "read pin status", read }, { "read", "read pin status", cmd_read },
{ "set", "set pin to HIGH", set }, { "set", "set pin to HIGH", cmd_set },
{ "clear", "set pin to LOW", clear }, { "clear", "set pin to LOW", cmd_clear },
{ "toggle", "toggle pin", toggle }, { "toggle", "toggle pin", cmd_toggle },
{ "bench", "run a set of predefined benchmarks", bench }, { "bench", "run a set of predefined benchmarks", bench },
{ NULL, NULL, NULL } { NULL, NULL, NULL }
}; };