Module Name: src
Committed By: thorpej
Date: Wed Aug 4 02:49:41 UTC 2021
Modified Files:
src/sys/arch/news68k/dev [thorpej-cfargs2]: hb.c kb_hb.c kb_kbc.c kbc.c
ms_hb.c ms_kbc.c zs.c
src/sys/arch/news68k/news68k [thorpej-cfargs2]: mainbus.c
src/sys/arch/newsmips/apbus [thorpej-cfargs2]: apbus.c kb_ap.c ms_ap.c
spifi.c xafb.c zs_ap.c
src/sys/arch/newsmips/dev [thorpej-cfargs2]: fb.c hb.c kb_hb.c ms_hb.c
sc_wrap.c zs_hb.c
src/sys/arch/newsmips/newsmips [thorpej-cfargs2]: mainbus.c
src/sys/arch/next68k/dev [thorpej-cfargs2]: intio.c nextdisplay.c
nextkbd.c zs.c
src/sys/arch/next68k/next68k [thorpej-cfargs2]: mainbus.c
src/sys/arch/ofppc/ofppc [thorpej-cfargs2]: mainbus.c
src/sys/arch/ofppc/pci [thorpej-cfargs2]: ofwpci.c
src/sys/arch/playstation2/dev [thorpej-cfargs2]: ohci_sbus.c sbus.c
spd.c
src/sys/arch/playstation2/ee [thorpej-cfargs2]: gsfb.c
src/sys/arch/playstation2/playstation2 [thorpej-cfargs2]: mainbus.c
src/sys/arch/pmax/ibus [thorpej-cfargs2]: dz_ibus.c ibus.c pm.c sii.c
src/sys/arch/pmax/pmax [thorpej-cfargs2]: mainbus.c
src/sys/arch/pmax/tc [thorpej-cfargs2]: dt.c dtkbd.c dtms.c
src/sys/arch/powerpc/booke/dev [thorpej-cfargs2]: cpunode.c pq3duart.c
pq3ehci.c pq3etsec.c pq3gpio.c pq3obio.c
src/sys/arch/powerpc/booke/pci [thorpej-cfargs2]: pq3pci.c
src/sys/arch/powerpc/ibm4xx/dev [thorpej-cfargs2]: dwctwo_plb.c exb.c
gpiic_opb.c gpio_opb.c opb.c plb.c
src/sys/arch/powerpc/ibm4xx/pci [thorpej-cfargs2]: pchb.c
src/sys/arch/powerpc/pci [thorpej-cfargs2]: pchb.c pcib.c
src/sys/arch/prep/pci [thorpej-cfargs2]: gten.c pceb.c
src/sys/arch/prep/pnpbus [thorpej-cfargs2]: pnpbus.c
src/sys/arch/prep/prep [thorpej-cfargs2]: mainbus.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/news68k/dev/hb.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/news68k/dev/kb_hb.c \
src/sys/arch/news68k/dev/kbc.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/news68k/dev/kb_kbc.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/news68k/dev/ms_hb.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/news68k/dev/ms_kbc.c
cvs rdiff -u -r1.32 -r1.32.8.1 src/sys/arch/news68k/dev/zs.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/news68k/news68k/mainbus.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/arch/newsmips/apbus/apbus.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/newsmips/apbus/kb_ap.c \
src/sys/arch/newsmips/apbus/ms_ap.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/newsmips/apbus/spifi.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/newsmips/apbus/xafb.c
cvs rdiff -u -r1.31 -r1.31.8.1 src/sys/arch/newsmips/apbus/zs_ap.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/arch/newsmips/dev/fb.c \
src/sys/arch/newsmips/dev/zs_hb.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/newsmips/dev/hb.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/newsmips/dev/kb_hb.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/newsmips/dev/ms_hb.c
cvs rdiff -u -r1.32 -r1.32.8.1 src/sys/arch/newsmips/dev/sc_wrap.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/newsmips/newsmips/mainbus.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/next68k/dev/intio.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/next68k/dev/nextdisplay.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/next68k/dev/nextkbd.c
cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/arch/next68k/dev/zs.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/next68k/next68k/mainbus.c
cvs rdiff -u -r1.31 -r1.31.8.1 src/sys/arch/ofppc/ofppc/mainbus.c
cvs rdiff -u -r1.20 -r1.20.4.1 src/sys/arch/ofppc/pci/ofwpci.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/playstation2/dev/ohci_sbus.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/playstation2/dev/sbus.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/playstation2/dev/spd.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/playstation2/ee/gsfb.c
cvs rdiff -u -r1.17 -r1.17.8.1 \
src/sys/arch/playstation2/playstation2/mainbus.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/pmax/ibus/dz_ibus.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/pmax/ibus/ibus.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/pmax/ibus/pm.c
cvs rdiff -u -r1.15 -r1.15.2.1 src/sys/arch/pmax/ibus/sii.c
cvs rdiff -u -r1.43 -r1.43.8.1 src/sys/arch/pmax/pmax/mainbus.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/pmax/tc/dt.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/pmax/tc/dtkbd.c \
src/sys/arch/pmax/tc/dtms.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/powerpc/booke/dev/cpunode.c \
src/sys/arch/powerpc/booke/dev/pq3duart.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/powerpc/booke/dev/pq3ehci.c
cvs rdiff -u -r1.55 -r1.55.2.1 src/sys/arch/powerpc/booke/dev/pq3etsec.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/powerpc/booke/dev/pq3gpio.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/powerpc/booke/dev/pq3obio.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/arch/powerpc/booke/pci/pq3pci.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/powerpc/ibm4xx/dev/exb.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/powerpc/ibm4xx/dev/gpiic_opb.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/powerpc/ibm4xx/dev/gpio_opb.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/arch/powerpc/ibm4xx/dev/opb.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/powerpc/ibm4xx/dev/plb.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/powerpc/ibm4xx/pci/pchb.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/powerpc/pci/pchb.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/powerpc/pci/pcib.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/prep/pci/gten.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/prep/pci/pceb.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/prep/pnpbus/pnpbus.c
cvs rdiff -u -r1.39 -r1.39.8.1 src/sys/arch/prep/prep/mainbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/news68k/dev/hb.c
diff -u src/sys/arch/news68k/dev/hb.c:1.20 src/sys/arch/news68k/dev/hb.c:1.20.8.1
--- src/sys/arch/news68k/dev/hb.c:1.20 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/news68k/dev/hb.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hb.c,v 1.20 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: hb.c,v 1.20.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*-
* Copyright (c) 1999 Izumi Tsutsui. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hb.c,v 1.20 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hb.c,v 1.20.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,8 +71,7 @@ hb_attach(device_t parent, device_t self
memset(&ha, 0, sizeof(ha));
config_search(self, &ha,
- CFARG_SEARCH, hb_search,
- CFARG_EOL);
+ CFARGS(.search = hb_search));
}
static int
@@ -90,7 +89,7 @@ hb_search(device_t parent, cfdata_t cf,
NEWS68K_BUS_SPACE_INTIO : NEWS68K_BUS_SPACE_EIO;
if (config_probe(parent, cf, ha))
- config_attach(parent, cf, ha, hb_print, CFARG_EOL);
+ config_attach(parent, cf, ha, hb_print, CFARGS_NONE);
return 0;
}
Index: src/sys/arch/news68k/dev/kb_hb.c
diff -u src/sys/arch/news68k/dev/kb_hb.c:1.14 src/sys/arch/news68k/dev/kb_hb.c:1.14.8.1
--- src/sys/arch/news68k/dev/kb_hb.c:1.14 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/news68k/dev/kb_hb.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kb_hb.c,v 1.14 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: kb_hb.c,v 1.14.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*-
* Copyright (c) 2001 Izumi Tsutsui. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kb_hb.c,v 1.14 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kb_hb.c,v 1.14.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -119,7 +119,7 @@ kb_hb_attach(device_t parent, device_t s
wsa.accessops = &kb_accessops;
wsa.accesscookie = sc;
- sc->sc_wskbddev = config_found(self, &wsa, wskbddevprint, CFARG_EOL);
+ sc->sc_wskbddev = config_found(self, &wsa, wskbddevprint, CFARGS_NONE);
}
static void
Index: src/sys/arch/news68k/dev/kbc.c
diff -u src/sys/arch/news68k/dev/kbc.c:1.14 src/sys/arch/news68k/dev/kbc.c:1.14.8.1
--- src/sys/arch/news68k/dev/kbc.c:1.14 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/news68k/dev/kbc.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kbc.c,v 1.14 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: kbc.c,v 1.14.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*-
* Copyright (C) 2001 Izumi Tsutsui. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbc.c,v 1.14 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbc.c,v 1.14.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -96,10 +96,10 @@ kbc_attach(device_t parent, device_t sel
ka.ka_ipl = KBC_PRI;
ka.ka_name = "kb";
- config_found(self, (void *)&ka, kbc_print, CFARG_EOL);
+ config_found(self, (void *)&ka, kbc_print, CFARGS_NONE);
ka.ka_name = "ms";
- config_found(self, (void *)&ka, kbc_print, CFARG_EOL);
+ config_found(self, (void *)&ka, kbc_print, CFARGS_NONE);
}
static int
Index: src/sys/arch/news68k/dev/kb_kbc.c
diff -u src/sys/arch/news68k/dev/kb_kbc.c:1.11 src/sys/arch/news68k/dev/kb_kbc.c:1.11.8.1
--- src/sys/arch/news68k/dev/kb_kbc.c:1.11 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/news68k/dev/kb_kbc.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kb_kbc.c,v 1.11 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: kb_kbc.c,v 1.11.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*-
* Copyright (c) 2001 Izumi Tsutsui. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kb_kbc.c,v 1.11 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kb_kbc.c,v 1.11.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -94,7 +94,7 @@ kb_kbc_attach(device_t parent, device_t
wsa.accessops = &kb_accessops;
wsa.accesscookie = sc;
- sc->sc_wskbddev = config_found(self, &wsa, wskbddevprint, CFARG_EOL);
+ sc->sc_wskbddev = config_found(self, &wsa, wskbddevprint, CFARGS_NONE);
}
static void
Index: src/sys/arch/news68k/dev/ms_hb.c
diff -u src/sys/arch/news68k/dev/ms_hb.c:1.15 src/sys/arch/news68k/dev/ms_hb.c:1.15.8.1
--- src/sys/arch/news68k/dev/ms_hb.c:1.15 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/news68k/dev/ms_hb.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ms_hb.c,v 1.15 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: ms_hb.c,v 1.15.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*-
* Copyright (c) 2001 Izumi Tsutsui. All rights reserved.
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms_hb.c,v 1.15 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms_hb.c,v 1.15.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -143,7 +143,7 @@ ms_hb_attach(device_t parent, device_t s
wsa.accessops = &ms_hb_accessops;
wsa.accesscookie = sc;
sc->sc_wsmousedev = config_found(self, &wsa, wsmousedevprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
static void
Index: src/sys/arch/news68k/dev/ms_kbc.c
diff -u src/sys/arch/news68k/dev/ms_kbc.c:1.13 src/sys/arch/news68k/dev/ms_kbc.c:1.13.8.1
--- src/sys/arch/news68k/dev/ms_kbc.c:1.13 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/news68k/dev/ms_kbc.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ms_kbc.c,v 1.13 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: ms_kbc.c,v 1.13.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*-
* Copyright (c) 2001 Izumi Tsutsui. All rights reserved.
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms_kbc.c,v 1.13 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms_kbc.c,v 1.13.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -121,7 +121,7 @@ ms_kbc_attach(device_t parent, device_t
wsa.accessops = &ms_kbc_accessops;
wsa.accesscookie = sc;
sc->sc_wsmousedev = config_found(self, &wsa, wsmousedevprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
static void
Index: src/sys/arch/news68k/dev/zs.c
diff -u src/sys/arch/news68k/dev/zs.c:1.32 src/sys/arch/news68k/dev/zs.c:1.32.8.1
--- src/sys/arch/news68k/dev/zs.c:1.32 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/news68k/dev/zs.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.32 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: zs.c,v 1.32.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.32 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.32.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include "opt_ddb.h"
@@ -255,7 +255,7 @@ zs_attach(device_t parent, device_t self
* The child attach will setup the hardware.
*/
if (!config_found(self, (void *)&zsc_args, zs_print,
- CFARG_EOL)) {
+ CFARGS_NONE)) {
/* No sub-driver. Just reset it. */
uint8_t reset = (channel == 0) ?
ZSWR9_A_RESET : ZSWR9_B_RESET;
Index: src/sys/arch/news68k/news68k/mainbus.c
diff -u src/sys/arch/news68k/news68k/mainbus.c:1.17 src/sys/arch/news68k/news68k/mainbus.c:1.17.8.1
--- src/sys/arch/news68k/news68k/mainbus.c:1.17 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/news68k/news68k/mainbus.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.17 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.17.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.17 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.17.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -70,8 +70,7 @@ mainbus_attach(device_t parent, device_t
aprint_normal("\n");
config_search(self, &ma,
- CFARG_SEARCH, mainbus_search,
- CFARG_EOL);
+ CFARGS(.search = mainbus_search));
}
static int
@@ -83,7 +82,7 @@ mainbus_search(device_t parent, cfdata_t
ma->ma_systype = cf->cf_systype;
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/newsmips/apbus/apbus.c
diff -u src/sys/arch/newsmips/apbus/apbus.c:1.28 src/sys/arch/newsmips/apbus/apbus.c:1.28.8.1
--- src/sys/arch/newsmips/apbus/apbus.c:1.28 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/newsmips/apbus/apbus.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: apbus.c,v 1.28 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: apbus.c,v 1.28.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*-
* Copyright (C) 1999 SHIMIZU Ryo. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apbus.c,v 1.28 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apbus.c,v 1.28.8.1 2021/08/04 02:49:38 thorpej Exp $");
#define __INTR_PRIVATE
@@ -150,7 +150,7 @@ apbusattach(device_t parent, device_t se
child.apa_hwbase = apctl->apbc_hwbase;
config_found(self, &child, apbusprint,
- CFARG_EOL);
+ CFARGS_NONE);
apctl = apctl->apbc_link;
}
Index: src/sys/arch/newsmips/apbus/kb_ap.c
diff -u src/sys/arch/newsmips/apbus/kb_ap.c:1.13 src/sys/arch/newsmips/apbus/kb_ap.c:1.13.8.1
--- src/sys/arch/newsmips/apbus/kb_ap.c:1.13 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/newsmips/apbus/kb_ap.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kb_ap.c,v 1.13 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: kb_ap.c,v 1.13.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kb_ap.c,v 1.13 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kb_ap.c,v 1.13.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -152,7 +152,7 @@ kb_ap_attach(device_t parent, device_t s
waa.accessops = &kb_ap_accessops;
waa.accesscookie = sc;
- sc->sc_wskbddev = config_found(self, &waa, wskbddevprint, CFARG_EOL);
+ sc->sc_wskbddev = config_found(self, &waa, wskbddevprint, CFARGS_NONE);
}
int
Index: src/sys/arch/newsmips/apbus/ms_ap.c
diff -u src/sys/arch/newsmips/apbus/ms_ap.c:1.13 src/sys/arch/newsmips/apbus/ms_ap.c:1.13.8.1
--- src/sys/arch/newsmips/apbus/ms_ap.c:1.13 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/newsmips/apbus/ms_ap.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ms_ap.c,v 1.13 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: ms_ap.c,v 1.13.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms_ap.c,v 1.13 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms_ap.c,v 1.13.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -105,7 +105,7 @@ ms_ap_attach(device_t parent, device_t s
aa.accessops = &ms_ap_accessops;
aa.accesscookie = sc;
- sc->sc_wsmousedev = config_found(self, &aa, wsmousedevprint, CFARG_EOL);
+ sc->sc_wsmousedev = config_found(self, &aa, wsmousedevprint, CFARGS_NONE);
}
int
Index: src/sys/arch/newsmips/apbus/spifi.c
diff -u src/sys/arch/newsmips/apbus/spifi.c:1.21 src/sys/arch/newsmips/apbus/spifi.c:1.21.8.1
--- src/sys/arch/newsmips/apbus/spifi.c:1.21 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/newsmips/apbus/spifi.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: spifi.c,v 1.21 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: spifi.c,v 1.21.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spifi.c,v 1.21 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spifi.c,v 1.21.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -209,7 +209,7 @@ spifi_attach(device_t parent, device_t s
apbus_intr_establish(0, intr, 0, spifi_intr, sc, device_xname(self),
apa->apa_ctlnum);
- config_found(self, &sc->sc_channel, scsiprint, CFARG_EOL);
+ config_found(self, &sc->sc_channel, scsiprint, CFARGS_NONE);
}
void
Index: src/sys/arch/newsmips/apbus/xafb.c
diff -u src/sys/arch/newsmips/apbus/xafb.c:1.20 src/sys/arch/newsmips/apbus/xafb.c:1.20.8.1
--- src/sys/arch/newsmips/apbus/xafb.c:1.20 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/newsmips/apbus/xafb.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xafb.c,v 1.20 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: xafb.c,v 1.20.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -29,7 +29,7 @@
/* "xa" frame buffer driver. Currently supports 1280x1024x8 only. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xafb.c,v 1.20 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xafb.c,v 1.20.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -187,7 +187,7 @@ xafb_attach(device_t parent, device_t se
wsa.accessops = &xafb_accessops;
wsa.accesscookie = sc;
- config_found(self, &wsa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &wsa, wsemuldisplaydevprint, CFARGS_NONE);
}
void
Index: src/sys/arch/newsmips/apbus/zs_ap.c
diff -u src/sys/arch/newsmips/apbus/zs_ap.c:1.31 src/sys/arch/newsmips/apbus/zs_ap.c:1.31.8.1
--- src/sys/arch/newsmips/apbus/zs_ap.c:1.31 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/newsmips/apbus/zs_ap.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_ap.c,v 1.31 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: zs_ap.c,v 1.31.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_ap.c,v 1.31 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_ap.c,v 1.31.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -381,7 +381,7 @@ zs_ap_attach(device_t parent, device_t s
* The child attach will setup the hardware.
*/
if (!config_found(self, (void *)&zsc_args, zs_print,
- CFARG_EOL)) {
+ CFARGS_NONE)) {
/* No sub-driver. Just reset it. */
uint8_t reset = (channel == 0) ?
ZSWR9_A_RESET : ZSWR9_B_RESET;
Index: src/sys/arch/newsmips/dev/fb.c
diff -u src/sys/arch/newsmips/dev/fb.c:1.28 src/sys/arch/newsmips/dev/fb.c:1.28.8.1
--- src/sys/arch/newsmips/dev/fb.c:1.28 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/newsmips/dev/fb.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fb.c,v 1.28 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: fb.c,v 1.28.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.28 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.28.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -168,7 +168,7 @@ fb_attach(device_t parent, device_t self
waa.accessops = &fb_accessops;
waa.accesscookie = sc;
- config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE);
}
int
Index: src/sys/arch/newsmips/dev/zs_hb.c
diff -u src/sys/arch/newsmips/dev/zs_hb.c:1.28 src/sys/arch/newsmips/dev/zs_hb.c:1.28.8.1
--- src/sys/arch/newsmips/dev/zs_hb.c:1.28 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/newsmips/dev/zs_hb.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_hb.c,v 1.28 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: zs_hb.c,v 1.28.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_hb.c,v 1.28 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_hb.c,v 1.28.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -271,7 +271,7 @@ zs_hb_attach(device_t parent, device_t s
* The child attach will setup the hardware.
*/
if (!config_found(self, (void *)&zsc_args, zs_print,
- CFARG_EOL)) {
+ CFARGS_NONE)) {
/* No sub-driver. Just reset it. */
uint8_t reset = (channel == 0) ?
ZSWR9_A_RESET : ZSWR9_B_RESET;
Index: src/sys/arch/newsmips/dev/hb.c
diff -u src/sys/arch/newsmips/dev/hb.c:1.22 src/sys/arch/newsmips/dev/hb.c:1.22.8.1
--- src/sys/arch/newsmips/dev/hb.c:1.22 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/newsmips/dev/hb.c Wed Aug 4 02:49:38 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: hb.c,v 1.22 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: hb.c,v 1.22.8.1 2021/08/04 02:49:38 thorpej Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hb.c,v 1.22 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hb.c,v 1.22.8.1 2021/08/04 02:49:38 thorpej Exp $");
#define __INTR_PRIVATE
#include <sys/param.h>
@@ -54,8 +54,7 @@ hb_attach(device_t parent, device_t self
}
config_search(self, &ha,
- CFARG_SEARCH, hb_search,
- CFARG_EOL);
+ CFARGS(.search = hb_search));
}
static int
@@ -68,7 +67,7 @@ hb_search(device_t parent, cfdata_t cf,
ha->ha_level = cf->cf_level;
if (config_probe(parent, cf, ha))
- config_attach(parent, cf, ha, hb_print, CFARG_EOL);
+ config_attach(parent, cf, ha, hb_print, CFARGS_NONE);
return 0;
}
Index: src/sys/arch/newsmips/dev/kb_hb.c
diff -u src/sys/arch/newsmips/dev/kb_hb.c:1.14 src/sys/arch/newsmips/dev/kb_hb.c:1.14.8.1
--- src/sys/arch/newsmips/dev/kb_hb.c:1.14 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/newsmips/dev/kb_hb.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kb_hb.c,v 1.14 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: kb_hb.c,v 1.14.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kb_hb.c,v 1.14 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kb_hb.c,v 1.14.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -135,7 +135,7 @@ kb_hb_attach(device_t parent, device_t s
aa.keymap = &kb_hb_keymapdata;
aa.accessops = &kb_hb_accessops;
aa.accesscookie = sc;
- sc->sc_wskbddev = config_found(self, &aa, wskbddevprint, CFARG_EOL);
+ sc->sc_wskbddev = config_found(self, &aa, wskbddevprint, CFARGS_NONE);
}
int
Index: src/sys/arch/newsmips/dev/ms_hb.c
diff -u src/sys/arch/newsmips/dev/ms_hb.c:1.15 src/sys/arch/newsmips/dev/ms_hb.c:1.15.8.1
--- src/sys/arch/newsmips/dev/ms_hb.c:1.15 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/newsmips/dev/ms_hb.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ms_hb.c,v 1.15 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: ms_hb.c,v 1.15.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms_hb.c,v 1.15 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms_hb.c,v 1.15.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -111,7 +111,7 @@ ms_hb_attach(device_t parent, device_t s
aa.accessops = &ms_hb_accessops;
aa.accesscookie = sc;
- sc->sc_wsmousedev = config_found(self, &aa, wsmousedevprint, CFARG_EOL);
+ sc->sc_wsmousedev = config_found(self, &aa, wsmousedevprint, CFARGS_NONE);
}
int
Index: src/sys/arch/newsmips/dev/sc_wrap.c
diff -u src/sys/arch/newsmips/dev/sc_wrap.c:1.32 src/sys/arch/newsmips/dev/sc_wrap.c:1.32.8.1
--- src/sys/arch/newsmips/dev/sc_wrap.c:1.32 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/newsmips/dev/sc_wrap.c Wed Aug 4 02:49:38 2021
@@ -1,11 +1,11 @@
-/* $NetBSD: sc_wrap.c,v 1.32 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: sc_wrap.c,v 1.32.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*
* This driver is slow! Need to rewrite.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sc_wrap.c,v 1.32 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sc_wrap.c,v 1.32.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -127,7 +127,7 @@ cxd1185_attach(device_t parent, device_t
hb_intr_establish(intlevel, INTEN1_DMA, IPL_BIO, sc_intr, sc);
- config_found(self, &sc->sc_channel, scsiprint, CFARG_EOL);
+ config_found(self, &sc->sc_channel, scsiprint, CFARGS_NONE);
}
void
Index: src/sys/arch/newsmips/newsmips/mainbus.c
diff -u src/sys/arch/newsmips/newsmips/mainbus.c:1.12 src/sys/arch/newsmips/newsmips/mainbus.c:1.12.8.1
--- src/sys/arch/newsmips/newsmips/mainbus.c:1.12 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/newsmips/newsmips/mainbus.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.12 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.12.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.12 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.12.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -69,15 +69,15 @@ mbattach(device_t parent, device_t self,
aprint_normal("\n");
nca.ca_name = "cpu";
- config_found(self, &nca, mbprint, CFARG_EOL);
+ config_found(self, &nca, mbprint, CFARGS_NONE);
/* XXX */
if (_sip != NULL) {
nca.ca_name = "ap";
- config_found(self, &nca, NULL, CFARG_EOL);
+ config_found(self, &nca, NULL, CFARGS_NONE);
} else {
nca.ca_name = "hb";
- config_found(self, &nca, NULL, CFARG_EOL);
+ config_found(self, &nca, NULL, CFARGS_NONE);
}
}
Index: src/sys/arch/next68k/dev/intio.c
diff -u src/sys/arch/next68k/dev/intio.c:1.15 src/sys/arch/next68k/dev/intio.c:1.15.8.1
--- src/sys/arch/next68k/dev/intio.c:1.15 Sat Apr 24 23:36:44 2021
+++ src/sys/arch/next68k/dev/intio.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intio.c,v 1.15 2021/04/24 23:36:44 thorpej Exp $ */
+/* $NetBSD: intio.c,v 1.15.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.15 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.15.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,8 +79,7 @@ intioattach(device_t parent, device_t se
/* Search for and attach children. */
config_search(self, aux,
- CFARG_SEARCH, intiosearch,
- CFARG_EOL);
+ CFARGS(.search = intiosearch));
intio_attached = true;
}
@@ -109,7 +108,7 @@ intiosearch(device_t parent, cfdata_t cf
if (!config_probe(parent, cf, &ia))
break;
- config_attach(parent, cf, &ia, intioprint, CFARG_EOL);
+ config_attach(parent, cf, &ia, intioprint, CFARGS_NONE);
} while (cf->cf_fstate == FSTATE_STAR);
return (0);
Index: src/sys/arch/next68k/dev/nextdisplay.c
diff -u src/sys/arch/next68k/dev/nextdisplay.c:1.24 src/sys/arch/next68k/dev/nextdisplay.c:1.24.8.1
--- src/sys/arch/next68k/dev/nextdisplay.c:1.24 Sat Apr 24 23:36:45 2021
+++ src/sys/arch/next68k/dev/nextdisplay.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nextdisplay.c,v 1.24 2021/04/24 23:36:45 thorpej Exp $ */
+/* $NetBSD: nextdisplay.c,v 1.24.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*
* Copyright (c) 1998 Matt DeBergalis
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nextdisplay.c,v 1.24 2021/04/24 23:36:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nextdisplay.c,v 1.24.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
@@ -279,7 +279,7 @@ nextdisplay_attach(device_t parent, devi
#if 0
printf("nextdisplay: access cookie is %p\n", sc);
#endif
- config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE);
}
int
Index: src/sys/arch/next68k/dev/nextkbd.c
diff -u src/sys/arch/next68k/dev/nextkbd.c:1.17 src/sys/arch/next68k/dev/nextkbd.c:1.17.8.1
--- src/sys/arch/next68k/dev/nextkbd.c:1.17 Sat Apr 24 23:36:45 2021
+++ src/sys/arch/next68k/dev/nextkbd.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nextkbd.c,v 1.17 2021/04/24 23:36:45 thorpej Exp $ */
+/* $NetBSD: nextkbd.c,v 1.17.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*
* Copyright (c) 1998 Matt DeBergalis
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nextkbd.c,v 1.17 2021/04/24 23:36:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nextkbd.c,v 1.17.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
@@ -180,7 +180,7 @@ nextkbd_attach(device_t parent, device_t
* Attach the wskbd, saving a handle to it.
* XXX XXX XXX
*/
- sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARG_EOL);
+ sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARGS_NONE);
attached = 1;
}
Index: src/sys/arch/next68k/dev/zs.c
diff -u src/sys/arch/next68k/dev/zs.c:1.35 src/sys/arch/next68k/dev/zs.c:1.35.8.1
--- src/sys/arch/next68k/dev/zs.c:1.35 Sat Apr 24 23:36:45 2021
+++ src/sys/arch/next68k/dev/zs.c Wed Aug 4 02:49:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.35 2021/04/24 23:36:45 thorpej Exp $ */
+/* $NetBSD: zs.c,v 1.35.8.1 2021/08/04 02:49:38 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.35 2021/04/24 23:36:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.35.8.1 2021/08/04 02:49:38 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -258,7 +258,7 @@ zs_attach(device_t parent, device_t self
* The child attach will setup the hardware.
*/
if (!config_found(self, (void *)&zsc_args, zs_print,
- CFARG_EOL)) {
+ CFARGS_NONE)) {
/* No sub-driver. Just reset it. */
uint8_t reset = (channel == 0) ?
ZSWR9_A_RESET : ZSWR9_B_RESET;
Index: src/sys/arch/next68k/next68k/mainbus.c
diff -u src/sys/arch/next68k/next68k/mainbus.c:1.12 src/sys/arch/next68k/next68k/mainbus.c:1.12.8.1
--- src/sys/arch/next68k/next68k/mainbus.c:1.12 Sat Apr 24 23:36:45 2021
+++ src/sys/arch/next68k/next68k/mainbus.c Wed Aug 4 02:49:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.12 2021/04/24 23:36:45 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.12.8.1 2021/08/04 02:49:39 thorpej Exp $ */
/*
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.12 2021/04/24 23:36:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.12.8.1 2021/08/04 02:49:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -91,8 +91,7 @@ mainbus_attach(device_t parent, device_t
/* Search for and attach children. */
config_search(self, &mba,
- CFARG_SEARCH, mainbus_search,
- CFARG_EOL);
+ CFARGS(.search = mainbus_search));
mainbus_attached = 1;
}
@@ -102,6 +101,6 @@ mainbus_search(device_t parent, cfdata_t
const int *ldesc, void *aux)
{
if (config_probe(parent, cf, aux))
- config_attach(parent, cf, aux, NULL, CFARG_EOL);
+ config_attach(parent, cf, aux, NULL, CFARGS_NONE);
return 0;
}
Index: src/sys/arch/ofppc/ofppc/mainbus.c
diff -u src/sys/arch/ofppc/ofppc/mainbus.c:1.31 src/sys/arch/ofppc/ofppc/mainbus.c:1.31.8.1
--- src/sys/arch/ofppc/ofppc/mainbus.c:1.31 Sat Apr 24 23:36:45 2021
+++ src/sys/arch/ofppc/ofppc/mainbus.c Wed Aug 4 02:49:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.31 2021/04/24 23:36:45 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.31.8.1 2021/08/04 02:49:39 thorpej Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.31 2021/04/24 23:36:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.31.8.1 2021/08/04 02:49:39 thorpej Exp $");
#include "opt_interrupt.h"
#include "opt_multiprocessor.h"
@@ -245,7 +245,7 @@ mainbus_attach(device_t parent, device_t
ca.ca_nreg = OF_getprop(rtnode, "reg", reg,
sizeof(reg));
ca.ca_reg = reg;
- config_found(self, &ca, NULL, CFARG_EOL);
+ config_found(self, &ca, NULL, CFARGS_NONE);
}
}
@@ -254,14 +254,14 @@ mainbus_attach(device_t parent, device_t
ca.ca_name = "cpu";
ca.ca_reg = reg;
reg[0] = i;
- config_found(self, &ca, NULL, CFARG_EOL);
+ config_found(self, &ca, NULL, CFARGS_NONE);
}
node = OF_peer(0);
if (node) {
oba.oba_busname = "ofw";
oba.oba_phandle = node;
- config_found(self, &oba, NULL, CFARG_EOL);
+ config_found(self, &oba, NULL, CFARGS_NONE);
}
if (strcmp(model_name, "Pegasos2") == 0) {
@@ -271,7 +271,7 @@ mainbus_attach(device_t parent, device_t
*/
ca.ca_name = "gt";
- config_found(self, &ca, NULL, CFARG_EOL);
+ config_found(self, &ca, NULL, CFARGS_NONE);
goto config_fin;
}
@@ -290,7 +290,7 @@ mainbus_attach(device_t parent, device_t
ca.ca_nreg = OF_getprop(node, "reg", reg, sizeof(reg));
ca.ca_reg = reg;
- config_found(self, &ca, NULL, CFARG_EOL);
+ config_found(self, &ca, NULL, CFARGS_NONE);
}
config_fin:
Index: src/sys/arch/ofppc/pci/ofwpci.c
diff -u src/sys/arch/ofppc/pci/ofwpci.c:1.20 src/sys/arch/ofppc/pci/ofwpci.c:1.20.4.1
--- src/sys/arch/ofppc/pci/ofwpci.c:1.20 Wed May 12 04:07:34 2021
+++ src/sys/arch/ofppc/pci/ofwpci.c Wed Aug 4 02:49:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ofwpci.c,v 1.20 2021/05/12 04:07:34 thorpej Exp $ */
+/* $NetBSD: ofwpci.c,v 1.20.4.1 2021/08/04 02:49:39 thorpej Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofwpci.c,v 1.20 2021/05/12 04:07:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofwpci.c,v 1.20.4.1 2021/08/04 02:49:39 thorpej Exp $");
#include "opt_pci.h"
@@ -229,6 +229,5 @@ ofwpci_attach(device_t parent, device_t
pba.pba_pc = pc;
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
config_found(self, &pba, pcibusprint,
- CFARG_DEVHANDLE, device_handle(self),
- CFARG_EOL);
+ CFARGS(.devhandle = device_handle(self)));
}
Index: src/sys/arch/playstation2/dev/ohci_sbus.c
diff -u src/sys/arch/playstation2/dev/ohci_sbus.c:1.15 src/sys/arch/playstation2/dev/ohci_sbus.c:1.15.8.1
--- src/sys/arch/playstation2/dev/ohci_sbus.c:1.15 Sat Apr 24 23:36:45 2021
+++ src/sys/arch/playstation2/dev/ohci_sbus.c Wed Aug 4 02:49:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_sbus.c,v 1.15 2021/04/24 23:36:45 thorpej Exp $ */
+/* $NetBSD: ohci_sbus.c,v 1.15.8.1 2021/08/04 02:49:39 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_sbus.c,v 1.15 2021/04/24 23:36:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_sbus.c,v 1.15.8.1 2021/08/04 02:49:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -151,7 +151,7 @@ ohci_sbus_attach(struct device *parent,
/* Attach usb device. */
sc->sc.sc_child = config_found(self, &sc->sc.sc_bus, usbctlprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
void
Index: src/sys/arch/playstation2/dev/sbus.c
diff -u src/sys/arch/playstation2/dev/sbus.c:1.18 src/sys/arch/playstation2/dev/sbus.c:1.18.8.1
--- src/sys/arch/playstation2/dev/sbus.c:1.18 Sat Apr 24 23:36:45 2021
+++ src/sys/arch/playstation2/dev/sbus.c Wed Aug 4 02:49:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sbus.c,v 1.18 2021/04/24 23:36:45 thorpej Exp $ */
+/* $NetBSD: sbus.c,v 1.18.8.1 2021/08/04 02:49:39 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.18 2021/04/24 23:36:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.18.8.1 2021/08/04 02:49:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -113,8 +113,7 @@ sbus_attach(device_t parent, device_t se
sbus_init(type);
config_search(self, NULL,
- CFARG_SEARCH, sbus_search,
- CFARG_EOL);
+ CFARGS(.search = sbus_search));
}
int
@@ -124,7 +123,7 @@ sbus_search(device_t parent, cfdata_t cf
struct sbus_attach_args sa;
if (config_probe(parent, cf, &sa))
- config_attach(parent, cf, &sa, sbus_print, CFARG_EOL);
+ config_attach(parent, cf, &sa, sbus_print, CFARGS_NONE);
return (0);
}
Index: src/sys/arch/playstation2/dev/spd.c
diff -u src/sys/arch/playstation2/dev/spd.c:1.14 src/sys/arch/playstation2/dev/spd.c:1.14.8.1
--- src/sys/arch/playstation2/dev/spd.c:1.14 Sat Apr 24 23:36:45 2021
+++ src/sys/arch/playstation2/dev/spd.c Wed Aug 4 02:49:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: spd.c,v 1.14 2021/04/24 23:36:45 thorpej Exp $ */
+/* $NetBSD: spd.c,v 1.14.8.1 2021/08/04 02:49:39 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spd.c,v 1.14 2021/04/24 23:36:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spd.c,v 1.14.8.1 2021/08/04 02:49:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -109,11 +109,11 @@ spd_attach(device_t parent, device_t sel
spa.spa_slot = SPD_HDD;
spa.spa_product_name = __spd_table[SPD_HDD].name;
- config_found(self, &spa, spd_print, CFARG_EOL);
+ config_found(self, &spa, spd_print, CFARGS_NONE);
spa.spa_slot = SPD_NIC;
spa.spa_product_name = __spd_table[SPD_NIC].name;
- config_found(self, &spa, spd_print, CFARG_EOL);
+ config_found(self, &spa, spd_print, CFARGS_NONE);
sbus_intr_establish(SBUS_IRQ_PCMCIA, spd_intr, 0);
}
Index: src/sys/arch/playstation2/ee/gsfb.c
diff -u src/sys/arch/playstation2/ee/gsfb.c:1.23 src/sys/arch/playstation2/ee/gsfb.c:1.23.8.1
--- src/sys/arch/playstation2/ee/gsfb.c:1.23 Sat Apr 24 23:36:45 2021
+++ src/sys/arch/playstation2/ee/gsfb.c Wed Aug 4 02:49:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gsfb.c,v 1.23 2021/04/24 23:36:45 thorpej Exp $ */
+/* $NetBSD: gsfb.c,v 1.23.8.1 2021/08/04 02:49:39 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gsfb.c,v 1.23 2021/04/24 23:36:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gsfb.c,v 1.23.8.1 2021/08/04 02:49:39 thorpej Exp $");
#include "debug_playstation2.h"
@@ -300,7 +300,7 @@ gsfb_attach(device_t parent, device_t se
wa.accessops = &_gsfb_accessops;
wa.accesscookie = sc;
- config_found(self, &wa, wsdisplaydevprint, CFARG_EOL);
+ config_found(self, &wa, wsdisplaydevprint, CFARGS_NONE);
}
/*
Index: src/sys/arch/playstation2/playstation2/mainbus.c
diff -u src/sys/arch/playstation2/playstation2/mainbus.c:1.17 src/sys/arch/playstation2/playstation2/mainbus.c:1.17.8.1
--- src/sys/arch/playstation2/playstation2/mainbus.c:1.17 Sat Apr 24 23:36:45 2021
+++ src/sys/arch/playstation2/playstation2/mainbus.c Wed Aug 4 02:49:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.17 2021/04/24 23:36:45 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.17.8.1 2021/08/04 02:49:39 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.17 2021/04/24 23:36:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.17.8.1 2021/08/04 02:49:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -59,11 +59,10 @@ mainbus_attach(device_t parent, device_t
/* attach CPU first */
config_found(self, &(struct mainbus_attach_args){.ma_name = "cpu"},
- mainbus_print, CFARG_EOL);
+ mainbus_print, CFARGS_NONE);
config_search(self, NULL,
- CFARG_SEARCH, mainbus_search,
- CFARG_EOL);
+ CFARGS(.search = mainbus_search));
}
static int
@@ -74,7 +73,7 @@ mainbus_search(device_t parent, cfdata_t
ma.ma_name = cf->cf_name;
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/pmax/ibus/dz_ibus.c
diff -u src/sys/arch/pmax/ibus/dz_ibus.c:1.13 src/sys/arch/pmax/ibus/dz_ibus.c:1.13.8.1
--- src/sys/arch/pmax/ibus/dz_ibus.c:1.13 Sat Apr 24 23:36:45 2021
+++ src/sys/arch/pmax/ibus/dz_ibus.c Wed Aug 4 02:49:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dz_ibus.c,v 1.13 2021/04/24 23:36:45 thorpej Exp $ */
+/* $NetBSD: dz_ibus.c,v 1.13.8.1 2021/08/04 02:49:39 thorpej Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dz_ibus.c,v 1.13 2021/04/24 23:36:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz_ibus.c,v 1.13.8.1 2021/08/04 02:49:39 thorpej Exp $");
#include "dzkbd.h"
#include "dzms.h"
@@ -212,7 +212,7 @@ dz_ibus_attach(device_t parent, device_t
DZ_LPR_8_BIT_CHAR | DZ_LINE_KBD;
daa.daa_line = DZ_LINE_KBD;
daa.daa_flags = (dz_ibus_iscn ? 0 : DZKBD_CONSOLE);
- config_found(self, &daa, dz_ibus_print, CFARG_EOL);
+ config_found(self, &daa, dz_ibus_print, CFARGS_NONE);
#endif
#if NDZMS > 0
dz->rbuf = DZ_LPR_RX_ENABLE | (DZ_LPR_B4800 << 8) |
@@ -220,7 +220,7 @@ dz_ibus_attach(device_t parent, device_t
DZ_LINE_MOUSE;
daa.daa_line = DZ_LINE_MOUSE;
daa.daa_flags = 0;
- config_found(self, &daa, dz_ibus_print, CFARG_EOL);
+ config_found(self, &daa, dz_ibus_print, CFARGS_NONE);
#endif
}
}
Index: src/sys/arch/pmax/ibus/ibus.c
diff -u src/sys/arch/pmax/ibus/ibus.c:1.22 src/sys/arch/pmax/ibus/ibus.c:1.22.8.1
--- src/sys/arch/pmax/ibus/ibus.c:1.22 Sat Apr 24 23:36:45 2021
+++ src/sys/arch/pmax/ibus/ibus.c Wed Aug 4 02:49:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ibus.c,v 1.22 2021/04/24 23:36:45 thorpej Exp $ */
+/* $NetBSD: ibus.c,v 1.22.8.1 2021/08/04 02:49:39 thorpej Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ibus.c,v 1.22 2021/04/24 23:36:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibus.c,v 1.22.8.1 2021/08/04 02:49:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -67,9 +67,8 @@ ibusattach(device_t parent, device_t sel
locs[IBUSCF_ADDR] = (int32_t)MIPS_KSEG1_TO_PHYS(ia->ia_addr);
config_found(self, ia, ibusprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
}
Index: src/sys/arch/pmax/ibus/pm.c
diff -u src/sys/arch/pmax/ibus/pm.c:1.17 src/sys/arch/pmax/ibus/pm.c:1.17.8.1
--- src/sys/arch/pmax/ibus/pm.c:1.17 Sat Apr 24 23:36:45 2021
+++ src/sys/arch/pmax/ibus/pm.c Wed Aug 4 02:49:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pm.c,v 1.17 2021/04/24 23:36:45 thorpej Exp $ */
+/* $NetBSD: pm.c,v 1.17.8.1 2021/08/04 02:49:39 thorpej Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.17 2021/04/24 23:36:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.17.8.1 2021/08/04 02:49:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -193,7 +193,7 @@ pm_attach(device_t parent, device_t self
waa.accessops = &pm_accessops;
waa.accesscookie = sc;
- config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE);
}
int
Index: src/sys/arch/pmax/ibus/sii.c
diff -u src/sys/arch/pmax/ibus/sii.c:1.15 src/sys/arch/pmax/ibus/sii.c:1.15.2.1
--- src/sys/arch/pmax/ibus/sii.c:1.15 Sat Jul 24 21:31:34 2021
+++ src/sys/arch/pmax/ibus/sii.c Wed Aug 4 02:49:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sii.c,v 1.15 2021/07/24 21:31:34 andvar Exp $ */
+/* $NetBSD: sii.c,v 1.15.2.1 2021/08/04 02:49:39 thorpej Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sii.c,v 1.15 2021/07/24 21:31:34 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sii.c,v 1.15.2.1 2021/08/04 02:49:39 thorpej Exp $");
#include "sii.h"
/*
@@ -191,7 +191,7 @@ siiattach(struct siisoftc *sc)
/*
* Now try to attach all the sub-devices
*/
- config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARG_EOL);
+ config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARGS_NONE);
}
/*
Index: src/sys/arch/pmax/pmax/mainbus.c
diff -u src/sys/arch/pmax/pmax/mainbus.c:1.43 src/sys/arch/pmax/pmax/mainbus.c:1.43.8.1
--- src/sys/arch/pmax/pmax/mainbus.c:1.43 Sat Apr 24 23:36:45 2021
+++ src/sys/arch/pmax/pmax/mainbus.c Wed Aug 4 02:49:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.43 2021/04/24 23:36:45 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.43.8.1 2021/08/04 02:49:39 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.43 2021/04/24 23:36:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.43.8.1 2021/08/04 02:49:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,11 +78,11 @@ mbattach(device_t parent, device_t self,
*/
ma.ma_name = "cpu";
ma.ma_slot = 0;
- config_found(self, &ma, mbprint, CFARG_EOL);
+ config_found(self, &ma, mbprint, CFARGS_NONE);
ma.ma_name = platform.iobus;
ma.ma_slot = 0;
- config_found(self, &ma, mbprint, CFARG_EOL);
+ config_found(self, &ma, mbprint, CFARGS_NONE);
}
static int
Index: src/sys/arch/pmax/tc/dt.c
diff -u src/sys/arch/pmax/tc/dt.c:1.15 src/sys/arch/pmax/tc/dt.c:1.15.8.1
--- src/sys/arch/pmax/tc/dt.c:1.15 Sat Apr 24 23:36:46 2021
+++ src/sys/arch/pmax/tc/dt.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dt.c,v 1.15 2021/04/24 23:36:46 thorpej Exp $ */
+/* $NetBSD: dt.c,v 1.15.8.1 2021/08/04 02:49:40 thorpej Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@ SOFTWARE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dt.c,v 1.15 2021/04/24 23:36:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dt.c,v 1.15.8.1 2021/08/04 02:49:40 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -232,9 +232,9 @@ dt_attach(device_t parent, device_t self
printf("\n");
dta.dta_addr = DT_ADDR_KBD;
- config_found(self, &dta, dt_print, CFARG_EOL);
+ config_found(self, &dta, dt_print, CFARGS_NONE);
dta.dta_addr = DT_ADDR_MOUSE;
- config_found(self, &dta, dt_print, CFARG_EOL);
+ config_found(self, &dta, dt_print, CFARGS_NONE);
}
void
Index: src/sys/arch/pmax/tc/dtkbd.c
diff -u src/sys/arch/pmax/tc/dtkbd.c:1.12 src/sys/arch/pmax/tc/dtkbd.c:1.12.8.1
--- src/sys/arch/pmax/tc/dtkbd.c:1.12 Sat Apr 24 23:36:46 2021
+++ src/sys/arch/pmax/tc/dtkbd.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dtkbd.c,v 1.12 2021/04/24 23:36:46 thorpej Exp $ */
+/* $NetBSD: dtkbd.c,v 1.12.8.1 2021/08/04 02:49:40 thorpej Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dtkbd.c,v 1.12 2021/04/24 23:36:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dtkbd.c,v 1.12.8.1 2021/08/04 02:49:40 thorpej Exp $");
#include "locators.h"
@@ -129,7 +129,7 @@ dtkbd_attach(device_t parent, device_t s
a.keymap = &dtkbd_keymapdata;
a.accessops = &dtkbd_accessops;
a.accesscookie = sc;
- sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARG_EOL);
+ sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARGS_NONE);
}
void
Index: src/sys/arch/pmax/tc/dtms.c
diff -u src/sys/arch/pmax/tc/dtms.c:1.12 src/sys/arch/pmax/tc/dtms.c:1.12.8.1
--- src/sys/arch/pmax/tc/dtms.c:1.12 Sat Apr 24 23:36:46 2021
+++ src/sys/arch/pmax/tc/dtms.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dtms.c,v 1.12 2021/04/24 23:36:46 thorpej Exp $ */
+/* $NetBSD: dtms.c,v 1.12.8.1 2021/08/04 02:49:40 thorpej Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dtms.c,v 1.12 2021/04/24 23:36:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dtms.c,v 1.12.8.1 2021/08/04 02:49:40 thorpej Exp $");
#include "locators.h"
@@ -99,7 +99,7 @@ dtms_attach(device_t parent, device_t se
a.accessops = &dtms_accessops;
a.accesscookie = sc;
- sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL);
+ sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARGS_NONE);
}
int
Index: src/sys/arch/powerpc/booke/dev/cpunode.c
diff -u src/sys/arch/powerpc/booke/dev/cpunode.c:1.7 src/sys/arch/powerpc/booke/dev/cpunode.c:1.7.8.1
--- src/sys/arch/powerpc/booke/dev/cpunode.c:1.7 Sat Apr 24 23:36:46 2021
+++ src/sys/arch/powerpc/booke/dev/cpunode.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cpunode.c,v 1.7 2021/04/24 23:36:46 thorpej Exp $ */
+/* $NetBSD: cpunode.c,v 1.7.8.1 2021/08/04 02:49:40 thorpej Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpunode.c,v 1.7 2021/04/24 23:36:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpunode.c,v 1.7.8.1 2021/08/04 02:49:40 thorpej Exp $");
#include "ioconf.h"
@@ -154,8 +154,7 @@ cpunode_attach(device_t parent, device_t
cna.cna_locs = *cnl;
config_found(self, &cna, cpunode_print,
- CFARG_IATTR, "cpunode",
- CFARG_EOL);
+ CFARGS(.iattr = "cpunode"));
childmask <<= 1;
}
/*
Index: src/sys/arch/powerpc/booke/dev/pq3duart.c
diff -u src/sys/arch/powerpc/booke/dev/pq3duart.c:1.7 src/sys/arch/powerpc/booke/dev/pq3duart.c:1.7.8.1
--- src/sys/arch/powerpc/booke/dev/pq3duart.c:1.7 Sat Apr 24 23:36:46 2021
+++ src/sys/arch/powerpc/booke/dev/pq3duart.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3duart.c,v 1.7 2021/04/24 23:36:46 thorpej Exp $ */
+/* $NetBSD: pq3duart.c,v 1.7.8.1 2021/08/04 02:49:40 thorpej Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pq3duart.c,v 1.7 2021/04/24 23:36:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3duart.c,v 1.7.8.1 2021/08/04 02:49:40 thorpej Exp $");
#include "ioconf.h"
@@ -169,7 +169,7 @@ pq3duart_attach(device_t parent, device_
da.da_port = port;
da.da_addr = cnl->cnl_addr + (port - 1) * DUART_SIZE;
da.da_size = COM_NPORTS;
- config_found(self, &da, pq3duart_print, CFARG_EOL);
+ config_found(self, &da, pq3duart_print, CFARGS_NONE);
}
if (dsc->dsc_sc[0] != NULL || dsc->dsc_sc[1] != NULL) {
Index: src/sys/arch/powerpc/booke/dev/pq3ehci.c
diff -u src/sys/arch/powerpc/booke/dev/pq3ehci.c:1.11 src/sys/arch/powerpc/booke/dev/pq3ehci.c:1.11.8.1
--- src/sys/arch/powerpc/booke/dev/pq3ehci.c:1.11 Sat Apr 24 23:36:46 2021
+++ src/sys/arch/powerpc/booke/dev/pq3ehci.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3ehci.c,v 1.11 2021/04/24 23:36:46 thorpej Exp $ */
+/* $NetBSD: pq3ehci.c,v 1.11.8.1 2021/08/04 02:49:40 thorpej Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pq3ehci.c,v 1.11 2021/04/24 23:36:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3ehci.c,v 1.11.8.1 2021/08/04 02:49:40 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -163,7 +163,7 @@ pq3ehci_attach(device_t parent, device_t
/* Attach usb device. */
sc->sc.sc_child = config_found(self, &sc->sc.sc_bus, usbctlprint,
- CFARG_EOL);
+ CFARGS_NONE);
return;
fail:
Index: src/sys/arch/powerpc/booke/dev/pq3etsec.c
diff -u src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.55 src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.55.2.1
--- src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.55 Wed Jun 16 00:21:18 2021
+++ src/sys/arch/powerpc/booke/dev/pq3etsec.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3etsec.c,v 1.55 2021/06/16 00:21:18 riastradh Exp $ */
+/* $NetBSD: pq3etsec.c,v 1.55.2.1 2021/08/04 02:49:40 thorpej Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.55 2021/06/16 00:21:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.55.2.1 2021/08/04 02:49:40 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -718,11 +718,10 @@ pq3etsec_attach(device_t parent, device_
if (mdio == CPUNODECF_MDIO_DEFAULT) {
aprint_normal("\n");
cfdata_t mdio_cf = config_search(self, cna,
- CFARG_SUBMATCH, pq3mdio_find,
- CFARG_EOL);
+ CFARGS(.submatch = pq3mdio_find));
if (mdio_cf != NULL) {
sc->sc_mdio_dev =
- config_attach(self, mdio_cf, cna, NULL, CFARG_EOL);
+ config_attach(self, mdio_cf, cna, NULL, CFARGS_NONE);
}
} else {
sc->sc_mdio_dev = device_find_by_driver_unit("mdio", mdio);
Index: src/sys/arch/powerpc/booke/dev/pq3gpio.c
diff -u src/sys/arch/powerpc/booke/dev/pq3gpio.c:1.13 src/sys/arch/powerpc/booke/dev/pq3gpio.c:1.13.8.1
--- src/sys/arch/powerpc/booke/dev/pq3gpio.c:1.13 Sat Apr 24 23:36:46 2021
+++ src/sys/arch/powerpc/booke/dev/pq3gpio.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3gpio.c,v 1.13 2021/04/24 23:36:46 thorpej Exp $ */
+/* $NetBSD: pq3gpio.c,v 1.13.8.1 2021/08/04 02:49:40 thorpej Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -38,7 +38,7 @@
#define GPIO_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pq3gpio.c,v 1.13 2021/04/24 23:36:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3gpio.c,v 1.13.8.1 2021/08/04 02:49:40 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_mpc85xx.h"
@@ -238,8 +238,7 @@ pq3gpio_group_create(device_t self, bus_
};
config_found(self, &gba, gpiobus_print,
- CFARG_IATTR, "gpiobus",
- CFARG_EOL);
+ CFARGS(.iattr = "gpiobus"));
}
#ifdef MPC8536
Index: src/sys/arch/powerpc/booke/dev/pq3obio.c
diff -u src/sys/arch/powerpc/booke/dev/pq3obio.c:1.6 src/sys/arch/powerpc/booke/dev/pq3obio.c:1.6.8.1
--- src/sys/arch/powerpc/booke/dev/pq3obio.c:1.6 Sat Apr 24 23:36:46 2021
+++ src/sys/arch/powerpc/booke/dev/pq3obio.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3obio.c,v 1.6 2021/04/24 23:36:46 thorpej Exp $ */
+/* $NetBSD: pq3obio.c,v 1.6.8.1 2021/08/04 02:49:40 thorpej Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -37,7 +37,7 @@
#define LBC_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pq3obio.c,v 1.6 2021/04/24 23:36:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3obio.c,v 1.6.8.1 2021/08/04 02:49:40 thorpej Exp $");
#include "locators.h"
@@ -152,8 +152,7 @@ pq3obio_search(device_t parent, cfdata_t
[OBIOCF_CS] = ga.ga_cs,
};
config_attach(parent, cf, &ga, pq3obio_print,
- CFARG_LOCATORS, floc,
- CFARG_EOL);
+ CFARGS(.locators = floc));
tryagain = (cf->cf_fstate == FSTATE_STAR);
}
} while (tryagain);
@@ -289,7 +288,6 @@ pq3obio_attach(device_t parent, device_t
locs[OBIOCF_SIZE] = OBIOCF_SIZE_DEFAULT;
locs[OBIOCF_CS] = OBIOCF_CS_DEFAULT;
config_search(self, NULL,
- CFARG_SEARCH, pq3obio_search,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.search = pq3obio_search,
+ .locators = locs));
}
Index: src/sys/arch/powerpc/booke/pci/pq3pci.c
diff -u src/sys/arch/powerpc/booke/pci/pq3pci.c:1.28 src/sys/arch/powerpc/booke/pci/pq3pci.c:1.28.8.1
--- src/sys/arch/powerpc/booke/pci/pq3pci.c:1.28 Sat Apr 24 23:36:46 2021
+++ src/sys/arch/powerpc/booke/pci/pq3pci.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3pci.c,v 1.28 2021/04/24 23:36:46 thorpej Exp $ */
+/* $NetBSD: pq3pci.c,v 1.28.8.1 2021/08/04 02:49:40 thorpej Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -39,7 +39,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pq3pci.c,v 1.28 2021/04/24 23:36:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3pci.c,v 1.28.8.1 2021/08/04 02:49:40 thorpej Exp $");
#include "locators.h"
@@ -994,7 +994,7 @@ pq3pci_cpunode_attach(device_t parent, d
pci_conf_print(pc, 0, NULL);
#endif
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
}
static void
Index: src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c:1.7 src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c:1.7.8.1
--- src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c:1.7 Sat Apr 24 23:36:46 2021
+++ src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dwctwo_plb.c,v 1.7 2021/04/24 23:36:46 thorpej Exp $ */
+/* $NetBSD: dwctwo_plb.c,v 1.7.8.1 2021/08/04 02:49:40 thorpej Exp $ */
/*
* Copyright (c) 2013 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwctwo_plb.c,v 1.7 2021/04/24 23:36:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwctwo_plb.c,v 1.7.8.1 2021/08/04 02:49:40 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -138,5 +138,5 @@ dwctwo_plb_deferred(device_t self)
return;
}
sc->sc_child = config_found(sc->sc_dev, &sc->sc_bus, usbctlprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
Index: src/sys/arch/powerpc/ibm4xx/dev/exb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/exb.c:1.4 src/sys/arch/powerpc/ibm4xx/dev/exb.c:1.4.8.1
--- src/sys/arch/powerpc/ibm4xx/dev/exb.c:1.4 Sat Apr 24 23:36:46 2021
+++ src/sys/arch/powerpc/ibm4xx/dev/exb.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $Id: exb.c,v 1.4 2021/04/24 23:36:46 thorpej Exp $ */
+/* $Id: exb.c,v 1.4.8.1 2021/08/04 02:49:40 thorpej Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exb.c,v 1.4 2021/04/24 23:36:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exb.c,v 1.4.8.1 2021/08/04 02:49:40 thorpej Exp $");
#include "locators.h"
@@ -102,9 +102,8 @@ exb_attach(device_t parent, device_t sel
ec1.ec_bust = exb_get_bus_space_tag();
config_found(self, &ec1, exb_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
ec++;
}
}
Index: src/sys/arch/powerpc/ibm4xx/dev/gpiic_opb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/gpiic_opb.c:1.11 src/sys/arch/powerpc/ibm4xx/dev/gpiic_opb.c:1.11.8.1
--- src/sys/arch/powerpc/ibm4xx/dev/gpiic_opb.c:1.11 Sat Apr 24 23:36:46 2021
+++ src/sys/arch/powerpc/ibm4xx/dev/gpiic_opb.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gpiic_opb.c,v 1.11 2021/04/24 23:36:46 thorpej Exp $ */
+/* $NetBSD: gpiic_opb.c,v 1.11.8.1 2021/08/04 02:49:40 thorpej Exp $ */
/*
* Copyright 2002, 2003 Wasabi Systems, Inc.
@@ -132,7 +132,7 @@ gpiic_attach(device_t parent, device_t s
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/powerpc/ibm4xx/dev/gpio_opb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/gpio_opb.c:1.9 src/sys/arch/powerpc/ibm4xx/dev/gpio_opb.c:1.9.8.1
--- src/sys/arch/powerpc/ibm4xx/dev/gpio_opb.c:1.9 Sat Apr 24 23:36:46 2021
+++ src/sys/arch/powerpc/ibm4xx/dev/gpio_opb.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio_opb.c,v 1.9 2021/04/24 23:36:46 thorpej Exp $ */
+/* $NetBSD: gpio_opb.c,v 1.9.8.1 2021/08/04 02:49:40 thorpej Exp $ */
/*
* Copyright (c) 2004 Shigeyuki Fukushima.
@@ -152,7 +152,7 @@ gpio_opb_attach(device_t parent, device_
gba.gba_npins = GPIO_NPINS;
/* Attach GPIO framework */
- (void) config_found(self, &gba, gpiobus_print, CFARG_EOL);
+ (void) config_found(self, &gba, gpiobus_print, CFARGS_NONE);
}
static int
Index: src/sys/arch/powerpc/ibm4xx/dev/opb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/opb.c:1.28 src/sys/arch/powerpc/ibm4xx/dev/opb.c:1.28.8.1
--- src/sys/arch/powerpc/ibm4xx/dev/opb.c:1.28 Sat Apr 24 23:36:46 2021
+++ src/sys/arch/powerpc/ibm4xx/dev/opb.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: opb.c,v 1.28 2021/04/24 23:36:46 thorpej Exp $ */
+/* $NetBSD: opb.c,v 1.28.8.1 2021/08/04 02:49:40 thorpej Exp $ */
/*
* Copyright 2001,2002 Wasabi Systems, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opb.c,v 1.28 2021/04/24 23:36:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opb.c,v 1.28.8.1 2021/08/04 02:49:40 thorpej Exp $");
#include "locators.h"
@@ -259,8 +259,7 @@ opb_attach(device_t parent, device_t sel
oaa.opb_flags = opb_devs[i].flags;
config_found(self, &oaa, opb_print,
- CFARG_SUBMATCH, opb_submatch,
- CFARG_EOL);
+ CFARGS(.submatch = opb_submatch));
}
}
Index: src/sys/arch/powerpc/ibm4xx/dev/plb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.23 src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.23.8.1
--- src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.23 Sat Apr 24 23:36:46 2021
+++ src/sys/arch/powerpc/ibm4xx/dev/plb.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: plb.c,v 1.23 2021/04/24 23:36:46 thorpej Exp $ */
+/* $NetBSD: plb.c,v 1.23.8.1 2021/08/04 02:49:40 thorpej Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plb.c,v 1.23 2021/04/24 23:36:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plb.c,v 1.23.8.1 2021/08/04 02:49:40 thorpej Exp $");
#include "emac.h"
#include "locators.h"
@@ -178,7 +178,7 @@ plb_attach(device_t parent, device_t sel
paa.plb_dmat = &ibm4xx_default_bus_dma_tag;
paa.plb_irq = PLBCF_IRQ_DEFAULT;
- config_found(self, &paa, plb_print, CFARG_EOL);
+ config_found(self, &paa, plb_print, CFARGS_NONE);
}
while (local_plb_devs && local_plb_devs->plb_name != NULL) {
@@ -190,7 +190,7 @@ plb_attach(device_t parent, device_t sel
paa.plb_dmat = &ibm4xx_default_bus_dma_tag;
paa.plb_irq = PLBCF_IRQ_DEFAULT;
- config_found(self, &paa, plb_print, CFARG_EOL);
+ config_found(self, &paa, plb_print, CFARGS_NONE);
local_plb_devs++;
}
}
Index: src/sys/arch/powerpc/ibm4xx/pci/pchb.c
diff -u src/sys/arch/powerpc/ibm4xx/pci/pchb.c:1.15 src/sys/arch/powerpc/ibm4xx/pci/pchb.c:1.15.8.1
--- src/sys/arch/powerpc/ibm4xx/pci/pchb.c:1.15 Sat Apr 24 23:36:46 2021
+++ src/sys/arch/powerpc/ibm4xx/pci/pchb.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pchb.c,v 1.15 2021/04/24 23:36:46 thorpej Exp $ */
+/* $NetBSD: pchb.c,v 1.15.8.1 2021/08/04 02:49:40 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.15 2021/04/24 23:36:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.15.8.1 2021/08/04 02:49:40 thorpej Exp $");
#include "pci.h"
@@ -186,7 +186,7 @@ pchbattach(device_t parent, device_t sel
pba.pba_bus = 0;
pba.pba_bridgetag = NULL;
pba.pba_flags = PCI_FLAGS_MEM_OKAY | PCI_FLAGS_IO_OKAY;
- config_found(self, &pba, pchbprint, CFARG_EOL);
+ config_found(self, &pba, pchbprint, CFARGS_NONE);
}
Index: src/sys/arch/powerpc/pci/pchb.c
diff -u src/sys/arch/powerpc/pci/pchb.c:1.11 src/sys/arch/powerpc/pci/pchb.c:1.11.8.1
--- src/sys/arch/powerpc/pci/pchb.c:1.11 Sat Apr 24 23:36:46 2021
+++ src/sys/arch/powerpc/pci/pchb.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pchb.c,v 1.11 2021/04/24 23:36:46 thorpej Exp $ */
+/* $NetBSD: pchb.c,v 1.11.8.1 2021/08/04 02:49:40 thorpej Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.11 2021/04/24 23:36:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.11.8.1 2021/08/04 02:49:40 thorpej Exp $");
#include "agp.h"
@@ -286,8 +286,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"));
}
#endif /* NAGP */
}
Index: src/sys/arch/powerpc/pci/pcib.c
diff -u src/sys/arch/powerpc/pci/pcib.c:1.9 src/sys/arch/powerpc/pci/pcib.c:1.9.8.1
--- src/sys/arch/powerpc/pci/pcib.c:1.9 Sat Apr 24 23:36:46 2021
+++ src/sys/arch/powerpc/pci/pcib.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.9 2021/04/24 23:36:46 thorpej Exp $ */
+/* $NetBSD: pcib.c,v 1.9.8.1 2021/08/04 02:49:40 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.9 2021/04/24 23:36:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.9.8.1 2021/08/04 02:49:40 thorpej Exp $");
#include "isa.h"
#include "isadma.h"
@@ -213,6 +213,6 @@ pcib_callback(device_t self)
#if NISADMA > 0
iba.iba_dmat = &isa_bus_dma_tag;
#endif
- config_found(sc->sc_dev, &iba, isabusprint, CFARG_EOL);
+ config_found(sc->sc_dev, &iba, isabusprint, CFARGS_NONE);
#endif
}
Index: src/sys/arch/prep/pci/gten.c
diff -u src/sys/arch/prep/pci/gten.c:1.23 src/sys/arch/prep/pci/gten.c:1.23.8.1
--- src/sys/arch/prep/pci/gten.c:1.23 Sat Apr 24 23:36:46 2021
+++ src/sys/arch/prep/pci/gten.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gten.c,v 1.23 2021/04/24 23:36:46 thorpej Exp $ */
+/* $NetBSD: gten.c,v 1.23.8.1 2021/08/04 02:49:40 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gten.c,v 1.23 2021/04/24 23:36:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gten.c,v 1.23.8.1 2021/08/04 02:49:40 thorpej Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -208,7 +208,7 @@ gten_attach(device_t parent, device_t se
a.accessops = >en_accessops;
a.accesscookie = gt;
- config_found(self, &a, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &a, wsemuldisplaydevprint, CFARGS_NONE);
}
static void
Index: src/sys/arch/prep/pci/pceb.c
diff -u src/sys/arch/prep/pci/pceb.c:1.7 src/sys/arch/prep/pci/pceb.c:1.7.8.1
--- src/sys/arch/prep/pci/pceb.c:1.7 Sat Apr 24 23:36:46 2021
+++ src/sys/arch/prep/pci/pceb.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pceb.c,v 1.7 2021/04/24 23:36:46 thorpej Exp $ */
+/* $NetBSD: pceb.c,v 1.7.8.1 2021/08/04 02:49:40 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pceb.c,v 1.7 2021/04/24 23:36:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pceb.c,v 1.7.8.1 2021/08/04 02:49:40 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -138,8 +138,7 @@ pceb_callback(device_t self)
ea.ea_eba.eba_dmat = &eisa_bus_dma_tag;
#endif
config_found(self, &ea.ea_eba, eisabusprint,
- CFARG_IATTR, "eisabus",
- CFARG_EOL);
+ CFARGS(.iattr = "eisabus"));
/*
* Attach the ISA bus behind this bridge.
@@ -151,6 +150,5 @@ pceb_callback(device_t self)
ea.ea_iba.iba_dmat = &isa_bus_dma_tag;
#endif
config_found(self, &ea.ea_iba, isabusprint,
- CFARG_IATTR, "isabus",
- CFARG_EOL);
+ CFARGS(.iattr = "isabus"));
}
Index: src/sys/arch/prep/pnpbus/pnpbus.c
diff -u src/sys/arch/prep/pnpbus/pnpbus.c:1.14 src/sys/arch/prep/pnpbus/pnpbus.c:1.14.8.1
--- src/sys/arch/prep/pnpbus/pnpbus.c:1.14 Sat Apr 24 23:36:46 2021
+++ src/sys/arch/prep/pnpbus/pnpbus.c Wed Aug 4 02:49:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pnpbus.c,v 1.14 2021/04/24 23:36:46 thorpej Exp $ */
+/* $NetBSD: pnpbus.c,v 1.14.8.1 2021/08/04 02:49:40 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pnpbus.c,v 1.14 2021/04/24 23:36:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pnpbus.c,v 1.14.8.1 2021/08/04 02:49:40 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -94,8 +94,7 @@ pnpbus_attach(device_t parent, device_t
#endif
config_search(self, aux,
- CFARG_SEARCH, pnpbus_search,
- CFARG_EOL);
+ CFARGS(.search = pnpbus_search));
}
static int
@@ -404,7 +403,7 @@ pnpbus_search(device_t parent, cfdata_t
pnp_getpna(&pna, paa, &ppc_dev[i]);
if (config_probe(parent, cf, &pna))
config_attach(parent, cf, &pna, pnpbus_print,
- CFARG_EOL);
+ CFARGS_NONE);
}
return 0;
Index: src/sys/arch/prep/prep/mainbus.c
diff -u src/sys/arch/prep/prep/mainbus.c:1.39 src/sys/arch/prep/prep/mainbus.c:1.39.8.1
--- src/sys/arch/prep/prep/mainbus.c:1.39 Sat Apr 24 23:36:47 2021
+++ src/sys/arch/prep/prep/mainbus.c Wed Aug 4 02:49:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.39 2021/04/24 23:36:47 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.39.8.1 2021/08/04 02:49:41 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.39 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.39.8.1 2021/08/04 02:49:41 thorpej Exp $");
#include "opt_pci.h"
#include "opt_residual.h"
@@ -121,8 +121,7 @@ mainbus_attach(device_t parent, device_t
ca.ca_name = "cpu";
ca.ca_node = i;
config_found(self, &ca, NULL,
- CFARG_IATTR, "mainbus",
- CFARG_EOL);
+ CFARGS(.iattr = "mainbus"));
}
/*
@@ -170,8 +169,7 @@ mainbus_attach(device_t parent, device_t
mba.mba_paa.paa_ic = &genppc_ict;
mba.mba_paa.paa_dmat = &isa_bus_dma_tag;
config_found(self, &mba.mba_pba, mainbus_print,
- CFARG_IATTR, "mainbus",
- CFARG_EOL);
+ CFARGS(.iattr = "mainbus"));
#endif /* NPNPBUS */
#if NPCI > 0
@@ -186,8 +184,7 @@ mainbus_attach(device_t parent, device_t
mba.mba_pba.pba_bridgetag = NULL;
mba.mba_pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
config_found(self, &mba.mba_pba, pcibusprint,
- CFARG_IATTR, "pcibus",
- CFARG_EOL);
+ CFARGS(.iattr = "pcibus"));
#endif /* NPCI */
#ifdef RESIDUAL_DATA_DUMP
