From 3ece1fc4c4ba6d781d292ea11bce49ee63a821b4 Mon Sep 17 00:00:00 2001
From: Hauke Petersen <hauke.petersen@fu-berlin.de>
Date: Tue, 15 Sep 2015 11:46:35 +0200
Subject: [PATCH] tests: s/GPIO(x,y)/GPIO_PIN(x,y)/
---
tests/periph_gpio/main.c | 14 +++++++-------
tests/periph_spi/main.c | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/periph_gpio/main.c b/tests/periph_gpio/main.c
index 427b3ec3db..fde10a49c8 100644
--- a/tests/periph_gpio/main.c
+++ b/tests/periph_gpio/main.c
@@ -66,7 +66,7 @@ static int init_out(int argc, char **argv)
else {
pull = GPIO_NOPULL;
}
- if (gpio_init(GPIO(port, pin), GPIO_DIR_OUT, pull) < 0) {
+ if (gpio_init(GPIO_PIN(port, pin), GPIO_DIR_OUT, pull) < 0) {
printf("Error while initializing PORT_%i.%i as output\n", port, pin);
return 1;
}
@@ -97,7 +97,7 @@ static int init_in(int argc, char **argv)
else {
pull = GPIO_NOPULL;
}
- if (gpio_init(GPIO(port, pin), GPIO_DIR_IN, pull) < 0) {
+ if (gpio_init(GPIO_PIN(port, pin), GPIO_DIR_IN, pull) < 0) {
printf("Error while initializing PORT_%i.%02i as input\n", port, pin);
return 1;
}
@@ -146,7 +146,7 @@ static int init_int(int argc, char **argv)
else {
pull = GPIO_NOPULL;
}
- if (gpio_init_int(GPIO(port, pin), pull, flank, cb, (void *)pin) < 0) {
+ if (gpio_init_int(GPIO_PIN(port, pin), pull, flank, cb, (void *)pin) < 0) {
printf("Error while initializing PORT_%i.%02i as external interrupt\n",
port, pin);
return 1;
@@ -167,7 +167,7 @@ static int read(int argc, char **argv)
}
port = atoi(argv[1]);
pin = atoi(argv[2]);
- if (gpio_read(GPIO(port, pin))) {
+ if (gpio_read(GPIO_PIN(port, pin))) {
printf("PORT_%i.%02i is HIGH\n", port, pin);
}
else {
@@ -187,7 +187,7 @@ static int set(int argc, char **argv)
port = atoi(argv[1]);
pin = atoi(argv[2]);
- gpio_set(GPIO(port, pin));
+ gpio_set(GPIO_PIN(port, pin));
return 0;
}
@@ -201,7 +201,7 @@ static int clear(int argc, char **argv)
}
port = atoi(argv[1]);
pin = atoi(argv[2]);
- gpio_clear(GPIO(port, pin));
+ gpio_clear(GPIO_PIN(port, pin));
return 0;
}
@@ -215,7 +215,7 @@ static int toggle(int argc, char **argv)
}
port = atoi(argv[1]);
pin = atoi(argv[2]);
- gpio_toggle(GPIO(port, pin));
+ gpio_toggle(GPIO_PIN(port, pin));
return 0;
}
diff --git a/tests/periph_spi/main.c b/tests/periph_spi/main.c
index c04a20bdfa..772d6fbddb 100644
--- a/tests/periph_spi/main.c
+++ b/tests/periph_spi/main.c
@@ -87,7 +87,7 @@ int parse_spi_dev(int argc, char **argv)
}
port = atoi(argv[2]);
pin = atoi(argv[3]);
- spi_cs = GPIO(port,pin);
+ spi_cs = GPIO_PIN(port,pin);
if (argc >= 5) {
spi_mode = argv[4][0] - '0';
if (spi_mode < 0 || spi_mode > 3) {
--
GitLab