Module Name: src
Committed By: thorpej
Date: Wed Aug 4 23:14:04 UTC 2021
Modified Files:
src/sys/dev/pcmcia [thorpej-cfargs2]: fdc_pcmcia.c mhzc.c pcmcia.c
pcmcom.c xirc.c
src/sys/dev/podulebus [thorpej-cfargs2]: acemidi.c
src/sys/dev/ppbus [thorpej-cfargs2]: ppbus_conf.c ppbus_gpio.c
src/sys/dev/qbus [thorpej-cfargs2]: rf.c rl.c uba.c uda.c
src/sys/dev/scsipi [thorpej-cfargs2]: atapi_wdc.c atapiconf.c
scsiconf.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/dev/pcmcia/fdc_pcmcia.c
cvs rdiff -u -r1.53 -r1.53.8.1 src/sys/dev/pcmcia/mhzc.c
cvs rdiff -u -r1.95 -r1.95.8.1 src/sys/dev/pcmcia/pcmcia.c
cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/dev/pcmcia/pcmcom.c
cvs rdiff -u -r1.37 -r1.37.8.1 src/sys/dev/pcmcia/xirc.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/dev/podulebus/acemidi.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/dev/ppbus/ppbus_conf.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/dev/ppbus/ppbus_gpio.c
cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/dev/qbus/rf.c
cvs rdiff -u -r1.52 -r1.52.8.1 src/sys/dev/qbus/rl.c
cvs rdiff -u -r1.82 -r1.82.8.1 src/sys/dev/qbus/uba.c
cvs rdiff -u -r1.62 -r1.62.8.1 src/sys/dev/qbus/uda.c
cvs rdiff -u -r1.139 -r1.139.8.1 src/sys/dev/scsipi/atapi_wdc.c
cvs rdiff -u -r1.92 -r1.92.8.1 src/sys/dev/scsipi/atapiconf.c
cvs rdiff -u -r1.291 -r1.291.8.1 src/sys/dev/scsipi/scsiconf.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/pcmcia/fdc_pcmcia.c
diff -u src/sys/dev/pcmcia/fdc_pcmcia.c:1.21 src/sys/dev/pcmcia/fdc_pcmcia.c:1.21.8.1
--- src/sys/dev/pcmcia/fdc_pcmcia.c:1.21 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/pcmcia/fdc_pcmcia.c Wed Aug 4 23:14:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_pcmcia.c,v 1.21 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: fdc_pcmcia.c,v 1.21.8.1 2021/08/04 23:14:04 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_pcmcia.c,v 1.21 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_pcmcia.c,v 1.21.8.1 2021/08/04 23:14:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -183,7 +183,7 @@ fdc_pcmcia_attach(device_t parent, devic
fa.fa_deftype = &fd_types[0];
else
fa.fa_deftype = NULL; /* unknown */
- (void)config_found(self, (void *)&fa, fdprint, CFARG_EOL);
+ (void)config_found(self, (void *)&fa, fdprint, CFARGS_NONE);
}
return;
Index: src/sys/dev/pcmcia/mhzc.c
diff -u src/sys/dev/pcmcia/mhzc.c:1.53 src/sys/dev/pcmcia/mhzc.c:1.53.8.1
--- src/sys/dev/pcmcia/mhzc.c:1.53 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/pcmcia/mhzc.c Wed Aug 4 23:14:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mhzc.c,v 1.53 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: mhzc.c,v 1.53.8.1 2021/08/04 23:14:04 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.53 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.53.8.1 2021/08/04 23:14:04 thorpej Exp $");
#include "opt_inet.h"
@@ -245,10 +245,10 @@ mhzc_attach(device_t parent, device_t se
/*XXXUNCONST*/
sc->sc_modem = config_found(self, __UNCONST("com"), mhzc_print,
- CFARG_EOL);
+ CFARGS_NONE);
/*XXXUNCONST*/
sc->sc_ethernet = config_found(self, __UNCONST("sm"), mhzc_print,
- CFARG_EOL);
+ CFARGS_NONE);
mhzc_disable(sc, MHZC_MODEM_ENABLED|MHZC_ETHERNET_ENABLED);
return;
Index: src/sys/dev/pcmcia/pcmcia.c
diff -u src/sys/dev/pcmcia/pcmcia.c:1.95 src/sys/dev/pcmcia/pcmcia.c:1.95.8.1
--- src/sys/dev/pcmcia/pcmcia.c:1.95 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/pcmcia/pcmcia.c Wed Aug 4 23:14:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmcia.c,v 1.95 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: pcmcia.c,v 1.95.8.1 2021/08/04 23:14:04 thorpej Exp $ */
/*
* Copyright (c) 2004 Charles M. Hannum. All rights reserved.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.95 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.95.8.1 2021/08/04 23:14:04 thorpej Exp $");
#include "opt_pcmciaverbose.h"
@@ -246,9 +246,8 @@ pcmcia_rescan(device_t self, const char
paa.pf = pf;
pf->child = config_found(self, &paa, pcmcia_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
return (0);
Index: src/sys/dev/pcmcia/pcmcom.c
diff -u src/sys/dev/pcmcia/pcmcom.c:1.42 src/sys/dev/pcmcia/pcmcom.c:1.42.8.1
--- src/sys/dev/pcmcia/pcmcom.c:1.42 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/pcmcia/pcmcom.c Wed Aug 4 23:14:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmcom.c,v 1.42 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: pcmcom.c,v 1.42.8.1 2021/08/04 23:14:04 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.42 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.42.8.1 2021/08/04 23:14:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -175,9 +175,8 @@ pcmcom_attach(device_t parent, device_t
sc->sc_slaves[slave] =
config_found(sc->sc_dev, &pca, pcmcom_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
pcmcom_disable(sc);
Index: src/sys/dev/pcmcia/xirc.c
diff -u src/sys/dev/pcmcia/xirc.c:1.37 src/sys/dev/pcmcia/xirc.c:1.37.8.1
--- src/sys/dev/pcmcia/xirc.c:1.37 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/pcmcia/xirc.c Wed Aug 4 23:14:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xirc.c,v 1.37 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: xirc.c,v 1.37.8.1 2021/08/04 23:14:04 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.37 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.37.8.1 2021/08/04 23:14:04 thorpej Exp $");
#include "opt_inet.h"
@@ -261,11 +261,11 @@ xirc_attach(device_t parent, device_t se
if (sc->sc_id & (XIMEDIA_MODEM << 8))
/*XXXUNCONST*/
sc->sc_modem = config_found(self, __UNCONST("com"), xirc_print,
- CFARG_EOL);
+ CFARGS_NONE);
if (sc->sc_id & (XIMEDIA_ETHER << 8))
/*XXXUNCONST*/
sc->sc_ethernet = config_found(self, __UNCONST("xi"),
- xirc_print, CFARG_EOL);
+ xirc_print, CFARGS_NONE);
xirc_disable(sc, XIRC_MODEM_ENABLED|XIRC_ETHERNET_ENABLED,
sc->sc_id & (XIMEDIA_MODEM|XIMEDIA_ETHER));
Index: src/sys/dev/podulebus/acemidi.c
diff -u src/sys/dev/podulebus/acemidi.c:1.16 src/sys/dev/podulebus/acemidi.c:1.16.8.1
--- src/sys/dev/podulebus/acemidi.c:1.16 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/podulebus/acemidi.c Wed Aug 4 23:14:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: acemidi.c,v 1.16 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: acemidi.c,v 1.16.8.1 2021/08/04 23:14:04 thorpej Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acemidi.c,v 1.16 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acemidi.c,v 1.16.8.1 2021/08/04 23:14:04 thorpej Exp $");
#include <sys/param.h>
@@ -78,7 +78,7 @@ acemidi_attach(device_t parent, device_t
/* struct podulebus_attach_args *pa = aux; */
printf("\n");
- config_found(self, aux, NULL, CFARG_EOL);
+ config_found(self, aux, NULL, CFARGS_NONE);
}
static int
Index: src/sys/dev/ppbus/ppbus_conf.c
diff -u src/sys/dev/ppbus/ppbus_conf.c:1.22 src/sys/dev/ppbus/ppbus_conf.c:1.22.8.1
--- src/sys/dev/ppbus/ppbus_conf.c:1.22 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/ppbus/ppbus_conf.c Wed Aug 4 23:14:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_conf.c,v 1.22 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: ppbus_conf.c,v 1.22.8.1 2021/08/04 23:14:04 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 Nicolas Souchu
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppbus_conf.c,v 1.22 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppbus_conf.c,v 1.22.8.1 2021/08/04 23:14:04 thorpej Exp $");
#include "opt_ppbus.h"
#include "opt_ppbus_1284.h"
@@ -171,9 +171,8 @@ ppbus_attach(device_t parent, device_t s
/* Configure child devices */
SLIST_INIT(&(ppbus->sc_childlist_head));
config_search(self, &args,
- CFARG_SEARCH, ppbus_search_children,
- CFARG_IATTR, "ppbus",
- CFARG_EOL);
+ CFARGS(.search = ppbus_search_children,
+ .iattr = "ppbus"));
#if NGPIO > 0
gpio_ppbus_attach(ppbus);
@@ -246,7 +245,7 @@ ppbus_search_children(device_t parent, c
int rval = 0;
if (config_probe(parent, cf, aux)) {
- dev = config_attach(parent, cf, aux, NULL, CFARG_EOL);
+ dev = config_attach(parent, cf, aux, NULL, CFARGS_NONE);
if (dev) {
child = device_private(dev);
SLIST_INSERT_HEAD(&(ppbus->sc_childlist_head),
Index: src/sys/dev/ppbus/ppbus_gpio.c
diff -u src/sys/dev/ppbus/ppbus_gpio.c:1.2 src/sys/dev/ppbus/ppbus_gpio.c:1.2.8.1
--- src/sys/dev/ppbus/ppbus_gpio.c:1.2 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/ppbus/ppbus_gpio.c Wed Aug 4 23:14:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_gpio.c,v 1.2 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: ppbus_gpio.c,v 1.2.8.1 2021/08/04 23:14:04 thorpej Exp $ */
/*
* Copyright (c) 2008, Hans Rosenfeld <rosenf...@grumpf.hope-2000.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppbus_gpio.c,v 1.2 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppbus_gpio.c,v 1.2.8.1 2021/08/04 23:14:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -110,8 +110,7 @@ gpio_ppbus_attach(struct ppbus_softc *sc
gba.gba_npins = PPBUS_NPINS;
config_found(sc->sc_dev, &gba, gpiobus_print,
- CFARG_IATTR, "gpiobus",
- CFARG_EOL);
+ CFARGS(.iattr = "gpiobus"));
}
static int
Index: src/sys/dev/qbus/rf.c
diff -u src/sys/dev/qbus/rf.c:1.35 src/sys/dev/qbus/rf.c:1.35.8.1
--- src/sys/dev/qbus/rf.c:1.35 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/qbus/rf.c Wed Aug 4 23:14:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rf.c,v 1.35 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: rf.c,v 1.35.8.1 2021/08/04 23:14:04 thorpej Exp $ */
/*
* Copyright (c) 2002 Jochen Kunz.
* All rights reserved.
@@ -36,7 +36,7 @@ TODO:
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.35 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.35.8.1 2021/08/04 23:14:04 thorpej Exp $");
/* autoconfig stuff */
#include <sys/param.h>
@@ -398,10 +398,10 @@ rfc_attach(device_t parent, device_t sel
*/
rfc_aa.dnum = 0;
rfc_sc->sc_childs[0] = config_found(rfc_sc->sc_dev, &rfc_aa, rf_print,
- CFARG_EOL);
+ CFARGS_NONE);
rfc_aa.dnum = 1;
rfc_sc->sc_childs[1] = config_found(rfc_sc->sc_dev, &rfc_aa, rf_print,
- CFARG_EOL);
+ CFARGS_NONE);
#else /* RX02_PROBE */
/*
* There are clones of the DEC RX system with standard shugart
@@ -415,13 +415,13 @@ rfc_attach(device_t parent, device_t sel
if (rfcprobedens(rfc_sc, 0) >= 0) {
rfc_aa.dnum = 0;
rfc_sc->sc_childs[0] = config_found(rfc_sc->sc_dev, &rfc_aa,
- rf_print, CFARG_EOL);
+ rf_print, CFARGS_NONE);
} else
rfc_sc->sc_childs[0] = NULL;
if (rfcprobedens(rfc_sc, 1) >= 0) {
rfc_aa.dnum = 1;
rfc_sc->sc_childs[1] = config_found(rfc_sc->sc_dev, &rfc_aa,
- rf_print, CFARG_EOL);
+ rf_print, CFARGS_NONE);
} else
rfc_sc->sc_childs[1] = NULL;
#endif /* RX02_PROBE */
Index: src/sys/dev/qbus/rl.c
diff -u src/sys/dev/qbus/rl.c:1.52 src/sys/dev/qbus/rl.c:1.52.8.1
--- src/sys/dev/qbus/rl.c:1.52 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/qbus/rl.c Wed Aug 4 23:14:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rl.c,v 1.52 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: rl.c,v 1.52.8.1 2021/08/04 23:14:04 thorpej Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.52 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.52.8.1 2021/08/04 23:14:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -244,7 +244,7 @@ rlcattach(device_t parent, device_t self
ra.type = RL_RREG(RL_MP);
ra.hwid = i;
if ((RL_RREG(RL_CS) & RLCS_ERR) == 0)
- config_found(sc->sc_dev, &ra, rlcprint, CFARG_EOL);
+ config_found(sc->sc_dev, &ra, rlcprint, CFARGS_NONE);
}
}
Index: src/sys/dev/qbus/uba.c
diff -u src/sys/dev/qbus/uba.c:1.82 src/sys/dev/qbus/uba.c:1.82.8.1
--- src/sys/dev/qbus/uba.c:1.82 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/qbus/uba.c Wed Aug 4 23:14:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uba.c,v 1.82 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: uba.c,v 1.82.8.1 2021/08/04 23:14:04 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uba.c,v 1.82 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uba.c,v 1.82.8.1 2021/08/04 23:14:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -267,8 +267,7 @@ uba_attach(struct uba_softc *sc, paddr_t
* Now start searching for devices.
*/
config_search(sc->uh_dev, NULL,
- CFARG_SEARCH, ubasearch,
- CFARG_EOL);
+ CFARGS(.search = ubasearch));
if (sc->uh_afterscan)
(*sc->uh_afterscan)(sc);
@@ -317,7 +316,7 @@ ubasearch(device_t parent, cfdata_t cf,
sc->uh_used[ubdevreg(csr)] = 1;
- config_attach(parent, cf, &ua, ubaprint, CFARG_EOL);
+ config_attach(parent, cf, &ua, ubaprint, CFARGS_NONE);
return 0;
fail:
Index: src/sys/dev/qbus/uda.c
diff -u src/sys/dev/qbus/uda.c:1.62 src/sys/dev/qbus/uda.c:1.62.8.1
--- src/sys/dev/qbus/uda.c:1.62 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/qbus/uda.c Wed Aug 4 23:14:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uda.c,v 1.62 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: uda.c,v 1.62.8.1 2021/08/04 23:14:04 thorpej Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uda.c,v 1.62 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uda.c,v 1.62.8.1 2021/08/04 23:14:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -252,7 +252,7 @@ udaattach(device_t parent, device_t self
ma.ma_ivec = sc->sc_uh->uh_lastiv;
ma.ma_ctlrnr = (ua->ua_iaddr == 0172150 ? 0 : 1); /* XXX */
ma.ma_adapnr = sc->sc_uh->uh_nr;
- config_found(sc->sc_dev, &ma, udaprint, CFARG_EOL);
+ config_found(sc->sc_dev, &ma, udaprint, CFARGS_NONE);
}
/*
Index: src/sys/dev/scsipi/atapi_wdc.c
diff -u src/sys/dev/scsipi/atapi_wdc.c:1.139 src/sys/dev/scsipi/atapi_wdc.c:1.139.8.1
--- src/sys/dev/scsipi/atapi_wdc.c:1.139 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/scsipi/atapi_wdc.c Wed Aug 4 23:14:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: atapi_wdc.c,v 1.139 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: atapi_wdc.c,v 1.139.8.1 2021/08/04 23:14:04 thorpej Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.139 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.139.8.1 2021/08/04 23:14:04 thorpej Exp $");
#ifndef ATADEBUG
#define ATADEBUG
@@ -142,8 +142,7 @@ wdc_atapibus_attach(struct atabus_softc
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/scsipi/atapiconf.c
diff -u src/sys/dev/scsipi/atapiconf.c:1.92 src/sys/dev/scsipi/atapiconf.c:1.92.8.1
--- src/sys/dev/scsipi/atapiconf.c:1.92 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/scsipi/atapiconf.c Wed Aug 4 23:14:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: atapiconf.c,v 1.92 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: atapiconf.c,v 1.92.8.1 2021/08/04 23:14:04 thorpej Exp $ */
/*
* Copyright (c) 1996, 2001 Manuel Bouyer. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.92 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.92.8.1 2021/08/04 23:14:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -279,8 +279,8 @@ atapi_probe_device(struct atapibus_softc
periph->periph_quirks |= quirks;
if ((cf = config_search(sc->sc_dev, sa,
- CFARG_SUBMATCH, atapibussubmatch,
- CFARG_EOL)) != NULL) {
+ CFARGS(.submatch =
+ atapibussubmatch))) != NULL) {
scsipi_insert_periph(chan, periph);
/*
* XXX Can't assign periph_dev here, because we'll
@@ -288,7 +288,7 @@ atapi_probe_device(struct atapibus_softc
* XXX assign it in periph driver.
*/
return config_attach(sc->sc_dev, cf, sa, atapibusprint,
- CFARG_EOL);
+ CFARGS_NONE);
} else {
atapibusprint(sa, device_xname(sc->sc_dev));
aprint_normal(" not configured\n");
Index: src/sys/dev/scsipi/scsiconf.c
diff -u src/sys/dev/scsipi/scsiconf.c:1.291 src/sys/dev/scsipi/scsiconf.c:1.291.8.1
--- src/sys/dev/scsipi/scsiconf.c:1.291 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/scsipi/scsiconf.c Wed Aug 4 23:14:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: scsiconf.c,v 1.291 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: scsiconf.c,v 1.291.8.1 2021/08/04 23:14:04 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.291 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.291.8.1 2021/08/04 23:14:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1013,9 +1013,8 @@ scsi_probe_device(struct scsibus_softc *
locs[SCSIBUSCF_LUN] = lun;
if ((cf = config_search(sc->sc_dev, &sa,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL)) != NULL) {
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs))) != NULL) {
scsipi_insert_periph(chan, periph);
/*
@@ -1034,8 +1033,7 @@ scsi_probe_device(struct scsibus_softc *
* XXX assign it in periph driver.
*/
config_attach(sc->sc_dev, cf, &sa, scsibusprint,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.locators = locs));
} else {
scsibusprint(&sa, device_xname(sc->sc_dev));
aprint_normal(" not configured\n");
