Module Name: src
Committed By: thorpej
Date: Wed Aug 4 20:14:42 UTC 2021
Modified Files:
src/sys/dev/ic [thorpej-cfargs2]: aac.c adv.c adw.c aha.c
ahcisata_core.c aic6360.c aic79xx_osm.c aic7xxx_osm.c apple_smc.c
atppc.c bha.c cac.c ciss.c cpc700.c ct65550.c depca.c dpt.c
dwc_mmc.c esiop.c gcscpcib.c i82365.c icp.c icpsp.c igsfb.c iha.c
isp_netbsd.c mb89352.c mfi.c mlx.c mpt_netbsd.c mvsata.c
ncr5380sbc.c ncr53c9x.c ninjascsi32.c nvme.c oosiop.c osiop.c
pca9564.c pcf8584.c pl061.c pl181.c rtsx.c siisata.c siop.c
sl811hs.c spic.c ssdfb.c sti.c sunscpal.c tcic2.c uha.c vga.c
vga_raster.c w83l518d_sdmmc.c wd33c93.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/dev/ic/aac.c src/sys/dev/ic/uha.c
cvs rdiff -u -r1.51 -r1.51.8.1 src/sys/dev/ic/adv.c src/sys/dev/ic/ciss.c
cvs rdiff -u -r1.58 -r1.58.2.1 src/sys/dev/ic/adw.c
cvs rdiff -u -r1.64 -r1.64.8.1 src/sys/dev/ic/aha.c src/sys/dev/ic/mfi.c
cvs rdiff -u -r1.99 -r1.99.2.1 src/sys/dev/ic/ahcisata_core.c
cvs rdiff -u -r1.103 -r1.103.8.1 src/sys/dev/ic/aic6360.c
cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/dev/ic/aic79xx_osm.c \
src/sys/dev/ic/icp.c
cvs rdiff -u -r1.40 -r1.40.8.1 src/sys/dev/ic/aic7xxx_osm.c \
src/sys/dev/ic/tcic2.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/dev/ic/apple_smc.c
cvs rdiff -u -r1.38 -r1.38.8.1 src/sys/dev/ic/atppc.c \
src/sys/dev/ic/mpt_netbsd.c
cvs rdiff -u -r1.78 -r1.78.8.1 src/sys/dev/ic/bha.c
cvs rdiff -u -r1.62 -r1.62.8.1 src/sys/dev/ic/cac.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/dev/ic/cpc700.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/dev/ic/ct65550.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/dev/ic/depca.c \
src/sys/dev/ic/pcf8584.c
cvs rdiff -u -r1.76 -r1.76.8.1 src/sys/dev/ic/dpt.c
cvs rdiff -u -r1.27 -r1.27.8.1 src/sys/dev/ic/dwc_mmc.c \
src/sys/dev/ic/icpsp.c src/sys/dev/ic/ninjascsi32.c
cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/dev/ic/esiop.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/dev/ic/gcscpcib.c \
src/sys/dev/ic/pca9564.c
cvs rdiff -u -r1.117 -r1.117.8.1 src/sys/dev/ic/i82365.c
cvs rdiff -u -r1.59 -r1.59.8.1 src/sys/dev/ic/igsfb.c \
src/sys/dev/ic/mb89352.c src/sys/dev/ic/mvsata.c
cvs rdiff -u -r1.44 -r1.44.8.1 src/sys/dev/ic/iha.c
cvs rdiff -u -r1.97 -r1.97.8.1 src/sys/dev/ic/isp_netbsd.c
cvs rdiff -u -r1.69 -r1.69.8.1 src/sys/dev/ic/mlx.c
cvs rdiff -u -r1.68 -r1.68.8.1 src/sys/dev/ic/ncr5380sbc.c
cvs rdiff -u -r1.154 -r1.154.8.1 src/sys/dev/ic/ncr53c9x.c
cvs rdiff -u -r1.57 -r1.57.4.1 src/sys/dev/ic/nvme.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/dev/ic/oosiop.c
cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/dev/ic/osiop.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/dev/ic/pl061.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/dev/ic/pl181.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/dev/ic/rtsx.c \
src/sys/dev/ic/w83l518d_sdmmc.c
cvs rdiff -u -r1.47 -r1.47.8.1 src/sys/dev/ic/siisata.c
cvs rdiff -u -r1.101 -r1.101.8.1 src/sys/dev/ic/siop.c
cvs rdiff -u -r1.105 -r1.105.8.1 src/sys/dev/ic/sl811hs.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/dev/ic/spic.c
cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/dev/ic/ssdfb.c
cvs rdiff -u -r1.30 -r1.30.8.1 src/sys/dev/ic/sti.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/dev/ic/sunscpal.c
cvs rdiff -u -r1.119 -r1.119.8.1 src/sys/dev/ic/vga.c
cvs rdiff -u -r1.49 -r1.49.8.1 src/sys/dev/ic/vga_raster.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/dev/ic/wd33c93.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/ic/aac.c
diff -u src/sys/dev/ic/aac.c:1.48 src/sys/dev/ic/aac.c:1.48.8.1
--- src/sys/dev/ic/aac.c:1.48 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/aac.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: aac.c,v 1.48 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: aac.c,v 1.48.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aac.c,v 1.48 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aac.c,v 1.48.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -211,9 +211,8 @@ aac_devscan(struct aac_softc *sc)
locs[AACCF_UNIT] = i;
config_found(sc->sc_dv, &aaca, aac_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
return 0;
}
Index: src/sys/dev/ic/uha.c
diff -u src/sys/dev/ic/uha.c:1.48 src/sys/dev/ic/uha.c:1.48.8.1
--- src/sys/dev/ic/uha.c:1.48 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/uha.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uha.c,v 1.48 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: uha.c,v 1.48.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uha.c,v 1.48 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uha.c,v 1.48.8.1 2021/08/04 20:14:42 thorpej Exp $");
#undef UHADEBUG
#ifdef DDB
@@ -191,7 +191,7 @@ uha_attach(struct uha_softc *sc, struct
/*
* ask the adapter what subunits are present
*/
- config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARG_EOL);
+ config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARGS_NONE);
}
integrate void
Index: src/sys/dev/ic/adv.c
diff -u src/sys/dev/ic/adv.c:1.51 src/sys/dev/ic/adv.c:1.51.8.1
--- src/sys/dev/ic/adv.c:1.51 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/adv.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: adv.c,v 1.51 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: adv.c,v 1.51.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Generic driver for the Advanced Systems Inc. Narrow SCSI controllers
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adv.c,v 1.51 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv.c,v 1.51.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -487,7 +487,7 @@ adv_attach(ASC_SOFTC *sc)
adapt->adapt_openings = i;
adapt->adapt_max_periph = adapt->adapt_openings;
- sc->sc_child = config_found(sc->sc_dev, chan, scsiprint, CFARG_EOL);
+ sc->sc_child = config_found(sc->sc_dev, chan, scsiprint, CFARGS_NONE);
}
int
Index: src/sys/dev/ic/ciss.c
diff -u src/sys/dev/ic/ciss.c:1.51 src/sys/dev/ic/ciss.c:1.51.8.1
--- src/sys/dev/ic/ciss.c:1.51 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/ciss.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ciss.c,v 1.51 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: ciss.c,v 1.51.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/* $OpenBSD: ciss.c,v 1.68 2013/05/30 16:15:02 deraadt Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.51 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.51.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include "bio.h"
@@ -472,7 +472,7 @@ ciss_attach(struct ciss_softc *sc)
sc->sc_adapter.adapt_minphys = cissminphys;
sc->sc_adapter.adapt_ioctl = ciss_scsi_ioctl;
sc->sc_adapter.adapt_nchannels = 1;
- config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARG_EOL);
+ config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARGS_NONE);
#if 0
sc->sc_link_raw.adapter_softc = sc;
@@ -480,7 +480,7 @@ ciss_attach(struct ciss_softc *sc)
sc->sc_link_raw.adapter = &ciss_raw_switch;
sc->sc_link_raw.adapter_target = sc->ndrives;
sc->sc_link_raw.adapter_buswidth = sc->ndrives;
- config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARG_EOL);
+ config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARGS_NONE);
#endif
#if NBIO > 0
Index: src/sys/dev/ic/adw.c
diff -u src/sys/dev/ic/adw.c:1.58 src/sys/dev/ic/adw.c:1.58.2.1
--- src/sys/dev/ic/adw.c:1.58 Sat Jul 24 21:31:37 2021
+++ src/sys/dev/ic/adw.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: adw.c,v 1.58 2021/07/24 21:31:37 andvar Exp $ */
+/* $NetBSD: adw.c,v 1.58.2.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Generic driver for the Advanced Systems Inc. SCSI controllers
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adw.c,v 1.58 2021/07/24 21:31:37 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adw.c,v 1.58.2.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -516,7 +516,7 @@ adw_attach(ADW_SOFTC *sc)
chan->chan_nluns = 8;
chan->chan_id = sc->chip_scsi_id;
- config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARG_EOL);
+ config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARGS_NONE);
}
Index: src/sys/dev/ic/aha.c
diff -u src/sys/dev/ic/aha.c:1.64 src/sys/dev/ic/aha.c:1.64.8.1
--- src/sys/dev/ic/aha.c:1.64 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/aha.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: aha.c,v 1.64 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: aha.c,v 1.64.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aha.c,v 1.64 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aha.c,v 1.64.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include "opt_ddb.h"
@@ -278,7 +278,7 @@ aha_attach(struct aha_softc *sc, struct
/*
* ask the adapter what subunits are present
*/
- config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARG_EOL);
+ config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARGS_NONE);
}
static void
Index: src/sys/dev/ic/mfi.c
diff -u src/sys/dev/ic/mfi.c:1.64 src/sys/dev/ic/mfi.c:1.64.8.1
--- src/sys/dev/ic/mfi.c:1.64 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/mfi.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi.c,v 1.64 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: mfi.c,v 1.64.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
/*
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.64 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.64.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include "bio.h"
@@ -909,7 +909,7 @@ mfi_rescan(device_t self, const char *if
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/ic/ahcisata_core.c
diff -u src/sys/dev/ic/ahcisata_core.c:1.99 src/sys/dev/ic/ahcisata_core.c:1.99.2.1
--- src/sys/dev/ic/ahcisata_core.c:1.99 Wed Jun 23 00:56:41 2021
+++ src/sys/dev/ic/ahcisata_core.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_core.c,v 1.99 2021/06/23 00:56:41 mrg Exp $ */
+/* $NetBSD: ahcisata_core.c,v 1.99.2.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.99 2021/06/23 00:56:41 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.99.2.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/types.h>
#include <sys/malloc.h>
@@ -1817,8 +1817,7 @@ ahci_atapibus_attach(struct atabus_softc
chan->chan_ntargets = 1;
chan->chan_nluns = 1;
chp->atapibus = config_found(ata_sc->sc_dev, chan, atapiprint,
- CFARG_IATTR, "atapi",
- CFARG_EOL);
+ CFARGS(.iattr = "atapi"));
}
static void
Index: src/sys/dev/ic/aic6360.c
diff -u src/sys/dev/ic/aic6360.c:1.103 src/sys/dev/ic/aic6360.c:1.103.8.1
--- src/sys/dev/ic/aic6360.c:1.103 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/aic6360.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: aic6360.c,v 1.103 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: aic6360.c,v 1.103.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Charles M. Hannum. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic6360.c,v 1.103 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic6360.c,v 1.103.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include "opt_ddb.h"
@@ -294,7 +294,7 @@ aicattach(struct aic_softc *sc)
* Ask the adapter what subunits are present
*/
sc->sc_child = config_found(sc->sc_dev, &sc->sc_channel, scsiprint,
- CFARG_EOL);
+ CFARGS_NONE);
scsipi_adapter_delref(adapt);
}
Index: src/sys/dev/ic/aic79xx_osm.c
diff -u src/sys/dev/ic/aic79xx_osm.c:1.35 src/sys/dev/ic/aic79xx_osm.c:1.35.8.1
--- src/sys/dev/ic/aic79xx_osm.c:1.35 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/aic79xx_osm.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx_osm.c,v 1.35 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: aic79xx_osm.c,v 1.35.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Bus independent NetBSD shim for the aic7xxx based adaptec SCSI controllers
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic79xx_osm.c,v 1.35 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic79xx_osm.c,v 1.35.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <dev/ic/aic79xx_osm.h>
#include <dev/ic/aic79xx_inline.h>
@@ -101,7 +101,7 @@ ahd_attach(struct ahd_softc *ahd)
ahd->sc_channel.chan_flags |= SCSIPI_CHAN_CANGROW;
ahd->sc_child = config_found(ahd->sc_dev, &ahd->sc_channel, scsiprint,
- CFARG_EOL);
+ CFARGS_NONE);
ahd_intr_enable(ahd, TRUE);
Index: src/sys/dev/ic/icp.c
diff -u src/sys/dev/ic/icp.c:1.35 src/sys/dev/ic/icp.c:1.35.8.1
--- src/sys/dev/ic/icp.c:1.35 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/icp.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: icp.c,v 1.35 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: icp.c,v 1.35.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icp.c,v 1.35 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icp.c,v 1.35.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -366,9 +366,8 @@ icp_init(struct icp_softc *icp, const ch
icp->icp_children[icpa.icpa_unit] =
config_found(icp->icp_dv, &icpa, icp_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
}
@@ -386,9 +385,8 @@ icp_init(struct icp_softc *icp, const ch
icp->icp_children[icpa.icpa_unit] =
config_found(icp->icp_dv, &icpa, icp_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
}
@@ -514,9 +512,8 @@ icp_rescan(struct icp_softc *icp, int un
icp->icp_children[unit] =
config_found(icp->icp_dv, &icpa, icp_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
icp_recompute_openings(icp);
Index: src/sys/dev/ic/aic7xxx_osm.c
diff -u src/sys/dev/ic/aic7xxx_osm.c:1.40 src/sys/dev/ic/aic7xxx_osm.c:1.40.8.1
--- src/sys/dev/ic/aic7xxx_osm.c:1.40 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/aic7xxx_osm.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx_osm.c,v 1.40 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: aic7xxx_osm.c,v 1.40.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Bus independent FreeBSD shim for the aic7xxx based adaptec SCSI controllers
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic7xxx_osm.c,v 1.40 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic7xxx_osm.c,v 1.40.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <dev/ic/aic7xxx_osm.h>
#include <dev/ic/aic7xxx_inline.h>
@@ -110,16 +110,16 @@ ahc_attach(struct ahc_softc *ahc)
if ((ahc->flags & AHC_PRIMARY_CHANNEL) == 0) {
ahc->sc_child = config_found(ahc->sc_dev,
- &ahc->sc_channel, scsiprint, CFARG_EOL);
+ &ahc->sc_channel, scsiprint, CFARGS_NONE);
if (ahc->features & AHC_TWIN)
ahc->sc_child_b = config_found(ahc->sc_dev,
- &ahc->sc_channel_b, scsiprint, CFARG_EOL);
+ &ahc->sc_channel_b, scsiprint, CFARGS_NONE);
} else {
if (ahc->features & AHC_TWIN)
ahc->sc_child = config_found(ahc->sc_dev,
- &ahc->sc_channel_b, scsiprint, CFARG_EOL);
+ &ahc->sc_channel_b, scsiprint, CFARGS_NONE);
ahc->sc_child_b = config_found(ahc->sc_dev,
- &ahc->sc_channel, scsiprint, CFARG_EOL);
+ &ahc->sc_channel, scsiprint, CFARGS_NONE);
}
ahc_intr_enable(ahc, TRUE);
Index: src/sys/dev/ic/tcic2.c
diff -u src/sys/dev/ic/tcic2.c:1.40 src/sys/dev/ic/tcic2.c:1.40.8.1
--- src/sys/dev/ic/tcic2.c:1.40 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/tcic2.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tcic2.c,v 1.40 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: tcic2.c,v 1.40.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 1998, 1999 Christoph Badura. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.40 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.40.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -417,9 +417,8 @@ tcic_attach_socket(struct tcic_handle *h
locs[PCMCIABUSCF_SOCKET] = h->sock;
h->pcmcia = config_found(h->sc->sc_dev, &paa, tcic_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
/* if there's actually a pcmcia device attached, initialize the slot */
Index: src/sys/dev/ic/apple_smc.c
diff -u src/sys/dev/ic/apple_smc.c:1.7 src/sys/dev/ic/apple_smc.c:1.7.8.1
--- src/sys/dev/ic/apple_smc.c:1.7 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/apple_smc.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: apple_smc.c,v 1.7 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: apple_smc.c,v 1.7.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Apple System Management Controller
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apple_smc.c,v 1.7 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apple_smc.c,v 1.7.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -109,8 +109,7 @@ apple_smc_rescan(struct apple_smc_tag *s
/* Let autoconf(9) do the work of finding new children. */
config_search(smc->smc_dev, smc,
- CFARG_SEARCH, apple_smc_search,
- CFARG_EOL);
+ CFARGS(.search = apple_smc_search));
return 0;
}
@@ -151,8 +150,7 @@ apple_smc_search(device_t parent, cfdata
/* Looks hunky-dory. Attach. */
asa.asa_smc = smc;
config_attach(parent, cf, &asa, NULL,
- CFARG_LOCATORS, locators,
- CFARG_EOL);
+ CFARGS(.locators = locators));
return 0;
}
Index: src/sys/dev/ic/atppc.c
diff -u src/sys/dev/ic/atppc.c:1.38 src/sys/dev/ic/atppc.c:1.38.8.1
--- src/sys/dev/ic/atppc.c:1.38 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/atppc.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc.c,v 1.38 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: atppc.c,v 1.38.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 2001 Alcove - Nicolas Souchu
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc.c,v 1.38 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc.c,v 1.38.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include "opt_atppc.h"
@@ -235,7 +235,7 @@ atppc_sc_attach(struct atppc_softc *lsc)
/* Configure child of the device. */
lsc->child = config_found(lsc->sc_dev, &(sc_parport_adapter),
- atppc_print, CFARG_EOL);
+ atppc_print, CFARGS_NONE);
return;
}
Index: src/sys/dev/ic/mpt_netbsd.c
diff -u src/sys/dev/ic/mpt_netbsd.c:1.38 src/sys/dev/ic/mpt_netbsd.c:1.38.8.1
--- src/sys/dev/ic/mpt_netbsd.c:1.38 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/mpt_netbsd.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mpt_netbsd.c,v 1.38 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: mpt_netbsd.c,v 1.38.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpt_netbsd.c,v 1.38 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpt_netbsd.c,v 1.38.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include "bio.h"
@@ -158,7 +158,7 @@ mpt_scsipi_attach(mpt_softc_t *mpt)
* errors
*/
mpt->sc_scsibus_dv = config_found(mpt->sc_dev, &mpt->sc_channel,
- scsiprint, CFARG_EOL);
+ scsiprint, CFARGS_NONE);
#if NBIO > 0
if (mpt_is_raid(mpt)) {
Index: src/sys/dev/ic/bha.c
diff -u src/sys/dev/ic/bha.c:1.78 src/sys/dev/ic/bha.c:1.78.8.1
--- src/sys/dev/ic/bha.c:1.78 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/bha.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bha.c,v 1.78 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: bha.c,v 1.78.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bha.c,v 1.78 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bha.c,v 1.78.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include "opt_ddb.h"
@@ -200,7 +200,7 @@ bha_attach(struct bha_softc *sc)
if (bha_init(sc) != 0)
return;
- (void) config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARG_EOL);
+ (void) config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARGS_NONE);
}
/*
Index: src/sys/dev/ic/cac.c
diff -u src/sys/dev/ic/cac.c:1.62 src/sys/dev/ic/cac.c:1.62.8.1
--- src/sys/dev/ic/cac.c:1.62 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/cac.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cac.c,v 1.62 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: cac.c,v 1.62.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2006, 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cac.c,v 1.62 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cac.c,v 1.62.8.1 2021/08/04 20:14:42 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include "bio.h"
@@ -233,9 +233,8 @@ cac_rescan(device_t self, const char *at
mlocs[CACCF_UNIT] = i;
if (config_found(self, &caca, cac_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, mlocs,
- CFARG_EOL) != NULL)
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = mlocs)) != NULL)
sc->sc_unitmask |= 1 << i;
}
return 0;
Index: src/sys/dev/ic/cpc700.c
diff -u src/sys/dev/ic/cpc700.c:1.22 src/sys/dev/ic/cpc700.c:1.22.8.1
--- src/sys/dev/ic/cpc700.c:1.22 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/cpc700.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cpc700.c,v 1.22 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: cpc700.c,v 1.22.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpc700.c,v 1.22 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpc700.c,v 1.22.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include "pci.h"
#include "opt_pci.h"
@@ -171,9 +171,8 @@ cpc_attach(device_t self, pci_chipset_ta
aa.cba.cpca_addr = devs[i].addr;
aa.cba.cpca_irq = devs[i].irq;
config_found(self, &aa.cba, cpc_print,
- CFARG_SUBMATCH, cpc_submatch,
- CFARG_IATTR, "cpcbus",
- CFARG_EOL);
+ CFARGS(.submatch = cpc_submatch,
+ .iattr = "cpcbus"));
}
tag = pci_make_tag(pc, 0, 0, 0);
@@ -209,8 +208,7 @@ cpc_attach(device_t self, pci_chipset_ta
#endif
config_found(self, &aa.pba, pcibusprint,
- CFARG_IATTR, "pcibus",
- CFARG_EOL);
+ CFARGS(.iattr = "pcibus"));
/* Restore error triggers, and clear errors */
pci_conf_write(pc, tag, CPC_PCI_BRDGERR, erren | CPC_PCI_CLEARERR);
Index: src/sys/dev/ic/ct65550.c
diff -u src/sys/dev/ic/ct65550.c:1.14 src/sys/dev/ic/ct65550.c:1.14.8.1
--- src/sys/dev/ic/ct65550.c:1.14 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/ct65550.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ct65550.c,v 1.14 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: ct65550.c,v 1.14.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 2006 Michael Lorenz
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ct65550.c,v 1.14 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ct65550.c,v 1.14.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -307,7 +307,7 @@ chipsfb_do_attach(struct chipsfb_softc *
aa.accessops = &chipsfb_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/ic/depca.c
diff -u src/sys/dev/ic/depca.c:1.18 src/sys/dev/ic/depca.c:1.18.8.1
--- src/sys/dev/ic/depca.c:1.18 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/depca.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: depca.c,v 1.18 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: depca.c,v 1.18.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: depca.c,v 1.18 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: depca.c,v 1.18.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -121,7 +121,7 @@ depca_attach(struct depca_softc *sc)
da.da_name = "le";
- (void)config_found(sc->sc_dev, &da, depca_print, CFARG_EOL);
+ (void)config_found(sc->sc_dev, &da, depca_print, CFARGS_NONE);
}
int
Index: src/sys/dev/ic/pcf8584.c
diff -u src/sys/dev/ic/pcf8584.c:1.18 src/sys/dev/ic/pcf8584.c:1.18.8.1
--- src/sys/dev/ic/pcf8584.c:1.18 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/pcf8584.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pcf8584.c,v 1.18 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: pcf8584.c,v 1.18.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/* $OpenBSD: pcf8584.c,v 1.9 2007/10/20 18:46:21 kettenis Exp $ */
/*
@@ -99,7 +99,7 @@ pcfiic_attach(struct pcfiic_softc *sc, i
bzero(&iba, 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);
}
int
Index: src/sys/dev/ic/dpt.c
diff -u src/sys/dev/ic/dpt.c:1.76 src/sys/dev/ic/dpt.c:1.76.8.1
--- src/sys/dev/ic/dpt.c:1.76 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/dpt.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dpt.c,v 1.76 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: dpt.c,v 1.76.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.76 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.76.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -491,7 +491,7 @@ dpt_init(struct dpt_softc *sc, const cha
chan->chan_ntargets = maxtarget + 1;
chan->chan_nluns = ec->ec_maxlun + 1;
chan->chan_id = sc->sc_hbaid[i];
- config_found(sc->sc_dev, chan, scsiprint, CFARG_EOL);
+ config_found(sc->sc_dev, chan, scsiprint, CFARGS_NONE);
}
}
Index: src/sys/dev/ic/dwc_mmc.c
diff -u src/sys/dev/ic/dwc_mmc.c:1.27 src/sys/dev/ic/dwc_mmc.c:1.27.8.1
--- src/sys/dev/ic/dwc_mmc.c:1.27 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/dwc_mmc.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_mmc.c,v 1.27 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: dwc_mmc.c,v 1.27.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc_mmc.c,v 1.27 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_mmc.c,v 1.27.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -192,7 +192,7 @@ dwc_mmc_attach_i(device_t self)
if (sc->sc_card_detect)
saa.saa_caps |= SMC_CAPS_POLL_CARD_DET;
- sc->sc_sdmmc_dev = config_found(self, &saa, NULL, CFARG_EOL);
+ sc->sc_sdmmc_dev = config_found(self, &saa, NULL, CFARGS_NONE);
}
static void
Index: src/sys/dev/ic/icpsp.c
diff -u src/sys/dev/ic/icpsp.c:1.27 src/sys/dev/ic/icpsp.c:1.27.8.1
--- src/sys/dev/ic/icpsp.c:1.27 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/icpsp.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: icpsp.c,v 1.27 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: icpsp.c,v 1.27.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icpsp.c,v 1.27 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icpsp.c,v 1.27.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -123,7 +123,7 @@ icpsp_attach(device_t parent, device_t s
sc->sc_channel.chan_id = icp->icp_bus_id[sc->sc_busno];
sc->sc_channel.chan_flags = SCSIPI_CHAN_NOSETTLE;
- config_found(self, &sc->sc_channel, scsiprint, CFARG_EOL);
+ config_found(self, &sc->sc_channel, scsiprint, CFARGS_NONE);
}
void
Index: src/sys/dev/ic/ninjascsi32.c
diff -u src/sys/dev/ic/ninjascsi32.c:1.27 src/sys/dev/ic/ninjascsi32.c:1.27.8.1
--- src/sys/dev/ic/ninjascsi32.c:1.27 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/ninjascsi32.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ninjascsi32.c,v 1.27 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: ninjascsi32.c,v 1.27.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*-
* Copyright (c) 2004, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ninjascsi32.c,v 1.27 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ninjascsi32.c,v 1.27.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -667,7 +667,7 @@ njsc32_attach(struct njsc32_softc *sc)
sc->sc_channel.chan_id = NJSC32_INITIATOR_ID;
sc->sc_scsi = config_found(sc->sc_dev, &sc->sc_channel, scsiprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
int
Index: src/sys/dev/ic/esiop.c
diff -u src/sys/dev/ic/esiop.c:1.58 src/sys/dev/ic/esiop.c:1.58.8.1
--- src/sys/dev/ic/esiop.c:1.58 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/esiop.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: esiop.c,v 1.58 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: esiop.c,v 1.58.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 2002 Manuel Bouyer.
@@ -28,7 +28,7 @@
/* SYM53c7/8xx PCI-SCSI I/O Processors driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.58 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.58.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -196,7 +196,7 @@ esiop_attach(struct esiop_softc *sc)
esiop_dump_script(sc);
#endif
- config_found(sc->sc_c.sc_dev, &sc->sc_c.sc_chan, scsiprint, CFARG_EOL);
+ config_found(sc->sc_c.sc_dev, &sc->sc_c.sc_chan, scsiprint, CFARGS_NONE);
}
void
Index: src/sys/dev/ic/gcscpcib.c
diff -u src/sys/dev/ic/gcscpcib.c:1.4 src/sys/dev/ic/gcscpcib.c:1.4.8.1
--- src/sys/dev/ic/gcscpcib.c:1.4 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/gcscpcib.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gcscpcib.c,v 1.4 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: gcscpcib.c,v 1.4.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/* $OpenBSD: gcscpcib.c,v 1.6 2007/11/17 17:02:47 mbalmer Exp $ */
/*
@@ -24,7 +24,7 @@
* AMD CS5535/CS5536 series LPC bridge also containing timer, watchdog and GPIO.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gcscpcib.c,v 1.4 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gcscpcib.c,v 1.4.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include "gpio.h"
@@ -191,8 +191,7 @@ gpio:
/* Attach GPIO framework */
if (gpio)
config_found(self, &gba, gpiobus_print,
- CFARG_IATTR, "gpiobus",
- CFARG_EOL);
+ CFARGS(.iattr = "gpiobus"));
#endif
/* Register Watchdog timer to SMW */
Index: src/sys/dev/ic/pca9564.c
diff -u src/sys/dev/ic/pca9564.c:1.4 src/sys/dev/ic/pca9564.c:1.4.8.1
--- src/sys/dev/ic/pca9564.c:1.4 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/pca9564.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pca9564.c,v 1.4 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: pca9564.c,v 1.4.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 2010 NONAKA Kimihiro <[email protected]>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pca9564.c,v 1.4 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pca9564.c,v 1.4.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -113,7 +113,7 @@ pca9564_attach(struct pca9564_softc *sc)
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/ic/i82365.c
diff -u src/sys/dev/ic/i82365.c:1.117 src/sys/dev/ic/i82365.c:1.117.8.1
--- src/sys/dev/ic/i82365.c:1.117 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/i82365.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365.c,v 1.117 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: i82365.c,v 1.117.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 2004 Charles M. Hannum. All rights reserved.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.117 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.117.8.1 2021/08/04 20:14:42 thorpej Exp $");
#define PCICDEBUG
@@ -412,9 +412,8 @@ pcic_attach_socket(struct pcic_handle *h
locs[PCMCIABUSCF_SOCKET] = h->socket;
h->pcmcia = config_found(sc->dev, &paa, pcic_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
if (h->pcmcia == NULL) {
h->flags &= ~PCIC_FLAG_SOCKETP;
return;
Index: src/sys/dev/ic/igsfb.c
diff -u src/sys/dev/ic/igsfb.c:1.59 src/sys/dev/ic/igsfb.c:1.59.8.1
--- src/sys/dev/ic/igsfb.c:1.59 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/igsfb.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: igsfb.c,v 1.59 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: igsfb.c,v 1.59.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 2002, 2003 Valeriy E. Ushakov
@@ -31,7 +31,7 @@
* Integraphics Systems IGA 168x and CyberPro series.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igsfb.c,v 1.59 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igsfb.c,v 1.59.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -215,7 +215,7 @@ igsfb_attach_subr(struct igsfb_softc *sc
waa.accessops = &igsfb_accessops;
waa.accesscookie = &dc->dc_vd;
- config_found(sc->sc_dev, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dev, &waa, wsemuldisplaydevprint, CFARGS_NONE);
}
Index: src/sys/dev/ic/mb89352.c
diff -u src/sys/dev/ic/mb89352.c:1.59 src/sys/dev/ic/mb89352.c:1.59.8.1
--- src/sys/dev/ic/mb89352.c:1.59 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/mb89352.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mb89352.c,v 1.59 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: mb89352.c,v 1.59.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/* NecBSD: mb89352.c,v 1.4 1998/03/14 07:31:20 kmatsuda Exp */
/*-
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb89352.c,v 1.59 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb89352.c,v 1.59.8.1 2021/08/04 20:14:42 thorpej Exp $");
#ifdef DDB
#define integrate
@@ -305,7 +305,7 @@ spc_attach(struct spc_softc *sc)
/*
* ask the adapter what subunits are present
*/
- sc->sc_child = config_found(sc->sc_dev, chan, scsiprint, CFARG_EOL);
+ sc->sc_child = config_found(sc->sc_dev, chan, scsiprint, CFARGS_NONE);
scsipi_adapter_delref(adapt);
}
Index: src/sys/dev/ic/mvsata.c
diff -u src/sys/dev/ic/mvsata.c:1.59 src/sys/dev/ic/mvsata.c:1.59.8.1
--- src/sys/dev/ic/mvsata.c:1.59 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/mvsata.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsata.c,v 1.59 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: mvsata.c,v 1.59.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.59 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.59.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include "opt_mvsata.h"
@@ -742,8 +742,7 @@ mvsata_atapibus_attach(struct atabus_sof
chan->chan_nluns = 1;
chp->atapibus = config_found(ata_sc->sc_dev, chan, atapiprint,
- CFARG_IATTR, "atapi",
- CFARG_EOL);
+ CFARGS(.iattr = "atapi"));
}
static void
Index: src/sys/dev/ic/iha.c
diff -u src/sys/dev/ic/iha.c:1.44 src/sys/dev/ic/iha.c:1.44.8.1
--- src/sys/dev/ic/iha.c:1.44 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/iha.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: iha.c,v 1.44 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: iha.c,v 1.44.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*-
* Copyright (c) 2001, 2002 Izumi Tsutsui
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iha.c,v 1.44 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iha.c,v 1.44.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -615,7 +615,7 @@ iha_attach(struct iha_softc *sc)
/*
* Now try to attach all the sub devices.
*/
- config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARG_EOL);
+ config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARGS_NONE);
}
/*
Index: src/sys/dev/ic/isp_netbsd.c
diff -u src/sys/dev/ic/isp_netbsd.c:1.97 src/sys/dev/ic/isp_netbsd.c:1.97.8.1
--- src/sys/dev/ic/isp_netbsd.c:1.97 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/isp_netbsd.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_netbsd.c,v 1.97 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: isp_netbsd.c,v 1.97.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Platform (NetBSD) dependent common attachment code for Qlogic adapters.
*/
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp_netbsd.c,v 1.97 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_netbsd.c,v 1.97.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <dev/ic/isp_netbsd.h>
#include <dev/ic/isp_ioctl.h>
@@ -178,7 +178,7 @@ isp_config_interrupts(device_t self)
*/
for (i = 0; i < isp->isp_osinfo.adapter.adapt_nchannels; i++) {
config_found(self, &isp->isp_osinfo.chan[i], scsiprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
}
Index: src/sys/dev/ic/mlx.c
diff -u src/sys/dev/ic/mlx.c:1.69 src/sys/dev/ic/mlx.c:1.69.8.1
--- src/sys/dev/ic/mlx.c:1.69 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/mlx.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mlx.c,v 1.69 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: mlx.c,v 1.69.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.69 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.69.8.1 2021/08/04 20:14:42 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include "ld.h"
@@ -628,9 +628,8 @@ mlx_configure(struct mlx_softc *mlx, int
locs[MLXCF_UNIT] = i;
ms->ms_dv = config_found(mlx->mlx_dv, &mlxa, mlx_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
nunits += (ms->ms_dv != NULL);
}
Index: src/sys/dev/ic/ncr5380sbc.c
diff -u src/sys/dev/ic/ncr5380sbc.c:1.68 src/sys/dev/ic/ncr5380sbc.c:1.68.8.1
--- src/sys/dev/ic/ncr5380sbc.c:1.68 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/ncr5380sbc.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr5380sbc.c,v 1.68 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: ncr5380sbc.c,v 1.68.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 1995 David Jones, Gordon W. Ross
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ncr5380sbc.c,v 1.68 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr5380sbc.c,v 1.68.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include "opt_ddb.h"
@@ -2588,7 +2588,7 @@ ncr5380_attach(struct ncr5380_softc *sc)
/*
* Ask the adapter what subunits are present
*/
- (void)config_found(sc->sc_dev, chan, scsiprint, CFARG_EOL);
+ (void)config_found(sc->sc_dev, chan, scsiprint, CFARGS_NONE);
scsipi_adapter_delref(adapt);
}
Index: src/sys/dev/ic/ncr53c9x.c
diff -u src/sys/dev/ic/ncr53c9x.c:1.154 src/sys/dev/ic/ncr53c9x.c:1.154.8.1
--- src/sys/dev/ic/ncr53c9x.c:1.154 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/ncr53c9x.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr53c9x.c,v 1.154 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: ncr53c9x.c,v 1.154.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ncr53c9x.c,v 1.154 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr53c9x.c,v 1.154.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -296,7 +296,7 @@ ncr53c9x_attach(struct ncr53c9x_softc *s
* Now try to attach all the sub-devices
*/
sc->sc_child = config_found(sc->sc_dev, &sc->sc_channel, scsiprint,
- CFARG_EOL);
+ CFARGS_NONE);
scsipi_adapter_delref(adapt);
callout_reset(&sc->sc_watchdog, 60 * hz, ncr53c9x_watch, sc);
Index: src/sys/dev/ic/nvme.c
diff -u src/sys/dev/ic/nvme.c:1.57 src/sys/dev/ic/nvme.c:1.57.4.1
--- src/sys/dev/ic/nvme.c:1.57 Sat May 29 10:48:23 2021
+++ src/sys/dev/ic/nvme.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nvme.c,v 1.57 2021/05/29 10:48:23 riastradh Exp $ */
+/* $NetBSD: nvme.c,v 1.57.4.1 2021/08/04 20:14:42 thorpej Exp $ */
/* $OpenBSD: nvme.c,v 1.49 2016/04/18 05:59:50 dlg Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.57 2021/05/29 10:48:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.57.4.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -523,9 +523,8 @@ nvme_rescan(device_t self, const char *i
naa.naa_typename = sc->sc_modelname;
sc->sc_namespaces[i - 1].dev =
config_found(sc->sc_dev, &naa, nvme_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, mlocs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = mlocs));
}
return 0;
}
Index: src/sys/dev/ic/oosiop.c
diff -u src/sys/dev/ic/oosiop.c:1.17 src/sys/dev/ic/oosiop.c:1.17.8.1
--- src/sys/dev/ic/oosiop.c:1.17 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/oosiop.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: oosiop.c,v 1.17 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: oosiop.c,v 1.17.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 2001 Shuichiro URATA. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oosiop.c,v 1.17 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oosiop.c,v 1.17.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -240,7 +240,7 @@ oosiop_attach(struct oosiop_softc *sc)
/*
* Now try to attach all the sub devices.
*/
- config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARG_EOL);
+ config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARGS_NONE);
}
static int
Index: src/sys/dev/ic/osiop.c
diff -u src/sys/dev/ic/osiop.c:1.42 src/sys/dev/ic/osiop.c:1.42.8.1
--- src/sys/dev/ic/osiop.c:1.42 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/osiop.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: osiop.c,v 1.42 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: osiop.c,v 1.42.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*-
* Copyright (c) 2001 Izumi Tsutsui. All rights reserved.
@@ -95,7 +95,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osiop.c,v 1.42 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osiop.c,v 1.42.8.1 2021/08/04 20:14:42 thorpej Exp $");
/* #define OSIOP_DEBUG */
@@ -329,7 +329,7 @@ osiop_attach(struct osiop_softc *sc)
/*
* Now try to attach all the sub devices.
*/
- config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARG_EOL);
+ config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARGS_NONE);
}
/*
Index: src/sys/dev/ic/pl061.c
diff -u src/sys/dev/ic/pl061.c:1.3 src/sys/dev/ic/pl061.c:1.3.8.1
--- src/sys/dev/ic/pl061.c:1.3 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/pl061.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pl061.c,v 1.3 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: pl061.c,v 1.3.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 2018 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pl061.c,v 1.3 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pl061.c,v 1.3.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -76,7 +76,7 @@ plgpio_attach(struct plgpio_softc *sc)
gba.gba_npins = 8;
#if NGPIO > 0
- config_found(sc->sc_dev, &gba, gpiobus_print, CFARG_EOL);
+ config_found(sc->sc_dev, &gba, gpiobus_print, CFARGS_NONE);
#endif
}
Index: src/sys/dev/ic/pl181.c
diff -u src/sys/dev/ic/pl181.c:1.8 src/sys/dev/ic/pl181.c:1.8.8.1
--- src/sys/dev/ic/pl181.c:1.8 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/pl181.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pl181.c,v 1.8 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: pl181.c,v 1.8.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pl181.c,v 1.8 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pl181.c,v 1.8.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -145,7 +145,7 @@ plmmc_init(struct plmmc_softc *sc)
sc->sc_max_freq / 1000 : sc->sc_clock_freq / 1000;
saa.saa_caps = SMC_CAPS_4BIT_MODE;
- sc->sc_sdmmc_dev = config_found(sc->sc_dev, &saa, NULL, CFARG_EOL);
+ sc->sc_sdmmc_dev = config_found(sc->sc_dev, &saa, NULL, CFARGS_NONE);
}
static int
Index: src/sys/dev/ic/rtsx.c
diff -u src/sys/dev/ic/rtsx.c:1.5 src/sys/dev/ic/rtsx.c:1.5.8.1
--- src/sys/dev/ic/rtsx.c:1.5 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/rtsx.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsx.c,v 1.5 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: rtsx.c,v 1.5.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/* $OpenBSD: rtsx.c,v 1.10 2014/08/19 17:55:03 phessler Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsx.c,v 1.5 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsx.c,v 1.5.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -239,7 +239,7 @@ rtsx_attach(struct rtsx_softc *sc, bus_s
saa.saa_clkmax = 25000;
saa.saa_caps = SMC_CAPS_DMA|SMC_CAPS_4BIT_MODE;
- sc->sc_sdmmc = config_found(sc->sc_dev, &saa, NULL, CFARG_EOL);
+ sc->sc_sdmmc = config_found(sc->sc_dev, &saa, NULL, CFARGS_NONE);
if (sc->sc_sdmmc == NULL)
goto destroy_dmamap_cmd;
Index: src/sys/dev/ic/w83l518d_sdmmc.c
diff -u src/sys/dev/ic/w83l518d_sdmmc.c:1.5 src/sys/dev/ic/w83l518d_sdmmc.c:1.5.8.1
--- src/sys/dev/ic/w83l518d_sdmmc.c:1.5 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/w83l518d_sdmmc.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: w83l518d_sdmmc.c,v 1.5 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: w83l518d_sdmmc.c,v 1.5.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 2009 Jared D. McNeill <[email protected]>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: w83l518d_sdmmc.c,v 1.5 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: w83l518d_sdmmc.c,v 1.5.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -185,7 +185,7 @@ wb_sdmmc_attach(struct wb_softc *wb)
if (!ISSET(wb->wb_quirks, WB_QUIRK_1BIT))
saa.saa_caps = SMC_CAPS_4BIT_MODE;
- wb->wb_sdmmc_dev = config_found(wb->wb_dev, &saa, NULL, CFARG_EOL);
+ wb->wb_sdmmc_dev = config_found(wb->wb_dev, &saa, NULL, CFARGS_NONE);
}
int
Index: src/sys/dev/ic/siisata.c
diff -u src/sys/dev/ic/siisata.c:1.47 src/sys/dev/ic/siisata.c:1.47.8.1
--- src/sys/dev/ic/siisata.c:1.47 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/siisata.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata.c,v 1.47 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: siisata.c,v 1.47.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/* from ahcisata_core.c */
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.47 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.47.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -1546,8 +1546,7 @@ siisata_atapibus_attach(struct atabus_so
chan->chan_nluns = 1;
chp->atapibus = config_found(ata_sc->sc_dev, chan, atapiprint,
- CFARG_IATTR, "atapi",
- CFARG_EOL);
+ CFARGS(.iattr = "atapi"));
}
void
Index: src/sys/dev/ic/siop.c
diff -u src/sys/dev/ic/siop.c:1.101 src/sys/dev/ic/siop.c:1.101.8.1
--- src/sys/dev/ic/siop.c:1.101 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/siop.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: siop.c,v 1.101 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: siop.c,v 1.101.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
@@ -28,7 +28,7 @@
/* SYM53c7/8xx PCI-SCSI I/O Processors driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.101 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.101.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -173,7 +173,7 @@ siop_attach(struct siop_softc *sc)
siop_dump_script(sc);
#endif
- config_found(sc->sc_c.sc_dev, &sc->sc_c.sc_chan, scsiprint, CFARG_EOL);
+ config_found(sc->sc_c.sc_dev, &sc->sc_c.sc_chan, scsiprint, CFARGS_NONE);
}
void
Index: src/sys/dev/ic/sl811hs.c
diff -u src/sys/dev/ic/sl811hs.c:1.105 src/sys/dev/ic/sl811hs.c:1.105.8.1
--- src/sys/dev/ic/sl811hs.c:1.105 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/sl811hs.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hs.c,v 1.105 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: sl811hs.c,v 1.105.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Not (c) 2007 Matthew Orgass
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.105 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.105.8.1 2021/08/04 20:14:42 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_slhci.h"
@@ -1272,7 +1272,7 @@ slhci_attach(struct slhci_softc *sc)
/* Attach usb and uhub. */
sc->sc_child = config_found(SC_DEV(sc), &sc->sc_bus, usbctlprint,
- CFARG_EOL);
+ CFARGS_NONE);
if (!sc->sc_child)
return -1;
Index: src/sys/dev/ic/spic.c
diff -u src/sys/dev/ic/spic.c:1.20 src/sys/dev/ic/spic.c:1.20.8.1
--- src/sys/dev/ic/spic.c:1.20 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/spic.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: spic.c,v 1.20 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: spic.c,v 1.20.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spic.c,v 1.20 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spic.c,v 1.20.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -269,7 +269,7 @@ spic_attach(struct spic_softc *sc)
a.accessops = &spic_accessops;
a.accesscookie = sc;
sc->sc_wsmousedev = config_found(sc->sc_dev, &a, wsmousedevprint,
- CFARG_EOL);
+ CFARGS_NONE);
sc->sc_smpsw[SPIC_PSWITCH_LID].smpsw_name = "spiclid0";
sc->sc_smpsw[SPIC_PSWITCH_LID].smpsw_type = PSWITCH_TYPE_LID;
Index: src/sys/dev/ic/ssdfb.c
diff -u src/sys/dev/ic/ssdfb.c:1.14 src/sys/dev/ic/ssdfb.c:1.14.2.1
--- src/sys/dev/ic/ssdfb.c:1.14 Fri Jul 30 13:44:09 2021
+++ src/sys/dev/ic/ssdfb.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ssdfb.c,v 1.14 2021/07/30 13:44:09 tnn Exp $ */
+/* $NetBSD: ssdfb.c,v 1.14.2.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ssdfb.c,v 1.14 2021/07/30 13:44:09 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ssdfb.c,v 1.14.2.1 2021/08/04 20:14:42 thorpej Exp $");
#include "opt_ddb.h"
@@ -359,7 +359,7 @@ ssdfb_attach(struct ssdfb_softc *sc, int
.accesscookie = sc
};
sc->sc_wsdisplay =
- config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARGS_NONE);
return;
out:
Index: src/sys/dev/ic/sti.c
diff -u src/sys/dev/ic/sti.c:1.30 src/sys/dev/ic/sti.c:1.30.8.1
--- src/sys/dev/ic/sti.c:1.30 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/sti.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sti.c,v 1.30 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: sti.c,v 1.30.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/* $OpenBSD: sti.c,v 1.61 2009/09/05 14:09:35 miod Exp $ */
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.30 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.30.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include "wsdisplay.h"
@@ -767,7 +767,7 @@ sti_end_attach(struct sti_softc *sc)
}
config_found(sc->sc_dev, &waa, wsemuldisplaydevprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
#endif
}
Index: src/sys/dev/ic/sunscpal.c
diff -u src/sys/dev/ic/sunscpal.c:1.28 src/sys/dev/ic/sunscpal.c:1.28.8.1
--- src/sys/dev/ic/sunscpal.c:1.28 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/sunscpal.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunscpal.c,v 1.28 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: sunscpal.c,v 1.28.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 2001 Matthew Fredette
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunscpal.c,v 1.28 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunscpal.c,v 1.28.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include "opt_ddb.h"
@@ -2087,7 +2087,7 @@ sunscpal_attach(struct sunscpal_softc *s
/*
* Ask the adapter what subunits are present
*/
- (void)config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARG_EOL);
+ (void)config_found(sc->sc_dev, &sc->sc_channel, scsiprint, CFARGS_NONE);
scsipi_adapter_delref(&sc->sc_adapter);
}
Index: src/sys/dev/ic/vga.c
diff -u src/sys/dev/ic/vga.c:1.119 src/sys/dev/ic/vga.c:1.119.8.1
--- src/sys/dev/ic/vga.c:1.119 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/vga.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.119 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: vga.c,v 1.119.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.119 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.119.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include "opt_vga.h"
/* for WSCONS_SUPPORT_PCVTFONTS */
@@ -658,8 +658,7 @@ vga_common_attach(struct vga_softc *sc,
aa.accesscookie = vc;
config_found(sc->sc_dev, &aa, wsemuldisplaydevprint,
- CFARG_IATTR, "wsemuldisplaydev",
- CFARG_EOL);
+ CFARGS(.iattr = "wsemuldisplaydev"));
}
int
Index: src/sys/dev/ic/vga_raster.c
diff -u src/sys/dev/ic/vga_raster.c:1.49 src/sys/dev/ic/vga_raster.c:1.49.8.1
--- src/sys/dev/ic/vga_raster.c:1.49 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/vga_raster.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_raster.c,v 1.49 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: vga_raster.c,v 1.49.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002 Bang Jun-Young
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.49 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.49.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include "opt_vga.h"
#include "opt_wsmsgattrs.h" /* for WSDISPLAY_CUSTOM_OUTPUT */
@@ -549,8 +549,7 @@ vga_common_attach(struct vga_softc *sc,
aa.accesscookie = vc;
config_found(sc->sc_dev, &aa, wsemuldisplaydevprint,
- CFARG_IATTR, "wsemuldisplaydev",
- CFARG_EOL);
+ CFARGS(.iattr = "wsemuldisplaydev"));
}
int
Index: src/sys/dev/ic/wd33c93.c
diff -u src/sys/dev/ic/wd33c93.c:1.29 src/sys/dev/ic/wd33c93.c:1.29.8.1
--- src/sys/dev/ic/wd33c93.c:1.29 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/wd33c93.c Wed Aug 4 20:14:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wd33c93.c,v 1.29 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: wd33c93.c,v 1.29.8.1 2021/08/04 20:14:42 thorpej Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd33c93.c,v 1.29 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd33c93.c,v 1.29.8.1 2021/08/04 20:14:42 thorpej Exp $");
#include "opt_ddb.h"
@@ -233,7 +233,7 @@ wd33c93_attach(struct wd33c93_softc *sc)
}
sc->sc_child = config_found(sc->sc_dev, &sc->sc_channel,
- scsiprint, CFARG_EOL);
+ scsiprint, CFARGS_NONE);
scsipi_adapter_delref(&sc->sc_adapter);
}
