Module Name: src
Committed By: thorpej
Date: Wed Aug 4 23:07:57 UTC 2021
Modified Files:
src/sys/dev/usb [thorpej-cfargs2]: auvitek_audio.c auvitek_dtv.c
auvitek_i2c.c emdtv_dtv.c emdtv_ir.c irmce.c motg.c u3g.c uark.c
uatp.c ubsa.c uchcom.c udl.c udsir.c uep.c uftdi.c ugensa.c
uhidev.c uhmodem.c uipaq.c uirda.c ukbd.c umass_scsipi.c umcs.c
umct.c umodem_common.c uplcom.c usb_subr.c uslsa.c usscanner.c
ustir.c uts.c uvisor.c uvscom.c vhci.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/usb/auvitek_audio.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/dev/usb/auvitek_dtv.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/dev/usb/auvitek_i2c.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/dev/usb/emdtv_dtv.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/dev/usb/emdtv_ir.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/dev/usb/irmce.c
cvs rdiff -u -r1.36 -r1.36.8.1 src/sys/dev/usb/motg.c
cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/dev/usb/u3g.c src/sys/dev/usb/umct.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/dev/usb/uark.c
cvs rdiff -u -r1.26 -r1.26.8.1 src/sys/dev/usb/uatp.c src/sys/dev/usb/udl.c
cvs rdiff -u -r1.42 -r1.42.2.1 src/sys/dev/usb/ubsa.c
cvs rdiff -u -r1.39 -r1.39.2.1 src/sys/dev/usb/uchcom.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/dev/usb/udsir.c src/sys/dev/usb/uts.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/dev/usb/uep.c
cvs rdiff -u -r1.75 -r1.75.8.1 src/sys/dev/usb/uftdi.c
cvs rdiff -u -r1.44 -r1.44.8.1 src/sys/dev/usb/ugensa.c
cvs rdiff -u -r1.80 -r1.80.8.1 src/sys/dev/usb/uhidev.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/dev/usb/uhmodem.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/dev/usb/uipaq.c
cvs rdiff -u -r1.49 -r1.49.8.1 src/sys/dev/usb/uirda.c \
src/sys/dev/usb/usscanner.c
cvs rdiff -u -r1.151 -r1.151.2.1 src/sys/dev/usb/ukbd.c
cvs rdiff -u -r1.68 -r1.68.4.1 src/sys/dev/usb/umass_scsipi.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/dev/usb/umcs.c
cvs rdiff -u -r1.34 -r1.34.8.1 src/sys/dev/usb/umodem_common.c
cvs rdiff -u -r1.90 -r1.90.8.1 src/sys/dev/usb/uplcom.c
cvs rdiff -u -r1.265 -r1.265.2.1 src/sys/dev/usb/usb_subr.c
cvs rdiff -u -r1.30 -r1.30.8.1 src/sys/dev/usb/uslsa.c
cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/dev/usb/ustir.c
cvs rdiff -u -r1.56 -r1.56.8.1 src/sys/dev/usb/uvisor.c
cvs rdiff -u -r1.38 -r1.38.8.1 src/sys/dev/usb/uvscom.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/dev/usb/vhci.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/usb/auvitek_audio.c
diff -u src/sys/dev/usb/auvitek_audio.c:1.4 src/sys/dev/usb/auvitek_audio.c:1.4.8.1
--- src/sys/dev/usb/auvitek_audio.c:1.4 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/auvitek_audio.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitek_audio.c,v 1.4 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: auvitek_audio.c,v 1.4.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auvitek_audio.c,v 1.4 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvitek_audio.c,v 1.4.8.1 2021/08/04 23:07:57 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -97,10 +97,9 @@ auvitek_audio_attach(struct auvitek_soft
ilocs[USBIFIFCF_INTERFACE] = uiaa.uiaa_ifaceno;
sc->sc_audiodev =
config_found(sc->sc_dev, &uiaa, auvitek_ifprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_IATTR, "usbifif",
- CFARG_LOCATORS, ilocs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .iattr = "usbifif",
+ .locators = ilocs));
if (sc->sc_audiodev)
break;
}
Index: src/sys/dev/usb/auvitek_dtv.c
diff -u src/sys/dev/usb/auvitek_dtv.c:1.8 src/sys/dev/usb/auvitek_dtv.c:1.8.8.1
--- src/sys/dev/usb/auvitek_dtv.c:1.8 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/auvitek_dtv.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitek_dtv.c,v 1.8 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: auvitek_dtv.c,v 1.8.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auvitek_dtv.c,v 1.8 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvitek_dtv.c,v 1.8.8.1 2021/08/04 23:07:57 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -117,8 +117,7 @@ auvitek_dtv_rescan(struct auvitek_softc
if (ifattr_match(ifattr, "dtvbus") && sc->sc_dtvdev == NULL)
sc->sc_dtvdev = config_found(sc->sc_dev, &daa, dtv_print,
- CFARG_IATTR, "dtvbus",
- CFARG_EOL);
+ CFARGS(.iattr = "dtvbus"));
}
void
Index: src/sys/dev/usb/auvitek_i2c.c
diff -u src/sys/dev/usb/auvitek_i2c.c:1.6 src/sys/dev/usb/auvitek_i2c.c:1.6.8.1
--- src/sys/dev/usb/auvitek_i2c.c:1.6 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/auvitek_i2c.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitek_i2c.c,v 1.6 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: auvitek_i2c.c,v 1.6.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auvitek_i2c.c,v 1.6 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvitek_i2c.c,v 1.6.8.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -102,8 +102,7 @@ auvitek_i2c_rescan(struct auvitek_softc
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &sc->sc_i2c;
sc->sc_i2cdev = config_found(sc->sc_dev, &iba, iicbus_print,
- CFARG_IATTR, "i2cbus",
- CFARG_EOL);
+ CFARGS(.iattr = "i2cbus"));
}
#endif
}
Index: src/sys/dev/usb/emdtv_dtv.c
diff -u src/sys/dev/usb/emdtv_dtv.c:1.15 src/sys/dev/usb/emdtv_dtv.c:1.15.8.1
--- src/sys/dev/usb/emdtv_dtv.c:1.15 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/emdtv_dtv.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: emdtv_dtv.c,v 1.15 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: emdtv_dtv.c,v 1.15.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*-
* Copyright (c) 2008, 2011 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emdtv_dtv.c,v 1.15 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emdtv_dtv.c,v 1.15.8.1 2021/08/04 23:07:57 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -172,8 +172,7 @@ emdtv_dtv_rescan(struct emdtv_softc *sc,
if (ifattr_match(ifattr, "dtvbus") && sc->sc_dtvdev == NULL)
sc->sc_dtvdev = config_found(sc->sc_dev, &daa, dtv_print,
- CFARG_IATTR, "dtvbus",
- CFARG_EOL);
+ CFARGS(.iattr = "dtvbus"));
}
static void
Index: src/sys/dev/usb/emdtv_ir.c
diff -u src/sys/dev/usb/emdtv_ir.c:1.3 src/sys/dev/usb/emdtv_ir.c:1.3.8.1
--- src/sys/dev/usb/emdtv_ir.c:1.3 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/emdtv_ir.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: emdtv_ir.c,v 1.3 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: emdtv_ir.c,v 1.3.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*-
* Copyright (c) 2008 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emdtv_ir.c,v 1.3 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emdtv_ir.c,v 1.3.8.1 2021/08/04 23:07:57 thorpej Exp $");
#include <sys/select.h>
#include <sys/param.h>
@@ -102,8 +102,7 @@ emdtv_ir_attach(struct emdtv_softc *sc)
sc->sc_cirdev =
config_found(sc->sc_dev, &ia, ir_print,
- CFARG_IATTR, "irbus",
- CFARG_EOL);
+ CFARGS(.iattr = "irbus"));
}
void
Index: src/sys/dev/usb/irmce.c
diff -u src/sys/dev/usb/irmce.c:1.7 src/sys/dev/usb/irmce.c:1.7.8.1
--- src/sys/dev/usb/irmce.c:1.7 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/irmce.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: irmce.c,v 1.7 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: irmce.c,v 1.7.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irmce.c,v 1.7 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irmce.c,v 1.7.8.1 2021/08/04 23:07:57 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -308,7 +308,7 @@ irmce_rescan(device_t self, const char *
iaa.ia_methods = &irmce_cir_methods;
iaa.ia_handle = sc;
sc->sc_cirdev =
- config_found(self, &iaa, irmce_print, CFARG_EOL);
+ config_found(self, &iaa, irmce_print, CFARGS_NONE);
}
return 0;
Index: src/sys/dev/usb/motg.c
diff -u src/sys/dev/usb/motg.c:1.36 src/sys/dev/usb/motg.c:1.36.8.1
--- src/sys/dev/usb/motg.c:1.36 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/motg.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: motg.c,v 1.36 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: motg.c,v 1.36.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.36 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.36.8.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -472,7 +472,7 @@ motg_init(struct motg_softc *sc)
sc->sc_bus.ub_usedma = false;
sc->sc_bus.ub_hcpriv = sc;
sc->sc_child = config_found(sc->sc_dev, &sc->sc_bus, usbctlprint,
- CFARG_EOL);
+ CFARGS_NONE);
return 0;
}
Index: src/sys/dev/usb/u3g.c
diff -u src/sys/dev/usb/u3g.c:1.42 src/sys/dev/usb/u3g.c:1.42.8.1
--- src/sys/dev/usb/u3g.c:1.42 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/u3g.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: u3g.c,v 1.42 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: u3g.c,v 1.42.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.42 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.42.8.1 2021/08/04 23:07:57 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -387,8 +387,7 @@ u3g_attach(device_t parent, device_t sel
com->c_open = false;
com->c_purging = false;
com->c_dev = config_found(self, &ucaa, ucomprint,
- CFARG_SUBMATCH, ucomsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = ucomsubmatch));
ucaa.ucaa_bulkin = -1;
ucaa.ucaa_bulkout = -1;
}
Index: src/sys/dev/usb/umct.c
diff -u src/sys/dev/usb/umct.c:1.42 src/sys/dev/usb/umct.c:1.42.8.1
--- src/sys/dev/usb/umct.c:1.42 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/umct.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: umct.c,v 1.42 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: umct.c,v 1.42.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.42 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.42.8.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -302,8 +302,7 @@ umct_attach(device_t parent, device_t se
DPRINTF(("umct: in=%#x out=%#x intr=%#x\n",
ucaa.ucaa_bulkin, ucaa.ucaa_bulkout, sc->sc_intr_number));
sc->sc_subdev = config_found(self, &ucaa, ucomprint,
- CFARG_SUBMATCH, ucomsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = ucomsubmatch));
return;
}
Index: src/sys/dev/usb/uark.c
diff -u src/sys/dev/usb/uark.c:1.17 src/sys/dev/usb/uark.c:1.17.8.1
--- src/sys/dev/usb/uark.c:1.17 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/uark.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uark.c,v 1.17 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: uark.c,v 1.17.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/* $OpenBSD: uark.c,v 1.13 2009/10/13 19:33:17 pirofti Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uark.c,v 1.17 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uark.c,v 1.17.8.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -191,8 +191,7 @@ uark_attach(device_t parent, device_t se
usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev);
sc->sc_subdev = config_found(self, &ucaa, ucomprint,
- CFARG_SUBMATCH, ucomsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = ucomsubmatch));
return;
}
Index: src/sys/dev/usb/uatp.c
diff -u src/sys/dev/usb/uatp.c:1.26 src/sys/dev/usb/uatp.c:1.26.8.1
--- src/sys/dev/usb/uatp.c:1.26 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/uatp.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uatp.c,v 1.26 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: uatp.c,v 1.26.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*-
* Copyright (c) 2011-2014 The NetBSD Foundation, Inc.
@@ -146,7 +146,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uatp.c,v 1.26 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uatp.c,v 1.26.8.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -985,7 +985,7 @@ uatp_attach(device_t parent, device_t se
/* Attach wsmouse. */
a.accessops = &uatp_accessops;
a.accesscookie = sc;
- sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL);
+ sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARGS_NONE);
}
/* Sysctl setup */
Index: src/sys/dev/usb/udl.c
diff -u src/sys/dev/usb/udl.c:1.26 src/sys/dev/usb/udl.c:1.26.8.1
--- src/sys/dev/usb/udl.c:1.26 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/udl.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: udl.c,v 1.26 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: udl.c,v 1.26.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*-
* Copyright (c) 2009 FUKAUMI Naoki.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udl.c,v 1.26 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udl.c,v 1.26.8.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -475,7 +475,7 @@ udl_attach(device_t parent, device_t sel
aa.accesscookie = sc;
sc->sc_wsdisplay =
- config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARGS_NONE);
usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev);
Index: src/sys/dev/usb/ubsa.c
diff -u src/sys/dev/usb/ubsa.c:1.42 src/sys/dev/usb/ubsa.c:1.42.2.1
--- src/sys/dev/usb/ubsa.c:1.42 Sun Jun 13 09:32:01 2021
+++ src/sys/dev/usb/ubsa.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsa.c,v 1.42 2021/06/13 09:32:01 mlelstv Exp $ */
+/* $NetBSD: ubsa.c,v 1.42.2.1 2021/08/04 23:07:57 thorpej Exp $ */
/*-
* Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.42 2021/06/13 09:32:01 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.42.2.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -276,8 +276,7 @@ ubsa_attach(device_t parent, device_t se
DPRINTF(("ubsa: int#=%d, in = %#x, out = %#x, intr = %#x\n",
i, ucaa.ucaa_bulkin, ucaa.ucaa_bulkout, sc->sc_intr_number));
sc->sc_subdevs[0] = config_found(self, &ucaa, ucomprint,
- CFARG_SUBMATCH, ucomsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = ucomsubmatch));
usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev);
Index: src/sys/dev/usb/uchcom.c
diff -u src/sys/dev/usb/uchcom.c:1.39 src/sys/dev/usb/uchcom.c:1.39.2.1
--- src/sys/dev/usb/uchcom.c:1.39 Thu Jul 15 03:25:50 2021
+++ src/sys/dev/usb/uchcom.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uchcom.c,v 1.39 2021/07/15 03:25:50 nisimura Exp $ */
+/* $NetBSD: uchcom.c,v 1.39.2.1 2021/08/04 23:07:57 thorpej Exp $ */
/*
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.39 2021/07/15 03:25:50 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.39.2.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -272,8 +272,7 @@ uchcom_attach(device_t parent, device_t
usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev);
sc->sc_subdev = config_found(self, &ucaa, ucomprint,
- CFARG_SUBMATCH, ucomsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = ucomsubmatch));
return;
Index: src/sys/dev/usb/udsir.c
diff -u src/sys/dev/usb/udsir.c:1.13 src/sys/dev/usb/udsir.c:1.13.8.1
--- src/sys/dev/usb/udsir.c:1.13 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/udsir.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: udsir.c,v 1.13 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: udsir.c,v 1.13.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.13 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.13.8.1 2021/08/04 23:07:57 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -230,7 +230,7 @@ udsir_attach(device_t parent, device_t s
ia.ia_methods = &udsir_methods;
ia.ia_handle = sc;
- sc->sc_child = config_found(self, &ia, ir_print, CFARG_EOL);
+ sc->sc_child = config_found(self, &ia, ir_print, CFARGS_NONE);
selinit(&sc->sc_rd_sel);
selinit(&sc->sc_wr_sel);
Index: src/sys/dev/usb/uts.c
diff -u src/sys/dev/usb/uts.c:1.13 src/sys/dev/usb/uts.c:1.13.8.1
--- src/sys/dev/usb/uts.c:1.13 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/uts.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uts.c,v 1.13 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: uts.c,v 1.13.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.13 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.13.8.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -235,7 +235,7 @@ uts_attach(device_t parent, device_t sel
a.accessops = &uts_accessops;
a.accesscookie = sc;
- sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL);
+ sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARGS_NONE);
/* calibrate the touchscreen */
memset(&sc->sc_calibcoords, 0, sizeof(sc->sc_calibcoords));
Index: src/sys/dev/usb/uep.c
diff -u src/sys/dev/usb/uep.c:1.24 src/sys/dev/usb/uep.c:1.24.8.1
--- src/sys/dev/usb/uep.c:1.24 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/uep.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uep.c,v 1.24 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: uep.c,v 1.24.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
* eGalax USB touchpanel controller driver.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uep.c,v 1.24 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uep.c,v 1.24.8.1 2021/08/04 23:07:57 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -223,7 +223,7 @@ uep_attach(device_t parent, device_t sel
a.accessops = &uep_accessops;
a.accesscookie = sc;
- sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL);
+ sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARGS_NONE);
tpcalib_init(&sc->sc_tpcalib);
tpcalib_ioctl(&sc->sc_tpcalib, WSMOUSEIO_SCALIBCOORDS,
Index: src/sys/dev/usb/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.75 src/sys/dev/usb/uftdi.c:1.75.8.1
--- src/sys/dev/usb/uftdi.c:1.75 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/uftdi.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.75 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: uftdi.c,v 1.75.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.75 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.75.8.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -332,8 +332,7 @@ uftdi_attach(device_t parent, device_t s
ucaa.ucaa_bulkin, ucaa.ucaa_bulkout,
ucaa.ucaa_ibufsize, ucaa.ucaa_obufsize));
sc->sc_subdev = config_found(self, &ucaa, ucomprint,
- CFARG_SUBMATCH, ucomsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = ucomsubmatch));
usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev);
Index: src/sys/dev/usb/ugensa.c
diff -u src/sys/dev/usb/ugensa.c:1.44 src/sys/dev/usb/ugensa.c:1.44.8.1
--- src/sys/dev/usb/ugensa.c:1.44 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/ugensa.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ugensa.c,v 1.44 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: ugensa.c,v 1.44.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.44 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.44.8.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -238,8 +238,7 @@ ugensa_attach(device_t parent, device_t
DPRINTF(("ugensa: in=%#x out=%#x\n", ucaa.ucaa_bulkin,
ucaa.ucaa_bulkout));
sc->sc_subdev = config_found(self, &ucaa, ucomprint,
- CFARG_SUBMATCH, ucomsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = ucomsubmatch));
if (!pmf_device_register(self, NULL, NULL))
aprint_error_dev(self, "couldn't establish power handler\n");
Index: src/sys/dev/usb/uhidev.c
diff -u src/sys/dev/usb/uhidev.c:1.80 src/sys/dev/usb/uhidev.c:1.80.8.1
--- src/sys/dev/usb/uhidev.c:1.80 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/uhidev.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uhidev.c,v 1.80 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: uhidev.c,v 1.80.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*
* Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.80 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.80.8.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -362,9 +362,8 @@ uhidev_attach(device_t parent, device_t
locs[UHIDBUSCF_REPORTID] = repid;
dev = config_found(self, &uha, uhidevprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
sc->sc_subdevs[repid] = dev;
if (dev != NULL) {
csc = device_private(dev);
Index: src/sys/dev/usb/uhmodem.c
diff -u src/sys/dev/usb/uhmodem.c:1.23 src/sys/dev/usb/uhmodem.c:1.23.8.1
--- src/sys/dev/usb/uhmodem.c:1.23 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/uhmodem.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uhmodem.c,v 1.23 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: uhmodem.c,v 1.23.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*
* Copyright (c) 2008 Yojiro UO <y...@nui.org>.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhmodem.c,v 1.23 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhmodem.c,v 1.23.8.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -352,8 +352,7 @@ uhmodem_attach(device_t parent, device_t
i, ucaa.ucaa_bulkin, ucaa.ucaa_bulkout,
sc->sc_intr_number));
sc->sc_subdevs[i] = config_found(self, &ucaa, ucomprint,
- CFARG_SUBMATCH, ucomsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = ucomsubmatch));
/* issue endpoint halt to each interface */
err = uhmodem_endpointhalt(sc, i);
Index: src/sys/dev/usb/uipaq.c
diff -u src/sys/dev/usb/uipaq.c:1.29 src/sys/dev/usb/uipaq.c:1.29.8.1
--- src/sys/dev/usb/uipaq.c:1.29 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/uipaq.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uipaq.c,v 1.29 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: uipaq.c,v 1.29.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/* $OpenBSD: uipaq.c,v 1.1 2005/06/17 23:50:33 deraadt Exp $ */
/*
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipaq.c,v 1.29 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipaq.c,v 1.29.8.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -238,8 +238,7 @@ uipaq_attach(device_t parent, device_t s
}
sc->sc_subdev = config_found(self, &ucaa, ucomprint,
- CFARG_SUBMATCH, ucomsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = ucomsubmatch));
return;
Index: src/sys/dev/usb/uirda.c
diff -u src/sys/dev/usb/uirda.c:1.49 src/sys/dev/usb/uirda.c:1.49.8.1
--- src/sys/dev/usb/uirda.c:1.49 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/uirda.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uirda.c,v 1.49 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: uirda.c,v 1.49.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.49 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.49.8.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -289,7 +289,7 @@ uirda_attach(device_t parent, device_t s
ia.ia_methods = sc->sc_irm ? sc->sc_irm : &uirda_methods;
ia.ia_handle = sc;
- sc->sc_child = config_found(self, &ia, ir_print, CFARG_EOL);
+ sc->sc_child = config_found(self, &ia, ir_print, CFARGS_NONE);
return;
}
Index: src/sys/dev/usb/usscanner.c
diff -u src/sys/dev/usb/usscanner.c:1.49 src/sys/dev/usb/usscanner.c:1.49.8.1
--- src/sys/dev/usb/usscanner.c:1.49 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/usscanner.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: usscanner.c,v 1.49 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: usscanner.c,v 1.49.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.49 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.49.8.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -332,7 +332,7 @@ usscanner_attach(device_t parent, device
usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev);
sc->sc_child = config_found(sc->sc_dev, &sc->sc_channel, scsiprint,
- CFARG_EOL);
+ CFARGS_NONE);
DPRINTFN(10, ("usscanner_attach: %p\n", sc->sc_udev));
Index: src/sys/dev/usb/ukbd.c
diff -u src/sys/dev/usb/ukbd.c:1.151 src/sys/dev/usb/ukbd.c:1.151.2.1
--- src/sys/dev/usb/ukbd.c:1.151 Sun Jun 27 22:41:55 2021
+++ src/sys/dev/usb/ukbd.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ukbd.c,v 1.151 2021/06/27 22:41:55 pgoyette Exp $ */
+/* $NetBSD: ukbd.c,v 1.151.2.1 2021/08/04 23:07:57 thorpej Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.151 2021/06/27 22:41:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.151.2.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -489,7 +489,7 @@ ukbd_attach(device_t parent, device_t se
usbd_delay_ms(uha->parent->sc_udev, 400);
ukbd_set_leds(sc, 0);
- sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARG_EOL);
+ sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARGS_NONE);
return;
}
Index: src/sys/dev/usb/umass_scsipi.c
diff -u src/sys/dev/usb/umass_scsipi.c:1.68 src/sys/dev/usb/umass_scsipi.c:1.68.4.1
--- src/sys/dev/usb/umass_scsipi.c:1.68 Sun May 23 08:42:32 2021
+++ src/sys/dev/usb/umass_scsipi.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_scsipi.c,v 1.68 2021/05/23 08:42:32 riastradh Exp $ */
+/* $NetBSD: umass_scsipi.c,v 1.68.4.1 2021/08/04 23:07:57 thorpej Exp $ */
/*
* Copyright (c) 2001, 2003, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.68 2021/05/23 08:42:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.68.4.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -144,8 +144,7 @@ umass_scsi_attach(struct umass_softc *sc
mutex_exit(&sc->sc_lock);
scbus->base.sc_child =
config_found(sc->sc_dev, &scbus->sc_channel, scsiprint,
- CFARG_IATTR, "scsi",
- CFARG_EOL);
+ CFARGS(.iattr = "scsi"));
mutex_enter(&sc->sc_lock);
if (--sc->sc_refcnt < 0)
cv_broadcast(&sc->sc_detach_cv);
@@ -187,8 +186,7 @@ umass_atapi_attach(struct umass_softc *s
mutex_exit(&sc->sc_lock);
scbus->base.sc_child =
config_found(sc->sc_dev, &scbus->sc_channel, atapiprint,
- CFARG_IATTR, "atapi",
- CFARG_EOL);
+ CFARGS(.iattr = "atapi"));
mutex_enter(&sc->sc_lock);
if (--sc->sc_refcnt < 0)
cv_broadcast(&sc->sc_detach_cv);
Index: src/sys/dev/usb/umcs.c
diff -u src/sys/dev/usb/umcs.c:1.16 src/sys/dev/usb/umcs.c:1.16.8.1
--- src/sys/dev/usb/umcs.c:1.16 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/umcs.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: umcs.c,v 1.16 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: umcs.c,v 1.16.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/* $FreeBSD: head/sys/dev/usb/serial/umcs.c 260559 2014-01-12 11:44:28Z hselasky $ */
/*-
@@ -41,7 +41,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.16 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.16.8.1 2021/08/04 23:07:57 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -341,8 +341,7 @@ umcs7840_attach(device_t parent, device_
sc->sc_ports[i].sc_port_phys = phyport;
sc->sc_ports[i].sc_port_ucom =
config_found(self, &ucaa, ucomprint,
- CFARG_SUBMATCH, ucomsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = ucomsubmatch));
}
}
Index: src/sys/dev/usb/umodem_common.c
diff -u src/sys/dev/usb/umodem_common.c:1.34 src/sys/dev/usb/umodem_common.c:1.34.8.1
--- src/sys/dev/usb/umodem_common.c:1.34 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/umodem_common.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: umodem_common.c,v 1.34 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: umodem_common.c,v 1.34.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.34 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.34.8.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -264,8 +264,7 @@ umodem_common_attach(device_t self, stru
DPRINTF(("umodem_common_attach: sc=%p\n", sc));
sc->sc_subdev = config_found(self, ucaa, ucomprint,
- CFARG_SUBMATCH, ucomsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = ucomsubmatch));
return 0;
Index: src/sys/dev/usb/uplcom.c
diff -u src/sys/dev/usb/uplcom.c:1.90 src/sys/dev/usb/uplcom.c:1.90.8.1
--- src/sys/dev/usb/uplcom.c:1.90 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/uplcom.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uplcom.c,v 1.90 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: uplcom.c,v 1.90.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.90 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.90.8.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -456,8 +456,7 @@ uplcom_attach(device_t parent, device_t
DPRINTF("in=%#jx out=%#jx intr=%#jx",
ucaa.ucaa_bulkin, ucaa.ucaa_bulkout, sc->sc_intr_number, 0);
sc->sc_subdev = config_found(self, &ucaa, ucomprint,
- CFARG_SUBMATCH, ucomsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = ucomsubmatch));
if (!pmf_device_register(self, NULL, NULL))
aprint_error_dev(self, "couldn't establish power handler\n");
Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.265 src/sys/dev/usb/usb_subr.c:1.265.2.1
--- src/sys/dev/usb/usb_subr.c:1.265 Sun Jun 13 14:48:10 2021
+++ src/sys/dev/usb/usb_subr.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.265 2021/06/13 14:48:10 riastradh Exp $ */
+/* $NetBSD: usb_subr.c,v 1.265.2.1 2021/08/04 23:07:57 thorpej Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.265 2021/06/13 14:48:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.265.2.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1042,8 +1042,7 @@ usbd_attach_roothub(device_t parent, str
KERNEL_LOCK(1, curlwp);
dv = config_found(parent, &uaa, NULL,
- CFARG_IATTR, "usbroothubif",
- CFARG_EOL);
+ CFARGS(.iattr = "usbroothubif"));
KERNEL_UNLOCK_ONE(curlwp);
if (dv) {
dev->ud_subdevs = kmem_alloc(sizeof(dv), KM_SLEEP);
@@ -1120,10 +1119,9 @@ usbd_attachwholedevice(device_t parent,
KERNEL_LOCK(1, curlwp);
config_pending_incr(parent);
dv = config_found(parent, &uaa, usbd_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_IATTR, "usbdevif",
- CFARG_LOCATORS, dlocs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .iattr = "usbdevif",
+ .locators = dlocs));
KERNEL_UNLOCK_ONE(curlwp);
if (dv) {
dev->ud_subdevs = kmem_alloc(sizeof(dv), KM_SLEEP);
@@ -1203,10 +1201,9 @@ usbd_attachinterfaces(device_t parent, s
}
KERNEL_LOCK(1, curlwp);
dv = config_found(parent, &uiaa, usbd_ifprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_IATTR, "usbifif",
- CFARG_LOCATORS, ilocs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .iattr = "usbifif",
+ .locators = ilocs));
KERNEL_UNLOCK_ONE(curlwp);
if (!dv)
continue;
Index: src/sys/dev/usb/uslsa.c
diff -u src/sys/dev/usb/uslsa.c:1.30 src/sys/dev/usb/uslsa.c:1.30.8.1
--- src/sys/dev/usb/uslsa.c:1.30 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/uslsa.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uslsa.c,v 1.30 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: uslsa.c,v 1.30.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/* from ugensa.c */
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.30 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.30.8.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -237,8 +237,7 @@ uslsa_attach(device_t parent, device_t s
}
sc->sc_subdev = config_found(self, &ucaa, ucomprint,
- CFARG_SUBMATCH, ucomsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = ucomsubmatch));
if (!pmf_device_register(self, NULL, NULL))
aprint_error_dev(self, "couldn't establish power handler\n");
Index: src/sys/dev/usb/ustir.c
diff -u src/sys/dev/usb/ustir.c:1.48 src/sys/dev/usb/ustir.c:1.48.8.1
--- src/sys/dev/usb/ustir.c:1.48 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/ustir.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ustir.c,v 1.48 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: ustir.c,v 1.48.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.48 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.48.8.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -303,7 +303,7 @@ ustir_attach(device_t parent, device_t s
ia.ia_methods = &ustir_methods;
ia.ia_handle = sc;
- sc->sc_child = config_found(self, &ia, ir_print, CFARG_EOL);
+ sc->sc_child = config_found(self, &ia, ir_print, CFARGS_NONE);
selinit(&sc->sc_rd_sel);
selinit(&sc->sc_wr_sel);
sc->sc_init_state = USTIR_INIT_INITED;
Index: src/sys/dev/usb/uvisor.c
diff -u src/sys/dev/usb/uvisor.c:1.56 src/sys/dev/usb/uvisor.c:1.56.8.1
--- src/sys/dev/usb/uvisor.c:1.56 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/uvisor.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uvisor.c,v 1.56 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: uvisor.c,v 1.56.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.56 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.56.8.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -328,8 +328,8 @@ uvisor_attach(device_t parent, device_t
if (hasin == 1 && hasout == 1)
sc->sc_subdevs[i] =
config_found(self, &ucaa, ucomprint,
- CFARG_SUBMATCH, ucomsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch =
+ ucomsubmatch));
else
aprint_error_dev(self,
"no proper endpoints for port %d (%d,%d)\n",
@@ -361,8 +361,7 @@ uvisor_attach(device_t parent, device_t
}
sc->sc_subdevs[i] =
config_found(self, &ucaa, ucomprint,
- CFARG_SUBMATCH, ucomsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = ucomsubmatch));
}
}
Index: src/sys/dev/usb/uvscom.c
diff -u src/sys/dev/usb/uvscom.c:1.38 src/sys/dev/usb/uvscom.c:1.38.8.1
--- src/sys/dev/usb/uvscom.c:1.38 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/uvscom.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uvscom.c,v 1.38 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: uvscom.c,v 1.38.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*-
* Copyright (c) 2001-2002, Shunsuke Akiyama <akiy...@jp.freebsd.org>.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.38 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.38.8.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -362,8 +362,7 @@ uvscom_attach(device_t parent, device_t
DPRINTF(("uplcom: in=%#x out=%#x intr=%#x\n",
ucaa.ucaa_bulkin, ucaa.ucaa_bulkout, sc->sc_intr_number ));
sc->sc_subdev = config_found(self, &ucaa, ucomprint,
- CFARG_SUBMATCH, ucomsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = ucomsubmatch));
return;
}
Index: src/sys/dev/usb/vhci.c
diff -u src/sys/dev/usb/vhci.c:1.21 src/sys/dev/usb/vhci.c:1.21.8.1
--- src/sys/dev/usb/vhci.c:1.21 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/vhci.c Wed Aug 4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vhci.c,v 1.21 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: vhci.c,v 1.21.8.1 2021/08/04 23:07:57 thorpej Exp $ */
/*
* Copyright (c) 2019-2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vhci.c,v 1.21 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vhci.c,v 1.21.8.1 2021/08/04 23:07:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1319,5 +1319,5 @@ vhci_attach(device_t parent, device_t se
KCOV_REMOTE_VHCI_ID(sc->sc_bus.ub_busnum, i));
}
- sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARG_EOL);
+ sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARGS_NONE);
}
