Module Name: src
Committed By: thorpej
Date: Wed Aug 4 20:31:00 UTC 2021
Modified Files:
src/sys/dev/tc [thorpej-cfargs2]: cfb.c ioasic_subr.c mfb.c sfb.c
sfbplus.c stic.c tc.c tcds.c tcu.c tfb.c xcfb.c zs_ioasic.c zskbd.c
zsms.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.64.8.1 src/sys/dev/tc/cfb.c src/sys/dev/tc/tfb.c
cvs rdiff -u -r1.15 -r1.15.6.1 src/sys/dev/tc/ioasic_subr.c
cvs rdiff -u -r1.62 -r1.62.8.1 src/sys/dev/tc/mfb.c
cvs rdiff -u -r1.87 -r1.87.8.1 src/sys/dev/tc/sfb.c
cvs rdiff -u -r1.40 -r1.40.8.1 src/sys/dev/tc/sfbplus.c
cvs rdiff -u -r1.55 -r1.55.8.1 src/sys/dev/tc/stic.c
cvs rdiff -u -r1.58 -r1.58.6.1 src/sys/dev/tc/tc.c
cvs rdiff -u -r1.27 -r1.27.8.1 src/sys/dev/tc/tcds.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/dev/tc/tcu.c
cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/dev/tc/xcfb.c
cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/dev/tc/zs_ioasic.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/dev/tc/zskbd.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/dev/tc/zsms.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/tc/cfb.c
diff -u src/sys/dev/tc/cfb.c:1.64 src/sys/dev/tc/cfb.c:1.64.8.1
--- src/sys/dev/tc/cfb.c:1.64 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/tc/cfb.c Wed Aug 4 20:31:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cfb.c,v 1.64 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: cfb.c,v 1.64.8.1 2021/08/04 20:31:00 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.64 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.64.8.1 2021/08/04 20:31:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -282,7 +282,7 @@ cfbattach(device_t parent, device_t self
waa.accessops = &cfb_accessops;
waa.accesscookie = sc;
- config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE);
}
static void
Index: src/sys/dev/tc/tfb.c
diff -u src/sys/dev/tc/tfb.c:1.64 src/sys/dev/tc/tfb.c:1.64.8.1
--- src/sys/dev/tc/tfb.c:1.64 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/tc/tfb.c Wed Aug 4 20:31:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tfb.c,v 1.64 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: tfb.c,v 1.64.8.1 2021/08/04 20:31:00 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.64 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.64.8.1 2021/08/04 20:31:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -316,7 +316,7 @@ tfbattach(device_t parent, device_t self
waa.accessops = &tfb_accessops;
waa.accesscookie = sc;
- config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE);
}
static void
Index: src/sys/dev/tc/ioasic_subr.c
diff -u src/sys/dev/tc/ioasic_subr.c:1.15 src/sys/dev/tc/ioasic_subr.c:1.15.6.1
--- src/sys/dev/tc/ioasic_subr.c:1.15 Fri May 7 16:55:58 2021
+++ src/sys/dev/tc/ioasic_subr.c Wed Aug 4 20:31:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ioasic_subr.c,v 1.15 2021/05/07 16:55:58 thorpej Exp $ */
+/* $NetBSD: ioasic_subr.c,v 1.15.6.1 2021/08/04 20:31:00 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioasic_subr.c,v 1.15 2021/05/07 16:55:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioasic_subr.c,v 1.15.6.1 2021/08/04 20:31:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,8 +73,7 @@ ioasic_attach_devs(struct ioasic_softc *
/* Tell the autoconfig machinery we've found the hardware. */
locs[IOASICCF_OFFSET] = ioasic_devs[i].iad_offset;
config_found(sc->sc_dev, &idev, ioasicprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
}
Index: src/sys/dev/tc/mfb.c
diff -u src/sys/dev/tc/mfb.c:1.62 src/sys/dev/tc/mfb.c:1.62.8.1
--- src/sys/dev/tc/mfb.c:1.62 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/tc/mfb.c Wed Aug 4 20:31:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mfb.c,v 1.62 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: mfb.c,v 1.62.8.1 2021/08/04 20:31:00 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.62 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.62.8.1 2021/08/04 20:31:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -262,7 +262,7 @@ mfbattach(device_t parent, device_t self
waa.accessops = &mfb_accessops;
waa.accesscookie = sc;
- config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE);
}
static void
Index: src/sys/dev/tc/sfb.c
diff -u src/sys/dev/tc/sfb.c:1.87 src/sys/dev/tc/sfb.c:1.87.8.1
--- src/sys/dev/tc/sfb.c:1.87 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/tc/sfb.c Wed Aug 4 20:31:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sfb.c,v 1.87 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: sfb.c,v 1.87.8.1 2021/08/04 20:31:00 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.87 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.87.8.1 2021/08/04 20:31:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -297,7 +297,7 @@ sfbattach(device_t parent, device_t self
waa.accessops = &sfb_accessops;
waa.accesscookie = sc;
- config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE);
}
static void
Index: src/sys/dev/tc/sfbplus.c
diff -u src/sys/dev/tc/sfbplus.c:1.40 src/sys/dev/tc/sfbplus.c:1.40.8.1
--- src/sys/dev/tc/sfbplus.c:1.40 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/tc/sfbplus.c Wed Aug 4 20:31:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sfbplus.c,v 1.40 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: sfbplus.c,v 1.40.8.1 2021/08/04 20:31:00 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.40 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.40.8.1 2021/08/04 20:31:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -303,7 +303,7 @@ sfbpattach(device_t parent, device_t sel
waa.accessops = &sfb_accessops;
waa.accesscookie = sc;
- config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE);
}
static void
Index: src/sys/dev/tc/stic.c
diff -u src/sys/dev/tc/stic.c:1.55 src/sys/dev/tc/stic.c:1.55.8.1
--- src/sys/dev/tc/stic.c:1.55 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/tc/stic.c Wed Aug 4 20:31:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: stic.c,v 1.55 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: stic.c,v 1.55.8.1 2021/08/04 20:31:00 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.55 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.55.8.1 2021/08/04 20:31:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -433,7 +433,7 @@ stic_attach(device_t self, struct stic_i
waa.accessops = &stic_accessops;
waa.accesscookie = si;
- config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE);
}
void
Index: src/sys/dev/tc/tc.c
diff -u src/sys/dev/tc/tc.c:1.58 src/sys/dev/tc/tc.c:1.58.6.1
--- src/sys/dev/tc/tc.c:1.58 Fri May 7 16:55:58 2021
+++ src/sys/dev/tc/tc.c Wed Aug 4 20:31:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tc.c,v 1.58 2021/05/07 16:55:58 thorpej Exp $ */
+/* $NetBSD: tc.c,v 1.58.6.1 2021/08/04 20:31:00 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.58 2021/05/07 16:55:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.58.6.1 2021/08/04 20:31:00 thorpej Exp $");
#include "opt_tcverbose.h"
@@ -138,9 +138,8 @@ tcattach(device_t parent, device_t self,
* Attach the device.
*/
config_found(self, &ta, tcprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
/*
@@ -184,9 +183,8 @@ tcattach(device_t parent, device_t self,
* Attach the device.
*/
config_found(self, &ta, tcprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
}
Index: src/sys/dev/tc/tcds.c
diff -u src/sys/dev/tc/tcds.c:1.27 src/sys/dev/tc/tcds.c:1.27.8.1
--- src/sys/dev/tc/tcds.c:1.27 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/tc/tcds.c Wed Aug 4 20:31:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tcds.c,v 1.27 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: tcds.c,v 1.27.8.1 2021/08/04 20:31:00 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcds.c,v 1.27 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcds.c,v 1.27.8.1 2021/08/04 20:31:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -295,9 +295,8 @@ tcdsattach(device_t parent, device_t sel
locs[TCDSCF_CHIP] = i;
config_found(self, &tcdsdev, tcdsprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
#ifdef __alpha__
/*
* The second SCSI chip isn't present on the baseboard TCDS
Index: src/sys/dev/tc/tcu.c
diff -u src/sys/dev/tc/tcu.c:1.5 src/sys/dev/tc/tcu.c:1.5.8.1
--- src/sys/dev/tc/tcu.c:1.5 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/tc/tcu.c Wed Aug 4 20:31:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tcu.c,v 1.5 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: tcu.c,v 1.5.8.1 2021/08/04 20:31:00 thorpej Exp $ */
/*-
* Copyright (c) 2016, Felix Deichmann
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcu.c,v 1.5 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcu.c,v 1.5.8.1 2021/08/04 20:31:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -148,8 +148,7 @@ tcu_attach(device_t parent, device_t sel
#if NSLHCI_TCU > 0
/* Attach slhci. */
(void)config_found(self, aux, tcu_print,
- CFARG_IATTR, "tcu",
- CFARG_EOL);
+ CFARGS(.iattr = "tcu"));
#endif /* NSLHCI_TCU > 0 */
#if NGPIO > 0
/* Attach gpio(bus). */
@@ -215,8 +214,7 @@ tcu_gpio_attach(device_t parent, device_
gba.gba_npins = TCU_GPIO_NPINS;
config_found(self, &gba, gpiobus_print,
- CFARG_IATTR, "gpiobus",
- CFARG_EOL);
+ CFARGS(.iattr = "gpiobus"));
}
static int
Index: src/sys/dev/tc/xcfb.c
diff -u src/sys/dev/tc/xcfb.c:1.58 src/sys/dev/tc/xcfb.c:1.58.8.1
--- src/sys/dev/tc/xcfb.c:1.58 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/tc/xcfb.c Wed Aug 4 20:31:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xcfb.c,v 1.58 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: xcfb.c,v 1.58.8.1 2021/08/04 20:31:00 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.58 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.58.8.1 2021/08/04 20:31:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -245,7 +245,7 @@ xcfbattach(device_t parent, device_t sel
waa.accessops = &xcfb_accessops;
waa.accesscookie = sc;
- config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE);
}
static void
Index: src/sys/dev/tc/zs_ioasic.c
diff -u src/sys/dev/tc/zs_ioasic.c:1.42 src/sys/dev/tc/zs_ioasic.c:1.42.8.1
--- src/sys/dev/tc/zs_ioasic.c:1.42 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/tc/zs_ioasic.c Wed Aug 4 20:31:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_ioasic.c,v 1.42 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: zs_ioasic.c,v 1.42.8.1 2021/08/04 20:31:00 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.42 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.42.8.1 2021/08/04 20:31:00 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -309,9 +309,8 @@ zs_ioasic_attach(device_t parent, device
* The child attach will setup the hardware.
*/
if (config_found(self, (void *)&zs_args, zs_ioasic_print,
- CFARG_SUBMATCH, zs_ioasic_submatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL) == NULL) {
+ CFARGS(.submatch = zs_ioasic_submatch,
+ .locators = locs)) == NULL) {
/* No sub-driver. Just reset it. */
uint8_t reset = (channel == 0) ?
ZSWR9_A_RESET : ZSWR9_B_RESET;
Index: src/sys/dev/tc/zskbd.c
diff -u src/sys/dev/tc/zskbd.c:1.20 src/sys/dev/tc/zskbd.c:1.20.8.1
--- src/sys/dev/tc/zskbd.c:1.20 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/tc/zskbd.c Wed Aug 4 20:31:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zskbd.c,v 1.20 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: zskbd.c,v 1.20.8.1 2021/08/04 20:31:00 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zskbd.c,v 1.20 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zskbd.c,v 1.20.8.1 2021/08/04 20:31:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -234,7 +234,7 @@ zskbd_attach(device_t parent, device_t s
a.accessops = &zskbd_accessops;
a.accesscookie = zskbd;
- zskbd->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARG_EOL);
+ zskbd->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARGS_NONE);
}
int
Index: src/sys/dev/tc/zsms.c
diff -u src/sys/dev/tc/zsms.c:1.19 src/sys/dev/tc/zsms.c:1.19.8.1
--- src/sys/dev/tc/zsms.c:1.19 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/tc/zsms.c Wed Aug 4 20:31:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zsms.c,v 1.19 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: zsms.c,v 1.19.8.1 2021/08/04 20:31:00 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zsms.c,v 1.19 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zsms.c,v 1.19.8.1 2021/08/04 20:31:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -183,7 +183,7 @@ zsms_attach(device_t parent, device_t se
zsms->sc_enabled = 0;
zsms->sc_selftest = 0;
zsms->sc_wsmousedev = config_found(self, &a, wsmousedevprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
static int
