From f473aec8a16df73c9e416f02fe9ec07cd13bf8fa Mon Sep 17 00:00:00 2001 From: tnn Date: Sun, 20 Oct 2019 09:35:18 +0000 Subject: gpio: make GPIOREAD return also the symbolic name of the pin, if it is set --- sys/dev/gpio/gpio.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/gpio/gpio.c b/sys/dev/gpio/gpio.c index 78a3f6dc1f8..d57693f85b5 100644 --- a/sys/dev/gpio/gpio.c +++ b/sys/dev/gpio/gpio.c @@ -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 -__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 cmd, void *data, int flag, 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 cmd, void *data, int flag, /* 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) -- cgit