Module Name: src
Committed By: thorpej
Date: Wed Aug 4 20:24:28 UTC 2021
Modified Files:
src/sys/dev/hil [thorpej-cfargs2]: hil.c hilkbd.c hilms.c
src/sys/dev/ieee1394 [thorpej-cfargs2]: firewire.c fwohci.c sbp.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/dev/hil/hil.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/dev/hil/hilkbd.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/dev/hil/hilms.c
cvs rdiff -u -r1.51 -r1.51.8.1 src/sys/dev/ieee1394/firewire.c
cvs rdiff -u -r1.145 -r1.145.8.1 src/sys/dev/ieee1394/fwohci.c
cvs rdiff -u -r1.40 -r1.40.8.1 src/sys/dev/ieee1394/sbp.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/hil/hil.c
diff -u src/sys/dev/hil/hil.c:1.4 src/sys/dev/hil/hil.c:1.4.8.1
--- src/sys/dev/hil/hil.c:1.4 Sat Apr 24 23:36:54 2021
+++ src/sys/dev/hil/hil.c Wed Aug 4 20:24:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hil.c,v 1.4 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: hil.c,v 1.4.8.1 2021/08/04 20:24:27 thorpej Exp $ */
/* $OpenBSD: hil.c,v 1.24 2010/11/20 16:45:46 miod Exp $ */
/*
* Copyright (c) 2003, 2004, Miodrag Vallat.
@@ -540,8 +540,7 @@ hilconfig(struct hil_softc *sc, u_int kn
sc->sc_devices[id] =
config_found(sc->sc_dev, &ha, hildevprint,
- CFARG_SUBMATCH, hilsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = hilsubmatch));
#if NHILKBD > 0
/*
Index: src/sys/dev/hil/hilkbd.c
diff -u src/sys/dev/hil/hilkbd.c:1.5 src/sys/dev/hil/hilkbd.c:1.5.8.1
--- src/sys/dev/hil/hilkbd.c:1.5 Sat Apr 24 23:36:54 2021
+++ src/sys/dev/hil/hilkbd.c Wed Aug 4 20:24:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hilkbd.c,v 1.5 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: hilkbd.c,v 1.5.8.1 2021/08/04 20:24:27 thorpej Exp $ */
/* $OpenBSD: hilkbd.c,v 1.14 2009/01/21 21:53:59 grange Exp $ */
/*
* Copyright (c) 2003, Miodrag Vallat.
@@ -203,7 +203,7 @@ hilkbdattach(device_t parent, device_t s
sc->sc_console = sc->sc_enabled = 0;
}
- sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARG_EOL);
+ sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARGS_NONE);
/*
* If this is an old keyboard with a numeric pad but no ``num lock''
Index: src/sys/dev/hil/hilms.c
diff -u src/sys/dev/hil/hilms.c:1.3 src/sys/dev/hil/hilms.c:1.3.8.1
--- src/sys/dev/hil/hilms.c:1.3 Sat Apr 24 23:36:54 2021
+++ src/sys/dev/hil/hilms.c Wed Aug 4 20:24:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hilms.c,v 1.3 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: hilms.c,v 1.3.8.1 2021/08/04 20:24:27 thorpej Exp $ */
/* $OpenBSD: hilms.c,v 1.5 2007/04/10 22:37:17 miod Exp $ */
/*
* Copyright (c) 2003, Miodrag Vallat.
@@ -161,7 +161,7 @@ hilmsattach(device_t parent, device_t se
a.accessops = &hilms_accessops;
a.accesscookie = sc;
- sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL);
+ sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARGS_NONE);
}
int
Index: src/sys/dev/ieee1394/firewire.c
diff -u src/sys/dev/ieee1394/firewire.c:1.51 src/sys/dev/ieee1394/firewire.c:1.51.8.1
--- src/sys/dev/ieee1394/firewire.c:1.51 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ieee1394/firewire.c Wed Aug 4 20:24:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: firewire.c,v 1.51 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: firewire.c,v 1.51.8.1 2021/08/04 20:24:27 thorpej Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: firewire.c,v 1.51 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: firewire.c,v 1.51.8.1 2021/08/04 20:24:27 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -246,7 +246,7 @@ firewireattach(device_t parent, device_t
faa.name = "fwip";
faa.fc = fc;
faa.fwdev = NULL;
- devlist->dev = config_found(sc->dev, &faa, firewire_print, CFARG_EOL);
+ devlist->dev = config_found(sc->dev, &faa, firewire_print, CFARGS_NONE);
if (devlist->dev == NULL)
free(devlist, M_DEVBUF);
else
@@ -2042,9 +2042,8 @@ fw_attach_dev(struct firewire_comm *fc)
fwa.name = fw_get_devclass(fwdev);
fwa.fwdev = fwdev;
fwdev->dev = config_found(sc->dev, &fwa, firewire_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
if (fwdev->dev == NULL) {
free(devlist, M_DEVBUF);
break;
Index: src/sys/dev/ieee1394/fwohci.c
diff -u src/sys/dev/ieee1394/fwohci.c:1.145 src/sys/dev/ieee1394/fwohci.c:1.145.8.1
--- src/sys/dev/ieee1394/fwohci.c:1.145 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ieee1394/fwohci.c Wed Aug 4 20:24:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci.c,v 1.145 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: fwohci.c,v 1.145.8.1 2021/08/04 20:24:27 thorpej Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.145 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.145.8.1 2021/08/04 20:24:27 thorpej Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -504,7 +504,7 @@ fwohci_attach(struct fwohci_softc *sc)
sc->fc.bdev =
config_found(sc->fc.dev, __UNCONST("ieee1394if"), fwohci_print,
- CFARG_EOL);
+ CFARGS_NONE);
return 0;
}
Index: src/sys/dev/ieee1394/sbp.c
diff -u src/sys/dev/ieee1394/sbp.c:1.40 src/sys/dev/ieee1394/sbp.c:1.40.8.1
--- src/sys/dev/ieee1394/sbp.c:1.40 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ieee1394/sbp.c Wed Aug 4 20:24:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sbp.c,v 1.40 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: sbp.c,v 1.40.8.1 2021/08/04 20:24:27 thorpej Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbp.c,v 1.40 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbp.c,v 1.40.8.1 2021/08/04 20:24:27 thorpej Exp $");
#include <sys/param.h>
@@ -518,7 +518,7 @@ sbpattach(device_t parent, device_t self
sc_channel->chan_id = 1;
sc->sc_bus = config_found(sc->sc_fd.dev, sc_channel, scsiprint,
- CFARG_EOL);
+ CFARGS_NONE);
if (sc->sc_bus == NULL) {
aprint_error_dev(self, "attach failed\n");
return;
