Module Name: src
Committed By: thorpej
Date: Wed Aug 4 21:35:17 UTC 2021
Modified Files:
src/sys/dev/sbus [thorpej-cfargs2]: agten.c cgtwelve.c dma_sbus.c
lebuffer.c magma.c mgx.c p9100.c qec.c sio16.c spif.c stp4020.c
tcx.c xbox.c zx.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/dev/sbus/agten.c \
src/sys/dev/sbus/spif.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/dev/sbus/cgtwelve.c
cvs rdiff -u -r1.37 -r1.37.4.1 src/sys/dev/sbus/dma_sbus.c
cvs rdiff -u -r1.38 -r1.38.4.1 src/sys/dev/sbus/lebuffer.c
cvs rdiff -u -r1.63 -r1.63.8.1 src/sys/dev/sbus/magma.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/dev/sbus/mgx.c
cvs rdiff -u -r1.64 -r1.64.8.1 src/sys/dev/sbus/p9100.c
cvs rdiff -u -r1.52 -r1.52.4.1 src/sys/dev/sbus/qec.c
cvs rdiff -u -r1.26 -r1.26.8.1 src/sys/dev/sbus/sio16.c
cvs rdiff -u -r1.70 -r1.70.8.1 src/sys/dev/sbus/stp4020.c
cvs rdiff -u -r1.59 -r1.59.8.1 src/sys/dev/sbus/tcx.c
cvs rdiff -u -r1.23 -r1.23.4.1 src/sys/dev/sbus/xbox.c
cvs rdiff -u -r1.46 -r1.46.8.1 src/sys/dev/sbus/zx.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/sbus/agten.c
diff -u src/sys/dev/sbus/agten.c:1.33 src/sys/dev/sbus/agten.c:1.33.8.1
--- src/sys/dev/sbus/agten.c:1.33 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/sbus/agten.c Wed Aug 4 21:35:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: agten.c,v 1.33 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: agten.c,v 1.33.8.1 2021/08/04 21:35:17 thorpej Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.33 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.33.8.1 2021/08/04 21:35:17 thorpej Exp $");
/*
* a driver for the Fujitsu AG-10e SBus framebuffer
@@ -370,7 +370,7 @@ agten_attach(device_t parent, device_t d
aa.accessops = &agten_accessops;
aa.accesscookie = &sc->vd;
- config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARGS_NONE);
fb->fb_driver = &agtenfbdriver;
fb->fb_device = sc->sc_dev;
Index: src/sys/dev/sbus/spif.c
diff -u src/sys/dev/sbus/spif.c:1.33 src/sys/dev/sbus/spif.c:1.33.8.1
--- src/sys/dev/sbus/spif.c:1.33 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/sbus/spif.c Wed Aug 4 21:35:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: spif.c,v 1.33 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: spif.c,v 1.33.8.1 2021/08/04 21:35:17 thorpej Exp $ */
/* $OpenBSD: spif.c,v 1.12 2003/10/03 16:44:51 miod Exp $ */
/*
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.33 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.33.8.1 2021/08/04 21:35:17 thorpej Exp $");
#include "spif.h"
#if NSPIF > 0
@@ -278,8 +278,8 @@ spif_attach(device_t parent, device_t se
printf(": rev %x chiprev %x osc %sMHz\n",
sc->sc_rev, sc->sc_rev2, clockfreq(sc->sc_osc));
- (void)config_found(self, stty_match, NULL, CFARG_EOL);
- (void)config_found(self, sbpp_match, NULL, CFARG_EOL);
+ (void)config_found(self, stty_match, NULL, CFARGS_NONE);
+ (void)config_found(self, sbpp_match, NULL, CFARGS_NONE);
return;
Index: src/sys/dev/sbus/cgtwelve.c
diff -u src/sys/dev/sbus/cgtwelve.c:1.7 src/sys/dev/sbus/cgtwelve.c:1.7.8.1
--- src/sys/dev/sbus/cgtwelve.c:1.7 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/sbus/cgtwelve.c Wed Aug 4 21:35:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cgtwelve.c,v 1.7 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: cgtwelve.c,v 1.7.8.1 2021/08/04 21:35:17 thorpej Exp $ */
/*-
* Copyright (c) 2010 Michael Lorenz
@@ -29,7 +29,7 @@
/* a console driver for the Sun CG12 / Matrox SG3 graphics board */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgtwelve.c,v 1.7 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgtwelve.c,v 1.7.8.1 2021/08/04 21:35:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -256,7 +256,7 @@ cgtwelve_attach(device_t parent, device_
aa.accessops = &cgtwelve_accessops;
aa.accesscookie = &sc->vd;
- config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &aa, wsemuldisplaydevprint, CFARGS_NONE);
#ifdef CG12_DEBUG
{
int i;
Index: src/sys/dev/sbus/dma_sbus.c
diff -u src/sys/dev/sbus/dma_sbus.c:1.37 src/sys/dev/sbus/dma_sbus.c:1.37.4.1
--- src/sys/dev/sbus/dma_sbus.c:1.37 Mon May 10 23:53:44 2021
+++ src/sys/dev/sbus/dma_sbus.c Wed Aug 4 21:35:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dma_sbus.c,v 1.37 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: dma_sbus.c,v 1.37.4.1 2021/08/04 21:35:17 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.37 2021/05/10 23:53:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.37.4.1 2021/08/04 21:35:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -211,8 +211,7 @@ dmaattach_sbus(device_t parent, device_t
struct sbus_attach_args sax;
sbus_setup_attach_args(sbsc, sbt, sc->sc_dmatag, node, &sax);
(void)config_found(self, (void *)&sax, dmaprint_sbus,
- CFARG_DEVHANDLE, prom_node_to_devhandle(node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(node)));
sbus_destroy_attach_args(&sax);
}
}
Index: src/sys/dev/sbus/lebuffer.c
diff -u src/sys/dev/sbus/lebuffer.c:1.38 src/sys/dev/sbus/lebuffer.c:1.38.4.1
--- src/sys/dev/sbus/lebuffer.c:1.38 Mon May 10 23:53:44 2021
+++ src/sys/dev/sbus/lebuffer.c Wed Aug 4 21:35:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lebuffer.c,v 1.38 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: lebuffer.c,v 1.38.4.1 2021/08/04 21:35:17 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.38 2021/05/10 23:53:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.38.4.1 2021/08/04 21:35:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,8 +125,7 @@ lebufattach(device_t parent, device_t se
sbus_setup_attach_args(sbsc,
bt, dt, node, &sax);
(void)config_found(self, (void *)&sax, lebufprint,
- CFARG_DEVHANDLE, prom_node_to_devhandle(node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(node)));
sbus_destroy_attach_args(&sax);
}
}
Index: src/sys/dev/sbus/magma.c
diff -u src/sys/dev/sbus/magma.c:1.63 src/sys/dev/sbus/magma.c:1.63.8.1
--- src/sys/dev/sbus/magma.c:1.63 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/sbus/magma.c Wed Aug 4 21:35:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: magma.c,v 1.63 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: magma.c,v 1.63.8.1 2021/08/04 21:35:17 thorpej Exp $ */
/*-
* Copyright (c) 1998 Iain Hibbert
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.63 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.63.8.1 2021/08/04 21:35:17 thorpej Exp $");
#if 0
#define MAGMA_DEBUG
@@ -475,8 +475,8 @@ magma_attach(device_t parent, device_t s
}
/* configure the children */
- (void)config_found(self, mtty_match, NULL, CFARG_EOL);
- (void)config_found(self, mbpp_match, NULL, CFARG_EOL);
+ (void)config_found(self, mtty_match, NULL, CFARGS_NONE);
+ (void)config_found(self, mbpp_match, NULL, CFARGS_NONE);
/*
* Establish the interrupt handlers.
Index: src/sys/dev/sbus/mgx.c
diff -u src/sys/dev/sbus/mgx.c:1.15 src/sys/dev/sbus/mgx.c:1.15.8.1
--- src/sys/dev/sbus/mgx.c:1.15 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/sbus/mgx.c Wed Aug 4 21:35:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mgx.c,v 1.15 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: mgx.c,v 1.15.8.1 2021/08/04 21:35:17 thorpej Exp $ */
/*-
* Copyright (c) 2014 Michael Lorenz
@@ -29,7 +29,7 @@
/* a console driver for the SSB 4096V-MGX graphics card */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mgx.c,v 1.15 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mgx.c,v 1.15.8.1 2021/08/04 21:35:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -364,7 +364,7 @@ mgx_attach(device_t parent, device_t sel
aa.accessops = &mgx_accessops;
aa.accesscookie = &sc->vd;
- config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &aa, wsemuldisplaydevprint, CFARGS_NONE);
/* now the Sun fb goop */
fb->fb_driver = &mgx_fbdriver;
Index: src/sys/dev/sbus/p9100.c
diff -u src/sys/dev/sbus/p9100.c:1.64 src/sys/dev/sbus/p9100.c:1.64.8.1
--- src/sys/dev/sbus/p9100.c:1.64 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/sbus/p9100.c Wed Aug 4 21:35:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: p9100.c,v 1.64 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: p9100.c,v 1.64.8.1 2021/08/04 21:35:17 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.64 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.64.8.1 2021/08/04 21:35:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -498,7 +498,7 @@ p9100_sbus_attach(device_t parent, devic
aa.accessops = &p9100_accessops;
aa.accesscookie = &sc->vd;
- config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &aa, wsemuldisplaydevprint, CFARGS_NONE);
fb->fb_type.fb_size = fb->fb_type.fb_height * fb->fb_linebytes;
printf("%s: rev %d / %x, %dx%d, depth %d mem %x\n",
Index: src/sys/dev/sbus/qec.c
diff -u src/sys/dev/sbus/qec.c:1.52 src/sys/dev/sbus/qec.c:1.52.4.1
--- src/sys/dev/sbus/qec.c:1.52 Mon May 10 23:53:44 2021
+++ src/sys/dev/sbus/qec.c Wed Aug 4 21:35:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: qec.c,v 1.52 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: qec.c,v 1.52.4.1 2021/08/04 21:35:17 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.52 2021/05/10 23:53:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.52.4.1 2021/08/04 21:35:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -208,8 +208,7 @@ qecattach(device_t parent, device_t self
sbus_setup_attach_args(sbsc,
sbt, sc->sc_dmatag, node, &sax);
(void)config_found(self, (void *)&sax, qecprint,
- CFARG_DEVHANDLE, prom_node_to_devhandle(node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(node)));
sbus_destroy_attach_args(&sax);
}
}
Index: src/sys/dev/sbus/sio16.c
diff -u src/sys/dev/sbus/sio16.c:1.26 src/sys/dev/sbus/sio16.c:1.26.8.1
--- src/sys/dev/sbus/sio16.c:1.26 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/sbus/sio16.c Wed Aug 4 21:35:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sio16.c,v 1.26 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: sio16.c,v 1.26.8.1 2021/08/04 21:35:17 thorpej Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sio16.c,v 1.26 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sio16.c,v 1.26.8.1 2021/08/04 21:35:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -230,7 +230,7 @@ sio16_attach(device_t parent, device_t s
cd.cd_handle = (bus_space_handle_t)sc->sc_reg[i];
cd.cd_ackfunc = sio16_ackfunc;
cd.cd_ackfunc_arg = sc;
- (void)config_found(self, (void *)&cd, NULL, CFARG_EOL);
+ (void)config_found(self, (void *)&cd, NULL, CFARGS_NONE);
}
}
Index: src/sys/dev/sbus/stp4020.c
diff -u src/sys/dev/sbus/stp4020.c:1.70 src/sys/dev/sbus/stp4020.c:1.70.8.1
--- src/sys/dev/sbus/stp4020.c:1.70 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/sbus/stp4020.c Wed Aug 4 21:35:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: stp4020.c,v 1.70 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: stp4020.c,v 1.70.8.1 2021/08/04 21:35:17 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.70 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.70.8.1 2021/08/04 21:35:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -504,7 +504,7 @@ stp4020_attach_socket(struct stp4020_soc
paa.pct = (pcmcia_chipset_tag_t)h->sc->sc_pct;
paa.pch = (pcmcia_chipset_handle_t)h;
- h->pcmcia = config_found(h->sc->sc_dev, &paa, stp4020print, CFARG_EOL);
+ h->pcmcia = config_found(h->sc->sc_dev, &paa, stp4020print, CFARGS_NONE);
if (h->pcmcia == NULL)
return;
Index: src/sys/dev/sbus/tcx.c
diff -u src/sys/dev/sbus/tcx.c:1.59 src/sys/dev/sbus/tcx.c:1.59.8.1
--- src/sys/dev/sbus/tcx.c:1.59 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/sbus/tcx.c Wed Aug 4 21:35:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tcx.c,v 1.59 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: tcx.c,v 1.59.8.1 2021/08/04 21:35:17 thorpej Exp $ */
/*
* Copyright (c) 1996, 1998, 2009 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.59 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.59.8.1 2021/08/04 21:35:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -423,7 +423,7 @@ tcxattach(device_t parent, device_t self
aa.accessops = &tcx_accessops;
aa.accesscookie = &sc->vd;
- config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &aa, wsemuldisplaydevprint, CFARGS_NONE);
/*
* we need to do this again - something overwrites a handful
* palette registers and we end up with white in reg. 0
Index: src/sys/dev/sbus/xbox.c
diff -u src/sys/dev/sbus/xbox.c:1.23 src/sys/dev/sbus/xbox.c:1.23.4.1
--- src/sys/dev/sbus/xbox.c:1.23 Mon May 10 23:53:44 2021
+++ src/sys/dev/sbus/xbox.c Wed Aug 4 21:35:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xbox.c,v 1.23 2021/05/10 23:53:44 thorpej Exp $ */
+/* $NetBSD: xbox.c,v 1.23.4.1 2021/08/04 21:35:17 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.23 2021/05/10 23:53:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.23.4.1 2021/08/04 21:35:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -150,6 +150,5 @@ xbox_attach(device_t parent, device_t se
xa.xa_dmatag = sa->sa_dmatag;
(void) config_found(self, (void *)&xa, xbox_print,
- CFARG_DEVHANDLE, prom_node_to_devhandle(node),
- CFARG_EOL);
+ CFARGS(.devhandle = prom_node_to_devhandle(node)));
}
Index: src/sys/dev/sbus/zx.c
diff -u src/sys/dev/sbus/zx.c:1.46 src/sys/dev/sbus/zx.c:1.46.8.1
--- src/sys/dev/sbus/zx.c:1.46 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/sbus/zx.c Wed Aug 4 21:35:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zx.c,v 1.46 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: zx.c,v 1.46.8.1 2021/08/04 21:35:17 thorpej Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.46 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.46.8.1 2021/08/04 21:35:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -336,7 +336,7 @@ zx_attach(device_t parent, device_t self
aa.console = isconsole;
aa.accessops = &zx_accessops;
aa.accesscookie = &sc->vd;
- config_found(sc->sc_dv, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dv, &aa, wsemuldisplaydevprint, CFARGS_NONE);
fb_attach(&sc->sc_fb, isconsole);
}
