Module Name: src Committed By: thorpej Date: Wed Aug 4 18:33:11 UTC 2021
Modified Files: src/sys/dev/gpio [thorpej-cfargs2]: gpio.c gpioiic.c gpioow.c gpiosim.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.65.8.1 src/sys/dev/gpio/gpio.c cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/dev/gpio/gpioiic.c cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/dev/gpio/gpioow.c cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/dev/gpio/gpiosim.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.65 src/sys/dev/gpio/gpio.c:1.65.8.1 --- src/sys/dev/gpio/gpio.c:1.65 Sat Apr 24 23:36:54 2021 +++ src/sys/dev/gpio/gpio.c Wed Aug 4 18:33:11 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: gpio.c,v 1.65 2021/04/24 23:36:54 thorpej Exp $ */ +/* $NetBSD: gpio.c,v 1.65.8.1 2021/08/04 18:33:11 thorpej 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.65 2021/04/24 23:36:54 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.65.8.1 2021/08/04 18:33:11 thorpej Exp $"); /* * General Purpose Input/Output framework. @@ -191,8 +191,7 @@ gpio_rescan(device_t self, const char *i { config_search(self, NULL, - CFARG_SEARCH, gpio_search, - CFARG_EOL); + CFARGS(.search = gpio_search)); return 0; } @@ -278,7 +277,7 @@ gpio_search(device_t parent, cfdata_t cf strcpy(ga.ga_dvname, cf->cf_name); if (config_probe(parent, cf, &ga)) - config_attach(parent, cf, &ga, gpio_print, CFARG_EOL); + config_attach(parent, cf, &ga, gpio_print, CFARGS_NONE); kmem_free(ga.ga_dvname, namlen); return 0; } @@ -854,13 +853,11 @@ gpio_ioctl(struct gpio_softc *sc, u_long locs[GPIOCF_FLAG] = ga.ga_flags; cf = config_search(sc->sc_dev, &ga, - CFARG_LOCATORS, locs, - CFARG_EOL); + CFARGS(.locators = locs)); if (cf != NULL) { dv = config_attach(sc->sc_dev, cf, &ga, gpiobus_print, - CFARG_LOCATORS, locs, - CFARG_EOL); + CFARGS(.locators = locs)); #ifdef COMPAT_50 if (dv != NULL) { gdev = kmem_alloc(sizeof(struct gpio_dev), Index: src/sys/dev/gpio/gpioiic.c diff -u src/sys/dev/gpio/gpioiic.c:1.10 src/sys/dev/gpio/gpioiic.c:1.10.8.1 --- src/sys/dev/gpio/gpioiic.c:1.10 Sat Apr 24 23:36:54 2021 +++ src/sys/dev/gpio/gpioiic.c Wed Aug 4 18:33:11 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: gpioiic.c,v 1.10 2021/04/24 23:36:54 thorpej Exp $ */ +/* $NetBSD: gpioiic.c,v 1.10.8.1 2021/08/04 18:33:11 thorpej Exp $ */ /* $OpenBSD: gpioiic.c,v 1.8 2008/11/24 12:12:12 mbalmer Exp $ */ /* @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gpioiic.c,v 1.10 2021/04/24 23:36:54 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gpioiic.c,v 1.10.8.1 2021/08/04 18:33:11 thorpej Exp $"); /* * I2C bus bit-banging through GPIO pins. @@ -192,7 +192,7 @@ gpioiic_attach(device_t parent, device_t memset(&iba, 0, sizeof(iba)); iba.iba_tag = &sc->sc_i2c_tag; - sc->sc_i2c_dev = config_found(self, &iba, iicbus_print, CFARG_EOL); + sc->sc_i2c_dev = config_found(self, &iba, iicbus_print, CFARGS_NONE); if (!pmf_device_register(self, NULL, NULL)) aprint_error("%s: could not establish power handler\n", Index: src/sys/dev/gpio/gpioow.c diff -u src/sys/dev/gpio/gpioow.c:1.18 src/sys/dev/gpio/gpioow.c:1.18.8.1 --- src/sys/dev/gpio/gpioow.c:1.18 Sat Apr 24 23:36:54 2021 +++ src/sys/dev/gpio/gpioow.c Wed Aug 4 18:33:11 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: gpioow.c,v 1.18 2021/04/24 23:36:54 thorpej Exp $ */ +/* $NetBSD: gpioow.c,v 1.18.8.1 2021/08/04 18:33:11 thorpej Exp $ */ /* $OpenBSD: gpioow.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */ /* @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gpioow.c,v 1.18 2021/04/24 23:36:54 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gpioow.c,v 1.18.8.1 2021/08/04 18:33:11 thorpej Exp $"); /* * 1-Wire bus bit-banging through GPIO pin. @@ -149,7 +149,7 @@ gpioow_attach(device_t parent, device_t memset(&oba, 0, sizeof(oba)); oba.oba_bus = &sc->sc_ow_bus; - sc->sc_ow_dev = config_found(self, &oba, onewirebus_print, CFARG_EOL); + sc->sc_ow_dev = config_found(self, &oba, onewirebus_print, CFARGS_NONE); if (!pmf_device_register(self, NULL, NULL)) aprint_error("%s: could not establish power handler\n", Index: src/sys/dev/gpio/gpiosim.c diff -u src/sys/dev/gpio/gpiosim.c:1.22 src/sys/dev/gpio/gpiosim.c:1.22.8.1 --- src/sys/dev/gpio/gpiosim.c:1.22 Sat Apr 24 23:36:54 2021 +++ src/sys/dev/gpio/gpiosim.c Wed Aug 4 18:33:11 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: gpiosim.c,v 1.22 2021/04/24 23:36:54 thorpej Exp $ */ +/* $NetBSD: gpiosim.c,v 1.22.8.1 2021/08/04 18:33:11 thorpej Exp $ */ /* $OpenBSD: gpiosim.c,v 1.1 2008/11/23 18:46:49 mbalmer Exp $ */ /* @@ -142,7 +142,7 @@ gpiosim_attach(device_t parent, device_t CTL_CREATE, CTL_EOL); aprint_normal(": simulating %d pins\n", GPIOSIM_NPINS); - sc->sc_gdev = config_found(self, &gba, gpiobus_print, CFARG_EOL); + sc->sc_gdev = config_found(self, &gba, gpiobus_print, CFARGS_NONE); } static int