Module Name: src
Committed By: thorpej
Date: Wed Aug 4 03:03:31 UTC 2021
Modified Files:
src/sys/arch/x68k/dev [thorpej-cfargs2]: fd.c grf_machdep.c intio.c
mfp.c mha.c neptune.c scsirom.c zs.c
src/sys/arch/x68k/x68k [thorpej-cfargs2]: mainbus.c
src/sys/arch/x86/pci [thorpej-cfargs2]: amdnb_misc.c amdpcib.c amdsmn.c
dwiic_pci.c ichlpcib.c pchb.c pcib.c tcpcib.c
src/sys/arch/x86/pci/imcsmb [thorpej-cfargs2]: imc.c imcsmb.c
src/sys/arch/x86/x86 [thorpej-cfargs2]: cpu.c mainbus.c mp.c mpacpi.c
mpbios.c
src/sys/arch/xen/x86 [thorpej-cfargs2]: cpu.c xen_mainbus.c
src/sys/arch/xen/xen [thorpej-cfargs2]: hypervisor.c xpci_xenbus.c
src/sys/arch/xen/xenbus [thorpej-cfargs2]: xenbus_probe.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.124.8.1 src/sys/arch/x68k/dev/fd.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/x68k/dev/grf_machdep.c
cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/arch/x68k/dev/intio.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/arch/x68k/dev/mfp.c
cvs rdiff -u -r1.55 -r1.55.8.1 src/sys/arch/x68k/dev/mha.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/x68k/dev/neptune.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/x68k/dev/scsirom.c
cvs rdiff -u -r1.45 -r1.45.8.1 src/sys/arch/x68k/dev/zs.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/x68k/x68k/mainbus.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/x86/pci/amdnb_misc.c \
src/sys/arch/x86/pci/amdpcib.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/x86/pci/amdsmn.c
cvs rdiff -u -r1.5 -r1.5.4.1 src/sys/arch/x86/pci/dwiic_pci.c
cvs rdiff -u -r1.53 -r1.53.8.1 src/sys/arch/x86/pci/ichlpcib.c
cvs rdiff -u -r1.36 -r1.36.8.1 src/sys/arch/x86/pci/pchb.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/x86/pci/pcib.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/x86/pci/tcpcib.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/x86/pci/imcsmb/imc.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/x86/pci/imcsmb/imcsmb.c
cvs rdiff -u -r1.200 -r1.200.8.1 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/x86/x86/mainbus.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/x86/x86/mp.c
cvs rdiff -u -r1.106 -r1.106.4.1 src/sys/arch/x86/x86/mpacpi.c
cvs rdiff -u -r1.69 -r1.69.8.1 src/sys/arch/x86/x86/mpbios.c
cvs rdiff -u -r1.140 -r1.140.8.1 src/sys/arch/xen/x86/cpu.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/xen/x86/xen_mainbus.c
cvs rdiff -u -r1.91 -r1.91.8.1 src/sys/arch/xen/xen/hypervisor.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/xen/xen/xpci_xenbus.c
cvs rdiff -u -r1.57 -r1.57.2.1 src/sys/arch/xen/xenbus/xenbus_probe.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/x68k/dev/fd.c
diff -u src/sys/arch/x68k/dev/fd.c:1.124 src/sys/arch/x68k/dev/fd.c:1.124.8.1
--- src/sys/arch/x68k/dev/fd.c:1.124 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x68k/dev/fd.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.124 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: fd.c,v 1.124.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.124 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.124.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_m68k_arch.h"
@@ -514,7 +514,7 @@ fdcattach(device_t parent, device_t self
/* physical limit: four drives per controller. */
for (fa.fa_drive = 0; fa.fa_drive < 4; fa.fa_drive++) {
- (void)config_found(self, (void *)&fa, fdprint, CFARG_EOL);
+ (void)config_found(self, (void *)&fa, fdprint, CFARGS_NONE);
}
intio_enable_intr(SICILIAN_INTR_FDC);
Index: src/sys/arch/x68k/dev/grf_machdep.c
diff -u src/sys/arch/x68k/dev/grf_machdep.c:1.33 src/sys/arch/x68k/dev/grf_machdep.c:1.33.8.1
--- src/sys/arch/x68k/dev/grf_machdep.c:1.33 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x68k/dev/grf_machdep.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_machdep.c,v 1.33 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: grf_machdep.c,v 1.33.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*
* Copyright (c) 1991 University of Utah.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_machdep.c,v 1.33 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_machdep.c,v 1.33.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include "locators.h"
@@ -93,15 +93,14 @@ grfbusattach(device_t parent, device_t s
aprint_normal("\n");
config_search(self, NULL,
- CFARG_SEARCH, grfbussearch,
- CFARG_EOL);
+ CFARGS(.search = grfbussearch));
}
int
grfbussearch(device_t self, cfdata_t match, const int *ldesc, void *aux)
{
- config_found(self, &match->cf_loc[GRFBCF_ADDR], grfbusprint, CFARG_EOL);
+ config_found(self, &match->cf_loc[GRFBCF_ADDR], grfbusprint, CFARGS_NONE);
return (0);
}
@@ -157,7 +156,7 @@ grfattach(device_t parent, device_t self
/*
* try and attach an ite
*/
- config_found(self, gp, grfprint, CFARG_EOL);
+ config_found(self, gp, grfprint, CFARGS_NONE);
}
int
Index: src/sys/arch/x68k/dev/intio.c
diff -u src/sys/arch/x68k/dev/intio.c:1.48 src/sys/arch/x68k/dev/intio.c:1.48.8.1
--- src/sys/arch/x68k/dev/intio.c:1.48 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x68k/dev/intio.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intio.c,v 1.48 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: intio.c,v 1.48.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.48 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.48.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -176,8 +176,7 @@ intio_attach(device_t parent, device_t s
ia.ia_dmat = sc->sc_dmat;
config_search(self, &ia,
- CFARG_SEARCH, intio_search,
- CFARG_EOL);
+ CFARGS(.search = intio_search));
}
static int
@@ -195,7 +194,7 @@ intio_search(device_t parent, cfdata_t c
ia->ia_dmaintr = cf->cf_dmaintr;
if (config_probe(parent, cf, ia))
- config_attach(parent, cf, ia, intio_print, CFARG_EOL);
+ config_attach(parent, cf, ia, intio_print, CFARGS_NONE);
return (0);
}
Index: src/sys/arch/x68k/dev/mfp.c
diff -u src/sys/arch/x68k/dev/mfp.c:1.28 src/sys/arch/x68k/dev/mfp.c:1.28.8.1
--- src/sys/arch/x68k/dev/mfp.c:1.28 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x68k/dev/mfp.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mfp.c,v 1.28 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: mfp.c,v 1.28.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*-
* Copyright (c) 1998 NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfp.c,v 1.28 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfp.c,v 1.28.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -108,8 +108,7 @@ mfp_attach(device_t parent, device_t sel
#endif
bus_space_map(ia->ia_bst, ia->ia_addr, 0x2000, 0, &sc->sc_bht);
config_search(self, NULL,
- CFARG_SEARCH, mfp_search,
- CFARG_EOL);
+ CFARGS(.search = mfp_search));
}
static int
@@ -117,7 +116,7 @@ mfp_search(device_t parent, cfdata_t cf,
{
if (config_probe(parent, cf, __UNCONST(cf->cf_name)))
config_attach(parent, cf, __UNCONST(cf->cf_name), NULL,
- CFARG_EOL);
+ CFARGS_NONE);
return 0;
}
Index: src/sys/arch/x68k/dev/mha.c
diff -u src/sys/arch/x68k/dev/mha.c:1.55 src/sys/arch/x68k/dev/mha.c:1.55.8.1
--- src/sys/arch/x68k/dev/mha.c:1.55 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x68k/dev/mha.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mha.c,v 1.55 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: mha.c,v 1.55.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*-
* Copyright (c) 1996-1999 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mha.c,v 1.55 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mha.c,v 1.55.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include "opt_ddb.h"
@@ -387,7 +387,7 @@ mhaattach(device_t parent, device_t self
tmpsc = NULL;
- config_found(self, &sc->sc_channel, scsiprint, CFARG_EOL);
+ config_found(self, &sc->sc_channel, scsiprint, CFARGS_NONE);
}
#if 0
Index: src/sys/arch/x68k/dev/neptune.c
diff -u src/sys/arch/x68k/dev/neptune.c:1.22 src/sys/arch/x68k/dev/neptune.c:1.22.8.1
--- src/sys/arch/x68k/dev/neptune.c:1.22 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x68k/dev/neptune.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: neptune.c,v 1.22 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: neptune.c,v 1.22.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: neptune.c,v 1.22 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: neptune.c,v 1.22.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -118,11 +118,10 @@ neptune_attach(device_t parent, device_t
na.na_intr = ia->ia_intr;
cf = config_search(self, &na,
- CFARG_SUBMATCH, neptune_search,
- CFARG_EOL);
+ CFARGS(.submatch = neptune_search));
if (cf) {
aprint_normal(": Neptune-X ISA bridge\n");
- config_attach(self, cf, &na, neptune_print, CFARG_EOL);
+ config_attach(self, cf, &na, neptune_print, CFARGS_NONE);
} else {
aprint_normal(": no device found.\n");
intio_map_free_region(parent, ia);
Index: src/sys/arch/x68k/dev/scsirom.c
diff -u src/sys/arch/x68k/dev/scsirom.c:1.21 src/sys/arch/x68k/dev/scsirom.c:1.21.8.1
--- src/sys/arch/x68k/dev/scsirom.c:1.21 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x68k/dev/scsirom.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: scsirom.c,v 1.21 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: scsirom.c,v 1.21.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsirom.c,v 1.21 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsirom.c,v 1.21.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -157,9 +157,9 @@ scsirom_attach(device_t parent, device_t
aprint_normal(": External at %p\n", (void *)ia->ia_addr);
cf = config_search(self, ia,
- CFARG_EOL);
+ CFARGS_NONE);
if (cf) {
- config_attach(self, cf, ia, NULL, CFARG_EOL);
+ config_attach(self, cf, ia, NULL, CFARGS_NONE);
} else {
aprint_normal_dev(self, "no matching device; ignored.\n");
}
Index: src/sys/arch/x68k/dev/zs.c
diff -u src/sys/arch/x68k/dev/zs.c:1.45 src/sys/arch/x68k/dev/zs.c:1.45.8.1
--- src/sys/arch/x68k/dev/zs.c:1.45 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x68k/dev/zs.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.45 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: zs.c,v 1.45.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*-
* Copyright (c) 1998 Minoura Makoto
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.45 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.45.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -251,7 +251,7 @@ zs_attach(device_t parent, device_t self
* The child attach will setup the hardware.
*/
child = config_found(self, (void *)&zsc_args, zs_print,
- CFARG_EOL);
+ CFARGS_NONE);
#if ZSTTY > 0
if (zc == conschan &&
((child && strcmp(device_xname(child), "zstty0")) ||
Index: src/sys/arch/x68k/x68k/mainbus.c
diff -u src/sys/arch/x68k/x68k/mainbus.c:1.6 src/sys/arch/x68k/x68k/mainbus.c:1.6.8.1
--- src/sys/arch/x68k/x68k/mainbus.c:1.6 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x68k/x68k/mainbus.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.6 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.6.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*
* Copyright (c) 2008 Tetsuya Isaki. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,6 +65,6 @@ mainbus_attach(device_t parent, device_t
aprint_normal("\n");
- config_found(self, __UNCONST("intio") , NULL, CFARG_EOL);
- config_found(self, __UNCONST("grfbus") , NULL, CFARG_EOL);
+ config_found(self, __UNCONST("intio") , NULL, CFARGS_NONE);
+ config_found(self, __UNCONST("grfbus") , NULL, CFARGS_NONE);
}
Index: src/sys/arch/x86/pci/amdnb_misc.c
diff -u src/sys/arch/x86/pci/amdnb_misc.c:1.4 src/sys/arch/x86/pci/amdnb_misc.c:1.4.8.1
--- src/sys/arch/x86/pci/amdnb_misc.c:1.4 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x86/pci/amdnb_misc.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdnb_misc.c,v 1.4 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: amdnb_misc.c,v 1.4.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdnb_misc.c,v 1.4 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdnb_misc.c,v 1.4.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -114,7 +114,7 @@ amdnb_misc_search(device_t parent, cfdat
if (!attach)
return 0;
- config_attach(parent, cf, aux, NULL, CFARG_EOL);
+ config_attach(parent, cf, aux, NULL, CFARGS_NONE);
return 0;
}
@@ -134,8 +134,7 @@ amdnb_misc_attach(device_t parent, devic
aprint_error_dev(self, "couldn't establish power handler\n");
config_search(self, &sc->sc_pa,
- CFARG_SEARCH, amdnb_misc_search,
- CFARG_EOL);
+ CFARGS(.search = amdnb_misc_search));
return;
}
@@ -159,8 +158,7 @@ amdnb_misc_rescan(device_t self, const c
struct amdnb_misc_softc *sc = device_private(self);
config_search(self, &sc->sc_pa,
- CFARG_SEARCH, amdnb_misc_search,
- CFARG_EOL);
+ CFARGS(.search = amdnb_misc_search));
return 0;
}
Index: src/sys/arch/x86/pci/amdpcib.c
diff -u src/sys/arch/x86/pci/amdpcib.c:1.4 src/sys/arch/x86/pci/amdpcib.c:1.4.8.1
--- src/sys/arch/x86/pci/amdpcib.c:1.4 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x86/pci/amdpcib.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdpcib.c,v 1.4 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: amdpcib.c,v 1.4.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*
* Copyright (c) 2006 Nicolas Joly
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdpcib.c,v 1.4 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdpcib.c,v 1.4.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include <sys/systm.h>
#include <sys/device.h>
@@ -73,9 +73,8 @@ amdpcib_attach(device_t parent, device_t
pcibattach(parent, self, aux);
config_search(self, pa,
- CFARG_SEARCH, amdpcib_search,
- CFARG_IATTR, "amdpcib",
- CFARG_EOL);
+ CFARGS(.search = amdpcib_search,
+ .iattr = "amdpcib"));
}
static int
@@ -84,8 +83,7 @@ amdpcib_search(device_t parent, cfdata_t
if (config_probe(parent, cf, aux))
config_attach(parent, cf, aux, NULL,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.locators = locs));
return 0;
}
Index: src/sys/arch/x86/pci/amdsmn.c
diff -u src/sys/arch/x86/pci/amdsmn.c:1.11 src/sys/arch/x86/pci/amdsmn.c:1.11.8.1
--- src/sys/arch/x86/pci/amdsmn.c:1.11 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x86/pci/amdsmn.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdsmn.c,v 1.11 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: amdsmn.c,v 1.11.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*-
* Copyright (c) 2017, 2019 Conrad Meyer <[email protected]>
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdsmn.c,v 1.11 2021/04/24 23:36:51 thorpej Exp $ ");
+__KERNEL_RCSID(0, "$NetBSD: amdsmn.c,v 1.11.8.1 2021/08/04 03:03:30 thorpej Exp $ ");
/*
* Driver for the AMD Family 15h (model 60+) and 17h CPU
@@ -124,8 +124,7 @@ amdsmn_misc_search(device_t parent, cfda
{
if (config_probe(parent, cf, aux))
config_attach(parent, cf, aux, NULL,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.locators = locs));
return 0;
}
@@ -159,8 +158,7 @@ amdsmn_rescan(device_t self, const char
struct amdsmn_softc *sc = device_private(self);
config_search(self, &sc->pa,
- CFARG_SEARCH, amdsmn_misc_search,
- CFARG_EOL);
+ CFARGS(.search = amdsmn_misc_search));
return 0;
}
Index: src/sys/arch/x86/pci/dwiic_pci.c
diff -u src/sys/arch/x86/pci/dwiic_pci.c:1.5 src/sys/arch/x86/pci/dwiic_pci.c:1.5.4.1
--- src/sys/arch/x86/pci/dwiic_pci.c:1.5 Sat May 29 09:47:28 2021
+++ src/sys/arch/x86/pci/dwiic_pci.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dwiic_pci.c,v 1.5 2021/05/29 09:47:28 riastradh Exp $ */
+/* $NetBSD: dwiic_pci.c,v 1.5.4.1 2021/08/04 03:03:30 thorpej Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c,v 1.5 2021/05/29 09:47:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c,v 1.5.4.1 2021/08/04 03:03:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -176,7 +176,7 @@ pci_dwiic_attach(device_t parent, device
dwiic_attach(&sc->sc_dwiic);
- config_found(self, &sc->sc_dwiic.sc_iba, iicbus_print, CFARG_EOL);
+ config_found(self, &sc->sc_dwiic.sc_iba, iicbus_print, CFARGS_NONE);
pmf_device_register(self, dwiic_suspend, dwiic_resume);
Index: src/sys/arch/x86/pci/ichlpcib.c
diff -u src/sys/arch/x86/pci/ichlpcib.c:1.53 src/sys/arch/x86/pci/ichlpcib.c:1.53.8.1
--- src/sys/arch/x86/pci/ichlpcib.c:1.53 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x86/pci/ichlpcib.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ichlpcib.c,v 1.53 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: ichlpcib.c,v 1.53.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.53 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.53.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -643,8 +643,7 @@ tcotimer_configure(device_t self)
arg.ta_pcib = &(sc->sc_pcib);
sc->sc_tco = config_found(self, &arg, NULL,
- CFARG_IATTR, "tcoichbus",
- CFARG_EOL);
+ CFARGS(.iattr = "tcoichbus"));
}
static int
@@ -872,8 +871,7 @@ lpcib_hpet_configure(device_t self)
arg.hpet_reg = hpet_reg;
sc->sc_hpetbus = config_found(self, &arg, NULL,
- CFARG_IATTR, "hpetichbus",
- CFARG_EOL);
+ CFARGS(.iattr = "hpetichbus"));
}
static int
@@ -982,8 +980,7 @@ lpcib_gpio_configure(device_t self)
gba.gba_npins = LPCIB_GPIO_NPINS;
sc->sc_gpiobus = config_found(self, &gba, gpiobus_print,
- CFARG_IATTR, "gpiobus",
- CFARG_EOL);
+ CFARGS(.iattr = "gpiobus"));
}
static int
@@ -1107,8 +1104,7 @@ lpcib_fwh_configure(device_t self)
}
sc->sc_fwhbus = config_found(self, NULL, NULL,
- CFARG_IATTR, "fwhichbus",
- CFARG_EOL);
+ CFARGS(.iattr = "fwhichbus"));
/* restore previous write enable setting */
pci_conf_write(sc->sc_pcib.sc_pc, sc->sc_pcib.sc_tag,
Index: src/sys/arch/x86/pci/pchb.c
diff -u src/sys/arch/x86/pci/pchb.c:1.36 src/sys/arch/x86/pci/pchb.c:1.36.8.1
--- src/sys/arch/x86/pci/pchb.c:1.36 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x86/pci/pchb.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pchb.c,v 1.36 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: pchb.c,v 1.36.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.36 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.36.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -418,8 +418,7 @@ pchbattach(device_t parent, device_t sel
NULL, NULL) != 0) {
apa.apa_pci_args = *pa;
config_found(self, &apa, agpbusprint,
- CFARG_IATTR, "agpbus",
- CFARG_EOL);
+ CFARGS(.iattr = "agpbus"));
}
if (doattach) {
@@ -435,8 +434,7 @@ pchbattach(device_t parent, device_t sel
pba.pba_intrswiz = 0;
memset(&pba.pba_intrtag, 0, sizeof(pba.pba_intrtag));
config_found(self, &pba, pcibusprint,
- CFARG_IATTR, "pcibus",
- CFARG_EOL);
+ CFARGS(.iattr = "pcibus"));
}
}
Index: src/sys/arch/x86/pci/pcib.c
diff -u src/sys/arch/x86/pci/pcib.c:1.20 src/sys/arch/x86/pci/pcib.c:1.20.8.1
--- src/sys/arch/x86/pci/pcib.c:1.20 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x86/pci/pcib.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.20 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: pcib.c,v 1.20.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.20 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.20.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -245,8 +245,7 @@ pcibrescan(device_t self, const char *if
#endif
sc->sc_isabus =
config_found(self, &iba, isabusprint,
- CFARG_IATTR, "isabus",
- CFARG_EOL);
+ CFARGS(.iattr = "isabus"));
}
return 0;
}
Index: src/sys/arch/x86/pci/tcpcib.c
diff -u src/sys/arch/x86/pci/tcpcib.c:1.3 src/sys/arch/x86/pci/tcpcib.c:1.3.8.1
--- src/sys/arch/x86/pci/tcpcib.c:1.3 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x86/pci/tcpcib.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tcpcib.c,v 1.3 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: tcpcib.c,v 1.3.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/* $OpenBSD: tcpcib.c,v 1.4 2012/10/17 22:32:01 deraadt Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcpcib.c,v 1.3 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcpcib.c,v 1.3.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -275,8 +275,7 @@ tcpcib_rescan(device_t self, const char
hpet_arg.hpet_reg = E600_HPET_BASE;
sc->sc_hpetbus =
config_found(self, &hpet_arg, NULL,
- CFARG_IATTR, "hpetichbus",
- CFARG_EOL);
+ CFARGS(.iattr = "hpetichbus"));
}
return pcibrescan(self, ifattr, locators);
Index: src/sys/arch/x86/pci/imcsmb/imc.c
diff -u src/sys/arch/x86/pci/imcsmb/imc.c:1.3 src/sys/arch/x86/pci/imcsmb/imc.c:1.3.8.1
--- src/sys/arch/x86/pci/imcsmb/imc.c:1.3 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x86/pci/imcsmb/imc.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: imc.c,v 1.3 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: imc.c,v 1.3.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imc.c,v 1.3 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imc.c,v 1.3.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -246,7 +246,7 @@ imc_rescan(device_t self, const char *if
imca.ia_pci_tag = sc->sc_pci_tag;
imca.ia_pci_chipset_tag = sc->sc_pci_chipset_tag;
sc->sc_smbchild[unit] =
- config_found(self, &imca, NULL, CFARG_EOL);
+ config_found(self, &imca, NULL, CFARGS_NONE);
}
return 0;
Index: src/sys/arch/x86/pci/imcsmb/imcsmb.c
diff -u src/sys/arch/x86/pci/imcsmb/imcsmb.c:1.4 src/sys/arch/x86/pci/imcsmb/imcsmb.c:1.4.8.1
--- src/sys/arch/x86/pci/imcsmb/imcsmb.c:1.4 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x86/pci/imcsmb/imcsmb.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: imcsmb.c,v 1.4 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: imcsmb.c,v 1.4.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imcsmb.c,v 1.4 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imcsmb.c,v 1.4.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -155,7 +155,7 @@ imcsmb_rescan(device_t self, const char
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &sc->sc_i2c_tag;
- sc->sc_smbus = config_found(self, &iba, iicbus_print, CFARG_EOL);
+ sc->sc_smbus = config_found(self, &iba, iicbus_print, CFARGS_NONE);
if (sc->sc_smbus == NULL) {
aprint_normal_dev(self, "no child found\n");
Index: src/sys/arch/x86/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.200 src/sys/arch/x86/x86/cpu.c:1.200.8.1
--- src/sys/arch/x86/x86/cpu.c:1.200 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x86/x86/cpu.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.200 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: cpu.c,v 1.200.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*
* Copyright (c) 2000-2020 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.200 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.200.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -587,32 +587,28 @@ cpu_rescan(device_t self, const char *if
cfaa.name = "frequency";
ci->ci_frequency =
config_found(self, &cfaa, NULL,
- CFARG_IATTR, "cpufeaturebus",
- CFARG_EOL);
+ CFARGS(.iattr = "cpufeaturebus"));
}
if (ci->ci_padlock == NULL) {
cfaa.name = "padlock";
ci->ci_padlock =
config_found(self, &cfaa, NULL,
- CFARG_IATTR, "cpufeaturebus",
- CFARG_EOL);
+ CFARGS(.iattr = "cpufeaturebus"));
}
if (ci->ci_temperature == NULL) {
cfaa.name = "temperature";
ci->ci_temperature =
config_found(self, &cfaa, NULL,
- CFARG_IATTR, "cpufeaturebus",
- CFARG_EOL);
+ CFARGS(.iattr = "cpufeaturebus"));
}
if (ci->ci_vm == NULL) {
cfaa.name = "vm";
ci->ci_vm =
config_found(self, &cfaa, NULL,
- CFARG_IATTR, "cpufeaturebus",
- CFARG_EOL);
+ CFARGS(.iattr = "cpufeaturebus"));
}
}
Index: src/sys/arch/x86/x86/mainbus.c
diff -u src/sys/arch/x86/x86/mainbus.c:1.6 src/sys/arch/x86/x86/mainbus.c:1.6.8.1
--- src/sys/arch/x86/x86/mainbus.c:1.6 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x86/x86/mainbus.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.6 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.6.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include "opt_acpi.h"
#include "opt_mpbios.h"
@@ -197,8 +197,7 @@ x86_cpubus_attach(device_t self)
caa.cpu_func = 0;
config_found(self, &caa, mainbus_cpu_print,
- CFARG_IATTR, "cpubus",
- CFARG_EOL);
+ CFARGS(.iattr = "cpubus"));
}
#if NACPICA > 0
}
Index: src/sys/arch/x86/x86/mp.c
diff -u src/sys/arch/x86/x86/mp.c:1.5 src/sys/arch/x86/x86/mp.c:1.5.8.1
--- src/sys/arch/x86/x86/mp.c:1.5 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x86/x86/mp.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mp.c,v 1.5 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: mp.c,v 1.5.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mp.c,v 1.5 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mp.c,v 1.5.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include "opt_multiprocessor.h"
#include "opt_acpi.h"
@@ -94,8 +94,7 @@ mp_pci_scan(device_t self, struct pcibus
if (strcmp(mpb->mb_name, "pci") == 0 && mpb->mb_dev == NULL) {
pba->pba_bus = i;
mpb->mb_dev = config_found(self, pba, print,
- CFARG_IATTR, "pcibus",
- CFARG_EOL);
+ CFARGS(.iattr = "pcibus"));
cnt++;
}
}
Index: src/sys/arch/x86/x86/mpacpi.c
diff -u src/sys/arch/x86/x86/mpacpi.c:1.106 src/sys/arch/x86/x86/mpacpi.c:1.106.4.1
--- src/sys/arch/x86/x86/mpacpi.c:1.106 Wed May 12 22:17:40 2021
+++ src/sys/arch/x86/x86/mpacpi.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mpacpi.c,v 1.106 2021/05/12 22:17:40 thorpej Exp $ */
+/* $NetBSD: mpacpi.c,v 1.106.4.1 2021/08/04 03:03:30 thorpej Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.106 2021/05/12 22:17:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.106.4.1 2021/08/04 03:03:30 thorpej Exp $");
#include "acpica.h"
#include "opt_acpi.h"
@@ -384,10 +384,9 @@ mpacpi_config_cpu(ACPI_SUBTABLE_HEADER *
caa.cpu_func = &mp_cpu_funcs;
locs[CPUBUSCF_APID] = caa.cpu_number;
config_found(parent, &caa, mpacpi_cpuprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_IATTR, "cpubus",
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .iattr = "cpubus",
+ .locators = locs));
}
break;
@@ -414,10 +413,9 @@ mpacpi_config_cpu(ACPI_SUBTABLE_HEADER *
caa.cpu_func = &mp_cpu_funcs;
locs[CPUBUSCF_APID] = caa.cpu_number;
config_found(parent, &caa, mpacpi_cpuprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_IATTR, "cpubus",
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .iattr = "cpubus",
+ .locators = locs));
}
break;
@@ -442,10 +440,9 @@ mpacpi_config_ioapic(ACPI_SUBTABLE_HEADE
aaa.apic_vecbase = p->GlobalIrqBase;
locs[IOAPICBUSCF_APID] = aaa.apic_id;
config_found(parent, &aaa, mpacpi_ioapicprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_IATTR, "ioapicbus",
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .iattr = "ioapicbus",
+ .locators = locs));
}
return AE_OK;
}
Index: src/sys/arch/x86/x86/mpbios.c
diff -u src/sys/arch/x86/x86/mpbios.c:1.69 src/sys/arch/x86/x86/mpbios.c:1.69.8.1
--- src/sys/arch/x86/x86/mpbios.c:1.69 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x86/x86/mpbios.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mpbios.c,v 1.69 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: mpbios.c,v 1.69.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.69 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.69.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include "acpica.h"
#include "lapic.h"
@@ -819,10 +819,9 @@ mpbios_cpu(const uint8_t *ent, device_t
locs[CPUBUSCF_APID] = caa.cpu_number;
config_found(self, &caa, mp_cpuprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_IATTR, "cpubus",
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .iattr = "cpubus",
+ .locators = locs));
}
static void
@@ -1249,10 +1248,9 @@ mpbios_ioapic(const uint8_t *ent, device
locs[IOAPICBUSCF_APID] = aaa.apic_id;
config_found(self, &aaa, mp_ioapicprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_IATTR, "ioapicbus",
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .iattr = "ioapicbus",
+ .locators = locs));
}
#endif
}
Index: src/sys/arch/xen/x86/cpu.c
diff -u src/sys/arch/xen/x86/cpu.c:1.140 src/sys/arch/xen/x86/cpu.c:1.140.8.1
--- src/sys/arch/xen/x86/cpu.c:1.140 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/xen/x86/cpu.c Wed Aug 4 03:03:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.140 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: cpu.c,v 1.140.8.1 2021/08/04 03:03:31 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.140 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.140.8.1 2021/08/04 03:03:31 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -262,8 +262,7 @@ cpu_rescan(device_t self, const char *if
cfaa.name = "frequency";
ci->ci_frequency =
config_found(self, &cfaa, NULL,
- CFARG_IATTR, "cpufeaturebus",
- CFARG_EOL);
+ CFARGS(.iattr = "cpufeaturebus"));
}
}
Index: src/sys/arch/xen/x86/xen_mainbus.c
diff -u src/sys/arch/xen/x86/xen_mainbus.c:1.9 src/sys/arch/xen/x86/xen_mainbus.c:1.9.8.1
--- src/sys/arch/xen/x86/xen_mainbus.c:1.9 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/xen/x86/xen_mainbus.c Wed Aug 4 03:03:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_mainbus.c,v 1.9 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: xen_mainbus.c,v 1.9.8.1 2021/08/04 03:03:31 thorpej Exp $ */
/* NetBSD: mainbus.c,v 1.19 2017/05/23 08:54:39 nonaka Exp */
/* NetBSD: mainbus.c,v 1.53 2003/10/27 14:11:47 junyoung Exp */
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_mainbus.c,v 1.9 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_mainbus.c,v 1.9.8.1 2021/08/04 03:03:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -129,16 +129,14 @@ xen_mainbus_attach(device_t parent, devi
mba.mba_ipmi.iaa_memt = x86_bus_space_mem;
if (ipmi_probe(&mba.mba_ipmi))
config_found(self, &mba.mba_ipmi, NULL,
- CFARG_IATTR, "ipmibus",
- CFARG_EOL);
+ CFARGS(.iattr = "ipmibus"));
#endif
/* FALLTHROUGH */
case VM_GUEST_XENPVH:
case VM_GUEST_XENPVHVM:
mba.mba_haa.haa_busname = "hypervisor";
config_found(self, &mba.mba_haa, xen_mainbus_print,
- CFARG_IATTR, "hypervisorbus",
- CFARG_EOL);
+ CFARGS(.iattr = "hypervisorbus"));
break;
default:
return;
Index: src/sys/arch/xen/xen/hypervisor.c
diff -u src/sys/arch/xen/xen/hypervisor.c:1.91 src/sys/arch/xen/xen/hypervisor.c:1.91.8.1
--- src/sys/arch/xen/xen/hypervisor.c:1.91 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/xen/xen/hypervisor.c Wed Aug 4 03:03:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor.c,v 1.91 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: hypervisor.c,v 1.91.8.1 2021/08/04 03:03:31 thorpej Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -53,7 +53,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.91 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.91.8.1 2021/08/04 03:03:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -641,8 +641,7 @@ hypervisor_attach(device_t parent, devic
hac.hac_vcaa.vcaa_caa.cpu_role = CPU_ROLE_BP;
hac.hac_vcaa.vcaa_caa.cpu_func = NULL; /* See xen/x86/cpu.c:vcpu_attach() */
config_found(self, &hac.hac_vcaa, hypervisor_print,
- CFARG_IATTR, "xendevbus",
- CFARG_EOL);
+ CFARGS(.iattr = "xendevbus"));
#ifdef MULTIPROCESSOR
@@ -663,8 +662,7 @@ hypervisor_attach(device_t parent, devic
hac.hac_vcaa.vcaa_caa.cpu_func = NULL; /* See xen/x86/cpu.c:vcpu_attach() */
if (NULL == config_found(self, &hac.hac_vcaa,
hypervisor_vcpu_print,
- CFARG_IATTR, "xendevbus",
- CFARG_EOL)) {
+ CFARGS(.iattr = "xendevbus"))) {
break;
}
}
@@ -678,16 +676,14 @@ hypervisor_attach(device_t parent, devic
hac.hac_xenbus.xa_device = "xenbus";
hac.hac_xenbus.xa_dmat = &xenbus_bus_dma_tag;
config_found(self, &hac.hac_xenbus, hypervisor_print,
- CFARG_IATTR, "xendevbus",
- CFARG_EOL);
+ CFARGS(.iattr = "xendevbus"));
#endif
#if NXENCONS > 0
if (xencons_interface != 0 || vm_guest != VM_GUEST_XENPVHVM) {
memset(&hac, 0, sizeof(hac));
hac.hac_xencons.xa_device = "xencons";
config_found(self, &hac.hac_xencons, hypervisor_print,
- CFARG_IATTR, "xendevbus",
- CFARG_EOL);
+ CFARGS(.iattr = "xendevbus"));
}
#endif
@@ -712,8 +708,7 @@ hypervisor_attach(device_t parent, devic
hac.hac_acpi.aa_dmat64 = NULL;
#endif /* _LP64 */
config_found(self, &hac.hac_acpi, NULL,
- CFARG_IATTR, "acpibus",
- CFARG_EOL);
+ CFARGS(.iattr = "acpibus"));
}
#endif /* NACPICA */
memset(&hac, 0, sizeof(hac));
@@ -739,8 +734,7 @@ hypervisor_attach(device_t parent, devic
else
#endif
config_found(self, &hac.hac_pba, pcibusprint,
- CFARG_IATTR, "pcibus",
- CFARG_EOL);
+ CFARGS(.iattr = "pcibus"));
#if NACPICA > 0
if (mp_verbose)
acpi_pci_link_state();
@@ -754,8 +748,7 @@ hypervisor_attach(device_t parent, devic
hac.hac_iba.iba_dmat = &isa_bus_dma_tag;
hac.hac_iba.iba_ic = NULL; /* No isa DMA yet */
config_found(self, &hac.hac_iba, isabusprint,
- CFARG_IATTR, "isabus",
- CFARG_EOL);
+ CFARGS(.iattr = "isabus"));
}
#endif /* NISA */
#endif /* NPCI */
Index: src/sys/arch/xen/xen/xpci_xenbus.c
diff -u src/sys/arch/xen/xen/xpci_xenbus.c:1.24 src/sys/arch/xen/xen/xpci_xenbus.c:1.24.8.1
--- src/sys/arch/xen/xen/xpci_xenbus.c:1.24 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/xen/xen/xpci_xenbus.c Wed Aug 4 03:03:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xpci_xenbus.c,v 1.24 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: xpci_xenbus.c,v 1.24.8.1 2021/08/04 03:03:31 thorpej Exp $ */
/*
* Copyright (c) 2009 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.c,v 1.24 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.c,v 1.24.8.1 2021/08/04 03:03:31 thorpej Exp $");
#include "opt_xen.h"
@@ -359,7 +359,7 @@ xpci_attach_pcibus(int domain, int busn)
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
pba.pba_bridgetag = NULL;
pba.pba_bus = busn;
- config_found(xpci_sc->sc_dev, &pba, pcibusprint, CFARG_EOL);
+ config_found(xpci_sc->sc_dev, &pba, pcibusprint, CFARGS_NONE);
}
/* functions required by the MI PCI system */
Index: src/sys/arch/xen/xenbus/xenbus_probe.c
diff -u src/sys/arch/xen/xenbus/xenbus_probe.c:1.57 src/sys/arch/xen/xenbus/xenbus_probe.c:1.57.2.1
--- src/sys/arch/xen/xenbus/xenbus_probe.c:1.57 Wed Jun 16 10:49:50 2021
+++ src/sys/arch/xen/xenbus/xenbus_probe.c Wed Aug 4 03:03:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus_probe.c,v 1.57 2021/06/16 10:49:50 bouyer Exp $ */
+/* $NetBSD: xenbus_probe.c,v 1.57.2.1 2021/08/04 03:03:31 thorpej Exp $ */
/******************************************************************************
* Talks to Xen Store to figure out what devices we have.
*
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenbus_probe.c,v 1.57 2021/06/16 10:49:50 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenbus_probe.c,v 1.57.2.1 2021/08/04 03:03:31 thorpej Exp $");
#if 0
#define DPRINTK(fmt, args...) \
@@ -472,7 +472,7 @@ xenbus_probe_device_type(const char *pat
KERNEL_LOCK(1, curlwp);
xbusd->xbusd_u.f.f_dev = config_found(xenbus_dev,
- &xa, xenbus_print, CFARG_EOL);
+ &xa, xenbus_print, CFARGS_NONE);
KERNEL_UNLOCK_ONE(curlwp);
if (xbusd->xbusd_u.f.f_dev == NULL) {
kmem_free(xbusd, xbusd->xbusd_sz);
@@ -657,7 +657,7 @@ xenbus_probe(void *unused)
/* attach balloon. */
KERNEL_LOCK(1, curlwp);
config_found(xenbus_dev, &balloon_xa, xenbus_print,
- CFARG_EOL);
+ CFARGS_NONE);
KERNEL_UNLOCK_ONE(curlwp);
shutdown_xenbus_setup();
