Module Name: src
Committed By: thorpej
Date: Wed Aug 4 02:37:21 UTC 2021
Modified Files:
src/sys/arch/landisk/dev [thorpej-cfargs2]: obio.c
src/sys/arch/landisk/landisk [thorpej-cfargs2]: mainbus.c
src/sys/arch/luna68k/dev [thorpej-cfargs2]: lunafb.c lunaws.c sio.c
src/sys/arch/luna68k/luna68k [thorpej-cfargs2]: mainbus.c
src/sys/arch/mac68k/dev [thorpej-cfargs2]: adb.c akbd.c ams.c
grf_subr.c macfb.c ncr5380.c zs.c
src/sys/arch/mac68k/mac68k [thorpej-cfargs2]: mainbus.c
src/sys/arch/mac68k/nubus [thorpej-cfargs2]: nubus.c
src/sys/arch/mac68k/obio [thorpej-cfargs2]: iwm_fd.c obio.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/landisk/dev/obio.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/landisk/landisk/mainbus.c
cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/arch/luna68k/dev/lunafb.c
cvs rdiff -u -r1.32 -r1.32.8.1 src/sys/arch/luna68k/dev/lunaws.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/luna68k/dev/sio.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/luna68k/luna68k/mainbus.c
cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/arch/mac68k/dev/adb.c
cvs rdiff -u -r1.25 -r1.25.8.1 src/sys/arch/mac68k/dev/akbd.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/mac68k/dev/ams.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/mac68k/dev/grf_subr.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/mac68k/dev/macfb.c
cvs rdiff -u -r1.69 -r1.69.8.1 src/sys/arch/mac68k/dev/ncr5380.c
cvs rdiff -u -r1.59 -r1.59.8.1 src/sys/arch/mac68k/dev/zs.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/mac68k/mac68k/mainbus.c
cvs rdiff -u -r1.67 -r1.67.8.1 src/sys/arch/mac68k/nubus/nubus.c
cvs rdiff -u -r1.60 -r1.60.4.1 src/sys/arch/mac68k/obio/iwm_fd.c
cvs rdiff -u -r1.26 -r1.26.8.1 src/sys/arch/mac68k/obio/obio.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/landisk/dev/obio.c
diff -u src/sys/arch/landisk/dev/obio.c:1.10 src/sys/arch/landisk/dev/obio.c:1.10.8.1
--- src/sys/arch/landisk/dev/obio.c:1.10 Sat Apr 24 23:36:40 2021
+++ src/sys/arch/landisk/dev/obio.c Wed Aug 4 02:37:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.10 2021/04/24 23:36:40 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.10.8.1 2021/08/04 02:37:20 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.10 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.10.8.1 2021/08/04 02:37:20 thorpej Exp $");
#include "btn_obio.h"
#include "pwrsw_obio.h"
@@ -106,8 +106,7 @@ obio_attach(device_t parent, device_t se
#endif
config_search(self, NULL,
- CFARG_SEARCH, obio_search,
- CFARG_EOL);
+ CFARGS(.search = obio_search));
}
static int
@@ -143,7 +142,7 @@ obio_search(device_t parent, cfdata_t cf
tryagain = 0;
if (config_probe(parent, cf, &oa)) {
- config_attach(parent, cf, &oa, obio_print, CFARG_EOL);
+ config_attach(parent, cf, &oa, obio_print, CFARGS_NONE);
tryagain = (cf->cf_fstate == FSTATE_STAR);
}
} while (tryagain);
Index: src/sys/arch/landisk/landisk/mainbus.c
diff -u src/sys/arch/landisk/landisk/mainbus.c:1.5 src/sys/arch/landisk/landisk/mainbus.c:1.5.8.1
--- src/sys/arch/landisk/landisk/mainbus.c:1.5 Sat Apr 24 23:36:40 2021
+++ src/sys/arch/landisk/landisk/mainbus.c Wed Aug 4 02:37:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.5 2021/04/24 23:36:40 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.5.8.1 2021/08/04 02:37:20 thorpej Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.5 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.5.8.1 2021/08/04 02:37:20 thorpej Exp $");
#include "obio.h"
#include "pci.h"
@@ -80,19 +80,19 @@ mainbus_attach(device_t parent, device_t
memset(&mba, 0, sizeof(mba));
mba.mba_ca.ca_name = "cpu";
mba.mba_ca.ca_node = 0;
- config_found(self, &mba, mainbus_print, CFARG_EOL);
+ config_found(self, &mba, mainbus_print, CFARGS_NONE);
#if NPCI > 0
/* SH PCIC */
memset(&mba, 0, sizeof(mba));
mba.mba_mba.ma_name = "shpcic";
- config_found(self, &mba, mainbus_print, CFARG_EOL);
+ config_found(self, &mba, mainbus_print, CFARGS_NONE);
#endif
/* SH bus */
memset(&mba, 0, sizeof(mba));
mba.mba_mba.ma_name = "shb";
- config_found(self, &mba, mainbus_print, CFARG_EOL);
+ config_found(self, &mba, mainbus_print, CFARGS_NONE);
#if NOBIO > 0
/* on-board I/O */
@@ -100,7 +100,7 @@ mainbus_attach(device_t parent, device_t
mba.mba_oba.oba_busname = "obio";
mba.mba_oba.oba_iot = &obio_bus_io;
mba.mba_oba.oba_memt = &obio_bus_mem;
- config_found(self, &mba, mainbus_print, CFARG_EOL);
+ config_found(self, &mba, mainbus_print, CFARGS_NONE);
#endif
}
Index: src/sys/arch/luna68k/dev/lunafb.c
diff -u src/sys/arch/luna68k/dev/lunafb.c:1.42 src/sys/arch/luna68k/dev/lunafb.c:1.42.8.1
--- src/sys/arch/luna68k/dev/lunafb.c:1.42 Sat Apr 24 23:36:40 2021
+++ src/sys/arch/luna68k/dev/lunafb.c Wed Aug 4 02:37:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lunafb.c,v 1.42 2021/04/24 23:36:40 thorpej Exp $ */
+/* $NetBSD: lunafb.c,v 1.42.8.1 2021/08/04 02:37:20 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.42 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.42.8.1 2021/08/04 02:37:20 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -218,7 +218,7 @@ omfbattach(device_t parent, device_t sel
waa.accessops = &omfb_accessops;
waa.accesscookie = sc;
- config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE);
}
/* EXPORT */ int
Index: src/sys/arch/luna68k/dev/lunaws.c
diff -u src/sys/arch/luna68k/dev/lunaws.c:1.32 src/sys/arch/luna68k/dev/lunaws.c:1.32.8.1
--- src/sys/arch/luna68k/dev/lunaws.c:1.32 Sat Apr 24 23:36:40 2021
+++ src/sys/arch/luna68k/dev/lunaws.c Wed Aug 4 02:37:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lunaws.c,v 1.32 2021/04/24 23:36:40 thorpej Exp $ */
+/* $NetBSD: lunaws.c,v 1.32.8.1 2021/08/04 02:37:20 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.32 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.32.8.1 2021/08/04 02:37:20 thorpej Exp $");
#include "opt_wsdisplay_compat.h"
#include "wsmouse.h"
@@ -175,8 +175,7 @@ wsattach(device_t parent, device_t self,
a.accessops = &omkbd_accessops;
a.accesscookie = (void *)sc;
sc->sc_wskbddev = config_found(self, &a, wskbddevprint,
- CFARG_IATTR, "wskbddev",
- CFARG_EOL);
+ CFARGS(.iattr = "wskbddev"));
#if NWSMOUSE > 0
{
@@ -184,8 +183,7 @@ wsattach(device_t parent, device_t self,
b.accessops = &omms_accessops;
b.accesscookie = (void *)sc;
sc->sc_wsmousedev = config_found(self, &b, wsmousedevprint,
- CFARG_IATTR, "wsmousedev",
- CFARG_EOL);
+ CFARGS(.iattr = "wsmousedev"));
sc->sc_msreport = 0;
}
#endif
Index: src/sys/arch/luna68k/dev/sio.c
diff -u src/sys/arch/luna68k/dev/sio.c:1.14 src/sys/arch/luna68k/dev/sio.c:1.14.8.1
--- src/sys/arch/luna68k/dev/sio.c:1.14 Sat Apr 24 23:36:40 2021
+++ src/sys/arch/luna68k/dev/sio.c Wed Aug 4 02:37:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sio.c,v 1.14 2021/04/24 23:36:40 thorpej Exp $ */
+/* $NetBSD: sio.c,v 1.14.8.1 2021/08/04 02:37:20 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.14 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.14.8.1 2021/08/04 02:37:20 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,7 +84,7 @@ sio_attach(device_t parent, device_t sel
sc->sc_intrhand[channel].ih_func = nullintr;
sio_args.channel = channel;
sio_args.hwflags = (channel == sysconsole);
- config_found(self, (void *)&sio_args, sio_print, CFARG_EOL);
+ config_found(self, (void *)&sio_args, sio_print, CFARGS_NONE);
}
isrlink_autovec(xsiointr, sc, ma->ma_ilvl, ISRPRI_TTYNOBUF);
Index: src/sys/arch/luna68k/luna68k/mainbus.c
diff -u src/sys/arch/luna68k/luna68k/mainbus.c:1.16 src/sys/arch/luna68k/luna68k/mainbus.c:1.16.8.1
--- src/sys/arch/luna68k/luna68k/mainbus.c:1.16 Sat Apr 24 23:36:40 2021
+++ src/sys/arch/luna68k/luna68k/mainbus.c Wed Aug 4 02:37:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.16 2021/04/24 23:36:40 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.16.8.1 2021/08/04 02:37:20 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.16 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.16.8.1 2021/08/04 02:37:20 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -97,7 +97,7 @@ mainbus_attach(device_t parent, device_t
aprint_normal("\n");
for (i = 0; i < ndevs; i++) {
ma = devs[i];
- config_found(self, &ma, mainbus_print, CFARG_EOL);
+ config_found(self, &ma, mainbus_print, CFARGS_NONE);
}
}
Index: src/sys/arch/mac68k/dev/adb.c
diff -u src/sys/arch/mac68k/dev/adb.c:1.58 src/sys/arch/mac68k/dev/adb.c:1.58.8.1
--- src/sys/arch/mac68k/dev/adb.c:1.58 Sat Apr 24 23:36:40 2021
+++ src/sys/arch/mac68k/dev/adb.c Wed Aug 4 02:37:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: adb.c,v 1.58 2021/04/24 23:36:40 thorpej Exp $ */
+/* $NetBSD: adb.c,v 1.58.8.1 2021/08/04 02:37:20 thorpej Exp $ */
/*
* Copyright (C) 1994 Bradley A. Grantham
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.58 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.58.8.1 2021/08/04 02:37:20 thorpej Exp $");
#include "opt_adb.h"
@@ -162,7 +162,7 @@ adb_config_interrupts(device_t self)
aa_args.origaddr = 0;
aa_args.adbaddr = 0;
aa_args.handler_id = 0;
- (void)config_found(self, &aa_args, adbprint, CFARG_EOL);
+ (void)config_found(self, &aa_args, adbprint, CFARGS_NONE);
#endif
/* for each ADB device */
@@ -174,7 +174,7 @@ adb_config_interrupts(device_t self)
aa_args.adbaddr = adbaddr;
aa_args.handler_id = (int)(adbdata.devType);
- (void)config_found(self, &aa_args, adbprint, CFARG_EOL);
+ (void)config_found(self, &aa_args, adbprint, CFARGS_NONE);
}
adb_polling = 0;
}
Index: src/sys/arch/mac68k/dev/akbd.c
diff -u src/sys/arch/mac68k/dev/akbd.c:1.25 src/sys/arch/mac68k/dev/akbd.c:1.25.8.1
--- src/sys/arch/mac68k/dev/akbd.c:1.25 Sat Apr 24 23:36:40 2021
+++ src/sys/arch/mac68k/dev/akbd.c Wed Aug 4 02:37:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: akbd.c,v 1.25 2021/04/24 23:36:40 thorpej Exp $ */
+/* $NetBSD: akbd.c,v 1.25.8.1 2021/08/04 02:37:20 thorpej Exp $ */
/*
* Copyright (C) 1998 Colin Wood
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.25 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.25.8.1 2021/08/04 02:37:20 thorpej Exp $");
#include "opt_adb.h"
@@ -262,7 +262,7 @@ akbdattach(device_t parent, device_t sel
a.accessops = &akbd_accessops;
a.accesscookie = sc;
- sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARG_EOL);
+ sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARGS_NONE);
#endif
}
Index: src/sys/arch/mac68k/dev/ams.c
diff -u src/sys/arch/mac68k/dev/ams.c:1.24 src/sys/arch/mac68k/dev/ams.c:1.24.8.1
--- src/sys/arch/mac68k/dev/ams.c:1.24 Sat Apr 24 23:36:40 2021
+++ src/sys/arch/mac68k/dev/ams.c Wed Aug 4 02:37:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ams.c,v 1.24 2021/04/24 23:36:40 thorpej Exp $ */
+/* $NetBSD: ams.c,v 1.24.8.1 2021/08/04 02:37:20 thorpej Exp $ */
/*
* Copyright (C) 1998 Colin Wood
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ams.c,v 1.24 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ams.c,v 1.24.8.1 2021/08/04 02:37:20 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -196,7 +196,7 @@ amsattach(device_t parent, device_t self
#if NWSMOUSE > 0
a.accessops = &ams_accessops;
a.accesscookie = sc;
- sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL);
+ sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARGS_NONE);
#endif
}
Index: src/sys/arch/mac68k/dev/grf_subr.c
diff -u src/sys/arch/mac68k/dev/grf_subr.c:1.23 src/sys/arch/mac68k/dev/grf_subr.c:1.23.8.1
--- src/sys/arch/mac68k/dev/grf_subr.c:1.23 Sat Apr 24 23:36:40 2021
+++ src/sys/arch/mac68k/dev/grf_subr.c Wed Aug 4 02:37:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_subr.c,v 1.23 2021/04/24 23:36:40 thorpej Exp $ */
+/* $NetBSD: grf_subr.c,v 1.23.8.1 2021/08/04 02:37:20 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_subr.c,v 1.23 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_subr.c,v 1.23.8.1 2021/08/04 02:37:20 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -66,7 +66,7 @@ grf_establish(struct grfbus_softc *sc, n
ga.ga_mode = g_mode;
ga.ga_set_mapreg = sc->sc_set_mapreg;
ga.ga_parent = sc;
- (void)config_found(sc->sc_dev, &ga, grfbusprint, CFARG_EOL);
+ (void)config_found(sc->sc_dev, &ga, grfbusprint, CFARGS_NONE);
}
int
Index: src/sys/arch/mac68k/dev/macfb.c
diff -u src/sys/arch/mac68k/dev/macfb.c:1.22 src/sys/arch/mac68k/dev/macfb.c:1.22.8.1
--- src/sys/arch/mac68k/dev/macfb.c:1.22 Sat Apr 24 23:36:40 2021
+++ src/sys/arch/mac68k/dev/macfb.c Wed Aug 4 02:37:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: macfb.c,v 1.22 2021/04/24 23:36:40 thorpej Exp $ */
+/* $NetBSD: macfb.c,v 1.22.8.1 2021/08/04 02:37:20 thorpej Exp $ */
/*
* Copyright (c) 1998 Matt DeBergalis
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: macfb.c,v 1.22 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: macfb.c,v 1.22.8.1 2021/08/04 02:37:20 thorpej Exp $");
#include "opt_wsdisplay_compat.h"
#include "grf.h"
@@ -230,7 +230,7 @@ macfb_attach(device_t parent, device_t s
waa.accessops = &macfb_accessops;
waa.accesscookie = sc;
- config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE);
#if NGRF > 0
grf_attach(sc, device_unit(self));
Index: src/sys/arch/mac68k/dev/ncr5380.c
diff -u src/sys/arch/mac68k/dev/ncr5380.c:1.69 src/sys/arch/mac68k/dev/ncr5380.c:1.69.8.1
--- src/sys/arch/mac68k/dev/ncr5380.c:1.69 Sat Apr 24 23:36:40 2021
+++ src/sys/arch/mac68k/dev/ncr5380.c Wed Aug 4 02:37:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr5380.c,v 1.69 2021/04/24 23:36:40 thorpej Exp $ */
+/* $NetBSD: ncr5380.c,v 1.69.8.1 2021/08/04 02:37:20 thorpej Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ncr5380.c,v 1.69 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr5380.c,v 1.69.8.1 2021/08/04 02:37:20 thorpej Exp $");
/*
* Bit mask of targets you want debugging to be shown
@@ -247,7 +247,7 @@ ncr_attach(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/mac68k/dev/zs.c
diff -u src/sys/arch/mac68k/dev/zs.c:1.59 src/sys/arch/mac68k/dev/zs.c:1.59.8.1
--- src/sys/arch/mac68k/dev/zs.c:1.59 Sat Apr 24 23:36:40 2021
+++ src/sys/arch/mac68k/dev/zs.c Wed Aug 4 02:37:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.59 2021/04/24 23:36:40 thorpej Exp $ */
+/* $NetBSD: zs.c,v 1.59.8.1 2021/08/04 02:37:20 thorpej Exp $ */
/*
* Copyright (c) 1996-1998 Bill Studenmund
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.59 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.59.8.1 2021/08/04 02:37:20 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_mac68k.h"
@@ -364,7 +364,7 @@ zsc_attach(device_t parent, device_t sel
* The child attach will setup the hardware.
*/
if (!config_found(self, (void *)&zsc_args, zsc_print,
- CFARG_EOL)) {
+ CFARGS_NONE)) {
/* No sub-driver. Just reset it. */
uint8_t reset = (channel == 0) ?
ZSWR9_A_RESET : ZSWR9_B_RESET;
Index: src/sys/arch/mac68k/mac68k/mainbus.c
diff -u src/sys/arch/mac68k/mac68k/mainbus.c:1.22 src/sys/arch/mac68k/mac68k/mainbus.c:1.22.8.1
--- src/sys/arch/mac68k/mac68k/mainbus.c:1.22 Sat Apr 24 23:36:40 2021
+++ src/sys/arch/mac68k/mac68k/mainbus.c Wed Aug 4 02:37:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.22 2021/04/24 23:36:40 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.22.8.1 2021/08/04 02:37:20 thorpej Exp $ */
/*
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.22 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.22.8.1 2021/08/04 02:37:20 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -93,8 +93,7 @@ mainbus_attach(device_t parent, device_t
/* Search for and attach children. */
config_search(self, &mba,
- CFARG_SEARCH, mainbus_search,
- CFARG_EOL);
+ CFARGS(.search = mainbus_search));
}
static int
@@ -102,6 +101,6 @@ mainbus_search(device_t parent, cfdata_t
const int *ldesc, void *aux)
{
if (config_probe(parent, cf, aux))
- config_attach(parent, cf, aux, NULL, CFARG_EOL);
+ config_attach(parent, cf, aux, NULL, CFARGS_NONE);
return 0;
}
Index: src/sys/arch/mac68k/nubus/nubus.c
diff -u src/sys/arch/mac68k/nubus/nubus.c:1.67 src/sys/arch/mac68k/nubus/nubus.c:1.67.8.1
--- src/sys/arch/mac68k/nubus/nubus.c:1.67 Sat Apr 24 23:36:41 2021
+++ src/sys/arch/mac68k/nubus/nubus.c Wed Aug 4 02:37:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nubus.c,v 1.67 2021/04/24 23:36:41 thorpej Exp $ */
+/* $NetBSD: nubus.c,v 1.67.8.1 2021/08/04 02:37:20 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996 Allen Briggs. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nubus.c,v 1.67 2021/04/24 23:36:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nubus.c,v 1.67.8.1 2021/08/04 02:37:20 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -249,7 +249,7 @@ notfound:
bus_space_unmap(bst, bsh, NBMEMSIZE);
- config_found(self, &na_args, nubus_print, CFARG_EOL);
+ config_found(self, &na_args, nubus_print, CFARGS_NONE);
}
enable_nubus_intr();
Index: src/sys/arch/mac68k/obio/iwm_fd.c
diff -u src/sys/arch/mac68k/obio/iwm_fd.c:1.60 src/sys/arch/mac68k/obio/iwm_fd.c:1.60.4.1
--- src/sys/arch/mac68k/obio/iwm_fd.c:1.60 Thu May 13 08:47:21 2021
+++ src/sys/arch/mac68k/obio/iwm_fd.c Wed Aug 4 02:37:21 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: iwm_fd.c,v 1.60 2021/05/13 08:47:21 hauke Exp $ */
+/* $NetBSD: iwm_fd.c,v 1.60.4.1 2021/08/04 02:37:21 thorpej Exp $ */
/*
* Copyright (c) 1997, 1998 Hauke Fath. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.60 2021/05/13 08:47:21 hauke Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.60.4.1 2021/08/04 02:37:21 thorpej Exp $");
#include "locators.h"
@@ -372,7 +372,7 @@ iwm_attach(device_t parent, device_t sel
ia.driveType = getFDType(ia.unit);
if (NULL != ia.driveType)
config_found(self, (void *)&ia,
- fd_print, CFARG_EOL);
+ fd_print, CFARGS_NONE);
}
if (TRACE_CONFIG)
printf("iwm: Initialization completed.\n");
Index: src/sys/arch/mac68k/obio/obio.c
diff -u src/sys/arch/mac68k/obio/obio.c:1.26 src/sys/arch/mac68k/obio/obio.c:1.26.8.1
--- src/sys/arch/mac68k/obio/obio.c:1.26 Sat Apr 24 23:36:41 2021
+++ src/sys/arch/mac68k/obio/obio.c Wed Aug 4 02:37:21 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.26 2021/04/24 23:36:41 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.26.8.1 2021/08/04 02:37:21 thorpej Exp $ */
/*
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.26 2021/04/24 23:36:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.26.8.1 2021/08/04 02:37:21 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -70,8 +70,7 @@ obio_attach(device_t parent, device_t se
/* Search for and attach children. */
config_search(self, aux,
- CFARG_SEARCH, obio_search,
- CFARG_EOL);
+ CFARGS(.search = obio_search));
}
int
@@ -96,7 +95,7 @@ obio_search(device_t parent, cfdata_t cf
oa.oa_dmat = mba->mba_dmat;
if (config_probe(parent, cf, &oa))
- config_attach(parent, cf, &oa, obio_print, CFARG_EOL);
+ config_attach(parent, cf, &oa, obio_print, CFARGS_NONE);
return (0);
}
