Module Name: src
Committed By: thorpej
Date: Wed Aug 4 21:27:00 UTC 2021
Modified Files:
src/sys/dev/pci [thorpej-cfargs2]: alipm.c amdpm_smbus.c amr.c arcmsr.c
btvmei.c btvmeii.c cmpci.c coram.c cxdtv.c ehci_pci.c eso.c fms.c
genfb_pci.c gffb.c ibmcd.c ichsmb.c if_msk.c if_sk.c igma.c ips.c
ismt.c jmide.c joy_eap.c lynxfb.c machfb.c mfii.c mly.c mpii.c
nfsmb.c oboe.c ohci_pci.c pccbb.c pci.c piixpm.c pm2fb.c pm3fb.c
ppb.c puc.c r128fb.c radeonfb.c sisfb.c sv.c tdvfb.c tga.c trm.c
twa.c twe.c uhci_pci.c unichromefb.c vga_pci.c vioscsi.c
virtio_pci.c voodoofb.c voyager.c wcfb.c xhci_pci.c xmm7360.c yds.c
src/sys/dev/pci/cxgb [thorpej-cfargs2]: cxgb_main.c
src/sys/dev/pci/igma [thorpej-cfargs2]: igmafb.c
src/sys/dev/pci/voyager [thorpej-cfargs2]: voyagerfb.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/dev/pci/alipm.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/dev/pci/amdpm_smbus.c \
src/sys/dev/pci/jmide.c
cvs rdiff -u -r1.66 -r1.66.8.1 src/sys/dev/pci/amr.c
cvs rdiff -u -r1.42 -r1.42.2.1 src/sys/dev/pci/arcmsr.c
cvs rdiff -u -r1.34 -r1.34.8.1 src/sys/dev/pci/btvmei.c
cvs rdiff -u -r1.25 -r1.25.8.1 src/sys/dev/pci/btvmeii.c
cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/dev/pci/cmpci.c \
src/sys/dev/pci/ohci_pci.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/dev/pci/coram.c \
src/sys/dev/pci/cxdtv.c src/sys/dev/pci/wcfb.c
cvs rdiff -u -r1.71 -r1.71.8.1 src/sys/dev/pci/ehci_pci.c
cvs rdiff -u -r1.74 -r1.74.6.1 src/sys/dev/pci/eso.c
cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/dev/pci/fms.c src/sys/dev/pci/oboe.c
cvs rdiff -u -r1.39 -r1.39.8.1 src/sys/dev/pci/genfb_pci.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/dev/pci/gffb.c \
src/sys/dev/pci/voyager.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/dev/pci/ibmcd.c
cvs rdiff -u -r1.71 -r1.71.2.1 src/sys/dev/pci/ichsmb.c
cvs rdiff -u -r1.116 -r1.116.6.1 src/sys/dev/pci/if_msk.c
cvs rdiff -u -r1.108 -r1.108.6.1 src/sys/dev/pci/if_sk.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/dev/pci/igma.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/dev/pci/ips.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/dev/pci/ismt.c src/sys/dev/pci/mfii.c
cvs rdiff -u -r1.16 -r1.16.6.1 src/sys/dev/pci/joy_eap.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/dev/pci/lynxfb.c src/sys/dev/pci/pm3fb.c \
src/sys/dev/pci/sisfb.c
cvs rdiff -u -r1.105 -r1.105.2.1 src/sys/dev/pci/machfb.c
cvs rdiff -u -r1.54 -r1.54.8.1 src/sys/dev/pci/mly.c \
src/sys/dev/pci/voodoofb.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/dev/pci/mpii.c
cvs rdiff -u -r1.26 -r1.26.8.1 src/sys/dev/pci/nfsmb.c \
src/sys/dev/pci/vioscsi.c
cvs rdiff -u -r1.216 -r1.216.8.1 src/sys/dev/pci/pccbb.c
cvs rdiff -u -r1.160 -r1.160.4.1 src/sys/dev/pci/pci.c
cvs rdiff -u -r1.64 -r1.64.8.1 src/sys/dev/pci/piixpm.c
cvs rdiff -u -r1.32 -r1.32.8.1 src/sys/dev/pci/pm2fb.c
cvs rdiff -u -r1.72 -r1.72.4.1 src/sys/dev/pci/ppb.c
cvs rdiff -u -r1.41 -r1.41.8.1 src/sys/dev/pci/puc.c
cvs rdiff -u -r1.43 -r1.43.8.1 src/sys/dev/pci/r128fb.c
cvs rdiff -u -r1.115 -r1.115.2.1 src/sys/dev/pci/radeonfb.c
cvs rdiff -u -r1.60 -r1.60.8.1 src/sys/dev/pci/sv.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/dev/pci/tdvfb.c
cvs rdiff -u -r1.87 -r1.87.8.1 src/sys/dev/pci/tga.c
cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/dev/pci/trm.c
cvs rdiff -u -r1.59 -r1.59.8.1 src/sys/dev/pci/twa.c
cvs rdiff -u -r1.109 -r1.109.8.1 src/sys/dev/pci/twe.c
cvs rdiff -u -r1.65 -r1.65.8.1 src/sys/dev/pci/uhci_pci.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/dev/pci/unichromefb.c
cvs rdiff -u -r1.57 -r1.57.8.1 src/sys/dev/pci/vga_pci.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/dev/pci/virtio_pci.c \
src/sys/dev/pci/xhci_pci.c
cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/dev/pci/xmm7360.c
cvs rdiff -u -r1.67 -r1.67.8.1 src/sys/dev/pci/yds.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/dev/pci/cxgb/cxgb_main.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/dev/pci/igma/igmafb.c
cvs rdiff -u -r1.32 -r1.32.4.1 src/sys/dev/pci/voyager/voyagerfb.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/pci/alipm.c
diff -u src/sys/dev/pci/alipm.c:1.12 src/sys/dev/pci/alipm.c:1.12.8.1
--- src/sys/dev/pci/alipm.c:1.12 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/alipm.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: alipm.c,v 1.12 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: alipm.c,v 1.12.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/* $OpenBSD: alipm.c,v 1.13 2007/05/03 12:19:01 dlg Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: alipm.c,v 1.12 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: alipm.c,v 1.12.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -210,7 +210,7 @@ alipm_attach(device_t parent, device_t s
memset(&iba, 0, sizeof iba);
iba.iba_tag = &sc->sc_smb_tag;
- config_found(sc->sc_dev, &iba, iicbus_print, CFARG_EOL);
+ config_found(sc->sc_dev, &iba, iicbus_print, CFARGS_NONE);
return;
Index: src/sys/dev/pci/amdpm_smbus.c
diff -u src/sys/dev/pci/amdpm_smbus.c:1.24 src/sys/dev/pci/amdpm_smbus.c:1.24.8.1
--- src/sys/dev/pci/amdpm_smbus.c:1.24 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/amdpm_smbus.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdpm_smbus.c,v 1.24 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: amdpm_smbus.c,v 1.24.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 2005 Anil Gopinath ([email protected])
@@ -32,7 +32,7 @@
* AMD-8111 HyperTransport I/O Hub
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdpm_smbus.c,v 1.24 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdpm_smbus.c,v 1.24.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -75,7 +75,7 @@ amdpm_smbus_attach(struct amdpm_softc *s
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &sc->sc_i2c;
- config_found(sc->sc_dev, &iba, iicbus_print, CFARG_EOL);
+ config_found(sc->sc_dev, &iba, iicbus_print, CFARGS_NONE);
}
static int
Index: src/sys/dev/pci/jmide.c
diff -u src/sys/dev/pci/jmide.c:1.24 src/sys/dev/pci/jmide.c:1.24.8.1
--- src/sys/dev/pci/jmide.c:1.24 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/jmide.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: jmide.c,v 1.24 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: jmide.c,v 1.24.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 2007 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: jmide.c,v 1.24 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jmide.c,v 1.24.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -227,8 +227,7 @@ jmide_attach(device_t parent, device_t s
sc->sc_ahci = config_found(
sc->sc_pciide.sc_wdcdev.sc_atac.atac_dev,
&jma, jmahci_print,
- CFARG_IATTR, "jmide_hl",
- CFARG_EOL);
+ CFARGS(.iattr = "jmide_hl"));
}
/*
* if we couldn't attach an ahci, try to fall back
Index: src/sys/dev/pci/amr.c
diff -u src/sys/dev/pci/amr.c:1.66 src/sys/dev/pci/amr.c:1.66.8.1
--- src/sys/dev/pci/amr.c:1.66 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/amr.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amr.c,v 1.66 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: amr.c,v 1.66.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.66 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.66.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -530,10 +530,9 @@ amr_rescan(device_t self, const char *if
amr->amr_drive[j].al_dv =
config_found(amr->amr_dv, &amra, amr_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_IATTR, ifattr,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .iattr = ifattr,
+ .locators = locs));
}
return 0;
}
Index: src/sys/dev/pci/arcmsr.c
diff -u src/sys/dev/pci/arcmsr.c:1.42 src/sys/dev/pci/arcmsr.c:1.42.2.1
--- src/sys/dev/pci/arcmsr.c:1.42 Sun Jun 13 10:04:10 2021
+++ src/sys/dev/pci/arcmsr.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: arcmsr.c,v 1.42 2021/06/13 10:04:10 mlelstv Exp $ */
+/* $NetBSD: arcmsr.c,v 1.42.2.1 2021/08/04 21:27:00 thorpej Exp $ */
/* $OpenBSD: arc.c,v 1.68 2007/10/27 03:28:27 dlg Exp $ */
/*
@@ -21,7 +21,7 @@
#include "bio.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arcmsr.c,v 1.42 2021/06/13 10:04:10 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arcmsr.c,v 1.42.2.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -256,7 +256,7 @@ arc_attach(device_t parent, device_t sel
* devices via the management interface.
*/
sc->sc_scsibus_dv = config_found(self, &sc->sc_chan, scsiprint,
- CFARG_EOL);
+ CFARGS_NONE);
/* enable interrupts */
arc_write(sc, ARC_REG_INTRMASK,
Index: src/sys/dev/pci/btvmei.c
diff -u src/sys/dev/pci/btvmei.c:1.34 src/sys/dev/pci/btvmei.c:1.34.8.1
--- src/sys/dev/pci/btvmei.c:1.34 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/btvmei.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: btvmei.c,v 1.34 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: btvmei.c,v 1.34.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 1999
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.34 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.34.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -177,7 +177,7 @@ b3_617_attach(device_t parent, device_t
sc->csrwindow.offset = -1;
sc->dmawindow24.offset = -1;
sc->dmawindow32.offset = -1;
- config_found(self, &vaa, 0, CFARG_EOL);
+ config_found(self, &vaa, 0, CFARGS_NONE);
}
#ifdef notyet
Index: src/sys/dev/pci/btvmeii.c
diff -u src/sys/dev/pci/btvmeii.c:1.25 src/sys/dev/pci/btvmeii.c:1.25.8.1
--- src/sys/dev/pci/btvmeii.c:1.25 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/btvmeii.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: btvmeii.c,v 1.25 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: btvmeii.c,v 1.25.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 1999
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btvmeii.c,v 1.25 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btvmeii.c,v 1.25.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -276,7 +276,7 @@ b3_2706_attach(device_t parent, device_t
vaa.va_bdt = pa->pa_dmat; /* XXX */
vaa.va_slaveconfig = 0; /* XXX CSR window? */
- config_found(self, &vaa, 0, CFARG_EOL);
+ config_found(self, &vaa, 0, CFARGS_NONE);
}
#define sc ((struct b3_2706_softc*)vsc)
Index: src/sys/dev/pci/cmpci.c
diff -u src/sys/dev/pci/cmpci.c:1.58 src/sys/dev/pci/cmpci.c:1.58.8.1
--- src/sys/dev/pci/cmpci.c:1.58 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/cmpci.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cmpci.c,v 1.58 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: cmpci.c,v 1.58.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.58 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.58.8.1 2021/08/04 21:27:00 thorpej Exp $");
#if defined(AUDIO_DEBUG) || defined(DEBUG)
#define DPRINTF(x) if (cmpcidebug) printf x
@@ -419,7 +419,7 @@ cmpci_attach(device_t parent, device_t s
aa.type = AUDIODEV_TYPE_OPL;
aa.hwif = NULL;
aa.hdl = NULL;
- (void)config_found(sc->sc_dev, &aa, audioprint, CFARG_EOL);
+ (void)config_found(sc->sc_dev, &aa, audioprint, CFARGS_NONE);
/* attach MPU-401 device */
aa.type = AUDIODEV_TYPE_MPU;
@@ -428,7 +428,7 @@ cmpci_attach(device_t parent, device_t s
if (bus_space_subregion(sc->sc_iot, sc->sc_ioh,
CMPCI_REG_MPU_BASE, CMPCI_REG_MPU_SIZE, &sc->sc_mpu_ioh) == 0)
sc->sc_mpudev = config_found(sc->sc_dev, &aa, audioprint,
- CFARG_EOL);
+ CFARGS_NONE);
/* get initial value (this is 0 and may be omitted but just in case) */
sc->sc_reg_misc = bus_space_read_4(sc->sc_iot, sc->sc_ioh,
Index: src/sys/dev/pci/ohci_pci.c
diff -u src/sys/dev/pci/ohci_pci.c:1.58 src/sys/dev/pci/ohci_pci.c:1.58.8.1
--- src/sys/dev/pci/ohci_pci.c:1.58 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/ohci_pci.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_pci.c,v 1.58 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: ohci_pci.c,v 1.58.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.58 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.58.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include "ehci.h"
@@ -168,7 +168,7 @@ ohci_pci_attach(device_t parent, device_
/* Attach usb device. */
sc->sc.sc_child = config_found(self, &sc->sc.sc_bus, usbctlprint,
- CFARG_EOL);
+ CFARGS_NONE);
return;
fail:
Index: src/sys/dev/pci/coram.c
diff -u src/sys/dev/pci/coram.c:1.19 src/sys/dev/pci/coram.c:1.19.8.1
--- src/sys/dev/pci/coram.c:1.19 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/coram.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: coram.c,v 1.19 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: coram.c,v 1.19.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 2008, 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coram.c,v 1.19 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coram.c,v 1.19.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -226,8 +226,7 @@ coram_attach(device_t parent, device_t s
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &cic->cic_i2c;
cic->cic_i2cdev = config_found(self, &iba, iicbus_print,
- CFARG_IATTR, "i2cbus",
- CFARG_EOL);
+ CFARGS(.iattr = "i2cbus"));
#endif
}
@@ -326,8 +325,7 @@ coram_rescan(device_t self, const char *
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"));
return 0;
}
Index: src/sys/dev/pci/cxdtv.c
diff -u src/sys/dev/pci/cxdtv.c:1.19 src/sys/dev/pci/cxdtv.c:1.19.8.1
--- src/sys/dev/pci/cxdtv.c:1.19 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/cxdtv.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cxdtv.c,v 1.19 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: cxdtv.c,v 1.19.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 2008, 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cxdtv.c,v 1.19 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxdtv.c,v 1.19.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -254,8 +254,7 @@ cxdtv_attach(device_t parent, device_t s
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &sc->sc_i2c;
config_found(self, &iba, iicbus_print,
- CFARG_IATTR, "i2cbus",
- CFARG_EOL);
+ CFARGS(.iattr = "i2cbus"));
if (!pmf_device_register(self, NULL, cxdtv_resume))
aprint_error_dev(self, "couldn't establish power handler\n");
@@ -295,8 +294,7 @@ cxdtv_rescan(device_t self, const char *
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"));
return 0;
}
Index: src/sys/dev/pci/wcfb.c
diff -u src/sys/dev/pci/wcfb.c:1.19 src/sys/dev/pci/wcfb.c:1.19.8.1
--- src/sys/dev/pci/wcfb.c:1.19 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/wcfb.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wcfb.c,v 1.19 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: wcfb.c,v 1.19.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Miodrag Vallat.
@@ -20,7 +20,7 @@
/* a driver for (some) 3DLabs Wildcat cards, based on OpenBSD's ifb driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wcfb.c,v 1.19 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wcfb.c,v 1.19.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -335,7 +335,7 @@ wcfb_attach(device_t parent, device_t se
aa.accessops = &wcfb_accessops;
aa.accesscookie = &sc->vd;
- config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARGS_NONE);
}
static int
Index: src/sys/dev/pci/ehci_pci.c
diff -u src/sys/dev/pci/ehci_pci.c:1.71 src/sys/dev/pci/ehci_pci.c:1.71.8.1
--- src/sys/dev/pci/ehci_pci.c:1.71 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/ehci_pci.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_pci.c,v 1.71 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: ehci_pci.c,v 1.71.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.71 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.71.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -256,7 +256,7 @@ ehci_pci_attach(device_t parent, device_
/* Attach usb device. */
sc->sc.sc_child = config_found(self, &sc->sc.sc_bus, usbctlprint,
- CFARG_EOL);
+ CFARGS_NONE);
return;
fail:
Index: src/sys/dev/pci/eso.c
diff -u src/sys/dev/pci/eso.c:1.74 src/sys/dev/pci/eso.c:1.74.6.1
--- src/sys/dev/pci/eso.c:1.74 Mon Apr 26 19:28:24 2021
+++ src/sys/dev/pci/eso.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: eso.c,v 1.74 2021/04/26 19:28:24 thorpej Exp $ */
+/* $NetBSD: eso.c,v 1.74.6.1 2021/08/04 21:27:00 thorpej Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.74 2021/04/26 19:28:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.74.6.1 2021/08/04 21:27:00 thorpej Exp $");
#include "mpu.h"
@@ -427,15 +427,13 @@ eso_attach(device_t parent, device_t sel
aa.hwif = NULL;
aa.hdl = NULL;
(void)config_found(sc->sc_dev, &aa, audioprint,
- CFARG_IATTR, "eso",
- CFARG_EOL);
+ CFARGS(.iattr = "eso"));
aa.type = AUDIODEV_TYPE_MPU;
aa.hwif = NULL;
aa.hdl = NULL;
sc->sc_mpudev = config_found(sc->sc_dev, &aa, audioprint,
- CFARG_IATTR, "eso",
- CFARG_EOL);
+ CFARGS(.iattr = "eso"));
if (sc->sc_mpudev != NULL) {
/* Unmask the MPU irq. */
mutex_spin_enter(&sc->sc_intr_lock);
@@ -449,8 +447,7 @@ eso_attach(device_t parent, device_t sel
aa.hwif = NULL;
aa.hdl = NULL;
(void)config_found(sc->sc_dev, &aa, eso_print,
- CFARG_IATTR, "eso",
- CFARG_EOL);
+ CFARGS(.iattr = "eso"));
}
static void
Index: src/sys/dev/pci/fms.c
diff -u src/sys/dev/pci/fms.c:1.48 src/sys/dev/pci/fms.c:1.48.8.1
--- src/sys/dev/pci/fms.c:1.48 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/fms.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fms.c,v 1.48 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: fms.c,v 1.48.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.48 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.48.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include "mpu.h"
@@ -325,12 +325,12 @@ fms_attach(device_t parent, device_t sel
aa.type = AUDIODEV_TYPE_OPL;
aa.hwif = NULL;
aa.hdl = NULL;
- config_found(sc->sc_dev, &aa, audioprint, CFARG_EOL);
+ config_found(sc->sc_dev, &aa, audioprint, CFARGS_NONE);
aa.type = AUDIODEV_TYPE_MPU;
aa.hwif = NULL;
aa.hdl = NULL;
- sc->sc_mpu_dev = config_found(sc->sc_dev, &aa, audioprint, CFARG_EOL);
+ sc->sc_mpu_dev = config_found(sc->sc_dev, &aa, audioprint, CFARGS_NONE);
}
/*
Index: src/sys/dev/pci/oboe.c
diff -u src/sys/dev/pci/oboe.c:1.48 src/sys/dev/pci/oboe.c:1.48.8.1
--- src/sys/dev/pci/oboe.c:1.48 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/oboe.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: oboe.c,v 1.48 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: oboe.c,v 1.48.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/* XXXXFVDL THIS DRIVER IS BROKEN FOR NON-i386 -- vtophys() usage */
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.48 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.48.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -239,7 +239,7 @@ oboe_attach(device_t parent, device_t se
oboe_alloc_taskfile(sc);
- sc->sc_child = config_found(self, &ia, ir_print, CFARG_EOL);
+ sc->sc_child = config_found(self, &ia, ir_print, CFARGS_NONE);
}
static int
Index: src/sys/dev/pci/genfb_pci.c
diff -u src/sys/dev/pci/genfb_pci.c:1.39 src/sys/dev/pci/genfb_pci.c:1.39.8.1
--- src/sys/dev/pci/genfb_pci.c:1.39 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/genfb_pci.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb_pci.c,v 1.39 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: genfb_pci.c,v 1.39.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.39 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.39.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -193,8 +193,7 @@ pci_genfb_attach(device_t parent, device
/* now try to attach a DRM */
config_found(self, aux, pci_genfb_drm_print,
- CFARG_IATTR, "drm",
- CFARG_EOL);
+ CFARGS(.iattr = "drm"));
}
}
Index: src/sys/dev/pci/gffb.c
diff -u src/sys/dev/pci/gffb.c:1.16 src/sys/dev/pci/gffb.c:1.16.8.1
--- src/sys/dev/pci/gffb.c:1.16 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/gffb.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gffb.c,v 1.16 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: gffb.c,v 1.16.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 2013 Michael Lorenz
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gffb.c,v 1.16 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gffb.c,v 1.16.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -378,7 +378,7 @@ gffb_attach(device_t parent, device_t se
aa.accessops = &gffb_accessops;
aa.accesscookie = &sc->vd;
- config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARGS_NONE);
#ifdef GFFB_DEBUG
for (i = 0; i < 40; i++) {
Index: src/sys/dev/pci/voyager.c
diff -u src/sys/dev/pci/voyager.c:1.16 src/sys/dev/pci/voyager.c:1.16.8.1
--- src/sys/dev/pci/voyager.c:1.16 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/voyager.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: voyager.c,v 1.16 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: voyager.c,v 1.16.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 2009, 2011 Michael Lorenz
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: voyager.c,v 1.16 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voyager.c,v 1.16.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -228,20 +228,17 @@ voyager_attach(device_t parent, device_t
#if NVOYAGERFB > 0
strcpy(vaa.vaa_name, "voyagerfb");
config_found(sc->sc_dev, &vaa, voyager_print,
- CFARG_IATTR, "voyagerbus",
- CFARG_EOL);
+ CFARGS(.iattr = "voyagerbus"));
#endif
#if NPWMCLOCK > 0
strcpy(vaa.vaa_name, "pwmclock");
config_found(sc->sc_dev, &vaa, voyager_print,
- CFARG_IATTR, "voyagerbus",
- CFARG_EOL);
+ CFARGS(.iattr = "voyagerbus"));
#endif
#ifdef notyet
strcpy(vaa.vaa_name, "vac");
config_found(sc->sc_dev, &vaa, voyager_print,
- CFARG_IATTR, "voyagerbus",
- CFARG_EOL);
+ CFARGS(.iattr = "voyagerbus"));
#endif
/* we use this mutex whether there's an i2c bus or not */
mutex_init(&sc->sc_i2c_lock, MUTEX_DEFAULT, IPL_NONE);
@@ -268,8 +265,7 @@ voyager_attach(device_t parent, device_t
sc->sc_i2c.ic_write_byte = voyager_i2c_write_byte;
iba.iba_tag = &sc->sc_i2c;
config_found(self, &iba, iicbus_print,
- CFARG_IATTR, "i2cbus",
- CFARG_EOL);
+ CFARGS(.iattr = "i2cbus"));
}
voyager_control_gpio(sc, ~(1 << 16), 0);
voyager_gpio_dir(sc, 0xffffffff, 1 << 16);
Index: src/sys/dev/pci/ibmcd.c
diff -u src/sys/dev/pci/ibmcd.c:1.4 src/sys/dev/pci/ibmcd.c:1.4.8.1
--- src/sys/dev/pci/ibmcd.c:1.4 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/ibmcd.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ibmcd.c,v 1.4 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: ibmcd.c,v 1.4.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 2012 Marc Balmer <[email protected]>
@@ -136,7 +136,7 @@ ibmcd_attach(device_t parent, device_t s
gba.gba_npins = IBMCD_NPINS;
/* Attach GPIO framework */
- config_found(self, &gba, gpiobus_print, CFARG_EOL);
+ config_found(self, &gba, gpiobus_print, CFARGS_NONE);
}
Index: src/sys/dev/pci/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.71 src/sys/dev/pci/ichsmb.c:1.71.2.1
--- src/sys/dev/pci/ichsmb.c:1.71 Mon Jul 12 12:59:54 2021
+++ src/sys/dev/pci/ichsmb.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ichsmb.c,v 1.71 2021/07/12 12:59:54 msaitoh Exp $ */
+/* $NetBSD: ichsmb.c,v 1.71.2.1 2021/08/04 21:27:00 thorpej Exp $ */
/* $OpenBSD: ichiic.c,v 1.44 2020/10/07 11:23:05 jsg Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.71 2021/07/12 12:59:54 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.71.2.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -240,7 +240,7 @@ ichsmb_rescan(device_t self, const char
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &sc->sc_i2c_tag;
- sc->sc_i2c_device = config_found(self, &iba, iicbus_print, CFARG_EOL);
+ sc->sc_i2c_device = config_found(self, &iba, iicbus_print, CFARGS_NONE);
return 0;
}
Index: src/sys/dev/pci/if_msk.c
diff -u src/sys/dev/pci/if_msk.c:1.116 src/sys/dev/pci/if_msk.c:1.116.6.1
--- src/sys/dev/pci/if_msk.c:1.116 Sat May 8 00:27:02 2021
+++ src/sys/dev/pci/if_msk.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.116 2021/05/08 00:27:02 thorpej Exp $ */
+/* $NetBSD: if_msk.c,v 1.116.6.1 2021/08/04 21:27:00 thorpej Exp $ */
/* $OpenBSD: if_msk.c,v 1.79 2009/10/15 17:54:56 deraadt Exp $ */
/*
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.116 2021/05/08 00:27:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.116.6.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1777,13 +1777,13 @@ mskc_attach(device_t parent, device_t se
skca.skc_port = SK_PORT_A;
skca.skc_type = sc->sk_type;
skca.skc_rev = sc->sk_rev;
- (void)config_found(sc->sk_dev, &skca, mskcprint, CFARG_EOL);
+ (void)config_found(sc->sk_dev, &skca, mskcprint, CFARGS_NONE);
if (sc->sk_macs > 1) {
skca.skc_port = SK_PORT_B;
skca.skc_type = sc->sk_type;
skca.skc_rev = sc->sk_rev;
- (void)config_found(sc->sk_dev, &skca, mskcprint, CFARG_EOL);
+ (void)config_found(sc->sk_dev, &skca, mskcprint, CFARGS_NONE);
}
/* Turn on the 'driver is loaded' LED. */
Index: src/sys/dev/pci/if_sk.c
diff -u src/sys/dev/pci/if_sk.c:1.108 src/sys/dev/pci/if_sk.c:1.108.6.1
--- src/sys/dev/pci/if_sk.c:1.108 Sat May 8 00:27:02 2021
+++ src/sys/dev/pci/if_sk.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sk.c,v 1.108 2021/05/08 00:27:02 thorpej Exp $ */
+/* $NetBSD: if_sk.c,v 1.108.6.1 2021/08/04 21:27:00 thorpej Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.108 2021/05/08 00:27:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.108.6.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1794,11 +1794,11 @@ skc_attach(device_t parent, device_t sel
sc->sk_name, revstr, sc->sk_rev);
skca.skc_port = SK_PORT_A;
- (void)config_found(sc->sk_dev, &skca, skcprint, CFARG_EOL);
+ (void)config_found(sc->sk_dev, &skca, skcprint, CFARGS_NONE);
if (!(sk_win_read_1(sc, SK_CONFIG) & SK_CONFIG_SINGLEMAC)) {
skca.skc_port = SK_PORT_B;
- (void)config_found(sc->sk_dev, &skca, skcprint, CFARG_EOL);
+ (void)config_found(sc->sk_dev, &skca, skcprint, CFARGS_NONE);
}
/* Turn on the 'driver is loaded' LED. */
Index: src/sys/dev/pci/igma.c
diff -u src/sys/dev/pci/igma.c:1.5 src/sys/dev/pci/igma.c:1.5.8.1
--- src/sys/dev/pci/igma.c:1.5 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/igma.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: igma.c,v 1.5 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: igma.c,v 1.5.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 2014 Michael van Elst
@@ -21,7 +21,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igma.c,v 1.5 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igma.c,v 1.5.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include "vga.h"
@@ -407,8 +407,7 @@ igma_attach(device_t parent, device_t se
strcpy(iaa.iaa_name, "igmafb");
iaa.iaa_chip = sc->sc_chip;
config_found(sc->sc_dev, &iaa, igma_print,
- CFARG_IATTR, "igmabus",
- CFARG_EOL);
+ CFARGS(.iattr = "igmabus"));
#endif
igma_i2c_attach(sc);
@@ -470,8 +469,7 @@ igma_i2c_attach(struct igma_softc *sc)
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &ii->ii_i2c;
config_found(sc->sc_dev, &iba, iicbus_print,
- CFARG_IATTR, "i2cbus",
- CFARG_EOL);
+ CFARGS(.iattr = "i2cbus"));
#endif
}
}
Index: src/sys/dev/pci/ips.c
diff -u src/sys/dev/pci/ips.c:1.3 src/sys/dev/pci/ips.c:1.3.8.1
--- src/sys/dev/pci/ips.c:1.3 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/ips.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ips.c,v 1.3 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: ips.c,v 1.3.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/* $OpenBSD: ips.c,v 1.113 2016/08/14 04:08:03 dlg Exp $ */
/*-
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ips.c,v 1.3 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ips.c,v 1.3.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include "bio.h"
@@ -813,7 +813,7 @@ ips_attach(struct device *parent, struct
chan->chan_nluns = lastarget + 1;
chan->chan_id = i;
chan->chan_flags = SCSIPI_CHAN_NOSETTLE;
- config_found(self, chan, scsiprint, CFARG_EOL);
+ config_found(self, chan, scsiprint, CFARGS_NONE);
}
/* Enable interrupts */
Index: src/sys/dev/pci/ismt.c
diff -u src/sys/dev/pci/ismt.c:1.8 src/sys/dev/pci/ismt.c:1.8.8.1
--- src/sys/dev/pci/ismt.c:1.8 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/ismt.c Wed Aug 4 21:27:00 2021
@@ -60,7 +60,7 @@
#if 0
__FBSDID("$FreeBSD: head/sys/dev/ismt/ismt.c 266474 2014-05-20 19:55:06Z jimharris $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: ismt.c,v 1.8 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ismt.c,v 1.8.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -802,7 +802,7 @@ ismt_rescan(device_t self, const char *i
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &sc->sc_i2c_tag;
- sc->smbdev = config_found(self, &iba, iicbus_print, CFARG_EOL);
+ sc->smbdev = config_found(self, &iba, iicbus_print, CFARGS_NONE);
return 0;
}
Index: src/sys/dev/pci/mfii.c
diff -u src/sys/dev/pci/mfii.c:1.8 src/sys/dev/pci/mfii.c:1.8.8.1
--- src/sys/dev/pci/mfii.c:1.8 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/mfii.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mfii.c,v 1.8 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: mfii.c,v 1.8.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/* $OpenBSD: mfii.c,v 1.58 2018/08/14 05:22:21 jmatthew Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.8 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.8.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include "bio.h"
@@ -992,7 +992,7 @@ mfii_rescan(device_t self, const char *i
if (sc->sc_child != NULL)
return 0;
- sc->sc_child = config_found(self, &sc->sc_chan, scsiprint, CFARG_EOL);
+ sc->sc_child = config_found(self, &sc->sc_chan, scsiprint, CFARGS_NONE);
return 0;
}
Index: src/sys/dev/pci/joy_eap.c
diff -u src/sys/dev/pci/joy_eap.c:1.16 src/sys/dev/pci/joy_eap.c:1.16.6.1
--- src/sys/dev/pci/joy_eap.c:1.16 Mon Apr 26 19:35:16 2021
+++ src/sys/dev/pci/joy_eap.c Wed Aug 4 21:27:00 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: joy_eap.c,v 1.16 2021/04/26 19:35:16 thorpej Exp $ */
+/* $NetBSD: joy_eap.c,v 1.16.6.1 2021/08/04 21:27:00 thorpej Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_eap.c,v 1.16 2021/04/26 19:35:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_eap.c,v 1.16.6.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,8 +60,7 @@ eap_joy_attach(device_t eapdev, struct e
aa.aa_iot = gpa->gpa_iot;
aa.aa_ioh = ioh;
joydev = config_found(eapdev, &aa, 0,
- CFARG_IATTR, "eap",
- CFARG_EOL);
+ CFARGS(.iattr = "eap"));
/* this cannot fail */
KASSERT(joydev != NULL);
Index: src/sys/dev/pci/lynxfb.c
diff -u src/sys/dev/pci/lynxfb.c:1.6 src/sys/dev/pci/lynxfb.c:1.6.8.1
--- src/sys/dev/pci/lynxfb.c:1.6 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/lynxfb.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lynxfb.c,v 1.6 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: lynxfb.c,v 1.6.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/* $OpenBSD: smfb.c,v 1.13 2011/07/21 20:36:12 miod Exp $ */
/*
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lynxfb.c,v 1.6 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lynxfb.c,v 1.6.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include "opt_wsemul.h"
@@ -364,7 +364,7 @@ lynxfb_attach(device_t parent, device_t
waa.accessops = &lynxfb_accessops;
waa.accesscookie = &sc->sc_vd;
- config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE);
}
/*
Index: src/sys/dev/pci/pm3fb.c
diff -u src/sys/dev/pci/pm3fb.c:1.6 src/sys/dev/pci/pm3fb.c:1.6.8.1
--- src/sys/dev/pci/pm3fb.c:1.6 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/pm3fb.c Wed Aug 4 21:27:00 2021
@@ -332,7 +332,7 @@ pm3fb_attach(device_t parent, device_t s
aa.accessops = &pm3fb_accessops;
aa.accesscookie = &sc->vd;
- config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARGS_NONE);
}
static int
Index: src/sys/dev/pci/sisfb.c
diff -u src/sys/dev/pci/sisfb.c:1.6 src/sys/dev/pci/sisfb.c:1.6.8.1
--- src/sys/dev/pci/sisfb.c:1.6 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/sisfb.c Wed Aug 4 21:27:00 2021
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sisfb.c,v 1.6 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sisfb.c,v 1.6.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -332,7 +332,7 @@ sisfb_attach(device_t parent, device_t s
waa.accessops = &sisfb_accessops;
waa.accesscookie = &sc->vd;
- config_found(sc->sc_dev, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dev, &waa, wsemuldisplaydevprint, CFARGS_NONE);
return;
fail3:
Index: src/sys/dev/pci/machfb.c
diff -u src/sys/dev/pci/machfb.c:1.105 src/sys/dev/pci/machfb.c:1.105.2.1
--- src/sys/dev/pci/machfb.c:1.105 Mon Jun 21 03:19:21 2021
+++ src/sys/dev/pci/machfb.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machfb.c,v 1.105 2021/06/21 03:19:21 christos Exp $ */
+/* $NetBSD: machfb.c,v 1.105.2.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 2002 Bang Jun-Young
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0,
- "$NetBSD: machfb.c,v 1.105 2021/06/21 03:19:21 christos Exp $");
+ "$NetBSD: machfb.c,v 1.105.2.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -786,8 +786,7 @@ mach64_attach(device_t parent, device_t
aa.accesscookie = &sc->vd;
config_found(self, &aa, wsemuldisplaydevprint,
- CFARG_IATTR, "wsemuldisplaydev",
- CFARG_EOL);
+ CFARGS(.iattr = "wsemuldisplaydev"));
#if 0
/* XXX
* turns out some firmware doesn't turn these back on when needed
@@ -809,8 +808,7 @@ mach64_attach(device_t parent, device_t
}
#endif
config_found(self, aux, machfb_drm_print,
- CFARG_IATTR, "drm",
- CFARG_EOL);
+ CFARGS(.iattr = "drm"));
}
static int
Index: src/sys/dev/pci/mly.c
diff -u src/sys/dev/pci/mly.c:1.54 src/sys/dev/pci/mly.c:1.54.8.1
--- src/sys/dev/pci/mly.c:1.54 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/mly.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mly.c,v 1.54 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: mly.c,v 1.54.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.54 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.54.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -533,7 +533,7 @@ mly_attach(device_t parent, device_t sel
chan->chan_nluns = MLY_MAX_LUNS;
chan->chan_id = mly->mly_controllerparam->initiator_id;
chan->chan_flags = SCSIPI_CHAN_NOSETTLE;
- config_found(self, chan, scsiprint, CFARG_EOL);
+ config_found(self, chan, scsiprint, CFARGS_NONE);
}
/*
Index: src/sys/dev/pci/voodoofb.c
diff -u src/sys/dev/pci/voodoofb.c:1.54 src/sys/dev/pci/voodoofb.c:1.54.8.1
--- src/sys/dev/pci/voodoofb.c:1.54 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/voodoofb.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: voodoofb.c,v 1.54 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: voodoofb.c,v 1.54.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 2005, 2006, 2012 Michael Lorenz
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.54 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.54.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -547,11 +547,9 @@ voodoofb_attach(device_t parent, device_
aa.accesscookie = &sc->vd;
config_found(self, &aa, wsemuldisplaydevprint,
- CFARG_IATTR, "wsemuldisplaydev",
- CFARG_EOL);
+ CFARGS(.iattr = "wsemuldisplaydev"));
config_found(self, aux, voodoofb_drm_print,
- CFARG_IATTR, "drm",
- CFARG_EOL);
+ CFARGS(.iattr = "drm"));
}
static int
Index: src/sys/dev/pci/mpii.c
diff -u src/sys/dev/pci/mpii.c:1.28 src/sys/dev/pci/mpii.c:1.28.8.1
--- src/sys/dev/pci/mpii.c:1.28 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/mpii.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mpii.c,v 1.28 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: mpii.c,v 1.28.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/* $OpenBSD: mpii.c,v 1.115 2018/08/14 05:22:21 jmatthew Exp $ */
/*
* Copyright (c) 2010, 2012 Mike Belopuhov
@@ -20,7 +20,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.28 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.28.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include "bio.h"
@@ -726,7 +726,7 @@ mpii_rescan(device_t self, const char *i
if (sc->sc_child != NULL)
return 0;
- sc->sc_child = config_found(self, &sc->sc_chan, scsiprint, CFARG_EOL);
+ sc->sc_child = config_found(self, &sc->sc_chan, scsiprint, CFARGS_NONE);
return 0;
}
Index: src/sys/dev/pci/nfsmb.c
diff -u src/sys/dev/pci/nfsmb.c:1.26 src/sys/dev/pci/nfsmb.c:1.26.8.1
--- src/sys/dev/pci/nfsmb.c:1.26 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/nfsmb.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nfsmb.c,v 1.26 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: nfsmb.c,v 1.26.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 2007 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfsmb.c,v 1.26 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfsmb.c,v 1.26.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -168,13 +168,13 @@ nfsmbc_attach(device_t parent, device_t
nfsmbca.nfsmb_num = 1;
nfsmbca.nfsmb_addr = NFORCE_SMBBASE(reg);
sc->sc_nfsmb[0] = config_found(sc->sc_dev, &nfsmbca, nfsmbc_print,
- CFARG_EOL);
+ CFARGS_NONE);
reg = pci_conf_read(pa->pa_pc, pa->pa_tag, baseregs[1]);
nfsmbca.nfsmb_num = 2;
nfsmbca.nfsmb_addr = NFORCE_SMBBASE(reg);
sc->sc_nfsmb[1] = config_found(sc->sc_dev, &nfsmbca, nfsmbc_print,
- CFARG_EOL);
+ CFARGS_NONE);
/* This driver is similar to an ISA bridge that doesn't
* need any special handling. So registering NULL handlers
@@ -238,7 +238,7 @@ nfsmb_attach(device_t parent, device_t s
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &sc->sc_i2c;
- config_found(sc->sc_dev, &iba, iicbus_print, CFARG_EOL);
+ config_found(sc->sc_dev, &iba, iicbus_print, CFARGS_NONE);
/* This driver is similar to an ISA bridge that doesn't
* need any special handling. So registering NULL handlers
Index: src/sys/dev/pci/vioscsi.c
diff -u src/sys/dev/pci/vioscsi.c:1.26 src/sys/dev/pci/vioscsi.c:1.26.8.1
--- src/sys/dev/pci/vioscsi.c:1.26 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/vioscsi.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vioscsi.c,v 1.26 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: vioscsi.c,v 1.26.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/* $OpenBSD: vioscsi.c,v 1.3 2015/03/14 03:38:49 jsg Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.26 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.26.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -212,7 +212,7 @@ vioscsi_attach(device_t parent, device_t
*/
chan->chan_defquirks = PQUIRK_FORCELUNS;
- config_found(self, &sc->sc_channel, scsiprint, CFARG_EOL);
+ config_found(self, &sc->sc_channel, scsiprint, CFARGS_NONE);
return;
err:
Index: src/sys/dev/pci/pccbb.c
diff -u src/sys/dev/pci/pccbb.c:1.216 src/sys/dev/pci/pccbb.c:1.216.8.1
--- src/sys/dev/pci/pccbb.c:1.216 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/pccbb.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pccbb.c,v 1.216 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: pccbb.c,v 1.216.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 1998, 1999 and 2000
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.216 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.216.8.1 2021/08/04 21:27:00 thorpej Exp $");
/*
#define CBB_DEBUG
@@ -681,8 +681,7 @@ pccbb_pci_callback(device_t self)
pccbb_intrinit(sc);
if (NULL != (csc = config_found(self, &caa, cbbprint,
- CFARG_IATTR, "pcmciaslot",
- CFARG_EOL))) {
+ CFARGS(.iattr = "pcmciaslot")))) {
DPRINTF(("%s: found cardslot\n", __func__));
sc->sc_csc = device_private(csc);
}
Index: src/sys/dev/pci/pci.c
diff -u src/sys/dev/pci/pci.c:1.160 src/sys/dev/pci/pci.c:1.160.4.1
--- src/sys/dev/pci/pci.c:1.160 Wed May 12 23:22:33 2021
+++ src/sys/dev/pci/pci.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.c,v 1.160 2021/05/12 23:22:33 thorpej Exp $ */
+/* $NetBSD: pci.c,v 1.160.4.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997, 1998
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.160 2021/05/12 23:22:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.160.4.1 2021/08/04 21:27:00 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -485,10 +485,9 @@ pci_probe_device(struct pci_softc *sc, p
c->c_psok = false;
c->c_dev = config_found(sc->sc_dev, &pa, pciprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_DEVHANDLE, devhandle,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs,
+ .devhandle = devhandle));
ret = (c->c_dev != NULL);
}
Index: src/sys/dev/pci/piixpm.c
diff -u src/sys/dev/pci/piixpm.c:1.64 src/sys/dev/pci/piixpm.c:1.64.8.1
--- src/sys/dev/pci/piixpm.c:1.64 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/piixpm.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: piixpm.c,v 1.64 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: piixpm.c,v 1.64.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/* $OpenBSD: piixpm.c,v 1.39 2013/10/01 20:06:02 sf Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.64 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.64.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -351,7 +351,7 @@ piixpm_rescan(device_t self, const char
memset(&iba, 0, sizeof(iba));
iba.iba_tag = tag;
sc->sc_i2c_device[i] =
- config_found(self, &iba, piixpm_iicbus_print, CFARG_EOL);
+ config_found(self, &iba, piixpm_iicbus_print, CFARGS_NONE);
}
return 0;
Index: src/sys/dev/pci/pm2fb.c
diff -u src/sys/dev/pci/pm2fb.c:1.32 src/sys/dev/pci/pm2fb.c:1.32.8.1
--- src/sys/dev/pci/pm2fb.c:1.32 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/pm2fb.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pm2fb.c,v 1.32 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: pm2fb.c,v 1.32.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 2009, 2012 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pm2fb.c,v 1.32 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm2fb.c,v 1.32.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -459,7 +459,7 @@ pm2fb_attach(device_t parent, device_t s
aa.accessops = &pm2fb_accessops;
aa.accesscookie = &sc->vd;
- config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARGS_NONE);
#ifdef PM2FB_DEBUG
/*
Index: src/sys/dev/pci/ppb.c
diff -u src/sys/dev/pci/ppb.c:1.72 src/sys/dev/pci/ppb.c:1.72.4.1
--- src/sys/dev/pci/ppb.c:1.72 Tue May 11 06:03:54 2021
+++ src/sys/dev/pci/ppb.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ppb.c,v 1.72 2021/05/11 06:03:54 thorpej Exp $ */
+/* $NetBSD: ppb.c,v 1.72.4.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 1996, 1998 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.72 2021/05/11 06:03:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.72.4.1 2021/08/04 21:27:00 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_ppb.h"
@@ -441,8 +441,7 @@ configure:
* Forward along the device handle for the bridge to the
* downstream bus.
*/
- CFARG_DEVHANDLE, device_handle(self),
- CFARG_EOL);
+ CFARGS(.devhandle = device_handle(self)));
}
static int
Index: src/sys/dev/pci/puc.c
diff -u src/sys/dev/pci/puc.c:1.41 src/sys/dev/pci/puc.c:1.41.8.1
--- src/sys/dev/pci/puc.c:1.41 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/puc.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: puc.c,v 1.41 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: puc.c,v 1.41.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 1996, 1998, 1999
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puc.c,v 1.41 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puc.c,v 1.41.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -318,9 +318,8 @@ puc_attach(device_t parent, device_t sel
/* and configure it */
sc->sc_ports[i].dev = config_found(self, &paa, puc_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
}
Index: src/sys/dev/pci/r128fb.c
diff -u src/sys/dev/pci/r128fb.c:1.43 src/sys/dev/pci/r128fb.c:1.43.8.1
--- src/sys/dev/pci/r128fb.c:1.43 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/r128fb.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: r128fb.c,v 1.43 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: r128fb.c,v 1.43.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 2007, 2012 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.43 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.43.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -356,7 +356,7 @@ r128fb_attach(device_t parent, device_t
aa.accessops = &r128fb_accessops;
aa.accesscookie = &sc->vd;
- config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARGS_NONE);
}
static int
Index: src/sys/dev/pci/radeonfb.c
diff -u src/sys/dev/pci/radeonfb.c:1.115 src/sys/dev/pci/radeonfb.c:1.115.2.1
--- src/sys/dev/pci/radeonfb.c:1.115 Mon Jun 21 03:21:17 2021
+++ src/sys/dev/pci/radeonfb.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb.c,v 1.115 2021/06/21 03:21:17 christos Exp $ */
+/* $NetBSD: radeonfb.c,v 1.115.2.1 2021/08/04 21:27:00 thorpej Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.115 2021/06/21 03:21:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.115.2.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1014,9 +1014,8 @@ radeonfb_attach(device_t parent, device_
aa.accesscookie = &dp->rd_vd;
config_found(sc->sc_dev, &aa, wsemuldisplaydevprint,
- CFARG_IATTR, "wsemuldisplaydev",
- CFARG_EOL);
-
+ CFARGS(.iattr = "wsemuldisplaydev"));
+
radeonfb_blank(dp, 0);
/* Initialise delayed lvds operations for backlight. */
@@ -1056,8 +1055,7 @@ radeonfb_attach(device_t parent, device_
*/
sc->sc_needs_unmap =
(config_found(dev, aux, radeonfb_drm_print,
- CFARG_IATTR, "drm",
- CFARG_EOL) != 0);
+ CFARGS(.iattr = "drm")) != NULL);
DPRINTF(("needs_unmap: %d\n", sc->sc_needs_unmap));
if (!IS_AVIVO(sc)) {
Index: src/sys/dev/pci/sv.c
diff -u src/sys/dev/pci/sv.c:1.60 src/sys/dev/pci/sv.c:1.60.8.1
--- src/sys/dev/pci/sv.c:1.60 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/sv.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sv.c,v 1.60 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: sv.c,v 1.60.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/* $OpenBSD: sv.c,v 1.2 1998/07/13 01:50:15 csapuntz Exp $ */
/*
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.60 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.60.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -449,7 +449,7 @@ sv_attach(device_t parent, device_t self
arg.type = AUDIODEV_TYPE_OPL;
arg.hwif = 0;
arg.hdl = 0;
- (void)config_found(self, &arg, audioprint, CFARG_EOL);
+ (void)config_found(self, &arg, audioprint, CFARGS_NONE);
sc->sc_pa = *pa; /* for deferred setup */
config_defer(self, sv_defer);
Index: src/sys/dev/pci/tdvfb.c
diff -u src/sys/dev/pci/tdvfb.c:1.9 src/sys/dev/pci/tdvfb.c:1.9.8.1
--- src/sys/dev/pci/tdvfb.c:1.9 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/tdvfb.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tdvfb.c,v 1.9 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: tdvfb.c,v 1.9.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tdvfb.c,v 1.9 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tdvfb.c,v 1.9.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -279,7 +279,7 @@ tdvfb_attach(device_t parent, device_t s
ws_aa.accessops = &tdvfb_accessops;
ws_aa.accesscookie = &sc->vd;
- config_found(sc->sc_dev, &ws_aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dev, &ws_aa, wsemuldisplaydevprint, CFARGS_NONE);
}
static void
Index: src/sys/dev/pci/tga.c
diff -u src/sys/dev/pci/tga.c:1.87 src/sys/dev/pci/tga.c:1.87.8.1
--- src/sys/dev/pci/tga.c:1.87 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/tga.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tga.c,v 1.87 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: tga.c,v 1.87.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.87 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.87.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -508,7 +508,7 @@ tgaattach(device_t parent, device_t self
aa.accessops = &tga_accessops;
aa.accesscookie = sc;
- config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &aa, wsemuldisplaydevprint, CFARGS_NONE);
config_interrupts(self, tga_config_interrupts);
}
Index: src/sys/dev/pci/trm.c
diff -u src/sys/dev/pci/trm.c:1.42 src/sys/dev/pci/trm.c:1.42.8.1
--- src/sys/dev/pci/trm.c:1.42 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/trm.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: trm.c,v 1.42 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: trm.c,v 1.42.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*-
* Copyright (c) 2002 Izumi Tsutsui. All rights reserved.
*
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.42 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.42.8.1 2021/08/04 21:27:00 thorpej Exp $");
/* #define TRM_DEBUG */
#ifdef TRM_DEBUG
@@ -502,7 +502,7 @@ trm_attach(device_t parent, device_t sel
sc->sc_channel.chan_nluns = 8;
sc->sc_channel.chan_id = sc->sc_id;
- config_found(self, &sc->sc_channel, scsiprint, CFARG_EOL);
+ config_found(self, &sc->sc_channel, scsiprint, CFARGS_NONE);
}
/*
Index: src/sys/dev/pci/twa.c
diff -u src/sys/dev/pci/twa.c:1.59 src/sys/dev/pci/twa.c:1.59.8.1
--- src/sys/dev/pci/twa.c:1.59 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/twa.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: twa.c,v 1.59 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: twa.c,v 1.59.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/* $wasabi: twa.c,v 1.27 2006/07/28 18:17:21 wrstuden Exp $ */
/*-
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.59 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.59.8.1 2021/08/04 21:27:00 thorpej Exp $");
//#define TWA_DEBUG
@@ -1010,10 +1010,9 @@ twa_request_bus_scan(device_t self, cons
sc->sc_units[unit].td_dev =
config_found(sc->twa_dv, &twaa, twa_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_IATTR, attr,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .iattr = attr,
+ .locators = locs));
}
} else {
if (td->td_dev != NULL) {
Index: src/sys/dev/pci/twe.c
diff -u src/sys/dev/pci/twe.c:1.109 src/sys/dev/pci/twe.c:1.109.8.1
--- src/sys/dev/pci/twe.c:1.109 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/twe.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: twe.c,v 1.109 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: twe.c,v 1.109.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.109 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.109.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -635,9 +635,8 @@ twe_add_unit(struct twe_softc *sc, int u
locs[TWECF_UNIT] = unit;
td->td_dev = config_found(sc->sc_dev, &twea, twe_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
rv = 0;
out:
Index: src/sys/dev/pci/uhci_pci.c
diff -u src/sys/dev/pci/uhci_pci.c:1.65 src/sys/dev/pci/uhci_pci.c:1.65.8.1
--- src/sys/dev/pci/uhci_pci.c:1.65 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/uhci_pci.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci_pci.c,v 1.65 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: uhci_pci.c,v 1.65.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.65 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.65.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include "ehci.h"
@@ -187,7 +187,7 @@ uhci_pci_attach(device_t parent, device_
/* 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/pci/unichromefb.c
diff -u src/sys/dev/pci/unichromefb.c:1.20 src/sys/dev/pci/unichromefb.c:1.20.8.1
--- src/sys/dev/pci/unichromefb.c:1.20 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/unichromefb.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: unichromefb.c,v 1.20 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: unichromefb.c,v 1.20.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*-
* Copyright (c) 2006, 2008 Jared D. McNeill <[email protected]>
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: unichromefb.c,v 1.20 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: unichromefb.c,v 1.20.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -352,12 +352,10 @@ unichromefb_attach(device_t parent, devi
aa.accesscookie = &sc->sc_vd;
config_found(self, &aa, wsemuldisplaydevprint,
- CFARG_IATTR, "wsemuldisplaydev",
- CFARG_EOL);
+ CFARGS(.iattr = "wsemuldisplaydev"));
config_found(self, opaque, unichromefb_drm_print,
- CFARG_IATTR, "drm",
- CFARG_EOL);
+ CFARGS(.iattr = "drm"));
return;
}
Index: src/sys/dev/pci/vga_pci.c
diff -u src/sys/dev/pci/vga_pci.c:1.57 src/sys/dev/pci/vga_pci.c:1.57.8.1
--- src/sys/dev/pci/vga_pci.c:1.57 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/vga_pci.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_pci.c,v 1.57 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: vga_pci.c,v 1.57.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.57 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.57.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -261,8 +261,7 @@ vga_pci_attach(device_t parent, device_t
if (!pmf_device_register(self, NULL, vga_pci_resume))
aprint_error_dev(self, "couldn't establish power handler\n");
config_found(self, aux, vga_drm_print,
- CFARG_IATTR, "drm",
- CFARG_EOL);
+ CFARGS(.iattr = "drm"));
}
static int
@@ -271,8 +270,7 @@ vga_pci_rescan(device_t self, const char
struct vga_pci_softc *psc = device_private(self);
config_found(self, &psc->sc_paa, vga_drm_print,
- CFARG_IATTR, "drm",
- CFARG_EOL);
+ CFARGS(.iattr = "drm"));
return 0;
}
Index: src/sys/dev/pci/virtio_pci.c
diff -u src/sys/dev/pci/virtio_pci.c:1.29 src/sys/dev/pci/virtio_pci.c:1.29.8.1
--- src/sys/dev/pci/virtio_pci.c:1.29 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/virtio_pci.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_pci.c,v 1.29 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: virtio_pci.c,v 1.29.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio_pci.c,v 1.29 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_pci.c,v 1.29.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -289,7 +289,7 @@ virtio_pci_rescan(device_t self, const c
memset(&va, 0, sizeof(va));
va.sc_childdevid = sc->sc_childdevid;
- config_found(self, &va, NULL, CFARG_EOL);
+ config_found(self, &va, NULL, CFARGS_NONE);
if (virtio_attach_failed(sc))
return 0;
Index: src/sys/dev/pci/xhci_pci.c
diff -u src/sys/dev/pci/xhci_pci.c:1.29 src/sys/dev/pci/xhci_pci.c:1.29.8.1
--- src/sys/dev/pci/xhci_pci.c:1.29 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/xhci_pci.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci_pci.c,v 1.29 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: xhci_pci.c,v 1.29.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/* OpenBSD: xhci_pci.c,v 1.4 2014/07/12 17:38:51 yuo Exp */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.29 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.29.8.1 2021/08/04 21:27:00 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_xhci_pci.h"
@@ -287,10 +287,10 @@ xhci_pci_attach(device_t parent, device_
aprint_error_dev(self, "couldn't establish power handler\n");
/* Attach usb buses. */
- sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARG_EOL);
+ sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARGS_NONE);
sc->sc_child2 = config_found(self, &sc->sc_bus2, usbctlprint,
- CFARG_EOL);
+ CFARGS_NONE);
return;
Index: src/sys/dev/pci/xmm7360.c
diff -u src/sys/dev/pci/xmm7360.c:1.8 src/sys/dev/pci/xmm7360.c:1.8.2.1
--- src/sys/dev/pci/xmm7360.c:1.8 Fri Jul 16 12:20:01 2021
+++ src/sys/dev/pci/xmm7360.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xmm7360.c,v 1.8 2021/07/16 12:20:01 andvar Exp $ */
+/* $NetBSD: xmm7360.c,v 1.8.2.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Device driver for Intel XMM7360 LTE modems, eg. Fibocom L850-GL.
@@ -75,7 +75,7 @@ MODULE_DEVICE_TABLE(pci, xmm7360_ids);
#include "opt_gateway.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xmm7360.c,v 1.8 2021/07/16 12:20:01 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xmm7360.c,v 1.8.2.1 2021/08/04 21:27:00 thorpej Exp $");
#endif
#include <sys/param.h>
@@ -2139,7 +2139,7 @@ wwanc_attach_finish(struct device *self)
struct wwanc_attach_args wa;
memset(&wa, 0, sizeof(wa));
wa.aa_type = WWMC_TYPE_NET;
- sc->sc_net = config_found(self, &wa, wwancprint, CFARG_EOL);
+ sc->sc_net = config_found(self, &wa, wwancprint, CFARGS_NONE);
}
static void
Index: src/sys/dev/pci/yds.c
diff -u src/sys/dev/pci/yds.c:1.67 src/sys/dev/pci/yds.c:1.67.8.1
--- src/sys/dev/pci/yds.c:1.67 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/yds.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: yds.c,v 1.67 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: yds.c,v 1.67.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 2000, 2001 Kazuki Sakamoto and Minoura Makoto.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.67 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.67.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include "mpu.h"
@@ -592,7 +592,7 @@ yds_configure_legacy(device_t self)
aa.type = AUDIODEV_TYPE_OPL;
aa.hwif = aa.hdl = NULL;
- dev = config_found(self, &aa, audioprint, CFARG_EOL);
+ dev = config_found(self, &aa, audioprint, CFARGS_NONE);
if (dev == 0)
bus_space_unmap(sc->sc_opl_iot,
sc->sc_opl_ioh, 4);
@@ -628,7 +628,7 @@ yds_configure_legacy(device_t self)
aa.type = AUDIODEV_TYPE_MPU;
aa.hwif = aa.hdl = NULL;
- dev = config_found(self, &aa, audioprint, CFARG_EOL);
+ dev = config_found(self, &aa, audioprint, CFARGS_NONE);
if (dev == 0)
bus_space_unmap(sc->sc_mpu_iot,
sc->sc_mpu_ioh, 2);
Index: src/sys/dev/pci/cxgb/cxgb_main.c
diff -u src/sys/dev/pci/cxgb/cxgb_main.c:1.9 src/sys/dev/pci/cxgb/cxgb_main.c:1.9.8.1
--- src/sys/dev/pci/cxgb/cxgb_main.c:1.9 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/cxgb/cxgb_main.c Wed Aug 4 21:27:00 2021
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cxgb_main.c,v 1.9 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxgb_main.c,v 1.9.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -469,9 +469,8 @@ cxgb_controller_attach(device_t parent,
locs[1] = i;
printf("\n"); // for cleaner formatting in dmesg
child = config_found(dev, &cxgb_args, cxgb_cfprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
printf("\n"); // for cleaner formatting in dmesg
sc->portdev[i] = child;
}
Index: src/sys/dev/pci/igma/igmafb.c
diff -u src/sys/dev/pci/igma/igmafb.c:1.3 src/sys/dev/pci/igma/igmafb.c:1.3.8.1
--- src/sys/dev/pci/igma/igmafb.c:1.3 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/igma/igmafb.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: igmafb.c,v 1.3 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: igmafb.c,v 1.3.8.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 2012 Michael van Elst
@@ -21,7 +21,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igmafb.c,v 1.3 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igmafb.c,v 1.3.8.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -203,7 +203,7 @@ igmafb_attach(device_t parent, device_t
waa.accessops = &igmafb_accessops;
waa.accesscookie = &sc->vd;
- config_found(sc->sc_dev, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dev, &waa, wsemuldisplaydevprint, CFARGS_NONE);
}
/*
Index: src/sys/dev/pci/voyager/voyagerfb.c
diff -u src/sys/dev/pci/voyager/voyagerfb.c:1.32 src/sys/dev/pci/voyager/voyagerfb.c:1.32.4.1
--- src/sys/dev/pci/voyager/voyagerfb.c:1.32 Fri May 21 20:23:35 2021
+++ src/sys/dev/pci/voyager/voyagerfb.c Wed Aug 4 21:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: voyagerfb.c,v 1.32 2021/05/21 20:23:35 macallan Exp $ */
+/* $NetBSD: voyagerfb.c,v 1.32.4.1 2021/08/04 21:27:00 thorpej Exp $ */
/*
* Copyright (c) 2009, 2011 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: voyagerfb.c,v 1.32 2021/05/21 20:23:35 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voyagerfb.c,v 1.32.4.1 2021/08/04 21:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -364,8 +364,7 @@ voyagerfb_attach(device_t parent, device
aa.accesscookie = &sc->vd;
config_found(sc->sc_dev, &aa, wsemuldisplaydevprint,
- CFARG_IATTR, "wsemuldisplaydev",
- CFARG_EOL);
+ CFARGS(.iattr = "wsemuldisplaydev"));
}
static int
