Module Name: src
Committed By: thorpej
Date: Wed Aug 4 17:31:17 UTC 2021
Modified Files:
src/sys/dev/cardbus [thorpej-cfargs2]: cardbus.c cardslot.c
ehci_cardbus.c ohci_cardbus.c rbus_ppb.c uhci_cardbus.c
src/sys/dev/dec [thorpej-cfargs2]: dzkbd.c dzms.c
src/sys/dev/eisa [thorpej-cfargs2]: ahb.c eisa.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.111.8.1 src/sys/dev/cardbus/cardbus.c
cvs rdiff -u -r1.59 -r1.59.8.1 src/sys/dev/cardbus/cardslot.c
cvs rdiff -u -r1.36 -r1.36.8.1 src/sys/dev/cardbus/ehci_cardbus.c
cvs rdiff -u -r1.45 -r1.45.8.1 src/sys/dev/cardbus/ohci_cardbus.c
cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/dev/cardbus/rbus_ppb.c
cvs rdiff -u -r1.26 -r1.26.8.1 src/sys/dev/cardbus/uhci_cardbus.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/dev/dec/dzkbd.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/dev/dec/dzms.c
cvs rdiff -u -r1.69 -r1.69.2.1 src/sys/dev/eisa/ahb.c
cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/dev/eisa/eisa.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/cardbus/cardbus.c
diff -u src/sys/dev/cardbus/cardbus.c:1.111 src/sys/dev/cardbus/cardbus.c:1.111.8.1
--- src/sys/dev/cardbus/cardbus.c:1.111 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/cardbus/cardbus.c Wed Aug 4 17:31:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbus.c,v 1.111 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: cardbus.c,v 1.111.8.1 2021/08/04 17:31:16 thorpej Exp $ */
/*
* Copyright (c) 1997, 1998, 1999 and 2000
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.111 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.111.8.1 2021/08/04 17:31:16 thorpej Exp $");
#include "opt_cardbus.h"
@@ -605,9 +605,8 @@ cardbus_rescan(device_t self, const char
locs[CARDBUSCF_FUNCTION] = function;
if ((csc = config_found(sc->sc_dev, &ca, cardbusprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL)) == NULL) {
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs))) == NULL) {
/* do not match */
disable_function(sc, function);
sc->sc_funcs[function] = NULL;
Index: src/sys/dev/cardbus/cardslot.c
diff -u src/sys/dev/cardbus/cardslot.c:1.59 src/sys/dev/cardbus/cardslot.c:1.59.8.1
--- src/sys/dev/cardbus/cardslot.c:1.59 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/cardbus/cardslot.c Wed Aug 4 17:31:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cardslot.c,v 1.59 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: cardslot.c,v 1.59.8.1 2021/08/04 17:31:16 thorpej Exp $ */
/*
* Copyright (c) 1999 and 2000
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.59 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.59.8.1 2021/08/04 17:31:16 thorpej Exp $");
#include "opt_cardslot.h"
@@ -138,8 +138,7 @@ cardslotattach(device_t parent, device_t
DPRINTF(("%s attaching CardBus bus...\n", device_xname(self)));
if (cba != NULL) {
csc = device_private(config_found(self, cba, cardslot_cb_print,
- CFARG_IATTR, "cbbus",
- CFARG_EOL));
+ CFARGS(.iattr = "cbbus")));
if (csc) {
/* cardbus found */
DPRINTF(("%s: found cardbus on %s\n", __func__,
@@ -150,9 +149,8 @@ cardslotattach(device_t parent, device_t
if (pa != NULL) {
sc->sc_16_softc = config_found(self, pa, cardslot_16_print,
- CFARG_SUBMATCH, cardslot_16_submatch,
- CFARG_IATTR, "pcmciabus",
- CFARG_EOL);
+ CFARGS(.submatch = cardslot_16_submatch,
+ .iattr = "pcmciabus"));
if (sc->sc_16_softc) {
/* pcmcia 16-bit bus found */
DPRINTF(("%s: found 16-bit pcmcia bus\n", __func__));
Index: src/sys/dev/cardbus/ehci_cardbus.c
diff -u src/sys/dev/cardbus/ehci_cardbus.c:1.36 src/sys/dev/cardbus/ehci_cardbus.c:1.36.8.1
--- src/sys/dev/cardbus/ehci_cardbus.c:1.36 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/cardbus/ehci_cardbus.c Wed Aug 4 17:31:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_cardbus.c,v 1.36 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: ehci_cardbus.c,v 1.36.8.1 2021/08/04 17:31:16 thorpej Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.36 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.36.8.1 2021/08/04 17:31:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -203,7 +203,7 @@ ehci_cardbus_attach(device_t parent, dev
/* Attach usb device. */
sc->sc.sc_child = config_found(self, &sc->sc.sc_bus, usbctlprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
int
Index: src/sys/dev/cardbus/ohci_cardbus.c
diff -u src/sys/dev/cardbus/ohci_cardbus.c:1.45 src/sys/dev/cardbus/ohci_cardbus.c:1.45.8.1
--- src/sys/dev/cardbus/ohci_cardbus.c:1.45 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/cardbus/ohci_cardbus.c Wed Aug 4 17:31:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_cardbus.c,v 1.45 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: ohci_cardbus.c,v 1.45.8.1 2021/08/04 17:31:16 thorpej Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.45 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.45.8.1 2021/08/04 17:31:16 thorpej Exp $");
#include "ehci_cardbus.h"
@@ -167,7 +167,7 @@ ohci_cardbus_attach(device_t parent, dev
/* Attach usb device. */
sc->sc.sc_child = config_found(self, &sc->sc.sc_bus, usbctlprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
int
Index: src/sys/dev/cardbus/rbus_ppb.c
diff -u src/sys/dev/cardbus/rbus_ppb.c:1.48 src/sys/dev/cardbus/rbus_ppb.c:1.48.8.1
--- src/sys/dev/cardbus/rbus_ppb.c:1.48 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/cardbus/rbus_ppb.c Wed Aug 4 17:31:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rbus_ppb.c,v 1.48 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: rbus_ppb.c,v 1.48.8.1 2021/08/04 17:31:16 thorpej Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.48 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.48.8.1 2021/08/04 17:31:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -695,7 +695,7 @@ ppb_cardbus_attach(device_t parent, devi
/*pba.pba_intrswiz = parent_sc->sc_intrswiz; */
pba.pba_intrtag = psc->sc_pa.pa_intrtag;
- config_found(self, &pba, rppbprint, CFARG_EOL);
+ config_found(self, &pba, rppbprint, CFARGS_NONE);
}
int
Index: src/sys/dev/cardbus/uhci_cardbus.c
diff -u src/sys/dev/cardbus/uhci_cardbus.c:1.26 src/sys/dev/cardbus/uhci_cardbus.c:1.26.8.1
--- src/sys/dev/cardbus/uhci_cardbus.c:1.26 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/cardbus/uhci_cardbus.c Wed Aug 4 17:31:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci_cardbus.c,v 1.26 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: uhci_cardbus.c,v 1.26.8.1 2021/08/04 17:31:16 thorpej Exp $ */
/*
* Copyright (c) 1998-2005 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.26 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.26.8.1 2021/08/04 17:31:16 thorpej Exp $");
#include "ehci_cardbus.h"
@@ -170,7 +170,7 @@ uhci_cardbus_attach(device_t parent, dev
/* Attach usb device. */
sc->sc.sc_child = config_found(self, &sc->sc.sc_bus, usbctlprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
static int
Index: src/sys/dev/dec/dzkbd.c
diff -u src/sys/dev/dec/dzkbd.c:1.29 src/sys/dev/dec/dzkbd.c:1.29.8.1
--- src/sys/dev/dec/dzkbd.c:1.29 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/dec/dzkbd.c Wed Aug 4 17:31:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dzkbd.c,v 1.29 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: dzkbd.c,v 1.29.8.1 2021/08/04 17:31:16 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.29 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.29.8.1 2021/08/04 17:31:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -190,7 +190,7 @@ dzkbd_attach(device_t parent, device_t s
a.accessops = &dzkbd_accessops;
a.accesscookie = dzkbd;
- dzkbd->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARG_EOL);
+ dzkbd->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARGS_NONE);
}
int
Index: src/sys/dev/dec/dzms.c
diff -u src/sys/dev/dec/dzms.c:1.23 src/sys/dev/dec/dzms.c:1.23.8.1
--- src/sys/dev/dec/dzms.c:1.23 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/dec/dzms.c Wed Aug 4 17:31:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dzms.c,v 1.23 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: dzms.c,v 1.23.8.1 2021/08/04 17:31:16 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.23 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.23.8.1 2021/08/04 17:31:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -136,7 +136,7 @@ dzms_attach(device_t parent, device_t se
dzms->sc_enabled = 0;
dzms->sc_selftest = 0;
dzms->sc_wsmousedev = config_found(self, &a, wsmousedevprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
static int
Index: src/sys/dev/eisa/ahb.c
diff -u src/sys/dev/eisa/ahb.c:1.69 src/sys/dev/eisa/ahb.c:1.69.2.1
--- src/sys/dev/eisa/ahb.c:1.69 Tue Jul 27 01:18:04 2021
+++ src/sys/dev/eisa/ahb.c Wed Aug 4 17:31:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ahb.c,v 1.69 2021/07/27 01:18:04 thorpej Exp $ */
+/* $NetBSD: ahb.c,v 1.69.2.1 2021/08/04 17:31:17 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.69 2021/07/27 01:18:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.69.2.1 2021/08/04 17:31:17 thorpej Exp $");
#include "opt_ddb.h"
@@ -269,7 +269,7 @@ ahbattach(device_t parent, device_t self
/*
* ask the adapter what subunits are present
*/
- config_found(self, &sc->sc_channel, scsiprint, CFARG_EOL);
+ config_found(self, &sc->sc_channel, scsiprint, CFARGS_NONE);
}
/*
Index: src/sys/dev/eisa/eisa.c
diff -u src/sys/dev/eisa/eisa.c:1.48 src/sys/dev/eisa/eisa.c:1.48.8.1
--- src/sys/dev/eisa/eisa.c:1.48 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/eisa/eisa.c Wed Aug 4 17:31:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: eisa.c,v 1.48 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: eisa.c,v 1.48.8.1 2021/08/04 17:31:17 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eisa.c,v 1.48 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eisa.c,v 1.48.8.1 2021/08/04 17:31:17 thorpej Exp $");
#include "opt_eisaverbose.h"
@@ -182,9 +182,8 @@ eisaattach(device_t parent, device_t sel
/* Attach matching device. */
config_found(self, &ea, eisaprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
}
