Module Name: src Committed By: thorpej Date: Wed Aug 4 02:39:49 UTC 2021
Modified Files: src/sys/arch/macppc/dev [thorpej-cfargs2]: adb.c akbd.c ams.c cuda.c gpio.c ki2c.c mediabay.c mesh.c obio.c ofb.c pbms.c platinumfb.c pmu.c smu.c smuiic.c snapper.c uni-n.c valkyriefb.c zs.c src/sys/arch/macppc/macppc [thorpej-cfargs2]: mainbus.c memory.c src/sys/arch/macppc/pci [thorpej-cfargs2]: bandit.c grackle.c u3.c uninorth.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.36.8.1 src/sys/arch/macppc/dev/adb.c cvs rdiff -u -r1.46 -r1.46.8.1 src/sys/arch/macppc/dev/akbd.c cvs rdiff -u -r1.30 -r1.30.8.1 src/sys/arch/macppc/dev/ams.c cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/arch/macppc/dev/cuda.c cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/macppc/dev/gpio.c cvs rdiff -u -r1.31 -r1.31.8.1 src/sys/arch/macppc/dev/ki2c.c cvs rdiff -u -r1.25 -r1.25.8.1 src/sys/arch/macppc/dev/mediabay.c cvs rdiff -u -r1.41 -r1.41.8.1 src/sys/arch/macppc/dev/mesh.c cvs rdiff -u -r1.49 -r1.49.8.1 src/sys/arch/macppc/dev/obio.c cvs rdiff -u -r1.71 -r1.71.8.1 src/sys/arch/macppc/dev/ofb.c cvs rdiff -u -r1.18 -r1.18.2.1 src/sys/arch/macppc/dev/pbms.c cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/macppc/dev/platinumfb.c cvs rdiff -u -r1.37 -r1.37.8.1 src/sys/arch/macppc/dev/pmu.c cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/macppc/dev/smu.c cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/macppc/dev/smuiic.c cvs rdiff -u -r1.60 -r1.60.2.1 src/sys/arch/macppc/dev/snapper.c cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/macppc/dev/uni-n.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/macppc/dev/valkyriefb.c cvs rdiff -u -r1.52 -r1.52.8.1 src/sys/arch/macppc/dev/zs.c cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/macppc/macppc/mainbus.c cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/macppc/macppc/memory.c cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/macppc/pci/bandit.c cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/macppc/pci/grackle.c cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/macppc/pci/u3.c cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/macppc/pci/uninorth.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/arch/macppc/dev/adb.c diff -u src/sys/arch/macppc/dev/adb.c:1.36 src/sys/arch/macppc/dev/adb.c:1.36.8.1 --- src/sys/arch/macppc/dev/adb.c:1.36 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/dev/adb.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: adb.c,v 1.36 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: adb.c,v 1.36.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /*- * Copyright (C) 1994 Bradley A. Grantham @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.36 2021/04/24 23:36:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.36.8.1 2021/08/04 02:39:49 thorpej Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -150,7 +150,7 @@ adbattach(device_t parent, device_t self aa_args.adbaddr = ADBADDR_APM; aa_args.handler_id = ADBADDR_APM; - (void)config_found(self, &aa_args, NULL, CFARG_EOL); + (void)config_found(self, &aa_args, NULL, CFARGS_NONE); #endif /* @@ -174,7 +174,7 @@ adbattach(device_t parent, device_t self aa_args.origaddr = 0; aa_args.adbaddr = 0; aa_args.handler_id = 0; - (void)config_found(self, &aa_args, adbprint, CFARG_EOL); + (void)config_found(self, &aa_args, adbprint, CFARGS_NONE); #endif /* for each ADB device */ @@ -186,7 +186,7 @@ adbattach(device_t parent, device_t self aa_args.adbaddr = adbaddr; aa_args.handler_id = adbdata.devType; - (void)config_found(self, &aa_args, adbprint, CFARG_EOL); + (void)config_found(self, &aa_args, adbprint, CFARGS_NONE); } if (adbHardware == ADB_HW_CUDA) Index: src/sys/arch/macppc/dev/akbd.c diff -u src/sys/arch/macppc/dev/akbd.c:1.46 src/sys/arch/macppc/dev/akbd.c:1.46.8.1 --- src/sys/arch/macppc/dev/akbd.c:1.46 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/dev/akbd.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: akbd.c,v 1.46 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: akbd.c,v 1.46.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /* * Copyright (C) 1998 Colin Wood @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.46 2021/04/24 23:36:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.46.8.1 2021/08/04 02:39:49 thorpej Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -250,7 +250,7 @@ akbdattach(device_t parent, device_t sel a.accessops = &akbd_accessops; a.accesscookie = sc; - sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARG_EOL); + sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARGS_NONE); } Index: src/sys/arch/macppc/dev/ams.c diff -u src/sys/arch/macppc/dev/ams.c:1.30 src/sys/arch/macppc/dev/ams.c:1.30.8.1 --- src/sys/arch/macppc/dev/ams.c:1.30 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/dev/ams.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ams.c,v 1.30 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: ams.c,v 1.30.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /* * Copyright (C) 1998 Colin Wood @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ams.c,v 1.30 2021/04/24 23:36:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ams.c,v 1.30.8.1 2021/08/04 02:39:49 thorpej Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -199,7 +199,7 @@ amsattach(device_t parent, device_t self a.accessops = &ams_accessops; a.accesscookie = sc; - sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL); + sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARGS_NONE); } Index: src/sys/arch/macppc/dev/cuda.c diff -u src/sys/arch/macppc/dev/cuda.c:1.28 src/sys/arch/macppc/dev/cuda.c:1.28.8.1 --- src/sys/arch/macppc/dev/cuda.c:1.28 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/dev/cuda.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: cuda.c,v 1.28 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: cuda.c,v 1.28.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /*- * Copyright (c) 2006 Michael Lorenz @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cuda.c,v 1.28 2021/04/24 23:36:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cuda.c,v 1.28.8.1 2021/08/04 02:39:49 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -233,8 +233,7 @@ cuda_attach(device_t parent, device_t se sc->sc_adbops.autopoll = cuda_autopoll; sc->sc_adbops.set_handler = cuda_adb_set_handler; config_found(self, &sc->sc_adbops, nadb_print, - CFARG_IATTR, "adb_bus", - CFARG_EOL); + CFARGS(.iattr = "adb_bus")); } else if (strncmp(name, "rtc", 4) == 0) { sc->sc_todr.todr_gettime = cuda_todr_get; @@ -250,7 +249,7 @@ cuda_attach(device_t parent, device_t se caa.send = cuda_send; caa.poll = cuda_poll; #if notyet - config_found(self, &caa, cuda_print, CFARG_EOL); + config_found(self, &caa, cuda_print, CFARGS_NONE); #endif cfg = prop_array_create(); prop_dictionary_set(dict, "i2c-child-devices", cfg); @@ -282,8 +281,7 @@ cuda_attach(device_t parent, device_t se sc->sc_i2c.ic_cookie = sc; sc->sc_i2c.ic_exec = cuda_i2c_exec; config_found(self, &iba, iicbus_print, - CFARG_IATTR, "i2cbus", - CFARG_EOL); + CFARGS(.iattr = "i2cbus")); if (cuda0 == NULL) cuda0 = &caa; Index: src/sys/arch/macppc/dev/gpio.c diff -u src/sys/arch/macppc/dev/gpio.c:1.14 src/sys/arch/macppc/dev/gpio.c:1.14.8.1 --- src/sys/arch/macppc/dev/gpio.c:1.14 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/dev/gpio.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: gpio.c,v 1.14 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: gpio.c,v 1.14.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /*- * Copyright (C) 1998 Internet Research Institute, Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.14 2021/04/24 23:36:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.14.8.1 2021/08/04 02:39:49 thorpej Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -120,8 +120,7 @@ gpio_obio_attach(device_t parent, device ca2.ca_intr = intr; config_found(self, &ca2, gpio_obio_print, - CFARG_DEVHANDLE, devhandle_from_of(child), - CFARG_EOL); + CFARGS(.devhandle = devhandle_from_of(child))); } } Index: src/sys/arch/macppc/dev/ki2c.c diff -u src/sys/arch/macppc/dev/ki2c.c:1.31 src/sys/arch/macppc/dev/ki2c.c:1.31.8.1 --- src/sys/arch/macppc/dev/ki2c.c:1.31 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/dev/ki2c.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ki2c.c,v 1.31 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: ki2c.c,v 1.31.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /* Id: ki2c.c,v 1.7 2002/10/05 09:56:05 tsubai Exp */ /*- @@ -205,7 +205,7 @@ ki2c_attach(device_t parent, device_t se memset(&iba, 0, sizeof(iba)); iba.iba_tag = &sc->sc_i2c; - config_found(sc->sc_dev, &iba, iicbus_print, CFARG_EOL); + config_found(sc->sc_dev, &iba, iicbus_print, CFARGS_NONE); } Index: src/sys/arch/macppc/dev/mediabay.c diff -u src/sys/arch/macppc/dev/mediabay.c:1.25 src/sys/arch/macppc/dev/mediabay.c:1.25.8.1 --- src/sys/arch/macppc/dev/mediabay.c:1.25 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/dev/mediabay.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mediabay.c,v 1.25 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: mediabay.c,v 1.25.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /*- * Copyright (C) 1999 Tsubai Masanari. All rights reserved. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mediabay.c,v 1.25 2021/04/24 23:36:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mediabay.c,v 1.25.8.1 2021/08/04 02:39:49 thorpej Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -244,8 +244,7 @@ mediabay_attach_content(struct mediabay_ ca.ca_intr = intr; content = config_found(sc->sc_dev, &ca, mediabay_print, - CFARG_DEVHANDLE, devhandle_from_of(child), - CFARG_EOL); + CFARGS(.devhandle = devhandle_from_of(child))); if (content) { sc->sc_content = content; return; Index: src/sys/arch/macppc/dev/mesh.c diff -u src/sys/arch/macppc/dev/mesh.c:1.41 src/sys/arch/macppc/dev/mesh.c:1.41.8.1 --- src/sys/arch/macppc/dev/mesh.c:1.41 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/dev/mesh.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mesh.c,v 1.41 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: mesh.c,v 1.41.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /*- * Copyright (c) 2000 Tsubai Masanari. @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mesh.c,v 1.41 2021/04/24 23:36:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mesh.c,v 1.41.8.1 2021/08/04 02:39:49 thorpej Exp $"); #include <sys/param.h> #include <sys/buf.h> @@ -259,7 +259,7 @@ mesh_attach(device_t parent, device_t se sc->sc_channel.chan_nluns = 8; sc->sc_channel.chan_id = sc->sc_id; - config_found(self, &sc->sc_channel, scsiprint, CFARG_EOL); + config_found(self, &sc->sc_channel, scsiprint, CFARGS_NONE); intr_establish_xname(sc->sc_irq, IST_EDGE, IPL_BIO, mesh_intr, sc, device_xname(self)); Index: src/sys/arch/macppc/dev/obio.c diff -u src/sys/arch/macppc/dev/obio.c:1.49 src/sys/arch/macppc/dev/obio.c:1.49.8.1 --- src/sys/arch/macppc/dev/obio.c:1.49 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/dev/obio.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: obio.c,v 1.49 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: obio.c,v 1.49.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /*- * Copyright (C) 1998 Internet Research Institute, Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.49 2021/04/24 23:36:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.49.8.1 2021/08/04 02:39:49 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -272,8 +272,7 @@ obio_attach(device_t parent, device_t se ca.ca_intr = intr; config_found(self, &ca, obio_print, - CFARG_DEVHANDLE, devhandle_from_of(child), - CFARG_EOL); + CFARGS(.devhandle = devhandle_from_of(child))); } } Index: src/sys/arch/macppc/dev/ofb.c diff -u src/sys/arch/macppc/dev/ofb.c:1.71 src/sys/arch/macppc/dev/ofb.c:1.71.8.1 --- src/sys/arch/macppc/dev/ofb.c:1.71 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/dev/ofb.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ofb.c,v 1.71 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: ofb.c,v 1.71.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.71 2021/04/24 23:36:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.71.8.1 2021/08/04 02:39:49 thorpej Exp $"); #include <sys/param.h> #include <sys/buf.h> @@ -218,12 +218,10 @@ ofbattach(device_t parent, device_t self a.accesscookie = &sc->vd; config_found(self, &a, wsemuldisplaydevprint, - CFARG_IATTR, "wsemuldisplaydev", - CFARG_EOL); + CFARGS(.iattr = "wsemuldisplaydev")); config_found(self, aux, ofb_drm_print, - CFARG_IATTR, "drm", - CFARG_EOL); + CFARGS(.iattr = "drm")); } static int Index: src/sys/arch/macppc/dev/pbms.c diff -u src/sys/arch/macppc/dev/pbms.c:1.18 src/sys/arch/macppc/dev/pbms.c:1.18.2.1 --- src/sys/arch/macppc/dev/pbms.c:1.18 Sat Jul 24 21:31:33 2021 +++ src/sys/arch/macppc/dev/pbms.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $Id: pbms.c,v 1.18 2021/07/24 21:31:33 andvar Exp $ */ +/* $Id: pbms.c,v 1.18.2.1 2021/08/04 02:39:49 thorpej Exp $ */ /* * Copyright (c) 2005, Johan Wallén @@ -373,7 +373,7 @@ pbms_attach(device_t parent, device_t se a.accessops = &pbms_accessops; a.accesscookie = sc; - sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL); + sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARGS_NONE); return; } Index: src/sys/arch/macppc/dev/platinumfb.c diff -u src/sys/arch/macppc/dev/platinumfb.c:1.5 src/sys/arch/macppc/dev/platinumfb.c:1.5.8.1 --- src/sys/arch/macppc/dev/platinumfb.c:1.5 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/dev/platinumfb.c Wed Aug 4 02:39:49 2021 @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: platinumfb.c,v 1.5 2021/04/24 23:36:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: platinumfb.c,v 1.5.8.1 2021/08/04 02:39:49 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -643,7 +643,7 @@ platinumfb_init(device_t self) aa.accessops = &platinumfb_accessops; aa.accesscookie = &sc->vd; - config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL); + config_found(self, &aa, wsemuldisplaydevprint, CFARGS_NONE); return 0; } Index: src/sys/arch/macppc/dev/pmu.c diff -u src/sys/arch/macppc/dev/pmu.c:1.37 src/sys/arch/macppc/dev/pmu.c:1.37.8.1 --- src/sys/arch/macppc/dev/pmu.c:1.37 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/dev/pmu.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pmu.c,v 1.37 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: pmu.c,v 1.37.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /*- * Copyright (c) 2006 Michael Lorenz @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmu.c,v 1.37 2021/04/24 23:36:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmu.c,v 1.37.8.1 2021/08/04 02:39:49 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -383,8 +383,7 @@ pmu_attach(device_t parent, device_t sel sc->sc_i2c.ic_cookie = sc; sc->sc_i2c.ic_exec = pmu_i2c_exec; config_found(sc->sc_dev, &iba, iicbus_print, - CFARG_IATTR, "i2cbus", - CFARG_EOL); + CFARGS(.iattr = "i2cbus")); goto next; } if (strncmp(name, "adb", 4) == 0) { @@ -396,8 +395,7 @@ pmu_attach(device_t parent, device_t sel sc->sc_adbops.set_handler = pmu_adb_set_handler; #if NNADB > 0 config_found(self, &sc->sc_adbops, nadb_print, - CFARG_IATTR, "adb_bus", - CFARG_EOL); + CFARGS(.iattr = "adb_bus")); #endif goto next; } @@ -1098,8 +1096,7 @@ pmu_attach_legacy_battery(struct pmu_sof baa.baa_type = BATTERY_TYPE_LEGACY; baa.baa_pmu_ops = &sc->sc_pmu_ops; config_found(sc->sc_dev, &baa, pmu_print, - CFARG_IATTR, "pmu_bus", - CFARG_EOL); + CFARGS(.iattr = "pmu_bus")); } static void @@ -1111,6 +1108,5 @@ pmu_attach_smart_battery(struct pmu_soft baa.baa_pmu_ops = &sc->sc_pmu_ops; baa.baa_num = num; config_found(sc->sc_dev, &baa, pmu_print, - CFARG_IATTR, "pmu_bus", - CFARG_EOL); + CFARGS(.iattr = "pmu_bus")); } Index: src/sys/arch/macppc/dev/smu.c diff -u src/sys/arch/macppc/dev/smu.c:1.13 src/sys/arch/macppc/dev/smu.c:1.13.8.1 --- src/sys/arch/macppc/dev/smu.c:1.13 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/dev/smu.c Wed Aug 4 02:39:49 2021 @@ -478,8 +478,7 @@ smu_setup_iicbus(struct smu_softc *sc) ca.ca_node = node; ca.ca_tag = i2c; config_found(sc->sc_dev, &ca, smu_iicbus_print, - CFARG_DEVHANDLE, devhandle_from_of(node), - CFARG_EOL); + CFARGS(.devhandle = devhandle_from_of(node))); sc->sc_num_iicbus++; } Index: src/sys/arch/macppc/dev/smuiic.c diff -u src/sys/arch/macppc/dev/smuiic.c:1.7 src/sys/arch/macppc/dev/smuiic.c:1.7.8.1 --- src/sys/arch/macppc/dev/smuiic.c:1.7 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/dev/smuiic.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: smuiic.c,v 1.7 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: smuiic.c,v 1.7.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /*- * Copyright (c) 2013 Phileas Fogg @@ -131,5 +131,5 @@ smuiic_attach(device_t parent, device_t memset(&iba, 0, sizeof(iba)); iba.iba_tag = sc->sc_i2c; - config_found(sc->sc_dev, &iba, iicbus_print, CFARG_EOL); + config_found(sc->sc_dev, &iba, iicbus_print, CFARGS_NONE); } Index: src/sys/arch/macppc/dev/snapper.c diff -u src/sys/arch/macppc/dev/snapper.c:1.60 src/sys/arch/macppc/dev/snapper.c:1.60.2.1 --- src/sys/arch/macppc/dev/snapper.c:1.60 Fri Jul 2 10:14:07 2021 +++ src/sys/arch/macppc/dev/snapper.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: snapper.c,v 1.60 2021/07/02 10:14:07 jmcneill Exp $ */ +/* $NetBSD: snapper.c,v 1.60.2.1 2021/08/04 02:39:49 thorpej Exp $ */ /* Id: snapper.c,v 1.11 2002/10/31 17:42:13 tsubai Exp */ /* Id: i2s.c,v 1.12 2005/01/15 14:32:35 tsubai Exp */ @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.60 2021/07/02 10:14:07 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.60.2.1 2021/08/04 02:39:49 thorpej Exp $"); #include <sys/param.h> #include <sys/audioio.h> @@ -2306,9 +2306,7 @@ snapper_setup_ow(struct snapper_softc *s memset(&oba, 0, sizeof(oba)); oba.oba_bus = &sc->sc_ow_bus; sc->sc_ow_dev = config_found(sc->sc_dev, &oba, onewirebus_print, - CFARG_IATTR, "onewirebus", - CFARG_EOL); - + CFARGS(.iattr = "onewirebus")); } static int Index: src/sys/arch/macppc/dev/uni-n.c diff -u src/sys/arch/macppc/dev/uni-n.c:1.10 src/sys/arch/macppc/dev/uni-n.c:1.10.8.1 --- src/sys/arch/macppc/dev/uni-n.c:1.10 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/dev/uni-n.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: uni-n.c,v 1.10 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: uni-n.c,v 1.10.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /*- * Copyright (C) 2005 Michael Lorenz. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uni-n.c,v 1.10 2021/04/24 23:36:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uni-n.c,v 1.10.8.1 2021/08/04 02:39:49 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -150,8 +150,7 @@ uni_n_attach(device_t parent, device_t s ca.ca_reg = reg; ca.ca_intr = intr; config_found(self, &ca, uni_n_print, - CFARG_DEVHANDLE, devhandle_from_of(child), - CFARG_EOL); + CFARGS(.devhandle = devhandle_from_of(child))); } } Index: src/sys/arch/macppc/dev/valkyriefb.c diff -u src/sys/arch/macppc/dev/valkyriefb.c:1.6 src/sys/arch/macppc/dev/valkyriefb.c:1.6.8.1 --- src/sys/arch/macppc/dev/valkyriefb.c:1.6 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/dev/valkyriefb.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: valkyriefb.c,v 1.6 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: valkyriefb.c,v 1.6.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /* * Copyright (c) 2012 Michael Lorenz @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: valkyriefb.c,v 1.6 2021/04/24 23:36:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: valkyriefb.c,v 1.6.8.1 2021/08/04 02:39:49 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -262,7 +262,7 @@ valkyriefb_init(device_t self) aa.accessops = &valkyriefb_accessops; aa.accesscookie = &sc->vd; - config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL); + config_found(self, &aa, wsemuldisplaydevprint, CFARGS_NONE); return 0; } Index: src/sys/arch/macppc/dev/zs.c diff -u src/sys/arch/macppc/dev/zs.c:1.52 src/sys/arch/macppc/dev/zs.c:1.52.8.1 --- src/sys/arch/macppc/dev/zs.c:1.52 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/dev/zs.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.52 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: zs.c,v 1.52.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /* * Copyright (c) 1996, 1998 Bill Studenmund @@ -49,7 +49,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.52 2021/04/24 23:36:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.52.8.1 2021/08/04 02:39:49 thorpej Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -368,7 +368,7 @@ zsc_attach(device_t parent, device_t sel * The child attach will setup the hardware. */ if (!config_found(self, (void *)&zsc_args, zsc_print, - CFARG_EOL)) { + CFARGS_NONE)) { /* No sub-driver. Just reset it. */ uint8_t reset = (channel == 0) ? ZSWR9_A_RESET : ZSWR9_B_RESET; Index: src/sys/arch/macppc/macppc/mainbus.c diff -u src/sys/arch/macppc/macppc/mainbus.c:1.23 src/sys/arch/macppc/macppc/mainbus.c:1.23.8.1 --- src/sys/arch/macppc/macppc/mainbus.c:1.23 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/macppc/mainbus.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.23 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: mainbus.c,v 1.23.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.23 2021/04/24 23:36:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.23.8.1 2021/08/04 02:39:49 thorpej Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -81,8 +81,7 @@ mainbus_attach(device_t parent, device_t ca.ca_reg = reg; ca.ca_nreg = OF_getprop(node, "reg", reg, sizeof(reg)); config_found(self, &ca, NULL, - CFARG_DEVHANDLE, devhandle_from_of(node), - CFARG_EOL); + CFARGS(.devhandle = devhandle_from_of(node))); node = OF_peer(node); } } else { @@ -90,7 +89,7 @@ mainbus_attach(device_t parent, device_t ca.ca_name = "cpu"; ca.ca_reg = reg; reg[0] = i; - config_found(self, &ca, NULL, CFARG_EOL); + config_found(self, &ca, NULL, CFARGS_NONE); } } @@ -101,8 +100,7 @@ mainbus_attach(device_t parent, device_t oba.oba_busname = "ofw"; oba.oba_phandle = node; config_found(self, &oba, NULL, - CFARG_DEVHANDLE, devhandle_from_of(node), - CFARG_EOL); + CFARGS(.devhandle = devhandle_from_of(node))); } for (node = OF_child(OF_finddevice("/")); node; node = OF_peer(node)) { @@ -115,13 +113,12 @@ mainbus_attach(device_t parent, device_t ca.ca_nreg = OF_getprop(node, "reg", reg, sizeof(reg)); ca.ca_reg = reg; config_found(self, &ca, NULL, - CFARG_DEVHANDLE, devhandle_from_of(node), - CFARG_EOL); + CFARGS(.devhandle = devhandle_from_of(node))); } #ifdef MAMBO ca.ca_name="com"; - config_found(self, &ca, NULL, CFARG_EOL); + config_found(self, &ca, NULL, CFARGS_NONE); #endif } Index: src/sys/arch/macppc/macppc/memory.c diff -u src/sys/arch/macppc/macppc/memory.c:1.8 src/sys/arch/macppc/macppc/memory.c:1.8.8.1 --- src/sys/arch/macppc/macppc/memory.c:1.8 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/macppc/memory.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: memory.c,v 1.8 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: memory.c,v 1.8.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /* $OpenBSD: mem.c,v 1.15 2007/10/14 17:29:04 kettenis Exp $ */ /*- @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: memory.c,v 1.8 2021/04/24 23:36:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: memory.c,v 1.8.8.1 2021/08/04 02:39:49 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -124,7 +124,7 @@ memory_attach(device_t parent, device_t /* Skip entries that have not been filled in. */ if (sc->sc_buf[addr * SPD_SIZE] != 0) { ia.ia_addr = 0x50 + addr; - config_found(self, &ia, NULL, CFARG_EOL); + config_found(self, &ia, NULL, CFARGS_NONE); } addr++; } Index: src/sys/arch/macppc/pci/bandit.c diff -u src/sys/arch/macppc/pci/bandit.c:1.33 src/sys/arch/macppc/pci/bandit.c:1.33.8.1 --- src/sys/arch/macppc/pci/bandit.c:1.33 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/pci/bandit.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: bandit.c,v 1.33 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: bandit.c,v 1.33.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /*- * Copyright (c) 2000 Tsubai Masanari. All rights reserved. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bandit.c,v 1.33 2021/04/24 23:36:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bandit.c,v 1.33.8.1 2021/08/04 02:39:49 thorpej Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -153,8 +153,7 @@ bandit_attach(device_t parent, device_t pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY; config_found(self, &pba, pcibusprint, - CFARG_DEVHANDLE, devhandle_from_of(node), - CFARG_EOL); + CFARGS(.devhandle = devhandle_from_of(node))); } static pcireg_t Index: src/sys/arch/macppc/pci/grackle.c diff -u src/sys/arch/macppc/pci/grackle.c:1.17 src/sys/arch/macppc/pci/grackle.c:1.17.8.1 --- src/sys/arch/macppc/pci/grackle.c:1.17 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/pci/grackle.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: grackle.c,v 1.17 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: grackle.c,v 1.17.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /*- * Copyright (c) 2000 Tsubai Masanari. All rights reserved. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: grackle.c,v 1.17 2021/04/24 23:36:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: grackle.c,v 1.17.8.1 2021/08/04 02:39:49 thorpej Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -146,8 +146,7 @@ grackle_attach(device_t parent, device_t pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY; config_found(self, &pba, pcibusprint, - CFARG_DEVHANDLE, devhandle_from_of(node), - CFARG_EOL); + CFARGS(.devhandle = devhandle_from_of(node))); } static pcireg_t Index: src/sys/arch/macppc/pci/u3.c diff -u src/sys/arch/macppc/pci/u3.c:1.10 src/sys/arch/macppc/pci/u3.c:1.10.8.1 --- src/sys/arch/macppc/pci/u3.c:1.10 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/pci/u3.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: u3.c,v 1.10 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: u3.c,v 1.10.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /* * Copyright 2006 Kyma Systems LLC. @@ -166,8 +166,7 @@ ibmcpc_attach(device_t parent, device_t pba.pba_flags = PCI_FLAGS_MEM_OKAY | PCI_FLAGS_IO_OKAY; config_found(self, &pba, pcibusprint, - CFARG_DEVHANDLE, devhandle_from_of(child), - CFARG_EOL); + CFARGS(.devhandle = devhandle_from_of(child))); pc++; } Index: src/sys/arch/macppc/pci/uninorth.c diff -u src/sys/arch/macppc/pci/uninorth.c:1.21 src/sys/arch/macppc/pci/uninorth.c:1.21.8.1 --- src/sys/arch/macppc/pci/uninorth.c:1.21 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/pci/uninorth.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: uninorth.c,v 1.21 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: uninorth.c,v 1.21.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /*- * Copyright (c) 2000 Tsubai Masanari. All rights reserved. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uninorth.c,v 1.21 2021/04/24 23:36:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uninorth.c,v 1.21.8.1 2021/08/04 02:39:49 thorpej Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -184,8 +184,7 @@ uninorth_attach(device_t parent, device_ pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY; config_found(self, &pba, pcibusprint, - CFARG_DEVHANDLE, devhandle_from_of(node), - CFARG_EOL); + CFARGS(.devhandle = devhandle_from_of(node))); } static pcireg_t