Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-29 03:13:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

tools: gpio: port gpio-watch to v2 uAPI

Browse Source 
Port the gpio-watch tool to the latest GPIO uAPI.

Signed-off-by: Kent Gibson <warthog618@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
This commit is contained in:
Kent Gibson 2020-09-28 08:28:02 +08:00 committed by Bartosz Golaszewski
parent 3c333c4704
commit e86a863b33
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/gpio/gpio-watch.c
View File

@ -21,8 +21,8 @@
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
struct gpioline_info_changed chg; struct gpio_v2_line_info_changed chg;
struct gpioline_info req; struct gpio_v2_line_info req;
struct pollfd pfd; struct pollfd pfd;
int fd, i, j, ret; int fd, i, j, ret;
char *event, *end; char *event, *end;
@ -40,11 +40,11 @@ int main(int argc, char **argv)
for (i = 0, j = 2; i < argc - 2; i++, j++) { for (i = 0, j = 2; i < argc - 2; i++, j++) {
memset(&req, 0, sizeof(req)); memset(&req, 0, sizeof(req));
req.line_offset = strtoul(argv[j], &end, 0); req.offset = strtoul(argv[j], &end, 0);
if (*end != '\0') if (*end != '\0')
goto err_usage; goto err_usage;
ret = ioctl(fd, GPIO_GET_LINEINFO_WATCH_IOCTL, &req); ret = ioctl(fd, GPIO_V2_GET_LINEINFO_WATCH_IOCTL, &req);
if (ret) { if (ret) {
perror("unable to set up line watch"); perror("unable to set up line watch");
return EXIT_FAILURE; return EXIT_FAILURE;
@ -71,13 +71,13 @@ int main(int argc, char **argv)
} }
switch (chg.event_type) { switch (chg.event_type) {
case GPIOLINE_CHANGED_REQUESTED: case GPIO_V2_LINE_CHANGED_REQUESTED:
event = "requested"; event = "requested";
break; break;
case GPIOLINE_CHANGED_RELEASED: case GPIO_V2_LINE_CHANGED_RELEASED:
event = "released"; event = "released";
break; break;
case GPIOLINE_CHANGED_CONFIG: case GPIO_V2_LINE_CHANGED_CONFIG:
event = "config changed"; event = "config changed";
break; break;
default: default:
@ -87,7 +87,7 @@ int main(int argc, char **argv)
} }
printf("line %u: %s at %llu\n", printf("line %u: %s at %llu\n",
chg.info.line_offset, event, chg.timestamp); chg.info.offset, event, chg.timestamp_ns);
} }
} }