Module Name: src
Committed By: thorpej
Date: Wed Aug 4 02:57:07 UTC 2021
Modified Files:
src/sys/arch/shark/ofw [thorpej-cfargs2]: ofisascr.c vlpci.c
src/sys/arch/shark/shark [thorpej-cfargs2]: sequoia.c shark_iic.c
src/sys/arch/sparc/dev [thorpej-cfargs2]: bootbus.c cgfourteen.c ebus.c
fd.c obio.c sbus.c ts102.c vme_machdep.c zs.c
src/sys/arch/sparc/sparc [thorpej-cfargs2]: autoconf.c cpuunit.c
iommu.c msiiep.c
src/sys/arch/sparc64/dev [thorpej-cfargs2]: cbus.c central.c com_ebus.c
ebus.c ebus_mainbus.c fdc.c ffb.c fhc.c gfb.c jbus-i2c.c psycho.c
pyro.c sab.c sbus.c schizo.c upa.c vbus.c vdsk.c vpci.c zs.c
src/sys/arch/sparc64/sparc64 [thorpej-cfargs2]: autoconf.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/shark/ofw/ofisascr.c \
src/sys/arch/shark/ofw/vlpci.c
cvs rdiff -u -r1.15 -r1.15.6.1 src/sys/arch/shark/shark/sequoia.c
cvs rdiff -u -r1.1 -r1.1.8.1 src/sys/arch/shark/shark/shark_iic.c
cvs rdiff -u -r1.22 -r1.22.4.1 src/sys/arch/sparc/dev/bootbus.c
cvs rdiff -u -r1.89 -r1.89.8.1 src/sys/arch/sparc/dev/cgfourteen.c
cvs rdiff -u -r1.40 -r1.40.4.1 src/sys/arch/sparc/dev/ebus.c
cvs rdiff -u -r1.162 -r1.162.8.1 src/sys/arch/sparc/dev/fd.c
cvs rdiff -u -r1.75 -r1.75.8.1 src/sys/arch/sparc/dev/obio.c
cvs rdiff -u -r1.82 -r1.82.4.1 src/sys/arch/sparc/dev/sbus.c
cvs rdiff -u -r1.20 -r1.20.2.1 src/sys/arch/sparc/dev/ts102.c
cvs rdiff -u -r1.73 -r1.73.4.1 src/sys/arch/sparc/dev/vme_machdep.c
cvs rdiff -u -r1.122 -r1.122.8.1 src/sys/arch/sparc/dev/zs.c
cvs rdiff -u -r1.268 -r1.268.2.1 src/sys/arch/sparc/sparc/autoconf.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/sparc/sparc/cpuunit.c
cvs rdiff -u -r1.98 -r1.98.4.1 src/sys/arch/sparc/sparc/iommu.c
cvs rdiff -u -r1.51 -r1.51.4.1 src/sys/arch/sparc/sparc/msiiep.c
cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/arch/sparc64/dev/cbus.c
cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/arch/sparc64/dev/central.c \
src/sys/arch/sparc64/dev/vbus.c
cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/arch/sparc64/dev/com_ebus.c
cvs rdiff -u -r1.67 -r1.67.4.1 src/sys/arch/sparc64/dev/ebus.c
cvs rdiff -u -r1.20 -r1.20.4.1 src/sys/arch/sparc64/dev/ebus_mainbus.c
cvs rdiff -u -r1.50 -r1.50.8.1 src/sys/arch/sparc64/dev/fdc.c
cvs rdiff -u -r1.66 -r1.66.8.1 src/sys/arch/sparc64/dev/ffb.c
cvs rdiff -u -r1.9 -r1.9.4.1 src/sys/arch/sparc64/dev/fhc.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/sparc64/dev/gfb.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/sparc64/dev/jbus-i2c.c
cvs rdiff -u -r1.134 -r1.134.4.1 src/sys/arch/sparc64/dev/psycho.c
cvs rdiff -u -r1.24 -r1.24.4.1 src/sys/arch/sparc64/dev/pyro.c
cvs rdiff -u -r1.56 -r1.56.8.1 src/sys/arch/sparc64/dev/sab.c
cvs rdiff -u -r1.102 -r1.102.4.1 src/sys/arch/sparc64/dev/sbus.c
cvs rdiff -u -r1.45 -r1.45.4.1 src/sys/arch/sparc64/dev/schizo.c
cvs rdiff -u -r1.22 -r1.22.4.1 src/sys/arch/sparc64/dev/upa.c
cvs rdiff -u -r1.7 -r1.7.2.1 src/sys/arch/sparc64/dev/vdsk.c
cvs rdiff -u -r1.11 -r1.11.4.1 src/sys/arch/sparc64/dev/vpci.c
cvs rdiff -u -r1.76 -r1.76.8.1 src/sys/arch/sparc64/dev/zs.c
cvs rdiff -u -r1.233 -r1.233.2.1 src/sys/arch/sparc64/sparc64/autoconf.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/shark/ofw/ofisascr.c
diff -u src/sys/arch/shark/ofw/ofisascr.c:1.11 src/sys/arch/shark/ofw/ofisascr.c:1.11.8.1
--- src/sys/arch/shark/ofw/ofisascr.c:1.11 Sat Apr 24 23:36:48 2021
+++ src/sys/arch/shark/ofw/ofisascr.c Wed Aug 4 02:57:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ofisascr.c,v 1.11 2021/04/24 23:36:48 thorpej Exp $ */
+/* $NetBSD: ofisascr.c,v 1.11.8.1 2021/08/04 02:57:06 thorpej Exp $ */
/*
* Copyright 1997
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofisascr.c,v 1.11 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofisascr.c,v 1.11.8.1 2021/08/04 02:57:06 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -105,6 +105,5 @@ ofisascrattach(device_t parent, device_t
ia.ia_aux = (void *)oba->oba_phandle;
config_found(dev, &ia, NULL,
- CFARG_DEVHANDLE, devhandle_from_of(oba->oba_phandle),
- CFARG_EOL);
+ CFARGS(.devhandle = devhandle_from_of(oba->oba_phandle)));
}
Index: src/sys/arch/shark/ofw/vlpci.c
diff -u src/sys/arch/shark/ofw/vlpci.c:1.11 src/sys/arch/shark/ofw/vlpci.c:1.11.8.1
--- src/sys/arch/shark/ofw/vlpci.c:1.11 Sat Apr 24 23:36:48 2021
+++ src/sys/arch/shark/ofw/vlpci.c Wed Aug 4 02:57:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vlpci.c,v 1.11 2021/04/24 23:36:48 thorpej Exp $ */
+/* $NetBSD: vlpci.c,v 1.11.8.1 2021/08/04 02:57:06 thorpej Exp $ */
/*
* Copyright (c) 2017 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.11 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.11.8.1 2021/08/04 02:57:06 thorpej Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -329,8 +329,7 @@ vlpci_attach(device_t parent, device_t s
vlpci_dump_window(sc, VLPCI_PCI_WND_NO_3);
config_found(self, &pba, pcibusprint,
- CFARG_DEVHANDLE, devhandle_from_of(oba->oba_phandle),
- CFARG_EOL);
+ CFARGS(.devhandle = devhandle_from_of(oba->oba_phandle)));
}
static void
Index: src/sys/arch/shark/shark/sequoia.c
diff -u src/sys/arch/shark/shark/sequoia.c:1.15 src/sys/arch/shark/shark/sequoia.c:1.15.6.1
--- src/sys/arch/shark/shark/sequoia.c:1.15 Fri Apr 30 02:11:37 2021
+++ src/sys/arch/shark/shark/sequoia.c Wed Aug 4 02:57:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sequoia.c,v 1.15 2021/04/30 02:11:37 thorpej Exp $ */
+/* $NetBSD: sequoia.c,v 1.15.6.1 2021/08/04 02:57:06 thorpej Exp $ */
/*
* Copyright 1997
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sequoia.c,v 1.15 2021/04/30 02:11:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sequoia.c,v 1.15.6.1 2021/08/04 02:57:06 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -792,13 +792,11 @@ sequoia_attach(device_t parent, device_t
/* attach the i2c bus connected to the DRAM banks slots */
strlcpy(noba.oba_ofname, "dec,dnard-i2c", sizeof(noba.oba_ofname));
config_found(self, &noba, sequoia_cfprint,
- CFARG_IATTR, "sequoia",
- CFARG_EOL);
+ CFARGS(.iattr = "sequoia"));
/* attach the ofisa instance at the same OFW node */
config_found(self, aux, ofisaprint,
- CFARG_IATTR, "ofisa_subclass",
- CFARG_EOL);
+ CFARGS(.iattr = "ofisa_subclass"));
}
CFATTACH_DECL_NEW(sequoia, 0,
Index: src/sys/arch/shark/shark/shark_iic.c
diff -u src/sys/arch/shark/shark/shark_iic.c:1.1 src/sys/arch/shark/shark/shark_iic.c:1.1.8.1
--- src/sys/arch/shark/shark/shark_iic.c:1.1 Fri Apr 30 02:24:05 2021
+++ src/sys/arch/shark/shark/shark_iic.c Wed Aug 4 02:57:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: shark_iic.c,v 1.1 2021/04/30 02:24:05 thorpej Exp $ */
+/* $NetBSD: shark_iic.c,v 1.1.8.1 2021/08/04 02:57:06 thorpej Exp $ */
/*
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: shark_iic.c,v 1.1 2021/04/30 02:24:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shark_iic.c,v 1.1.8.1 2021/08/04 02:57:06 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -284,7 +284,7 @@ sharkiic_attach(device_t parent, device_
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);
}
CFATTACH_DECL_NEW(sharkiic, sizeof(struct sharkiic_softc),
Index: src/sys/arch/sparc/dev/bootbus.c
diff -u src/sys/arch/sparc/dev/bootbus.c:1.22 src/sys/arch/sparc/dev/bootbus.c:1.22.4.1
--- src/sys/arch/sparc/dev/bootbus.c:1.22 Mon May 10 23:53:44 2021
+++ src/sys/arch/sparc/dev/bootbus.c Wed Aug 4 02:57:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bootbus.c,v 1.22 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: bootbus.c,v 1.22.4.1 2021/08/04 02:57:06 thorpej Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bootbus.c,v 1.22 2021/05/10 23:53:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bootbus.c,v 1.22.4.1 2021/08/04 02:57:06 thorpej Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -123,9 +123,8 @@ bootbus_attach(device_t parent, device_t
panic("bootbus_attach: failed to set up attach args");
config_found(self, &baa, bootbus_print,
- CFARG_DEVHANDLE, prom_node_to_devhandle(node),
- CFARG_SUBMATCH, bootbus_submatch,
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(node),
+ .submatch = bootbus_submatch));
bootbus_destroy_attach_args(&baa);
}
Index: src/sys/arch/sparc/dev/cgfourteen.c
diff -u src/sys/arch/sparc/dev/cgfourteen.c:1.89 src/sys/arch/sparc/dev/cgfourteen.c:1.89.8.1
--- src/sys/arch/sparc/dev/cgfourteen.c:1.89 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc/dev/cgfourteen.c Wed Aug 4 02:57:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cgfourteen.c,v 1.89 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: cgfourteen.c,v 1.89.8.1 2021/08/04 02:57:06 thorpej Exp $ */
/*
* Copyright (c) 1996
@@ -776,7 +776,7 @@ cg14_setup_wsdisplay(struct cgfourteen_s
aa.accessops = &cg14_accessops;
aa.accesscookie = &sc->sc_vd;
- config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARGS_NONE);
}
static void
Index: src/sys/arch/sparc/dev/ebus.c
diff -u src/sys/arch/sparc/dev/ebus.c:1.40 src/sys/arch/sparc/dev/ebus.c:1.40.4.1
--- src/sys/arch/sparc/dev/ebus.c:1.40 Mon May 10 23:53:44 2021
+++ src/sys/arch/sparc/dev/ebus.c Wed Aug 4 02:57:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ebus.c,v 1.40 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: ebus.c,v 1.40.4.1 2021/08/04 02:57:06 thorpej Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.40 2021/05/10 23:53:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.40.4.1 2021/08/04 02:57:06 thorpej Exp $");
#if defined(DEBUG) && !defined(EBUS_DEBUG)
#define EBUS_DEBUG
@@ -317,8 +317,7 @@ ebus_attach(device_t parent, device_t se
DPRINTF(EDB_CHILD,
("- found child `%s', attaching\n", ea.ea_name));
(void)config_found(self, &ea, ebus_print,
- CFARG_DEVHANDLE, prom_node_to_devhandle(node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(node)));
ebus_destroy_attach_args(&ea);
}
}
Index: src/sys/arch/sparc/dev/fd.c
diff -u src/sys/arch/sparc/dev/fd.c:1.162 src/sys/arch/sparc/dev/fd.c:1.162.8.1
--- src/sys/arch/sparc/dev/fd.c:1.162 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc/dev/fd.c Wed Aug 4 02:57:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.162 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: fd.c,v 1.162.8.1 2021/08/04 02:57:06 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.162 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.162.8.1 2021/08/04 02:57:06 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_md.h"
@@ -689,7 +689,7 @@ fdcattach(struct fdc_softc *fdc, int pri
fa.fa_deftype = NULL; /* unknown */
fa.fa_deftype = &fd_types[0]; /* XXX */
if (config_found(fdc->sc_dev, (void *)&fa, fdprint,
- CFARG_EOL) != NULL)
+ CFARGS_NONE) != NULL)
drive_attached = 1;
}
Index: src/sys/arch/sparc/dev/obio.c
diff -u src/sys/arch/sparc/dev/obio.c:1.75 src/sys/arch/sparc/dev/obio.c:1.75.8.1
--- src/sys/arch/sparc/dev/obio.c:1.75 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc/dev/obio.c Wed Aug 4 02:57:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.75 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.75.8.1 2021/08/04 02:57:06 thorpej Exp $ */
/*-
* Copyright (c) 1997,1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.75 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.75.8.1 2021/08/04 02:57:06 thorpej Exp $");
#include "locators.h"
@@ -165,15 +165,13 @@ obioattach(device_t parent, device_t sel
for (cpp = special4; *cpp != NULL; cpp++) {
oa.name = *cpp;
config_search(self, &oa,
- CFARG_SEARCH, obiosearch,
- CFARG_EOL);
+ CFARGS(.search = obiosearch));
}
/* Find all other obio devices */
oa.name = NULL;
config_search(self, &oa,
- CFARG_SEARCH, obiosearch,
- CFARG_EOL);
+ CFARGS(.search = obiosearch));
#endif
return;
} else if (CPU_ISSUN4M) {
@@ -285,7 +283,7 @@ obiosearch(device_t parent, struct cfdat
if (!config_probe(parent, cf, &uoba))
return (0);
- config_attach(parent, cf, &uoba, obioprint, CFARG_EOL);
+ config_attach(parent, cf, &uoba, obioprint, CFARGS_NONE);
return (1);
}
Index: src/sys/arch/sparc/dev/sbus.c
diff -u src/sys/arch/sparc/dev/sbus.c:1.82 src/sys/arch/sparc/dev/sbus.c:1.82.4.1
--- src/sys/arch/sparc/dev/sbus.c:1.82 Mon May 10 23:53:44 2021
+++ src/sys/arch/sparc/dev/sbus.c Wed Aug 4 02:57:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sbus.c,v 1.82 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: sbus.c,v 1.82.4.1 2021/08/04 02:57:06 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.82 2021/05/10 23:53:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.82.4.1 2021/08/04 02:57:06 thorpej Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -413,8 +413,7 @@ sbus_attach_common(struct sbus_softc *sc
panic("sbus_attach: %s: incomplete", sp);
}
(void) config_found(sc->sc_dev, (void *)&sa, sbus_print,
- CFARG_DEVHANDLE, prom_node_to_devhandle(node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(node)));
sbus_destroy_attach_args(&sa);
}
@@ -436,8 +435,7 @@ sbus_attach_common(struct sbus_softc *sc
continue;
}
(void) config_found(sc->sc_dev, (void *)&sa, sbus_print,
- CFARG_DEVHANDLE, prom_node_to_devhandle(node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(node)));
sbus_destroy_attach_args(&sa);
}
}
Index: src/sys/arch/sparc/dev/ts102.c
diff -u src/sys/arch/sparc/dev/ts102.c:1.20 src/sys/arch/sparc/dev/ts102.c:1.20.2.1
--- src/sys/arch/sparc/dev/ts102.c:1.20 Fri Jun 11 04:58:30 2021
+++ src/sys/arch/sparc/dev/ts102.c Wed Aug 4 02:57:06 2021
@@ -1,5 +1,5 @@
/* $OpenBSD: ts102.c,v 1.14 2005/01/27 17:03:23 millert Exp $ */
-/* $NetBSD: ts102.c,v 1.20 2021/06/11 04:58:30 jdc Exp $ */
+/* $NetBSD: ts102.c,v 1.20.2.1 2021/08/04 02:57:06 thorpej Exp $ */
/*
* Copyright (c) 2003, 2004, Miodrag Vallat.
* Copyright (c) 2005, Michael Lorenz.
@@ -410,7 +410,7 @@ tslot_reset(struct tslot_data *td, uint3
paa.pch = (pcmcia_chipset_handle_t)td;
td->td_pcmcia = config_found(td->td_parent->sc_dev, &paa, tslot_print,
- CFARG_EOL);
+ CFARGS_NONE);
if (td->td_pcmcia == NULL) {
/*
Index: src/sys/arch/sparc/dev/vme_machdep.c
diff -u src/sys/arch/sparc/dev/vme_machdep.c:1.73 src/sys/arch/sparc/dev/vme_machdep.c:1.73.4.1
--- src/sys/arch/sparc/dev/vme_machdep.c:1.73 Mon May 10 23:53:44 2021
+++ src/sys/arch/sparc/dev/vme_machdep.c Wed Aug 4 02:57:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vme_machdep.c,v 1.73 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: vme_machdep.c,v 1.73.4.1 2021/08/04 02:57:06 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.73 2021/05/10 23:53:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.73.4.1 2021/08/04 02:57:06 thorpej Exp $");
#include <sys/param.h>
#include <sys/extent.h>
@@ -318,7 +318,7 @@ vmeattach_mainbus(device_t parent, devic
0, 0, EX_WAITOK);
printf("\n");
- (void)config_found(self, &vba, 0, CFARG_EOL);
+ (void)config_found(self, &vba, 0, CFARGS_NONE);
#endif /* SUN4 */
return;
@@ -432,8 +432,7 @@ vmeattach_iommu(device_t parent, device_
sc->sc_reg->vmebus_cr & VMEBUS_CR_IMPL);
(void)config_found(self, &vba, 0,
- CFARG_DEVHANDLE, prom_node_to_devhandle(node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(node)));
#endif /* SUN4M */
}
Index: src/sys/arch/sparc/dev/zs.c
diff -u src/sys/arch/sparc/dev/zs.c:1.122 src/sys/arch/sparc/dev/zs.c:1.122.8.1
--- src/sys/arch/sparc/dev/zs.c:1.122 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc/dev/zs.c Wed Aug 4 02:57:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.122 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: zs.c,v 1.122.8.1 2021/08/04 02:57:06 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.122 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.122.8.1 2021/08/04 02:57:06 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -506,7 +506,7 @@ zs_attach(struct zsc_softc *zsc, struct
*/
child = config_found(zsc->zsc_dev, &zsc_args, zs_print,
- CFARG_EOL);
+ CFARGS_NONE);
if (child == NULL) {
/* No sub-driver. Just reset it. */
uint8_t reset = (channel == 0) ?
@@ -547,13 +547,13 @@ zs_attach(struct zsc_softc *zsc, struct
#if (NKBD > 0)
if (channel == 0) {
kma.kmta_name = "keyboard";
- config_found(child, &kma, NULL, CFARG_EOL);
+ config_found(child, &kma, NULL, CFARGS_NONE);
}
#endif
#if (NMS > 0)
if (channel == 1) {
kma.kmta_name = "mouse";
- config_found(child, &kma, NULL, CFARG_EOL);
+ config_found(child, &kma, NULL, CFARGS_NONE);
}
#endif
}
Index: src/sys/arch/sparc/sparc/autoconf.c
diff -u src/sys/arch/sparc/sparc/autoconf.c:1.268 src/sys/arch/sparc/sparc/autoconf.c:1.268.2.1
--- src/sys/arch/sparc/sparc/autoconf.c:1.268 Sat Jul 31 16:54:37 2021
+++ src/sys/arch/sparc/sparc/autoconf.c Wed Aug 4 02:57:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.268 2021/07/31 16:54:37 andvar Exp $ */
+/* $NetBSD: autoconf.c,v 1.268.2.1 2021/08/04 02:57:06 thorpej Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.268 2021/07/31 16:54:37 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.268.2.1 2021/08/04 02:57:06 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -1222,19 +1222,19 @@ mainbus_attach(device_t parent, device_t
ma.ma_bustag = &mainbus_space_tag;
ma.ma_dmatag = &mainbus_dma_tag;
ma.ma_name = "cpu";
- if (config_found(dev, (void *)&ma, mbprint, CFARG_EOL) == NULL)
+ if (config_found(dev, (void *)&ma, mbprint, CFARGS_NONE) == NULL)
panic("cpu missing");
ma.ma_bustag = &mainbus_space_tag;
ma.ma_dmatag = &mainbus_dma_tag;
ma.ma_name = "obio";
- if (config_found(dev, (void *)&ma, mbprint, CFARG_EOL) == NULL)
+ if (config_found(dev, (void *)&ma, mbprint, CFARGS_NONE) == NULL)
panic("obio missing");
ma.ma_bustag = &mainbus_space_tag;
ma.ma_dmatag = &mainbus_dma_tag;
ma.ma_name = "vme";
- (void)config_found(dev, (void *)&ma, mbprint, CFARG_EOL);
+ (void)config_found(dev, (void *)&ma, mbprint, CFARGS_NONE);
return;
}
#endif
@@ -1286,8 +1286,7 @@ mainbus_attach(device_t parent, device_t
ma.ma_node = node;
ma.ma_name = "cpu";
config_found(dev, (void *)&ma, mbprint,
- CFARG_DEVHANDLE, prom_node_to_devhandle(node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(node)));
if (node == bootnode && bootmid != 0) {
/* Re-enter loop to find all remaining CPUs */
goto rescan;
@@ -1300,8 +1299,7 @@ mainbus_attach(device_t parent, device_t
ma.ma_node = findroot();
ma.ma_name = "cpu";
config_found(dev, (void *)&ma, mbprint,
- CFARG_DEVHANDLE, prom_node_to_devhandle(ma.ma_node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(ma.ma_node)));
}
for (ssp = openboot_special; (sp = ssp->dev) != NULL; ssp++) {
@@ -1332,8 +1330,8 @@ mainbus_attach(device_t parent, device_t
continue;
if (config_found(dev, (void *)&ma, mbprint,
- CFARG_DEVHANDLE, prom_node_to_devhandle(node),
- CFARG_EOL) == NULL) {
+ CFARGS(.devhandle =
+ prom_node_to_devhandle(node))) == NULL) {
if (ssp->flags & BS_OPTIONAL) continue;
panic("%s", sp);
}
@@ -1393,8 +1391,7 @@ mainbus_attach(device_t parent, device_t
ma.ma_promvaddr = 0;
config_found(dev, (void *)&ma, mbprint,
- CFARG_DEVHANDLE, prom_node_to_devhandle(node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(node)));
continue;
}
#endif /* SUN4M */
@@ -1412,8 +1409,7 @@ mainbus_attach(device_t parent, device_t
continue;
config_found(dev, (void *)&ma, mbprint,
- CFARG_DEVHANDLE, prom_node_to_devhandle(node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(node)));
}
#endif /* SUN4C || SUN4M || SUN4D */
}
Index: src/sys/arch/sparc/sparc/cpuunit.c
diff -u src/sys/arch/sparc/sparc/cpuunit.c:1.17 src/sys/arch/sparc/sparc/cpuunit.c:1.17.8.1
--- src/sys/arch/sparc/sparc/cpuunit.c:1.17 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc/sparc/cpuunit.c Wed Aug 4 02:57:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuunit.c,v 1.17 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: cpuunit.c,v 1.17.8.1 2021/08/04 02:57:06 thorpej Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpuunit.c,v 1.17 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpuunit.c,v 1.17.8.1 2021/08/04 02:57:06 thorpej Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -125,7 +125,7 @@ cpuunit_attach(device_t parent, device_t
if (cpuunit_setup_attach_args(sc, sbt, node, &cpua))
panic("cpuunit_attach: failed to set up attach args");
- (void) config_found(self, &cpua, cpuunit_print, CFARG_EOL);
+ (void) config_found(self, &cpua, cpuunit_print, CFARGS_NONE);
cpuunit_destroy_attach_args(&cpua);
}
Index: src/sys/arch/sparc/sparc/iommu.c
diff -u src/sys/arch/sparc/sparc/iommu.c:1.98 src/sys/arch/sparc/sparc/iommu.c:1.98.4.1
--- src/sys/arch/sparc/sparc/iommu.c:1.98 Mon May 10 23:53:44 2021
+++ src/sys/arch/sparc/sparc/iommu.c Wed Aug 4 02:57:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: iommu.c,v 1.98 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: iommu.c,v 1.98.4.1 2021/08/04 02:57:06 thorpej Exp $ */
/*
* Copyright (c) 1996
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.98 2021/05/10 23:53:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.98.4.1 2021/08/04 02:57:06 thorpej Exp $");
#include "opt_sparc_arch.h"
@@ -299,8 +299,7 @@ iommu_attach(device_t parent, device_t s
ia.iom_nreg = 1;
config_found(self, (void *)&ia, iommu_print,
- CFARG_DEVHANDLE, prom_node_to_devhandle(node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(node)));
return;
}
@@ -324,8 +323,7 @@ iommu_attach(device_t parent, device_t s
&ia.iom_nreg, &ia.iom_reg);
config_found(self, (void *)&ia, iommu_print,
- CFARG_DEVHANDLE, prom_node_to_devhandle(node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(node)));
if (ia.iom_reg != NULL)
free(ia.iom_reg, M_DEVBUF);
}
Index: src/sys/arch/sparc/sparc/msiiep.c
diff -u src/sys/arch/sparc/sparc/msiiep.c:1.51 src/sys/arch/sparc/sparc/msiiep.c:1.51.4.1
--- src/sys/arch/sparc/sparc/msiiep.c:1.51 Mon May 10 23:53:44 2021
+++ src/sys/arch/sparc/sparc/msiiep.c Wed Aug 4 02:57:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msiiep.c,v 1.51 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: msiiep.c,v 1.51.4.1 2021/08/04 02:57:06 thorpej Exp $ */
/*
* Copyright (c) 2001 Valeriy E. Ushakov
@@ -27,7 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msiiep.c,v 1.51 2021/05/10 23:53:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msiiep.c,v 1.51.4.1 2021/08/04 02:57:06 thorpej Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -232,11 +232,11 @@ msiiep_attach(device_t parent, device_t
/* config timer/counter part of PCIC */
msa.msa_name = "timer";
- config_found(self, &msa, NULL, CFARG_EOL);
+ config_found(self, &msa, NULL, CFARGS_NONE);
/* config PCI tree */
msa.msa_name = "pcic";
- config_found(self, &msa, NULL, CFARG_EOL);
+ config_found(self, &msa, NULL, CFARGS_NONE);
}
/* ARGSUSED */
@@ -363,8 +363,7 @@ mspcic_attach(device_t parent, device_t
mspcic_pci_scan(sc->sc_node);
config_found(self, &pba, mspcic_print,
- CFARG_DEVHANDLE, prom_node_to_devhandle(sc->sc_node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(sc->sc_node)));
}
Index: src/sys/arch/sparc64/dev/cbus.c
diff -u src/sys/arch/sparc64/dev/cbus.c:1.6 src/sys/arch/sparc64/dev/cbus.c:1.6.4.1
--- src/sys/arch/sparc64/dev/cbus.c:1.6 Mon May 10 23:53:44 2021
+++ src/sys/arch/sparc64/dev/cbus.c Wed Aug 4 02:57:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cbus.c,v 1.6 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: cbus.c,v 1.6.4.1 2021/08/04 02:57:07 thorpej Exp $ */
/* $OpenBSD: cbus.c,v 1.15 2015/09/27 11:29:20 kettenis Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis
@@ -122,8 +122,7 @@ cbus_attach(device_t parent, device_t se
}
config_found(self, &ca, cbus_print,
- CFARG_DEVHANDLE, devhandle_from_of(ca.ca_node),
- CFARG_EOL);
+ CFARGS(.devhandle = devhandle_from_of(ca.ca_node)));
}
}
Index: src/sys/arch/sparc64/dev/central.c
diff -u src/sys/arch/sparc64/dev/central.c:1.7 src/sys/arch/sparc64/dev/central.c:1.7.4.1
--- src/sys/arch/sparc64/dev/central.c:1.7 Mon May 10 23:53:44 2021
+++ src/sys/arch/sparc64/dev/central.c Wed Aug 4 02:57:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: central.c,v 1.7 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: central.c,v 1.7.4.1 2021/08/04 02:57:07 thorpej Exp $ */
/* $OpenBSD: central.c,v 1.7 2010/11/11 17:58:23 miod Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: central.c,v 1.7 2021/05/10 23:53:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: central.c,v 1.7.4.1 2021/08/04 02:57:07 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -113,8 +113,7 @@ central_attach(device_t parent, device_t
&ca.ca_nreg, (void **)&ca.ca_reg);
(void)config_found(self, (void *)&ca, central_print,
- CFARG_DEVHANDLE, prom_node_to_devhandle(ca.ca_node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(ca.ca_node)));
if (ca.ca_name != NULL)
free(ca.ca_name, M_DEVBUF);
Index: src/sys/arch/sparc64/dev/vbus.c
diff -u src/sys/arch/sparc64/dev/vbus.c:1.7 src/sys/arch/sparc64/dev/vbus.c:1.7.4.1
--- src/sys/arch/sparc64/dev/vbus.c:1.7 Mon May 10 23:53:44 2021
+++ src/sys/arch/sparc64/dev/vbus.c Wed Aug 4 02:57:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vbus.c,v 1.7 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: vbus.c,v 1.7.4.1 2021/08/04 02:57:07 thorpej Exp $ */
/* $OpenBSD: vbus.c,v 1.8 2015/09/27 11:29:20 kettenis Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis
@@ -97,14 +97,13 @@ vbus_attach(device_t parent, device_t se
prom_getprop(node, "interrupts", sizeof(*va.va_intr),
&va.va_nintr, (void **)&va.va_intr);
config_found(self, &va, vbus_print,
- CFARG_DEVHANDLE, prom_node_to_devhandle(va.va_node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(va.va_node)));
}
struct vbus_attach_args va;
bzero(&va, sizeof(va));
va.va_name = "rtc";
- config_found(self, &va, vbus_print, CFARG_EOL);
+ config_found(self, &va, vbus_print, CFARGS_NONE);
}
Index: src/sys/arch/sparc64/dev/com_ebus.c
diff -u src/sys/arch/sparc64/dev/com_ebus.c:1.35 src/sys/arch/sparc64/dev/com_ebus.c:1.35.8.1
--- src/sys/arch/sparc64/dev/com_ebus.c:1.35 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc64/dev/com_ebus.c Wed Aug 4 02:57:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: com_ebus.c,v 1.35 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: com_ebus.c,v 1.35.8.1 2021/08/04 02:57:07 thorpej Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_ebus.c,v 1.35 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_ebus.c,v 1.35.8.1 2021/08/04 02:57:07 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -234,13 +234,13 @@ com_ebus_attach(device_t parent, device_
#if (NKBD > 0)
kma.kmta_name = "keyboard";
if (prom_getproplen(ea->ea_node, kma.kmta_name) == 0) {
- config_found(self, (void *)&kma, NULL, CFARG_EOL);
+ config_found(self, (void *)&kma, NULL, CFARGS_NONE);
}
#endif
#if (NMS > 0)
kma.kmta_name = "mouse";
if (prom_getproplen(ea->ea_node, kma.kmta_name) == 0) {
- config_found(self, (void *)&kma, NULL, CFARG_EOL);
+ config_found(self, (void *)&kma, NULL, CFARGS_NONE);
}
#endif
#endif
Index: src/sys/arch/sparc64/dev/ebus.c
diff -u src/sys/arch/sparc64/dev/ebus.c:1.67 src/sys/arch/sparc64/dev/ebus.c:1.67.4.1
--- src/sys/arch/sparc64/dev/ebus.c:1.67 Mon May 10 23:53:44 2021
+++ src/sys/arch/sparc64/dev/ebus.c Wed Aug 4 02:57:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ebus.c,v 1.67 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: ebus.c,v 1.67.4.1 2021/08/04 02:57:07 thorpej Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.67 2021/05/10 23:53:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.67.4.1 2021/08/04 02:57:07 thorpej Exp $");
#include "opt_ddb.h"
@@ -214,8 +214,7 @@ ebus_attach(device_t parent, device_t se
DPRINTF(EDB_CHILD, ("- found child `%s', attaching\n",
eba.ea_name));
(void)config_found(self, &eba, ebus_print,
- CFARG_DEVHANDLE, prom_node_to_devhandle(node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(node)));
}
ebus_destroy_attach_args(&eba);
}
Index: src/sys/arch/sparc64/dev/ebus_mainbus.c
diff -u src/sys/arch/sparc64/dev/ebus_mainbus.c:1.20 src/sys/arch/sparc64/dev/ebus_mainbus.c:1.20.4.1
--- src/sys/arch/sparc64/dev/ebus_mainbus.c:1.20 Mon May 10 23:53:44 2021
+++ src/sys/arch/sparc64/dev/ebus_mainbus.c Wed Aug 4 02:57:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ebus_mainbus.c,v 1.20 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: ebus_mainbus.c,v 1.20.4.1 2021/08/04 02:57:07 thorpej Exp $ */
/* $OpenBSD: ebus_mainbus.c,v 1.7 2010/11/11 17:58:23 miod Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ebus_mainbus.c,v 1.20 2021/05/10 23:53:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus_mainbus.c,v 1.20.4.1 2021/08/04 02:57:07 thorpej Exp $");
#ifdef DEBUG
#define EDB_PROM 0x01
@@ -174,8 +174,7 @@ ebus_mainbus_attach(device_t parent, dev
DPRINTF(EDB_CHILD, ("- found child `%s', attaching\n",
eba.ea_name));
(void)config_found(self, &eba, ebus_print,
- CFARG_DEVHANDLE, prom_node_to_devhandle(node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(node)));
}
ebus_destroy_attach_args(&eba);
}
Index: src/sys/arch/sparc64/dev/fdc.c
diff -u src/sys/arch/sparc64/dev/fdc.c:1.50 src/sys/arch/sparc64/dev/fdc.c:1.50.8.1
--- src/sys/arch/sparc64/dev/fdc.c:1.50 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc64/dev/fdc.c Wed Aug 4 02:57:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc.c,v 1.50 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: fdc.c,v 1.50.8.1 2021/08/04 02:57:07 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.50 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.50.8.1 2021/08/04 02:57:07 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_md.h"
@@ -857,7 +857,7 @@ fdcattach(struct fdc_softc *fdc, int pri
fa.fa_deftype = NULL; /* unknown */
fa.fa_deftype = &fd_types[0]; /* XXX */
if (config_found(fdc->sc_dev, (void *)&fa, fdprint,
- CFARG_EOL) != NULL)
+ CFARGS_NONE) != NULL)
drive_attached = 1;
}
Index: src/sys/arch/sparc64/dev/ffb.c
diff -u src/sys/arch/sparc64/dev/ffb.c:1.66 src/sys/arch/sparc64/dev/ffb.c:1.66.8.1
--- src/sys/arch/sparc64/dev/ffb.c:1.66 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc64/dev/ffb.c Wed Aug 4 02:57:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ffb.c,v 1.66 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: ffb.c,v 1.66.8.1 2021/08/04 02:57:07 thorpej Exp $ */
/* $OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.66 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.66.8.1 2021/08/04 02:57:07 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -377,7 +377,7 @@ ffb_attach(device_t self)
waa.scrdata = &ffb_screenlist;
waa.accessops = &ffb_accessops;
waa.accesscookie = &sc->vd;
- config_found(sc->sc_dev, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dev, &waa, wsemuldisplaydevprint, CFARGS_NONE);
}
void
Index: src/sys/arch/sparc64/dev/fhc.c
diff -u src/sys/arch/sparc64/dev/fhc.c:1.9 src/sys/arch/sparc64/dev/fhc.c:1.9.4.1
--- src/sys/arch/sparc64/dev/fhc.c:1.9 Mon May 10 23:53:44 2021
+++ src/sys/arch/sparc64/dev/fhc.c Wed Aug 4 02:57:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fhc.c,v 1.9 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: fhc.c,v 1.9.4.1 2021/08/04 02:57:07 thorpej Exp $ */
/* $OpenBSD: fhc.c,v 1.17 2010/11/11 17:58:23 miod Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fhc.c,v 1.9 2021/05/10 23:53:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fhc.c,v 1.9.4.1 2021/08/04 02:57:07 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -117,8 +117,7 @@ fhc_attach(struct fhc_softc *sc)
&fa.fa_npromvaddrs, (void **)&fa.fa_promvaddrs);
(void)config_found(sc->sc_dev, (void *)&fa, fhc_print,
- CFARG_DEVHANDLE, prom_node_to_devhandle(node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(node)));
if (fa.fa_name != NULL)
free(fa.fa_name, M_DEVBUF);
Index: src/sys/arch/sparc64/dev/gfb.c
diff -u src/sys/arch/sparc64/dev/gfb.c:1.10 src/sys/arch/sparc64/dev/gfb.c:1.10.8.1
--- src/sys/arch/sparc64/dev/gfb.c:1.10 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc64/dev/gfb.c Wed Aug 4 02:57:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gfb.c,v 1.10 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: gfb.c,v 1.10.8.1 2021/08/04 02:57:07 thorpej Exp $ */
/*
* Copyright (c) 2009 Michael Lorenz
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gfb.c,v 1.10 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gfb.c,v 1.10.8.1 2021/08/04 02:57:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -229,7 +229,7 @@ gfb_attach(device_t parent, device_t sel
aa.accessops = &gfb_accessops;
aa.accesscookie = &sc->vd;
- config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARGS_NONE);
#ifdef GFB_DEBUG
/*
Index: src/sys/arch/sparc64/dev/jbus-i2c.c
diff -u src/sys/arch/sparc64/dev/jbus-i2c.c:1.6 src/sys/arch/sparc64/dev/jbus-i2c.c:1.6.8.1
--- src/sys/arch/sparc64/dev/jbus-i2c.c:1.6 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc64/dev/jbus-i2c.c Wed Aug 4 02:57:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: jbus-i2c.c,v 1.6 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: jbus-i2c.c,v 1.6.8.1 2021/08/04 02:57:07 thorpej Exp $ */
/*
* Copyright (c) 2018 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: jbus-i2c.c,v 1.6 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jbus-i2c.c,v 1.6.8.1 2021/08/04 02:57:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -178,7 +178,7 @@ jbusi2c_setup_i2c(struct jbusi2c_softc *
}
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);
}
static inline void
Index: src/sys/arch/sparc64/dev/psycho.c
diff -u src/sys/arch/sparc64/dev/psycho.c:1.134 src/sys/arch/sparc64/dev/psycho.c:1.134.4.1
--- src/sys/arch/sparc64/dev/psycho.c:1.134 Mon May 10 23:53:44 2021
+++ src/sys/arch/sparc64/dev/psycho.c Wed Aug 4 02:57:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: psycho.c,v 1.134 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: psycho.c,v 1.134.4.1 2021/08/04 02:57:07 thorpej Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.134 2021/05/10 23:53:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.134.4.1 2021/08/04 02:57:07 thorpej Exp $");
#include "opt_ddb.h"
@@ -685,8 +685,7 @@ found:
pba.pba_pc = pp->pp_pc;
config_found(self, &pba, psycho_print,
- CFARG_DEVHANDLE, prom_node_to_devhandle(sc->sc_node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(sc->sc_node)));
}
static int
Index: src/sys/arch/sparc64/dev/pyro.c
diff -u src/sys/arch/sparc64/dev/pyro.c:1.24 src/sys/arch/sparc64/dev/pyro.c:1.24.4.1
--- src/sys/arch/sparc64/dev/pyro.c:1.24 Mon May 10 23:53:44 2021
+++ src/sys/arch/sparc64/dev/pyro.c Wed Aug 4 02:57:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pyro.c,v 1.24 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: pyro.c,v 1.24.4.1 2021/08/04 02:57:07 thorpej Exp $ */
/* from: $OpenBSD: pyro.c,v 1.20 2010/12/05 15:15:14 kettenis Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pyro.c,v 1.24 2021/05/10 23:53:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pyro.c,v 1.24.4.1 2021/08/04 02:57:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -238,8 +238,7 @@ pyro_init(struct pyro_softc *sc, int bus
free(busranges, M_DEVBUF);
config_found(sc->sc_dev, &pba, pyro_print,
- CFARG_DEVHANDLE, prom_node_to_devhandle(sc->sc_node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(sc->sc_node)));
}
void
Index: src/sys/arch/sparc64/dev/sab.c
diff -u src/sys/arch/sparc64/dev/sab.c:1.56 src/sys/arch/sparc64/dev/sab.c:1.56.8.1
--- src/sys/arch/sparc64/dev/sab.c:1.56 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc64/dev/sab.c Wed Aug 4 02:57:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sab.c,v 1.56 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: sab.c,v 1.56.8.1 2021/08/04 02:57:07 thorpej Exp $ */
/* $OpenBSD: sab.c,v 1.7 2002/04/08 17:49:42 jason Exp $ */
/*
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sab.c,v 1.56 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sab.c,v 1.56.8.1 2021/08/04 02:57:07 thorpej Exp $");
#include "opt_kgdb.h"
#include <sys/types.h>
@@ -322,9 +322,8 @@ sab_attach(device_t parent, device_t sel
sc->sc_child[i] = device_private(
config_found(self, &stax, sab_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL));
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs)));
if (sc->sc_child[i] != NULL)
sc->sc_nchild++;
}
Index: src/sys/arch/sparc64/dev/sbus.c
diff -u src/sys/arch/sparc64/dev/sbus.c:1.102 src/sys/arch/sparc64/dev/sbus.c:1.102.4.1
--- src/sys/arch/sparc64/dev/sbus.c:1.102 Mon May 10 23:53:44 2021
+++ src/sys/arch/sparc64/dev/sbus.c Wed Aug 4 02:57:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sbus.c,v 1.102 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: sbus.c,v 1.102.4.1 2021/08/04 02:57:07 thorpej Exp $ */
/*
* Copyright (c) 1999-2002 Eduardo Horvath
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.102 2021/05/10 23:53:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.102.4.1 2021/08/04 02:57:07 thorpej Exp $");
#include "opt_ddb.h"
@@ -294,8 +294,7 @@ sbus_attach(device_t parent, device_t se
continue;
}
(void) config_found(self, &sa, sbus_print,
- CFARG_DEVHANDLE, prom_node_to_devhandle(node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(node)));
sbus_destroy_attach_args(&sa);
}
}
Index: src/sys/arch/sparc64/dev/schizo.c
diff -u src/sys/arch/sparc64/dev/schizo.c:1.45 src/sys/arch/sparc64/dev/schizo.c:1.45.4.1
--- src/sys/arch/sparc64/dev/schizo.c:1.45 Mon May 10 23:53:44 2021
+++ src/sys/arch/sparc64/dev/schizo.c Wed Aug 4 02:57:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: schizo.c,v 1.45 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: schizo.c,v 1.45.4.1 2021/08/04 02:57:07 thorpej Exp $ */
/* $OpenBSD: schizo.c,v 1.55 2008/08/18 20:29:37 brad Exp $ */
/*
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: schizo.c,v 1.45 2021/05/10 23:53:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: schizo.c,v 1.45.4.1 2021/08/04 02:57:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -366,8 +366,7 @@ schizo_attach(device_t parent, device_t
}
config_found(sc->sc_dev, &pba, schizo_print,
- CFARG_DEVHANDLE, prom_node_to_devhandle(sc->sc_node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(sc->sc_node)));
}
int
Index: src/sys/arch/sparc64/dev/upa.c
diff -u src/sys/arch/sparc64/dev/upa.c:1.22 src/sys/arch/sparc64/dev/upa.c:1.22.4.1
--- src/sys/arch/sparc64/dev/upa.c:1.22 Mon May 10 23:53:44 2021
+++ src/sys/arch/sparc64/dev/upa.c Wed Aug 4 02:57:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: upa.c,v 1.22 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: upa.c,v 1.22.4.1 2021/08/04 02:57:07 thorpej Exp $ */
/* $OpenBSD: upa.c,v 1.8 2008/01/17 22:53:18 kettenis Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: upa.c,v 1.22 2021/05/10 23:53:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: upa.c,v 1.22.4.1 2021/08/04 02:57:07 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -133,8 +133,7 @@ upa_attach(device_t parent, device_t sel
map.ma_bustag = sc->sc_cbt;
map.ma_dmatag = ma->ma_dmatag;
config_found(sc->sc_dev, &map, upa_print,
- CFARG_DEVHANDLE, prom_node_to_devhandle(node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(node)));
}
}
Index: src/sys/arch/sparc64/dev/vdsk.c
diff -u src/sys/arch/sparc64/dev/vdsk.c:1.7 src/sys/arch/sparc64/dev/vdsk.c:1.7.2.1
--- src/sys/arch/sparc64/dev/vdsk.c:1.7 Fri Jun 25 19:10:50 2021
+++ src/sys/arch/sparc64/dev/vdsk.c Wed Aug 4 02:57:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vdsk.c,v 1.7 2021/06/25 19:10:50 palle Exp $ */
+/* $NetBSD: vdsk.c,v 1.7.2.1 2021/08/04 02:57:07 thorpej Exp $ */
/* $OpenBSD: vdsk.c,v 1.46 2015/01/25 21:42:13 kettenis Exp $ */
/*
* Copyright (c) 2009, 2011 Mark Kettenis
@@ -392,7 +392,7 @@ vdsk_attach(device_t parent, device_t se
sc->sc_channel.chan_id = 0;
sc->sc_channel.chan_flags = SCSIPI_CHAN_NOSETTLE;
- config_found(self, &sc->sc_channel, scsiprint, CFARG_EOL);
+ config_found(self, &sc->sc_channel, scsiprint, CFARGS_NONE);
return;
Index: src/sys/arch/sparc64/dev/vpci.c
diff -u src/sys/arch/sparc64/dev/vpci.c:1.11 src/sys/arch/sparc64/dev/vpci.c:1.11.4.1
--- src/sys/arch/sparc64/dev/vpci.c:1.11 Mon May 10 23:53:44 2021
+++ src/sys/arch/sparc64/dev/vpci.c Wed Aug 4 02:57:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vpci.c,v 1.11 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: vpci.c,v 1.11.4.1 2021/08/04 02:57:07 thorpej Exp $ */
/*
* Copyright (c) 2015 Palle Lyckegaard
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vpci.c,v 1.11 2021/05/10 23:53:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vpci.c,v 1.11.4.1 2021/08/04 02:57:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -268,8 +268,7 @@ FIXME
free(busranges, M_DEVBUF);
config_found(sc->sc_dev, &pba, vpci_print,
- CFARG_DEVHANDLE, prom_node_to_devhandle(sc->sc_node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(sc->sc_node)));
}
void
Index: src/sys/arch/sparc64/dev/zs.c
diff -u src/sys/arch/sparc64/dev/zs.c:1.76 src/sys/arch/sparc64/dev/zs.c:1.76.8.1
--- src/sys/arch/sparc64/dev/zs.c:1.76 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc64/dev/zs.c Wed Aug 4 02:57:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.76 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: zs.c,v 1.76.8.1 2021/08/04 02:57:07 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.76 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.76.8.1 2021/08/04 02:57:07 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -408,7 +408,7 @@ zs_attach(struct zsc_softc *zsc, struct
* The child attach will setup the hardware.
*/
child = config_found(zsc->zsc_dev, (void *)&zsc_args,
- zs_print, CFARG_EOL);
+ zs_print, CFARGS_NONE);
if (child == NULL) {
/* No sub-driver. Just reset it. */
uint8_t reset = (channel == 0) ?
@@ -438,14 +438,14 @@ zs_attach(struct zsc_softc *zsc, struct
if (channel == 0) {
kma.kmta_name = "keyboard";
config_found(child, (void *)&kma, NULL,
- CFARG_EOL);
+ CFARGS_NONE);
}
#endif
#if (NMS > 0)
if (channel == 1) {
kma.kmta_name = "mouse";
config_found(child, (void *)&kma, NULL,
- CFARG_EOL);
+ CFARGS_NONE);
}
#endif
}
Index: src/sys/arch/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.233 src/sys/arch/sparc64/sparc64/autoconf.c:1.233.2.1
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.233 Sat Jul 3 19:39:07 2021
+++ src/sys/arch/sparc64/sparc64/autoconf.c Wed Aug 4 02:57:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.233 2021/07/03 19:39:07 palle Exp $ */
+/* $NetBSD: autoconf.c,v 1.233.2.1 2021/08/04 02:57:07 thorpej Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.233 2021/07/03 19:39:07 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.233.2.1 2021/08/04 02:57:07 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -730,8 +730,7 @@ extern struct sparc_bus_space_tag mainbu
ma.ma_node = node;
ma.ma_name = "cpu";
config_found(dev, &ma, mbprint,
- CFARG_DEVHANDLE, devhandle_from_of(ma.ma_node),
- CFARG_EOL);
+ CFARGS(.devhandle = devhandle_from_of(ma.ma_node)));
}
node = findroot(); /* re-init root node */
@@ -815,8 +814,7 @@ extern struct sparc_bus_space_tag mainbu
}
#endif
(void) config_found(dev, (void *)&ma, mbprint,
- CFARG_DEVHANDLE, prom_node_to_devhandle(ma.ma_node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(ma.ma_node)));
free(ma.ma_reg, M_DEVBUF);
if (ma.ma_ninterrupts)
free(ma.ma_interrupts, M_DEVBUF);
@@ -826,7 +824,7 @@ extern struct sparc_bus_space_tag mainbu
/* Try to attach PROM console */
memset(&ma, 0, sizeof ma);
ma.ma_name = "pcons";
- (void) config_found(dev, (void *)&ma, mbprint, CFARG_EOL);
+ (void) config_found(dev, (void *)&ma, mbprint, CFARGS_NONE);
}
CFATTACH_DECL_NEW(mainbus, 0,
