iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools: gpio: port gpio-event-mon to v2 uAPI

Browse Source 
Port the gpio-event-mon 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:05 +08:00 committed by Bartosz Golaszewski
parent 7ff6d1d25a
commit 0acda979df
1 changed files with 47 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
tools/gpio/gpio-event-mon.c
View File

@ -23,17 +23,16 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/types.h> #include <sys/types.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include "gpio-utils.h"
int monitor_device(const char *device_name, int monitor_device(const char *device_name,
unsigned int line, unsigned int line,
uint32_t handleflags, struct gpio_v2_line_config *config,
uint32_t eventflags,
unsigned int loops) unsigned int loops)
{ {
struct gpioevent_request req; struct gpio_v2_line_values values;
struct gpiohandle_data data;
char *chrdev_name; char *chrdev_name;
int fd; int cfd, lfd;
int ret; int ret;
int i = 0; int i = 0;
@ -41,44 +40,39 @@ int monitor_device(const char *device_name,
if (ret < 0) if (ret < 0)
return -ENOMEM; return -ENOMEM;
fd = open(chrdev_name, 0); cfd = open(chrdev_name, 0);
if (fd == -1) { if (cfd == -1) {
ret = -errno; ret = -errno;
fprintf(stderr, "Failed to open %s\n", chrdev_name); fprintf(stderr, "Failed to open %s\n", chrdev_name);
goto exit_free_name; goto exit_free_name;
} }
req.lineoffset = line; ret = gpiotools_request_line(device_name, &line, 1, config,
req.handleflags = handleflags; "gpio-event-mon");
req.eventflags = eventflags; if (ret < 0)
strcpy(req.consumer_label, "gpio-event-mon"); goto exit_device_close;
else
ret = ioctl(fd, GPIO_GET_LINEEVENT_IOCTL, &req); lfd = ret;
if (ret == -1) {
ret = -errno;
fprintf(stderr, "Failed to issue GET EVENT "
"IOCTL (%d)\n",
ret);
goto exit_close_error;
}
/* Read initial states */ /* Read initial states */
ret = ioctl(req.fd, GPIOHANDLE_GET_LINE_VALUES_IOCTL, &data); values.mask = 1;
if (ret == -1) { values.bits = 0;
ret = -errno; ret = gpiotools_get_values(lfd, &values);
fprintf(stderr, "Failed to issue GPIOHANDLE GET LINE " if (ret < 0) {
"VALUES IOCTL (%d)\n", fprintf(stderr,
"Failed to issue GPIO LINE GET VALUES IOCTL (%d)\n",
ret); ret);
goto exit_close_error; goto exit_line_close;
} }
fprintf(stdout, "Monitoring line %d on %s\n", line, device_name); fprintf(stdout, "Monitoring line %d on %s\n", line, device_name);
fprintf(stdout, "Initial line value: %d\n", data.values[0]); fprintf(stdout, "Initial line value: %d\n",
gpiotools_test_bit(values.bits, 0));
while (1) { while (1) {
struct gpioevent_data event; struct gpio_v2_line_event event;
ret = read(req.fd, &event, sizeof(event)); ret = read(lfd, &event, sizeof(event));
if (ret == -1) { if (ret == -1) {
if (errno == -EAGAIN) { if (errno == -EAGAIN) {
fprintf(stderr, "nothing available\n"); fprintf(stderr, "nothing available\n");
@ -96,12 +90,14 @@ int monitor_device(const char *device_name,
ret = -EIO; ret = -EIO;
break; break;
} }
fprintf(stdout, "GPIO EVENT %llu: ", event.timestamp); fprintf(stdout, "GPIO EVENT at %llu on line %d (%d|%d) ",
event.timestamp_ns, event.offset, event.line_seqno,
event.seqno);
switch (event.id) { switch (event.id) {
case GPIOEVENT_EVENT_RISING_EDGE: case GPIO_V2_LINE_EVENT_RISING_EDGE:
fprintf(stdout, "rising edge"); fprintf(stdout, "rising edge");
break; break;
case GPIOEVENT_EVENT_FALLING_EDGE: case GPIO_V2_LINE_EVENT_FALLING_EDGE:
fprintf(stdout, "falling edge"); fprintf(stdout, "falling edge");
break; break;
default: default:
@ -114,8 +110,11 @@ int monitor_device(const char *device_name,
break; break;
} }
exit_close_error: exit_line_close:
if (close(fd) == -1) if (close(lfd) == -1)
perror("Failed to close line file");
exit_device_close:
if (close(cfd) == -1)
perror("Failed to close GPIO character device file"); perror("Failed to close GPIO character device file");
exit_free_name: exit_free_name:
free(chrdev_name); free(chrdev_name);
@ -140,15 +139,20 @@ void print_usage(void)
); );
} }
#define EDGE_FLAGS \
(GPIO_V2_LINE_FLAG_EDGE_RISING | \
GPIO_V2_LINE_FLAG_EDGE_FALLING)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
const char *device_name = NULL; const char *device_name = NULL;
unsigned int line = -1; unsigned int line = -1;
unsigned int loops = 0; unsigned int loops = 0;
uint32_t handleflags = GPIOHANDLE_REQUEST_INPUT; struct gpio_v2_line_config config;
uint32_t eventflags = 0;
int c; int c;
memset(&config, 0, sizeof(config));
config.flags = GPIO_V2_LINE_FLAG_INPUT;
while ((c = getopt(argc, argv, "c:n:o:dsrf?")) != -1) { while ((c = getopt(argc, argv, "c:n:o:dsrf?")) != -1) {
switch (c) { switch (c) {
case 'c': case 'c':
@ -161,16 +165,16 @@ int main(int argc, char **argv)
line = strtoul(optarg, NULL, 10); line = strtoul(optarg, NULL, 10);
break; break;
case 'd': case 'd':
handleflags |= GPIOHANDLE_REQUEST_OPEN_DRAIN; config.flags |= GPIO_V2_LINE_FLAG_OPEN_DRAIN;
break; break;
case 's': case 's':
handleflags |= GPIOHANDLE_REQUEST_OPEN_SOURCE; config.flags |= GPIO_V2_LINE_FLAG_OPEN_SOURCE;
break; break;
case 'r': case 'r':
eventflags |= GPIOEVENT_REQUEST_RISING_EDGE; config.flags |= GPIO_V2_LINE_FLAG_EDGE_RISING;
break; break;
case 'f': case 'f':
eventflags |= GPIOEVENT_REQUEST_FALLING_EDGE; config.flags |= GPIO_V2_LINE_FLAG_EDGE_FALLING;
break; break;
case '?': case '?':
print_usage(); print_usage();
@ -182,11 +186,10 @@ int main(int argc, char **argv)
print_usage(); print_usage();
return -1; return -1;
} }
if (!eventflags) { if (!(config.flags & EDGE_FLAGS)) {
printf("No flags specified, listening on both rising and " printf("No flags specified, listening on both rising and "
"falling edges\n"); "falling edges\n");
eventflags = GPIOEVENT_REQUEST_BOTH_EDGES; config.flags |= EDGE_FLAGS;
} }
return monitor_device(device_name, line, handleflags, return monitor_device(device_name, line, &config, loops);
eventflags, loops);
} }