pon., 25 lis 2019 o 15:33 Kent Gibson <warthog618@xxxxxxxxx> napisał(a):
>
> Add support for bias flags to applicable tools - gpioget, gpioset, and
> gpiomon.
>
> Signed-off-by: Kent Gibson <warthog618@xxxxxxxxx>
> ---
> tools/gpioget.c | 32 +++++++++++++++++++++++++----
> tools/gpiomon.c | 36 +++++++++++++++++++++++++++------
> tools/gpioset.c | 54 ++++++++++++++++++++++++++++++++++++++++++++-----
> 3 files changed, 107 insertions(+), 15 deletions(-)
>
> diff --git a/tools/gpioget.c b/tools/gpioget.c
> index 196ebeb..17614cb 100644
> --- a/tools/gpioget.c
> +++ b/tools/gpioget.c
> @@ -17,10 +17,11 @@ 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' },
> { GETOPT_NULL_LONGOPT },
> };
>
> -static const char *const shortopts = "+hvl";
> +static const char *const shortopts = "+hvlB:";
>
> static void print_help(void)
> {
> @@ -32,6 +33,25 @@ 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");
> + 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");
> +}
> +
> +static 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;
> + return 0;
> }
>
> int main(int argc, char **argv)
> @@ -39,6 +59,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 +77,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 +110,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 9a1843b..687212d 100644
> --- 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,12 @@ 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");
> + 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");
> + printf("\n");
> printf("Format specifiers:\n");
> printf(" %%o: GPIO line offset\n");
> printf(" %%e: event type (0 - falling edge, 1 rising edge)\n");
> @@ -240,10 +249,22 @@ static int make_signalfd(void)
> return sigfd;
> }
>
> +static 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;
> + return 0;
Does it mean that any other string would be interpreted as 'as-is'?
I'd prefer it to bail out on invalid value.
> +}
> +
> 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 +287,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 +344,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 d9977a7..b91baea 100644
> --- a/tools/gpioset.c
> +++ b/tools/gpioset.c
> @@ -23,6 +23,8 @@ 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' },
> + { "drive", required_argument, NULL, 'D' },
> { "mode", required_argument, NULL, 'm' },
> { "sec", required_argument, NULL, 's' },
> { "usec", required_argument, NULL, 'u' },
> @@ -30,7 +32,7 @@ static const struct option longopts[] = {
> { GETOPT_NULL_LONGOPT },
> };
>
> -static const char *const shortopts = "+hvlm:s:u:b";
> +static const char *const shortopts = "+hvlB:D:m:s:u:b";
>
> static void print_help(void)
> {
> @@ -42,12 +44,27 @@ 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(" -D, --drive=[push-pull|open-drain|open-source] (defaults to 'push-pull'):\n");
> + printf(" set the line drive mode\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");
> + 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");
> + printf("\n");
> + printf("Drives:\n");
> + printf(" push-pull:\tdrive the line both high and low\n");
> + printf(" open-drain:\tdrive the line low or go high impedance\n");
> + printf(" open-source:\tdrive the line high or go high impedance\n");
> + 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");
> @@ -178,11 +195,31 @@ static const struct mode_mapping *parse_mode(const char *mode)
> return NULL;
> }
>
> +static 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;
> + return 0;
> +}
> +
> +static int drive_flags(const char *option)
> +{
> + if (strcmp(option, "open-drain") == 0)
> + return GPIOD_CTXLESS_FLAG_OPEN_DRAIN;
> + if (strcmp(option, "open-source") == 0)
> + return GPIOD_CTXLESS_FLAG_OPEN_SOURCE;
> + return 0;
Thanks for doing this, but please put it into a separate commit that
adds support for drive flags.
> +}
> +
> 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 +241,12 @@ int main(int argc, char **argv)
> case 'l':
> active_low = true;
> break;
> + case 'B':
> + flags |= bias_flags(optarg);
> + break;
> + case 'D':
> + flags |= drive_flags(optarg);
> + break;
> case 'm':
> mode = parse_mode(optarg);
> if (!mode)
> @@ -268,9 +311,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");
>
> --
> 2.24.0
>
Re: [libgpiod][PATCH v3 13/14] tools: add support for bias flags
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
- Subject: Re: [libgpiod][PATCH v3 13/14] tools: add support for bias flags
- From: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx>
- Date: Thu, 28 Nov 2019 11:29:45 +0100
- In-reply-to: <20191125143157.26154-14-warthog618@gmail.com>
- References: <20191125143157.26154-1-warthog618@gmail.com> <20191125143157.26154-14-warthog618@gmail.com>
- References:
- [libgpiod][PATCH v3 00/14] Add support for bias flags and SET_CONFIG
- From: Kent Gibson
- [libgpiod][PATCH v3 13/14] tools: add support for bias flags
- From: Kent Gibson
- [libgpiod][PATCH v3 00/14] Add support for bias flags and SET_CONFIG
- Prev by Date: Re: [libgpiod][PATCH v3 11/14] bindings: python: add support for SET_CONFIG
- Next by Date: Re: [PATCH v2 3/3] pinctrl: da9062: add driver support
- Previous by thread: [libgpiod][PATCH v3 13/14] tools: add support for bias flags
- Next by thread: [libgpiod][PATCH v3 14/14] tools: add tests for bias and drive flags
- Index(es):
 |