Module Name: src
Committed By: thorpej
Date: Tue Aug 3 23:05:52 UTC 2021
Modified Files:
src/sys/arch/amiga/amiga [thorpej-cfargs2]: autoconf.c device.h
src/sys/arch/amiga/clockport [thorpej-cfargs2]: a1k2cp.c clockport.c
gencp.c
src/sys/arch/amiga/dev [thorpej-cfargs2]: acafh.c afsc.c ahsc.c
amidisplaycc.c atzsc.c bppcsc.c cbiiisc.c drsc.c drsupio.c empsc.c
fd.c gayle_pcmcia.c grf.c grf_cc.c grf_cl.c grf_cv.c grf_cv3d.c
grf_et.c grf_rh.c grf_rt.c grf_ul.c gtsc.c gvpbus.c gvpio.c hyper.c
ioblix_zbus.c ivsc.c kbd.c mfc.c mgnsc.c mlhsc.c mntva.c ms.c
otgsc.c p5bus.c wesc.c wstsc.c xsh.c xsurf.c z3rambd.c zbus.c
zssc.c
src/sys/arch/amiga/pci [thorpej-cfargs2]: cv3dpb.c em4k.c empb.c mppb.c
p5pb.c
src/sys/arch/amigappc/amigappc [thorpej-cfargs2]: autoconf.c mainbus.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.119.6.1 src/sys/arch/amiga/amiga/autoconf.c
cvs rdiff -u -r1.15 -r1.15.6.1 src/sys/arch/amiga/amiga/device.h
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/amiga/clockport/a1k2cp.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/amiga/clockport/clockport.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/amiga/clockport/gencp.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/amiga/dev/acafh.c \
src/sys/arch/amiga/dev/bppcsc.c src/sys/arch/amiga/dev/mntva.c \
src/sys/arch/amiga/dev/xsurf.c src/sys/arch/amiga/dev/z3rambd.c
cvs rdiff -u -r1.45 -r1.45.8.1 src/sys/arch/amiga/dev/afsc.c
cvs rdiff -u -r1.39 -r1.39.8.1 src/sys/arch/amiga/dev/ahsc.c
cvs rdiff -u -r1.36 -r1.36.2.1 src/sys/arch/amiga/dev/amidisplaycc.c
cvs rdiff -u -r1.44 -r1.44.8.1 src/sys/arch/amiga/dev/atzsc.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/amiga/dev/cbiiisc.c \
src/sys/arch/amiga/dev/drsupio.c
cvs rdiff -u -r1.34 -r1.34.8.1 src/sys/arch/amiga/dev/drsc.c \
src/sys/arch/amiga/dev/otgsc.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/arch/amiga/dev/empsc.c
cvs rdiff -u -r1.98 -r1.98.8.1 src/sys/arch/amiga/dev/fd.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/amiga/dev/gayle_pcmcia.c \
src/sys/arch/amiga/dev/mlhsc.c
cvs rdiff -u -r1.66 -r1.66.6.1 src/sys/arch/amiga/dev/grf.c
cvs rdiff -u -r1.42 -r1.42.6.1 src/sys/arch/amiga/dev/grf_cc.c
cvs rdiff -u -r1.51 -r1.51.6.1 src/sys/arch/amiga/dev/grf_cl.c
cvs rdiff -u -r1.60 -r1.60.6.1 src/sys/arch/amiga/dev/grf_cv.c
cvs rdiff -u -r1.35 -r1.35.6.1 src/sys/arch/amiga/dev/grf_cv3d.c
cvs rdiff -u -r1.37 -r1.37.6.1 src/sys/arch/amiga/dev/grf_et.c
cvs rdiff -u -r1.58 -r1.58.6.1 src/sys/arch/amiga/dev/grf_rh.c
cvs rdiff -u -r1.59 -r1.59.6.1 src/sys/arch/amiga/dev/grf_rt.c
cvs rdiff -u -r1.52 -r1.52.6.1 src/sys/arch/amiga/dev/grf_ul.c
cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/arch/amiga/dev/gtsc.c
cvs rdiff -u -r1.27 -r1.27.8.1 src/sys/arch/amiga/dev/gvpbus.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/amiga/dev/gvpio.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/amiga/dev/hyper.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/amiga/dev/ioblix_zbus.c
cvs rdiff -u -r1.38 -r1.38.8.1 src/sys/arch/amiga/dev/ivsc.c
cvs rdiff -u -r1.60 -r1.60.2.1 src/sys/arch/amiga/dev/kbd.c
cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/arch/amiga/dev/mfc.c
cvs rdiff -u -r1.47 -r1.47.8.1 src/sys/arch/amiga/dev/mgnsc.c \
src/sys/arch/amiga/dev/zssc.c
cvs rdiff -u -r1.41 -r1.41.2.1 src/sys/arch/amiga/dev/ms.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/amiga/dev/p5bus.c
cvs rdiff -u -r1.41 -r1.41.8.1 src/sys/arch/amiga/dev/wesc.c
cvs rdiff -u -r1.36 -r1.36.8.1 src/sys/arch/amiga/dev/wstsc.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/amiga/dev/xsh.c
cvs rdiff -u -r1.76 -r1.76.6.1 src/sys/arch/amiga/dev/zbus.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/amiga/pci/cv3dpb.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/amiga/pci/em4k.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/amiga/pci/empb.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/amiga/pci/mppb.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/amiga/pci/p5pb.c
cvs rdiff -u -r1.8 -r1.8.6.1 src/sys/arch/amigappc/amigappc/autoconf.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/amigappc/amigappc/mainbus.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/arch/amiga/amiga/autoconf.c
diff -u src/sys/arch/amiga/amiga/autoconf.c:1.119 src/sys/arch/amiga/amiga/autoconf.c:1.119.6.1
--- src/sys/arch/amiga/amiga/autoconf.c:1.119 Tue Apr 27 14:48:28 2021
+++ src/sys/arch/amiga/amiga/autoconf.c Tue Aug 3 23:05:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.119 2021/04/27 14:48:28 thorpej Exp $ */
+/* $NetBSD: autoconf.c,v 1.119.6.1 2021/08/03 23:05:51 thorpej Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -30,10 +30,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#define __SUBR_AUTOCONF_PRIVATE /* XXX amiga_config_found() */
-
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.119 2021/04/27 14:48:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.119.6.1 2021/08/03 23:05:51 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -165,18 +163,15 @@ matchname(const char *fp, const char *sp
*/
int
amiga_config_found(cfdata_t pcfp, device_t parent, void *aux, cfprint_t pfn,
- cfarg_t tag, ...)
+ const struct cfargs *cfargs)
{
struct device temp;
cfdata_t cf;
const struct cfattach *ca;
int rv = 0;
- va_list ap;
-
- va_start(ap, tag);
if (amiga_realconfig) {
- rv = config_vfound(parent, aux, pfn, tag, ap) != NULL;
+ rv = config_found(parent, aux, pfn, cfargs) != NULL;
goto out;
}
@@ -189,7 +184,7 @@ amiga_config_found(cfdata_t pcfp, device
parent->dv_cfdriver = config_cfdriver_lookup(pcfp->cf_name);
parent->dv_unit = pcfp->cf_unit;
- if ((cf = config_vsearch(parent, aux, tag, ap)) != NULL) {
+ if ((cf = config_search(parent, aux, cfargs)) != NULL) {
ca = config_cfattach_lookup(cf->cf_name, cf->cf_atname);
if (ca != NULL) {
(*ca->ca_attach)(parent, NULL, aux);
@@ -198,7 +193,6 @@ amiga_config_found(cfdata_t pcfp, device
}
parent->dv_cfdata = NULL;
out:
- va_end(ap);
return rv;
}
@@ -225,7 +219,7 @@ config_console(void)
/*
* delay clock calibration.
*/
- amiga_config_found(cf, NULL, __UNCONST("clock"), NULL, CFARG_EOL);
+ amiga_config_found(cf, NULL, __UNCONST("clock"), NULL, CFARGS_NONE);
/*
* internal grf.
@@ -234,13 +228,13 @@ config_console(void)
if (!(is_draco()))
#endif
amiga_config_found(cf, NULL, __UNCONST("grfcc"), NULL,
- CFARG_EOL);
+ CFARGS_NONE);
/*
* zbus knows when its not for real and will
* only configure the appropriate hardware
*/
- amiga_config_found(cf, NULL, __UNCONST("zbus"), NULL, CFARG_EOL);
+ amiga_config_found(cf, NULL, __UNCONST("zbus"), NULL, CFARGS_NONE);
}
/*
@@ -274,75 +268,75 @@ void
mbattach(device_t parent, device_t self, void *aux)
{
printf("\n");
- config_found(self, __UNCONST("clock"), simple_devprint, CFARG_EOL);
+ config_found(self, __UNCONST("clock"), simple_devprint, CFARGS_NONE);
if (is_a3000() || is_a4000()) {
config_found(self, __UNCONST("a34kbbc"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
} else
#ifdef DRACO
if (!is_draco())
#endif
{
config_found(self, __UNCONST("a2kbbc"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
#ifdef DRACO
if (is_draco()) {
config_found(self, __UNCONST("drbbc"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
config_found(self, __UNCONST("kbd"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
config_found(self, __UNCONST("drsc"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
config_found(self, __UNCONST("drsupio"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
} else
#endif
{
config_found(self, __UNCONST("ser"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
config_found(self, __UNCONST("par"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
config_found(self, __UNCONST("kbd"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
config_found(self, __UNCONST("ms"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
config_found(self, __UNCONST("grfcc"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
config_found(self, __UNCONST("amidisplaycc"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
config_found(self, __UNCONST("fdc"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
if (is_a4000() || is_a1200() || is_a600())
config_found(self, __UNCONST("wdc"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
if (is_a4000()) /* Try to configure A4000T SCSI */
config_found(self, __UNCONST("afsc"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
if (is_a3000())
config_found(self, __UNCONST("ahsc"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
if (is_a600() || is_a1200())
config_found(self, __UNCONST("pccard"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
if (is_a1200())
config_found(self, __UNCONST("a1k2cp"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
#ifdef DRACO
if (!is_draco())
#endif
config_found(self, __UNCONST("aucc"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
#if NACAFH > 0
if (!is_a600() && !is_a1200() && !is_a3000() && !is_a4000())
if (acafh_mbattach_probe() == true)
config_found(self, __UNCONST("acafh"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
#endif
- config_found(self, __UNCONST("zbus"), simple_devprint, CFARG_EOL);
+ config_found(self, __UNCONST("zbus"), simple_devprint, CFARGS_NONE);
}
int
Index: src/sys/arch/amiga/amiga/device.h
diff -u src/sys/arch/amiga/amiga/device.h:1.15 src/sys/arch/amiga/amiga/device.h:1.15.6.1
--- src/sys/arch/amiga/amiga/device.h:1.15 Tue Apr 27 14:48:28 2021
+++ src/sys/arch/amiga/amiga/device.h Tue Aug 3 23:05:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.15 2021/04/27 14:48:28 thorpej Exp $ */
+/* $NetBSD: device.h,v 1.15.6.1 2021/08/03 23:05:51 thorpej Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -38,7 +38,8 @@
* passed in some cases and the devices will deal with it)
*/
void config_console(void);
-int amiga_config_found(cfdata_t, device_t, void *, cfprint_t, cfarg_t, ...);
+int amiga_config_found(cfdata_t, device_t, void *, cfprint_t,
+ const struct cfargs *);
int simple_devprint(void *, const char *);
int matchname(const char *, const char *);
/*
Index: src/sys/arch/amiga/clockport/a1k2cp.c
diff -u src/sys/arch/amiga/clockport/a1k2cp.c:1.4 src/sys/arch/amiga/clockport/a1k2cp.c:1.4.8.1
--- src/sys/arch/amiga/clockport/a1k2cp.c:1.4 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/clockport/a1k2cp.c Tue Aug 3 23:05:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: a1k2cp.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: a1k2cp.c,v 1.4.8.1 2021/08/03 23:05:51 thorpej Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -104,5 +104,5 @@ a1k2cp_attach(device_t parent, device_t
A1K2CP_BASE, (void*) a1k2cp_bst.base);
#endif /* A1K2CP_DEBUG */
- config_found(sc->sc_dev, &a1k2cp_aa, 0, CFARG_EOL);
+ config_found(sc->sc_dev, &a1k2cp_aa, 0, CFARGS_NONE);
}
Index: src/sys/arch/amiga/clockport/clockport.c
diff -u src/sys/arch/amiga/clockport/clockport.c:1.6 src/sys/arch/amiga/clockport/clockport.c:1.6.8.1
--- src/sys/arch/amiga/clockport/clockport.c:1.6 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/clockport/clockport.c Tue Aug 3 23:05:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: clockport.c,v 1.6 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: clockport.c,v 1.6.8.1 2021/08/03 23:05:51 thorpej Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -66,8 +66,7 @@ clockport_attach(device_t parent, device
sc->cpb_aa = (struct clockportbus_attach_args *) aux;
config_search(self, NULL,
- CFARG_SEARCH, clockport_search,
- CFARG_EOL);
+ CFARGS(.search = clockport_search));
}
static int
@@ -83,7 +82,7 @@ clockport_search(device_t parent, cfdata
a.cp_intr_establish = sc->cpb_aa->cp_intr_establish;
if (config_probe(parent, cf, &a)) {
- config_attach(parent, cf, &a, clockport_print, CFARG_EOL);
+ config_attach(parent, cf, &a, clockport_print, CFARGS_NONE);
return 1;
}
Index: src/sys/arch/amiga/clockport/gencp.c
diff -u src/sys/arch/amiga/clockport/gencp.c:1.2 src/sys/arch/amiga/clockport/gencp.c:1.2.8.1
--- src/sys/arch/amiga/clockport/gencp.c:1.2 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/clockport/gencp.c Tue Aug 3 23:05:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gencp.c,v 1.2 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: gencp.c,v 1.2.8.1 2021/08/03 23:05:51 thorpej Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -56,6 +56,6 @@ gencp_attach(struct gencp_softc *gsc)
gsc->cpb_aa->cp_intr_establish = clockport_generic_intr_establish;
- config_found(gsc->sc_dev, gsc->cpb_aa, 0, CFARG_EOL);
+ config_found(gsc->sc_dev, gsc->cpb_aa, 0, CFARGS_NONE);
}
Index: src/sys/arch/amiga/dev/acafh.c
diff -u src/sys/arch/amiga/dev/acafh.c:1.4 src/sys/arch/amiga/dev/acafh.c:1.4.8.1
--- src/sys/arch/amiga/dev/acafh.c:1.4 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/acafh.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: acafh.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: acafh.c,v 1.4.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acafh.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acafh.c,v 1.4.8.1 2021/08/03 23:05:52 thorpej Exp $");
/*
* Individual Computers ACA500 driver.
@@ -200,11 +200,11 @@ acafh_attach(device_t parent, device_t s
aaa_wdc.aaa_pbase = (bus_addr_t) GAYLE_IDE_BASE + 2;
strcpy(aaa_wdc.aaa_name, "wdc_acafh");
- config_found(sc->sc_dev, &aaa_wdc, acafh_print, CFARG_EOL);
+ config_found(sc->sc_dev, &aaa_wdc, acafh_print, CFARGS_NONE);
aaa_cp.aaa_pbase = (bus_addr_t) ACAFH_CLOCKPORT_BASE;
strcpy(aaa_cp.aaa_name, "gencp_acafh");
- config_found(sc->sc_dev, &aaa_cp, acafh_print, CFARG_EOL);
+ config_found(sc->sc_dev, &aaa_cp, acafh_print, CFARGS_NONE);
}
uint8_t
Index: src/sys/arch/amiga/dev/bppcsc.c
diff -u src/sys/arch/amiga/dev/bppcsc.c:1.4 src/sys/arch/amiga/dev/bppcsc.c:1.4.8.1
--- src/sys/arch/amiga/dev/bppcsc.c:1.4 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/bppcsc.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bppcsc.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: bppcsc.c,v 1.4.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bppcsc.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bppcsc.c,v 1.4.8.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -169,7 +169,7 @@ bppcscattach(device_t parent, device_t s
/*
* attach all scsi units on us
*/
- config_found(self, chan, scsiprint, CFARG_EOL);
+ config_found(self, chan, scsiprint, CFARGS_NONE);
}
int
Index: src/sys/arch/amiga/dev/mntva.c
diff -u src/sys/arch/amiga/dev/mntva.c:1.4 src/sys/arch/amiga/dev/mntva.c:1.4.8.1
--- src/sys/arch/amiga/dev/mntva.c:1.4 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/mntva.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mntva.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: mntva.c,v 1.4.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 2012, 2016 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mntva.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mntva.c,v 1.4.8.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -238,7 +238,7 @@ mntva_attach(device_t parent, device_t s
ws_aa.accessops = &mntva_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/arch/amiga/dev/xsurf.c
diff -u src/sys/arch/amiga/dev/xsurf.c:1.4 src/sys/arch/amiga/dev/xsurf.c:1.4.8.1
--- src/sys/arch/amiga/dev/xsurf.c:1.4 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/xsurf.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xsurf.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: xsurf.c,v 1.4.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xsurf.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xsurf.c,v 1.4.8.1 2021/08/03 23:05:52 thorpej Exp $");
/*
* X-Surf driver, split from ne_zbus.
@@ -128,7 +128,7 @@ xsurf_attach(device_t parent, device_t s
/* Add clockport. */
xaa_gencp1.xaa_base = (bus_addr_t)zap->va + XSURF_CP2_BASE;
strcpy(xaa_gencp1.xaa_name, "gencp_xsurf");
- config_found(sc->sc_dev, &xaa_gencp1, xsurf_print, CFARG_EOL);
+ config_found(sc->sc_dev, &xaa_gencp1, xsurf_print, CFARGS_NONE);
/* Now... if we are a fake X-Surf that's enough. */
if (zap->serno == DENEB_XSURF_SERNO) {
@@ -139,17 +139,17 @@ xsurf_attach(device_t parent, device_t s
/* Otherwise add one more clockport and continue... */
xaa_gencp2.xaa_base = (bus_addr_t)zap->va + XSURF_CP1_BASE;
strcpy(xaa_gencp2.xaa_name, "gencp_xsurf");
- config_found(sc->sc_dev, &xaa_gencp2, xsurf_print, CFARG_EOL);
+ config_found(sc->sc_dev, &xaa_gencp2, xsurf_print, CFARGS_NONE);
/* Add ne(4). */
xaa_ne.xaa_base = (bus_addr_t)zap->va + XSURF_NE_OFFSET;
strcpy(xaa_ne.xaa_name, "ne_xsurf");
- config_found(sc->sc_dev, &xaa_ne, xsurf_print, CFARG_EOL);
+ config_found(sc->sc_dev, &xaa_ne, xsurf_print, CFARGS_NONE);
/* Add wdc(4). */
xaa_wdc.xaa_base = (bus_addr_t)zap->va + XSURF_WDC_OFFSET;
strcpy(xaa_wdc.xaa_name, "wdc_xsurf");
- config_found(sc->sc_dev, &xaa_wdc, xsurf_print, CFARG_EOL);
+ config_found(sc->sc_dev, &xaa_wdc, xsurf_print, CFARGS_NONE);
}
Index: src/sys/arch/amiga/dev/z3rambd.c
diff -u src/sys/arch/amiga/dev/z3rambd.c:1.4 src/sys/arch/amiga/dev/z3rambd.c:1.4.8.1
--- src/sys/arch/amiga/dev/z3rambd.c:1.4 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/z3rambd.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: z3rambd.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: z3rambd.c,v 1.4.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: z3rambd.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: z3rambd.c,v 1.4.8.1 2021/08/03 23:05:52 thorpej Exp $");
/*
* Z3 RAM virtual block device. Supports ZorRAM, BigRamPlus and FastLane Z3 so
@@ -114,7 +114,7 @@ z3rambd_attach(device_t parent, device_t
aaa.cookie = sc;
aaa.memops = &z3rambd_altmem_memops;
- config_found(self, &aaa, z3rambd_altmem_print, CFARG_EOL);
+ config_found(self, &aaa, z3rambd_altmem_print, CFARGS_NONE);
}
static int
Index: src/sys/arch/amiga/dev/afsc.c
diff -u src/sys/arch/amiga/dev/afsc.c:1.45 src/sys/arch/amiga/dev/afsc.c:1.45.8.1
--- src/sys/arch/amiga/dev/afsc.c:1.45 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/afsc.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: afsc.c,v 1.45 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: afsc.c,v 1.45.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: afsc.c,v 1.45 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: afsc.c,v 1.45.8.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -190,7 +190,7 @@ afscattach(device_t parent, device_t sel
/*
* attach all scsi units on us
*/
- config_found(self, chan, scsiprint, CFARG_EOL);
+ config_found(self, chan, scsiprint, CFARGS_NONE);
}
int
Index: src/sys/arch/amiga/dev/ahsc.c
diff -u src/sys/arch/amiga/dev/ahsc.c:1.39 src/sys/arch/amiga/dev/ahsc.c:1.39.8.1
--- src/sys/arch/amiga/dev/ahsc.c:1.39 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/ahsc.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ahsc.c,v 1.39 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: ahsc.c,v 1.39.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahsc.c,v 1.39 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahsc.c,v 1.39.8.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -202,7 +202,7 @@ ahscattach(device_t parent, device_t sel
/*
* attach all scsi units on us
*/
- config_found(self, chan, scsiprint, CFARG_EOL);
+ config_found(self, chan, scsiprint, CFARGS_NONE);
}
void
Index: src/sys/arch/amiga/dev/amidisplaycc.c
diff -u src/sys/arch/amiga/dev/amidisplaycc.c:1.36 src/sys/arch/amiga/dev/amidisplaycc.c:1.36.2.1
--- src/sys/arch/amiga/dev/amidisplaycc.c:1.36 Tue Jun 15 09:00:33 2021
+++ src/sys/arch/amiga/dev/amidisplaycc.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amidisplaycc.c,v 1.36 2021/06/15 09:00:33 rin Exp $ */
+/* $NetBSD: amidisplaycc.c,v 1.36.2.1 2021/08/03 23:05:52 thorpej Exp $ */
/*-
* Copyright (c) 2000 Jukka Andberg.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.36 2021/06/15 09:00:33 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.36.2.1 2021/08/03 23:05:52 thorpej Exp $");
/*
* wscons interface to amiga custom chips. Contains the necessary functions
@@ -472,7 +472,7 @@ amidisplaycc_attach(device_t parent, dev
waa.console = amidisplaycc_consolescreen.isconsole;
waa.accessops = &amidisplaycc_accessops;
waa.accesscookie = adp;
- config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE);
wsfont_init();
}
Index: src/sys/arch/amiga/dev/atzsc.c
diff -u src/sys/arch/amiga/dev/atzsc.c:1.44 src/sys/arch/amiga/dev/atzsc.c:1.44.8.1
--- src/sys/arch/amiga/dev/atzsc.c:1.44 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/atzsc.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: atzsc.c,v 1.44 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: atzsc.c,v 1.44.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atzsc.c,v 1.44 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atzsc.c,v 1.44.8.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -211,7 +211,7 @@ atzscattach(device_t parent, device_t se
/*
* attach all scsi units on us
*/
- config_found(self, chan, scsiprint, CFARG_EOL);
+ config_found(self, chan, scsiprint, CFARGS_NONE);
}
void
Index: src/sys/arch/amiga/dev/cbiiisc.c
diff -u src/sys/arch/amiga/dev/cbiiisc.c:1.22 src/sys/arch/amiga/dev/cbiiisc.c:1.22.8.1
--- src/sys/arch/amiga/dev/cbiiisc.c:1.22 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/cbiiisc.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cbiiisc.c,v 1.22 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: cbiiisc.c,v 1.22.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cbiiisc.c,v 1.22 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cbiiisc.c,v 1.22.8.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -166,7 +166,7 @@ cbiiiscattach(device_t parent, device_t
/*
* attach all scsi units on us
*/
- config_found(self, chan, scsiprint, CFARG_EOL);
+ config_found(self, chan, scsiprint, CFARGS_NONE);
}
int
Index: src/sys/arch/amiga/dev/drsupio.c
diff -u src/sys/arch/amiga/dev/drsupio.c:1.22 src/sys/arch/amiga/dev/drsupio.c:1.22.8.1
--- src/sys/arch/amiga/dev/drsupio.c:1.22 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/drsupio.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drsupio.c,v 1.22 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: drsupio.c,v 1.22.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drsupio.c,v 1.22 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drsupio.c,v 1.22.8.1 2021/08/03 23:05:52 thorpej Exp $");
/*
* DraCo multi-io chip bus space stuff
@@ -113,7 +113,7 @@ drsupioattach(device_t parent, device_t
supa.supio_name = drsd->name;
supa.supio_iobase = drsd->off;
supa.supio_arg = drsd->arg;
- config_found(self, &supa, drsupprint, CFARG_EOL); /* XXX */
+ config_found(self, &supa, drsupprint, CFARGS_NONE); /* XXX */
++drsd;
}
Index: src/sys/arch/amiga/dev/drsc.c
diff -u src/sys/arch/amiga/dev/drsc.c:1.34 src/sys/arch/amiga/dev/drsc.c:1.34.8.1
--- src/sys/arch/amiga/dev/drsc.c:1.34 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/drsc.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drsc.c,v 1.34 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: drsc.c,v 1.34.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1996 Ignatios Souvatzis
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drsc.c,v 1.34 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drsc.c,v 1.34.8.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -170,7 +170,7 @@ drscattach(device_t parent, device_t sel
/*
* attach all scsi units on us
*/
- config_found(self, chan, scsiprint, CFARG_EOL);
+ config_found(self, chan, scsiprint, CFARGS_NONE);
}
/*
Index: src/sys/arch/amiga/dev/otgsc.c
diff -u src/sys/arch/amiga/dev/otgsc.c:1.34 src/sys/arch/amiga/dev/otgsc.c:1.34.8.1
--- src/sys/arch/amiga/dev/otgsc.c:1.34 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/otgsc.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: otgsc.c,v 1.34 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: otgsc.c,v 1.34.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: otgsc.c,v 1.34 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: otgsc.c,v 1.34.8.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -179,7 +179,7 @@ otgscattach(device_t parent, device_t se
/*
* attach all scsi units on us
*/
- config_found(self, chan, scsiprint, CFARG_EOL);
+ config_found(self, chan, scsiprint, CFARGS_NONE);
}
int
Index: src/sys/arch/amiga/dev/empsc.c
diff -u src/sys/arch/amiga/dev/empsc.c:1.29 src/sys/arch/amiga/dev/empsc.c:1.29.8.1
--- src/sys/arch/amiga/dev/empsc.c:1.29 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/empsc.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: empsc.c,v 1.29 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: empsc.c,v 1.29.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: empsc.c,v 1.29 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: empsc.c,v 1.29.8.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -175,7 +175,7 @@ empscattach(device_t parent, device_t se
/*
* attach all scsi units on us
*/
- config_found(self, chan, scsiprint, CFARG_EOL);
+ config_found(self, chan, scsiprint, CFARGS_NONE);
}
int
Index: src/sys/arch/amiga/dev/fd.c
diff -u src/sys/arch/amiga/dev/fd.c:1.98 src/sys/arch/amiga/dev/fd.c:1.98.8.1
--- src/sys/arch/amiga/dev/fd.c:1.98 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/fd.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.98 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: fd.c,v 1.98.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.98 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.98.8.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -371,11 +371,11 @@ fdcattach(device_t parent, device_t self
args.type = fdcgetfdtype(args.unit);
fdc_side = -1;
- config_found(self, &args, fdcprint, CFARG_EOL);
+ config_found(self, &args, fdcprint, CFARGS_NONE);
for (args.unit++; args.unit < FDMAXUNITS; args.unit++) {
if ((args.type = fdcgetfdtype(args.unit)) == NULL)
continue;
- config_found(self, &args, fdcprint, CFARG_EOL);
+ config_found(self, &args, fdcprint, CFARGS_NONE);
}
}
Index: src/sys/arch/amiga/dev/gayle_pcmcia.c
diff -u src/sys/arch/amiga/dev/gayle_pcmcia.c:1.33 src/sys/arch/amiga/dev/gayle_pcmcia.c:1.33.8.1
--- src/sys/arch/amiga/dev/gayle_pcmcia.c:1.33 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/gayle_pcmcia.c Tue Aug 3 23:05:52 2021
@@ -1,9 +1,9 @@
-/* $NetBSD: gayle_pcmcia.c,v 1.33 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: gayle_pcmcia.c,v 1.33.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/* public domain */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gayle_pcmcia.c,v 1.33 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gayle_pcmcia.c,v 1.33.8.1 2021/08/03 23:05:52 thorpej Exp $");
/* PCMCIA front-end driver for A1200's and A600's. */
@@ -173,7 +173,8 @@ pccard_attach(device_t parent, device_t
paa.paa_busname = "pcmcia";
paa.pct = &chip_functions;
paa.pch = &sc->devs[0];
- sc->devs[0].card = config_found(self, &paa, simple_devprint, CFARG_EOL);
+ sc->devs[0].card = config_found(self, &paa, simple_devprint,
+ CFARGS_NONE);
if (sc->devs[0].card == NULL) {
printf("attach failed, config_found() returned NULL\n");
pmap_remove(kernel_map->pmap, pcmcia_base,
Index: src/sys/arch/amiga/dev/mlhsc.c
diff -u src/sys/arch/amiga/dev/mlhsc.c:1.33 src/sys/arch/amiga/dev/mlhsc.c:1.33.8.1
--- src/sys/arch/amiga/dev/mlhsc.c:1.33 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/mlhsc.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mlhsc.c,v 1.33 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: mlhsc.c,v 1.33.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlhsc.c,v 1.33 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlhsc.c,v 1.33.8.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -172,7 +172,7 @@ mlhscattach(device_t parent, device_t se
/*
* attach all scsi units on us
*/
- config_found(self, chan, scsiprint, CFARG_EOL);
+ config_found(self, chan, scsiprint, CFARGS_NONE);
}
int
Index: src/sys/arch/amiga/dev/grf.c
diff -u src/sys/arch/amiga/dev/grf.c:1.66 src/sys/arch/amiga/dev/grf.c:1.66.6.1
--- src/sys/arch/amiga/dev/grf.c:1.66 Tue Apr 27 14:48:28 2021
+++ src/sys/arch/amiga/dev/grf.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: grf.c,v 1.66 2021/04/27 14:48:28 thorpej Exp $ */
+/* $NetBSD: grf.c,v 1.66.6.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.66 2021/04/27 14:48:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.66.6.1 2021/08/03 23:05:52 thorpej Exp $");
/*
* Graphics display driver for the Amiga
@@ -214,8 +214,7 @@ grfattach(device_t parent, device_t self
wa.accessops = gp->g_accessops;
wa.accesscookie = &gp->g_vd;
config_found(self, &wa, wsemuldisplaydevprint,
- CFARG_IATTR, "wsemuldisplaydev",
- CFARG_EOL);
+ CFARGS(.iattr = "wsemuldisplaydev"));
#endif /* NWSDISPLAY > 0 */
}
@@ -224,8 +223,7 @@ grfattach(device_t parent, device_t self
* try and attach an ite
*/
amiga_config_found(cfdata, self, gp, grfprint,
- CFARG_IATTR, "grf",
- CFARG_EOL);
+ CFARGS(.iattr = "grf"));
#endif
}
Index: src/sys/arch/amiga/dev/grf_cc.c
diff -u src/sys/arch/amiga/dev/grf_cc.c:1.42 src/sys/arch/amiga/dev/grf_cc.c:1.42.6.1
--- src/sys/arch/amiga/dev/grf_cc.c:1.42 Tue Apr 27 14:48:28 2021
+++ src/sys/arch/amiga/dev/grf_cc.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_cc.c,v 1.42 2021/04/27 14:48:28 thorpej Exp $ */
+/* $NetBSD: grf_cc.c,v 1.42.6.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_cc.c,v 1.42 2021/04/27 14:48:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cc.c,v 1.42.6.1 2021/08/03 23:05:52 thorpej Exp $");
#include "grfcc.h"
#include "ite.h"
@@ -151,7 +151,7 @@ grfccattach(device_t parent, device_t se
/*
* attach grf
*/
- amiga_config_found(cfdata, gp->g_device, gp, grfccprint, CFARG_EOL);
+ amiga_config_found(cfdata, gp->g_device, gp, grfccprint, CFARGS_NONE);
}
int
Index: src/sys/arch/amiga/dev/grf_cl.c
diff -u src/sys/arch/amiga/dev/grf_cl.c:1.51 src/sys/arch/amiga/dev/grf_cl.c:1.51.6.1
--- src/sys/arch/amiga/dev/grf_cl.c:1.51 Tue Apr 27 14:48:28 2021
+++ src/sys/arch/amiga/dev/grf_cl.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_cl.c,v 1.51 2021/04/27 14:48:28 thorpej Exp $ */
+/* $NetBSD: grf_cl.c,v 1.51.6.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1997 Klaus Burkert
@@ -36,7 +36,7 @@
#include "opt_amigacons.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_cl.c,v 1.51 2021/04/27 14:48:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cl.c,v 1.51.6.1 2021/08/03 23:05:52 thorpej Exp $");
#include "grfcl.h"
#include "ite.h"
@@ -456,7 +456,7 @@ grfclattach(device_t parent, device_t se
* attach grf (once)
*/
if (amiga_config_found(cfdata, gp->g_device, gp, grfclprint,
- CFARG_EOL)) {
+ CFARGS_NONE)) {
attachflag = 1;
printf("grfcl: %dMB ", cl_fbsize / 0x100000);
switch (cltype) {
Index: src/sys/arch/amiga/dev/grf_cv.c
diff -u src/sys/arch/amiga/dev/grf_cv.c:1.60 src/sys/arch/amiga/dev/grf_cv.c:1.60.6.1
--- src/sys/arch/amiga/dev/grf_cv.c:1.60 Tue Apr 27 14:48:28 2021
+++ src/sys/arch/amiga/dev/grf_cv.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_cv.c,v 1.60 2021/04/27 14:48:28 thorpej Exp $ */
+/* $NetBSD: grf_cv.c,v 1.60.6.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1995 Michael Teske
@@ -33,7 +33,7 @@
#include "opt_amigacons.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_cv.c,v 1.60 2021/04/27 14:48:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cv.c,v 1.60.6.1 2021/08/03 23:05:52 thorpej Exp $");
#include "grfcv.h"
#include "ite.h"
@@ -555,7 +555,7 @@ grfcvattach(device_t parent, device_t se
* attach grf
*/
if (amiga_config_found(cfdata, gp->g_device, gp, grfcvprint,
- CFARG_EOL)) {
+ CFARGS_NONE)) {
if (self != NULL)
printf("grfcv: CyberVision64 with %dMB being used\n",
cv_fbsize/0x100000);
Index: src/sys/arch/amiga/dev/grf_cv3d.c
diff -u src/sys/arch/amiga/dev/grf_cv3d.c:1.35 src/sys/arch/amiga/dev/grf_cv3d.c:1.35.6.1
--- src/sys/arch/amiga/dev/grf_cv3d.c:1.35 Tue Apr 27 14:48:28 2021
+++ src/sys/arch/amiga/dev/grf_cv3d.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_cv3d.c,v 1.35 2021/04/27 14:48:28 thorpej Exp $ */
+/* $NetBSD: grf_cv3d.c,v 1.35.6.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1995 Michael Teske
@@ -33,7 +33,7 @@
#include "opt_amigacons.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_cv3d.c,v 1.35 2021/04/27 14:48:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cv3d.c,v 1.35.6.1 2021/08/03 23:05:52 thorpej Exp $");
#include "grfcv3d.h"
#include "ite.h"
@@ -505,7 +505,7 @@ grfcv3dattach(device_t parent, device_t
* attach grf
*/
if (amiga_config_found(cfdata, gp->g_device, gp, grfcv3dprint,
- CFARG_EOL)) {
+ CFARGS_NONE)) {
if (self != NULL)
printf("%s: CyberVision64/3D with %dMB being used\n",
device_xname(self), cv3d_fbsize / 0x100000);
Index: src/sys/arch/amiga/dev/grf_et.c
diff -u src/sys/arch/amiga/dev/grf_et.c:1.37 src/sys/arch/amiga/dev/grf_et.c:1.37.6.1
--- src/sys/arch/amiga/dev/grf_et.c:1.37 Tue Apr 27 14:48:28 2021
+++ src/sys/arch/amiga/dev/grf_et.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_et.c,v 1.37 2021/04/27 14:48:28 thorpej Exp $ */
+/* $NetBSD: grf_et.c,v 1.37.6.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1997 Klaus Burkert
@@ -37,7 +37,7 @@
#include "opt_amigacons.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_et.c,v 1.37 2021/04/27 14:48:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_et.c,v 1.37.6.1 2021/08/03 23:05:52 thorpej Exp $");
#include "grfet.h"
#include "ite.h"
@@ -388,7 +388,7 @@ grfetattach(device_t parent, device_t se
* attach grf (once)
*/
if (amiga_config_found(cfdata, gp->g_device, gp, grfetprint,
- CFARG_EOL)) {
+ CFARGS_NONE)) {
attachflag = 1;
printf("grfet: %dMB ", et_fbsize / 0x100000);
switch (ettype) {
Index: src/sys/arch/amiga/dev/grf_rh.c
diff -u src/sys/arch/amiga/dev/grf_rh.c:1.58 src/sys/arch/amiga/dev/grf_rh.c:1.58.6.1
--- src/sys/arch/amiga/dev/grf_rh.c:1.58 Tue Apr 27 14:48:28 2021
+++ src/sys/arch/amiga/dev/grf_rh.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_rh.c,v 1.58 2021/04/27 14:48:28 thorpej Exp $ */
+/* $NetBSD: grf_rh.c,v 1.58.6.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1994 Markus Wild
@@ -34,7 +34,7 @@
#include "opt_retina.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_rh.c,v 1.58 2021/04/27 14:48:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_rh.c,v 1.58.6.1 2021/08/03 23:05:52 thorpej Exp $");
#include "grfrh.h"
#include "ite.h"
@@ -1617,7 +1617,7 @@ grfrhattach(device_t parent, device_t se
/*
* attach grf
*/
- amiga_config_found(cfdata, gp->g_device, gp, grfrhprint, CFARG_EOL);
+ amiga_config_found(cfdata, gp->g_device, gp, grfrhprint, CFARGS_NONE);
}
int
Index: src/sys/arch/amiga/dev/grf_rt.c
diff -u src/sys/arch/amiga/dev/grf_rt.c:1.59 src/sys/arch/amiga/dev/grf_rt.c:1.59.6.1
--- src/sys/arch/amiga/dev/grf_rt.c:1.59 Tue Apr 27 14:48:28 2021
+++ src/sys/arch/amiga/dev/grf_rt.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_rt.c,v 1.59 2021/04/27 14:48:28 thorpej Exp $ */
+/* $NetBSD: grf_rt.c,v 1.59.6.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1993 Markus Wild
@@ -33,7 +33,7 @@
#include "opt_amigacons.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_rt.c,v 1.59 2021/04/27 14:48:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_rt.c,v 1.59.6.1 2021/08/03 23:05:52 thorpej Exp $");
#include "grfrt.h"
#include "ite.h"
@@ -881,7 +881,7 @@ grfrtattach(device_t parent, device_t se
/*
* attach grf
*/
- amiga_config_found(cfdata, gp->g_device, gp, grfrtprint, CFARG_EOL);
+ amiga_config_found(cfdata, gp->g_device, gp, grfrtprint, CFARGS_NONE);
}
int
Index: src/sys/arch/amiga/dev/grf_ul.c
diff -u src/sys/arch/amiga/dev/grf_ul.c:1.52 src/sys/arch/amiga/dev/grf_ul.c:1.52.6.1
--- src/sys/arch/amiga/dev/grf_ul.c:1.52 Tue Apr 27 14:48:28 2021
+++ src/sys/arch/amiga/dev/grf_ul.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_ul.c,v 1.52 2021/04/27 14:48:28 thorpej Exp $ */
+/* $NetBSD: grf_ul.c,v 1.52.6.1 2021/08/03 23:05:52 thorpej Exp $ */
#define UL_DEBUG
/*-
@@ -33,7 +33,7 @@
#include "opt_amigacons.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_ul.c,v 1.52 2021/04/27 14:48:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_ul.c,v 1.52.6.1 2021/08/03 23:05:52 thorpej Exp $");
#include "grful.h"
#include "ite.h"
@@ -554,7 +554,7 @@ grfulattach(device_t parent, device_t se
/*
* attach grf
*/
- amiga_config_found(cfdata, gp->g_device, gp, grfulprint, CFARG_EOL);
+ amiga_config_found(cfdata, gp->g_device, gp, grfulprint, CFARGS_NONE);
}
int
Index: src/sys/arch/amiga/dev/gtsc.c
diff -u src/sys/arch/amiga/dev/gtsc.c:1.42 src/sys/arch/amiga/dev/gtsc.c:1.42.8.1
--- src/sys/arch/amiga/dev/gtsc.c:1.42 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/gtsc.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gtsc.c,v 1.42 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: gtsc.c,v 1.42.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtsc.c,v 1.42 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtsc.c,v 1.42.8.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -239,7 +239,7 @@ gtscattach(device_t parent, device_t sel
/*
* attach all scsi units on us
*/
- config_found(self, chan, scsiprint, CFARG_EOL);
+ config_found(self, chan, scsiprint, CFARGS_NONE);
}
void
Index: src/sys/arch/amiga/dev/gvpbus.c
diff -u src/sys/arch/amiga/dev/gvpbus.c:1.27 src/sys/arch/amiga/dev/gvpbus.c:1.27.8.1
--- src/sys/arch/amiga/dev/gvpbus.c:1.27 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/gvpbus.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gvpbus.c,v 1.27 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: gvpbus.c,v 1.27.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gvpbus.c,v 1.27 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gvpbus.c,v 1.27.8.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -145,11 +145,11 @@ gvpbusattach(device_t parent, device_t s
if (flags & GVP_SCSI) {
ga.flags = flags0 | GVP_SCSI;
- config_found(self, &ga, gvpbusprint, CFARG_EOL);
+ config_found(self, &ga, gvpbusprint, CFARGS_NONE);
}
if (flags & GVP_IO) {
ga.flags = flags0 | GVP_IO;
- config_found(self, &ga, gvpbusprint, CFARG_EOL);
+ config_found(self, &ga, gvpbusprint, CFARGS_NONE);
}
}
Index: src/sys/arch/amiga/dev/gvpio.c
diff -u src/sys/arch/amiga/dev/gvpio.c:1.21 src/sys/arch/amiga/dev/gvpio.c:1.21.8.1
--- src/sys/arch/amiga/dev/gvpio.c:1.21 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/gvpio.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gvpio.c,v 1.21 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: gvpio.c,v 1.21.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1997 Ignatios Souvatzis
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gvpio.c,v 1.21 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gvpio.c,v 1.21.8.1 2021/08/03 23:05:52 thorpej Exp $");
/*
* GVP I/O Extender
@@ -131,7 +131,7 @@ gvpioattach(device_t parent, device_t se
supa.supio_iobase = giosd->off;
supa.supio_arg = giosd->arg;
supa.supio_ipl = giosd->ipl;
- config_found(self, &supa, gvpioprint, CFARG_EOL); /* XXX */
+ config_found(self, &supa, gvpioprint, CFARGS_NONE); /* XXX */
++giosd;
}
if (giosc->sc_comhdls.lh_first) {
Index: src/sys/arch/amiga/dev/hyper.c
diff -u src/sys/arch/amiga/dev/hyper.c:1.23 src/sys/arch/amiga/dev/hyper.c:1.23.8.1
--- src/sys/arch/amiga/dev/hyper.c:1.23 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/hyper.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hyper.c,v 1.23 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: hyper.c,v 1.23.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*-
* Copyright (c) 1997,1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hyper.c,v 1.23 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hyper.c,v 1.23.8.1 2021/08/03 23:05:52 thorpej Exp $");
/*
* zbus HyperCom driver
@@ -149,7 +149,7 @@ hyperattach(device_t parent, device_t se
supa.supio_name = hprsd->name;
supa.supio_iobase = hprsd->off;
supa.supio_arg = hprsd->arg;
- config_found(self, &supa, hyperprint, CFARG_EOL); /* XXX */
+ config_found(self, &supa, hyperprint, CFARGS_NONE); /* XXX */
}
++hprsd;
}
Index: src/sys/arch/amiga/dev/ioblix_zbus.c
diff -u src/sys/arch/amiga/dev/ioblix_zbus.c:1.20 src/sys/arch/amiga/dev/ioblix_zbus.c:1.20.8.1
--- src/sys/arch/amiga/dev/ioblix_zbus.c:1.20 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/ioblix_zbus.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ioblix_zbus.c,v 1.20 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: ioblix_zbus.c,v 1.20.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioblix_zbus.c,v 1.20 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioblix_zbus.c,v 1.20.8.1 2021/08/03 23:05:52 thorpej Exp $");
/* IOBlix Zorro driver */
/* XXX to be done: we need to probe the com clock speed! */
@@ -130,7 +130,7 @@ iobzattach(device_t parent, device_t sel
supa.supio_name = iobzd->name;
supa.supio_iobase = iobzd->off;
supa.supio_arg = iobzd->arg ? iobzclock : 0 /* XXX iobzd->arg */;
- config_found(self, &supa, iobzprint, CFARG_EOL); /* XXX */
+ config_found(self, &supa, iobzprint, CFARGS_NONE); /* XXX */
++iobzd;
}
Index: src/sys/arch/amiga/dev/ivsc.c
diff -u src/sys/arch/amiga/dev/ivsc.c:1.38 src/sys/arch/amiga/dev/ivsc.c:1.38.8.1
--- src/sys/arch/amiga/dev/ivsc.c:1.38 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/ivsc.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ivsc.c,v 1.38 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: ivsc.c,v 1.38.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ivsc.c,v 1.38 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ivsc.c,v 1.38.8.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -186,7 +186,7 @@ ivscattach(device_t parent, device_t sel
/*
* attach all scsi units on us
*/
- config_found(self, chan, scsiprint, CFARG_EOL);
+ config_found(self, chan, scsiprint, CFARGS_NONE);
}
int
Index: src/sys/arch/amiga/dev/kbd.c
diff -u src/sys/arch/amiga/dev/kbd.c:1.60 src/sys/arch/amiga/dev/kbd.c:1.60.2.1
--- src/sys/arch/amiga/dev/kbd.c:1.60 Thu Jun 3 07:31:20 2021
+++ src/sys/arch/amiga/dev/kbd.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.c,v 1.60 2021/06/03 07:31:20 rin Exp $ */
+/* $NetBSD: kbd.c,v 1.60.2.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.60 2021/06/03 07:31:20 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.60.2.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -220,8 +220,7 @@ kbdattach(device_t parent, device_t self
waa.accessops = &kbd_accessops;
waa.accesscookie = NULL;
kbd_softc.k_wskbddev = config_found(self, &waa, wskbddevprint,
- CFARG_IATTR, "wskbddev",
- CFARG_EOL);
+ CFARGS(.iattr = "wskbddev"));
kbd_softc.k_pollingmode = 0;
}
Index: src/sys/arch/amiga/dev/mfc.c
diff -u src/sys/arch/amiga/dev/mfc.c:1.58 src/sys/arch/amiga/dev/mfc.c:1.58.8.1
--- src/sys/arch/amiga/dev/mfc.c:1.58 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/mfc.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mfc.c,v 1.58 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: mfc.c,v 1.58.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -55,7 +55,7 @@
#include "opt_kgdb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfc.c,v 1.58 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfc.c,v 1.58.8.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -419,14 +419,14 @@ mfcattach(device_t parent, device_t self
ma.subdev = "mfcs";
ma.unit = unit * 2;
- config_found(self, &ma, mfcprint, CFARG_EOL);
+ config_found(self, &ma, mfcprint, CFARGS_NONE);
ma.unit = unit * 2 + 1;
- config_found(self, &ma, mfcprint, CFARG_EOL);
+ config_found(self, &ma, mfcprint, CFARGS_NONE);
ma.subdev = "mfcp";
ma.unit = unit;
- config_found(self, &ma, mfcprint, CFARG_EOL);
+ config_found(self, &ma, mfcprint, CFARGS_NONE);
}
/*
Index: src/sys/arch/amiga/dev/mgnsc.c
diff -u src/sys/arch/amiga/dev/mgnsc.c:1.47 src/sys/arch/amiga/dev/mgnsc.c:1.47.8.1
--- src/sys/arch/amiga/dev/mgnsc.c:1.47 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/mgnsc.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mgnsc.c,v 1.47 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: mgnsc.c,v 1.47.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mgnsc.c,v 1.47 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mgnsc.c,v 1.47.8.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -162,7 +162,7 @@ mgnscattach(device_t parent, device_t se
/*
* attach all scsi units on us
*/
- config_found(self, chan, scsiprint, CFARG_EOL);
+ config_found(self, chan, scsiprint, CFARGS_NONE);
}
/*
Index: src/sys/arch/amiga/dev/zssc.c
diff -u src/sys/arch/amiga/dev/zssc.c:1.47 src/sys/arch/amiga/dev/zssc.c:1.47.8.1
--- src/sys/arch/amiga/dev/zssc.c:1.47 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/zssc.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zssc.c,v 1.47 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: zssc.c,v 1.47.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zssc.c,v 1.47 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zssc.c,v 1.47.8.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -149,7 +149,7 @@ zsscattach(device_t parent, device_t sel
/*
* attach all scsi units on us
*/
- config_found(self, &sc->sc_channel, scsiprint, CFARG_EOL);
+ config_found(self, &sc->sc_channel, scsiprint, CFARGS_NONE);
}
/*
Index: src/sys/arch/amiga/dev/ms.c
diff -u src/sys/arch/amiga/dev/ms.c:1.41 src/sys/arch/amiga/dev/ms.c:1.41.2.1
--- src/sys/arch/amiga/dev/ms.c:1.41 Thu Jun 3 07:31:20 2021
+++ src/sys/arch/amiga/dev/ms.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ms.c,v 1.41 2021/06/03 07:31:20 rin Exp $ */
+/* $NetBSD: ms.c,v 1.41.2.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* based on:
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.41 2021/06/03 07:31:20 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.41.2.1 2021/08/03 23:05:52 thorpej Exp $");
/*
* Mouse driver.
@@ -203,8 +203,7 @@ msattach(device_t parent, device_t self,
sc->sc_ports[i].ms_wsenabled = 0;
sc->sc_ports[i].ms_wsmousedev =
config_found(self, &waa, wsmousedevprint,
- CFARG_IATTR, "wsmousedev",
- CFARG_EOL);
+ CFARGS(.iattr = "wsmousedev"));
#endif
}
}
Index: src/sys/arch/amiga/dev/p5bus.c
diff -u src/sys/arch/amiga/dev/p5bus.c:1.5 src/sys/arch/amiga/dev/p5bus.c:1.5.8.1
--- src/sys/arch/amiga/dev/p5bus.c:1.5 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/p5bus.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: p5bus.c,v 1.5 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: p5bus.c,v 1.5.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*-
* Copyright (c) 2011, 2012 The NetBSD Foundation, Inc.
@@ -143,11 +143,11 @@ p5bus_attach(device_t parent, device_t s
switch (sc->sc_has_scsi) {
case P5BUS_SCSI_710:
strcpy(p5baa.p5baa_name, "bppcsc");
- config_found(sc->sc_dev, &p5baa, p5bus_print, CFARG_EOL);
+ config_found(sc->sc_dev, &p5baa, p5bus_print, CFARGS_NONE);
break;
case P5BUS_SCSI_770:
strcpy(p5baa.p5baa_name, "cbiiisc");
- config_found(sc->sc_dev, &p5baa, p5bus_print, CFARG_EOL);
+ config_found(sc->sc_dev, &p5baa, p5bus_print, CFARGS_NONE);
break;
default:
break;
@@ -173,7 +173,7 @@ p5bus_callback(device_t self) {
/* p5pb is always found, probe is inside of p5pb driver */
strcpy(p5baa.p5baa_name, "p5pb");
- config_found(sc->sc_dev, &p5baa, p5bus_print, CFARG_EOL);
+ config_found(sc->sc_dev, &p5baa, p5bus_print, CFARGS_NONE);
}
/* Get serial number of the card. */
Index: src/sys/arch/amiga/dev/wesc.c
diff -u src/sys/arch/amiga/dev/wesc.c:1.41 src/sys/arch/amiga/dev/wesc.c:1.41.8.1
--- src/sys/arch/amiga/dev/wesc.c:1.41 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/wesc.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wesc.c,v 1.41 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: wesc.c,v 1.41.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wesc.c,v 1.41 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wesc.c,v 1.41.8.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -160,7 +160,7 @@ wescattach(device_t parent, device_t sel
/*
* attach all scsi units on us
*/
- config_found(self, chan, scsiprint, CFARG_EOL);
+ config_found(self, chan, scsiprint, CFARGS_NONE);
}
int
Index: src/sys/arch/amiga/dev/wstsc.c
diff -u src/sys/arch/amiga/dev/wstsc.c:1.36 src/sys/arch/amiga/dev/wstsc.c:1.36.8.1
--- src/sys/arch/amiga/dev/wstsc.c:1.36 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/wstsc.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wstsc.c,v 1.36 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: wstsc.c,v 1.36.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wstsc.c,v 1.36 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wstsc.c,v 1.36.8.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -197,7 +197,7 @@ wstscattach(device_t parent, device_t se
/*
* attach all scsi units on us
*/
- config_found(self, chan, scsiprint, CFARG_EOL);
+ config_found(self, chan, scsiprint, CFARGS_NONE);
}
int
Index: src/sys/arch/amiga/dev/xsh.c
diff -u src/sys/arch/amiga/dev/xsh.c:1.3 src/sys/arch/amiga/dev/xsh.c:1.3.8.1
--- src/sys/arch/amiga/dev/xsh.c:1.3 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/xsh.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xsh.c,v 1.3 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: xsh.c,v 1.3.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xsh.c,v 1.3 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xsh.c,v 1.3.8.1 2021/08/03 23:05:52 thorpej Exp $");
/*
* X-Surf 100 driver.
@@ -90,7 +90,7 @@ xsh_attach(device_t parent, device_t sel
/* Add ne(4). */
xaa_ne.xaa_base = (bus_addr_t)zap->va + XSURF100_NE_OFFSET;
strcpy(xaa_ne.xaa_name, "ne_xsh");
- config_found(sc->sc_dev, &xaa_ne, xsh_print, CFARG_EOL);
+ config_found(sc->sc_dev, &xaa_ne, xsh_print, CFARGS_NONE);
/* TODO: add USB module... */
}
Index: src/sys/arch/amiga/dev/zbus.c
diff -u src/sys/arch/amiga/dev/zbus.c:1.76 src/sys/arch/amiga/dev/zbus.c:1.76.6.1
--- src/sys/arch/amiga/dev/zbus.c:1.76 Tue Apr 27 14:48:28 2021
+++ src/sys/arch/amiga/dev/zbus.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zbus.c,v 1.76 2021/04/27 14:48:28 thorpej Exp $ */
+/* $NetBSD: zbus.c,v 1.76.6.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zbus.c,v 1.76 2021/04/27 14:48:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zbus.c,v 1.76.6.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -371,7 +371,7 @@ zbusattach(device_t parent, device_t sel
pcp->vaddr = za.va;
}
amiga_config_found(early_cfdata, self, &za, zbusprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
}
Index: src/sys/arch/amiga/pci/cv3dpb.c
diff -u src/sys/arch/amiga/pci/cv3dpb.c:1.5 src/sys/arch/amiga/pci/cv3dpb.c:1.5.8.1
--- src/sys/arch/amiga/pci/cv3dpb.c:1.5 Sat Apr 24 23:36:25 2021
+++ src/sys/arch/amiga/pci/cv3dpb.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cv3dpb.c,v 1.5 2021/04/24 23:36:25 thorpej Exp $ */
+/* $NetBSD: cv3dpb.c,v 1.5.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*-
* Copyright (c) 2011, 2012 The NetBSD Foundation, Inc.
@@ -141,7 +141,7 @@ cv3dpb_attach(device_t parent, device_t
pba.pba_bus = 0;
pba.pba_bridgetag = NULL;
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
}
pcireg_t
Index: src/sys/arch/amiga/pci/em4k.c
diff -u src/sys/arch/amiga/pci/em4k.c:1.7 src/sys/arch/amiga/pci/em4k.c:1.7.8.1
--- src/sys/arch/amiga/pci/em4k.c:1.7 Sat Apr 24 23:36:25 2021
+++ src/sys/arch/amiga/pci/em4k.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: em4k.c,v 1.7 2021/04/24 23:36:25 thorpej Exp $ */
+/* $NetBSD: em4k.c,v 1.7.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -235,7 +235,7 @@ em4k_callback(device_t self) {
em4k_intr_enable(sc);
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
}
#ifdef PCI_NETBSD_CONFIGURE
Index: src/sys/arch/amiga/pci/empb.c
diff -u src/sys/arch/amiga/pci/empb.c:1.14 src/sys/arch/amiga/pci/empb.c:1.14.8.1
--- src/sys/arch/amiga/pci/empb.c:1.14 Sat Apr 24 23:36:25 2021
+++ src/sys/arch/amiga/pci/empb.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: empb.c,v 1.14 2021/04/24 23:36:25 thorpej Exp $ */
+/* $NetBSD: empb.c,v 1.14.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -269,8 +269,7 @@ empb_callback(device_t self) {
empb_intr_enable(sc);
config_found(self, &pba, pcibusprint,
- CFARG_IATTR, "pcibus",
- CFARG_EOL);
+ CFARGS(.iattr = "pcibus"));
}
static void
@@ -280,8 +279,7 @@ empb_empm_attach(struct empb_softc *sc)
aa.setup_area_t = sc->setup_area_t;
config_found(sc->sc_dev, &aa, empb_empm_print,
- CFARG_IATTR, "empmdev",
- CFARG_EOL);
+ CFARGS(.iattr = "empmdev"));
}
static int
Index: src/sys/arch/amiga/pci/mppb.c
diff -u src/sys/arch/amiga/pci/mppb.c:1.11 src/sys/arch/amiga/pci/mppb.c:1.11.8.1
--- src/sys/arch/amiga/pci/mppb.c:1.11 Sat Apr 24 23:36:25 2021
+++ src/sys/arch/amiga/pci/mppb.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mppb.c,v 1.11 2021/04/24 23:36:25 thorpej Exp $ */
+/* $NetBSD: mppb.c,v 1.11.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -186,7 +186,7 @@ mppb_attach(device_t parent, device_t se
pba.pba_bus = 0;
pba.pba_bridgetag = NULL;
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
}
pcireg_t
Index: src/sys/arch/amiga/pci/p5pb.c
diff -u src/sys/arch/amiga/pci/p5pb.c:1.18 src/sys/arch/amiga/pci/p5pb.c:1.18.8.1
--- src/sys/arch/amiga/pci/p5pb.c:1.18 Sat Apr 24 23:36:25 2021
+++ src/sys/arch/amiga/pci/p5pb.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: p5pb.c,v 1.18 2021/04/24 23:36:25 thorpej Exp $ */
+/* $NetBSD: p5pb.c,v 1.18.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*-
* Copyright (c) 2011, 2012 The NetBSD Foundation, Inc.
@@ -219,7 +219,7 @@ p5pb_attach(device_t parent, device_t se
p5pb_set_props(sc);
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
}
/*
Index: src/sys/arch/amigappc/amigappc/autoconf.c
diff -u src/sys/arch/amigappc/amigappc/autoconf.c:1.8 src/sys/arch/amigappc/amigappc/autoconf.c:1.8.6.1
--- src/sys/arch/amigappc/amigappc/autoconf.c:1.8 Tue Apr 27 14:48:28 2021
+++ src/sys/arch/amigappc/amigappc/autoconf.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.8 2021/04/27 14:48:28 thorpej Exp $ */
+/* $NetBSD: autoconf.c,v 1.8.6.1 2021/08/03 23:05:52 thorpej Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -30,10 +30,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#define __SUBR_AUTOCONF_PRIVATE /* XXX amiga_config_found() */
-
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.8 2021/04/27 14:48:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.8.6.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,18 +123,15 @@ matchname(const char *fp, const char *sp
*/
int
amiga_config_found(cfdata_t pcfp, device_t parent, void *aux, cfprint_t pfn,
- cfarg_t tag, ...)
+ const struct cfargs *cfargs)
{
struct device temp;
cfdata_t cf;
const struct cfattach *ca;
int rv = 0;
- va_list ap;
-
- va_start(ap, tag);
if (amiga_realconfig) {
- rv = config_vfound(parent, aux, pfn, tag, ap) != NULL;
+ rv = config_found(parent, aux, pfn, cfargs) != NULL;
goto out;
}
@@ -149,7 +144,7 @@ amiga_config_found(cfdata_t pcfp, device
parent->dv_cfdriver = config_cfdriver_lookup(pcfp->cf_name);
parent->dv_unit = pcfp->cf_unit;
- if ((cf = config_vsearch(parent, aux, tag, ap)) != NULL) {
+ if ((cf = config_search(parent, aux, cfargs)) != NULL) {
ca = config_cfattach_lookup(cf->cf_name, cf->cf_atname);
if (ca != NULL) {
(*ca->ca_attach)(parent, NULL, aux);
@@ -158,7 +153,6 @@ amiga_config_found(cfdata_t pcfp, device
}
parent->dv_cfdata = NULL;
out:
- va_end(ap);
return rv;
}
@@ -184,13 +178,13 @@ config_console(void)
/*
* internal grf.
*/
- amiga_config_found(cf, NULL, __UNCONST("grfcc"), NULL, CFARG_EOL);
+ amiga_config_found(cf, NULL, __UNCONST("grfcc"), NULL, CFARGS_NONE);
/*
* zbus knows when its not for real and will
* only configure the appropriate hardware
*/
- amiga_config_found(cf, NULL, __UNCONST("zbus"), NULL, CFARG_EOL);
+ amiga_config_found(cf, NULL, __UNCONST("zbus"), NULL, CFARGS_NONE);
}
/*
Index: src/sys/arch/amigappc/amigappc/mainbus.c
diff -u src/sys/arch/amigappc/amigappc/mainbus.c:1.5 src/sys/arch/amigappc/amigappc/mainbus.c:1.5.8.1
--- src/sys/arch/amigappc/amigappc/mainbus.c:1.5 Sat Apr 24 23:36:25 2021
+++ src/sys/arch/amigappc/amigappc/mainbus.c Tue Aug 3 23:05:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.5 2021/04/24 23:36:25 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.5.8.1 2021/08/03 23:05:52 thorpej Exp $ */
/*-
* Copyright (c) 2008,2009 Frank Wille.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.5 2021/04/24 23:36:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.5.8.1 2021/08/03 23:05:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -102,40 +102,40 @@ mbattach(device_t parent, device_t self,
/*
* Always find the CPU
*/
- config_found(self, __UNCONST("cpu"), mbprint, CFARG_EOL);
+ config_found(self, __UNCONST("cpu"), mbprint, CFARGS_NONE);
/*
* "find" all the things that should be there.
*/
if (is_a3000() || is_a4000())
config_found(self, __UNCONST("a34kbbc"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
else
config_found(self, __UNCONST("a2kbbc"), simple_devprint,
- CFARG_EOL);
- config_found(self, __UNCONST("ser"), simple_devprint, CFARG_EOL);
- config_found(self, __UNCONST("par"), simple_devprint, CFARG_EOL);
- config_found(self, __UNCONST("kbd"), simple_devprint, CFARG_EOL);
- config_found(self, __UNCONST("ms"), simple_devprint, CFARG_EOL);
- config_found(self, __UNCONST("grfcc"), simple_devprint, CFARG_EOL);
+ CFARGS_NONE);
+ config_found(self, __UNCONST("ser"), simple_devprint, CFARGS_NONE);
+ config_found(self, __UNCONST("par"), simple_devprint, CFARGS_NONE);
+ config_found(self, __UNCONST("kbd"), simple_devprint, CFARGS_NONE);
+ config_found(self, __UNCONST("ms"), simple_devprint, CFARGS_NONE);
+ config_found(self, __UNCONST("grfcc"), simple_devprint, CFARGS_NONE);
config_found(self, __UNCONST("amidisplaycc"), simple_devprint,
- CFARG_EOL);
- config_found(self, __UNCONST("fdc"), simple_devprint, CFARG_EOL);
+ CFARGS_NONE);
+ config_found(self, __UNCONST("fdc"), simple_devprint, CFARGS_NONE);
if (is_a4000() || is_a1200())
config_found(self, __UNCONST("wdc"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
if (is_a4000()) /* Try to configure A4000T SCSI */
config_found(self, __UNCONST("afsc"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
if (is_a3000())
config_found(self, __UNCONST("ahsc"), simple_devprint,
- CFARG_EOL);
+ CFARGS_NONE);
if (is_a1200())
config_found(self, __UNCONST("pccard"), simple_devprint,
- CFARG_EOL);
- config_found(self, __UNCONST("aucc"), simple_devprint, CFARG_EOL);
+ CFARGS_NONE);
+ config_found(self, __UNCONST("aucc"), simple_devprint, CFARGS_NONE);
- config_found(self, __UNCONST("zbus"), simple_devprint, CFARG_EOL);
+ config_found(self, __UNCONST("zbus"), simple_devprint, CFARGS_NONE);
}
int
