Module Name: src
Committed By: thorpej
Date: Wed Aug 4 03:00:08 UTC 2021
Modified Files:
src/sys/arch/usermode/dev [thorpej-cfargs2]: mainbus.c vatapi.c vncfb.c
src/sys/arch/vax/mba [thorpej-cfargs2]: mba.c
src/sys/arch/vax/uba [thorpej-cfargs2]: qv.c qvaux.c qvkbd.c qvms.c
src/sys/arch/vax/vax [thorpej-cfargs2]: autoconf.c cmi.c ka860.c
nmi_mainbus.c sbi.c ubi.c
src/sys/arch/vax/vsa [thorpej-cfargs2]: dz_vsbus.c hdc9224.c lcg.c
smg.c spx.c vsbus.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/usermode/dev/mainbus.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/usermode/dev/vatapi.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/usermode/dev/vncfb.c
cvs rdiff -u -r1.41 -r1.41.8.1 src/sys/arch/vax/mba/mba.c
cvs rdiff -u -r1.37 -r1.37.8.1 src/sys/arch/vax/uba/qv.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/vax/uba/qvaux.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/vax/uba/qvkbd.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/vax/uba/qvms.c
cvs rdiff -u -r1.98 -r1.98.8.1 src/sys/arch/vax/vax/autoconf.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/vax/vax/cmi.c
cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/arch/vax/vax/ka860.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/vax/vax/nmi_mainbus.c
cvs rdiff -u -r1.39 -r1.39.8.1 src/sys/arch/vax/vax/sbi.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/vax/vax/ubi.c
cvs rdiff -u -r1.45 -r1.45.8.1 src/sys/arch/vax/vsa/dz_vsbus.c
cvs rdiff -u -r1.61 -r1.61.8.1 src/sys/arch/vax/vsa/hdc9224.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/vax/vsa/lcg.c
cvs rdiff -u -r1.60 -r1.60.8.1 src/sys/arch/vax/vsa/smg.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/vax/vsa/spx.c
cvs rdiff -u -r1.66 -r1.66.8.1 src/sys/arch/vax/vsa/vsbus.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/usermode/dev/mainbus.c
diff -u src/sys/arch/usermode/dev/mainbus.c:1.11 src/sys/arch/usermode/dev/mainbus.c:1.11.8.1
--- src/sys/arch/usermode/dev/mainbus.c:1.11 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/usermode/dev/mainbus.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.11 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.11.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11.8.1 2021/08/04 03:00:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -80,45 +80,45 @@ mainbus_attach(device_t parent, device_t
sc->sc_dev = self;
taa.taa_type = THUNKBUS_TYPE_CPU;
- config_found(self, &taa, mainbus_print, CFARG_EOL);
+ config_found(self, &taa, mainbus_print, CFARGS_NONE);
taa.taa_type = THUNKBUS_TYPE_TTYCONS;
- config_found(self, &taa, mainbus_print, CFARG_EOL);
+ config_found(self, &taa, mainbus_print, CFARGS_NONE);
if (usermode_vnc_port > 0 && usermode_vnc_port < 65536) {
taa.taa_type = THUNKBUS_TYPE_VNCFB;
taa.u.vnc.width = usermode_vnc_width;
taa.u.vnc.height = usermode_vnc_height;
taa.u.vnc.port = usermode_vnc_port;
- config_found(self, &taa, mainbus_print, CFARG_EOL);
+ config_found(self, &taa, mainbus_print, CFARGS_NONE);
}
taa.taa_type = THUNKBUS_TYPE_CLOCK;
- config_found(self, &taa, mainbus_print, CFARG_EOL);
+ config_found(self, &taa, mainbus_print, CFARGS_NONE);
if (usermode_tap_device) {
taa.taa_type = THUNKBUS_TYPE_VETH;
taa.u.veth.device = usermode_tap_device;
taa.u.veth.eaddr = usermode_tap_eaddr;
- config_found(self, &taa, mainbus_print, CFARG_EOL);
+ config_found(self, &taa, mainbus_print, CFARGS_NONE);
}
if (usermode_audio_device) {
taa.taa_type = THUNKBUS_TYPE_VAUDIO;
taa.u.vaudio.device = usermode_audio_device;
- config_found(self, &taa, mainbus_print, CFARG_EOL);
+ config_found(self, &taa, mainbus_print, CFARGS_NONE);
}
for (i = 0; i < usermode_disk_image_path_count; i++) {
taa.taa_type = THUNKBUS_TYPE_DISKIMAGE;
taa.u.diskimage.path = usermode_disk_image_path[i];
- config_found(self, &taa, mainbus_print, CFARG_EOL);
+ config_found(self, &taa, mainbus_print, CFARGS_NONE);
}
for (i = 0; i < usermode_vdev_count; i++) {
taa.taa_type = usermode_vdev_type[i];
taa.u.vdev.path = usermode_vdev_path[i];
- config_found(self, &taa, mainbus_print, CFARG_EOL);
+ config_found(self, &taa, mainbus_print, CFARGS_NONE);
}
}
Index: src/sys/arch/usermode/dev/vatapi.c
diff -u src/sys/arch/usermode/dev/vatapi.c:1.3 src/sys/arch/usermode/dev/vatapi.c:1.3.8.1
--- src/sys/arch/usermode/dev/vatapi.c:1.3 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/usermode/dev/vatapi.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vatapi.c,v 1.3 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: vatapi.c,v 1.3.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/*-
* Copyright (c) 2018 Reinoud Zandijk <rein...@netbsd.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vatapi.c,v 1.3 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vatapi.c,v 1.3.8.1 2021/08/04 03:00:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -176,7 +176,7 @@ vatapi_callback(device_t self)
/* we `discovered' an atapi adapter */
sc->sc_vatapibus =
- config_found(sc->sc_dev, chan, atapiprint, CFARG_EOL);
+ config_found(sc->sc_dev, chan, atapiprint, CFARGS_NONE);
}
Index: src/sys/arch/usermode/dev/vncfb.c
diff -u src/sys/arch/usermode/dev/vncfb.c:1.13 src/sys/arch/usermode/dev/vncfb.c:1.13.8.1
--- src/sys/arch/usermode/dev/vncfb.c:1.13 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/usermode/dev/vncfb.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vncfb.c,v 1.13 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: vncfb.c,v 1.13.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill <jmcne...@invisible.ca>
@@ -35,7 +35,7 @@
#include "opt_wsemul.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vncfb.c,v 1.13 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vncfb.c,v 1.13.8.1 2021/08/04 03:00:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -264,7 +264,7 @@ vncfb_attach(device_t parent, device_t s
waa.accessops = &vncfb_accessops;
waa.accesscookie = &sc->sc_vd;
- config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE);
wskbd_cnattach(&vncfb_kbd_consops, sc, &vncfb_keymapdata);
@@ -274,15 +274,13 @@ vncfb_attach(device_t parent, device_t s
kaa.accesscookie = sc;
sc->sc_wskbddev = config_found(self, &kaa, wskbddevprint,
- CFARG_IATTR, "wskbddev",
- CFARG_EOL);
+ CFARGS(.iattr = "wskbddev"));
maa.accessops = &vncfb_mouse_accessops;
maa.accesscookie = sc;
sc->sc_wsmousedev = config_found(self, &maa, wsmousedevprint,
- CFARG_IATTR, "wsmousedev",
- CFARG_EOL);
+ CFARGS(.iattr = "wsmousedev"));
}
static void
Index: src/sys/arch/vax/mba/mba.c
diff -u src/sys/arch/vax/mba/mba.c:1.41 src/sys/arch/vax/mba/mba.c:1.41.8.1
--- src/sys/arch/vax/mba/mba.c:1.41 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/vax/mba/mba.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mba.c,v 1.41 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: mba.c,v 1.41.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/*
* Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mba.c,v 1.41 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mba.c,v 1.41.8.1 2021/08/04 03:00:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -154,7 +154,7 @@ mbaattach(device_t parent, device_t self
ma.ma_name = mbaunit[j].name;
ma.ma_iot = sc->sc_iot;
ma.ma_ioh = sc->sc_ioh + MUREG(i, 0);
- config_found(sc->sc_dev, &ma, mbaprint, CFARG_EOL);
+ config_found(sc->sc_dev, &ma, mbaprint, CFARGS_NONE);
}
}
Index: src/sys/arch/vax/uba/qv.c
diff -u src/sys/arch/vax/uba/qv.c:1.37 src/sys/arch/vax/uba/qv.c:1.37.8.1
--- src/sys/arch/vax/uba/qv.c:1.37 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/vax/uba/qv.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: qv.c,v 1.37 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: qv.c,v 1.37.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/*
* Copyright (c) 2015 Charles H. Dickman. All rights reserved.
* Derived from smg.c
@@ -31,7 +31,7 @@
/*3456789012345678901234567890123456789012345678901234567890123456789012345678*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qv.c,v 1.37 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qv.c,v 1.37.8.1 2021/08/04 03:00:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -476,10 +476,9 @@ qv_attach(device_t parent, device_t self
aa.ua_ioh = ua->ua_ioh + 32; // offset
aa.ua_cvec = ua->ua_cvec - 4;
if (config_search(self, &aa,
- CFARG_IATTR, "qv") != NULL) {
+ CFARGS(.iattr = "qv")) != NULL) {
config_found(self, &aa, qvauxprint,
- CFARG_IATTR, "qv",
- CFARG_EOL);
+ CFARGS(.iattr = "qv"));
uh->uh_lastiv -= 4;
}
@@ -488,11 +487,9 @@ qv_attach(device_t parent, device_t self
emulaa.accessops = &qv_accessops;
emulaa.accesscookie = self;
if (config_search(self, &emulaa,
- CFARG_IATTR, "wsemuldisplaydev",
- CFARG_EOL) != NULL) {
+ CFARGS(.iattr = "wsemuldisplaydev")) != NULL) {
config_found(self, &emulaa, wsemuldisplaydevprint,
- CFARG_IATTR, "wsemuldisplaydev",
- CFARG_EOL);
+ CFARGS(.iattr = "wsemuldisplaydev"));
}
//console_debugger();
Index: src/sys/arch/vax/uba/qvaux.c
diff -u src/sys/arch/vax/uba/qvaux.c:1.3 src/sys/arch/vax/uba/qvaux.c:1.3.8.1
--- src/sys/arch/vax/uba/qvaux.c:1.3 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/vax/uba/qvaux.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: qvaux.c,v 1.3 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: qvaux.c,v 1.3.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -314,7 +314,7 @@ qvaux_attach(device_t parent, device_t s
daa.daa_line = 0;
daa.daa_flags = 0;
- config_found(self, &daa, qvaux_print, CFARG_EOL);
+ config_found(self, &daa, qvaux_print, CFARGS_NONE);
#endif
#if NQVMS > 0
/* XXX set line parameters */
@@ -326,7 +326,7 @@ qvaux_attach(device_t parent, device_t s
daa.daa_line = 1;
daa.daa_flags = 0;
- config_found(self, &daa, qvaux_print, CFARG_EOL);
+ config_found(self, &daa, qvaux_print, CFARGS_NONE);
#endif
}
Index: src/sys/arch/vax/uba/qvkbd.c
diff -u src/sys/arch/vax/uba/qvkbd.c:1.4 src/sys/arch/vax/uba/qvkbd.c:1.4.8.1
--- src/sys/arch/vax/uba/qvkbd.c:1.4 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/vax/uba/qvkbd.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: qvkbd.c,v 1.4 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: qvkbd.c,v 1.4.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/* Copyright (c) 2015 Charles H. Dickman. All rights reserved.
* Derived from dzkbd.c
@@ -198,7 +198,7 @@ qvkbd_attach(device_t parent, device_t s
a.accessops = &qvkbd_accessops;
a.accesscookie = qvkbd;
- qvkbd->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARG_EOL);
+ qvkbd->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARGS_NONE);
}
int
Index: src/sys/arch/vax/uba/qvms.c
diff -u src/sys/arch/vax/uba/qvms.c:1.2 src/sys/arch/vax/uba/qvms.c:1.2.8.1
--- src/sys/arch/vax/uba/qvms.c:1.2 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/vax/uba/qvms.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: qvms.c,v 1.2 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: qvms.c,v 1.2.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/* Copyright (c) 2015 Charles H. Dickman. All rights reserved.
* Derived from dzms.c
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qvms.c,v 1.2 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qvms.c,v 1.2.8.1 2021/08/04 03:00:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -139,7 +139,7 @@ qvms_attach(device_t parent, device_t se
qvms->sc_enabled = 0;
qvms->sc_selftest = 0;
qvms->sc_wsmousedev = config_found(self, &a, wsmousedevprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
static int
Index: src/sys/arch/vax/vax/autoconf.c
diff -u src/sys/arch/vax/vax/autoconf.c:1.98 src/sys/arch/vax/vax/autoconf.c:1.98.8.1
--- src/sys/arch/vax/vax/autoconf.c:1.98 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/vax/vax/autoconf.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.98 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: autoconf.c,v 1.98.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.98 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.98.8.1 2021/08/04 03:00:08 thorpej Exp $");
#include "opt_compat_netbsd.h"
#include "opt_cputype.h"
@@ -137,7 +137,7 @@ mainbus_attach(device_t parent, device_t
ma.ma_type = *devp;
ma.ma_iot = &vax_mem_bus_space;
ma.ma_dmat = &vax_bus_dma_tag;
- config_found(self, &ma, mainbus_print, CFARG_EOL);
+ config_found(self, &ma, mainbus_print, CFARGS_NONE);
}
/*
Index: src/sys/arch/vax/vax/cmi.c
diff -u src/sys/arch/vax/vax/cmi.c:1.15 src/sys/arch/vax/vax/cmi.c:1.15.8.1
--- src/sys/arch/vax/vax/cmi.c:1.15 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/vax/vax/cmi.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cmi.c,v 1.15 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: cmi.c,v 1.15.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmi.c,v 1.15 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmi.c,v 1.15.8.1 2021/08/04 03:00:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -85,7 +85,7 @@ cmi_attach(device_t parent, device_t sel
vax_unmap_physmem((vaddr_t)sa.sa_ioh, NEXPAGES);
} else {
sa.sa_type = NEX_MEM16;
- config_found(self, (void*)&sa, cmi_print, CFARG_EOL);
+ config_found(self, (void*)&sa, cmi_print, CFARGS_NONE);
}
}
@@ -99,7 +99,7 @@ cmi_attach(device_t parent, device_t sel
vax_unmap_physmem((vaddr_t)sa.sa_ioh, NEXPAGES);
} else {
sa.sa_type = NEX_MBA;
- config_found(self, (void*)&sa, cmi_print, CFARG_EOL);
+ config_found(self, (void*)&sa, cmi_print, CFARGS_NONE);
}
}
@@ -110,7 +110,7 @@ cmi_attach(device_t parent, device_t sel
sa.sa_ioh = vax_map_physmem(NEX750 +
sizeof(struct nexus) * sa.sa_nexnum, NEXPAGES);
sa.sa_type = NEX_UBA0;
- config_found(self, (void*)&sa, cmi_print, CFARG_EOL);
+ config_found(self, (void*)&sa, cmi_print, CFARGS_NONE);
sa.sa_nexnum = 9;
sa.sa_ioh = vax_map_physmem(NEX750 +
@@ -119,5 +119,5 @@ cmi_attach(device_t parent, device_t sel
if (badaddr((void *)sa.sa_ioh, 4))
vax_unmap_physmem((vaddr_t)sa.sa_ioh, NEXPAGES);
else
- config_found(self, (void*)&sa, cmi_print, CFARG_EOL);
+ config_found(self, (void*)&sa, cmi_print, CFARGS_NONE);
}
Index: src/sys/arch/vax/vax/ka860.c
diff -u src/sys/arch/vax/vax/ka860.c:1.35 src/sys/arch/vax/vax/ka860.c:1.35.8.1
--- src/sys/arch/vax/vax/ka860.c:1.35 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/vax/vax/ka860.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ka860.c,v 1.35 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: ka860.c,v 1.35.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/*
* Copyright (c) 1986, 1988 Regents of the University of California.
* All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka860.c,v 1.35 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka860.c,v 1.35.8.1 2021/08/04 03:00:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -426,7 +426,7 @@ void abus_mainbus_attach(device_t parent
sbiar->sbi_error = 0x1000;
sbiar->sbi_fltsts = 0xc0000;
- config_found(self, &aa, abus_print, CFARG_EOL);
+ config_found(self, &aa, abus_print, CFARGS_NONE);
break;
default:
Index: src/sys/arch/vax/vax/nmi_mainbus.c
diff -u src/sys/arch/vax/vax/nmi_mainbus.c:1.13 src/sys/arch/vax/vax/nmi_mainbus.c:1.13.8.1
--- src/sys/arch/vax/vax/nmi_mainbus.c:1.13 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/vax/vax/nmi_mainbus.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nmi_mainbus.c,v 1.13 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: nmi_mainbus.c,v 1.13.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nmi_mainbus.c,v 1.13 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nmi_mainbus.c,v 1.13.8.1 2021/08/04 03:00:08 thorpej Exp $");
#define _VAX_BUS_DMA_PRIVATE
@@ -89,19 +89,19 @@ nmi_mainbus_attach(device_t parent, devi
/* One CPU is always found */
na.na_type = "cpu";
na.na_slot = 20;
- config_found(self, (void *)&na, nmi_mainbus_print, CFARG_EOL);
+ config_found(self, (void *)&na, nmi_mainbus_print, CFARGS_NONE);
/* Check for a second one */
if (vax_boardtype == VAX_BTYP_8800) {
na.na_type = "cpu";
na.na_slot = 21;
- config_found(self, (void *)&na, nmi_mainbus_print, CFARG_EOL);
+ config_found(self, (void *)&na, nmi_mainbus_print, CFARGS_NONE);
}
/* One memory adapter is also present */
na.na_type = "mem";
na.na_slot = 10;
- config_found(self, (void *)&na, nmi_mainbus_print, CFARG_EOL);
+ config_found(self, (void *)&na, nmi_mainbus_print, CFARGS_NONE);
/* Enable BI interrupts */
mtpr(NICTRL_DEV0|NICTRL_DEV1|NICTRL_MNF, PR_NICTRL);
@@ -117,11 +117,11 @@ nmi_mainbus_attach(device_t parent, devi
na.na_slot = 2 * nbia;
if (r[1] & 2)
config_found(self, (void *)&na, nmi_mainbus_print,
- CFARG_EOL);
+ CFARGS_NONE);
na.na_slot++;
if (r[1] & 4)
config_found(self, (void *)&na, nmi_mainbus_print,
- CFARG_EOL);
+ CFARGS_NONE);
}
}
Index: src/sys/arch/vax/vax/sbi.c
diff -u src/sys/arch/vax/vax/sbi.c:1.39 src/sys/arch/vax/vax/sbi.c:1.39.8.1
--- src/sys/arch/vax/vax/sbi.c:1.39 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/vax/vax/sbi.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sbi.c,v 1.39 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: sbi.c,v 1.39.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbi.c,v 1.39 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbi.c,v 1.39.8.1 2021/08/04 03:00:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -126,7 +126,7 @@ sbi_mainbus_attach(device_t parent, devi
sa.sa_nexnum = nexnum;
sa.sa_ioh = (vaddr_t)nexusP;
sa.sa_base = (bus_addr_t)NEX780;
- config_found(self, (void*)&sa, sbi_print, CFARG_EOL);
+ config_found(self, (void*)&sa, sbi_print, CFARGS_NONE);
}
}
}
@@ -177,7 +177,7 @@ sbi_abus_attach(device_t parent, device_
sa.sa_nexnum = nexnum;
sa.sa_ioh = (vaddr_t)nexusP;
- config_found(self, (void*)&sa, sbi_print, CFARG_EOL);
+ config_found(self, (void*)&sa, sbi_print, CFARGS_NONE);
}
}
}
Index: src/sys/arch/vax/vax/ubi.c
diff -u src/sys/arch/vax/vax/ubi.c:1.7 src/sys/arch/vax/vax/ubi.c:1.7.8.1
--- src/sys/arch/vax/vax/ubi.c:1.7 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/vax/vax/ubi.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ubi.c,v 1.7 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: ubi.c,v 1.7.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubi.c,v 1.7 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubi.c,v 1.7.8.1 2021/08/04 03:00:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,7 +88,7 @@ ubi_attach(device_t parent, device_t sel
vax_unmap_physmem((vaddr_t)sa.sa_ioh, NEXPAGES);
} else {
sa.sa_type = NEX_MEM16;
- config_found(self, (void*)&sa, ubi_print, CFARG_EOL);
+ config_found(self, (void*)&sa, ubi_print, CFARGS_NONE);
}
}
#endif
@@ -100,7 +100,7 @@ ubi_attach(device_t parent, device_t sel
sa.sa_ioh = vax_map_physmem((int)NEX730 +
sizeof(struct nexus) * sa.sa_nexnum, NEXPAGES);
sa.sa_type = NEX_MEM16;
- config_found(self, (void*)&sa, ubi_print, CFARG_EOL);
+ config_found(self, (void*)&sa, ubi_print, CFARGS_NONE);
printf("\n");
@@ -109,5 +109,5 @@ ubi_attach(device_t parent, device_t sel
sa.sa_ioh = vax_map_physmem((int)NEX730 +
sizeof(struct nexus) * sa.sa_nexnum, NEXPAGES);
sa.sa_type = NEX_UBA0;
- config_found(self, (void*)&sa, ubi_print, CFARG_EOL);
+ config_found(self, (void*)&sa, ubi_print, CFARGS_NONE);
}
Index: src/sys/arch/vax/vsa/dz_vsbus.c
diff -u src/sys/arch/vax/vsa/dz_vsbus.c:1.45 src/sys/arch/vax/vsa/dz_vsbus.c:1.45.8.1
--- src/sys/arch/vax/vsa/dz_vsbus.c:1.45 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/vax/vsa/dz_vsbus.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dz_vsbus.c,v 1.45 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: dz_vsbus.c,v 1.45.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dz_vsbus.c,v 1.45 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz_vsbus.c,v 1.45.8.1 2021/08/04 03:00:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -195,7 +195,7 @@ dz_vsbus_attach(device_t parent, device_
daa.daa_line = 0;
daa.daa_flags =
(cn_tab->cn_pri == CN_INTERNAL ? DZKBD_CONSOLE : 0);
- config_found(self, &daa, dz_print, CFARG_EOL);
+ config_found(self, &daa, dz_print, CFARGS_NONE);
}
#endif
#if NDZMS > 0
@@ -203,7 +203,7 @@ dz_vsbus_attach(device_t parent, device_
| DZ_LPR_PARENB | DZ_LPR_OPAR | 1 /* line */;
daa.daa_line = 1;
daa.daa_flags = 0;
- config_found(self, &daa, dz_print, CFARG_EOL);
+ config_found(self, &daa, dz_print, CFARGS_NONE);
#endif
s = spltty();
dzrint(sc);
Index: src/sys/arch/vax/vsa/hdc9224.c
diff -u src/sys/arch/vax/vsa/hdc9224.c:1.61 src/sys/arch/vax/vsa/hdc9224.c:1.61.8.1
--- src/sys/arch/vax/vsa/hdc9224.c:1.61 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/vax/vsa/hdc9224.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hdc9224.c,v 1.61 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: hdc9224.c,v 1.61.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -45,7 +45,7 @@
#undef RDDEBUG
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdc9224.c,v 1.61 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdc9224.c,v 1.61.8.1 2021/08/04 03:00:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -324,7 +324,7 @@ hdcattach(device_t parent, device_t self
status = HDC_RSTAT;
ha.ha_drive = i;
if ((status & DKC_ST_TERMCOD) == DKC_TC_SUCCESS)
- config_found(self, (void *)&ha, hdcprint, CFARG_EOL);
+ config_found(self, (void *)&ha, hdcprint, CFARGS_NONE);
}
}
Index: src/sys/arch/vax/vsa/lcg.c
diff -u src/sys/arch/vax/vsa/lcg.c:1.6 src/sys/arch/vax/vsa/lcg.c:1.6.8.1
--- src/sys/arch/vax/vsa/lcg.c:1.6 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/vax/vsa/lcg.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lcg.c,v 1.6 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: lcg.c,v 1.6.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/*
* LCG accelerated framebuffer driver
* Copyright (c) 2003, 2004 Blaz Antonic
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lcg.c,v 1.6 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lcg.c,v 1.6.8.1 2021/08/04 03:00:08 thorpej Exp $");
#define LCG_NO_ACCEL
@@ -472,7 +472,7 @@ lcg_attach(struct device *parent, struct
callout_init(&lcg_cursor_ch, 0);
callout_reset(&lcg_cursor_ch, hz / 2, lcg_crsr_blink, NULL);
- config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &aa, wsemuldisplaydevprint, CFARGS_NONE);
}
static void
Index: src/sys/arch/vax/vsa/smg.c
diff -u src/sys/arch/vax/vsa/smg.c:1.60 src/sys/arch/vax/vsa/smg.c:1.60.8.1
--- src/sys/arch/vax/vsa/smg.c:1.60 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/vax/vsa/smg.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: smg.c,v 1.60 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: smg.c,v 1.60.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.60 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.60.8.1 2021/08/04 03:00:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -252,7 +252,7 @@ smg_attach(device_t parent, device_t sel
}
qf = console_font->data;
- config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &aa, wsemuldisplaydevprint, CFARGS_NONE);
}
static u_char *cursor;
Index: src/sys/arch/vax/vsa/spx.c
diff -u src/sys/arch/vax/vsa/spx.c:1.11 src/sys/arch/vax/vsa/spx.c:1.11.8.1
--- src/sys/arch/vax/vsa/spx.c:1.11 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/vax/vsa/spx.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: spx.c,v 1.11 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: spx.c,v 1.11.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/*
* SPX/LCSPX/SPXg/SPXgt accelerated framebuffer driver for NetBSD/VAX
* Copyright (c) 2005 Blaz Antonic
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spx.c,v 1.11 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spx.c,v 1.11.8.1 2021/08/04 03:00:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -668,7 +668,7 @@ spx_attach(device_t parent, device_t sel
/* enable cursor */
set_btreg(SPXDAC_REG_CCR, 0xc1);
- config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &aa, wsemuldisplaydevprint, CFARGS_NONE);
}
static int cur_on;
Index: src/sys/arch/vax/vsa/vsbus.c
diff -u src/sys/arch/vax/vsa/vsbus.c:1.66 src/sys/arch/vax/vsa/vsbus.c:1.66.8.1
--- src/sys/arch/vax/vsa/vsbus.c:1.66 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/vax/vsa/vsbus.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vsbus.c,v 1.66 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: vsbus.c,v 1.66.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/*
* Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vsbus.c,v 1.66 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vsbus.c,v 1.66.8.1 2021/08/04 03:00:08 thorpej Exp $");
#include "opt_cputype.h"
@@ -171,8 +171,7 @@ vsbus_attach(device_t parent, device_t s
* now check for all possible devices on this "bus"
*/
config_search(self, NULL,
- CFARG_SEARCH, vsbus_search,
- CFARG_EOL);
+ CFARGS(.search = vsbus_search));
/* Autoconfig finished, enable interrupts */
*sc->sc_intmsk = ~sc->sc_mask;
@@ -220,7 +219,7 @@ vsbus_search(device_t parent, cfdata_t c
va.va_dmaaddr = sc->sc_dmaaddr;
va.va_dmasize = sc->sc_dmasize;
*sc->sc_intmsk = c; /* Allow interrupts during attach */
- config_attach(parent, cf, &va, vsbus_print, CFARG_EOL);
+ config_attach(parent, cf, &va, vsbus_print, CFARGS_NONE);
*sc->sc_intmsk = 0;
return 0;
