Module Name: src Committed By: thorpej Date: Wed Aug 4 01:21:27 UTC 2021
Modified Files: src/sys/arch/i386/i386 [thorpej-cfargs2]: i386_mainbus.c src/sys/arch/i386/isa [thorpej-cfargs2]: lms.c mms.c src/sys/arch/i386/pci [thorpej-cfargs2]: elan520.c gcscehci.c geode.c gscpcib.c pceb.c pcmb.c viapcib.c src/sys/arch/i386/pnpbios [thorpej-cfargs2]: pnpbios.c wss_pnpbios.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/i386/i386/i386_mainbus.c cvs rdiff -u -r1.57 -r1.57.8.1 src/sys/arch/i386/isa/lms.c cvs rdiff -u -r1.54 -r1.54.8.1 src/sys/arch/i386/isa/mms.c cvs rdiff -u -r1.51 -r1.51.8.1 src/sys/arch/i386/pci/elan520.c cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/i386/pci/gcscehci.c cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/i386/pci/geode.c cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/i386/pci/gscpcib.c cvs rdiff -u -r1.25 -r1.25.8.1 src/sys/arch/i386/pci/pceb.c cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/i386/pci/pcmb.c cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/i386/pci/viapcib.c cvs rdiff -u -r1.76 -r1.76.8.1 src/sys/arch/i386/pnpbios/pnpbios.c cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/i386/pnpbios/wss_pnpbios.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/i386/i386/i386_mainbus.c diff -u src/sys/arch/i386/i386/i386_mainbus.c:1.5 src/sys/arch/i386/i386/i386_mainbus.c:1.5.8.1 --- src/sys/arch/i386/i386/i386_mainbus.c:1.5 Sat Apr 24 23:36:39 2021 +++ src/sys/arch/i386/i386/i386_mainbus.c Wed Aug 4 01:21:26 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: i386_mainbus.c,v 1.5 2021/04/24 23:36:39 thorpej Exp $ */ +/* $NetBSD: i386_mainbus.c,v 1.5.8.1 2021/08/04 01:21:26 thorpej Exp $ */ /* NetBSD: mainbus.c,v 1.104 2018/12/02 08:19:44 cherry Exp */ /* @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i386_mainbus.c,v 1.5 2021/04/24 23:36:39 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i386_mainbus.c,v 1.5.8.1 2021/08/04 01:21:26 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -230,8 +230,7 @@ i386_mainbus_attach(device_t parent, dev mba.mba_eba.eba_dmat = &eisa_bus_dma_tag; #endif config_found(self, &mba.mba_eba, eisabusprint, - CFARG_IATTR, "eisabus", - CFARG_EOL); + CFARGS(.iattr = "eisabus")); } #if NISA > 0 @@ -240,8 +239,7 @@ i386_mainbus_attach(device_t parent, dev mba.mba_iba.iba_iot = x86_bus_space_io; mba.mba_iba.iba_memt = x86_bus_space_mem; config_found(self, &mba.mba_iba, isabusprint, - CFARG_IATTR, "isabus", - CFARG_EOL); + CFARGS(.iattr = "isabus")); } #endif @@ -272,8 +270,7 @@ i386_mainbus_rescan(device_t self, const mba.mba_acpi.aa_dmat = &pci_bus_dma_tag; mba.mba_acpi.aa_dmat64 = NULL; sc->sc_acpi = config_found(self, &mba.mba_acpi, NULL, - CFARG_IATTR, "acpibus", - CFARG_EOL); + CFARGS(.iattr = "acpibus")); #if 0 /* XXXJRT not yet */ if (acpi_active) { /* @@ -294,8 +291,7 @@ i386_mainbus_rescan(device_t self, const if (pnpbios_probe()) { mba.mba_paa.paa_ic = &x86_isa_chipset; sc->sc_pnpbios = config_found(self, &mba.mba_paa, NULL, - CFARG_IATTR, "pnpbiosbus", - CFARG_EOL); + CFARGS(.iattr = "pnpbiosbus")); } #endif } @@ -307,8 +303,7 @@ i386_mainbus_rescan(device_t self, const mba.mba_ipmi.iaa_memt = x86_bus_space_mem; if (ipmi_probe(&mba.mba_ipmi)) { sc->sc_ipmi = config_found(self, &mba.mba_ipmi, NULL, - CFARG_IATTR, "ipmibus", - CFARG_EOL); + CFARGS(.iattr = "ipmibus")); } #endif } @@ -352,8 +347,7 @@ i386_mainbus_rescan(device_t self, const if (npcibus == 0 && sc->sc_pci == NULL) { sc->sc_pci = config_found(self, &mba.mba_pba, pcibusprint, - CFARG_IATTR, "pcibus", - CFARG_EOL); + CFARGS(.iattr = "pcibus")); } #if NACPICA > 0 if (mp_verbose) @@ -374,8 +368,7 @@ i386_mainbus_rescan(device_t self, const mba.mba_mba.mba_bus = 0; sc->sc_mca = config_found(self, &mba.mba_mba, mcabusprint, - CFARG_IATTR, "mcabus", - CFARG_EOL); + CFARGS(.iattr = "mcabus")); } #endif } Index: src/sys/arch/i386/isa/lms.c diff -u src/sys/arch/i386/isa/lms.c:1.57 src/sys/arch/i386/isa/lms.c:1.57.8.1 --- src/sys/arch/i386/isa/lms.c:1.57 Sat Apr 24 23:36:39 2021 +++ src/sys/arch/i386/isa/lms.c Wed Aug 4 01:21:27 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: lms.c,v 1.57 2021/04/24 23:36:39 thorpej Exp $ */ +/* $NetBSD: lms.c,v 1.57.8.1 2021/08/04 01:21:27 thorpej Exp $ */ /*- * Copyright (c) 1993, 1994 Charles M. Hannum. @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lms.c,v 1.57 2021/04/24 23:36:39 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lms.c,v 1.57.8.1 2021/08/04 01:21:27 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -166,7 +166,7 @@ lmsattach(device_t parent, device_t self * here or in psmintr, because if this fails lms_enable() will * never be called, so lmsintr() will never be called. */ - sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL); + sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARGS_NONE); } static int Index: src/sys/arch/i386/isa/mms.c diff -u src/sys/arch/i386/isa/mms.c:1.54 src/sys/arch/i386/isa/mms.c:1.54.8.1 --- src/sys/arch/i386/isa/mms.c:1.54 Sat Apr 24 23:36:39 2021 +++ src/sys/arch/i386/isa/mms.c Wed Aug 4 01:21:27 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mms.c,v 1.54 2021/04/24 23:36:39 thorpej Exp $ */ +/* $NetBSD: mms.c,v 1.54.8.1 2021/08/04 01:21:27 thorpej Exp $ */ /*- * Copyright (c) 1993, 1994 Charles M. Hannum. @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mms.c,v 1.54 2021/04/24 23:36:39 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mms.c,v 1.54.8.1 2021/08/04 01:21:27 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -157,7 +157,7 @@ mmsattach(device_t parent, device_t self * here or in psmintr, because if this fails lms_enable() will * never be called, so lmsintr() will never be called. */ - sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL); + sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARGS_NONE); } static int Index: src/sys/arch/i386/pci/elan520.c diff -u src/sys/arch/i386/pci/elan520.c:1.51 src/sys/arch/i386/pci/elan520.c:1.51.8.1 --- src/sys/arch/i386/pci/elan520.c:1.51 Sat Apr 24 23:36:39 2021 +++ src/sys/arch/i386/pci/elan520.c Wed Aug 4 01:21:27 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: elan520.c,v 1.51 2021/04/24 23:36:39 thorpej Exp $ */ +/* $NetBSD: elan520.c,v 1.51.8.1 2021/08/04 01:21:27 thorpej Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.51 2021/04/24 23:36:39 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.51.8.1 2021/08/04 01:21:27 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1435,14 +1435,12 @@ elansc_rescan(device_t self, const char if (ifattr_match(ifattr, "elanparbus") && sc->sc_par == NULL) { sc->sc_par = config_found(sc->sc_dev, NULL, NULL, - CFARG_IATTR, "elanparbus", - CFARG_EOL); + CFARGS(.iattr = "elanparbus")); } if (ifattr_match(ifattr, "elanpexbus") && sc->sc_pex == NULL) { sc->sc_pex = config_found(sc->sc_dev, NULL, NULL, - CFARG_IATTR, "elanpexbus", - CFARG_EOL); + CFARGS(.iattr = "elanpexbus")); } if (ifattr_match(ifattr, "gpiobus") && sc->sc_gpio == NULL) { @@ -1455,8 +1453,7 @@ elansc_rescan(device_t self, const char gba.gba_pins = sc->sc_gpio_pins; gba.gba_npins = ELANSC_PIO_NPINS; sc->sc_gpio = config_found(sc->sc_dev, &gba, gpiobus_print, - CFARG_IATTR, "gpiobus", - CFARG_EOL); + CFARGS(.iattr = "gpiobus")); #endif } @@ -1473,8 +1470,7 @@ elansc_rescan(device_t self, const char pba.pba_bus = 0; pba.pba_bridgetag = NULL; sc->sc_pci = config_found(self, &pba, pcibusprint, - CFARG_IATTR, "pcibus", - CFARG_EOL); + CFARGS(.iattr = "pcibus")); } return 0; Index: src/sys/arch/i386/pci/gcscehci.c diff -u src/sys/arch/i386/pci/gcscehci.c:1.14 src/sys/arch/i386/pci/gcscehci.c:1.14.8.1 --- src/sys/arch/i386/pci/gcscehci.c:1.14 Sat Apr 24 23:36:39 2021 +++ src/sys/arch/i386/pci/gcscehci.c Wed Aug 4 01:21:27 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: gcscehci.c,v 1.14 2021/04/24 23:36:39 thorpej Exp $ */ +/* $NetBSD: gcscehci.c,v 1.14.8.1 2021/08/04 01:21:27 thorpej Exp $ */ /* * Copyright (c) 2001, 2002, 2007 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gcscehci.c,v 1.14 2021/04/24 23:36:39 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gcscehci.c,v 1.14.8.1 2021/08/04 01:21:27 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -172,7 +172,7 @@ gcscehci_attach(device_t parent, device_ /* Attach usb device. */ sc->sc.sc_child = config_found(self, &sc->sc.sc_bus, usbctlprint, - CFARG_EOL); + CFARGS_NONE); } CFATTACH_DECL_NEW(gcscehci, sizeof(struct gcscehci_softc), Index: src/sys/arch/i386/pci/geode.c diff -u src/sys/arch/i386/pci/geode.c:1.16 src/sys/arch/i386/pci/geode.c:1.16.8.1 --- src/sys/arch/i386/pci/geode.c:1.16 Sat Apr 24 23:36:39 2021 +++ src/sys/arch/i386/pci/geode.c Wed Aug 4 01:21:27 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: geode.c,v 1.16 2021/04/24 23:36:39 thorpej Exp $ */ +/* $NetBSD: geode.c,v 1.16.8.1 2021/08/04 01:21:27 thorpej Exp $ */ /*- * Copyright (c) 2005 David Young. All rights reserved. @@ -64,7 +64,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: geode.c,v 1.16 2021/04/24 23:36:39 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: geode.c,v 1.16.8.1 2021/08/04 01:21:27 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -120,7 +120,7 @@ geode_gcb_attach(device_t parent, device aprint_naive("\n"); aprint_normal(": AMD Geode GCB (rev. 0x%02x)\n", rev); - while (config_found(self, NULL, NULL, CFARG_EOL) != NULL) + while (config_found(self, NULL, NULL, CFARGS_NONE) != NULL) /* empty */; } static int Index: src/sys/arch/i386/pci/gscpcib.c diff -u src/sys/arch/i386/pci/gscpcib.c:1.19 src/sys/arch/i386/pci/gscpcib.c:1.19.8.1 --- src/sys/arch/i386/pci/gscpcib.c:1.19 Sat Apr 24 23:36:39 2021 +++ src/sys/arch/i386/pci/gscpcib.c Wed Aug 4 01:21:27 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: gscpcib.c,v 1.19 2021/04/24 23:36:39 thorpej Exp $ */ +/* $NetBSD: gscpcib.c,v 1.19.8.1 2021/08/04 01:21:27 thorpej Exp $ */ /* $OpenBSD: gscpcib.c,v 1.3 2004/10/05 19:02:33 grange Exp $ */ /* * Copyright (c) 2004 Alexander Yurchenko <gra...@openbsd.org> @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gscpcib.c,v 1.19 2021/04/24 23:36:39 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gscpcib.c,v 1.19.8.1 2021/08/04 01:21:27 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -100,8 +100,7 @@ gscpcib_rescan(device_t self, const char gba.gba_npins = GSCGPIO_NPINS; sc->sc_gpiobus = config_found(self, &gba, gpiobus_print, - CFARG_IATTR, "gpiobus", - CFARG_EOL); + CFARGS(.iattr = "gpiobus")); return 0; } #endif Index: src/sys/arch/i386/pci/pceb.c diff -u src/sys/arch/i386/pci/pceb.c:1.25 src/sys/arch/i386/pci/pceb.c:1.25.8.1 --- src/sys/arch/i386/pci/pceb.c:1.25 Sat Apr 24 23:36:39 2021 +++ src/sys/arch/i386/pci/pceb.c Wed Aug 4 01:21:27 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pceb.c,v 1.25 2021/04/24 23:36:39 thorpej Exp $ */ +/* $NetBSD: pceb.c,v 1.25.8.1 2021/08/04 01:21:27 thorpej Exp $ */ /*- * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pceb.c,v 1.25 2021/04/24 23:36:39 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pceb.c,v 1.25.8.1 2021/08/04 01:21:27 thorpej Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -127,8 +127,7 @@ pceb_callback(device_t self) ea.ea_eba.eba_dmat = &eisa_bus_dma_tag; #endif config_found(self, &ea.ea_eba, eisabusprint, - CFARG_IATTR, "eisabus", - CFARG_EOL); + CFARGS(.iattr = "eisabus")); /* * Attach the ISA bus behind this bridge. @@ -140,6 +139,5 @@ pceb_callback(device_t self) ea.ea_iba.iba_dmat = &isa_bus_dma_tag; #endif config_found(self, &ea.ea_iba, isabusprint, - CFARG_IATTR, "isabus", - CFARG_EOL); + CFARGS(.iattr = "isabus")); } Index: src/sys/arch/i386/pci/pcmb.c diff -u src/sys/arch/i386/pci/pcmb.c:1.21 src/sys/arch/i386/pci/pcmb.c:1.21.8.1 --- src/sys/arch/i386/pci/pcmb.c:1.21 Sat Apr 24 23:36:39 2021 +++ src/sys/arch/i386/pci/pcmb.c Wed Aug 4 01:21:27 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pcmb.c,v 1.21 2021/04/24 23:36:39 thorpej Exp $ */ +/* $NetBSD: pcmb.c,v 1.21.8.1 2021/08/04 01:21:27 thorpej Exp $ */ /*- * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pcmb.c,v 1.21 2021/04/24 23:36:39 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcmb.c,v 1.21.8.1 2021/08/04 01:21:27 thorpej Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -108,5 +108,5 @@ pcmb_callback(device_t self) #endif ma.mba_mc = NULL; ma.mba_bus = 0; - config_found(self, &ma, mcabusprint, CFARG_EOL); + config_found(self, &ma, mcabusprint, CFARGS_NONE); } Index: src/sys/arch/i386/pci/viapcib.c diff -u src/sys/arch/i386/pci/viapcib.c:1.18 src/sys/arch/i386/pci/viapcib.c:1.18.8.1 --- src/sys/arch/i386/pci/viapcib.c:1.18 Sat Apr 24 23:36:39 2021 +++ src/sys/arch/i386/pci/viapcib.c Wed Aug 4 01:21:27 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: viapcib.c,v 1.18 2021/04/24 23:36:39 thorpej Exp $ */ +/* $NetBSD: viapcib.c,v 1.18.8.1 2021/08/04 01:21:27 thorpej Exp $ */ /* $FreeBSD: src/sys/pci/viapm.c,v 1.10 2005/05/29 04:42:29 nyan Exp $ */ /*- @@ -55,7 +55,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: viapcib.c,v 1.18 2021/04/24 23:36:39 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: viapcib.c,v 1.18.8.1 2021/08/04 01:21:27 thorpej Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -215,8 +215,7 @@ core_pcib: iba.iba_tag->ic_exec = viapcib_exec; config_found(self, &iba, iicbus_print, - CFARG_IATTR, "i2cbus", - CFARG_EOL); + CFARGS(.iattr = "i2cbus")); } } Index: src/sys/arch/i386/pnpbios/pnpbios.c diff -u src/sys/arch/i386/pnpbios/pnpbios.c:1.76 src/sys/arch/i386/pnpbios/pnpbios.c:1.76.8.1 --- src/sys/arch/i386/pnpbios/pnpbios.c:1.76 Sat Apr 24 23:36:39 2021 +++ src/sys/arch/i386/pnpbios/pnpbios.c Wed Aug 4 01:21:27 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pnpbios.c,v 1.76 2021/04/24 23:36:39 thorpej Exp $ */ +/* $NetBSD: pnpbios.c,v 1.76.8.1 2021/08/04 01:21:27 thorpej Exp $ */ /* * Copyright (c) 2000 Jason R. Thorpe. All rights reserved. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pnpbios.c,v 1.76 2021/04/24 23:36:39 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pnpbios.c,v 1.76.8.1 2021/08/04 01:21:27 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -773,14 +773,12 @@ pnpbios_attachchild(struct pnpbios_softc if (matchonly) return (config_search(sc->sc_dev, aa, - CFARG_SUBMATCH, config_stdsubmatch, - CFARG_LOCATORS, locs, - CFARG_EOL) != NULL); + CFARGS(.submatch = config_stdsubmatch, + .locators = locs)) != NULL); else return (config_found(sc->sc_dev, aa, pnpbios_print, - CFARG_SUBMATCH, config_stdsubmatch, - CFARG_LOCATORS, locs, - CFARG_EOL) != NULL); + CFARGS(.submatch = config_stdsubmatch, + .locators = locs)) != NULL); } static int Index: src/sys/arch/i386/pnpbios/wss_pnpbios.c diff -u src/sys/arch/i386/pnpbios/wss_pnpbios.c:1.23 src/sys/arch/i386/pnpbios/wss_pnpbios.c:1.23.8.1 --- src/sys/arch/i386/pnpbios/wss_pnpbios.c:1.23 Sat Apr 24 23:36:39 2021 +++ src/sys/arch/i386/pnpbios/wss_pnpbios.c Wed Aug 4 01:21:27 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: wss_pnpbios.c,v 1.23 2021/04/24 23:36:39 thorpej Exp $ */ +/* $NetBSD: wss_pnpbios.c,v 1.23.8.1 2021/08/04 01:21:27 thorpej Exp $ */ /* * Copyright (c) 1999 * Matthias Drochner. All rights reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wss_pnpbios.c,v 1.23 2021/04/24 23:36:39 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wss_pnpbios.c,v 1.23.8.1 2021/08/04 01:21:27 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -168,6 +168,6 @@ wss_pnpbios_attach(device_t parent, devi arg.type = AUDIODEV_TYPE_OPL; arg.hwif = 0; arg.hdl = 0; - (void)config_found(self, &arg, audioprint, CFARG_EOL); + (void)config_found(self, &arg, audioprint, CFARGS_NONE); }