Module Name: src
Committed By: thorpej
Date: Wed Aug 4 23:09:02 UTC 2021
Modified Files:
src/sys/dev/sun [thorpej-cfargs2]: bwtwo.c cgsix.c cgthree.c kbd.c
sunms.c
src/sys/dev/vme [thorpej-cfargs2]: vme.c xd.c xy.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.37.8.1 src/sys/dev/sun/bwtwo.c
cvs rdiff -u -r1.69 -r1.69.8.1 src/sys/dev/sun/cgsix.c
cvs rdiff -u -r1.34 -r1.34.8.1 src/sys/dev/sun/cgthree.c \
src/sys/dev/sun/sunms.c
cvs rdiff -u -r1.72 -r1.72.8.1 src/sys/dev/sun/kbd.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/dev/vme/vme.c
cvs rdiff -u -r1.97 -r1.97.8.1 src/sys/dev/vme/xd.c
cvs rdiff -u -r1.101 -r1.101.8.1 src/sys/dev/vme/xy.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/dev/sun/bwtwo.c
diff -u src/sys/dev/sun/bwtwo.c:1.37 src/sys/dev/sun/bwtwo.c:1.37.8.1
--- src/sys/dev/sun/bwtwo.c:1.37 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/sun/bwtwo.c Wed Aug 4 23:09:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bwtwo.c,v 1.37 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: bwtwo.c,v 1.37.8.1 2021/08/04 23:09:02 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.37 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.37.8.1 2021/08/04 23:09:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -324,7 +324,7 @@ bwtwoattach(struct bwtwo_softc *sc, cons
aa.console = isconsole;
aa.accessops = &bwtwo_accessops;
aa.accesscookie = &sc->vd;
- config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARGS_NONE);
#endif
}
Index: src/sys/dev/sun/cgsix.c
diff -u src/sys/dev/sun/cgsix.c:1.69 src/sys/dev/sun/cgsix.c:1.69.8.1
--- src/sys/dev/sun/cgsix.c:1.69 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/sun/cgsix.c Wed Aug 4 23:09:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix.c,v 1.69 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: cgsix.c,v 1.69.8.1 2021/08/04 23:09:02 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.69 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.69.8.1 2021/08/04 23:09:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -629,7 +629,7 @@ cg6attach(struct cgsix_softc *sc, const
aa.console = isconsole;
aa.accessops = &cgsix_accessops;
aa.accesscookie = &sc->vd;
- config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARGS_NONE);
}
Index: src/sys/dev/sun/cgthree.c
diff -u src/sys/dev/sun/cgthree.c:1.34 src/sys/dev/sun/cgthree.c:1.34.8.1
--- src/sys/dev/sun/cgthree.c:1.34 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/sun/cgthree.c Wed Aug 4 23:09:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthree.c,v 1.34 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: cgthree.c,v 1.34.8.1 2021/08/04 23:09:02 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgthree.c,v 1.34 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgthree.c,v 1.34.8.1 2021/08/04 23:09:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -244,7 +244,7 @@ cgthreeattach(struct cgthree_softc *sc,
aa.console = isconsole;
aa.accessops = &cgthree_accessops;
aa.accesscookie = &sc->vd;
- config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARGS_NONE);
}
Index: src/sys/dev/sun/sunms.c
diff -u src/sys/dev/sun/sunms.c:1.34 src/sys/dev/sun/sunms.c:1.34.8.1
--- src/sys/dev/sun/sunms.c:1.34 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/sun/sunms.c Wed Aug 4 23:09:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunms.c,v 1.34 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: sunms.c,v 1.34.8.1 2021/08/04 23:09:02 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunms.c,v 1.34 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunms.c,v 1.34.8.1 2021/08/04 23:09:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -174,7 +174,7 @@ sunms_attach(device_t parent, device_t s
a.accessops = &sunms_accessops;
a.accesscookie = ms;
- ms->ms_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL);
+ ms->ms_wsmousedev = config_found(self, &a, wsmousedevprint, CFARGS_NONE);
#endif
}
Index: src/sys/dev/sun/kbd.c
diff -u src/sys/dev/sun/kbd.c:1.72 src/sys/dev/sun/kbd.c:1.72.8.1
--- src/sys/dev/sun/kbd.c:1.72 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/sun/kbd.c Wed Aug 4 23:09:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.c,v 1.72 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: kbd.c,v 1.72.8.1 2021/08/04 23:09:02 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.72 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.72.8.1 2021/08/04 23:09:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1083,7 +1083,7 @@ kbd_enable(device_t dev)
k->k_wsenabled = 0;
/* Attach the wskbd */
- k->k_wskbd = config_found(k->k_dev, &a, wskbddevprint, CFARG_EOL);
+ k->k_wskbd = config_found(k->k_dev, &a, wskbddevprint, CFARGS_NONE);
callout_init(&k->k_wsbell, 0);
Index: src/sys/dev/vme/vme.c
diff -u src/sys/dev/vme/vme.c:1.28 src/sys/dev/vme/vme.c:1.28.8.1
--- src/sys/dev/vme/vme.c:1.28 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/vme/vme.c Wed Aug 4 23:09:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vme.c,v 1.28 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: vme.c,v 1.28.8.1 2021/08/04 23:09:02 thorpej Exp $ */
/*
* Copyright (c) 1999
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.28 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.28.8.1 2021/08/04 23:09:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -148,7 +148,7 @@ vmesubmatch(device_t bus, cfdata_t dev,
v.va_bdt = sc->sc_bdt;
if (config_probe(bus, dev, &v)) {
- config_attach(bus, dev, &v, (cfprint_t)vmeprint, CFARG_EOL);
+ config_attach(bus, dev, &v, (cfprint_t)vmeprint, CFARGS_NONE);
return (1);
}
return (0);
@@ -202,12 +202,10 @@ vmeattach(device_t parent, device_t self
/* first get info about the bus master's slave side,
if present */
config_search(self, NULL,
- CFARG_SEARCH, vmesubmatch1,
- CFARG_EOL);
+ CFARGS(.search = vmesubmatch1));
}
config_search(self, NULL,
- CFARG_SEARCH, vmesubmatch,
- CFARG_EOL);
+ CFARGS(.search = vmesubmatch));
#ifdef VMEDEBUG
if (sc->vme32ext)
Index: src/sys/dev/vme/xd.c
diff -u src/sys/dev/vme/xd.c:1.97 src/sys/dev/vme/xd.c:1.97.8.1
--- src/sys/dev/vme/xd.c:1.97 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/vme/xd.c Wed Aug 4 23:09:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xd.c,v 1.97 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: xd.c,v 1.97.8.1 2021/08/04 23:09:02 thorpej Exp $ */
/*
* Copyright (c) 1995 Charles D. Cranor
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.97 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.97.8.1 2021/08/04 23:09:02 thorpej Exp $");
#undef XDC_DEBUG /* full debug */
#define XDC_DIAG /* extra sanity checks */
@@ -672,7 +672,7 @@ xdcattach(device_t parent, device_t self
xa.booting = 1;
for (xa.driveno = 0; xa.driveno < XDC_MAXDEV; xa.driveno++)
- (void) config_found(self, (void *) &xa, NULL, CFARG_EOL);
+ (void) config_found(self, (void *) &xa, NULL, CFARGS_NONE);
/* start the watchdog clock */
callout_reset(&xdc->sc_tick_ch, XDC_TICKCNT, xdc_tick, xdc);
Index: src/sys/dev/vme/xy.c
diff -u src/sys/dev/vme/xy.c:1.101 src/sys/dev/vme/xy.c:1.101.8.1
--- src/sys/dev/vme/xy.c:1.101 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/vme/xy.c Wed Aug 4 23:09:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xy.c,v 1.101 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: xy.c,v 1.101.8.1 2021/08/04 23:09:02 thorpej Exp $ */
/*
* Copyright (c) 1995 Charles D. Cranor
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.101 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.101.8.1 2021/08/04 23:09:02 thorpej Exp $");
#undef XYC_DEBUG /* full debug */
#undef XYC_DIAG /* extra sanity checks */
@@ -571,7 +571,7 @@ xycattach(device_t parent, device_t self
xa.booting = 1;
for (xa.driveno = 0; xa.driveno < XYC_MAXDEV; xa.driveno++)
- (void) config_found(self, (void *) &xa, NULL, CFARG_EOL);
+ (void) config_found(self, (void *) &xa, NULL, CFARGS_NONE);
/* start the watchdog clock */
callout_reset(&xyc->sc_tick_ch, XYC_TICKCNT, xyc_tick, xyc);
