Module Name: src Committed By: thorpej Date: Tue Aug 3 23:43:45 UTC 2021
Modified Files: src/sys/arch/atari/atari [thorpej-cfargs2]: autoconf.c device.h src/sys/arch/atari/dev [thorpej-cfargs2]: fd.c grf.c hdfd.c ite_cc.c ite_et.c kbd.c ncr5380.c src/sys/arch/atari/isa [thorpej-cfargs2]: isa_machdep.c src/sys/arch/atari/pci [thorpej-cfargs2]: pci_machdep.c src/sys/arch/atari/vme [thorpej-cfargs2]: vme.c vme_machdep.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.70.6.1 src/sys/arch/atari/atari/autoconf.c cvs rdiff -u -r1.7 -r1.7.6.1 src/sys/arch/atari/atari/device.h cvs rdiff -u -r1.88 -r1.88.8.1 src/sys/arch/atari/dev/fd.c \ src/sys/arch/atari/dev/hdfd.c cvs rdiff -u -r1.52 -r1.52.6.1 src/sys/arch/atari/dev/grf.c cvs rdiff -u -r1.42 -r1.42.6.1 src/sys/arch/atari/dev/ite_cc.c cvs rdiff -u -r1.33 -r1.33.6.1 src/sys/arch/atari/dev/ite_et.c cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/arch/atari/dev/kbd.c cvs rdiff -u -r1.75 -r1.75.8.1 src/sys/arch/atari/dev/ncr5380.c cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/arch/atari/isa/isa_machdep.c cvs rdiff -u -r1.60 -r1.60.8.1 src/sys/arch/atari/pci/pci_machdep.c cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/atari/vme/vme.c cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/atari/vme/vme_machdep.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/atari/atari/autoconf.c diff -u src/sys/arch/atari/atari/autoconf.c:1.70 src/sys/arch/atari/atari/autoconf.c:1.70.6.1 --- src/sys/arch/atari/atari/autoconf.c:1.70 Tue Apr 27 14:48:29 2021 +++ src/sys/arch/atari/atari/autoconf.c Tue Aug 3 23:43:44 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.70 2021/04/27 14:48:29 thorpej Exp $ */ +/* $NetBSD: autoconf.c,v 1.70.6.1 2021/08/03 23:43:44 thorpej Exp $ */ /* * Copyright (c) 1995 Leo Weppelman @@ -30,10 +30,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define __SUBR_AUTOCONF_PRIVATE /* XXX atari_config_found() */ - #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.70 2021/04/27 14:48:29 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.70.6.1 2021/08/03 23:43:44 thorpej Exp $"); #include "opt_md.h" @@ -141,18 +139,15 @@ simple_devprint(void *aux, const char *p */ int atari_config_found(cfdata_t pcfp, device_t parent, void *aux, cfprint_t pfn, - cfarg_t tag, ...) + const struct cfargs *cfargs) { struct device temp; cfdata_t cf; const struct cfattach *ca; int rv = 0; - va_list ap; - - va_start(ap, tag); if (atari_realconfig) { - rv = config_vfound(parent, aux, pfn, tag, ap) != NULL; + rv = config_found(parent, aux, pfn, cfargs) != NULL; goto out; } @@ -164,7 +159,7 @@ atari_config_found(cfdata_t pcfp, device parent->dv_cfdriver = config_cfdriver_lookup(pcfp->cf_name); parent->dv_unit = pcfp->cf_unit; - if ((cf = config_vsearch(parent, aux, tag, ap)) != NULL) { + if ((cf = config_search(parent, aux, cfargs)) != NULL) { ca = config_cfattach_lookup(cf->cf_name, cf->cf_atname); if (ca != NULL) { (*ca->ca_attach)(parent, NULL, aux); @@ -174,7 +169,6 @@ atari_config_found(cfdata_t pcfp, device } parent->dv_cfdata = NULL; out: - va_end(ap); return rv; } @@ -203,9 +197,9 @@ config_console(void) * some setup for the 'grf-side'. This make it possible to use * a PCI card for both wscons and grfabs. */ - atari_config_found(cf, NULL, __UNCONST("pcib") , NULL, CFARG_EOL); - atari_config_found(cf, NULL, __UNCONST("isab") , NULL, CFARG_EOL); - atari_config_found(cf, NULL, __UNCONST("grfbus"), NULL, CFARG_EOL); + atari_config_found(cf, NULL, __UNCONST("pcib") , NULL, CFARGS_NONE); + atari_config_found(cf, NULL, __UNCONST("isab") , NULL, CFARGS_NONE); + atari_config_found(cf, NULL, __UNCONST("grfbus"), NULL, CFARGS_NONE); } /* @@ -325,20 +319,20 @@ mbattach(device_t parent, device_t self, mb_attached = 1; printf ("\n"); - config_found(self, __UNCONST("clock") , simple_devprint, CFARG_EOL); - config_found(self, __UNCONST("grfbus") , simple_devprint, CFARG_EOL); - config_found(self, __UNCONST("kbd") , simple_devprint, CFARG_EOL); - config_found(self, __UNCONST("fdc") , simple_devprint, CFARG_EOL); - config_found(self, __UNCONST("ser") , simple_devprint, CFARG_EOL); - config_found(self, __UNCONST("zs") , simple_devprint, CFARG_EOL); - config_found(self, __UNCONST("ncrscsi") , simple_devprint, CFARG_EOL); - config_found(self, __UNCONST("nvr") , simple_devprint, CFARG_EOL); - config_found(self, __UNCONST("lpt") , simple_devprint, CFARG_EOL); - config_found(self, __UNCONST("wdc") , simple_devprint, CFARG_EOL); - config_found(self, __UNCONST("ne") , simple_devprint, CFARG_EOL); - config_found(self, __UNCONST("isab") , simple_devprint, CFARG_EOL); - config_found(self, __UNCONST("pcib") , simple_devprint, CFARG_EOL); - config_found(self, __UNCONST("avmebus") , simple_devprint, CFARG_EOL); + config_found(self, __UNCONST("clock") , simple_devprint, CFARGS_NONE); + config_found(self, __UNCONST("grfbus") , simple_devprint, CFARGS_NONE); + config_found(self, __UNCONST("kbd") , simple_devprint, CFARGS_NONE); + config_found(self, __UNCONST("fdc") , simple_devprint, CFARGS_NONE); + config_found(self, __UNCONST("ser") , simple_devprint, CFARGS_NONE); + config_found(self, __UNCONST("zs") , simple_devprint, CFARGS_NONE); + config_found(self, __UNCONST("ncrscsi") , simple_devprint, CFARGS_NONE); + config_found(self, __UNCONST("nvr") , simple_devprint, CFARGS_NONE); + config_found(self, __UNCONST("lpt") , simple_devprint, CFARGS_NONE); + config_found(self, __UNCONST("wdc") , simple_devprint, CFARGS_NONE); + config_found(self, __UNCONST("ne") , simple_devprint, CFARGS_NONE); + config_found(self, __UNCONST("isab") , simple_devprint, CFARGS_NONE); + config_found(self, __UNCONST("pcib") , simple_devprint, CFARGS_NONE); + config_found(self, __UNCONST("avmebus") , simple_devprint, CFARGS_NONE); } #if 0 Index: src/sys/arch/atari/atari/device.h diff -u src/sys/arch/atari/atari/device.h:1.7 src/sys/arch/atari/atari/device.h:1.7.6.1 --- src/sys/arch/atari/atari/device.h:1.7 Tue Apr 27 14:48:29 2021 +++ src/sys/arch/atari/atari/device.h Tue Aug 3 23:43:44 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: device.h,v 1.7 2021/04/27 14:48:29 thorpej Exp $ */ +/* $NetBSD: device.h,v 1.7.6.1 2021/08/03 23:43:44 thorpej Exp $ */ /* * Copyright (c) 1995 Leo Weppelman @@ -39,7 +39,8 @@ * *and know it* (i.e. everything is really tight certain params won't be * passed in some cases and the devices will deal with it) */ -int atari_config_found(cfdata_t, device_t, void *, cfprint_t, cfarg_t, ...); +int atari_config_found(cfdata_t, device_t, void *, cfprint_t, + const struct cfargs *); int simple_devprint(void *, const char *); int matchname(char *, char *); /* Index: src/sys/arch/atari/dev/fd.c diff -u src/sys/arch/atari/dev/fd.c:1.88 src/sys/arch/atari/dev/fd.c:1.88.8.1 --- src/sys/arch/atari/dev/fd.c:1.88 Sat Apr 24 23:36:29 2021 +++ src/sys/arch/atari/dev/fd.c Tue Aug 3 23:43:44 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.88 2021/04/24 23:36:29 thorpej Exp $ */ +/* $NetBSD: fd.c,v 1.88.8.1 2021/08/03 23:43:44 thorpej Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.88 2021/04/24 23:36:29 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.88.8.1 2021/08/03 23:43:44 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -341,7 +341,7 @@ fdcattach(device_t parent, device_t self if (nfound == 0) first_found = i; nfound++; - config_found(self, (void *)i, fdcprint, CFARG_EOL); + config_found(self, (void *)i, fdcprint, CFARGS_NONE); } } Index: src/sys/arch/atari/dev/hdfd.c diff -u src/sys/arch/atari/dev/hdfd.c:1.88 src/sys/arch/atari/dev/hdfd.c:1.88.8.1 --- src/sys/arch/atari/dev/hdfd.c:1.88 Sat Apr 24 23:36:29 2021 +++ src/sys/arch/atari/dev/hdfd.c Tue Aug 3 23:43:44 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: hdfd.c,v 1.88 2021/04/24 23:36:29 thorpej Exp $ */ +/* $NetBSD: hdfd.c,v 1.88.8.1 2021/08/03 23:43:44 thorpej Exp $ */ /*- * Copyright (c) 1996 Leo Weppelman @@ -91,7 +91,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.88 2021/04/24 23:36:29 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.88.8.1 2021/08/03 23:43:44 thorpej Exp $"); #include "opt_ddb.h" @@ -464,7 +464,7 @@ fdcattach(device_t parent, device_t self * XXX: Choose something sensible as a default... */ fa.fa_deftype = &fd_types[2]; /* 1.44MB */ - (void)config_found(self, (void *)&fa, fdprint, CFARG_EOL); + (void)config_found(self, (void *)&fa, fdprint, CFARGS_NONE); } } Index: src/sys/arch/atari/dev/grf.c diff -u src/sys/arch/atari/dev/grf.c:1.52 src/sys/arch/atari/dev/grf.c:1.52.6.1 --- src/sys/arch/atari/dev/grf.c:1.52 Tue Apr 27 14:48:29 2021 +++ src/sys/arch/atari/dev/grf.c Tue Aug 3 23:43:44 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: grf.c,v 1.52 2021/04/27 14:48:29 thorpej Exp $ */ +/* $NetBSD: grf.c,v 1.52.6.1 2021/08/03 23:43:44 thorpej Exp $ */ /* * Copyright (c) 1995 Leo Weppelman @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.52 2021/04/27 14:48:29 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.52.6.1 2021/08/03 23:43:44 thorpej Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -149,10 +149,10 @@ grfbusattach(device_t parent, device_t s if (self == NULL) { /* Console init */ atari_config_found(cfdata_gbus, NULL, &grf_auxp, grfbusprint, - CFARG_EOL); + CFARGS_NONE); } else { printf("\n"); - config_found(self, &grf_auxp, grfbusprint, CFARG_EOL); + config_found(self, &grf_auxp, grfbusprint, CFARGS_NONE); } } Index: src/sys/arch/atari/dev/ite_cc.c diff -u src/sys/arch/atari/dev/ite_cc.c:1.42 src/sys/arch/atari/dev/ite_cc.c:1.42.6.1 --- src/sys/arch/atari/dev/ite_cc.c:1.42 Tue Apr 27 14:48:29 2021 +++ src/sys/arch/atari/dev/ite_cc.c Tue Aug 3 23:43:44 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ite_cc.c,v 1.42 2021/04/27 14:48:29 thorpej Exp $ */ +/* $NetBSD: ite_cc.c,v 1.42.6.1 2021/08/03 23:43:44 thorpej Exp $ */ /* * Copyright (c) 1996 Leo Weppelman @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ite_cc.c,v 1.42 2021/04/27 14:48:29 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ite_cc.c,v 1.42.6.1 2021/08/03 23:43:44 thorpej Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -231,7 +231,7 @@ grfccattach(device_t parent, device_t se /* Attach console ite */ atari_config_found(cfdata_grf, &itedev, &congrf, grfccprint, - CFARG_EOL); + CFARGS_NONE); return; } @@ -268,7 +268,7 @@ grfccattach(device_t parent, device_t se /* * try and attach an ite */ - config_found(self, sc /* XXX */, grfccprint, CFARG_EOL); + config_found(self, sc /* XXX */, grfccprint, CFARGS_NONE); /* * If attaching the first unit, go ahead and 'find' the rest of us @@ -278,7 +278,7 @@ grfccattach(device_t parent, device_t se grf_auxp.from_bus_match = 0; for (grf_auxp.unit=1; grf_auxp.unit < NGRFCC; grf_auxp.unit++) { config_found(parent, &grf_auxp, grf_bus_auxp->busprint, - CFARG_EOL); + CFARGS_NONE); } } } Index: src/sys/arch/atari/dev/ite_et.c diff -u src/sys/arch/atari/dev/ite_et.c:1.33 src/sys/arch/atari/dev/ite_et.c:1.33.6.1 --- src/sys/arch/atari/dev/ite_et.c:1.33 Tue Apr 27 14:48:29 2021 +++ src/sys/arch/atari/dev/ite_et.c Tue Aug 3 23:43:44 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ite_et.c,v 1.33 2021/04/27 14:48:29 thorpej Exp $ */ +/* $NetBSD: ite_et.c,v 1.33.6.1 2021/08/03 23:43:44 thorpej Exp $ */ /* * Copyright (c) 1996 Leo Weppelman. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.33 2021/04/27 14:48:29 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.33.6.1 2021/08/03 23:43:44 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -205,7 +205,7 @@ grfetattach(device_t parent, device_t se /* Attach console ite */ atari_config_found(cfdata_grf, &itedev, &congrf, grfetprint, - CFARG_EOL); + CFARGS_NONE); return; } @@ -241,7 +241,7 @@ grfetattach(device_t parent, device_t se /* * try and attach an ite */ - config_found(self, sc /* XXX */, grfetprint, CFARG_EOL); + config_found(self, sc /* XXX */, grfetprint, CFARGS_NONE); /* * If attaching the first unit, go ahead and 'find' the rest of us @@ -251,7 +251,7 @@ grfetattach(device_t parent, device_t se grf_auxp.from_bus_match = 0; for (grf_auxp.unit=0; grf_auxp.unit < NGRFET; grf_auxp.unit++) { config_found(parent, (void*)&grf_auxp, - grf_bus_auxp->busprint, CFARG_EOL); + grf_bus_auxp->busprint, CFARGS_NONE); } } } Index: src/sys/arch/atari/dev/kbd.c diff -u src/sys/arch/atari/dev/kbd.c:1.48 src/sys/arch/atari/dev/kbd.c:1.48.8.1 --- src/sys/arch/atari/dev/kbd.c:1.48 Sat Apr 24 23:36:29 2021 +++ src/sys/arch/atari/dev/kbd.c Tue Aug 3 23:43:44 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: kbd.c,v 1.48 2021/04/24 23:36:29 thorpej Exp $ */ +/* $NetBSD: kbd.c,v 1.48.8.1 2021/08/03 23:43:44 thorpej Exp $ */ /* * Copyright (c) 1995 Leo Weppelman @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.48 2021/04/24 23:36:29 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.48.8.1 2021/08/03 23:43:44 thorpej Exp $"); #include "mouse.h" #include "ite.h" @@ -246,7 +246,7 @@ kbdattach(device_t parent, device_t self waa.accessops = &kbd_accessops; waa.accesscookie = NULL; kbd_softc.k_wskbddev = config_found(self, &waa, wskbddevprint, - CFARG_EOL); + CFARGS_NONE); kbd_softc.k_pollingmode = 0; Index: src/sys/arch/atari/dev/ncr5380.c diff -u src/sys/arch/atari/dev/ncr5380.c:1.75 src/sys/arch/atari/dev/ncr5380.c:1.75.8.1 --- src/sys/arch/atari/dev/ncr5380.c:1.75 Sat Apr 24 23:36:29 2021 +++ src/sys/arch/atari/dev/ncr5380.c Tue Aug 3 23:43:44 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ncr5380.c,v 1.75 2021/04/24 23:36:29 thorpej Exp $ */ +/* $NetBSD: ncr5380.c,v 1.75.8.1 2021/08/03 23:43:44 thorpej Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ncr5380.c,v 1.75 2021/04/24 23:36:29 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ncr5380.c,v 1.75.8.1 2021/08/03 23:43:44 thorpej Exp $"); /* * Bit mask of targets you want debugging to be shown @@ -251,7 +251,7 @@ ncr_attach(device_t parent, device_t sel /* * attach all scsi units on us */ - config_found(self, &sc->sc_channel, scsiprint, CFARG_EOL); + config_found(self, &sc->sc_channel, scsiprint, CFARGS_NONE); } /* Index: src/sys/arch/atari/isa/isa_machdep.c diff -u src/sys/arch/atari/isa/isa_machdep.c:1.42 src/sys/arch/atari/isa/isa_machdep.c:1.42.8.1 --- src/sys/arch/atari/isa/isa_machdep.c:1.42 Sat Apr 24 23:36:30 2021 +++ src/sys/arch/atari/isa/isa_machdep.c Tue Aug 3 23:43:44 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.c,v 1.42 2021/04/24 23:36:30 thorpej Exp $ */ +/* $NetBSD: isa_machdep.c,v 1.42.8.1 2021/08/03 23:43:44 thorpej Exp $ */ /* * Copyright (c) 1997 Leo Weppelman. All rights reserved. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.42 2021/04/24 23:36:30 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.42.8.1 2021/08/03 23:43:44 thorpej Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -141,7 +141,7 @@ isabusattach(device_t parent, device_t s iba.iba_ic = &sc->sc_chipset; printf("\n"); - config_found(self, &iba, atariisabusprint, CFARG_EOL); + config_found(self, &iba, atariisabusprint, CFARGS_NONE); } int Index: src/sys/arch/atari/pci/pci_machdep.c diff -u src/sys/arch/atari/pci/pci_machdep.c:1.60 src/sys/arch/atari/pci/pci_machdep.c:1.60.8.1 --- src/sys/arch/atari/pci/pci_machdep.c:1.60 Sat Apr 24 23:36:30 2021 +++ src/sys/arch/atari/pci/pci_machdep.c Tue Aug 3 23:43:44 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_machdep.c,v 1.60 2021/04/24 23:36:30 thorpej Exp $ */ +/* $NetBSD: pci_machdep.c,v 1.60.8.1 2021/08/03 23:43:44 thorpej Exp $ */ /* * Copyright (c) 1996 Leo Weppelman. All rights reserved. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.60 2021/04/24 23:36:30 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.60.8.1 2021/08/03 23:43:44 thorpej Exp $"); #include "opt_mbtype.h" @@ -199,7 +199,7 @@ pcibusattach(device_t parent, device_t s printf("\n"); - config_found(self, &pba, ataripcibusprint, CFARG_EOL); + config_found(self, &pba, ataripcibusprint, CFARGS_NONE); } int Index: src/sys/arch/atari/vme/vme.c diff -u src/sys/arch/atari/vme/vme.c:1.18 src/sys/arch/atari/vme/vme.c:1.18.8.1 --- src/sys/arch/atari/vme/vme.c:1.18 Sat Apr 24 23:36:30 2021 +++ src/sys/arch/atari/vme/vme.c Tue Aug 3 23:43:44 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: vme.c,v 1.18 2021/04/24 23:36:30 thorpej Exp $ */ +/* $NetBSD: vme.c,v 1.18.8.1 2021/08/03 23:43:44 thorpej Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.18 2021/04/24 23:36:30 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.18.8.1 2021/08/03 23:43:44 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -74,8 +74,7 @@ vmeattach(device_t parent, device_t self sc->sc_vc = vba->vba_vc; config_search(self, NULL, - CFARG_SEARCH, vmesearch, - CFARG_EOL); + CFARGS(.search = vmesearch)); } int @@ -112,6 +111,6 @@ vmesearch(device_t parent, cfdata_t cf, va.va_irq = cf->cf_irq; if (config_probe(parent, cf, &va)) - config_attach(parent, cf, &va, vmeprint, CFARG_EOL); + config_attach(parent, cf, &va, vmeprint, CFARGS_NONE); return (0); } Index: src/sys/arch/atari/vme/vme_machdep.c diff -u src/sys/arch/atari/vme/vme_machdep.c:1.22 src/sys/arch/atari/vme/vme_machdep.c:1.22.8.1 --- src/sys/arch/atari/vme/vme_machdep.c:1.22 Sat Apr 24 23:36:30 2021 +++ src/sys/arch/atari/vme/vme_machdep.c Tue Aug 3 23:43:44 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: vme_machdep.c,v 1.22 2021/04/24 23:36:30 thorpej Exp $ */ +/* $NetBSD: vme_machdep.c,v 1.22.8.1 2021/08/03 23:43:44 thorpej Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.22 2021/04/24 23:36:30 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.22.8.1 2021/08/03 23:43:44 thorpej Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -88,7 +88,7 @@ vmebusattach(device_t parent, device_t s vba.vba_memt->base = 0; printf("\n"); - config_found(self, &vba, vmebusprint, CFARG_EOL); + config_found(self, &vba, vmebusprint, CFARGS_NONE); } int