tools: add support for bias flags

Add support for bias flags to applicable tools - gpioget, gpioset, and
gpiomon.

Signed-off-by: Kent Gibson <warthog618@gmail.com>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>

diff --git a/tools/gpioget.c b/tools/gpioget.c
index 196ebeb61e7628a60438441a87e6e5e664f29bb9..6a22164c96ac929a87ecaa076bdefd04d48ea193 100644 (file)
--- a/tools/gpioget.c
+++ b/tools/gpioget.c
@@ -14,13 +14,14 @@
 #include "tools-common.h"
 
 static const struct option longopts[] = {
-       { "help",       no_argument,    NULL,   'h' },
-       { "version",    no_argument,    NULL,   'v' },
-       { "active-low", no_argument,    NULL,   'l' },
+       { "help",       no_argument,            NULL,   'h' },
+       { "version",    no_argument,            NULL,   'v' },
+       { "active-low", no_argument,            NULL,   'l' },
+       { "bias",       required_argument,      NULL,   'B' },
        { GETOPT_NULL_LONGOPT },
 };
 
-static const char *const shortopts = "+hvl";
+static const char *const shortopts = "+hvlB:";
 
 static void print_help(void)
 {
@@ -32,6 +33,10 @@ static void print_help(void)
        printf("  -h, --help:\t\tdisplay this message and exit\n");
        printf("  -v, --version:\tdisplay the version and exit\n");
        printf("  -l, --active-low:\tset the line active state to low\n");
+       printf("  -B, --bias=[as-is|disable|pull-down|pull-up] (defaults to 'as-is'):\n");
+       printf("                set the line bias\n");
+       printf("\n");
+       print_bias_help();
 }
 
 int main(int argc, char **argv)
@@ -39,6 +44,7 @@ int main(int argc, char **argv)
        unsigned int *offsets, i, num_lines;
        int *values, optc, opti, rv;
        bool active_low = false;
+       int flags = 0;
        char *device, *end;
 
        for (;;) {
@@ -56,6 +62,9 @@ int main(int argc, char **argv)
                case 'l':
                        active_low = true;
                        break;
+               case 'B':
+                       flags = bias_flags(optarg);
+                       break;
                case '?':
                        die("try %s --help", get_progname());
                default:
@@ -86,9 +95,9 @@ int main(int argc, char **argv)
                        die("invalid GPIO offset: %s", argv[i + 1]);
        }
 
-       rv = gpiod_ctxless_get_value_multiple(device, offsets, values,
-                                             num_lines, active_low,
-                                             "gpioget");
+       rv = gpiod_ctxless_get_value_multiple_ext(device, offsets, values,
+                                                 num_lines, active_low,
+                                                 "gpioget", flags);
        if (rv < 0)
                die_perror("error reading GPIO values");
 

