Module Name: src Committed By: thorpej Date: Wed Aug 4 20:27:36 UTC 2021
Modified Files: src/sys/dev/isa [thorpej-cfargs2]: addcom_isa.c ast.c boca.c cec.c ega.c ess.c fd.c if_le_isa.c ioat66.c isa.c moxa_isa.c nct.c nsclpcsio_isa.c pcdisplay.c pcppi.c ptcd.c rtfps.c sb.c seagate.c soekrisgpio.c tcom.c tsdio.c wbsio.c wds.c wss.c ym.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/dev/isa/addcom_isa.c \ src/sys/dev/isa/moxa_isa.c cvs rdiff -u -r1.67 -r1.67.8.1 src/sys/dev/isa/ast.c cvs rdiff -u -r1.56 -r1.56.8.1 src/sys/dev/isa/boca.c cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/dev/isa/cec.c cvs rdiff -u -r1.31 -r1.31.8.1 src/sys/dev/isa/ega.c cvs rdiff -u -r1.88 -r1.88.6.1 src/sys/dev/isa/ess.c cvs rdiff -u -r1.115 -r1.115.8.1 src/sys/dev/isa/fd.c cvs rdiff -u -r1.50 -r1.50.8.1 src/sys/dev/isa/if_le_isa.c cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/dev/isa/ioat66.c cvs rdiff -u -r1.139 -r1.139.8.1 src/sys/dev/isa/isa.c cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/dev/isa/nct.c src/sys/dev/isa/ptcd.c \ src/sys/dev/isa/soekrisgpio.c cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/dev/isa/nsclpcsio_isa.c cvs rdiff -u -r1.46 -r1.46.8.1 src/sys/dev/isa/pcdisplay.c \ src/sys/dev/isa/pcppi.c cvs rdiff -u -r1.61 -r1.61.8.1 src/sys/dev/isa/rtfps.c cvs rdiff -u -r1.92 -r1.92.8.1 src/sys/dev/isa/sb.c cvs rdiff -u -r1.75 -r1.75.8.1 src/sys/dev/isa/seagate.c cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/dev/isa/tcom.c cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/dev/isa/tsdio.c cvs rdiff -u -r1.26 -r1.26.8.1 src/sys/dev/isa/wbsio.c cvs rdiff -u -r1.78 -r1.78.8.1 src/sys/dev/isa/wds.c cvs rdiff -u -r1.76 -r1.76.6.1 src/sys/dev/isa/wss.c cvs rdiff -u -r1.49 -r1.49.6.1 src/sys/dev/isa/ym.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/isa/addcom_isa.c diff -u src/sys/dev/isa/addcom_isa.c:1.22 src/sys/dev/isa/addcom_isa.c:1.22.8.1 --- src/sys/dev/isa/addcom_isa.c:1.22 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/addcom_isa.c Wed Aug 4 20:27:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: addcom_isa.c,v 1.22 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: addcom_isa.c,v 1.22.8.1 2021/08/04 20:27:35 thorpej Exp $ */ /* * Copyright (c) 2000 Michael Graff. All rights reserved. @@ -55,7 +55,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: addcom_isa.c,v 1.22 2021/04/24 23:36:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: addcom_isa.c,v 1.22.8.1 2021/08/04 20:27:35 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -225,7 +225,7 @@ addcomattach(device_t parent, device_t s ca.ca_noien = 0; sc->sc_slaves[i] = config_found(self, &ca, commultiprint, - CFARG_EOL); + CFARGS_NONE); if (sc->sc_slaves[i] != NULL) sc->sc_alive |= 1 << i; } Index: src/sys/dev/isa/moxa_isa.c diff -u src/sys/dev/isa/moxa_isa.c:1.22 src/sys/dev/isa/moxa_isa.c:1.22.8.1 --- src/sys/dev/isa/moxa_isa.c:1.22 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/moxa_isa.c Wed Aug 4 20:27:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: moxa_isa.c,v 1.22 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: moxa_isa.c,v 1.22.8.1 2021/08/04 20:27:35 thorpej Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: moxa_isa.c,v 1.22 2021/04/24 23:36:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: moxa_isa.c,v 1.22.8.1 2021/08/04 20:27:35 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -172,7 +172,7 @@ moxa_isaattach(device_t parent, device_t ca.ca_noien = 1; sc->sc_slaves[i] = config_found(self, &ca, commultiprint, - CFARG_EOL); + CFARGS_NONE); if (sc->sc_slaves[i] != NULL) sc->sc_alive |= 1 << i; } Index: src/sys/dev/isa/ast.c diff -u src/sys/dev/isa/ast.c:1.67 src/sys/dev/isa/ast.c:1.67.8.1 --- src/sys/dev/isa/ast.c:1.67 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/ast.c Wed Aug 4 20:27:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ast.c,v 1.67 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: ast.c,v 1.67.8.1 2021/08/04 20:27:35 thorpej Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.67 2021/04/24 23:36:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.67.8.1 2021/08/04 20:27:35 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -178,7 +178,7 @@ astattach(device_t parent, device_t self ca.ca_iobase = sc->sc_iobase + i * COM_NPORTS; ca.ca_noien = 1; - slave = config_found(self, &ca, commultiprint, CFARG_EOL); + slave = config_found(self, &ca, commultiprint, CFARGS_NONE); if (slave != NULL) { sc->sc_alive |= 1 << i; sc->sc_slaves[i] = device_private(slave); Index: src/sys/dev/isa/boca.c diff -u src/sys/dev/isa/boca.c:1.56 src/sys/dev/isa/boca.c:1.56.8.1 --- src/sys/dev/isa/boca.c:1.56 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/boca.c Wed Aug 4 20:27:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: boca.c,v 1.56 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: boca.c,v 1.56.8.1 2021/08/04 20:27:35 thorpej Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: boca.c,v 1.56 2021/04/24 23:36:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: boca.c,v 1.56.8.1 2021/08/04 20:27:35 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -181,7 +181,7 @@ bocaattach(device_t parent, device_t sel ca.ca_noien = 0; sc->sc_slaves[i] = config_found(self, &ca, commultiprint, - CFARG_EOL); + CFARGS_NONE); if (sc->sc_slaves[i] != NULL) sc->sc_alive |= 1 << i; } Index: src/sys/dev/isa/cec.c diff -u src/sys/dev/isa/cec.c:1.15 src/sys/dev/isa/cec.c:1.15.8.1 --- src/sys/dev/isa/cec.c:1.15 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/cec.c Wed Aug 4 20:27:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: cec.c,v 1.15 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: cec.c,v 1.15.8.1 2021/08/04 20:27:35 thorpej Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cec.c,v 1.15 2021/04/24 23:36:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cec.c,v 1.15.8.1 2021/08/04 20:27:35 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -233,7 +233,7 @@ cecattach(device_t parent, device_t self ga.ga_address = sc->sc_myaddr; sc->sc_gpib = (struct gpib_softc *)config_found(self, &ga, gpibdevprint, - CFARG_EOL); + CFARGS_NONE); } int Index: src/sys/dev/isa/ega.c diff -u src/sys/dev/isa/ega.c:1.31 src/sys/dev/isa/ega.c:1.31.8.1 --- src/sys/dev/isa/ega.c:1.31 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/ega.c Wed Aug 4 20:27:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ega.c,v 1.31 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: ega.c,v 1.31.8.1 2021/08/04 20:27:35 thorpej Exp $ */ /* * Copyright (c) 1999 @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ega.c,v 1.31 2021/04/24 23:36:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ega.c,v 1.31.8.1 2021/08/04 20:27:35 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -520,7 +520,7 @@ ega_attach(device_t parent, device_t sel aa.accessops = &ega_accessops; aa.accesscookie = dc; - config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL); + config_found(self, &aa, wsemuldisplaydevprint, CFARGS_NONE); } Index: src/sys/dev/isa/ess.c diff -u src/sys/dev/isa/ess.c:1.88 src/sys/dev/isa/ess.c:1.88.6.1 --- src/sys/dev/isa/ess.c:1.88 Mon Apr 26 19:10:38 2021 +++ src/sys/dev/isa/ess.c Wed Aug 4 20:27:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ess.c,v 1.88 2021/04/26 19:10:38 thorpej Exp $ */ +/* $NetBSD: ess.c,v 1.88.6.1 2021/08/04 20:27:35 thorpej Exp $ */ /* * Copyright 1997 @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.88 2021/04/26 19:10:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.88.6.1 2021/08/04 20:27:35 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1046,8 +1046,7 @@ skip: arg.hwif = 0; arg.hdl = 0; (void)config_found(sc->sc_dev, &arg, audioprint, - CFARG_IATTR, "ess", - CFARG_EOL); + CFARGS(.iattr = "ess")); #if NJOY_ESS > 0 if (sc->sc_model == ESS_1888 && enablejoy) { @@ -1059,8 +1058,7 @@ skip: arg.type = AUDIODEV_TYPE_AUX; (void)config_found(sc->sc_dev, &arg, audioprint, - CFARG_IATTR, "ess", - CFARG_EOL); + CFARGS(.iattr = "ess")); } #endif Index: src/sys/dev/isa/fd.c diff -u src/sys/dev/isa/fd.c:1.115 src/sys/dev/isa/fd.c:1.115.8.1 --- src/sys/dev/isa/fd.c:1.115 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/fd.c Wed Aug 4 20:27:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.115 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: fd.c,v 1.115.8.1 2021/08/04 20:27:35 thorpej Exp $ */ /*- * Copyright (c) 1998, 2003, 2008 The NetBSD Foundation, Inc. @@ -81,7 +81,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.115 2021/04/24 23:36:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.115.8.1 2021/08/04 20:27:35 thorpej Exp $"); #include "opt_ddb.h" @@ -452,7 +452,7 @@ fdcfinishattach(device_t self) if (fdc->sc_present & (1 << fa.fa_drive)) { fa.fa_deftype = fdc->sc_knownfds[fa.fa_drive]; config_found(fdc->sc_dev, (void *)&fa, - fdprint, CFARG_EOL); + fdprint, CFARGS_NONE); } } else { #if defined(atari) @@ -462,8 +462,7 @@ fdcfinishattach(device_t self) fa.fa_deftype = &fd_types[2]; /* Atari also configures ISA fdc(4) as "fdcisa" */ config_found(fdc->sc_dev, &fa, fdprint, - CFARG_IATTR, "fdcisa", - CFARG_EOL); + CFARGS(.iattr = "fdcisa")); #else /* * Default to 1.44MB on Alpha and BeBox. How do we tell @@ -471,8 +470,7 @@ fdcfinishattach(device_t self) */ fa.fa_deftype = &fd_types[0]; config_found(fdc->sc_dev, &fa, fdprint, - CFARG_IATTR, "fdc", - CFARG_EOL); + CFARGS(.iattr = "fdc")); #endif } } Index: src/sys/dev/isa/if_le_isa.c diff -u src/sys/dev/isa/if_le_isa.c:1.50 src/sys/dev/isa/if_le_isa.c:1.50.8.1 --- src/sys/dev/isa/if_le_isa.c:1.50 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/if_le_isa.c Wed Aug 4 20:27:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_isa.c,v 1.50 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: if_le_isa.c,v 1.50.8.1 2021/08/04 20:27:35 thorpej Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le_isa.c,v 1.50 2021/04/24 23:36:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_isa.c,v 1.50.8.1 2021/08/04 20:27:35 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -262,7 +262,7 @@ le_dummyattach(device_t parent, device_t aprint_normal("\n"); - config_found(self, aux, 0, CFARG_EOL); + config_found(self, aux, 0, CFARGS_NONE); } int Index: src/sys/dev/isa/ioat66.c diff -u src/sys/dev/isa/ioat66.c:1.23 src/sys/dev/isa/ioat66.c:1.23.8.1 --- src/sys/dev/isa/ioat66.c:1.23 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/ioat66.c Wed Aug 4 20:27:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ioat66.c,v 1.23 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: ioat66.c,v 1.23.8.1 2021/08/04 20:27:35 thorpej Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ioat66.c,v 1.23 2021/04/24 23:36:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ioat66.c,v 1.23.8.1 2021/08/04 20:27:35 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -180,7 +180,7 @@ ioat66attach(device_t parent, device_t s ca.ca_noien = 0; sc->sc_slaves[i] = config_found(self, &ca, commultiprint, - CFARG_EOL); + CFARGS_NONE); if (sc->sc_slaves[i] != NULL) sc->sc_alive |= 1 << i; } Index: src/sys/dev/isa/isa.c diff -u src/sys/dev/isa/isa.c:1.139 src/sys/dev/isa/isa.c:1.139.8.1 --- src/sys/dev/isa/isa.c:1.139 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/isa.c Wed Aug 4 20:27:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: isa.c,v 1.139 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: isa.c,v 1.139.8.1 2021/08/04 20:27:35 thorpej Exp $ */ /*- * Copyright (c) 1998, 2001, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isa.c,v 1.139 2021/04/24 23:36:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isa.c,v 1.139.8.1 2021/08/04 20:27:35 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -191,9 +191,8 @@ isarescan(device_t self, const char *ifa locs[ISACF_IOSIZ] = ISACF_IOSIZ_DEFAULT; config_search(self, NULL, - CFARG_SEARCH, isasearch, - CFARG_LOCATORS, locs, - CFARG_EOL); + CFARGS(.search = isasearch, + .locators = locs)); return (0); } @@ -247,8 +246,7 @@ isa_attach_knowndevs(struct isa_softc *s /* XXX should setup locator array */ ik->ik_claimed = config_found(sc->sc_dev, &ia, isaprint, - CFARG_SUBMATCH, isasubmatch, - CFARG_EOL); + CFARGS(.submatch = isasubmatch)); } } @@ -485,8 +483,7 @@ isasearch(device_t parent, cfdata_t cf, flocs[ISACF_DRQ] = ia.ia_drq[0].ir_drq; flocs[ISACF_DRQ2] = ia.ia_drq[1].ir_drq; config_attach(parent, cf, &ia, isaprint, - CFARG_LOCATORS, flocs, - CFARG_EOL); + CFARGS(.locators = flocs)); tryagain = (cf->cf_fstate == FSTATE_STAR); } } while (tryagain); Index: src/sys/dev/isa/nct.c diff -u src/sys/dev/isa/nct.c:1.4 src/sys/dev/isa/nct.c:1.4.8.1 --- src/sys/dev/isa/nct.c:1.4 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/nct.c Wed Aug 4 20:27:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: nct.c,v 1.4 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: nct.c,v 1.4.8.1 2021/08/04 20:27:36 thorpej Exp $ */ /*- * Copyright (c) 2019, 2020 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nct.c,v 1.4 2021/04/24 23:36:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nct.c,v 1.4.8.1 2021/08/04 20:27:36 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -441,7 +441,7 @@ nct_attach(device_t parent, device_t sel gba.gba_pins = sc->sc_pins; gba.gba_npins = NCT_NUM_PINS; - (void)config_found(sc->sc_dev, &gba, gpiobus_print, CFARG_EOL); + (void)config_found(sc->sc_dev, &gba, gpiobus_print, CFARGS_NONE); } /* Index: src/sys/dev/isa/ptcd.c diff -u src/sys/dev/isa/ptcd.c:1.4 src/sys/dev/isa/ptcd.c:1.4.8.1 --- src/sys/dev/isa/ptcd.c:1.4 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/ptcd.c Wed Aug 4 20:27:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ptcd.c,v 1.4 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: ptcd.c,v 1.4.8.1 2021/08/04 20:27:36 thorpej Exp $ */ /* * Copyright (c) 2012 Marc Balmer <m...@msys.ch> @@ -143,7 +143,7 @@ ptcd_attach(device_t parent, device_t se gba.gba_npins = PTCD_NPINS; /* Attach GPIO framework */ - config_found(self, &gba, gpiobus_print, CFARG_EOL); + config_found(self, &gba, gpiobus_print, CFARGS_NONE); } int Index: src/sys/dev/isa/soekrisgpio.c diff -u src/sys/dev/isa/soekrisgpio.c:1.4 src/sys/dev/isa/soekrisgpio.c:1.4.8.1 --- src/sys/dev/isa/soekrisgpio.c:1.4 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/soekrisgpio.c Wed Aug 4 20:27:36 2021 @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: soekrisgpio.c,v 1.4 2021/04/24 23:36:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: soekrisgpio.c,v 1.4.8.1 2021/08/04 20:27:36 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -176,8 +176,8 @@ soekris_attach(device_t parent, device_t gba2.gba_npins = SOEKRIS_NLEDS; #if NGPIO > 0 - (void)config_found(sc->sc_dev, &gba1, gpiobus_print, CFARG_EOL); - (void)config_found(sc->sc_dev, &gba2, gpiobus_print, CFARG_EOL); + (void)config_found(sc->sc_dev, &gba1, gpiobus_print, CFARGS_NONE); + (void)config_found(sc->sc_dev, &gba2, gpiobus_print, CFARGS_NONE); #endif } Index: src/sys/dev/isa/nsclpcsio_isa.c diff -u src/sys/dev/isa/nsclpcsio_isa.c:1.33 src/sys/dev/isa/nsclpcsio_isa.c:1.33.8.1 --- src/sys/dev/isa/nsclpcsio_isa.c:1.33 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/nsclpcsio_isa.c Wed Aug 4 20:27:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: nsclpcsio_isa.c,v 1.33 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: nsclpcsio_isa.c,v 1.33.8.1 2021/08/04 20:27:36 thorpej Exp $ */ /* * Copyright (c) 2002 @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nsclpcsio_isa.c,v 1.33 2021/04/24 23:36:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nsclpcsio_isa.c,v 1.33.8.1 2021/08/04 20:27:36 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -401,7 +401,7 @@ nsclpcsio_isa_attach(device_t parent, de gba.gba_gc = &sc->sc_gpio_gc; gba.gba_pins = sc->sc_gpio_pins; gba.gba_npins = SIO_GPIO_NPINS; - config_found(self, &gba, NULL, CFARG_EOL); + config_found(self, &gba, NULL, CFARGS_NONE); } #endif } Index: src/sys/dev/isa/pcdisplay.c diff -u src/sys/dev/isa/pcdisplay.c:1.46 src/sys/dev/isa/pcdisplay.c:1.46.8.1 --- src/sys/dev/isa/pcdisplay.c:1.46 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/pcdisplay.c Wed Aug 4 20:27:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pcdisplay.c,v 1.46 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: pcdisplay.c,v 1.46.8.1 2021/08/04 20:27:36 thorpej Exp $ */ /* * Copyright (c) 1998 @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.46 2021/04/24 23:36:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.46.8.1 2021/08/04 20:27:36 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -329,7 +329,7 @@ pcdisplay_attach(device_t parent, device aa.accessops = &pcdisplay_accessops; aa.accesscookie = sc; - config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL); + config_found(self, &aa, wsemuldisplaydevprint, CFARGS_NONE); } Index: src/sys/dev/isa/pcppi.c diff -u src/sys/dev/isa/pcppi.c:1.46 src/sys/dev/isa/pcppi.c:1.46.8.1 --- src/sys/dev/isa/pcppi.c:1.46 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/pcppi.c Wed Aug 4 20:27:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pcppi.c,v 1.46 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: pcppi.c,v 1.46.8.1 2021/08/04 20:27:36 thorpej Exp $ */ /* * Copyright (c) 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.46 2021/04/24 23:36:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.46.8.1 2021/08/04 20:27:36 thorpej Exp $"); #include "attimer.h" @@ -246,8 +246,7 @@ pcppi_rescan(device_t self, const char * pa.pa_bell_func = pcppi_bell; config_search(sc->sc_dv, &pa, - CFARG_SEARCH, pcppisearch, - CFARG_EOL); + CFARGS(.search = pcppisearch)); return 0; } @@ -258,8 +257,7 @@ pcppisearch(device_t parent, cfdata_t cf if (config_probe(parent, cf, aux)) config_attach(parent, cf, aux, NULL, - CFARG_LOCATORS, locs, - CFARG_EOL); + CFARGS(.locators = locs)); return 0; } Index: src/sys/dev/isa/rtfps.c diff -u src/sys/dev/isa/rtfps.c:1.61 src/sys/dev/isa/rtfps.c:1.61.8.1 --- src/sys/dev/isa/rtfps.c:1.61 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/rtfps.c Wed Aug 4 20:27:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: rtfps.c,v 1.61 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: rtfps.c,v 1.61.8.1 2021/08/04 20:27:36 thorpej Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rtfps.c,v 1.61 2021/04/24 23:36:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtfps.c,v 1.61.8.1 2021/08/04 20:27:36 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -190,7 +190,7 @@ rtfpsattach(device_t parent, device_t se ca.ca_noien = 0; sc->sc_slaves[i] = config_found(self, &ca, commultiprint, - CFARG_EOL); + CFARGS_NONE); if (sc->sc_slaves[i] != NULL) sc->sc_alive |= 1 << i; } Index: src/sys/dev/isa/sb.c diff -u src/sys/dev/isa/sb.c:1.92 src/sys/dev/isa/sb.c:1.92.8.1 --- src/sys/dev/isa/sb.c:1.92 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/sb.c Wed Aug 4 20:27:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: sb.c,v 1.92 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: sb.c,v 1.92.8.1 2021/08/04 20:27:36 thorpej Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sb.c,v 1.92 2021/04/24 23:36:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sb.c,v 1.92.8.1 2021/08/04 20:27:36 thorpej Exp $"); #include "midi.h" @@ -264,8 +264,7 @@ sbattach(struct sbdsp_softc *sc) arg.hwif = 0; arg.hdl = 0; sc->sc_mpudev = config_found(sc->sc_dev, &arg, audioprint, - CFARG_IATTR, "sbdsp", - CFARG_EOL); + CFARGS(.iattr = "sbdsp")); break; } #endif @@ -274,8 +273,7 @@ sbattach(struct sbdsp_softc *sc) arg.hwif = 0; arg.hdl = 0; config_found(sc->sc_dev, &arg, audioprint, - CFARG_IATTR, "sbdsp", - CFARG_EOL); + CFARGS(.iattr = "sbdsp")); } } Index: src/sys/dev/isa/seagate.c diff -u src/sys/dev/isa/seagate.c:1.75 src/sys/dev/isa/seagate.c:1.75.8.1 --- src/sys/dev/isa/seagate.c:1.75 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/seagate.c Wed Aug 4 20:27:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: seagate.c,v 1.75 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: seagate.c,v 1.75.8.1 2021/08/04 20:27:36 thorpej Exp $ */ /* * ST01/02, Future Domain TMC-885, TMC-950 SCSI driver @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: seagate.c,v 1.75 2021/04/24 23:36:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: seagate.c,v 1.75.8.1 2021/08/04 20:27:36 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -471,7 +471,7 @@ seaattach(device_t parent, device_t self /* * ask the adapter what subunits are present */ - config_found(self, &sea->sc_channel, scsiprint, CFARG_EOL); + config_found(self, &sea->sc_channel, scsiprint, CFARGS_NONE); } /* Index: src/sys/dev/isa/tcom.c diff -u src/sys/dev/isa/tcom.c:1.21 src/sys/dev/isa/tcom.c:1.21.8.1 --- src/sys/dev/isa/tcom.c:1.21 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/tcom.c Wed Aug 4 20:27:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: tcom.c,v 1.21 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: tcom.c,v 1.21.8.1 2021/08/04 20:27:36 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -70,7 +70,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tcom.c,v 1.21 2021/04/24 23:36:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcom.c,v 1.21.8.1 2021/08/04 20:27:36 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -219,7 +219,7 @@ tcomattach(device_t parent, device_t sel ca.ca_iobase = sc->sc_iobase + i * COM_NPORTS; ca.ca_noien = 0; - slave = config_found(self, &ca, commultiprint, CFARG_EOL); + slave = config_found(self, &ca, commultiprint, CFARGS_NONE); if (slave != NULL) { sc->sc_alive |= 1 << i; sc->sc_slaves[i] = device_private(slave); Index: src/sys/dev/isa/tsdio.c diff -u src/sys/dev/isa/tsdio.c:1.12 src/sys/dev/isa/tsdio.c:1.12.8.1 --- src/sys/dev/isa/tsdio.c:1.12 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/tsdio.c Wed Aug 4 20:27:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: tsdio.c,v 1.12 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: tsdio.c,v 1.12.8.1 2021/08/04 20:27:36 thorpej Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tsdio.c,v 1.12 2021/04/24 23:36:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tsdio.c,v 1.12.8.1 2021/08/04 20:27:36 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -123,8 +123,7 @@ tsdio_attach(device_t parent, device_t s * Attach sub-devices */ config_search(self, NULL, - CFARG_SEARCH, tsdio_search, - CFARG_EOL); + CFARGS(.search = tsdio_search)); } int @@ -137,7 +136,7 @@ tsdio_search(device_t parent, cfdata_t c sa.ta_ioh = sc->sc_ioh; if (config_probe(parent, cf, &sa)) - config_attach(parent, cf, &sa, tsdio_print, CFARG_EOL); + config_attach(parent, cf, &sa, tsdio_print, CFARGS_NONE); return (0); } Index: src/sys/dev/isa/wbsio.c diff -u src/sys/dev/isa/wbsio.c:1.26 src/sys/dev/isa/wbsio.c:1.26.8.1 --- src/sys/dev/isa/wbsio.c:1.26 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/wbsio.c Wed Aug 4 20:27:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: wbsio.c,v 1.26 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: wbsio.c,v 1.26.8.1 2021/08/04 20:27:36 thorpej Exp $ */ /* $OpenBSD: wbsio.c,v 1.10 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2008 Mark Kettenis <kette...@openbsd.org> @@ -333,18 +333,16 @@ wbsio_rescan(device_t self, const char * #if NGPIO > 0 if (ifattr_match(ifattr, "gpiobus")) { config_search(self, NULL, - CFARG_SEARCH, wbsio_gpio_search, - CFARG_IATTR, ifattr, - CFARG_LOCATORS, locators, - CFARG_EOL); + CFARGS(.search = wbsio_gpio_search, + .iattr = ifattr, + .locators = locators)); return 0; } #endif config_search(self, NULL, - CFARG_SEARCH, wbsio_search, - CFARG_IATTR, ifattr, - CFARG_LOCATORS, locators, - CFARG_EOL); + CFARGS(.search = wbsio_search, + .iattr = ifattr, + .locators = locators)); wbsio_wdog_attach(self); @@ -416,7 +414,7 @@ wbsio_search(device_t parent, cfdata_t c /* Store device-id to ia_aux */ sc->sc_ia.ia_aux = (void *)(uintptr_t)devid; sc->sc_lm_dev = config_attach(parent, cf, &sc->sc_ia, wbsio_print, - CFARG_EOL); + CFARGS_NONE); return 0; } @@ -525,7 +523,7 @@ wbsio_gpio_search(device_t parent, cfdat gba.gba_npins = WBSIO_GPIO_NPINS; sc->sc_gpio_dev = config_attach(parent, cf, &gba, gpiobus_print, - CFARG_EOL); + CFARGS_NONE); return 0; } Index: src/sys/dev/isa/wds.c diff -u src/sys/dev/isa/wds.c:1.78 src/sys/dev/isa/wds.c:1.78.8.1 --- src/sys/dev/isa/wds.c:1.78 Sat Apr 24 23:36:55 2021 +++ src/sys/dev/isa/wds.c Wed Aug 4 20:27:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: wds.c,v 1.78 2021/04/24 23:36:55 thorpej Exp $ */ +/* $NetBSD: wds.c,v 1.78.8.1 2021/08/04 20:27:36 thorpej Exp $ */ /* * XXX @@ -79,7 +79,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wds.c,v 1.78 2021/04/24 23:36:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wds.c,v 1.78.8.1 2021/08/04 20:27:36 thorpej Exp $"); #include "opt_ddb.h" @@ -403,7 +403,7 @@ wds_attach(struct wds_softc *sc, struct /* * ask the adapter what subunits are present */ - config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARG_EOL); + config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARGS_NONE); } integrate void Index: src/sys/dev/isa/wss.c diff -u src/sys/dev/isa/wss.c:1.76 src/sys/dev/isa/wss.c:1.76.6.1 --- src/sys/dev/isa/wss.c:1.76 Mon Apr 26 19:21:55 2021 +++ src/sys/dev/isa/wss.c Wed Aug 4 20:27:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: wss.c,v 1.76 2021/04/26 19:21:55 thorpej Exp $ */ +/* $NetBSD: wss.c,v 1.76.6.1 2021/08/04 20:27:36 thorpej Exp $ */ /* * Copyright (c) 1994 John Brezak @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wss.c,v 1.76 2021/04/26 19:21:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wss.c,v 1.76.6.1 2021/08/04 20:27:36 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -162,8 +162,7 @@ wssattach(struct wss_softc *sc) arg.hwif = 0; arg.hdl = 0; (void)config_found(ac->sc_dev, &arg, audioprint, - CFARG_IATTR, "wss", - CFARG_EOL); + CFARGS(.iattr = "wss")); } } Index: src/sys/dev/isa/ym.c diff -u src/sys/dev/isa/ym.c:1.49 src/sys/dev/isa/ym.c:1.49.6.1 --- src/sys/dev/isa/ym.c:1.49 Mon Apr 26 19:22:14 2021 +++ src/sys/dev/isa/ym.c Wed Aug 4 20:27:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ym.c,v 1.49 2021/04/26 19:22:14 thorpej Exp $ */ +/* $NetBSD: ym.c,v 1.49.6.1 2021/08/04 20:27:36 thorpej Exp $ */ /*- * Copyright (c) 1999-2002, 2008 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.49 2021/04/26 19:22:14 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.49.6.1 2021/08/04 20:27:36 thorpej Exp $"); #include "mpu_ym.h" #include "opt_ym.h" @@ -259,8 +259,7 @@ ym_attach(struct ym_softc *sc) arg.hwif = 0; arg.hdl = 0; (void)config_found(ac->sc_dev, &arg, audioprint, - CFARG_IATTR, "ym", - CFARG_EOL); + CFARGS(.iattr = "ym")); } #if NMPU_YM > 0 @@ -270,8 +269,7 @@ ym_attach(struct ym_softc *sc) arg.hwif = 0; arg.hdl = 0; sc->sc_mpudev = config_found(ac->sc_dev, &arg, audioprint, - CFARG_IATTR, "ym", - CFARG_EOL); + CFARGS(.iattr = "ym")); } #endif