diff options
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/gpio.c | 48 |
1 files changed, 29 insertions, 19 deletions
diff --git a/commands/gpio.c b/commands/gpio.c index 08ecc152d9..5a28493d1c 100644 --- a/commands/gpio.c +++ b/commands/gpio.c @@ -16,14 +16,29 @@ #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; - if (argc < 2) + if (argc < count) return COMMAND_ERROR_USAGE; - gpio = simple_strtoul(argv[1], NULL, 0); + *gpio = simple_strtoul(argv[1], NULL, 0); + + if (value) + *value = simple_strtoul(argv[2], NULL, 0); + + return 0; +} + +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 +56,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 +78,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 +100,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) |