From: Kent Gibson <warthog618@gmail.com>
To: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org,
bgolaszewski@baylibre.com, linus.walleij@linaro.org
Cc: Kent Gibson <warthog618@gmail.com>
Subject: [PATCH v7 14/20] tools: gpio: port lsgpio to v2 uAPI
Date: Sat, 5 Sep 2020 21:35:43 +0800 [thread overview]
Message-ID: <20200905133549.24606-15-warthog618@gmail.com> (raw)
In-Reply-To: <20200905133549.24606-1-warthog618@gmail.com>
Port the lsgpio tool to the latest GPIO uAPI.
Signed-off-by: Kent Gibson <warthog618@gmail.com>
---
tools/gpio/lsgpio.c | 60 ++++++++++++++++++++++++++++-----------------
1 file changed, 38 insertions(+), 22 deletions(-)
diff --git a/tools/gpio/lsgpio.c b/tools/gpio/lsgpio.c
index b08d7a5e779b..deda38244026 100644
--- a/tools/gpio/lsgpio.c
+++ b/tools/gpio/lsgpio.c
@@ -25,57 +25,73 @@
struct gpio_flag {
char *name;
- unsigned long mask;
+ unsigned long long mask;
};
struct gpio_flag flagnames[] = {
{
- .name = "kernel",
- .mask = GPIOLINE_FLAG_KERNEL,
+ .name = "used",
+ .mask = GPIO_V2_LINE_FLAG_USED,
+ },
+ {
+ .name = "input",
+ .mask = GPIO_V2_LINE_FLAG_INPUT,
},
{
.name = "output",
- .mask = GPIOLINE_FLAG_IS_OUT,
+ .mask = GPIO_V2_LINE_FLAG_OUTPUT,
},
{
.name = "active-low",
- .mask = GPIOLINE_FLAG_ACTIVE_LOW,
+ .mask = GPIO_V2_LINE_FLAG_ACTIVE_LOW,
},
{
.name = "open-drain",
- .mask = GPIOLINE_FLAG_OPEN_DRAIN,
+ .mask = GPIO_V2_LINE_FLAG_OPEN_DRAIN,
},
{
.name = "open-source",
- .mask = GPIOLINE_FLAG_OPEN_SOURCE,
+ .mask = GPIO_V2_LINE_FLAG_OPEN_SOURCE,
},
{
.name = "pull-up",
- .mask = GPIOLINE_FLAG_BIAS_PULL_UP,
+ .mask = GPIO_V2_LINE_FLAG_BIAS_PULL_UP,
},
{
.name = "pull-down",
- .mask = GPIOLINE_FLAG_BIAS_PULL_DOWN,
+ .mask = GPIO_V2_LINE_FLAG_BIAS_PULL_DOWN,
},
{
.name = "bias-disabled",
- .mask = GPIOLINE_FLAG_BIAS_DISABLE,
+ .mask = GPIO_V2_LINE_FLAG_BIAS_DISABLED,
},
};
-void print_flags(unsigned long flags)
+static void print_attributes(struct gpio_v2_line_info *info)
{
int i;
- int printed = 0;
+ const char *field_format = "%s";
for (i = 0; i < ARRAY_SIZE(flagnames); i++) {
- if (flags & flagnames[i].mask) {
- if (printed)
- fprintf(stdout, " ");
- fprintf(stdout, "%s", flagnames[i].name);
- printed++;
+ if (info->flags & flagnames[i].mask) {
+ fprintf(stdout, field_format, flagnames[i].name);
+ field_format = ", %s";
}
}
+
+ if ((info->flags & GPIO_V2_LINE_FLAG_EDGE_RISING) &&
+ (info->flags & GPIO_V2_LINE_FLAG_EDGE_FALLING))
+ fprintf(stdout, field_format, "both-edges");
+ else if (info->flags & GPIO_V2_LINE_FLAG_EDGE_RISING)
+ fprintf(stdout, field_format, "rising-edge");
+ else if (info->flags & GPIO_V2_LINE_FLAG_EDGE_FALLING)
+ fprintf(stdout, field_format, "falling-edge");
+
+ for (i = 0; i < info->num_attrs; i++) {
+ if (info->attrs[i].id == GPIO_V2_LINE_ATTR_ID_DEBOUNCE)
+ fprintf(stdout, ", debounce_period=%dusec",
+ info->attrs[0].debounce_period);
+ }
}
int list_device(const char *device_name)
@@ -109,18 +125,18 @@ int list_device(const char *device_name)
/* Loop over the lines and print info */
for (i = 0; i < cinfo.lines; i++) {
- struct gpioline_info linfo;
+ struct gpio_v2_line_info linfo;
memset(&linfo, 0, sizeof(linfo));
- linfo.line_offset = i;
+ linfo.offset = i;
- ret = ioctl(fd, GPIO_GET_LINEINFO_IOCTL, &linfo);
+ ret = ioctl(fd, GPIO_V2_GET_LINEINFO_IOCTL, &linfo);
if (ret == -1) {
ret = -errno;
perror("Failed to issue LINEINFO IOCTL\n");
goto exit_close_error;
}
- fprintf(stdout, "\tline %2d:", linfo.line_offset);
+ fprintf(stdout, "\tline %2d:", linfo.offset);
if (linfo.name[0])
fprintf(stdout, " \"%s\"", linfo.name);
else
@@ -131,7 +147,7 @@ int list_device(const char *device_name)
fprintf(stdout, " unused");
if (linfo.flags) {
fprintf(stdout, " [");
- print_flags(linfo.flags);
+ print_attributes(&linfo);
fprintf(stdout, "]");
}
fprintf(stdout, "\n");
--
2.28.0
next prev parent reply other threads:[~2020-09-05 13:45 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-05 13:35 [PATCH v7 00/20] gpio: cdev: add uAPI v2 Kent Gibson
2020-09-05 13:35 ` [PATCH v7 01/20] gpiolib: cdev: desc_to_lineinfo should set info offset Kent Gibson
2020-09-05 13:35 ` [PATCH v7 02/20] gpiolib: cdev: replace strncpy with strscpy Kent Gibson
2020-09-05 13:35 ` [PATCH v7 03/20] gpio: uapi: define GPIO_MAX_NAME_SIZE for array sizes Kent Gibson
2020-09-05 13:35 ` [PATCH v7 04/20] gpio: uapi: define uAPI v2 Kent Gibson
2020-09-05 13:35 ` [PATCH v7 05/20] gpiolib: make cdev a build option Kent Gibson
2020-09-05 13:35 ` [PATCH v7 06/20] gpiolib: add build option for CDEV v1 ABI Kent Gibson
2020-09-05 13:35 ` [PATCH v7 07/20] gpiolib: cdev: support GPIO_V2_GET_LINE_IOCTL and GPIO_V2_LINE_GET_VALUES_IOCTL Kent Gibson
2020-09-09 9:24 ` Kent Gibson
2020-09-09 9:26 ` Bartosz Golaszewski
2020-09-09 9:35 ` Kent Gibson
2020-09-09 9:41 ` Bartosz Golaszewski
2020-09-09 9:49 ` Kent Gibson
2020-09-09 9:54 ` Bartosz Golaszewski
2020-09-15 10:31 ` Andy Shevchenko
2020-09-20 11:12 ` Kent Gibson
2020-09-24 13:36 ` Bartosz Golaszewski
2020-09-24 13:40 ` Kent Gibson
2020-09-05 13:35 ` [PATCH v7 08/20] gpiolib: cdev: support GPIO_V2_GET_LINEINFO_IOCTL and GPIO_V2_GET_LINEINFO_WATCH_IOCTL Kent Gibson
2020-09-05 13:35 ` [PATCH v7 09/20] gpiolib: cdev: support edge detection for uAPI v2 Kent Gibson
2020-09-05 13:35 ` [PATCH v7 10/20] gpiolib: cdev: support GPIO_V2_LINE_SET_CONFIG_IOCTL Kent Gibson
2020-09-05 13:35 ` [PATCH v7 11/20] gpiolib: cdev: support GPIO_V2_LINE_SET_VALUES_IOCTL Kent Gibson
2020-09-05 13:35 ` [PATCH v7 12/20] gpiolib: cdev: support setting debounce Kent Gibson
2020-09-05 13:35 ` [PATCH v7 13/20] gpio: uapi: document uAPI v1 as deprecated Kent Gibson
2020-09-05 13:35 ` Kent Gibson [this message]
2020-09-05 13:35 ` [PATCH v7 15/20] tools: gpio: port gpio-watch to v2 uAPI Kent Gibson
2020-09-05 13:35 ` [PATCH v7 16/20] tools: gpio: rename nlines to num_lines Kent Gibson
2020-09-05 13:35 ` [PATCH v7 17/20] tools: gpio: port gpio-hammer to v2 uAPI Kent Gibson
2020-09-05 13:35 ` [PATCH v7 18/20] tools: gpio: port gpio-event-mon " Kent Gibson
2020-09-05 13:35 ` [PATCH v7 19/20] tools: gpio: add multi-line monitoring to gpio-event-mon Kent Gibson
2020-09-05 13:35 ` [PATCH v7 20/20] tools: gpio: add debounce support " Kent Gibson
2020-09-08 16:07 ` [PATCH v7 00/20] gpio: cdev: add uAPI v2 Bartosz Golaszewski
2020-09-09 1:16 ` Kent Gibson
2020-09-09 7:52 ` Bartosz Golaszewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200905133549.24606-15-warthog618@gmail.com \
--to=warthog618@gmail.com \
--cc=bgolaszewski@baylibre.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).