Module Name: src
Committed By: thorpej
Date: Wed Aug 4 17:28:41 UTC 2021
Modified Files:
src/sys/dev/bi [thorpej-cfargs2]: bi.c kdb.c
src/sys/dev/bluetooth [thorpej-cfargs2]: bthidev.c bthub.c btkbd.c
btmagic.c btms.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.8.1 src/sys/dev/bi/bi.c
cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/dev/bi/kdb.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/dev/bluetooth/bthidev.c
cvs rdiff -u -r1.25 -r1.25.8.1 src/sys/dev/bluetooth/bthub.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/dev/bluetooth/btkbd.c \
src/sys/dev/bluetooth/btmagic.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/dev/bluetooth/btms.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/bi/bi.c
diff -u src/sys/dev/bi/bi.c:1.26 src/sys/dev/bi/bi.c:1.26.8.1
--- src/sys/dev/bi/bi.c:1.26 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/bi/bi.c Wed Aug 4 17:28:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bi.c,v 1.26 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: bi.c,v 1.26.8.1 2021/08/04 17:28:41 thorpej Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bi.c,v 1.26 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bi.c,v 1.26.8.1 2021/08/04 17:28:41 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -142,6 +142,6 @@ bi_attach(struct bi_softc *sc)
}
ba.ba_nodenr = nodenr;
ba.ba_ivec = sc->sc_lastiv + 64 + 4 * nodenr; /* all on spl5 */
- config_found(sc->sc_dev, &ba, bi_print, CFARG_EOL);
+ config_found(sc->sc_dev, &ba, bi_print, CFARGS_NONE);
}
}
Index: src/sys/dev/bi/kdb.c
diff -u src/sys/dev/bi/kdb.c:1.48 src/sys/dev/bi/kdb.c:1.48.8.1
--- src/sys/dev/bi/kdb.c:1.48 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/bi/kdb.c Wed Aug 4 17:28:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kdb.c,v 1.48 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: kdb.c,v 1.48.8.1 2021/08/04 17:28:41 thorpej Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kdb.c,v 1.48 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kdb.c,v 1.48.8.1 2021/08/04 17:28:41 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -210,7 +210,7 @@ err2: bus_dmamem_unmap(sc->sc_dmat, sc-
KDB_WL(BIREG_BCICSR, KDB_RL(BIREG_BCICSR) |
BCI_STOPEN | BCI_IDENTEN | BCI_UINTEN | BCI_INTEN);
KDB_WL(BIREG_UINTRCSR, ba->ba_ivec);
- config_found(sc->sc_dev, &ma, kdbprint, CFARG_EOL);
+ config_found(sc->sc_dev, &ma, kdbprint, CFARGS_NONE);
}
void
Index: src/sys/dev/bluetooth/bthidev.c
diff -u src/sys/dev/bluetooth/bthidev.c:1.33 src/sys/dev/bluetooth/bthidev.c:1.33.8.1
--- src/sys/dev/bluetooth/bthidev.c:1.33 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/bluetooth/bthidev.c Wed Aug 4 17:28:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bthidev.c,v 1.33 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: bthidev.c,v 1.33.8.1 2021/08/04 17:28:41 thorpej Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.33 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.33.8.1 2021/08/04 17:28:41 thorpej Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
@@ -320,10 +320,9 @@ bthidev_attach(device_t parent, device_t
locs[BTHIDBUSCF_REPORTID] = rep;
dev = config_found(self, &bha, bthidev_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_IATTR, "bthidbus",
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .iattr = "bthidbus",
+ .locators = locs));
if (dev != NULL) {
hidev = device_private(dev);
hidev->sc_dev = dev;
Index: src/sys/dev/bluetooth/bthub.c
diff -u src/sys/dev/bluetooth/bthub.c:1.25 src/sys/dev/bluetooth/bthub.c:1.25.8.1
--- src/sys/dev/bluetooth/bthub.c:1.25 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/bluetooth/bthub.c Wed Aug 4 17:28:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bthub.c,v 1.25 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: bthub.c,v 1.25.8.1 2021/08/04 17:28:41 thorpej Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.25 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.25.8.1 2021/08/04 17:28:41 thorpej Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -238,7 +238,7 @@ bthub_pioctl(dev_t devno, unsigned long
if (dev != NULL)
return EADDRINUSE;
- dev = config_found(self, dict, bthub_print, CFARG_EOL);
+ dev = config_found(self, dict, bthub_print, CFARGS_NONE);
if (dev == NULL)
return ENXIO;
Index: src/sys/dev/bluetooth/btkbd.c
diff -u src/sys/dev/bluetooth/btkbd.c:1.20 src/sys/dev/bluetooth/btkbd.c:1.20.8.1
--- src/sys/dev/bluetooth/btkbd.c:1.20 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/bluetooth/btkbd.c Wed Aug 4 17:28:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: btkbd.c,v 1.20 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: btkbd.c,v 1.20.8.1 2021/08/04 17:28:41 thorpej Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btkbd.c,v 1.20 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btkbd.c,v 1.20.8.1 2021/08/04 17:28:41 thorpej Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -236,7 +236,7 @@ btkbd_attach(device_t parent, device_t s
wska.accessops = &btkbd_accessops;
wska.accesscookie = sc;
- sc->sc_wskbd = config_found(self, &wska, wskbddevprint, CFARG_EOL);
+ sc->sc_wskbd = config_found(self, &wska, wskbddevprint, CFARGS_NONE);
pmf_device_register(self, NULL, NULL);
}
Index: src/sys/dev/bluetooth/btmagic.c
diff -u src/sys/dev/bluetooth/btmagic.c:1.20 src/sys/dev/bluetooth/btmagic.c:1.20.8.1
--- src/sys/dev/bluetooth/btmagic.c:1.20 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/bluetooth/btmagic.c Wed Aug 4 17:28:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: btmagic.c,v 1.20 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: btmagic.c,v 1.20.8.1 2021/08/04 17:28:41 thorpej Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btmagic.c,v 1.20 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btmagic.c,v 1.20.8.1 2021/08/04 17:28:41 thorpej Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -406,7 +406,7 @@ btmagic_attach(device_t parent, device_t
*/
wsma.accessops = &btmagic_wsmouse_accessops;
wsma.accesscookie = self;
- sc->sc_wsmouse = config_found(self, &wsma, wsmousedevprint, CFARG_EOL);
+ sc->sc_wsmouse = config_found(self, &wsma, wsmousedevprint, CFARGS_NONE);
if (sc->sc_wsmouse == NULL) {
aprint_error_dev(self, "failed to attach wsmouse\n");
return;
Index: src/sys/dev/bluetooth/btms.c
diff -u src/sys/dev/bluetooth/btms.c:1.14 src/sys/dev/bluetooth/btms.c:1.14.8.1
--- src/sys/dev/bluetooth/btms.c:1.14 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/bluetooth/btms.c Wed Aug 4 17:28:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: btms.c,v 1.14 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: btms.c,v 1.14.8.1 2021/08/04 17:28:41 thorpej Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btms.c,v 1.14 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btms.c,v 1.14.8.1 2021/08/04 17:28:41 thorpej Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -327,7 +327,7 @@ btms_attach(device_t parent, device_t se
wsma.accessops = &btms_wsmouse_accessops;
wsma.accesscookie = sc;
- sc->sc_wsmouse = config_found(self, &wsma, wsmousedevprint, CFARG_EOL);
+ sc->sc_wsmouse = config_found(self, &wsma, wsmousedevprint, CFARGS_NONE);
pmf_device_register(self, NULL, NULL);
}