diff --git a/tools/gpiomon.c b/tools/gpiomon.c
index 9a1843b64ec81cf67aad81911a93f9875cf5e70e..0a61abf674f68c6884af9a9b5ce7c7b2db13a2b9 100644 (file)
--- a/tools/gpiomon.c
+++ b/tools/gpiomon.c
@@ -22,6 +22,7 @@ static const struct option longopts[] = {
        { "help",               no_argument,            NULL,   'h' },
        { "version",            no_argument,            NULL,   'v' },
        { "active-low",         no_argument,            NULL,   'l' },
+       { "bias",               required_argument,      NULL,   'B' },
        { "num-events",         required_argument,      NULL,   'n' },
        { "silent",             no_argument,            NULL,   's' },
        { "rising-edge",        no_argument,            NULL,   'r' },
@@ -31,7 +32,7 @@ static const struct option longopts[] = {
        { GETOPT_NULL_LONGOPT },
 };
 
-static const char *const shortopts = "+hvln:srfbF:";
+static const char *const shortopts = "+hvlB:n:srfbF:";
 
 static void print_help(void)
 {
@@ -43,6 +44,8 @@ static void print_help(void)
        printf("  -h, --help:\t\tdisplay this message and exit\n");
        printf("  -v, --version:\tdisplay the version and exit\n");
        printf("  -l, --active-low:\tset the line active state to low\n");
+       printf("  -B, --bias=[as-is|disable|pull-down|pull-up] (defaults to 'as-is'):\n");
+       printf("                set the line bias\n");
        printf("  -n, --num-events=NUM:\texit after processing NUM events\n");
        printf("  -s, --silent:\t\tdon't print event info\n");
        printf("  -r, --rising-edge:\tonly process rising edge events\n");
@@ -50,6 +53,8 @@ static void print_help(void)
        printf("  -b, --line-buffered:\tset standard output as line buffered\n");
        printf("  -F, --format=FMT\tspecify custom output format\n");
        printf("\n");
+       print_bias_help();
+       printf("\n");
        printf("Format specifiers:\n");
        printf("  %%o:  GPIO line offset\n");
        printf("  %%e:  event type (0 - falling edge, 1 rising edge)\n");
@@ -244,6 +249,7 @@ int main(int argc, char **argv)
 {
        unsigned int offsets[GPIOD_LINE_BULK_MAX_LINES], num_lines = 0, offset;
        bool active_low = false, watch_rising = false, watch_falling = false;
+       int flags = 0;
        struct timespec timeout = { 10, 0 };
        int optc, opti, rv, i, event_type;
        struct mon_ctx ctx;
@@ -266,6 +272,9 @@ int main(int argc, char **argv)
                case 'l':
                        active_low = true;
                        break;
+               case 'B':
+                       flags = bias_flags(optarg);
+                       break;
                case 'n':
                        ctx.events_wanted = strtoul(optarg, &end, 10);
                        if (*end != '\0')
@@ -320,11 +329,11 @@ int main(int argc, char **argv)
 
        ctx.sigfd = make_signalfd();
 
-       rv = gpiod_ctxless_event_monitor_multiple(argv[0], event_type,
-                                                 offsets, num_lines,
-                                                 active_low, "gpiomon",
-                                                 &timeout, poll_callback,
-                                                 event_callback, &ctx);
+       rv = gpiod_ctxless_event_monitor_multiple_ext(
+                               argv[0], event_type, offsets,
+                               num_lines, active_low, "gpiomon",
+                               &timeout, poll_callback,
+                               event_callback, &ctx, flags);
        if (rv)
                die_perror("error waiting for events");
 

diff --git a/tools/gpioset.c b/tools/gpioset.c
index d9977a7f9b641f5efbc135ad4def262287b150ca..347fb2e467baac71d7a87ad2de9e11553122f348 100644 (file)
--- a/tools/gpioset.c
+++ b/tools/gpioset.c
@@ -23,6 +23,7 @@ static const struct option longopts[] = {
        { "help",               no_argument,            NULL,   'h' },
        { "version",            no_argument,            NULL,   'v' },
        { "active-low",         no_argument,            NULL,   'l' },
+       { "bias",               required_argument,      NULL,   'B' },
        { "mode",               required_argument,      NULL,   'm' },
        { "sec",                required_argument,      NULL,   's' },
        { "usec",               required_argument,      NULL,   'u' },
@@ -30,7 +31,7 @@ static const struct option longopts[] = {
        { GETOPT_NULL_LONGOPT },
 };
 
-static const char *const shortopts = "+hvlm:s:u:b";
+static const char *const shortopts = "+hvlB:m:s:u:b";
 
 static void print_help(void)
 {
@@ -42,12 +43,16 @@ static void print_help(void)
        printf("  -h, --help:\t\tdisplay this message and exit\n");
        printf("  -v, --version:\tdisplay the version and exit\n");
        printf("  -l, --active-low:\tset the line active state to low\n");
+       printf("  -B, --bias=[as-is|disable|pull-down|pull-up] (defaults to 'as-is'):\n");
+       printf("                set the line bias\n");
        printf("  -m, --mode=[exit|wait|time|signal] (defaults to 'exit'):\n");
        printf("                tell the program what to do after setting values\n");
        printf("  -s, --sec=SEC:\tspecify the number of seconds to wait (only valid for --mode=time)\n");
        printf("  -u, --usec=USEC:\tspecify the number of microseconds to wait (only valid for --mode=time)\n");
        printf("  -b, --background:\tafter setting values: detach from the controlling terminal\n");
        printf("\n");
+       print_bias_help();
+       printf("\n");
        printf("Modes:\n");
        printf("  exit:\t\tset values and exit immediately\n");
        printf("  wait:\t\tset values and wait for user to press ENTER\n");
@@ -182,7 +187,7 @@ int main(int argc, char **argv)
 {
        const struct mode_mapping *mode = &modes[MODE_EXIT];
        unsigned int *offsets, num_lines, i;
-       int *values, rv, optc, opti;
+       int *values, rv, optc, opti, flags = 0;
        struct callback_data cbdata;
        bool active_low = false;
        char *device, *end;
@@ -204,6 +209,9 @@ int main(int argc, char **argv)
                case 'l':
                        active_low = true;
                        break;
+               case 'B':
+                       flags |= bias_flags(optarg);
+                       break;
                case 'm':
                        mode = parse_mode(optarg);
                        if (!mode)
@@ -268,9 +276,10 @@ int main(int argc, char **argv)
                        die("invalid offset: %s", argv[i + 1]);
        }
 
-       rv = gpiod_ctxless_set_value_multiple(device, offsets, values,
-                                             num_lines, active_low, "gpioset",
-                                             mode->callback, &cbdata);
+       rv = gpiod_ctxless_set_value_multiple_ext(
+                               device, offsets, values,
+                               num_lines, active_low, "gpioset",
+                               mode->callback, &cbdata, flags);
        if (rv < 0)
                die_perror("error setting the GPIO line values");
 

diff --git a/tools/tools-common.c b/tools/tools-common.c
index a6e38e5b446a879ae2119c7d54def85a682ea503..199f472734e98818bc13c27dafbf9e3d4c7f0046 100644 (file)
--- a/tools/tools-common.c
+++ b/tools/tools-common.c
@@ -57,3 +57,25 @@ void print_version(void)
        printf("This is free software: you are free to change and redistribute it.\n");
        printf("There is NO WARRANTY, to the extent permitted by law.\n");
 }
+
+int bias_flags(const char *option)
+{
+       if (strcmp(option, "pull-down") == 0)
+               return GPIOD_CTXLESS_FLAG_BIAS_PULL_DOWN;
+       if (strcmp(option, "pull-up") == 0)
+               return GPIOD_CTXLESS_FLAG_BIAS_PULL_UP;
+       if (strcmp(option, "disable") == 0)
+               return GPIOD_CTXLESS_FLAG_BIAS_DISABLE;
+       if (strcmp(option, "as-is") != 0)
+               die("invalid bias: %s", option);
+       return 0;
+}
+
+void print_bias_help(void)
+{
+       printf("Biases:\n");
+       printf("  as-is:\tleave bias unchanged\n");
+       printf("  disable:\tdisable bias\n");
+       printf("  pull-up:\tenable pull-up\n");
+       printf("  pull-down:\tenable pull-down\n");
+}

diff --git a/tools/tools-common.h b/tools/tools-common.h
index ace3b467ed78c72071f931a9ba87718879c9284f..c0d0cf24c0426392847c388bd4b81a2cd18e18b1 100644 (file)
--- a/tools/tools-common.h
+++ b/tools/tools-common.h
@@ -25,5 +25,7 @@ const char *get_progname(void);
 void die(const char *fmt, ...) NORETURN PRINTF(1, 2);
 void die_perror(const char *fmt, ...) NORETURN PRINTF(1, 2);
 void print_version(void);
+int bias_flags(const char *option);
+void print_bias_help(void);
 
 #endif /* __GPIOD_TOOLS_COMMON_H__ */