Module Name: src
Committed By: thorpej
Date: Wed Aug 4 02:58:24 UTC 2021
Modified Files:
src/sys/arch/sun2/dev [thorpej-cfargs2]: zs.c
src/sys/arch/sun2/sun2 [thorpej-cfargs2]: mbio.c mbmem.c obio.c obmem.c
src/sys/arch/sun3/dev [thorpej-cfargs2]: fd.c sebuf.c xd.c xy.c zs.c
src/sys/arch/sun3/sun3 [thorpej-cfargs2]: autoconf.c mainbus.c obio.c
obmem.c vme.c
src/sys/arch/sun3/sun3x [thorpej-cfargs2]: obio.c vme.c
src/sys/arch/sun68k/sun68k [thorpej-cfargs2]: autoconf.c vme_sun68k.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/sun2/dev/zs.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/sun2/sun2/mbio.c \
src/sys/arch/sun2/sun2/obio.c src/sys/arch/sun2/sun2/obmem.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/sun2/sun2/mbmem.c
cvs rdiff -u -r1.85 -r1.85.8.1 src/sys/arch/sun3/dev/fd.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/sun3/dev/sebuf.c
cvs rdiff -u -r1.76 -r1.76.8.1 src/sys/arch/sun3/dev/xd.c
cvs rdiff -u -r1.81 -r1.81.8.1 src/sys/arch/sun3/dev/xy.c
cvs rdiff -u -r1.89 -r1.89.8.1 src/sys/arch/sun3/dev/zs.c
cvs rdiff -u -r1.80 -r1.80.8.1 src/sys/arch/sun3/sun3/autoconf.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/sun3/sun3/mainbus.c
cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/arch/sun3/sun3/obio.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/arch/sun3/sun3/obmem.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/sun3/sun3/vme.c
cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/arch/sun3/sun3x/obio.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/sun3/sun3x/vme.c
cvs rdiff -u -r1.31 -r1.31.8.1 src/sys/arch/sun68k/sun68k/autoconf.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/sun68k/sun68k/vme_sun68k.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/sun2/dev/zs.c
diff -u src/sys/arch/sun2/dev/zs.c:1.22 src/sys/arch/sun2/dev/zs.c:1.22.8.1
--- src/sys/arch/sun2/dev/zs.c:1.22 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sun2/dev/zs.c Wed Aug 4 02:58:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.22 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: zs.c,v 1.22.8.1 2021/08/04 02:58:23 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.22 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.22.8.1 2021/08/04 02:58:23 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -233,7 +233,7 @@ zs_attach(struct zsc_softc *zsc, struct
* The child attach will setup the hardware.
*/
if ((child = config_found(zsc->zsc_dev, (void *)&zsc_args,
- zs_print, CFARG_EOL)) == NULL) {
+ zs_print, CFARGS_NONE)) == NULL) {
/* No sub-driver. Just reset it. */
uint8_t reset = (channel == 0) ?
ZSWR9_A_RESET : ZSWR9_B_RESET;
@@ -274,14 +274,14 @@ zs_attach(struct zsc_softc *zsc, struct
#if (NKBD > 0)
kma.kmta_name = "keyboard";
config_found(child, (void *)&kma, NULL,
- CFARG_EOL);
+ CFARGS_NONE);
#endif
break;
case ZS_PERIPHERAL_SUNMS:
#if (NMS > 0)
kma.kmta_name = "mouse";
config_found(child, (void *)&kma, NULL,
- CFARG_EOL);
+ CFARGS_NONE);
#endif
break;
default:
Index: src/sys/arch/sun2/sun2/mbio.c
diff -u src/sys/arch/sun2/sun2/mbio.c:1.20 src/sys/arch/sun2/sun2/mbio.c:1.20.8.1
--- src/sys/arch/sun2/sun2/mbio.c:1.20 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sun2/sun2/mbio.c Wed Aug 4 02:58:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mbio.c,v 1.20 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: mbio.c,v 1.20.8.1 2021/08/04 02:58:23 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mbio.c,v 1.20 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mbio.c,v 1.20.8.1 2021/08/04 02:58:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -130,15 +130,13 @@ mbio_attach(device_t parent, device_t se
for (cpp = special; *cpp != NULL; cpp++) {
mba.mba_name = *cpp;
config_search(self, &mba,
- CFARG_SEARCH, sun68k_bus_search,
- CFARG_EOL);
+ CFARGS(.search = sun68k_bus_search));
}
/* Find all other mbio devices */
mba.mba_name = NULL;
config_search(self, &mba,
- CFARG_SEARCH, sun68k_bus_search,
- CFARG_EOL);
+ CFARGS(.search = sun68k_bus_search));
}
int
Index: src/sys/arch/sun2/sun2/obio.c
diff -u src/sys/arch/sun2/sun2/obio.c:1.20 src/sys/arch/sun2/sun2/obio.c:1.20.8.1
--- src/sys/arch/sun2/sun2/obio.c:1.20 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sun2/sun2/obio.c Wed Aug 4 02:58:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.20 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.20.8.1 2021/08/04 02:58:23 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.20 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.20.8.1 2021/08/04 02:58:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -135,15 +135,13 @@ obio_attach(device_t parent, device_t se
for (cpp = special; *cpp != NULL; cpp++) {
oba.oba_name = *cpp;
config_search(self, &oba,
- CFARG_SEARCH, sun68k_bus_search,
- CFARG_EOL);
+ CFARGS(.search = sun68k_bus_search));
}
/* Find all other obio devices */
oba.oba_name = NULL;
config_search(self, &oba,
- CFARG_SEARCH, sun68k_bus_search,
- CFARG_EOL);
+ CFARGS(.search = sun68k_bus_search));
}
int
Index: src/sys/arch/sun2/sun2/obmem.c
diff -u src/sys/arch/sun2/sun2/obmem.c:1.20 src/sys/arch/sun2/sun2/obmem.c:1.20.8.1
--- src/sys/arch/sun2/sun2/obmem.c:1.20 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sun2/sun2/obmem.c Wed Aug 4 02:58:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obmem.c,v 1.20 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: obmem.c,v 1.20.8.1 2021/08/04 02:58:23 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obmem.c,v 1.20 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obmem.c,v 1.20.8.1 2021/08/04 02:58:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,15 +125,13 @@ obmem_attach(device_t parent, device_t s
for (cpp = special; *cpp != NULL; cpp++) {
obma.obma_name = *cpp;
config_search(self, &obma,
- CFARG_SEARCH, sun68k_bus_search,
- CFARG_EOL);
+ CFARGS(.search = sun68k_bus_search));
}
/* Find all other obmem devices */
obma.obma_name = NULL;
config_search(self, &obma,
- CFARG_SEARCH, sun68k_bus_search,
- CFARG_EOL);
+ CFARGS(.search = sun68k_bus_search));
}
int
Index: src/sys/arch/sun2/sun2/mbmem.c
diff -u src/sys/arch/sun2/sun2/mbmem.c:1.21 src/sys/arch/sun2/sun2/mbmem.c:1.21.8.1
--- src/sys/arch/sun2/sun2/mbmem.c:1.21 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sun2/sun2/mbmem.c Wed Aug 4 02:58:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mbmem.c,v 1.21 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: mbmem.c,v 1.21.8.1 2021/08/04 02:58:23 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mbmem.c,v 1.21 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mbmem.c,v 1.21.8.1 2021/08/04 02:58:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -144,15 +144,13 @@ mbmem_attach(device_t parent, device_t s
for (cpp = special; *cpp != NULL; cpp++) {
mbma.mbma_name = *cpp;
config_search(self, &mbma,
- CFARG_SEARCH, sun68k_bus_search,
- CFARG_EOL);
+ CFARGS(.search = sun68k_bus_search));
}
/* Find all other mbmem devices */
mbma.mbma_name = NULL;
config_search(self, &mbma,
- CFARG_SEARCH, sun68k_bus_search,
- CFARG_EOL);
+ CFARGS(.search = sun68k_bus_search));
}
int
Index: src/sys/arch/sun3/dev/fd.c
diff -u src/sys/arch/sun3/dev/fd.c:1.85 src/sys/arch/sun3/dev/fd.c:1.85.8.1
--- src/sys/arch/sun3/dev/fd.c:1.85 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sun3/dev/fd.c Wed Aug 4 02:58:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.85 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: fd.c,v 1.85.8.1 2021/08/04 02:58:24 thorpej Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.85 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.85.8.1 2021/08/04 02:58:24 thorpej Exp $");
#include "opt_ddb.h"
@@ -494,7 +494,7 @@ fdcattach(device_t parent, device_t self
for (fa.fa_drive = 0; fa.fa_drive < 4; fa.fa_drive++) {
fa.fa_deftype = NULL; /* unknown */
fa.fa_deftype = &fd_types[0]; /* XXX */
- (void)config_found(self, (void *)&fa, fdprint, CFARG_EOL);
+ (void)config_found(self, (void *)&fa, fdprint, CFARGS_NONE);
}
}
Index: src/sys/arch/sun3/dev/sebuf.c
diff -u src/sys/arch/sun3/dev/sebuf.c:1.18 src/sys/arch/sun3/dev/sebuf.c:1.18.8.1
--- src/sys/arch/sun3/dev/sebuf.c:1.18 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sun3/dev/sebuf.c Wed Aug 4 02:58:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sebuf.c,v 1.18 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: sebuf.c,v 1.18.8.1 2021/08/04 02:58:24 thorpej Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sebuf.c,v 1.18 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sebuf.c,v 1.18.8.1 2021/08/04 02:58:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -161,7 +161,7 @@ sebuf_attach(device_t parent, device_t s
aa.buf = ®s->se_scsi_buf[0];
aa.blen = SE_NCRBUFSIZE;
aa.regs = ®s->se_scsi_regs;
- (void)config_found(self, (void *)&aa, sebuf_print, CFARG_EOL);
+ (void)config_found(self, (void *)&aa, sebuf_print, CFARGS_NONE);
/* Attach the Ethernet child. */
aa.ca.ca_intpri++;
@@ -170,7 +170,7 @@ sebuf_attach(device_t parent, device_t s
aa.buf = ®s->se_eth_buf[0];
aa.blen = SE_IEBUFSIZE;
aa.regs = ®s->se_eth_regs;
- (void)config_found(self, (void *)&aa, sebuf_print, CFARG_EOL);
+ (void)config_found(self, (void *)&aa, sebuf_print, CFARGS_NONE);
}
static int
Index: src/sys/arch/sun3/dev/xd.c
diff -u src/sys/arch/sun3/dev/xd.c:1.76 src/sys/arch/sun3/dev/xd.c:1.76.8.1
--- src/sys/arch/sun3/dev/xd.c:1.76 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sun3/dev/xd.c Wed Aug 4 02:58:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xd.c,v 1.76 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: xd.c,v 1.76.8.1 2021/08/04 02:58:24 thorpej Exp $ */
/*
* Copyright (c) 1995 Charles D. Cranor
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.76 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.76.8.1 2021/08/04 02:58:24 thorpej Exp $");
#undef XDC_DEBUG /* full debug */
#define XDC_DIAG /* extra sanity checks */
@@ -513,7 +513,7 @@ xdcattach(device_t parent, device_t self
/* now we must look for disks using autoconfig */
xa.booting = 1;
for (xa.driveno = 0; xa.driveno < XDC_MAXDEV; xa.driveno++)
- (void)config_found(self, (void *)&xa, xdc_print, CFARG_EOL);
+ (void)config_found(self, (void *)&xa, xdc_print, CFARGS_NONE);
/* start the watchdog clock */
callout_reset(&xdc->sc_tick_ch, XDC_TICKCNT, xdc_tick, xdc);
Index: src/sys/arch/sun3/dev/xy.c
diff -u src/sys/arch/sun3/dev/xy.c:1.81 src/sys/arch/sun3/dev/xy.c:1.81.8.1
--- src/sys/arch/sun3/dev/xy.c:1.81 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sun3/dev/xy.c Wed Aug 4 02:58:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xy.c,v 1.81 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: xy.c,v 1.81.8.1 2021/08/04 02:58:24 thorpej Exp $ */
/*
* Copyright (c) 1995 Charles D. Cranor
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.81 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.81.8.1 2021/08/04 02:58:24 thorpej Exp $");
#undef XYC_DEBUG /* full debug */
#undef XYC_DIAG /* extra sanity checks */
@@ -448,7 +448,7 @@ xycattach(device_t parent, device_t self
/* now we must look for disks using autoconfig */
for (xa.driveno = 0; xa.driveno < XYC_MAXDEV; xa.driveno++)
- (void)config_found(self, (void *)&xa, xyc_print, CFARG_EOL);
+ (void)config_found(self, (void *)&xa, xyc_print, CFARGS_NONE);
/* start the watchdog clock */
callout_reset(&xyc->sc_tick_ch, XYC_TICKCNT, xyc_tick, xyc);
Index: src/sys/arch/sun3/dev/zs.c
diff -u src/sys/arch/sun3/dev/zs.c:1.89 src/sys/arch/sun3/dev/zs.c:1.89.8.1
--- src/sys/arch/sun3/dev/zs.c:1.89 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sun3/dev/zs.c Wed Aug 4 02:58:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.89 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: zs.c,v 1.89.8.1 2021/08/04 02:58:24 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.89 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.89.8.1 2021/08/04 02:58:24 thorpej Exp $");
#include "opt_kgdb.h"
@@ -320,7 +320,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/sun3/sun3/autoconf.c
diff -u src/sys/arch/sun3/sun3/autoconf.c:1.80 src/sys/arch/sun3/sun3/autoconf.c:1.80.8.1
--- src/sys/arch/sun3/sun3/autoconf.c:1.80 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/sun3/sun3/autoconf.c Wed Aug 4 02:58:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.80 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: autoconf.c,v 1.80.8.1 2021/08/04 02:58:24 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.80 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.80.8.1 2021/08/04 02:58:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -122,7 +122,7 @@ bus_scan(device_t parent, cfdata_t cf, c
* XXX - This is a hack...
*/
if (config_probe(parent, cf, ca)) {
- config_attach(parent, cf, ca, bus_print, CFARG_EOL);
+ config_attach(parent, cf, ca, bus_print, CFARGS_NONE);
}
return 0;
}
Index: src/sys/arch/sun3/sun3/mainbus.c
diff -u src/sys/arch/sun3/sun3/mainbus.c:1.19 src/sys/arch/sun3/sun3/mainbus.c:1.19.8.1
--- src/sys/arch/sun3/sun3/mainbus.c:1.19 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/sun3/sun3/mainbus.c Wed Aug 4 02:58:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.19 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.19.8.1 2021/08/04 02:58:24 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.19 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.19.8.1 2021/08/04 02:58:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,6 +76,6 @@ main_attach(device_t parent, device_t se
for (i = 0; i < BUS__NTYPES; i++) {
ca.ca_bustype = i;
- (void)config_found(self, &ca, NULL, CFARG_EOL);
+ (void)config_found(self, &ca, NULL, CFARGS_NONE);
}
}
Index: src/sys/arch/sun3/sun3/obio.c
diff -u src/sys/arch/sun3/sun3/obio.c:1.58 src/sys/arch/sun3/sun3/obio.c:1.58.8.1
--- src/sys/arch/sun3/sun3/obio.c:1.58 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/sun3/sun3/obio.c Wed Aug 4 02:58:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.58 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.58.8.1 2021/08/04 02:58:24 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.58 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.58.8.1 2021/08/04 02:58:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -148,8 +148,7 @@ obio_attach(device_t parent, device_t se
oba.ca_intpri = -1;
oba.ca_intvec = -1;
config_found(self, &oba, obio_print,
- CFARG_SUBMATCH, obio_submatch,
- CFARG_EOL);
+ CFARGS(.submatch = obio_submatch));
}
}
Index: src/sys/arch/sun3/sun3/obmem.c
diff -u src/sys/arch/sun3/sun3/obmem.c:1.28 src/sys/arch/sun3/sun3/obmem.c:1.28.8.1
--- src/sys/arch/sun3/sun3/obmem.c:1.28 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/sun3/sun3/obmem.c Wed Aug 4 02:58:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obmem.c,v 1.28 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: obmem.c,v 1.28.8.1 2021/08/04 02:58:24 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obmem.c,v 1.28 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obmem.c,v 1.28.8.1 2021/08/04 02:58:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -119,8 +119,7 @@ obmem_attach(device_t parent, device_t s
/* We know ca_bustype == BUS_OBMEM */
config_search(self, &obma,
- CFARG_SEARCH, bus_scan,
- CFARG_EOL);
+ CFARGS(.search = bus_scan));
}
int
Index: src/sys/arch/sun3/sun3/vme.c
diff -u src/sys/arch/sun3/sun3/vme.c:1.23 src/sys/arch/sun3/sun3/vme.c:1.23.8.1
--- src/sys/arch/sun3/sun3/vme.c:1.23 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/sun3/sun3/vme.c Wed Aug 4 02:58:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vme.c,v 1.23 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: vme.c,v 1.23.8.1 2021/08/04 02:58:24 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.23 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.23.8.1 2021/08/04 02:58:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -154,8 +154,7 @@ vme_attach(device_t parent, device_t sel
/* We know ca_bustype == BUS_VMExx */
config_search(self, &vmea,
- CFARG_SEARCH, bus_scan,
- CFARG_EOL);
+ CFARGS(.search = bus_scan));
}
int
Index: src/sys/arch/sun3/sun3x/obio.c
diff -u src/sys/arch/sun3/sun3x/obio.c:1.35 src/sys/arch/sun3/sun3x/obio.c:1.35.8.1
--- src/sys/arch/sun3/sun3x/obio.c:1.35 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/sun3/sun3x/obio.c Wed Aug 4 02:58:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.35 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.35.8.1 2021/08/04 02:58:24 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.35 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.35.8.1 2021/08/04 02:58:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -191,8 +191,7 @@ obio_attach(device_t parent, device_t se
oba.ca_intpri = -1;
oba.ca_intvec = -1;
config_found(self, &oba, obio_print,
- CFARG_SUBMATCH, obio_submatch,
- CFARG_EOL);
+ CFARGS(.submatch = obio_submatch));
}
}
Index: src/sys/arch/sun3/sun3x/vme.c
diff -u src/sys/arch/sun3/sun3x/vme.c:1.18 src/sys/arch/sun3/sun3x/vme.c:1.18.8.1
--- src/sys/arch/sun3/sun3x/vme.c:1.18 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/sun3/sun3x/vme.c Wed Aug 4 02:58:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vme.c,v 1.18 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: vme.c,v 1.18.8.1 2021/08/04 02:58:24 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.18 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.18.8.1 2021/08/04 02:58:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -154,8 +154,7 @@ vme_attach(device_t parent, device_t sel
/* We know ca_bustype == BUS_VMExx */
config_search(self, args,
- CFARG_SEARCH, bus_scan,
- CFARG_EOL);
+ CFARGS(.search = bus_scan));
}
int
Index: src/sys/arch/sun68k/sun68k/autoconf.c
diff -u src/sys/arch/sun68k/sun68k/autoconf.c:1.31 src/sys/arch/sun68k/sun68k/autoconf.c:1.31.8.1
--- src/sys/arch/sun68k/sun68k/autoconf.c:1.31 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/sun68k/sun68k/autoconf.c Wed Aug 4 02:58:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.31 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: autoconf.c,v 1.31.8.1 2021/08/04 02:58:24 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.31 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.31.8.1 2021/08/04 02:58:24 thorpej Exp $");
#include "opt_kgdb.h"
@@ -145,16 +145,16 @@ mainbus_attach(device_t parent, device_t
/* Find all `early' mainbus buses */
for (cpp = special; *cpp != NULL; cpp++) {
ma.ma_name = *cpp;
- (void)config_found(self, &ma, NULL, CFARG_EOL);
+ (void)config_found(self, &ma, NULL, CFARGS_NONE);
}
/* Find the remaining buses */
ma.ma_name = NULL;
- (void)config_found(self, &ma, NULL, CFARG_EOL);
+ (void)config_found(self, &ma, NULL, CFARGS_NONE);
/* Lastly, find the PROM console */
ma.ma_name = "pcons";
- (void)config_found(self, &ma, NULL, CFARG_EOL);
+ (void)config_found(self, &ma, NULL, CFARGS_NONE);
}
/*
@@ -226,7 +226,7 @@ sun68k_bus_search(device_t parent, cfdat
* XXX - This is a hack...
*/
if (config_probe(parent, cf, &ma)) {
- config_attach(parent, cf, &ma, sun68k_bus_print, CFARG_EOL);
+ config_attach(parent, cf, &ma, sun68k_bus_print, CFARGS_NONE);
}
return 0;
}
Index: src/sys/arch/sun68k/sun68k/vme_sun68k.c
diff -u src/sys/arch/sun68k/sun68k/vme_sun68k.c:1.18 src/sys/arch/sun68k/sun68k/vme_sun68k.c:1.18.8.1
--- src/sys/arch/sun68k/sun68k/vme_sun68k.c:1.18 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/sun68k/sun68k/vme_sun68k.c Wed Aug 4 02:58:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vme_sun68k.c,v 1.18 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: vme_sun68k.c,v 1.18.8.1 2021/08/04 02:58:24 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme_sun68k.c,v 1.18 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_sun68k.c,v 1.18.8.1 2021/08/04 02:58:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/extent.h>
@@ -169,7 +169,7 @@ sun68kvme_attach(device_t parent, device
vba.va_slaveconfig = 0;
aprint_normal("\n");
- (void)config_found(self, &vba, 0, CFARG_EOL);
+ (void)config_found(self, &vba, 0, CFARGS_NONE);
}
/*
