Module Name: src
Committed By: tnn
Date: Sun Oct 20 09:35:18 UTC 2019
Modified Files:
src/sys/dev/gpio: gpio.c
Log Message:
gpio: make GPIOREAD return also the symbolic name of the pin, if it is set
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/gpio/gpio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/gpio/gpio.c
diff -u src/sys/dev/gpio/gpio.c:1.63 src/sys/dev/gpio/gpio.c:1.64
--- src/sys/dev/gpio/gpio.c:1.63 Tue Oct 15 00:13:53 2019
+++ src/sys/dev/gpio/gpio.c Sun Oct 20 09:35:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.63 2019/10/15 00:13:53 chs Exp $ */
+/* $NetBSD: gpio.c,v 1.64 2019/10/20 09:35:18 tnn Exp $ */
/* $OpenBSD: gpio.c,v 1.6 2006/01/14 12:33:49 grange Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.63 2019/10/15 00:13:53 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.64 2019/10/20 09:35:18 tnn Exp $");
/*
* General Purpose Input/Output framework.
@@ -722,9 +722,8 @@ gpio_ioctl(struct gpio_softc *sc, u_long
req = data;
if (req->gp_name[0] != '\0')
- pin = gpio_pinbyname(sc, req->gp_name);
- else
- pin = req->gp_pin;
+ req->gp_pin = gpio_pinbyname(sc, req->gp_name);
+ pin = req->gp_pin;
if (pin < 0 || pin >= sc->sc_npins)
return EINVAL;
@@ -736,6 +735,11 @@ gpio_ioctl(struct gpio_softc *sc, u_long
/* return read value */
req->gp_value = gpiobus_pin_read(gc, pin);
+ LIST_FOREACH(nm, &sc->sc_names, gp_next)
+ if (nm->gp_pin == pin) {
+ strlcpy(req->gp_name, nm->gp_name, GPIOMAXNAME);
+ break;
+ }
break;
case GPIOWRITE:
if ((flag & FWRITE) == 0)
