diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-11-09 10:54:54 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-11-09 10:54:54 +0100 |
commit | 5576a028d0b722a1c3b125d3ac0322debc7e724b (patch) | |
tree | 2f1145c4ffee70a891a474942ca098747ea3e458 /commands | |
parent | e61cca2117eb7dfe45cac376544ffade1d94b643 (diff) | |
parent | 9984960ac43b85faa36269d905c56c01e7549bde (diff) | |
download | barebox-5576a028d0b722a1c3b125d3ac0322debc7e724b.tar.gz barebox-5576a028d0b722a1c3b125d3ac0322debc7e724b.tar.xz |
Merge branch 'for-next/gpio'
Diffstat (limited to 'commands')
-rw-r--r-- | commands/gpio.c | 54 |
1 files changed, 35 insertions, 19 deletions
diff --git a/commands/gpio.c b/commands/gpio.c index 08ecc152d9..951ad2c285 100644 --- a/commands/gpio.c +++ b/commands/gpio.c @@ -16,14 +16,35 @@ #include <errno.h> #include <gpio.h> -static int do_gpio_get_value(int argc, char *argv[]) +static int get_gpio_and_value(int argc, char *argv[], + int *gpio, int *value) { - int gpio, value; + const int count = value ? 3 : 2; + int ret = 0; - if (argc < 2) + if (argc < count) return COMMAND_ERROR_USAGE; - gpio = simple_strtoul(argv[1], NULL, 0); + *gpio = gpio_find_by_label(argv[1]); + if (*gpio < 0) { + ret = kstrtoint(argv[1], 0, gpio); + if (ret < 0) + return ret; + } + + if (value) + ret = kstrtoint(argv[2], 0, value); + + return ret; +} + +static int do_gpio_get_value(int argc, char *argv[]) +{ + int gpio, value, ret; + + ret = get_gpio_and_value(argc, argv, &gpio, NULL); + if (ret) + return ret; value = gpio_get_value(gpio); if (value < 0) @@ -41,13 +62,11 @@ BAREBOX_CMD_END static int do_gpio_set_value(int argc, char *argv[]) { - int gpio, value; - - if (argc < 3) - return COMMAND_ERROR_USAGE; + int gpio, value, ret; - gpio = simple_strtoul(argv[1], NULL, 0); - value = simple_strtoul(argv[2], NULL, 0); + ret = get_gpio_and_value(argc, argv, &gpio, &value); + if (ret) + return ret; gpio_set_value(gpio, value); @@ -65,10 +84,9 @@ static int do_gpio_direction_input(int argc, char *argv[]) { int gpio, ret; - if (argc < 2) - return COMMAND_ERROR_USAGE; - - gpio = simple_strtoul(argv[1], NULL, 0); + ret = get_gpio_and_value(argc, argv, &gpio, NULL); + if (ret) + return ret; ret = gpio_direction_input(gpio); if (ret) @@ -88,11 +106,9 @@ static int do_gpio_direction_output(int argc, char *argv[]) { int gpio, value, ret; - if (argc < 3) - return COMMAND_ERROR_USAGE; - - gpio = simple_strtoul(argv[1], NULL, 0); - value = simple_strtoul(argv[2], NULL, 0); + ret = get_gpio_and_value(argc, argv, &gpio, &value); + if (ret) + return ret; ret = gpio_direction_output(gpio, value); if (ret) |