Module Name: src
Committed By: thorpej
Date: Wed Aug 4 02:44:16 UTC 2021
Modified Files:
src/sys/arch/mips/adm5120 [thorpej-cfargs2]: adm5120_extio.c
adm5120_obio.c
src/sys/arch/mips/adm5120/dev [thorpej-cfargs2]: admgpio.c admpci.c
ahci.c
src/sys/arch/mips/alchemy [thorpej-cfargs2]: aubus.c
src/sys/arch/mips/alchemy/dev [thorpej-cfargs2]: augpio.c aupci.c
aupcmcia.c aupsc.c ausmbus_psc.c auspi.c ohci_aubus.c
src/sys/arch/mips/atheros [thorpej-cfargs2]: arbus.c
src/sys/arch/mips/atheros/dev [thorpej-cfargs2]: argpio.c arpci.c
arspi.c ehci_arbus.c ohci_arbus.c
src/sys/arch/mips/cavium [thorpej-cfargs2]: mainbus.c octeon_bootbus.c
octeon_cpunode.c octeon_iobus.c
src/sys/arch/mips/cavium/dev [thorpej-cfargs2]: octeon_dwctwo.c
octeon_gmx.c octeon_mpi.c octeon_pip.c octeon_xhci.c
src/sys/arch/mips/ingenic [thorpej-cfargs2]: apbus.c ingenic_dwctwo.c
ingenic_ehci.c ingenic_ohci.c jziic.c
src/sys/arch/mips/ralink [thorpej-cfargs2]: ralink_ehci.c ralink_gpio.c
ralink_i2c.c ralink_mainbus.c ralink_ohci.c
src/sys/arch/mips/rmi [thorpej-cfargs2]: rmixl_cpucore.c
rmixl_cpunode.c rmixl_ehci.c rmixl_gpio.c rmixl_iobus.c
rmixl_mainbus.c rmixl_obio.c rmixl_ohci.c rmixl_pcie.c rmixl_pcix.c
rmixl_usbi.c
src/sys/arch/mips/sibyte/dev [thorpej-cfargs2]: sbgbus.c sbobio.c
sbscd.c sbsmbus.c
src/sys/arch/mips/sibyte/pci [thorpej-cfargs2]: sbbrz.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/mips/adm5120/adm5120_extio.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/mips/adm5120/adm5120_obio.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/mips/adm5120/dev/admgpio.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/mips/adm5120/dev/admpci.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/mips/adm5120/dev/ahci.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/mips/alchemy/aubus.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/mips/alchemy/dev/augpio.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/mips/alchemy/dev/aupci.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/mips/alchemy/dev/aupcmcia.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/mips/alchemy/dev/aupsc.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/mips/alchemy/dev/ausmbus_psc.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/mips/alchemy/dev/auspi.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/mips/alchemy/dev/ohci_aubus.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/mips/atheros/arbus.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/mips/atheros/dev/argpio.c \
src/sys/arch/mips/atheros/dev/ehci_arbus.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/mips/atheros/dev/arpci.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/mips/atheros/dev/arspi.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/mips/atheros/dev/ohci_arbus.c
cvs rdiff -u -r1.8 -r1.8.4.1 src/sys/arch/mips/cavium/mainbus.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/mips/cavium/octeon_bootbus.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/mips/cavium/octeon_cpunode.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/mips/cavium/octeon_iobus.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/mips/cavium/dev/octeon_dwctwo.c
cvs rdiff -u -r1.19 -r1.19.4.1 src/sys/arch/mips/cavium/dev/octeon_gmx.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/mips/cavium/dev/octeon_mpi.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/mips/cavium/dev/octeon_pip.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/mips/cavium/dev/octeon_xhci.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/mips/ingenic/apbus.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/mips/ingenic/ingenic_dwctwo.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/mips/ingenic/ingenic_ehci.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/mips/ingenic/ingenic_ohci.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/mips/ingenic/jziic.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/mips/ralink/ralink_ehci.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/mips/ralink/ralink_gpio.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/mips/ralink/ralink_i2c.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/mips/ralink/ralink_mainbus.c \
src/sys/arch/mips/ralink/ralink_ohci.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/mips/rmi/rmixl_cpucore.c \
src/sys/arch/mips/rmi/rmixl_iobus.c src/sys/arch/mips/rmi/rmixl_obio.c \
src/sys/arch/mips/rmi/rmixl_ohci.c src/sys/arch/mips/rmi/rmixl_usbi.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/mips/rmi/rmixl_cpunode.c \
src/sys/arch/mips/rmi/rmixl_gpio.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/mips/rmi/rmixl_ehci.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/mips/rmi/rmixl_mainbus.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/mips/rmi/rmixl_pcie.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/mips/rmi/rmixl_pcix.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/mips/sibyte/dev/sbgbus.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/mips/sibyte/dev/sbobio.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/mips/sibyte/dev/sbscd.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/mips/sibyte/dev/sbsmbus.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/mips/sibyte/pci/sbbrz.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/mips/adm5120/adm5120_extio.c
diff -u src/sys/arch/mips/adm5120/adm5120_extio.c:1.7 src/sys/arch/mips/adm5120/adm5120_extio.c:1.7.8.1
--- src/sys/arch/mips/adm5120/adm5120_extio.c:1.7 Sat Apr 24 23:36:41 2021
+++ src/sys/arch/mips/adm5120/adm5120_extio.c Wed Aug 4 02:44:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_extio.c,v 1.7 2021/04/24 23:36:41 thorpej Exp $ */
+/* $NetBSD: adm5120_extio.c,v 1.7.8.1 2021/08/04 02:44:14 thorpej Exp $ */
/*-
* Copyright (c) 2007 David Young. All rights reserved.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_extio.c,v 1.7 2021/04/24 23:36:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_extio.c,v 1.7.8.1 2021/08/04 02:44:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -367,9 +367,8 @@ extio_attach(device_t parent, device_t s
(ed->ed_cfio) ? &sc->sc_cfio : &admc->extio_space);
EXTIO_DPRINTF("%s: %d\n", __func__, __LINE__);
config_found(self, &ea, extio_print,
- CFARG_SUBMATCH, extio_submatch,
- CFARG_IATTR, "extio",
- CFARG_EOL);
+ CFARGS(.submatch = extio_submatch,
+ .iattr = "extio"));
}
EXTIO_DPRINTF("%s: %d\n", __func__, __LINE__);
extio_mpmc_dump(sc);
Index: src/sys/arch/mips/adm5120/adm5120_obio.c
diff -u src/sys/arch/mips/adm5120/adm5120_obio.c:1.5 src/sys/arch/mips/adm5120/adm5120_obio.c:1.5.8.1
--- src/sys/arch/mips/adm5120/adm5120_obio.c:1.5 Sat Apr 24 23:36:41 2021
+++ src/sys/arch/mips/adm5120/adm5120_obio.c Wed Aug 4 02:44:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_obio.c,v 1.5 2021/04/24 23:36:41 thorpej Exp $ */
+/* $NetBSD: adm5120_obio.c,v 1.5.8.1 2021/08/04 02:44:14 thorpej Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_obio.c,v 1.5 2021/04/24 23:36:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_obio.c,v 1.5.8.1 2021/08/04 02:44:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -159,9 +159,8 @@ obio_attach(device_t parent, device_t se
ma->ma_obiot);
OBIO_DPRINTF("%s: %d\n", __func__, __LINE__);
config_found(self, &oa, obio_print,
- CFARG_SUBMATCH, obio_submatch,
- CFARG_IATTR, "obio",
- CFARG_EOL);
+ CFARGS(.submatch = obio_submatch,
+ .iattr = "obio"));
}
OBIO_DPRINTF("%s: %d\n", __func__, __LINE__);
}
Index: src/sys/arch/mips/adm5120/dev/admgpio.c
diff -u src/sys/arch/mips/adm5120/dev/admgpio.c:1.5 src/sys/arch/mips/adm5120/dev/admgpio.c:1.5.8.1
--- src/sys/arch/mips/adm5120/dev/admgpio.c:1.5 Sat Apr 24 23:36:41 2021
+++ src/sys/arch/mips/adm5120/dev/admgpio.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: admgpio.c,v 1.5 2021/04/24 23:36:41 thorpej Exp $ */
+/* $NetBSD: admgpio.c,v 1.5.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*-
* Copyright (c) 2007 David Young. All rights reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: admgpio.c,v 1.5 2021/04/24 23:36:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: admgpio.c,v 1.5.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -138,6 +138,5 @@ admgpio_attach(struct mainbus_softc *sc)
/* Attach GPIO framework */
return config_found(sc->sc_dev, &gba, gpiobus_print,
- CFARG_IATTR, "gpiobus",
- CFARG_EOL);
+ CFARGS(.iattr = "gpiobus"));
}
Index: src/sys/arch/mips/adm5120/dev/admpci.c
diff -u src/sys/arch/mips/adm5120/dev/admpci.c:1.15 src/sys/arch/mips/adm5120/dev/admpci.c:1.15.8.1
--- src/sys/arch/mips/adm5120/dev/admpci.c:1.15 Sat Apr 24 23:36:41 2021
+++ src/sys/arch/mips/adm5120/dev/admpci.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: admpci.c,v 1.15 2021/04/24 23:36:41 thorpej Exp $ */
+/* $NetBSD: admpci.c,v 1.15.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*-
* Copyright (c) 2007 David Young. All rights reserved.
@@ -61,7 +61,7 @@
#include "pci.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1.15 2021/04/24 23:36:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1.15.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -259,8 +259,7 @@ admpciattach(device_t parent, device_t s
pba.pba_bridgetag = NULL;
config_found(self, &pba, pcibusprint,
- CFARG_IATTR, "pcibus",
- CFARG_EOL);
+ CFARGS(.iattr = "pcibus"));
#endif /* NPCI > 0 */
}
Index: src/sys/arch/mips/adm5120/dev/ahci.c
diff -u src/sys/arch/mips/adm5120/dev/ahci.c:1.24 src/sys/arch/mips/adm5120/dev/ahci.c:1.24.8.1
--- src/sys/arch/mips/adm5120/dev/ahci.c:1.24 Sat Apr 24 23:36:41 2021
+++ src/sys/arch/mips/adm5120/dev/ahci.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ahci.c,v 1.24 2021/04/24 23:36:41 thorpej Exp $ */
+/* $NetBSD: ahci.c,v 1.24.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.24 2021/04/24 23:36:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.24.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -310,7 +310,7 @@ ahci_attach(device_t parent, device_t se
#endif
/* Attach USB devices */
- sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARG_EOL);
+ sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARGS_NONE);
}
Index: src/sys/arch/mips/alchemy/aubus.c
diff -u src/sys/arch/mips/alchemy/aubus.c:1.24 src/sys/arch/mips/alchemy/aubus.c:1.24.8.1
--- src/sys/arch/mips/alchemy/aubus.c:1.24 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/alchemy/aubus.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: aubus.c,v 1.24 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: aubus.c,v 1.24.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aubus.c,v 1.24 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aubus.c,v 1.24.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include "locators.h"
#define _MIPS_BUS_DMA_PRIVATE
@@ -170,9 +170,8 @@ aubus_attach(device_t parent, device_t s
locs[AUBUSCF_ADDR] = ad->addr[0];
config_found(self, &aa, aubus_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
}
Index: src/sys/arch/mips/alchemy/dev/augpio.c
diff -u src/sys/arch/mips/alchemy/dev/augpio.c:1.9 src/sys/arch/mips/alchemy/dev/augpio.c:1.9.8.1
--- src/sys/arch/mips/alchemy/dev/augpio.c:1.9 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/alchemy/dev/augpio.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: augpio.c,v 1.9 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: augpio.c,v 1.9.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: augpio.c,v 1.9 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: augpio.c,v 1.9.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -148,7 +148,7 @@ augpio_attach(device_t parent, device_t
aprint_normal(": Alchemy GPIO, %s\n", sc->sc_name);
aprint_naive("\n");
- config_found(self, &gba, gpiobus_print, CFARG_EOL);
+ config_found(self, &gba, gpiobus_print, CFARGS_NONE);
}
int
Index: src/sys/arch/mips/alchemy/dev/aupci.c
diff -u src/sys/arch/mips/alchemy/dev/aupci.c:1.19 src/sys/arch/mips/alchemy/dev/aupci.c:1.19.8.1
--- src/sys/arch/mips/alchemy/dev/aupci.c:1.19 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/alchemy/dev/aupci.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: aupci.c,v 1.19 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: aupci.c,v 1.19.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -35,7 +35,7 @@
#include "pci.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aupci.c,v 1.19 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aupci.c,v 1.19.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -281,7 +281,7 @@ aupciattach(device_t parent, device_t se
pba.pba_bus = 0;
pba.pba_bridgetag = NULL;
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
#endif /* NPCI > 0 */
}
Index: src/sys/arch/mips/alchemy/dev/aupcmcia.c
diff -u src/sys/arch/mips/alchemy/dev/aupcmcia.c:1.11 src/sys/arch/mips/alchemy/dev/aupcmcia.c:1.11.8.1
--- src/sys/arch/mips/alchemy/dev/aupcmcia.c:1.11 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/alchemy/dev/aupcmcia.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: aupcmcia.c,v 1.11 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: aupcmcia.c,v 1.11.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -35,7 +35,7 @@
/* #include "pci.h" */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aupcmcia.c,v 1.11 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aupcmcia.c,v 1.11.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -271,7 +271,7 @@ aupcm_attach(device_t parent, device_t s
paa.pch = (pcmcia_chipset_handle_t)sp;
sp->as_pcmcia = config_found(self, &paa, aupcm_print,
- CFARG_EOL);
+ CFARGS_NONE);
/* if no pcmcia, make sure slot is powered down */
if (sp->as_pcmcia == NULL) {
Index: src/sys/arch/mips/alchemy/dev/aupsc.c
diff -u src/sys/arch/mips/alchemy/dev/aupsc.c:1.8 src/sys/arch/mips/alchemy/dev/aupsc.c:1.8.8.1
--- src/sys/arch/mips/alchemy/dev/aupsc.c:1.8 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/alchemy/dev/aupsc.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: aupsc.c,v 1.8 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: aupsc.c,v 1.8.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*-
* Copyright (c) 2006 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aupsc.c,v 1.8 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aupsc.c,v 1.8.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include "locators.h"
@@ -149,8 +149,7 @@ aupsc_attach(device_t parent, device_t s
if (s & AUPSC_STAT_SR) {
config_found(self, &pa, aupsc_print,
- CFARG_SUBMATCH, aupsc_submatch,
- CFARG_EOL);
+ CFARGS(.submatch = aupsc_submatch));
}
}
}
Index: src/sys/arch/mips/alchemy/dev/ausmbus_psc.c
diff -u src/sys/arch/mips/alchemy/dev/ausmbus_psc.c:1.14 src/sys/arch/mips/alchemy/dev/ausmbus_psc.c:1.14.8.1
--- src/sys/arch/mips/alchemy/dev/ausmbus_psc.c:1.14 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/alchemy/dev/ausmbus_psc.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ausmbus_psc.c,v 1.14 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: ausmbus_psc.c,v 1.14.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*-
* Copyright (c) 2006 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ausmbus_psc.c,v 1.14 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ausmbus_psc.c,v 1.14.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include "locators.h"
@@ -135,7 +135,7 @@ ausmbus_attach(device_t parent, device_t
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &sc->sc_i2c;
- config_found(self, &iba, iicbus_print, CFARG_EOL);
+ config_found(self, &iba, iicbus_print, CFARGS_NONE);
}
static int
Index: src/sys/arch/mips/alchemy/dev/auspi.c
diff -u src/sys/arch/mips/alchemy/dev/auspi.c:1.10 src/sys/arch/mips/alchemy/dev/auspi.c:1.10.8.1
--- src/sys/arch/mips/alchemy/dev/auspi.c:1.10 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/alchemy/dev/auspi.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: auspi.c,v 1.10 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: auspi.c,v 1.10.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auspi.c,v 1.10 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auspi.c,v 1.10.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include "locators.h"
@@ -163,7 +163,7 @@ auspi_attach(device_t parent, device_t s
sc->sc_ih = au_intr_establish(aa->aupsc_irq, 0, IPL_BIO, IST_LEVEL,
auspi_intr, sc);
- config_found(self, &sba, spibus_print, CFARG_EOL);
+ config_found(self, &sba, spibus_print, CFARGS_NONE);
}
int
Index: src/sys/arch/mips/alchemy/dev/ohci_aubus.c
diff -u src/sys/arch/mips/alchemy/dev/ohci_aubus.c:1.17 src/sys/arch/mips/alchemy/dev/ohci_aubus.c:1.17.8.1
--- src/sys/arch/mips/alchemy/dev/ohci_aubus.c:1.17 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/alchemy/dev/ohci_aubus.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_aubus.c,v 1.17 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: ohci_aubus.c,v 1.17.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_aubus.c,v 1.17 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_aubus.c,v 1.17.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -152,6 +152,6 @@ ohci_aubus_attach(device_t parent, devic
}
/* Attach USB device */
- sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARG_EOL);
+ sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARGS_NONE);
}
Index: src/sys/arch/mips/atheros/arbus.c
diff -u src/sys/arch/mips/atheros/arbus.c:1.16 src/sys/arch/mips/atheros/arbus.c:1.16.8.1
--- src/sys/arch/mips/atheros/arbus.c:1.16 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/atheros/arbus.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $Id: arbus.c,v 1.16 2021/04/24 23:36:42 thorpej Exp $ */
+/* $Id: arbus.c,v 1.16.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
* Copyright (c) 2006 Garrett D'Amore.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arbus.c,v 1.16 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arbus.c,v 1.16.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include "locators.h"
#define _MIPS_BUS_DMA_PRIVATE
@@ -148,9 +148,8 @@ arbus_attach(device_t parent, device_t s
}
config_found(self, &aa, arbus_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
}
Index: src/sys/arch/mips/atheros/dev/argpio.c
diff -u src/sys/arch/mips/atheros/dev/argpio.c:1.9 src/sys/arch/mips/atheros/dev/argpio.c:1.9.8.1
--- src/sys/arch/mips/atheros/dev/argpio.c:1.9 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/atheros/dev/argpio.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: argpio.c,v 1.9 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: argpio.c,v 1.9.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*-
* Copyright (c) 2006 Garrett D'Amore
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: argpio.c,v 1.9 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: argpio.c,v 1.9.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -205,7 +205,7 @@ argpio_attach(device_t parent, device_t
gba.gba_gc = &sc->sc_gc;
gba.gba_pins = sc->sc_pins;
gba.gba_npins = sc->sc_npins;
- config_found(sc->sc_dev, &gba, gpiobus_print, CFARG_EOL);
+ config_found(sc->sc_dev, &gba, gpiobus_print, CFARGS_NONE);
}
void
Index: src/sys/arch/mips/atheros/dev/ehci_arbus.c
diff -u src/sys/arch/mips/atheros/dev/ehci_arbus.c:1.9 src/sys/arch/mips/atheros/dev/ehci_arbus.c:1.9.8.1
--- src/sys/arch/mips/atheros/dev/ehci_arbus.c:1.9 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/atheros/dev/ehci_arbus.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_arbus.c,v 1.9 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: ehci_arbus.c,v 1.9.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_arbus.c,v 1.9 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_arbus.c,v 1.9.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include "locators.h"
@@ -146,7 +146,7 @@ ehci_arbus_attach(device_t parent, devic
}
/* Attach USB device */
- sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARG_EOL);
+ sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARGS_NONE);
}
static void
Index: src/sys/arch/mips/atheros/dev/arpci.c
diff -u src/sys/arch/mips/atheros/dev/arpci.c:1.6 src/sys/arch/mips/atheros/dev/arpci.c:1.6.8.1
--- src/sys/arch/mips/atheros/dev/arpci.c:1.6 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/atheros/dev/arpci.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: arpci.c,v 1.6 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: arpci.c,v 1.6.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arpci.c,v 1.6 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arpci.c,v 1.6.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -321,7 +321,7 @@ arpci_attach(device_t parent, device_t s
pba.pba_pc = &sc->sc_pc;
pba.pba_bus = 0;
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
}
CFATTACH_DECL_NEW(arpci, sizeof(struct arpci_softc),
Index: src/sys/arch/mips/atheros/dev/arspi.c
diff -u src/sys/arch/mips/atheros/dev/arspi.c:1.14 src/sys/arch/mips/atheros/dev/arspi.c:1.14.8.1
--- src/sys/arch/mips/atheros/dev/arspi.c:1.14 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/atheros/dev/arspi.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: arspi.c,v 1.14 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: arspi.c,v 1.14.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arspi.c,v 1.14 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arspi.c,v 1.14.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include "locators.h"
@@ -193,7 +193,7 @@ arspi_attach(device_t parent, device_t s
*/
memset(&sba, 0, sizeof(sba));
sba.sba_controller = &sc->sc_spi;
- config_found(self, &sba, spibus_print, CFARG_EOL);
+ config_found(self, &sba, spibus_print, CFARGS_NONE);
}
void
Index: src/sys/arch/mips/atheros/dev/ohci_arbus.c
diff -u src/sys/arch/mips/atheros/dev/ohci_arbus.c:1.4 src/sys/arch/mips/atheros/dev/ohci_arbus.c:1.4.8.1
--- src/sys/arch/mips/atheros/dev/ohci_arbus.c:1.4 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/atheros/dev/ohci_arbus.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_arbus.c,v 1.4 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: ohci_arbus.c,v 1.4.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_arbus.c,v 1.4 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_arbus.c,v 1.4.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -129,5 +129,5 @@ ohci_arbus_attach(device_t parent, devic
#endif
/* Attach USB device */
- sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARG_EOL);
+ sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARGS_NONE);
}
Index: src/sys/arch/mips/cavium/mainbus.c
diff -u src/sys/arch/mips/cavium/mainbus.c:1.8 src/sys/arch/mips/cavium/mainbus.c:1.8.4.1
--- src/sys/arch/mips/cavium/mainbus.c:1.8 Mon May 10 23:58:52 2021
+++ src/sys/arch/mips/cavium/mainbus.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.8 2021/05/10 23:58:52 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.8.4.1 2021/08/04 02:44:15 thorpej Exp $ */
/*
* Copyright (c) 2007
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.8 2021/05/10 23:58:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.8.4.1 2021/08/04 02:44:15 thorpej Exp $");
#define _MIPS_BUS_DMA_PRIVATE
@@ -98,9 +98,8 @@ mainbus_attach_static(device_t self)
for (i = 0; i < (int)mainbus_ndevs; i++) {
aa.aa_name = mainbus_devs[i];
config_found(self, &aa, mainbus_print,
- CFARG_SUBMATCH, mainbus_submatch,
- CFARG_IATTR, "mainbus",
- CFARG_EOL);
+ CFARGS(.submatch = mainbus_submatch,
+ .iattr = "mainbus"));
}
}
@@ -118,15 +117,13 @@ mainbus_attach_devicetree(device_t self)
aa.aa_name = "cpunode";
config_found(self, &aa, mainbus_print,
- CFARG_SUBMATCH, mainbus_submatch,
- CFARG_IATTR, "mainbus",
- CFARG_EOL);
+ CFARGS(.submatch = mainbus_submatch,
+ .iattr = "mainbus"));
aa.aa_name = "iobus";
config_found(self, &aa, mainbus_print,
- CFARG_SUBMATCH, mainbus_submatch,
- CFARG_IATTR, "mainbus",
- CFARG_EOL);
+ CFARGS(.submatch = mainbus_submatch,
+ .iattr = "mainbus"));
simplebus_bus_io_init(&simplebus_bus_tag, NULL);
@@ -150,8 +147,7 @@ mainbus_attach_devicetree(device_t self)
faa.faa_phandle = OF_peer(0);
config_found(self, &faa, NULL,
- CFARG_IATTR, "fdt",
- CFARG_EOL);
+ CFARGS(.iattr = "fdt"));
}
static int
Index: src/sys/arch/mips/cavium/octeon_bootbus.c
diff -u src/sys/arch/mips/cavium/octeon_bootbus.c:1.2 src/sys/arch/mips/cavium/octeon_bootbus.c:1.2.8.1
--- src/sys/arch/mips/cavium/octeon_bootbus.c:1.2 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/cavium/octeon_bootbus.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_bootbus.c,v 1.2 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: octeon_bootbus.c,v 1.2.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*
* Copyright (c) 2007
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_bootbus.c,v 1.2 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_bootbus.c,v 1.2.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include "locators.h"
@@ -96,8 +96,7 @@ bootbus_attach(device_t parent, device_t
aa.aa_dmat = bootbus_dmat;
config_found(self, &aa, bootbus_print,
- CFARG_SUBMATCH, bootbus_submatch,
- CFARG_EOL);
+ CFARGS(.submatch = bootbus_submatch));
}
}
}
Index: src/sys/arch/mips/cavium/octeon_cpunode.c
diff -u src/sys/arch/mips/cavium/octeon_cpunode.c:1.19 src/sys/arch/mips/cavium/octeon_cpunode.c:1.19.8.1
--- src/sys/arch/mips/cavium/octeon_cpunode.c:1.19 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/cavium/octeon_cpunode.c Wed Aug 4 02:44:15 2021
@@ -29,7 +29,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_cpunode.c,v 1.19 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_cpunode.c,v 1.19.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include "locators.h"
#include "cpunode.h"
@@ -137,14 +137,14 @@ cpunode_mainbus_attach(device_t parent,
.cnaa_name = "cpu",
.cnaa_cpunum = cpunum,
};
- config_found(self, &cnaa, cpunode_mainbus_print, CFARG_EOL);
+ config_found(self, &cnaa, cpunode_mainbus_print, CFARGS_NONE);
}
#if NWDOG > 0
struct cpunode_attach_args cnaa = {
.cnaa_name = "wdog",
.cnaa_cpunum = CPUNODECF_CORE_DEFAULT,
};
- config_found(self, &cnaa, cpunode_mainbus_print, CFARG_EOL);
+ config_found(self, &cnaa, cpunode_mainbus_print, CFARGS_NONE);
#endif
}
Index: src/sys/arch/mips/cavium/octeon_iobus.c
diff -u src/sys/arch/mips/cavium/octeon_iobus.c:1.6 src/sys/arch/mips/cavium/octeon_iobus.c:1.6.8.1
--- src/sys/arch/mips/cavium/octeon_iobus.c:1.6 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/cavium/octeon_iobus.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_iobus.c,v 1.6 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: octeon_iobus.c,v 1.6.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*
* Copyright (c) 2007
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_iobus.c,v 1.6 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_iobus.c,v 1.6.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include "locators.h"
@@ -113,8 +113,7 @@ iobus_attach(device_t parent, device_t s
aa.aa_dmat = iobus_dmat;
config_found(self, &aa, iobus_print,
- CFARG_SUBMATCH, iobus_submatch,
- CFARG_EOL);
+ CFARGS(.submatch = iobus_submatch));
}
}
}
Index: src/sys/arch/mips/cavium/dev/octeon_dwctwo.c
diff -u src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.14 src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.14.8.1
--- src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.14 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/cavium/dev/octeon_dwctwo.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_dwctwo.c,v 1.14 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: octeon_dwctwo.c,v 1.14.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*
* Copyright (c) 2015 Masao Uebayashi <uebay...@tombiinc.com>
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_dwctwo.c,v 1.14 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_dwctwo.c,v 1.14.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include "opt_usb.h"
@@ -306,7 +306,7 @@ octeon_dwc2_attach(device_t parent, devi
sc->sc_dwc2.sc_child =
config_found(sc->sc_dwc2.sc_dev, &sc->sc_dwc2.sc_bus, usbctlprint,
- CFARG_EOL);
+ CFARGS_NONE);
sc->sc_ih = octeon_intr_establish(CIU_INT_USB, IPL_VM, dwc2_intr, sc);
if (sc->sc_ih == NULL)
Index: src/sys/arch/mips/cavium/dev/octeon_gmx.c
diff -u src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.19 src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.19.4.1
--- src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.19 Fri May 14 13:36:28 2021
+++ src/sys/arch/mips/cavium/dev/octeon_gmx.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_gmx.c,v 1.19 2021/05/14 13:36:28 simonb Exp $ */
+/* $NetBSD: octeon_gmx.c,v 1.19.4.1 2021/08/04 02:44:15 thorpej Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_gmx.c,v 1.19 2021/05/14 13:36:28 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_gmx.c,v 1.19.4.1 2021/08/04 02:44:15 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -269,7 +269,7 @@ octgmx_attach(device_t parent, device_t
gmx_aa.ga_smi = smi;
gmx_aa.ga_gmx = sc;
gmx_aa.ga_gmx_port = port_sc;
- config_found(self, &gmx_aa, octgmx_print, CFARG_EOL);
+ config_found(self, &gmx_aa, octgmx_print, CFARGS_NONE);
}
}
Index: src/sys/arch/mips/cavium/dev/octeon_mpi.c
diff -u src/sys/arch/mips/cavium/dev/octeon_mpi.c:1.6 src/sys/arch/mips/cavium/dev/octeon_mpi.c:1.6.8.1
--- src/sys/arch/mips/cavium/dev/octeon_mpi.c:1.6 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/cavium/dev/octeon_mpi.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_mpi.c,v 1.6 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: octeon_mpi.c,v 1.6.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_mpi.c,v 1.6 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_mpi.c,v 1.6.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include "opt_octeon.h"
@@ -149,8 +149,7 @@ octmpi_attach(device_t parent, device_t
octmpi_reg_wr(sc, MPI_TX_OFFSET, 0);
config_found(&sc->sc_dev, &pa, spi_print,
- CFARG_IATTR, "octmpi",
- CFARG_EOL);
+ CFARGS(.iattr = "octmpi"));
}
#if 0
Index: src/sys/arch/mips/cavium/dev/octeon_pip.c
diff -u src/sys/arch/mips/cavium/dev/octeon_pip.c:1.12 src/sys/arch/mips/cavium/dev/octeon_pip.c:1.12.8.1
--- src/sys/arch/mips/cavium/dev/octeon_pip.c:1.12 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/cavium/dev/octeon_pip.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_pip.c,v 1.12 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: octeon_pip.c,v 1.12.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_pip.c,v 1.12 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_pip.c,v 1.12.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -112,7 +112,7 @@ octpip_iobus_attach(device_t parent, dev
else
gmxiu.addr = GMX_BASE_PORT(i, 0);
- config_found(self, &gmxaa, NULL, CFARG_EOL);
+ config_found(self, &gmxaa, NULL, CFARGS_NONE);
}
}
@@ -163,7 +163,7 @@ octpip_fdt_attach(device_t parent, devic
else
gmxiu.addr = GMX_BASE_PORT(intno, 0);
- config_found(self, &gmxaa, NULL, CFARG_EOL);
+ config_found(self, &gmxaa, NULL, CFARGS_NONE);
/* XXX only one interface supported by octgmx */
return;
Index: src/sys/arch/mips/cavium/dev/octeon_xhci.c
diff -u src/sys/arch/mips/cavium/dev/octeon_xhci.c:1.5 src/sys/arch/mips/cavium/dev/octeon_xhci.c:1.5.8.1
--- src/sys/arch/mips/cavium/dev/octeon_xhci.c:1.5 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/cavium/dev/octeon_xhci.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_xhci.c,v 1.5 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: octeon_xhci.c,v 1.5.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/* $OpenBSD: octxhci.c,v 1.4 2019/09/29 04:32:23 visa Exp $ */
/*
@@ -180,9 +180,9 @@ octxhci_attach(device_t parent, device_t
return;
}
- sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARG_EOL);
+ sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARGS_NONE);
sc->sc_child2 = config_found(self, &sc->sc_bus2, usbctlprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
void
Index: src/sys/arch/mips/ingenic/apbus.c
diff -u src/sys/arch/mips/ingenic/apbus.c:1.20 src/sys/arch/mips/ingenic/apbus.c:1.20.8.1
--- src/sys/arch/mips/ingenic/apbus.c:1.20 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/ingenic/apbus.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: apbus.c,v 1.20 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: apbus.c,v 1.20.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*-
* Copyright (c) 2014 Michael Lorenz
@@ -29,7 +29,7 @@
/* catch-all for on-chip peripherals */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apbus.c,v 1.20 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apbus.c,v 1.20.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include "locators.h"
#define _MIPS_BUS_DMA_PRIVATE
@@ -265,7 +265,7 @@ apbus_attach(device_t parent, device_t s
writereg(JZ_CLKGR1, reg);
}
- config_found(self, &aa, apbus_print, CFARG_EOL);
+ config_found(self, &aa, apbus_print, CFARGS_NONE);
}
}
Index: src/sys/arch/mips/ingenic/ingenic_dwctwo.c
diff -u src/sys/arch/mips/ingenic/ingenic_dwctwo.c:1.14 src/sys/arch/mips/ingenic/ingenic_dwctwo.c:1.14.8.1
--- src/sys/arch/mips/ingenic/ingenic_dwctwo.c:1.14 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/ingenic/ingenic_dwctwo.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ingenic_dwctwo.c,v 1.14 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: ingenic_dwctwo.c,v 1.14.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*-
* Copyright (c) 2014 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ingenic_dwctwo.c,v 1.14 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ingenic_dwctwo.c,v 1.14.8.1 2021/08/04 02:44:15 thorpej Exp $");
/*
* adapted from bcm2835_dwctwo.c
@@ -222,5 +222,5 @@ ingenic_dwc2_deferred(device_t self)
return;
}
sc->sc_dwc2.sc_child = config_found(sc->sc_dwc2.sc_dev,
- &sc->sc_dwc2.sc_bus, usbctlprint, CFARG_EOL);
+ &sc->sc_dwc2.sc_bus, usbctlprint, CFARGS_NONE);
}
Index: src/sys/arch/mips/ingenic/ingenic_ehci.c
diff -u src/sys/arch/mips/ingenic/ingenic_ehci.c:1.7 src/sys/arch/mips/ingenic/ingenic_ehci.c:1.7.8.1
--- src/sys/arch/mips/ingenic/ingenic_ehci.c:1.7 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/ingenic/ingenic_ehci.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ingenic_ehci.c,v 1.7 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: ingenic_ehci.c,v 1.7.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*-
* Copyright (c) 2015 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ingenic_ehci.c,v 1.7 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ingenic_ehci.c,v 1.7.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -217,7 +217,7 @@ ingenic_ehci_attach(device_t parent, dev
bus_space_write_4(sc->iot, sc->ioh, 0xb0, reg);
/* Attach USB device */
- sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARG_EOL);
+ sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARGS_NONE);
return;
Index: src/sys/arch/mips/ingenic/ingenic_ohci.c
diff -u src/sys/arch/mips/ingenic/ingenic_ohci.c:1.6 src/sys/arch/mips/ingenic/ingenic_ohci.c:1.6.8.1
--- src/sys/arch/mips/ingenic/ingenic_ohci.c:1.6 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/ingenic/ingenic_ohci.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ingenic_ohci.c,v 1.6 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: ingenic_ohci.c,v 1.6.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*-
* Copyright (c) 2015 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ingenic_ohci.c,v 1.6 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ingenic_ohci.c,v 1.6.8.1 2021/08/04 02:44:15 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -120,7 +120,7 @@ ingenic_ohci_attach(device_t parent, dev
}
/* Attach USB device */
- sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARG_EOL);
+ sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARGS_NONE);
ingenic_ohci = self;
return;
Index: src/sys/arch/mips/ingenic/jziic.c
diff -u src/sys/arch/mips/ingenic/jziic.c:1.8 src/sys/arch/mips/ingenic/jziic.c:1.8.8.1
--- src/sys/arch/mips/ingenic/jziic.c:1.8 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/ingenic/jziic.c Wed Aug 4 02:44:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: jziic.c,v 1.8 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: jziic.c,v 1.8.8.1 2021/08/04 02:44:15 thorpej Exp $ */
/*-
* Copyright (c) 2015 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: jziic.c,v 1.8 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jziic.c,v 1.8.8.1 2021/08/04 02:44:15 thorpej Exp $");
/*
* a preliminary driver for JZ4780's on-chip SMBus controllers
@@ -178,7 +178,7 @@ jziic_attach(device_t parent, device_t s
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &sc->sc_i2c;
- config_found(sc->sc_dev, &iba, iicbus_print, CFARG_EOL);
+ config_found(sc->sc_dev, &iba, iicbus_print, CFARGS_NONE);
return;
Index: src/sys/arch/mips/ralink/ralink_ehci.c
diff -u src/sys/arch/mips/ralink/ralink_ehci.c:1.8 src/sys/arch/mips/ralink/ralink_ehci.c:1.8.8.1
--- src/sys/arch/mips/ralink/ralink_ehci.c:1.8 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/ralink/ralink_ehci.c Wed Aug 4 02:44:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ralink_ehci.c,v 1.8 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: ralink_ehci.c,v 1.8.8.1 2021/08/04 02:44:16 thorpej Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
/* ralink_ehci.c -- Ralink EHCI USB Driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_ehci.c,v 1.8 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_ehci.c,v 1.8.8.1 2021/08/04 02:44:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -166,7 +166,7 @@ ralink_ehci_attach(device_t parent, devi
/* Attach usb device. */
sc->sc_ehci.sc_child = config_found(self, &sc->sc_ehci.sc_bus,
- usbctlprint, CFARG_EOL);
+ usbctlprint, CFARGS_NONE);
return;
Index: src/sys/arch/mips/ralink/ralink_gpio.c
diff -u src/sys/arch/mips/ralink/ralink_gpio.c:1.10 src/sys/arch/mips/ralink/ralink_gpio.c:1.10.8.1
--- src/sys/arch/mips/ralink/ralink_gpio.c:1.10 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/ralink/ralink_gpio.c Wed Aug 4 02:44:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ralink_gpio.c,v 1.10 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: ralink_gpio.c,v 1.10.8.1 2021/08/04 02:44:16 thorpej Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
/* ra_gpio.c -- Ralink 3052 gpio driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_gpio.c,v 1.10 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_gpio.c,v 1.10.8.1 2021/08/04 02:44:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -752,7 +752,7 @@ ra_gpio_attach(device_t parent, device_t
/* Note, > 52nd pin isn't a gpio, it is a special command */
gba.gba_npins = (GPIO_PINS + SPECIAL_COMMANDS);
- config_found(sc->sc_dev, &gba, gpiobus_print, CFARG_EOL);
+ config_found(sc->sc_dev, &gba, gpiobus_print, CFARGS_NONE);
#if 0
gpio_register_dump(sc);
Index: src/sys/arch/mips/ralink/ralink_i2c.c
diff -u src/sys/arch/mips/ralink/ralink_i2c.c:1.5 src/sys/arch/mips/ralink/ralink_i2c.c:1.5.8.1
--- src/sys/arch/mips/ralink/ralink_i2c.c:1.5 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/ralink/ralink_i2c.c Wed Aug 4 02:44:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ralink_i2c.c,v 1.5 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: ralink_i2c.c,v 1.5.8.1 2021/08/04 02:44:16 thorpej Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
/* ra_i2c.c - Ralink i2c 3052 driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_i2c.c,v 1.5 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_i2c.c,v 1.5.8.1 2021/08/04 02:44:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -159,7 +159,7 @@ ra_i2c_attach(device_t parent, device_t
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &sc->sc_i2c;
- config_found(self, &iba, iicbus_print, CFARG_EOL);
+ config_found(self, &iba, iicbus_print, CFARGS_NONE);
}
Index: src/sys/arch/mips/ralink/ralink_mainbus.c
diff -u src/sys/arch/mips/ralink/ralink_mainbus.c:1.6 src/sys/arch/mips/ralink/ralink_mainbus.c:1.6.8.1
--- src/sys/arch/mips/ralink/ralink_mainbus.c:1.6 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/ralink/ralink_mainbus.c Wed Aug 4 02:44:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ralink_mainbus.c,v 1.6 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: ralink_mainbus.c,v 1.6.8.1 2021/08/04 02:44:16 thorpej Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_mainbus.c,v 1.6 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_mainbus.c,v 1.6.8.1 2021/08/04 02:44:16 thorpej Exp $");
#include "locators.h"
#include <sys/param.h>
@@ -120,8 +120,7 @@ mainbus_attach(device_t parent, device_t
/* attach other devices */
config_search(self, &ma,
- CFARG_SEARCH, mainbus_search,
- CFARG_EOL);
+ CFARGS(.search = mainbus_search));
}
static int
@@ -133,7 +132,7 @@ mainbus_search(device_t parent, cfdata_t
ma->ma_addr = cf->cf_loc[MAINBUSCF_ADDR];
if (config_probe(parent, cf, aux))
- config_attach(parent, cf, aux, mainbus_print, CFARG_EOL);
+ config_attach(parent, cf, aux, mainbus_print, CFARGS_NONE);
else
mainbus_print(aux, cf->cf_name);
return 0;
@@ -180,13 +179,12 @@ mainbus_attach_critical(struct mainbus_s
ma.ma_dmat = sc->sc_dmat;
cf = config_search(sc->sc_dev, &ma,
- CFARG_SUBMATCH, mainbus_find,
- CFARG_EOL);
+ CFARGS(.submatch = mainbus_find));
if (cf == NULL && critical_devs[i].required)
panic("%s: failed to find %s",
__func__, critical_devs[i].name);
ma.ma_addr = cf->cf_loc[MAINBUSCF_ADDR];
- config_attach(sc->sc_dev, cf, &ma, mainbus_print, CFARG_EOL);
+ config_attach(sc->sc_dev, cf, &ma, mainbus_print, CFARGS_NONE);
}
}
Index: src/sys/arch/mips/ralink/ralink_ohci.c
diff -u src/sys/arch/mips/ralink/ralink_ohci.c:1.6 src/sys/arch/mips/ralink/ralink_ohci.c:1.6.8.1
--- src/sys/arch/mips/ralink/ralink_ohci.c:1.6 Sat Apr 24 23:36:42 2021
+++ src/sys/arch/mips/ralink/ralink_ohci.c Wed Aug 4 02:44:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ralink_ohci.c,v 1.6 2021/04/24 23:36:42 thorpej Exp $ */
+/* $NetBSD: ralink_ohci.c,v 1.6.8.1 2021/08/04 02:44:16 thorpej Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@@ -31,7 +31,7 @@
#include "ehci.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_ohci.c,v 1.6 2021/04/24 23:36:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_ohci.c,v 1.6.8.1 2021/08/04 02:44:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -149,7 +149,7 @@ ralink_ohci_attach(device_t parent, devi
/* Attach usb device. */
sc->sc_ohci.sc_child = config_found(self, &sc->sc_ohci.sc_bus,
- usbctlprint, CFARG_EOL);
+ usbctlprint, CFARGS_NONE);
return;
Index: src/sys/arch/mips/rmi/rmixl_cpucore.c
diff -u src/sys/arch/mips/rmi/rmixl_cpucore.c:1.6 src/sys/arch/mips/rmi/rmixl_cpucore.c:1.6.8.1
--- src/sys/arch/mips/rmi/rmixl_cpucore.c:1.6 Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mips/rmi/rmixl_cpucore.c Wed Aug 4 02:44:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_cpucore.c,v 1.6 2021/04/24 23:36:43 thorpej Exp $ */
+/* $NetBSD: rmixl_cpucore.c,v 1.6.8.1 2021/08/04 02:44:16 thorpej Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -38,7 +38,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_cpucore.c,v 1.6 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_cpucore.c,v 1.6.8.1 2021/08/04 02:44:16 thorpej Exp $");
#include "opt_multiprocessor.h"
@@ -164,7 +164,7 @@ cpucore_rmixl_attach(device_t parent, de
ca.ca_thread = t;
ca.ca_core = sc->sc_core;
if (config_found(self, &ca, cpucore_rmixl_print,
- CFARG_EOL) == NULL) {
+ CFARGS_NONE) == NULL) {
/*
* thread did not attach, e.g. not configured
* arrange to have it disabled in THREADEN PCR
Index: src/sys/arch/mips/rmi/rmixl_iobus.c
diff -u src/sys/arch/mips/rmi/rmixl_iobus.c:1.6 src/sys/arch/mips/rmi/rmixl_iobus.c:1.6.8.1
--- src/sys/arch/mips/rmi/rmixl_iobus.c:1.6 Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mips/rmi/rmixl_iobus.c Wed Aug 4 02:44:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_iobus.c,v 1.6 2021/04/24 23:36:43 thorpej Exp $ */
+/* $NetBSD: rmixl_iobus.c,v 1.6.8.1 2021/08/04 02:44:16 thorpej Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_iobus.c,v 1.6 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_iobus.c,v 1.6.8.1 2021/08/04 02:44:16 thorpej Exp $");
#include "locators.h"
@@ -162,8 +162,7 @@ rmixl_iobus_attach(device_t parent, devi
/* attach any children */
config_search(self, NULL,
- CFARG_SEARCH, rmixl_iobus_search,
- CFARG_EOL);
+ CFARGS(.search = rmixl_iobus_search));
}
static void
@@ -285,7 +284,7 @@ rmixl_iobus_search(device_t parent, cfda
if (config_probe(parent, cf, &ia)) {
cs->cs_allocated = true;
- config_attach(parent, cf, &ia, rmixl_iobus_print, CFARG_EOL);
+ config_attach(parent, cf, &ia, rmixl_iobus_print, CFARGS_NONE);
}
return 0;
Index: src/sys/arch/mips/rmi/rmixl_obio.c
diff -u src/sys/arch/mips/rmi/rmixl_obio.c:1.6 src/sys/arch/mips/rmi/rmixl_obio.c:1.6.8.1
--- src/sys/arch/mips/rmi/rmixl_obio.c:1.6 Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mips/rmi/rmixl_obio.c Wed Aug 4 02:44:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_obio.c,v 1.6 2021/04/24 23:36:43 thorpej Exp $ */
+/* $NetBSD: rmixl_obio.c,v 1.6.8.1 2021/08/04 02:44:16 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_obio.c,v 1.6 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_obio.c,v 1.6.8.1 2021/08/04 02:44:16 thorpej Exp $");
#include "locators.h"
#include "pci.h"
@@ -118,9 +118,7 @@ obio_attach(device_t parent, device_t se
* Attach on-board devices as specified in the kernel config file.
*/
config_search(self, NULL,
- CFARG_SEARCH, obio_search,
- CFARG_EOL);
-
+ CFARGS(.search = obio_search));
}
static int
@@ -162,7 +160,7 @@ obio_search(device_t parent, cfdata_t cf
obio.obio_64bit_dmat = sc->sc_64bit_dmat;
if (config_probe(parent, cf, &obio))
- config_attach(parent, cf, &obio, obio_print, CFARG_EOL);
+ config_attach(parent, cf, &obio, obio_print, CFARGS_NONE);
return 0;
}
Index: src/sys/arch/mips/rmi/rmixl_ohci.c
diff -u src/sys/arch/mips/rmi/rmixl_ohci.c:1.6 src/sys/arch/mips/rmi/rmixl_ohci.c:1.6.8.1
--- src/sys/arch/mips/rmi/rmixl_ohci.c:1.6 Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mips/rmi/rmixl_ohci.c Wed Aug 4 02:44:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_ohci.c,v 1.6 2021/04/24 23:36:43 thorpej Exp $ */
+/* $NetBSD: rmixl_ohci.c,v 1.6.8.1 2021/08/04 02:44:16 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_ohci.c,v 1.6 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_ohci.c,v 1.6.8.1 2021/08/04 02:44:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -135,5 +135,5 @@ rmixl_ohci_attach(device_t parent, devic
}
/* Attach USB device */
- sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARG_EOL);
+ sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARGS_NONE);
}
Index: src/sys/arch/mips/rmi/rmixl_usbi.c
diff -u src/sys/arch/mips/rmi/rmixl_usbi.c:1.6 src/sys/arch/mips/rmi/rmixl_usbi.c:1.6.8.1
--- src/sys/arch/mips/rmi/rmixl_usbi.c:1.6 Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mips/rmi/rmixl_usbi.c Wed Aug 4 02:44:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_usbi.c,v 1.6 2021/04/24 23:36:43 thorpej Exp $ */
+/* $NetBSD: rmixl_usbi.c,v 1.6.8.1 2021/08/04 02:44:16 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_usbi.c,v 1.6 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_usbi.c,v 1.6.8.1 2021/08/04 02:44:16 thorpej Exp $");
#include "locators.h"
@@ -165,8 +165,7 @@ rmixl_usbi_attach(device_t parent, devic
/* attach any children */
config_search(self, NULL,
- CFARG_SEARCH, rmixl_usbi_search,
- CFARG_EOL);
+ CFARGS(.search = rmixl_usbi_search));
}
static int
@@ -202,7 +201,7 @@ rmixl_usbi_search(device_t parent, cfdat
usbi.usbi_dmat = sc->sc_dmat;
if (config_probe(parent, cf, &usbi))
- config_attach(parent, cf, &usbi, rmixl_usbi_print, CFARG_EOL);
+ config_attach(parent, cf, &usbi, rmixl_usbi_print, CFARGS_NONE);
return 0;
}
Index: src/sys/arch/mips/rmi/rmixl_cpunode.c
diff -u src/sys/arch/mips/rmi/rmixl_cpunode.c:1.4 src/sys/arch/mips/rmi/rmixl_cpunode.c:1.4.8.1
--- src/sys/arch/mips/rmi/rmixl_cpunode.c:1.4 Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mips/rmi/rmixl_cpunode.c Wed Aug 4 02:44:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_cpunode.c,v 1.4 2021/04/24 23:36:43 thorpej Exp $ */
+/* $NetBSD: rmixl_cpunode.c,v 1.4.8.1 2021/08/04 02:44:16 thorpej Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_cpunode.c,v 1.4 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_cpunode.c,v 1.4.8.1 2021/08/04 02:44:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,14 +125,14 @@ cpunode_rmixl_attach(device_t parent, de
na.na_name = "cpucore";
na.na_node = ma->ma_node;
na.na_core = i;
- config_found(self, &na, cpunode_rmixl_print, CFARG_EOL);
+ config_found(self, &na, cpunode_rmixl_print, CFARGS_NONE);
}
/*
* Attach obio
*/
na.na_name = "obio";
- config_found(self, &na, NULL, CFARG_EOL);
+ config_found(self, &na, NULL, CFARGS_NONE);
}
static int
Index: src/sys/arch/mips/rmi/rmixl_gpio.c
diff -u src/sys/arch/mips/rmi/rmixl_gpio.c:1.4 src/sys/arch/mips/rmi/rmixl_gpio.c:1.4.8.1
--- src/sys/arch/mips/rmi/rmixl_gpio.c:1.4 Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mips/rmi/rmixl_gpio.c Wed Aug 4 02:44:16 2021
@@ -1,5 +1,5 @@
-/* $NetBSD: rmixl_gpio.c,v 1.4 2021/04/24 23:36:43 thorpej Exp $ */
-/* $NetBSD: rmixl_gpio.c,v 1.4 2021/04/24 23:36:43 thorpej Exp $ */
+/* $NetBSD: rmixl_gpio.c,v 1.4.8.1 2021/08/04 02:44:16 thorpej Exp $ */
+/* $NetBSD: rmixl_gpio.c,v 1.4.8.1 2021/08/04 02:44:16 thorpej Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_gpio.c,v 1.4 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_gpio.c,v 1.4.8.1 2021/08/04 02:44:16 thorpej Exp $");
#define _INTR_PRIVATE
@@ -179,7 +179,7 @@ gpio_defer(device_t self)
: GPIO_PIN_HIGH;
}
- config_found(self, &gba, gpiobus_print, CFARG_EOL);
+ config_found(self, &gba, gpiobus_print, CFARGS_NONE);
}
#endif /* NGPIO > 0 */
Index: src/sys/arch/mips/rmi/rmixl_ehci.c
diff -u src/sys/arch/mips/rmi/rmixl_ehci.c:1.7 src/sys/arch/mips/rmi/rmixl_ehci.c:1.7.8.1
--- src/sys/arch/mips/rmi/rmixl_ehci.c:1.7 Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mips/rmi/rmixl_ehci.c Wed Aug 4 02:44:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_ehci.c,v 1.7 2021/04/24 23:36:43 thorpej Exp $ */
+/* $NetBSD: rmixl_ehci.c,v 1.7.8.1 2021/08/04 02:44:16 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_ehci.c,v 1.7 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_ehci.c,v 1.7.8.1 2021/08/04 02:44:16 thorpej Exp $");
#include "locators.h"
@@ -138,6 +138,6 @@ rmixl_ehci_attach(device_t parent, devic
}
/* Attach USB device */
- sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARG_EOL);
+ sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARGS_NONE);
}
Index: src/sys/arch/mips/rmi/rmixl_mainbus.c
diff -u src/sys/arch/mips/rmi/rmixl_mainbus.c:1.5 src/sys/arch/mips/rmi/rmixl_mainbus.c:1.5.8.1
--- src/sys/arch/mips/rmi/rmixl_mainbus.c:1.5 Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mips/rmi/rmixl_mainbus.c Wed Aug 4 02:44:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_mainbus.c,v 1.5 2021/04/24 23:36:43 thorpej Exp $ */
+/* $NetBSD: rmixl_mainbus.c,v 1.5.8.1 2021/08/04 02:44:16 thorpej Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_mainbus.c,v 1.5 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_mainbus.c,v 1.5.8.1 2021/08/04 02:44:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,8 +92,7 @@ mainbusattach(device_t parent, device_t
* attach mainbus devices
*/
config_search(self, NULL,
- CFARG_SEARCH, mainbus_search,
- CFARG_EOL);
+ CFARGS(.search = mainbus_search));
}
static int
@@ -152,7 +151,7 @@ mainbus_search(device_t parent, cfdata_t
ma.ma_node = mainbus_node_alloc(sc, cf->cf_loc[MAINBUSCF_NODE]);
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/mips/rmi/rmixl_pcie.c
diff -u src/sys/arch/mips/rmi/rmixl_pcie.c:1.15 src/sys/arch/mips/rmi/rmixl_pcie.c:1.15.8.1
--- src/sys/arch/mips/rmi/rmixl_pcie.c:1.15 Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mips/rmi/rmixl_pcie.c Wed Aug 4 02:44:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcie.c,v 1.15 2021/04/24 23:36:43 thorpej Exp $ */
+/* $NetBSD: rmixl_pcie.c,v 1.15.8.1 2021/08/04 02:44:16 thorpej Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie.c,v 1.15 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie.c,v 1.15.8.1 2021/08/04 02:44:16 thorpej Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -396,7 +396,7 @@ rmixl_pcie_attach(device_t parent, devic
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
}
/*
Index: src/sys/arch/mips/rmi/rmixl_pcix.c
diff -u src/sys/arch/mips/rmi/rmixl_pcix.c:1.16 src/sys/arch/mips/rmi/rmixl_pcix.c:1.16.8.1
--- src/sys/arch/mips/rmi/rmixl_pcix.c:1.16 Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mips/rmi/rmixl_pcix.c Wed Aug 4 02:44:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcix.c,v 1.16 2021/04/24 23:36:43 thorpej Exp $ */
+/* $NetBSD: rmixl_pcix.c,v 1.16.8.1 2021/08/04 02:44:16 thorpej Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcix.c,v 1.16 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcix.c,v 1.16.8.1 2021/08/04 02:44:16 thorpej Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -474,7 +474,7 @@ rmixl_pcix_attach(device_t parent, devic
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
}
/*
Index: src/sys/arch/mips/sibyte/dev/sbgbus.c
diff -u src/sys/arch/mips/sibyte/dev/sbgbus.c:1.14 src/sys/arch/mips/sibyte/dev/sbgbus.c:1.14.8.1
--- src/sys/arch/mips/sibyte/dev/sbgbus.c:1.14 Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mips/sibyte/dev/sbgbus.c Wed Aug 4 02:44:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sbgbus.c,v 1.14 2021/04/24 23:36:43 thorpej Exp $ */
+/* $NetBSD: sbgbus.c,v 1.14.8.1 2021/08/04 02:44:16 thorpej Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbgbus.c,v 1.14 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbgbus.c,v 1.14.8.1 2021/08/04 02:44:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -75,8 +75,7 @@ sbgbus_attach(device_t parent, device_t
/* Configure children using indirect configuration. */
config_search(self, NULL,
- CFARG_SEARCH, sbgbussearch,
- CFARG_EOL);
+ CFARGS(.search = sbgbussearch));
}
static int
@@ -157,7 +156,7 @@ sbgbussearch(device_t parent, cfdata_t c
tryagain = 0;
if (config_probe(parent, cf, &sga)) {
- config_attach(parent, cf, &sga, sbgbusprint, CFARG_EOL);
+ config_attach(parent, cf, &sga, sbgbusprint, CFARGS_NONE);
tryagain = (cf->cf_fstate == FSTATE_STAR);
}
} while (tryagain);
Index: src/sys/arch/mips/sibyte/dev/sbobio.c
diff -u src/sys/arch/mips/sibyte/dev/sbobio.c:1.24 src/sys/arch/mips/sibyte/dev/sbobio.c:1.24.8.1
--- src/sys/arch/mips/sibyte/dev/sbobio.c:1.24 Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mips/sibyte/dev/sbobio.c Wed Aug 4 02:44:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sbobio.c,v 1.24 2021/04/24 23:36:43 thorpej Exp $ */
+/* $NetBSD: sbobio.c,v 1.24.8.1 2021/08/04 02:44:16 thorpej Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbobio.c,v 1.24 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbobio.c,v 1.24.8.1 2021/08/04 02:44:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -242,9 +242,8 @@ sbobio_attach(device_t parent, device_t
locs[SBOBIOCF_INTR + 1] = devs[i].sa_intr[1];
config_found(self, &sa, sbobio_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
return;
}
Index: src/sys/arch/mips/sibyte/dev/sbscd.c
diff -u src/sys/arch/mips/sibyte/dev/sbscd.c:1.19 src/sys/arch/mips/sibyte/dev/sbscd.c:1.19.8.1
--- src/sys/arch/mips/sibyte/dev/sbscd.c:1.19 Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mips/sibyte/dev/sbscd.c Wed Aug 4 02:44:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sbscd.c,v 1.19 2021/04/24 23:36:43 thorpej Exp $ */
+/* $NetBSD: sbscd.c,v 1.19.8.1 2021/08/04 02:44:16 thorpej Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbscd.c,v 1.19 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbscd.c,v 1.19.8.1 2021/08/04 02:44:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -118,9 +118,8 @@ sbscd_attach(device_t parent, device_t s
sb1250_sbscd_devs[i].sa_intr[1];
config_found(self, &sa, sbscd_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
return;
}
Index: src/sys/arch/mips/sibyte/dev/sbsmbus.c
diff -u src/sys/arch/mips/sibyte/dev/sbsmbus.c:1.18 src/sys/arch/mips/sibyte/dev/sbsmbus.c:1.18.8.1
--- src/sys/arch/mips/sibyte/dev/sbsmbus.c:1.18 Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mips/sibyte/dev/sbsmbus.c Wed Aug 4 02:44:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sbsmbus.c,v 1.18 2021/04/24 23:36:43 thorpej Exp $ */
+/* $NetBSD: sbsmbus.c,v 1.18.8.1 2021/08/04 02:44:16 thorpej Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbsmbus.c,v 1.18 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbsmbus.c,v 1.18.8.1 2021/08/04 02:44:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -101,9 +101,8 @@ smbus_attach(device_t parent, device_t s
locs[SMBUSCF_DEV] = smbus_devs[i].sa_device;
config_found(self, &sa, smbus_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
}
Index: src/sys/arch/mips/sibyte/pci/sbbrz.c
diff -u src/sys/arch/mips/sibyte/pci/sbbrz.c:1.5 src/sys/arch/mips/sibyte/pci/sbbrz.c:1.5.8.1
--- src/sys/arch/mips/sibyte/pci/sbbrz.c:1.5 Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mips/sibyte/pci/sbbrz.c Wed Aug 4 02:44:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sbbrz.c,v 1.5 2021/04/24 23:36:43 thorpej Exp $ */
+/* $NetBSD: sbbrz.c,v 1.5.8.1 2021/08/04 02:44:16 thorpej Exp $ */
/*
* Copyright 2000, 2001
@@ -201,7 +201,7 @@ sbbrz_attach(device_t parent, device_t s
pba.pba_bridgetag = NULL;
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
- config_found(self, &pba, sbbrz_print, CFARG_EOL);
+ config_found(self, &pba, sbbrz_print, CFARGS_NONE);
}
static int
