Module Name: src
Committed By: thorpej
Date: Wed Aug 4 00:00:00 UTC 2021
Modified Files:
src/sys/arch/dreamcast/dev [thorpej-cfargs2]: pvr.c
src/sys/arch/dreamcast/dev/g1 [thorpej-cfargs2]: g1bus.c
src/sys/arch/dreamcast/dev/g2 [thorpej-cfargs2]: g2bus.c gapspci.c
src/sys/arch/dreamcast/dev/maple [thorpej-cfargs2]: maple.c mkbd.c
mms.c
src/sys/arch/dreamcast/dreamcast [thorpej-cfargs2]: mainbus.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.38.2.1 src/sys/arch/dreamcast/dev/pvr.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/dreamcast/dev/g1/g1bus.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/dreamcast/dev/g2/g2bus.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/dreamcast/dev/g2/gapspci.c
cvs rdiff -u -r1.54 -r1.54.8.1 src/sys/arch/dreamcast/dev/maple/maple.c
cvs rdiff -u -r1.30 -r1.30.8.1 src/sys/arch/dreamcast/dev/maple/mkbd.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/dreamcast/dev/maple/mms.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/dreamcast/dreamcast/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/dreamcast/dev/pvr.c
diff -u src/sys/arch/dreamcast/dev/pvr.c:1.38 src/sys/arch/dreamcast/dev/pvr.c:1.38.2.1
--- src/sys/arch/dreamcast/dev/pvr.c:1.38 Sat Jul 31 14:36:33 2021
+++ src/sys/arch/dreamcast/dev/pvr.c Tue Aug 3 23:59:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pvr.c,v 1.38 2021/07/31 14:36:33 andvar Exp $ */
+/* $NetBSD: pvr.c,v 1.38.2.1 2021/08/03 23:59:59 thorpej Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.38 2021/07/31 14:36:33 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.38.2.1 2021/08/03 23:59:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -301,7 +301,7 @@ pvr_attach(device_t parent, device_t sel
waa.accessops = &pvr_accessops;
waa.accesscookie = sc;
- (void) config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ (void) config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE);
}
int
Index: src/sys/arch/dreamcast/dev/g1/g1bus.c
diff -u src/sys/arch/dreamcast/dev/g1/g1bus.c:1.2 src/sys/arch/dreamcast/dev/g1/g1bus.c:1.2.8.1
--- src/sys/arch/dreamcast/dev/g1/g1bus.c:1.2 Sat Apr 24 23:36:31 2021
+++ src/sys/arch/dreamcast/dev/g1/g1bus.c Wed Aug 4 00:00:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: g1bus.c,v 1.2 2021/04/24 23:36:31 thorpej Exp $ */
+/* $NetBSD: g1bus.c,v 1.2.8.1 2021/08/04 00:00:00 thorpej Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: g1bus.c,v 1.2 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: g1bus.c,v 1.2.8.1 2021/08/04 00:00:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,8 +76,7 @@ g1busattach(device_t parent, device_t se
ga.ga_memt = &sc->sc_memt;
config_search(self, &ga,
- CFARG_SEARCH, g1bussearch,
- CFARG_EOL);
+ CFARGS(.search = g1bussearch));
}
int
@@ -92,7 +91,7 @@ g1bussearch(device_t parent, cfdata_t cf
{
if (config_probe(parent, cf, aux))
- config_attach(parent, cf, aux, g1busprint, CFARG_EOL);
+ config_attach(parent, cf, aux, g1busprint, CFARGS_NONE);
return 0;
}
Index: src/sys/arch/dreamcast/dev/g2/g2bus.c
diff -u src/sys/arch/dreamcast/dev/g2/g2bus.c:1.15 src/sys/arch/dreamcast/dev/g2/g2bus.c:1.15.8.1
--- src/sys/arch/dreamcast/dev/g2/g2bus.c:1.15 Sat Apr 24 23:36:31 2021
+++ src/sys/arch/dreamcast/dev/g2/g2bus.c Wed Aug 4 00:00:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: g2bus.c,v 1.15 2021/04/24 23:36:31 thorpej Exp $ */
+/* $NetBSD: g2bus.c,v 1.15.8.1 2021/08/04 00:00:00 thorpej Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: g2bus.c,v 1.15 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: g2bus.c,v 1.15.8.1 2021/08/04 00:00:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,8 +78,7 @@ g2busattach(device_t parent, device_t se
ga.ga_memt = &sc->sc_memt;
config_search(self, &ga,
- CFARG_SEARCH, g2bussearch,
- CFARG_EOL);
+ CFARGS(.search = g2bussearch));
}
int
@@ -94,7 +93,7 @@ g2bussearch(device_t parent, cfdata_t cf
{
if (config_probe(parent, cf, aux))
- config_attach(parent, cf, aux, g2busprint, CFARG_EOL);
+ config_attach(parent, cf, aux, g2busprint, CFARGS_NONE);
return 0;
}
Index: src/sys/arch/dreamcast/dev/g2/gapspci.c
diff -u src/sys/arch/dreamcast/dev/g2/gapspci.c:1.20 src/sys/arch/dreamcast/dev/g2/gapspci.c:1.20.8.1
--- src/sys/arch/dreamcast/dev/g2/gapspci.c:1.20 Sat Apr 24 23:36:31 2021
+++ src/sys/arch/dreamcast/dev/g2/gapspci.c Wed Aug 4 00:00:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gapspci.c,v 1.20 2021/04/24 23:36:31 thorpej Exp $ */
+/* $NetBSD: gapspci.c,v 1.20.8.1 2021/08/04 00:00:00 thorpej Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: gapspci.c,v 1.20 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gapspci.c,v 1.20.8.1 2021/08/04 00:00:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -129,5 +129,5 @@ gaps_attach(device_t parent, device_t se
pba.pba_flags = PCI_FLAGS_MEM_OKAY;
pba.pba_pc = &sc->sc_pc;
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
}
Index: src/sys/arch/dreamcast/dev/maple/maple.c
diff -u src/sys/arch/dreamcast/dev/maple/maple.c:1.54 src/sys/arch/dreamcast/dev/maple/maple.c:1.54.8.1
--- src/sys/arch/dreamcast/dev/maple/maple.c:1.54 Sat Apr 24 23:36:31 2021
+++ src/sys/arch/dreamcast/dev/maple/maple.c Wed Aug 4 00:00:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: maple.c,v 1.54 2021/04/24 23:36:31 thorpej Exp $ */
+/* $NetBSD: maple.c,v 1.54.8.1 2021/08/04 00:00:00 thorpej Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: maple.c,v 1.54 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: maple.c,v 1.54.8.1 2021/08/04 00:00:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -702,8 +702,7 @@ maple_attach_unit(struct maple_softc *sc
ma.ma_function = f;
u->u_func[f].f_dev =
config_found(sc->sc_dev, &ma, mapleprint,
- CFARG_SUBMATCH, maplesubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = maplesubmatch));
u->u_ping_func = f; /* XXX using largest func */
}
}
Index: src/sys/arch/dreamcast/dev/maple/mkbd.c
diff -u src/sys/arch/dreamcast/dev/maple/mkbd.c:1.30 src/sys/arch/dreamcast/dev/maple/mkbd.c:1.30.8.1
--- src/sys/arch/dreamcast/dev/maple/mkbd.c:1.30 Sat Apr 24 23:36:31 2021
+++ src/sys/arch/dreamcast/dev/maple/mkbd.c Wed Aug 4 00:00:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mkbd.c,v 1.30 2021/04/24 23:36:31 thorpej Exp $ */
+/* $NetBSD: mkbd.c,v 1.30.8.1 2021/08/04 00:00:00 thorpej Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mkbd.c,v 1.30 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mkbd.c,v 1.30.8.1 2021/08/04 00:00:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -160,7 +160,7 @@ mkbdattach(device_t parent, device_t sel
a.keymap = &mkbd_keymapdata;
a.accessops = &mkbd_accessops;
a.accesscookie = sc;
- sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARG_EOL);
+ sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARGS_NONE);
#endif
maple_set_callback(parent, sc->sc_unit, MAPLE_FN_KEYBOARD,
Index: src/sys/arch/dreamcast/dev/maple/mms.c
diff -u src/sys/arch/dreamcast/dev/maple/mms.c:1.18 src/sys/arch/dreamcast/dev/maple/mms.c:1.18.8.1
--- src/sys/arch/dreamcast/dev/maple/mms.c:1.18 Sat Apr 24 23:36:31 2021
+++ src/sys/arch/dreamcast/dev/maple/mms.c Wed Aug 4 00:00:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mms.c,v 1.18 2021/04/24 23:36:31 thorpej Exp $ */
+/* $NetBSD: mms.c,v 1.18.8.1 2021/08/04 00:00:00 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mms.c,v 1.18 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mms.c,v 1.18.8.1 2021/08/04 00:00:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -154,7 +154,7 @@ mms_attach(device_t parent, device_t sel
/*
* Attach the mouse, saving a handle to it.
*/
- sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL);
+ sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARGS_NONE);
if (sc->sc_wsmousedev == NULL) {
/* Nothing more to do here. */
return;
Index: src/sys/arch/dreamcast/dreamcast/mainbus.c
diff -u src/sys/arch/dreamcast/dreamcast/mainbus.c:1.12 src/sys/arch/dreamcast/dreamcast/mainbus.c:1.12.8.1
--- src/sys/arch/dreamcast/dreamcast/mainbus.c:1.12 Sat Apr 24 23:36:31 2021
+++ src/sys/arch/dreamcast/dreamcast/mainbus.c Wed Aug 4 00:00:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.12 2021/04/24 23:36:31 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.12.8.1 2021/08/04 00:00:00 thorpej Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.12 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.12.8.1 2021/08/04 00:00:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,7 +62,7 @@ mainbus_attach(device_t parent, device_t
aprint_normal("\n");
for (ma = mainbusdevs; ma->ma_name != NULL; ma++)
- config_found(self, ma, mainbus_print, CFARG_EOL);
+ config_found(self, ma, mainbus_print, CFARGS_NONE);
}
int
