Module Name: src Committed By: thorpej Date: Wed Aug 4 01:08:48 UTC 2021
Modified Files: src/sys/arch/hpcarm/dev [thorpej-cfargs2]: epsonlcd.c ipaq_atmelgpio.c ipaq_lcd.c ipaq_pcic.c ipaq_saip.c j720kbd.c j720pwr.c j720ssp.c j720tp.c nbpiic.c nbpkbd.c nbppcon.c sacc_hpcarm.c sed_saip.c uda1341.c wzero3_kbd.c wzero3_keypad.c wzero3_lcd.c wzero3_tp.c src/sys/arch/hpcmips/dev [thorpej-cfargs2]: it8368.c ite8181.c m38813c.c mq200.c optpoint.c plum.c plumiobus.c plumohci.c plumpcmcia.c plumvideo.c tc5165buf.c ucb1200.c ucbtp.c src/sys/arch/hpcmips/hpcmips [thorpej-cfargs2]: mainbus.c src/sys/arch/hpcmips/isa [thorpej-cfargs2]: isa_machdep.c plumisa_machdep.c src/sys/arch/hpcmips/tx [thorpej-cfargs2]: tx3912video.c tx39biu.c tx39sib.c tx39spi.c tx39uart.c txcom.c txcsbus.c txioman.c txsim.c src/sys/arch/hpcmips/vr [thorpej-cfargs2]: vr4181giu.c vrc4172gpio.c vrc4172pci.c vrc4173bcu.c vrdsiu_mouse.c vrgiu.c vrip.c vrkiu.c vrpciu.c vrpiu.c src/sys/arch/hpcsh/dev [thorpej-cfargs2]: j6x0tp.c pfckbd.c psh3tp.c src/sys/arch/hpcsh/dev/hd64461 [thorpej-cfargs2]: hd64461.c hd64461pcmcia.c hd64461video.c src/sys/arch/hpcsh/dev/hd64465 [thorpej-cfargs2]: hd64465.c hd64465pcmcia.c src/sys/arch/hpcsh/hpcsh [thorpej-cfargs2]: mainbus.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/hpcarm/dev/epsonlcd.c cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/hpcarm/dev/ipaq_lcd.c cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/hpcarm/dev/ipaq_pcic.c cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/hpcarm/dev/ipaq_saip.c cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/hpcarm/dev/j720kbd.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/hpcarm/dev/j720pwr.c \ src/sys/arch/hpcarm/dev/wzero3_lcd.c cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/hpcarm/dev/j720ssp.c cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/hpcarm/dev/j720tp.c cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/hpcarm/dev/nbpiic.c \ src/sys/arch/hpcarm/dev/nbppcon.c cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/hpcarm/dev/nbpkbd.c cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/hpcarm/dev/sacc_hpcarm.c cvs rdiff -u -r1.27 -r1.27.8.1 src/sys/arch/hpcarm/dev/sed_saip.c cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/hpcarm/dev/uda1341.c cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/hpcarm/dev/wzero3_kbd.c cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/hpcarm/dev/wzero3_keypad.c cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/hpcarm/dev/wzero3_tp.c cvs rdiff -u -r1.26 -r1.26.6.1 src/sys/arch/hpcmips/dev/it8368.c cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/arch/hpcmips/dev/ite8181.c \ src/sys/arch/hpcmips/dev/plumpcmcia.c cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/hpcmips/dev/m38813c.c cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/hpcmips/dev/mq200.c cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/hpcmips/dev/optpoint.c cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/hpcmips/dev/plum.c \ src/sys/arch/hpcmips/dev/tc5165buf.c cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/hpcmips/dev/plumiobus.c \ src/sys/arch/hpcmips/dev/plumohci.c cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/arch/hpcmips/dev/plumvideo.c cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/hpcmips/dev/ucb1200.c cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/hpcmips/dev/ucbtp.c cvs rdiff -u -r1.32 -r1.32.8.1 src/sys/arch/hpcmips/hpcmips/mainbus.c cvs rdiff -u -r1.40 -r1.40.8.1 src/sys/arch/hpcmips/isa/isa_machdep.c cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/hpcmips/isa/plumisa_machdep.c cvs rdiff -u -r1.46 -r1.46.8.1 src/sys/arch/hpcmips/tx/tx3912video.c cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/hpcmips/tx/tx39biu.c \ src/sys/arch/hpcmips/tx/tx39uart.c cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/hpcmips/tx/tx39sib.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/hpcmips/tx/tx39spi.c cvs rdiff -u -r1.51 -r1.51.8.1 src/sys/arch/hpcmips/tx/txcom.c cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/hpcmips/tx/txcsbus.c cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/hpcmips/tx/txioman.c cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/hpcmips/tx/txsim.c cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/hpcmips/vr/vr4181giu.c cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/hpcmips/vr/vrc4172gpio.c cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/hpcmips/vr/vrc4172pci.c cvs rdiff -u -r1.25 -r1.25.8.1 src/sys/arch/hpcmips/vr/vrc4173bcu.c cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/hpcmips/vr/vrdsiu_mouse.c cvs rdiff -u -r1.46 -r1.46.4.1 src/sys/arch/hpcmips/vr/vrgiu.c cvs rdiff -u -r1.38 -r1.38.8.1 src/sys/arch/hpcmips/vr/vrip.c cvs rdiff -u -r1.40 -r1.40.8.1 src/sys/arch/hpcmips/vr/vrkiu.c cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/hpcmips/vr/vrpciu.c cvs rdiff -u -r1.43 -r1.43.8.1 src/sys/arch/hpcmips/vr/vrpiu.c cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/hpcsh/dev/j6x0tp.c cvs rdiff -u -r1.31 -r1.31.8.1 src/sys/arch/hpcsh/dev/pfckbd.c cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/hpcsh/dev/psh3tp.c cvs rdiff -u -r1.25 -r1.25.8.1 src/sys/arch/hpcsh/dev/hd64461/hd64461.c cvs rdiff -u -r1.53 -r1.53.8.1 src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c cvs rdiff -u -r1.54 -r1.54.8.1 src/sys/arch/hpcsh/dev/hd64461/hd64461video.c cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/hpcsh/dev/hd64465/hd64465.c cvs rdiff -u -r1.34 -r1.34.8.1 src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/hpcsh/hpcsh/mainbus.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/hpcarm/dev/epsonlcd.c diff -u src/sys/arch/hpcarm/dev/epsonlcd.c:1.3 src/sys/arch/hpcarm/dev/epsonlcd.c:1.3.8.1 --- src/sys/arch/hpcarm/dev/epsonlcd.c:1.3 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hpcarm/dev/epsonlcd.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: epsonlcd.c,v 1.3 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: epsonlcd.c,v 1.3.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /* * Copyright (c) 2011 KIYOHARA Takashi * All rights reserved. @@ -25,7 +25,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: epsonlcd.c,v 1.3 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: epsonlcd.c,v 1.3.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -143,7 +143,7 @@ epsonlcd_attach(device_t parent, device_ haa.ha_ndspconf = 1; haa.ha_dspconflist = &sc->sc_dsp; - config_found(self, &haa, hpcfbprint, CFARG_EOL); + config_found(self, &haa, hpcfbprint, CFARGS_NONE); if (!pmf_device_register(self, NULL, NULL)) aprint_error_dev(self, "unable to establish power handler\n"); Index: src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c diff -u src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c:1.17 src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c:1.17.8.1 --- src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c:1.17 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ipaq_atmelgpio.c,v 1.17 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: ipaq_atmelgpio.c,v 1.17.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. All rights reserved. @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ipaq_atmelgpio.c,v 1.17 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ipaq_atmelgpio.c,v 1.17.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -124,8 +124,7 @@ atmelgpio_attach(device_t parent, device */ config_search(self, NULL, - CFARG_SEARCH, atmelgpio_search, - CFARG_EOL); + CFARGS(.search = atmelgpio_search)); } static int @@ -133,7 +132,7 @@ atmelgpio_search(device_t parent, cfdata void *aux) { if (config_probe(parent, cf, NULL)) - config_attach(parent, cf, NULL, atmelgpio_print, CFARG_EOL); + config_attach(parent, cf, NULL, atmelgpio_print, CFARGS_NONE); return 0; } Index: src/sys/arch/hpcarm/dev/ipaq_lcd.c diff -u src/sys/arch/hpcarm/dev/ipaq_lcd.c:1.21 src/sys/arch/hpcarm/dev/ipaq_lcd.c:1.21.8.1 --- src/sys/arch/hpcarm/dev/ipaq_lcd.c:1.21 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hpcarm/dev/ipaq_lcd.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ipaq_lcd.c,v 1.21 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: ipaq_lcd.c,v 1.21.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ipaq_lcd.c,v 1.21 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ipaq_lcd.c,v 1.21.8.1 2021/08/04 01:08:47 thorpej Exp $"); #define IPAQ_LCD_DEBUG @@ -123,7 +123,7 @@ ipaqlcd_attach(device_t parent, device_t ha.ha_ndspconf = 1; ha.ha_dspconflist = &sc->sc_dspconf; - config_found(sc->sc_dev, &ha, hpcfbprint, CFARG_EOL); + config_found(sc->sc_dev, &ha, hpcfbprint, CFARGS_NONE); } void Index: src/sys/arch/hpcarm/dev/ipaq_pcic.c diff -u src/sys/arch/hpcarm/dev/ipaq_pcic.c:1.22 src/sys/arch/hpcarm/dev/ipaq_pcic.c:1.22.8.1 --- src/sys/arch/hpcarm/dev/ipaq_pcic.c:1.22 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hpcarm/dev/ipaq_pcic.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ipaq_pcic.c,v 1.22 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: ipaq_pcic.c,v 1.22.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ipaq_pcic.c,v 1.22 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ipaq_pcic.c,v 1.22.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -128,7 +128,7 @@ ipaqpcic_attach(device_t parent, device_ sc->sc_socket[i].pcmcia = config_found(sc->sc_pc.sc_dev, &paa, ipaqpcic_print, - CFARG_EOL); + CFARGS_NONE); sa11x0_intr_establish((sa11x0_chipset_tag_t)psc, i ? IRQ_CD1 : IRQ_CD0, Index: src/sys/arch/hpcarm/dev/ipaq_saip.c diff -u src/sys/arch/hpcarm/dev/ipaq_saip.c:1.24 src/sys/arch/hpcarm/dev/ipaq_saip.c:1.24.8.1 --- src/sys/arch/hpcarm/dev/ipaq_saip.c:1.24 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hpcarm/dev/ipaq_saip.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ipaq_saip.c,v 1.24 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: ipaq_saip.c,v 1.24.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 2001, The NetBSD Foundation, Inc. All rights reserved. @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ipaq_saip.c,v 1.24 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ipaq_saip.c,v 1.24.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -108,15 +108,14 @@ ipaq_attach(device_t parent, device_t se * Attach each devices */ config_search(self, NULL, - CFARG_SEARCH, ipaq_search, - CFARG_EOL); + CFARGS(.search = ipaq_search)); } int ipaq_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux) { if (config_probe(parent, cf, NULL)) - config_attach(parent, cf, NULL, ipaq_print, CFARG_EOL); + config_attach(parent, cf, NULL, ipaq_print, CFARGS_NONE); return 0; } Index: src/sys/arch/hpcarm/dev/j720kbd.c diff -u src/sys/arch/hpcarm/dev/j720kbd.c:1.7 src/sys/arch/hpcarm/dev/j720kbd.c:1.7.8.1 --- src/sys/arch/hpcarm/dev/j720kbd.c:1.7 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hpcarm/dev/j720kbd.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: j720kbd.c,v 1.7 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: j720kbd.c,v 1.7.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ /* Jornada 720 keyboard driver. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: j720kbd.c,v 1.7 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: j720kbd.c,v 1.7.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -126,7 +126,7 @@ j720kbd_attach(device_t parent, device_t /* Attach hpckbd. */ haa.haa_ic = &sc->sc_chip->scc_if; - config_found(self, &haa, hpckbd_print, CFARG_EOL); + config_found(self, &haa, hpckbd_print, CFARGS_NONE); } static void Index: src/sys/arch/hpcarm/dev/j720pwr.c diff -u src/sys/arch/hpcarm/dev/j720pwr.c:1.6 src/sys/arch/hpcarm/dev/j720pwr.c:1.6.8.1 --- src/sys/arch/hpcarm/dev/j720pwr.c:1.6 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hpcarm/dev/j720pwr.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: j720pwr.c,v 1.6 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: j720pwr.c,v 1.6.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 2002, 2006 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ /* Jornada 720 power management. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: j720pwr.c,v 1.6 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: j720pwr.c,v 1.6.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -156,7 +156,7 @@ j720pwr_attach(device_t parent, device_t CONFIG_HOOK_SHARE, j720pwr_event_hook, sc); /* Attach hpcapm. */ - config_found(self, NULL, NULL, CFARG_EOL); + config_found(self, NULL, NULL, CFARGS_NONE); } static void Index: src/sys/arch/hpcarm/dev/wzero3_lcd.c diff -u src/sys/arch/hpcarm/dev/wzero3_lcd.c:1.6 src/sys/arch/hpcarm/dev/wzero3_lcd.c:1.6.8.1 --- src/sys/arch/hpcarm/dev/wzero3_lcd.c:1.6 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hpcarm/dev/wzero3_lcd.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: wzero3_lcd.c,v 1.6 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: wzero3_lcd.c,v 1.6.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (C) 2008, 2009 NONAKA Kimihiro <non...@netbsd.org> @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wzero3_lcd.c,v 1.6 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wzero3_lcd.c,v 1.6.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -255,7 +255,7 @@ wzero3lcd_attach(device_t parent, device aa.accessops = &wzero3lcd_accessops; aa.accesscookie = sc; - (void) config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL); + (void) config_found(self, &aa, wsemuldisplaydevprint, CFARGS_NONE); if (!pmf_device_register(sc->dev, wzero3lcd_suspend, wzero3lcd_resume)) aprint_error_dev(sc->dev, "couldn't establish power handler\n"); Index: src/sys/arch/hpcarm/dev/j720ssp.c diff -u src/sys/arch/hpcarm/dev/j720ssp.c:1.33 src/sys/arch/hpcarm/dev/j720ssp.c:1.33.8.1 --- src/sys/arch/hpcarm/dev/j720ssp.c:1.33 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hpcarm/dev/j720ssp.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: j720ssp.c,v 1.33 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: j720ssp.c,v 1.33.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 2001, 2006 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ /* Jornada 720 SSP port. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: j720ssp.c,v 1.33 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: j720ssp.c,v 1.33.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -98,8 +98,7 @@ j720ssp_attach(device_t parent, device_t aprint_normal("\n"); config_search(self, NULL, - CFARG_SEARCH, j720ssp_search, - CFARG_EOL); + CFARGS(.search = j720ssp_search)); } static int @@ -107,7 +106,7 @@ j720ssp_search(device_t parent, cfdata_t { if (config_probe(parent, cf, NULL)) - config_attach(parent, cf, NULL, j720ssp_print, CFARG_EOL); + config_attach(parent, cf, NULL, j720ssp_print, CFARGS_NONE); return 0; } Index: src/sys/arch/hpcarm/dev/j720tp.c diff -u src/sys/arch/hpcarm/dev/j720tp.c:1.12 src/sys/arch/hpcarm/dev/j720tp.c:1.12.8.1 --- src/sys/arch/hpcarm/dev/j720tp.c:1.12 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hpcarm/dev/j720tp.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: j720tp.c,v 1.12 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: j720tp.c,v 1.12.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ /* Jornada 720 touch-panel driver. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: j720tp.c,v 1.12 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: j720tp.c,v 1.12.8.1 2021/08/04 01:08:47 thorpej Exp $"); #ifdef _KERNEL_OPT #include "opt_j720tp.h" @@ -230,8 +230,7 @@ j720tp_attach(device_t parent, device_t wsma.accesscookie = sc; sc->sc_wsmousedev = config_found(self, &wsma, wsmousedevprint, - CFARG_IATTR, "wsmousedev", - CFARG_EOL); + CFARGS(.iattr = "wsmousedev")); if (sc->sc_wsmousedev == NULL) return; @@ -251,8 +250,7 @@ j720tp_attach(device_t parent, device_t wska.accesscookie = sc; sc->sc_wskbddev = config_found(self, &wska, wskbddevprint, - CFARG_IATTR, "wskbddev", - CFARG_EOL); + CFARGS(.iattr = "wskbddev")); /* Setup touch-panel interrupt. */ sa11x0_intr_establish(0, 9, 1, IPL_TTY, j720tp_intr, sc); Index: src/sys/arch/hpcarm/dev/nbpiic.c diff -u src/sys/arch/hpcarm/dev/nbpiic.c:1.4 src/sys/arch/hpcarm/dev/nbpiic.c:1.4.8.1 --- src/sys/arch/hpcarm/dev/nbpiic.c:1.4 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hpcarm/dev/nbpiic.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: nbpiic.c,v 1.4 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: nbpiic.c,v 1.4.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /* * Copyright (c) 2011 KIYOHARA Takashi * All rights reserved. @@ -25,7 +25,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nbpiic.c,v 1.4 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nbpiic.c,v 1.4.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -129,7 +129,7 @@ pxaiic_attach(device_t parent, device_t memset(&iba, 0, sizeof(iba)); iba.iba_tag = &sc->sc_i2c; pxa2x0_i2c_open(&sc->sc_pxa_i2c); - config_found(self, &iba, iicbus_print, CFARG_EOL); + config_found(self, &iba, iicbus_print, CFARGS_NONE); sc->sc_pcon = device_find_by_xname("nbppcon0"); Index: src/sys/arch/hpcarm/dev/nbppcon.c diff -u src/sys/arch/hpcarm/dev/nbppcon.c:1.4 src/sys/arch/hpcarm/dev/nbppcon.c:1.4.8.1 --- src/sys/arch/hpcarm/dev/nbppcon.c:1.4 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hpcarm/dev/nbppcon.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: nbppcon.c,v 1.4 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: nbppcon.c,v 1.4.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /* * Copyright (c) 2011 KIYOHARA Takashi * All rights reserved. @@ -25,7 +25,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nbppcon.c,v 1.4 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nbppcon.c,v 1.4.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -108,8 +108,7 @@ nbppcon_attach(device_t parent, device_t aprint_error_dev(self, "NVRAM read failed\n"); config_search(self, NULL, - CFARG_SEARCH, nbppcon_search, - CFARG_EOL); + CFARGS(.search = nbppcon_search)); } /* ARGSUSED */ @@ -122,7 +121,7 @@ nbppcon_search(device_t self, cfdata_t c pcon.aa_tag = cf->cf_loc[NBPPCONCF_TAG]; if (config_probe(self, cf, &pcon)) - config_attach(self, cf, &pcon, nbppcon_print, CFARG_EOL); + config_attach(self, cf, &pcon, nbppcon_print, CFARGS_NONE); return 0; } Index: src/sys/arch/hpcarm/dev/nbpkbd.c diff -u src/sys/arch/hpcarm/dev/nbpkbd.c:1.2 src/sys/arch/hpcarm/dev/nbpkbd.c:1.2.8.1 --- src/sys/arch/hpcarm/dev/nbpkbd.c:1.2 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hpcarm/dev/nbpkbd.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: nbpkbd.c,v 1.2 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: nbpkbd.c,v 1.2.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /* * Copyright (c) 2011 KIYOHARA Takashi * All rights reserved. @@ -25,7 +25,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nbpkbd.c,v 1.2 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nbpkbd.c,v 1.2.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/callout.h> @@ -121,7 +121,7 @@ nbpkbd_attach(device_t parent, device_t /* Attach hpckbd */ haa.haa_ic = &sc->sc_if; - config_found(self, &haa, hpckbd_print, CFARG_EOL); + config_found(self, &haa, hpckbd_print, CFARGS_NONE); if (nbppcon_regist_callback(parent, sc->sc_tag, nbpkbd_input, sc) == NULL) Index: src/sys/arch/hpcarm/dev/sacc_hpcarm.c diff -u src/sys/arch/hpcarm/dev/sacc_hpcarm.c:1.13 src/sys/arch/hpcarm/dev/sacc_hpcarm.c:1.13.8.1 --- src/sys/arch/hpcarm/dev/sacc_hpcarm.c:1.13 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hpcarm/dev/sacc_hpcarm.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: sacc_hpcarm.c,v 1.13 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: sacc_hpcarm.c,v 1.13.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sacc_hpcarm.c,v 1.13 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sacc_hpcarm.c,v 1.13.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -124,8 +124,7 @@ sacc_attach(device_t parent, device_t se /* attach each devices */ config_search(self, NULL, - CFARG_SEARCH, sa1111_search, - CFARG_EOL); + CFARGS(.search = sa1111_search)); } static int Index: src/sys/arch/hpcarm/dev/sed_saip.c diff -u src/sys/arch/hpcarm/dev/sed_saip.c:1.27 src/sys/arch/hpcarm/dev/sed_saip.c:1.27.8.1 --- src/sys/arch/hpcarm/dev/sed_saip.c:1.27 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hpcarm/dev/sed_saip.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: sed_saip.c,v 1.27 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: sed_saip.c,v 1.27.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 1999-2001 @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sed_saip.c,v 1.27 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sed_saip.c,v 1.27.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -185,7 +185,7 @@ sed1356_attach(device_t parent, device_t CONFIG_HOOK_SHARE, j720lcd_power, sc); } - config_found(self, &ha, hpcfbprint, CFARG_EOL); + config_found(self, &ha, hpcfbprint, CFARGS_NONE); } static int Index: src/sys/arch/hpcarm/dev/uda1341.c diff -u src/sys/arch/hpcarm/dev/uda1341.c:1.16 src/sys/arch/hpcarm/dev/uda1341.c:1.16.8.1 --- src/sys/arch/hpcarm/dev/uda1341.c:1.16 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hpcarm/dev/uda1341.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: uda1341.c,v 1.16 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: uda1341.c,v 1.16.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. All rights reserved. @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uda1341.c,v 1.16 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uda1341.c,v 1.16.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -147,15 +147,14 @@ uda1341_attach(device_t parent, device_t */ config_search(self, NULL, - CFARG_SEARCH, uda1341_search, - CFARG_EOL); + CFARGS(.search = uda1341_search)); } static int uda1341_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux) { if (config_probe(parent, cf, NULL)) - config_attach(parent, cf, NULL, uda1341_print, CFARG_EOL); + config_attach(parent, cf, NULL, uda1341_print, CFARGS_NONE); return 0; } Index: src/sys/arch/hpcarm/dev/wzero3_kbd.c diff -u src/sys/arch/hpcarm/dev/wzero3_kbd.c:1.11 src/sys/arch/hpcarm/dev/wzero3_kbd.c:1.11.8.1 --- src/sys/arch/hpcarm/dev/wzero3_kbd.c:1.11 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hpcarm/dev/wzero3_kbd.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: wzero3_kbd.c,v 1.11 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: wzero3_kbd.c,v 1.11.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (C) 2008, 2009, 2010 NONAKA Kimihiro <non...@netbsd.org> @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wzero3_kbd.c,v 1.11 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wzero3_kbd.c,v 1.11.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -350,7 +350,7 @@ wzero3kbd_attach(device_t parent, device /* Attach hpckbd. */ haa.haa_ic = &sc->sc_if; - config_found(self, &haa, hpckbd_print, CFARG_EOL); + config_found(self, &haa, hpckbd_print, CFARGS_NONE); #if defined(KEYTEST) || defined(KEYTEST2) || defined(KEYTEST3) || defined(KEYTEST4) || defined(KEYTEST5) sc->sc_test_ih = NULL; Index: src/sys/arch/hpcarm/dev/wzero3_keypad.c diff -u src/sys/arch/hpcarm/dev/wzero3_keypad.c:1.5 src/sys/arch/hpcarm/dev/wzero3_keypad.c:1.5.8.1 --- src/sys/arch/hpcarm/dev/wzero3_keypad.c:1.5 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hpcarm/dev/wzero3_keypad.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: wzero3_keypad.c,v 1.5 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: wzero3_keypad.c,v 1.5.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (C) 2010 NONAKA Kimihiro <non...@netbsd.org> @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wzero3_keypad.c,v 1.5 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wzero3_keypad.c,v 1.5.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include "wzero3lcd.h" #include "opt_wsdisplay_compat.h" @@ -330,7 +330,7 @@ wzero3keypad_attach(device_t parent, dev wska.keymap = &wzero3keypad_wskbd_keymapdata; wska.accessops = &wzero3keypad_wskbd_accessops; wska.accesscookie = sc; - sc->sc_wskbddev = config_found(self, &wska, wskbddevprint, CFARG_EOL); + sc->sc_wskbddev = config_found(self, &wska, wskbddevprint, CFARGS_NONE); /* setup keypad interrupt */ pxa2x0_gpio_set_function(sc->sc_intr_pin, GPIO_IN); Index: src/sys/arch/hpcarm/dev/wzero3_tp.c diff -u src/sys/arch/hpcarm/dev/wzero3_tp.c:1.9 src/sys/arch/hpcarm/dev/wzero3_tp.c:1.9.8.1 --- src/sys/arch/hpcarm/dev/wzero3_tp.c:1.9 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hpcarm/dev/wzero3_tp.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: wzero3_tp.c,v 1.9 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: wzero3_tp.c,v 1.9.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (C) 2010 NONAKA Kimihiro <non...@netbsd.org> @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wzero3_tp.c,v 1.9 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wzero3_tp.c,v 1.9.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -291,7 +291,7 @@ wzero3tp_attach(device_t parent, device_ a.accessops = &wzero3tp_accessops; a.accesscookie = sc; - sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL); + sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARGS_NONE); /* Initialize calibration, set default parameters. */ tpcalib_init(&sc->sc_tpcalib); Index: src/sys/arch/hpcmips/dev/it8368.c diff -u src/sys/arch/hpcmips/dev/it8368.c:1.26 src/sys/arch/hpcmips/dev/it8368.c:1.26.6.1 --- src/sys/arch/hpcmips/dev/it8368.c:1.26 Sun Apr 25 18:26:15 2021 +++ src/sys/arch/hpcmips/dev/it8368.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: it8368.c,v 1.26 2021/04/25 18:26:15 thorpej Exp $ */ +/* $NetBSD: it8368.c,v 1.26.6.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: it8368.c,v 1.26 2021/04/25 18:26:15 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: it8368.c,v 1.26.6.1 2021/08/04 01:08:47 thorpej Exp $"); #undef WINCE_DEFAULT_SETTING /* for debug */ #undef IT8368DEBUG @@ -382,7 +382,7 @@ it8368_attach_socket(struct it8368e_soft paa.pch = (pcmcia_chipset_handle_t)sc; if ((sc->sc_pcmcia = config_found(sc->sc_dev, &paa, it8368_print, - CFARG_EOL))) { + CFARGS_NONE))) { it8368_init_socket(sc); } } Index: src/sys/arch/hpcmips/dev/ite8181.c diff -u src/sys/arch/hpcmips/dev/ite8181.c:1.29 src/sys/arch/hpcmips/dev/ite8181.c:1.29.8.1 --- src/sys/arch/hpcmips/dev/ite8181.c:1.29 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/dev/ite8181.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ite8181.c,v 1.29 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: ite8181.c,v 1.29.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 2000,2001 SATO Kazumi @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ite8181.c,v 1.29 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ite8181.c,v 1.29.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -312,7 +312,7 @@ ite8181_attach(struct ite8181_softc *sc) ha.ha_ndspconf = 1; ha.ha_dspconflist = &sc->sc_dspconf; - config_found(sc->sc_dev, &ha, hpcfbprint, CFARG_EOL); + config_found(sc->sc_dev, &ha, hpcfbprint, CFARGS_NONE); #if NBIVIDEO > 0 /* Index: src/sys/arch/hpcmips/dev/plumpcmcia.c diff -u src/sys/arch/hpcmips/dev/plumpcmcia.c:1.29 src/sys/arch/hpcmips/dev/plumpcmcia.c:1.29.8.1 --- src/sys/arch/hpcmips/dev/plumpcmcia.c:1.29 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/dev/plumpcmcia.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: plumpcmcia.c,v 1.29 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: plumpcmcia.c,v 1.29.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /* * Copyright (c) 1999, 2000 UCHIYAMA Yasushi. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: plumpcmcia.c,v 1.29 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: plumpcmcia.c,v 1.29.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -309,7 +309,7 @@ plumpcmcia_attach_socket(struct plumpcmc paa.pch = (pcmcia_chipset_handle_t)ph; if ((ph->ph_pcmcia = config_found(ph->ph_parent, &paa, plumpcmcia_print, - CFARG_EOL))) { + CFARGS_NONE))) { /* Enable slot */ plum_conf_write(ph->ph_regt, ph->ph_regh, PLUM_PCMCIA_SLOTCTRL, Index: src/sys/arch/hpcmips/dev/m38813c.c diff -u src/sys/arch/hpcmips/dev/m38813c.c:1.14 src/sys/arch/hpcmips/dev/m38813c.c:1.14.8.1 --- src/sys/arch/hpcmips/dev/m38813c.c:1.14 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/dev/m38813c.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: m38813c.c,v 1.14 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: m38813c.c,v 1.14.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: m38813c.c,v 1.14 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: m38813c.c,v 1.14.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include "opt_use_poll.h" @@ -120,7 +120,7 @@ m38813c_attach(device_t parent, device_t haa.haa_ic = &sc->sc_chip->scc_if; - config_found(self, &haa, hpckbd_print, CFARG_EOL); + config_found(self, &haa, hpckbd_print, CFARGS_NONE); } void Index: src/sys/arch/hpcmips/dev/mq200.c diff -u src/sys/arch/hpcmips/dev/mq200.c:1.33 src/sys/arch/hpcmips/dev/mq200.c:1.33.8.1 --- src/sys/arch/hpcmips/dev/mq200.c:1.33 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/dev/mq200.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mq200.c,v 1.33 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: mq200.c,v 1.33.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 2000, 2001 TAKEMURA Shin @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mq200.c,v 1.33 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mq200.c,v 1.33.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -236,7 +236,7 @@ mq200_attach(struct mq200_softc *sc) ha.ha_ndspconf = 1; ha.ha_dspconflist = &sc->sc_dspconf; - config_found(sc->sc_dev, &ha, hpcfbprint, CFARG_EOL); + config_found(sc->sc_dev, &ha, hpcfbprint, CFARGS_NONE); #if NBIVIDEO > 0 /* Index: src/sys/arch/hpcmips/dev/optpoint.c diff -u src/sys/arch/hpcmips/dev/optpoint.c:1.8 src/sys/arch/hpcmips/dev/optpoint.c:1.8.8.1 --- src/sys/arch/hpcmips/dev/optpoint.c:1.8 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/dev/optpoint.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: optpoint.c,v 1.8 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: optpoint.c,v 1.8.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved. @@ -31,7 +31,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: optpoint.c,v 1.8 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: optpoint.c,v 1.8.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -131,7 +131,7 @@ optpoint_attach(device_t parent, device_ wsmaa.accesscookie = sc; /* attach the wsmouse */ sc->sc_wsmousedev = config_found(self, &wsmaa, wsmousedevprint, - CFARG_EOL); + CFARGS_NONE); /* Add a hard power hook to power saving */ sc->sc_powerhook = config_hook(CONFIG_HOOK_PMEVENT, Index: src/sys/arch/hpcmips/dev/plum.c diff -u src/sys/arch/hpcmips/dev/plum.c:1.19 src/sys/arch/hpcmips/dev/plum.c:1.19.8.1 --- src/sys/arch/hpcmips/dev/plum.c:1.19 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/dev/plum.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: plum.c,v 1.19 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: plum.c,v 1.19.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: plum.c,v 1.19 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: plum.c,v 1.19.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -113,16 +113,14 @@ plum_attach(device_t parent, device_t se */ sc->sc_pri = 2; config_search(self, NULL, - CFARG_SEARCH, plum_search, - CFARG_EOL); + CFARGS(.search = plum_search)); /* * Other plum module. */ sc->sc_pri = 1; config_search(self, NULL, - CFARG_SEARCH, plum_search, - CFARG_EOL); + CFARGS(.search = plum_search)); } plumreg_t @@ -162,7 +160,7 @@ plum_search(device_t parent, cfdata_t cf pa.pa_irq = sc->sc_irq; if (/*XXX*/config_probe(parent, cf, &pa) == sc->sc_pri) { - config_attach(parent, cf, &pa, plum_print, CFARG_EOL); + config_attach(parent, cf, &pa, plum_print, CFARGS_NONE); } return 0; Index: src/sys/arch/hpcmips/dev/tc5165buf.c diff -u src/sys/arch/hpcmips/dev/tc5165buf.c:1.19 src/sys/arch/hpcmips/dev/tc5165buf.c:1.19.8.1 --- src/sys/arch/hpcmips/dev/tc5165buf.c:1.19 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/dev/tc5165buf.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: tc5165buf.c,v 1.19 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: tc5165buf.c,v 1.19.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 1999-2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tc5165buf.c,v 1.19 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tc5165buf.c,v 1.19.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include "opt_use_poll.h" @@ -147,7 +147,7 @@ tc5165buf_attach(device_t parent, device haa.haa_ic = &sc->sc_chip->scc_if; - config_found(self, &haa, hpckbd_print, CFARG_EOL); + config_found(self, &haa, hpckbd_print, CFARGS_NONE); } void Index: src/sys/arch/hpcmips/dev/plumiobus.c diff -u src/sys/arch/hpcmips/dev/plumiobus.c:1.17 src/sys/arch/hpcmips/dev/plumiobus.c:1.17.8.1 --- src/sys/arch/hpcmips/dev/plumiobus.c:1.17 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/dev/plumiobus.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: plumiobus.c,v 1.17 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: plumiobus.c,v 1.17.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: plumiobus.c,v 1.17 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: plumiobus.c,v 1.17.8.1 2021/08/04 01:08:47 thorpej Exp $"); #define PLUMIOBUSDEBUG @@ -164,8 +164,7 @@ plumiobus_attach(device_t parent, device #endif config_search(self, NULL, - CFARG_SEARCH, plumiobus_search, - CFARG_EOL); + CFARGS(.search = plumiobus_search)); } /* XXX something kludge */ @@ -203,7 +202,7 @@ plumiobus_search(device_t parent, cfdata if (!(sc->sc_isa[slot].pr_enabled) && /* not attached slot */ config_probe(parent, cf, &pba)) { - config_attach(parent, cf, &pba, plumiobus_print, CFARG_EOL); + config_attach(parent, cf, &pba, plumiobus_print, CFARGS_NONE); sc->sc_isa[slot].pr_enabled = 1; } Index: src/sys/arch/hpcmips/dev/plumohci.c diff -u src/sys/arch/hpcmips/dev/plumohci.c:1.17 src/sys/arch/hpcmips/dev/plumohci.c:1.17.8.1 --- src/sys/arch/hpcmips/dev/plumohci.c:1.17 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/dev/plumohci.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: plumohci.c,v 1.17 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: plumohci.c,v 1.17.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 2000 UCHIYAMA Yasushi @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: plumohci.c,v 1.17 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: plumohci.c,v 1.17.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -192,7 +192,7 @@ plumohci_attach(device_t parent, device_ /* Attach usb device. */ sc->sc.sc_child = config_found(self, &sc->sc.sc_bus, usbctlprint, - CFARG_EOL); + CFARGS_NONE); } int Index: src/sys/arch/hpcmips/dev/plumvideo.c diff -u src/sys/arch/hpcmips/dev/plumvideo.c:1.42 src/sys/arch/hpcmips/dev/plumvideo.c:1.42.8.1 --- src/sys/arch/hpcmips/dev/plumvideo.c:1.42 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/dev/plumvideo.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: plumvideo.c,v 1.42 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: plumvideo.c,v 1.42.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 1999-2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: plumvideo.c,v 1.42 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: plumvideo.c,v 1.42.8.1 2021/08/04 01:08:47 thorpej Exp $"); #undef PLUMVIDEODEBUG @@ -228,7 +228,7 @@ plumvideo_attach(device_t parent, device ha.ha_ndspconf = 1; ha.ha_dspconflist = &sc->sc_dspconf; - config_found(self, &ha, hpcfbprint, CFARG_EOL); + config_found(self, &ha, hpcfbprint, CFARGS_NONE); #if NBIVIDEO > 0 /* bivideo is no longer need */ bivideo_dont_attach = 1; Index: src/sys/arch/hpcmips/dev/ucb1200.c diff -u src/sys/arch/hpcmips/dev/ucb1200.c:1.20 src/sys/arch/hpcmips/dev/ucb1200.c:1.20.8.1 --- src/sys/arch/hpcmips/dev/ucb1200.c:1.20 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/dev/ucb1200.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ucb1200.c,v 1.20 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: ucb1200.c,v 1.20.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ucb1200.c,v 1.20 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ucb1200.c,v 1.20.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -134,8 +134,7 @@ ucb1200_attach(device_t parent, device_t printf("\n"); config_search(self, NULL, - CFARG_SEARCH, ucb1200_search, - CFARG_EOL); + CFARGS(.search = ucb1200_search)); } int @@ -151,7 +150,7 @@ ucb1200_search(device_t parent, cfdata_t ucba.ucba_ucb = parent; if (config_probe(parent, cf, &ucba)) - config_attach(parent, cf, &ucba, ucb1200_print, CFARG_EOL); + config_attach(parent, cf, &ucba, ucb1200_print, CFARGS_NONE); return (0); } Index: src/sys/arch/hpcmips/dev/ucbtp.c diff -u src/sys/arch/hpcmips/dev/ucbtp.c:1.22 src/sys/arch/hpcmips/dev/ucbtp.c:1.22.8.1 --- src/sys/arch/hpcmips/dev/ucbtp.c:1.22 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/dev/ucbtp.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ucbtp.c,v 1.22 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: ucbtp.c,v 1.22.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ucbtp.c,v 1.22 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ucbtp.c,v 1.22.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include "opt_use_poll.h" @@ -316,7 +316,7 @@ ucbtp_attach(device_t parent, device_t s * attach the wsmouse */ sc->sc_wsmousedev = config_found(self, &wsmaa, wsmousedevprint, - CFARG_EOL); + CFARGS_NONE); } int Index: src/sys/arch/hpcmips/hpcmips/mainbus.c diff -u src/sys/arch/hpcmips/hpcmips/mainbus.c:1.32 src/sys/arch/hpcmips/hpcmips/mainbus.c:1.32.8.1 --- src/sys/arch/hpcmips/hpcmips/mainbus.c:1.32 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/hpcmips/mainbus.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.32 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: mainbus.c,v 1.32.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 1999 @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.32 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.32.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -98,15 +98,13 @@ mainbus_attach(device_t parent, device_t for (i = 0; i < sizeof(devnames) / sizeof(devnames[0]); i++) { ma.ma_name = devnames[i]; config_search(self, &ma, - CFARG_SEARCH, mainbus_search, - CFARG_IATTR, "mainbus", - CFARG_EOL); + CFARGS(.search = mainbus_search, + .iattr = "mainbus")); } /* APM */ config_found(self, NULL, mainbus_print, - CFARG_IATTR, "hpcapmif", - CFARG_EOL); + CFARGS(.iattr = "hpcapmif")); } int @@ -126,7 +124,7 @@ mainbus_search(device_t parent, cfdata_t /* attach device */ if (config_probe(parent, cf, ma)) - config_attach(parent, cf, ma, mainbus_print, CFARG_EOL); + config_attach(parent, cf, ma, mainbus_print, CFARGS_NONE); return (0); } Index: src/sys/arch/hpcmips/isa/isa_machdep.c diff -u src/sys/arch/hpcmips/isa/isa_machdep.c:1.40 src/sys/arch/hpcmips/isa/isa_machdep.c:1.40.8.1 --- src/sys/arch/hpcmips/isa/isa_machdep.c:1.40 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/isa/isa_machdep.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.c,v 1.40 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: isa_machdep.c,v 1.40.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.40 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.40.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include "opt_vr41xx.h" @@ -173,7 +173,7 @@ vrisabattach(device_t parent, device_t s printf(": ISA port %#x-%#x mem %#x-%#x\n", iot->base, iot->base + iot->size, memt->base, memt->base + memt->size); - config_found(self, &iba, vrisabprint, CFARG_EOL); + config_found(self, &iba, vrisabprint, CFARGS_NONE); #endif #ifdef DEBUG_FIND_COMPORT Index: src/sys/arch/hpcmips/isa/plumisa_machdep.c diff -u src/sys/arch/hpcmips/isa/plumisa_machdep.c:1.13 src/sys/arch/hpcmips/isa/plumisa_machdep.c:1.13.8.1 --- src/sys/arch/hpcmips/isa/plumisa_machdep.c:1.13 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/isa/plumisa_machdep.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: plumisa_machdep.c,v 1.13 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: plumisa_machdep.c,v 1.13.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: plumisa_machdep.c,v 1.13 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: plumisa_machdep.c,v 1.13.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -121,7 +121,7 @@ plumisabattach(device_t parent, device_t /* Plum ISA-bus don't have memory space! */ /* Plum ISA port space */ iba.iba_iot = sc->sc_iot; - config_found(self, &iba, plumisabprint, CFARG_EOL); + config_found(self, &iba, plumisabprint, CFARGS_NONE); } int Index: src/sys/arch/hpcmips/tx/tx3912video.c diff -u src/sys/arch/hpcmips/tx/tx3912video.c:1.46 src/sys/arch/hpcmips/tx/tx3912video.c:1.46.8.1 --- src/sys/arch/hpcmips/tx/tx3912video.c:1.46 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/tx/tx3912video.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: tx3912video.c,v 1.46 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: tx3912video.c,v 1.46.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 1999-2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tx3912video.c,v 1.46 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tx3912video.c,v 1.46.8.1 2021/08/04 01:08:47 thorpej Exp $"); #define TX3912VIDEO_DEBUG @@ -195,7 +195,7 @@ tx3912video_attach(device_t parent, devi ha.ha_ndspconf = 1; ha.ha_dspconflist = &sc->sc_dspconf; - config_found(self, &ha, hpcfbprint, CFARG_EOL); + config_found(self, &ha, hpcfbprint, CFARGS_NONE); #if NBIVIDEO > 0 /* bivideo is no longer need */ bivideo_dont_attach = 1; Index: src/sys/arch/hpcmips/tx/tx39biu.c diff -u src/sys/arch/hpcmips/tx/tx39biu.c:1.16 src/sys/arch/hpcmips/tx/tx39biu.c:1.16.8.1 --- src/sys/arch/hpcmips/tx/tx39biu.c:1.16 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/tx/tx39biu.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: tx39biu.c,v 1.16 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: tx39biu.c,v 1.16.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 1999-2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tx39biu.c,v 1.16 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tx39biu.c,v 1.16.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include "opt_tx39_watchdogtimer.h" #include "opt_tx39biu_debug.h" @@ -130,7 +130,7 @@ tx39biu_callback(device_t self) cba.cba_busname = "txcsbus"; cba.cba_tc = sc->sc_tc; - config_found(self, &cba, tx39biu_print, CFARG_EOL); + config_found(self, &cba, tx39biu_print, CFARGS_NONE); } int Index: src/sys/arch/hpcmips/tx/tx39uart.c diff -u src/sys/arch/hpcmips/tx/tx39uart.c:1.16 src/sys/arch/hpcmips/tx/tx39uart.c:1.16.8.1 --- src/sys/arch/hpcmips/tx/tx39uart.c:1.16 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/tx/tx39uart.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: tx39uart.c,v 1.16 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: tx39uart.c,v 1.16.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tx39uart.c,v 1.16 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tx39uart.c,v 1.16.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include "opt_tx39uart_debug.h" @@ -76,8 +76,7 @@ tx39uart_attach(device_t parent, device_ sc->sc_tc = tc = ta->ta_tc; config_search(self, NULL, - CFARG_SEARCH, tx39uart_search, - CFARG_EOL); + CFARGS(.search = tx39uart_search)); } int @@ -96,7 +95,7 @@ tx39uart_search(device_t parent, cfdata_ if (!(sc->sc_enabled & (1 << ua.ua_slot)) && /* not attached slot */ config_probe(parent, cf, &ua)) { - config_attach(parent, cf, &ua, tx39uart_print, CFARG_EOL); + config_attach(parent, cf, &ua, tx39uart_print, CFARGS_NONE); sc->sc_enabled |= (1 << ua.ua_slot); } Index: src/sys/arch/hpcmips/tx/tx39sib.c diff -u src/sys/arch/hpcmips/tx/tx39sib.c:1.22 src/sys/arch/hpcmips/tx/tx39sib.c:1.22.8.1 --- src/sys/arch/hpcmips/tx/tx39sib.c:1.22 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/tx/tx39sib.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: tx39sib.c,v 1.22 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: tx39sib.c,v 1.22.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tx39sib.c,v 1.22 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tx39sib.c,v 1.22.8.1 2021/08/04 01:08:47 thorpej Exp $"); #undef TX39SIBDEBUG @@ -178,8 +178,7 @@ tx39sib_attach(device_t parent, device_t #endif config_search(self, NULL, - CFARG_SEARCH, tx39sib_search, - CFARG_EOL); + CFARGS(.search = tx39sib_search)); } void @@ -289,7 +288,7 @@ tx39sib_search(device_t parent, cfdata_t if (!(sc->sc_attached & (1 << sa.sa_slot)) &&/* not attached slot */ config_probe(parent, cf, &sa)) { - config_attach(parent, cf, &sa, tx39sib_print, CFARG_EOL); + config_attach(parent, cf, &sa, tx39sib_print, CFARGS_NONE); sc->sc_attached |= (1 << sa.sa_slot); } Index: src/sys/arch/hpcmips/tx/tx39spi.c diff -u src/sys/arch/hpcmips/tx/tx39spi.c:1.6 src/sys/arch/hpcmips/tx/tx39spi.c:1.6.8.1 --- src/sys/arch/hpcmips/tx/tx39spi.c:1.6 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/tx/tx39spi.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: tx39spi.c,v 1.6 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: tx39spi.c,v 1.6.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved. @@ -31,7 +31,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tx39spi.c,v 1.6 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tx39spi.c,v 1.6.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -88,8 +88,7 @@ tx39spi_attach(device_t parent, device_t printf("\n"); config_search(self, NULL, - CFARG_SEARCH, tx39spi_search, - CFARG_EOL); + CFARGS(.search = tx39spi_search)); } int @@ -108,7 +107,7 @@ tx39spi_search(device_t parent, cfdata_t if (!(sc->sc_attached & (1 << sa.sa_slot)) && /* not attached slot */ config_probe(parent, cf, &sa)) { - config_attach(parent, cf, &sa, tx39spi_print, CFARG_EOL); + config_attach(parent, cf, &sa, tx39spi_print, CFARGS_NONE); sc->sc_attached |= (1 << sa.sa_slot); } Index: src/sys/arch/hpcmips/tx/txcom.c diff -u src/sys/arch/hpcmips/tx/txcom.c:1.51 src/sys/arch/hpcmips/tx/txcom.c:1.51.8.1 --- src/sys/arch/hpcmips/tx/txcom.c:1.51 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/tx/txcom.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: txcom.c,v 1.51 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: txcom.c,v 1.51.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: txcom.c,v 1.51 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: txcom.c,v 1.51.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include "opt_tx39uart_debug.h" @@ -293,7 +293,7 @@ txcom_attach(device_t parent, device_t s struct txcom_attach_args tca; tca.tca_tc = tc; tca.tca_parent = self; - config_found(self, &tca, txcom_print, CFARG_EOL); + config_found(self, &tca, txcom_print, CFARGS_NONE); } } Index: src/sys/arch/hpcmips/tx/txcsbus.c diff -u src/sys/arch/hpcmips/tx/txcsbus.c:1.23 src/sys/arch/hpcmips/tx/txcsbus.c:1.23.8.1 --- src/sys/arch/hpcmips/tx/txcsbus.c:1.23 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/tx/txcsbus.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: txcsbus.c,v 1.23 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: txcsbus.c,v 1.23.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: txcsbus.c,v 1.23 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: txcsbus.c,v 1.23.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -144,14 +144,12 @@ txcsbus_attach(device_t parent, device_t /* higher priority devices attach first */ sc->sc_pri = 2; config_search(self, NULL, - CFARG_SEARCH, txcsbus_search, - CFARG_EOL); + CFARGS(.search = txcsbus_search)); /* then, normal priority devices */ sc->sc_pri = 1; config_search(self, NULL, - CFARG_SEARCH, txcsbus_search, - CFARG_EOL); + CFARGS(.search = txcsbus_search)); } int @@ -239,7 +237,7 @@ txcsbus_search(device_t parent, cfdata_t ca.ca_irq3 = cf->cf_loc[TXCSBUSCF_IRQ3]; if (/*XXX*/config_probe(parent, cf, &ca) == sc->sc_pri) { - config_attach(parent, cf, &ca, txcsbus_print, CFARG_EOL); + config_attach(parent, cf, &ca, txcsbus_print, CFARGS_NONE); } return (0); Index: src/sys/arch/hpcmips/tx/txioman.c diff -u src/sys/arch/hpcmips/tx/txioman.c:1.11 src/sys/arch/hpcmips/tx/txioman.c:1.11.8.1 --- src/sys/arch/hpcmips/tx/txioman.c:1.11 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/tx/txioman.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: txioman.c,v 1.11 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: txioman.c,v 1.11.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: txioman.c,v 1.11 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: txioman.c,v 1.11.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -74,7 +74,7 @@ txioman_callback(device_t self) haa.haa_getchip = tx_conf_reference_ioman; haa.haa_iot = 0; /* not needed for TX */ - config_found(self, &haa, txioman_print, CFARG_EOL); + config_found(self, &haa, txioman_print, CFARGS_NONE); } int Index: src/sys/arch/hpcmips/tx/txsim.c diff -u src/sys/arch/hpcmips/tx/txsim.c:1.18 src/sys/arch/hpcmips/tx/txsim.c:1.18.8.1 --- src/sys/arch/hpcmips/tx/txsim.c:1.18 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/tx/txsim.c Wed Aug 4 01:08:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: txsim.c,v 1.18 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: txsim.c,v 1.18.8.1 2021/08/04 01:08:47 thorpej Exp $ */ /*- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: txsim.c,v 1.18 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: txsim.c,v 1.18.8.1 2021/08/04 01:08:47 thorpej Exp $"); #include "opt_vr41xx.h" #include "opt_tx39xx.h" @@ -91,8 +91,7 @@ txsim_attach(device_t parent, device_t s */ sc->sc_pri = ATTACH_FIRST; config_search(self, NULL, - CFARG_SEARCH, txsim_search, - CFARG_EOL); + CFARGS(.search = txsim_search)); /* * unified I/O manager requires all I/O capable module already @@ -100,16 +99,14 @@ txsim_attach(device_t parent, device_t s */ sc->sc_pri = ATTACH_NORMAL; config_search(self, NULL, - CFARG_SEARCH, txsim_search, - CFARG_EOL); + CFARGS(.search = txsim_search)); /* * UART module uses platform dependent config_hooks. */ sc->sc_pri = ATTACH_LAST; config_search(self, NULL, - CFARG_SEARCH, txsim_search, - CFARG_EOL); + CFARGS(.search = txsim_search)); } int @@ -127,7 +124,7 @@ txsim_search(device_t parent, cfdata_t c ta.ta_tc = tx_conf_get_tag(); if (/*XXX*/config_probe(parent, cf, &ta) == sc->sc_pri) - config_attach(parent, cf, &ta, txsim_print, CFARG_EOL); + config_attach(parent, cf, &ta, txsim_print, CFARGS_NONE); return (0); } Index: src/sys/arch/hpcmips/vr/vr4181giu.c diff -u src/sys/arch/hpcmips/vr/vr4181giu.c:1.7 src/sys/arch/hpcmips/vr/vr4181giu.c:1.7.8.1 --- src/sys/arch/hpcmips/vr/vr4181giu.c:1.7 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/vr/vr4181giu.c Wed Aug 4 01:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: vr4181giu.c,v 1.7 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: vr4181giu.c,v 1.7.8.1 2021/08/04 01:08:48 thorpej Exp $ */ /*- * Copyright (c) 1999-2001 @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vr4181giu.c,v 1.7 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vr4181giu.c,v 1.7.8.1 2021/08/04 01:08:48 thorpej Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -151,7 +151,7 @@ vr4181giu_attach(device_t parent, device sc->sc_haa.haa_sc = sc; sc->sc_haa.haa_getchip = vr4181giu_getchip; sc->sc_haa.haa_iot = sc->sc_iot; - while (config_found(self, &sc->sc_haa, vr4181giu_print, CFARG_EOL)) ; + while (config_found(self, &sc->sc_haa, vr4181giu_print, CFARGS_NONE)) ; /* * GIU-ISA bridge @@ -169,7 +169,7 @@ vr4181giu_callback(device_t self) struct vr4181giu_softc *sc = (void *) self; sc->sc_haa.haa_busname = "vrisab"; - config_found(self, &sc->sc_haa, vr4181giu_print, CFARG_EOL); + config_found(self, &sc->sc_haa, vr4181giu_print, CFARGS_NONE); } static int Index: src/sys/arch/hpcmips/vr/vrc4172gpio.c diff -u src/sys/arch/hpcmips/vr/vrc4172gpio.c:1.16 src/sys/arch/hpcmips/vr/vrc4172gpio.c:1.16.8.1 --- src/sys/arch/hpcmips/vr/vrc4172gpio.c:1.16 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/vr/vrc4172gpio.c Wed Aug 4 01:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: vrc4172gpio.c,v 1.16 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: vrc4172gpio.c,v 1.16.8.1 2021/08/04 01:08:48 thorpej Exp $ */ /*- * Copyright (c) 2001 TAKEMRUA Shin. All rights reserved. * @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vrc4172gpio.c,v 1.16 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vrc4172gpio.c,v 1.16.8.1 2021/08/04 01:08:48 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -320,7 +320,7 @@ vrc4172gpio_attach(device_t parent, devi sc->sc_haa.haa_sc = sc; sc->sc_haa.haa_getchip = vrc4172gpio_getchip; sc->sc_haa.haa_iot = sc->sc_iot; - while (config_found(self, &sc->sc_haa, vrc4172gpio_print, CFARG_EOL)) ; + while (config_found(self, &sc->sc_haa, vrc4172gpio_print, CFARGS_NONE)) ; /* * GIU-ISA bridge */ @@ -337,7 +337,7 @@ vrc4172gpio_callback(device_t self) struct vrc4172gpio_softc *sc = device_private(self); sc->sc_haa.haa_busname = "vrisab"; - config_found(self, &sc->sc_haa, vrc4172gpio_print, CFARG_EOL); + config_found(self, &sc->sc_haa, vrc4172gpio_print, CFARGS_NONE); } int Index: src/sys/arch/hpcmips/vr/vrc4172pci.c diff -u src/sys/arch/hpcmips/vr/vrc4172pci.c:1.19 src/sys/arch/hpcmips/vr/vrc4172pci.c:1.19.8.1 --- src/sys/arch/hpcmips/vr/vrc4172pci.c:1.19 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/vr/vrc4172pci.c Wed Aug 4 01:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: vrc4172pci.c,v 1.19 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: vrc4172pci.c,v 1.19.8.1 2021/08/04 01:08:48 thorpej Exp $ */ /*- * Copyright (c) 2002 TAKEMURA Shin @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vrc4172pci.c,v 1.19 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vrc4172pci.c,v 1.19.8.1 2021/08/04 01:08:48 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -206,7 +206,7 @@ vrc4172pci_attach(device_t parent, devic PCI_FLAGS_MRL_OKAY; pba.pba_pc = pc; - config_found(self, &pba, pcibusprint, CFARG_EOL); + config_found(self, &pba, pcibusprint, CFARGS_NONE); #endif } Index: src/sys/arch/hpcmips/vr/vrc4173bcu.c diff -u src/sys/arch/hpcmips/vr/vrc4173bcu.c:1.25 src/sys/arch/hpcmips/vr/vrc4173bcu.c:1.25.8.1 --- src/sys/arch/hpcmips/vr/vrc4173bcu.c:1.25 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/vr/vrc4173bcu.c Wed Aug 4 01:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: vrc4173bcu.c,v 1.25 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: vrc4173bcu.c,v 1.25.8.1 2021/08/04 01:08:48 thorpej Exp $ */ /*- * Copyright (c) 2001,2002 Enami Tsugutomo. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vrc4173bcu.c,v 1.25 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vrc4173bcu.c,v 1.25.8.1 2021/08/04 01:08:48 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -426,8 +426,7 @@ vrc4173bcu_attach(device_t parent, devic */ for (sc->sc_pri = 2; 0 < sc->sc_pri; sc->sc_pri--) { config_search(self, NULL, - CFARG_SEARCH, vrc4173bcu_search, - CFARG_EOL); + CFARGS(.search = vrc4173bcu_search)); } } @@ -470,7 +469,7 @@ vrc4173bcu_search(device_t parent, cfdat va.va_ac = sc->sc_chipset.vc_ac; va.va_dc = sc->sc_chipset.vc_dc; if (/*XXX*/config_probe(parent, cf, &va) == sc->sc_pri) - config_attach(parent, cf, &va, vrc4173bcu_print, CFARG_EOL); + config_attach(parent, cf, &va, vrc4173bcu_print, CFARGS_NONE); return (0); } Index: src/sys/arch/hpcmips/vr/vrdsiu_mouse.c diff -u src/sys/arch/hpcmips/vr/vrdsiu_mouse.c:1.13 src/sys/arch/hpcmips/vr/vrdsiu_mouse.c:1.13.8.1 --- src/sys/arch/hpcmips/vr/vrdsiu_mouse.c:1.13 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/vr/vrdsiu_mouse.c Wed Aug 4 01:08:48 2021 @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vrdsiu_mouse.c,v 1.13 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vrdsiu_mouse.c,v 1.13.8.1 2021/08/04 01:08:48 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -159,7 +159,7 @@ vrdsiu_attach(device_t parent, device_t wsmaa.accessops = &vrdsiu_accessops; wsmaa.accesscookie = sc; sc->sc_wsmousedev = config_found(self, &wsmaa, wsmousedevprint, - CFARG_EOL); + CFARGS_NONE); /* * TODO: Initialize the DSIU ourselves. Index: src/sys/arch/hpcmips/vr/vrgiu.c diff -u src/sys/arch/hpcmips/vr/vrgiu.c:1.46 src/sys/arch/hpcmips/vr/vrgiu.c:1.46.4.1 --- src/sys/arch/hpcmips/vr/vrgiu.c:1.46 Sat May 22 16:00:42 2021 +++ src/sys/arch/hpcmips/vr/vrgiu.c Wed Aug 4 01:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: vrgiu.c,v 1.46 2021/05/22 16:00:42 thorpej Exp $ */ +/* $NetBSD: vrgiu.c,v 1.46.4.1 2021/08/04 01:08:48 thorpej Exp $ */ /*- * Copyright (c) 1999-2001 * Shin Takemura and PocketBSD Project. All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vrgiu.c,v 1.46 2021/05/22 16:00:42 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vrgiu.c,v 1.46.4.1 2021/08/04 01:08:48 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -269,8 +269,7 @@ vrgiu_attach(device_t parent, device_t s haa.haa_getchip = vrgiu_getchip; haa.haa_iot = sc->sc_iot; while (config_found(self, &haa, vrgiu_print, - CFARG_IATTR, "hpcioif", - CFARG_EOL)) ; + CFARGS(.iattr = "hpcioif"))); /* * GIU-ISA bridge */ @@ -292,8 +291,7 @@ vrgiu_callback(device_t self) haa.haa_getchip = vrgiu_getchip; haa.haa_iot = sc->sc_iot; config_found(self, &haa, vrgiu_print, - CFARG_IATTR, "vrisabif", - CFARG_EOL); + CFARGS(.iattr = "vrisabif")); } int Index: src/sys/arch/hpcmips/vr/vrip.c diff -u src/sys/arch/hpcmips/vr/vrip.c:1.38 src/sys/arch/hpcmips/vr/vrip.c:1.38.8.1 --- src/sys/arch/hpcmips/vr/vrip.c:1.38 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/vr/vrip.c Wed Aug 4 01:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: vrip.c,v 1.38 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: vrip.c,v 1.38.8.1 2021/08/04 01:08:48 thorpej Exp $ */ /*- * Copyright (c) 1999, 2002 @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vrip.c,v 1.38 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vrip.c,v 1.38.8.1 2021/08/04 01:08:48 thorpej Exp $"); #include "opt_vr41xx.h" #include "opt_tx39xx.h" @@ -246,14 +246,12 @@ vripattach_common(device_t parent, devic */ sc->sc_pri = 2; config_search(self, NULL, - CFARG_SEARCH, vrip_search, - CFARG_EOL); + CFARGS(.search = vrip_search)); /* Other system devices. */ sc->sc_pri = 1; config_search(self, NULL, - CFARG_SEARCH, vrip_search, - CFARG_EOL); + CFARGS(.search = vrip_search)); } int @@ -304,7 +302,7 @@ vrip_search(device_t parent, cfdata_t cf va.va_ac = sc->sc_chipset.vc_ac; va.va_dc = sc->sc_chipset.vc_dc; if (/*XXX*/config_probe(parent, cf, &va) == sc->sc_pri) - config_attach(parent, cf, &va, vrip_print, CFARG_EOL); + config_attach(parent, cf, &va, vrip_print, CFARGS_NONE); return (0); } Index: src/sys/arch/hpcmips/vr/vrkiu.c diff -u src/sys/arch/hpcmips/vr/vrkiu.c:1.40 src/sys/arch/hpcmips/vr/vrkiu.c:1.40.8.1 --- src/sys/arch/hpcmips/vr/vrkiu.c:1.40 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/vr/vrkiu.c Wed Aug 4 01:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: vrkiu.c,v 1.40 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: vrkiu.c,v 1.40.8.1 2021/08/04 01:08:48 thorpej Exp $ */ /*- * Copyright (c) 1999 SASAKI Takesi All rights reserved. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vrkiu.c,v 1.40 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vrkiu.c,v 1.40.8.1 2021/08/04 01:08:48 thorpej Exp $"); #include <sys/param.h> #include <sys/tty.h> @@ -175,7 +175,7 @@ vrkiuattach(device_t parent, device_t se /* attach hpckbd */ haa.haa_ic = &sc->sc_chip->kc_if; - config_found(self, &haa, hpckbd_print, CFARG_EOL); + config_found(self, &haa, hpckbd_print, CFARGS_NONE); } /* Index: src/sys/arch/hpcmips/vr/vrpciu.c diff -u src/sys/arch/hpcmips/vr/vrpciu.c:1.23 src/sys/arch/hpcmips/vr/vrpciu.c:1.23.8.1 --- src/sys/arch/hpcmips/vr/vrpciu.c:1.23 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/vr/vrpciu.c Wed Aug 4 01:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: vrpciu.c,v 1.23 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: vrpciu.c,v 1.23.8.1 2021/08/04 01:08:48 thorpej Exp $ */ /*- * Copyright (c) 2001 Enami Tsugutomo. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vrpciu.c,v 1.23 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vrpciu.c,v 1.23.8.1 2021/08/04 01:08:48 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -324,7 +324,7 @@ vrpciu_attach(device_t parent, device_t PCI_FLAGS_MRL_OKAY; pba.pba_pc = pc; - config_found(self, &pba, pcibusprint, CFARG_EOL); + config_found(self, &pba, pcibusprint, CFARGS_NONE); #endif } Index: src/sys/arch/hpcmips/vr/vrpiu.c diff -u src/sys/arch/hpcmips/vr/vrpiu.c:1.43 src/sys/arch/hpcmips/vr/vrpiu.c:1.43.8.1 --- src/sys/arch/hpcmips/vr/vrpiu.c:1.43 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/vr/vrpiu.c Wed Aug 4 01:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: vrpiu.c,v 1.43 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: vrpiu.c,v 1.43.8.1 2021/08/04 01:08:48 thorpej Exp $ */ /* * Copyright (c) 1999-2003 TAKEMURA Shin All rights reserved. @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vrpiu.c,v 1.43 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vrpiu.c,v 1.43.8.1 2021/08/04 01:08:48 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -328,7 +328,7 @@ vrpiu_init(struct vrpiu_softc *sc, void * attach the wsmouse */ sc->sc_wsmousedev = config_found(sc->sc_dev, &wsmaa, wsmousedevprint, - CFARG_EOL); + CFARGS_NONE); /* * power management events Index: src/sys/arch/hpcsh/dev/j6x0tp.c diff -u src/sys/arch/hpcsh/dev/j6x0tp.c:1.24 src/sys/arch/hpcsh/dev/j6x0tp.c:1.24.8.1 --- src/sys/arch/hpcsh/dev/j6x0tp.c:1.24 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcsh/dev/j6x0tp.c Wed Aug 4 01:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: j6x0tp.c,v 1.24 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: j6x0tp.c,v 1.24.8.1 2021/08/04 01:08:48 thorpej Exp $ */ /* * Copyright (c) 2003 Valeriy E. Ushakov @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: j6x0tp.c,v 1.24 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: j6x0tp.c,v 1.24.8.1 2021/08/04 01:08:48 thorpej Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -254,8 +254,7 @@ j6x0tp_attach(device_t parent, device_t wsma.accesscookie = sc; sc->sc_wsmousedev = config_found(self, &wsma, wsmousedevprint, - CFARG_IATTR, "wsmousedev", - CFARG_EOL); + CFARGS(.iattr = "wsmousedev")); if (sc->sc_wsmousedev == NULL) return; @@ -266,8 +265,7 @@ j6x0tp_attach(device_t parent, device_t wska.accesscookie = sc; sc->sc_wskbddev = config_found(self, &wska, wskbddevprint, - CFARG_IATTR, "wskbddev", - CFARG_EOL); + CFARGS(.iattr = "wskbddev")); /* init calibration, set default parameters */ tpcalib_init(&sc->sc_tpcalib); Index: src/sys/arch/hpcsh/dev/pfckbd.c diff -u src/sys/arch/hpcsh/dev/pfckbd.c:1.31 src/sys/arch/hpcsh/dev/pfckbd.c:1.31.8.1 --- src/sys/arch/hpcsh/dev/pfckbd.c:1.31 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcsh/dev/pfckbd.c Wed Aug 4 01:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pfckbd.c,v 1.31 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: pfckbd.c,v 1.31.8.1 2021/08/04 01:08:48 thorpej Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ * currently, HP Jornada 680/690, HITACHI PERSONA HPW-50PAD only. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pfckbd.c,v 1.31 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pfckbd.c,v 1.31.8.1 2021/08/04 01:08:48 thorpej Exp $"); #include "debug_hpcsh.h" @@ -141,7 +141,7 @@ pfckbd_attach(device_t parent, device_t /* attach hpckbd */ haa.haa_ic = &pfckbd_core.pc_if; /* tell hpckbd our interface */ - config_found(self, &haa, hpckbd_print, CFARG_EOL); + config_found(self, &haa, hpckbd_print, CFARGS_NONE); /* install callout handler */ if (pfckbd_core.pc_callout != NULL) { Index: src/sys/arch/hpcsh/dev/psh3tp.c diff -u src/sys/arch/hpcsh/dev/psh3tp.c:1.16 src/sys/arch/hpcsh/dev/psh3tp.c:1.16.8.1 --- src/sys/arch/hpcsh/dev/psh3tp.c:1.16 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcsh/dev/psh3tp.c Wed Aug 4 01:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: psh3tp.c,v 1.16 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: psh3tp.c,v 1.16.8.1 2021/08/04 01:08:48 thorpej Exp $ */ /* * Copyright (c) 2005 KIYOHARA Takashi * All rights reserved. @@ -182,7 +182,7 @@ psh3tp_attach(device_t parent __unused, wsma.accesscookie = sc; sc->sc_wsmousedev = config_found( - self, &wsma, wsmousedevprint, CFARG_EOL); + self, &wsma, wsmousedevprint, CFARGS_NONE); if (sc->sc_wsmousedev == NULL) return; Index: src/sys/arch/hpcsh/dev/hd64461/hd64461.c diff -u src/sys/arch/hpcsh/dev/hd64461/hd64461.c:1.25 src/sys/arch/hpcsh/dev/hd64461/hd64461.c:1.25.8.1 --- src/sys/arch/hpcsh/dev/hd64461/hd64461.c:1.25 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcsh/dev/hd64461/hd64461.c Wed Aug 4 01:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: hd64461.c,v 1.25 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: hd64461.c,v 1.25.8.1 2021/08/04 01:08:48 thorpej Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hd64461.c,v 1.25 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hd64461.c,v 1.25.8.1 2021/08/04 01:08:48 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -126,7 +126,7 @@ hd64461_attach(device_t parent, device_t if (module->name == NULL) continue; ha.ha_module_id = i; - config_found(self, &ha, hd64461_print, CFARG_EOL); + config_found(self, &ha, hd64461_print, CFARGS_NONE); } /* XXX: TODO */ Index: src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c diff -u src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c:1.53 src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c:1.53.8.1 --- src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c:1.53 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c Wed Aug 4 01:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: hd64461pcmcia.c,v 1.53 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: hd64461pcmcia.c,v 1.53.8.1 2021/08/04 01:08:48 thorpej Exp $ */ /*- * Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hd64461pcmcia.c,v 1.53 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hd64461pcmcia.c,v 1.53.8.1 2021/08/04 01:08:48 thorpej Exp $"); #include "opt_hd64461pcmcia.h" @@ -420,8 +420,7 @@ hd64461pcmcia_attach_channel(struct hd64 paa.pch = (pcmcia_chipset_handle_t)ch; ch->ch_pcmcia = config_found(parent, &paa, hd64461pcmcia_print, - CFARG_SUBMATCH, hd64461pcmcia_submatch, - CFARG_EOL); + CFARGS(.submatch = hd64461pcmcia_submatch)); if (ch->ch_pcmcia && (detect_card(ch->ch_channel) == EVENT_INSERT)) { ch->ch_attached = 1; Index: src/sys/arch/hpcsh/dev/hd64461/hd64461video.c diff -u src/sys/arch/hpcsh/dev/hd64461/hd64461video.c:1.54 src/sys/arch/hpcsh/dev/hd64461/hd64461video.c:1.54.8.1 --- src/sys/arch/hpcsh/dev/hd64461/hd64461video.c:1.54 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcsh/dev/hd64461/hd64461video.c Wed Aug 4 01:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: hd64461video.c,v 1.54 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: hd64461video.c,v 1.54.8.1 2021/08/04 01:08:48 thorpej Exp $ */ /*- * Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hd64461video.c,v 1.54 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hd64461video.c,v 1.54.8.1 2021/08/04 01:08:48 thorpej Exp $"); #include "opt_hd64461video.h" // #define HD64461VIDEO_HWACCEL @@ -270,7 +270,7 @@ hd64461video_attach(device_t parent, dev hfa.ha_ndspconf = 1; hfa.ha_dspconflist = &hd64461video_chip.hd; - config_found(self, &hfa, hpcfbprint, CFARG_EOL); + config_found(self, &hfa, hpcfbprint, CFARGS_NONE); /* * XXX: TODO: for now this device manages power using Index: src/sys/arch/hpcsh/dev/hd64465/hd64465.c diff -u src/sys/arch/hpcsh/dev/hd64465/hd64465.c:1.18 src/sys/arch/hpcsh/dev/hd64465/hd64465.c:1.18.8.1 --- src/sys/arch/hpcsh/dev/hd64465/hd64465.c:1.18 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcsh/dev/hd64465/hd64465.c Wed Aug 4 01:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: hd64465.c,v 1.18 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: hd64465.c,v 1.18.8.1 2021/08/04 01:08:48 thorpej Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hd64465.c,v 1.18 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hd64465.c,v 1.18.8.1 2021/08/04 01:08:48 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -120,7 +120,7 @@ hd64465_attach(device_t parent, device_t if (module->name == 0) continue; ha.ha_module_id = i; - config_found(self, &ha, hd64465_print, CFARG_EOL); + config_found(self, &ha, hd64465_print, CFARGS_NONE); } } Index: src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c diff -u src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c:1.34 src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c:1.34.8.1 --- src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c:1.34 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c Wed Aug 4 01:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: hd64465pcmcia.c,v 1.34 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: hd64465pcmcia.c,v 1.34.8.1 2021/08/04 01:08:48 thorpej Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hd64465pcmcia.c,v 1.34 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hd64465pcmcia.c,v 1.34.8.1 2021/08/04 01:08:48 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -364,8 +364,7 @@ hd64465pcmcia_attach_channel(struct hd64 paa.pch = (pcmcia_chipset_handle_t)ch; ch->ch_pcmcia = config_found(parent, &paa, hd64465pcmcia_print, - CFARG_SUBMATCH, hd64465pcmcia_submatch, - CFARG_EOL); + CFARGS(.submatch = hd64465pcmcia_submatch)); if (ch->ch_pcmcia && (__detect_card(ch->ch_channel) == EVENT_INSERT)) { ch->ch_attached = 1; Index: src/sys/arch/hpcsh/hpcsh/mainbus.c diff -u src/sys/arch/hpcsh/hpcsh/mainbus.c:1.21 src/sys/arch/hpcsh/hpcsh/mainbus.c:1.21.8.1 --- src/sys/arch/hpcsh/hpcsh/mainbus.c:1.21 Sat Apr 24 23:36:39 2021 +++ src/sys/arch/hpcsh/hpcsh/mainbus.c Wed Aug 4 01:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.21 2021/04/24 23:36:39 thorpej Exp $ */ +/* $NetBSD: mainbus.c,v 1.21.8.1 2021/08/04 01:08:48 thorpej Exp $ */ /*- * Copyright (c) 2001, 2004 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21 2021/04/24 23:36:39 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21.8.1 2021/08/04 01:08:48 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -64,19 +64,16 @@ mainbus_attach(device_t parent, device_t /* CPU */ config_found(self, &(struct mainbus_attach_args){.ma_name = "cpu"}, mainbus_print, - CFARG_IATTR, "mainbus", - CFARG_EOL); + CFARGS(.iattr = "mainbus")); /* Devices */ config_search(self, NULL, - CFARG_SEARCH, mainbus_search, - CFARG_IATTR, "mainbus", - CFARG_EOL); + CFARGS(.search = mainbus_search, + .iattr = "mainbus")); /* APM */ config_found(self, NULL, mainbus_print, - CFARG_IATTR, "hpcapmif", - CFARG_EOL); + CFARGS(.iattr = "hpcapmif")); if (!pmf_device_register(self, NULL, NULL)) aprint_error_dev(self, "unable to establish power handler\n"); @@ -98,7 +95,7 @@ mainbus_search(device_t parent, cfdata_t maa.ma_name = cf->cf_name; if (config_probe(parent, cf, &maa)) - config_attach(parent, cf, &maa, mainbus_print, CFARG_EOL); + config_attach(parent, cf, &maa, mainbus_print, CFARGS_NONE); return (0); }