Module Name: src
Committed By: thorpej
Date: Wed Aug 4 02:53:01 UTC 2021
Modified Files:
src/sys/arch/riscv/htif [thorpej-cfargs2]: htif.c
src/sys/arch/riscv/riscv [thorpej-cfargs2]: mainbus.c
src/sys/arch/rs6000/mca [thorpej-cfargs2]: ioplanar.c
src/sys/arch/rs6000/rs6000 [thorpej-cfargs2]: mainbus.c
src/sys/arch/sandpoint/sandpoint [thorpej-cfargs2]: eumb.c mainbus.c
nhpow.c
src/sys/arch/sbmips/sbmips [thorpej-cfargs2]: zbbus.c
src/sys/arch/sgimips/dev [thorpej-cfargs2]: crmfb.c imc.c pic.c zs.c
zs_kbd.c zs_ms.c
src/sys/arch/sgimips/gio [thorpej-cfargs2]: gio.c grtwo.c light.c
newport.c pci_gio.c
src/sys/arch/sgimips/hpc [thorpej-cfargs2]: hpc.c pi1ppc.c
src/sys/arch/sgimips/ioc [thorpej-cfargs2]: ioc.c oioc.c
src/sys/arch/sgimips/mace [thorpej-cfargs2]: mace.c pci_mace.c
src/sys/arch/sgimips/sgimips [thorpej-cfargs2]: mainbus.c
src/sys/arch/sh3/dev [thorpej-cfargs2]: adc.c shb.c shpcic.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/riscv/htif/htif.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/riscv/riscv/mainbus.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/rs6000/mca/ioplanar.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/rs6000/rs6000/mainbus.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/sandpoint/sandpoint/eumb.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/sandpoint/sandpoint/mainbus.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/sandpoint/sandpoint/nhpow.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/sbmips/sbmips/zbbus.c
cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/arch/sgimips/dev/crmfb.c
cvs rdiff -u -r1.36 -r1.36.8.1 src/sys/arch/sgimips/dev/imc.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/sgimips/dev/pic.c
cvs rdiff -u -r1.40 -r1.40.8.1 src/sys/arch/sgimips/dev/zs.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/sgimips/dev/zs_kbd.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/sgimips/dev/zs_ms.c
cvs rdiff -u -r1.37 -r1.37.8.1 src/sys/arch/sgimips/gio/gio.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/sgimips/gio/grtwo.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/sgimips/gio/light.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/sgimips/gio/newport.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/sgimips/gio/pci_gio.c
cvs rdiff -u -r1.72 -r1.72.8.1 src/sys/arch/sgimips/hpc/hpc.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/sgimips/hpc/pi1ppc.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/sgimips/ioc/ioc.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/sgimips/ioc/oioc.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/sgimips/mace/mace.c \
src/sys/arch/sgimips/mace/pci_mace.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/sgimips/sgimips/mainbus.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/sh3/dev/adc.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/sh3/dev/shb.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/sh3/dev/shpcic.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/riscv/htif/htif.c
diff -u src/sys/arch/riscv/htif/htif.c:1.3 src/sys/arch/riscv/htif/htif.c:1.3.8.1
--- src/sys/arch/riscv/htif/htif.c:1.3 Sat Apr 24 23:36:47 2021
+++ src/sys/arch/riscv/htif/htif.c Wed Aug 4 02:52:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: htif.c,v 1.3 2021/04/24 23:36:47 thorpej Exp $ */
+/* $NetBSD: htif.c,v 1.3.8.1 2021/08/04 02:52:59 thorpej Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__RCSID("$NetBSD: htif.c,v 1.3 2021/04/24 23:36:47 thorpej Exp $");
+__RCSID("$NetBSD: htif.c,v 1.3.8.1 2021/08/04 02:52:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -68,7 +68,7 @@ htif_mainbus_attach(device_t parent, dev
struct htif_attach_args haa;
haa.haa_name = "htifcons";
- config_found(self, &haa, htif_mainbus_print, CFARG_EOL);
+ config_found(self, &haa, htif_mainbus_print, CFARGS_NONE);
haa.haa_name = "htifdisk";
- config_found(self, &haa, htif_mainbus_print, CFARG_EOL);
+ config_found(self, &haa, htif_mainbus_print, CFARGS_NONE);
}
Index: src/sys/arch/riscv/riscv/mainbus.c
diff -u src/sys/arch/riscv/riscv/mainbus.c:1.3 src/sys/arch/riscv/riscv/mainbus.c:1.3.8.1
--- src/sys/arch/riscv/riscv/mainbus.c:1.3 Sat Apr 24 23:36:47 2021
+++ src/sys/arch/riscv/riscv/mainbus.c Wed Aug 4 02:52:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.3 2021/04/24 23:36:47 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.3.8.1 2021/08/04 02:52:59 thorpej Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__RCSID("$NetBSD: mainbus.c,v 1.3 2021/04/24 23:36:47 thorpej Exp $");
+__RCSID("$NetBSD: mainbus.c,v 1.3.8.1 2021/08/04 02:52:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,5 +72,5 @@ mainbus_attach(device_t parent, device_t
maa.maa_name = "cpu";
maa.maa_instance = 0;
- config_found(self, &maa, mainbus_print, CFARG_EOL);
+ config_found(self, &maa, mainbus_print, CFARGS_NONE);
}
Index: src/sys/arch/rs6000/mca/ioplanar.c
diff -u src/sys/arch/rs6000/mca/ioplanar.c:1.5 src/sys/arch/rs6000/mca/ioplanar.c:1.5.8.1
--- src/sys/arch/rs6000/mca/ioplanar.c:1.5 Sat Apr 24 23:36:47 2021
+++ src/sys/arch/rs6000/mca/ioplanar.c Wed Aug 4 02:52:59 2021
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioplanar.c,v 1.5 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioplanar.c,v 1.5.8.1 2021/08/04 02:52:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -87,8 +87,7 @@ ioplanar_attach(device_t parent, device_
sc->sc_devid = ma->ma_id;
config_search(self, aux,
- CFARG_SEARCH, ioplanar_search,
- CFARG_EOL);
+ CFARGS(.search = ioplanar_search));
}
static int
@@ -110,7 +109,7 @@ ioplanar_search(device_t parent, cfdata_
idaa.idaa_device = rainbow_map[i];
if (config_probe(parent, cf, &idaa))
config_attach(parent, cf, &idaa,
- ioplanar_print, CFARG_EOL);
+ ioplanar_print, CFARGS_NONE);
}
break;
default:
Index: src/sys/arch/rs6000/rs6000/mainbus.c
diff -u src/sys/arch/rs6000/rs6000/mainbus.c:1.6 src/sys/arch/rs6000/rs6000/mainbus.c:1.6.8.1
--- src/sys/arch/rs6000/rs6000/mainbus.c:1.6 Sat Apr 24 23:36:47 2021
+++ src/sys/arch/rs6000/rs6000/mainbus.c Wed Aug 4 02:52:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.6 2021/04/24 23:36:47 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.6.8.1 2021/08/04 02:52:59 thorpej Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6.8.1 2021/08/04 02:52:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/extent.h>
@@ -96,8 +96,7 @@ mainbus_attach(device_t parent, device_t
ca.ca_name = "cpu";
ca.ca_node = 0;
config_found(self, &ca, mainbus_print,
- CFARG_IATTR, "mainbus",
- CFARG_EOL);
+ CFARGS(.iattr = "mainbus"));
#if DEBUG
printf("scanning MCA bus\n");
@@ -118,9 +117,7 @@ mainbus_attach(device_t parent, device_t
mba.mba_mba.mba_mc = NULL;
mba.mba_mba.mba_bus = 0;
config_found(self, &mba.mba_mba, mcabusprint,
- CFARG_IATTR, "mcabus",
- CFARG_EOL);
-
+ CFARGS(.iattr = "mcabus"));
}
int
Index: src/sys/arch/sandpoint/sandpoint/eumb.c
diff -u src/sys/arch/sandpoint/sandpoint/eumb.c:1.7 src/sys/arch/sandpoint/sandpoint/eumb.c:1.7.8.1
--- src/sys/arch/sandpoint/sandpoint/eumb.c:1.7 Sat Apr 24 23:36:47 2021
+++ src/sys/arch/sandpoint/sandpoint/eumb.c Wed Aug 4 02:52:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: eumb.c,v 1.7 2021/04/24 23:36:47 thorpej Exp $ */
+/* $NetBSD: eumb.c,v 1.7.8.1 2021/08/04 02:52:59 thorpej Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eumb.c,v 1.7 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eumb.c,v 1.7.8.1 2021/08/04 02:52:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -70,8 +70,7 @@ eumb_attach(device_t parent, device_t se
aprint_naive("\n");
aprint_normal("\n");
config_search(self, aux,
- CFARG_SEARCH, eumb_search,
- CFARG_EOL);
+ CFARGS(.search = eumb_search));
}
static int
@@ -84,7 +83,7 @@ eumb_search(device_t parent, cfdata_t cf
eaa.eumb_bt = ma->ma_bst;
eaa.eumb_unit = cf->cf_loc[EUMBCF_UNIT];
if (config_probe(parent, cf, &eaa))
- config_attach(parent, cf, &eaa, eumb_print, CFARG_EOL);
+ config_attach(parent, cf, &eaa, eumb_print, CFARGS_NONE);
return 0;
}
Index: src/sys/arch/sandpoint/sandpoint/mainbus.c
diff -u src/sys/arch/sandpoint/sandpoint/mainbus.c:1.33 src/sys/arch/sandpoint/sandpoint/mainbus.c:1.33.8.1
--- src/sys/arch/sandpoint/sandpoint/mainbus.c:1.33 Sat Apr 24 23:36:47 2021
+++ src/sys/arch/sandpoint/sandpoint/mainbus.c Wed Aug 4 02:52:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.33 2021/04/24 23:36:47 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.33.8.1 2021/08/04 02:52:59 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.33 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.33.8.1 2021/08/04 02:52:59 thorpej Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -92,14 +92,12 @@ mainbus_attach(device_t parent, device_t
mba.ma_name = "cpu";
config_found(self, &mba, mainbus_print,
- CFARG_IATTR, "mainbus",
- CFARG_EOL);
+ CFARGS(.iattr = "mainbus"));
mba.ma_name = "eumb";
mba.ma_bst = &sandpoint_eumb_space_tag;
config_found(self, &mba, mainbus_print,
- CFARG_IATTR, "mainbus",
- CFARG_EOL);
+ CFARGS(.iattr = "mainbus"));
pfam = lookup_bootinfo(BTINFO_PRODFAMILY);
if (pfam != NULL && strcmp(pfam->name, "nhnas") == 0) {
@@ -107,15 +105,13 @@ mainbus_attach(device_t parent, device_t
mba.ma_name = "nhpow";
mba.ma_bst = &sandpoint_nhgpio_space_tag;
config_found(self, &mba, mainbus_print,
- CFARG_IATTR, "mainbus",
- CFARG_EOL);
+ CFARGS(.iattr = "mainbus"));
}
mba.ma_name = "cfi";
mba.ma_bst = &sandpoint_flash_space_tag;
config_found(self, &mba, mainbus_print,
- CFARG_IATTR, "mainbus",
- CFARG_EOL);
+ CFARGS(.iattr = "mainbus"));
/*
* XXX Note also that the presence of a PCI bus should
@@ -147,8 +143,7 @@ mainbus_attach(device_t parent, device_t
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
config_found(self, &pba, pcibusprint,
- CFARG_IATTR, "pcibus",
- CFARG_EOL);
+ CFARGS(.iattr = "pcibus"));
#endif
}
Index: src/sys/arch/sandpoint/sandpoint/nhpow.c
diff -u src/sys/arch/sandpoint/sandpoint/nhpow.c:1.3 src/sys/arch/sandpoint/sandpoint/nhpow.c:1.3.8.1
--- src/sys/arch/sandpoint/sandpoint/nhpow.c:1.3 Sat Apr 24 23:36:47 2021
+++ src/sys/arch/sandpoint/sandpoint/nhpow.c Wed Aug 4 02:52:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nhpow.c,v 1.3 2021/04/24 23:36:47 thorpej Exp $ */
+/* $NetBSD: nhpow.c,v 1.3.8.1 2021/08/04 02:52:59 thorpej Exp $ */
/*-
* Copyright (c) 2012 Frank Wille.
@@ -32,7 +32,7 @@
* NH230/231 power and LED control, button handling
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nhpow.c,v 1.3 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nhpow.c,v 1.3.8.1 2021/08/04 02:52:59 thorpej Exp $");
#include "gpio.h"
#include <sys/param.h>
@@ -208,7 +208,7 @@ nhpow_attach(device_t parent, device_t s
gba.gba_gc = &sc->sc_gpio_gc;
gba.gba_pins = sc->sc_gpio_pins;
gba.gba_npins = NHGPIO_PINS;
- config_found(self, &gba, gpiobus_print, CFARG_EOL);
+ config_found(self, &gba, gpiobus_print, CFARGS_NONE);
#endif
}
Index: src/sys/arch/sbmips/sbmips/zbbus.c
diff -u src/sys/arch/sbmips/sbmips/zbbus.c:1.13 src/sys/arch/sbmips/sbmips/zbbus.c:1.13.8.1
--- src/sys/arch/sbmips/sbmips/zbbus.c:1.13 Sat Apr 24 23:36:47 2021
+++ src/sys/arch/sbmips/sbmips/zbbus.c Wed Aug 4 02:53:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zbbus.c,v 1.13 2021/04/24 23:36:47 thorpej Exp $ */
+/* $NetBSD: zbbus.c,v 1.13.8.1 2021/08/04 02:53:00 thorpej Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zbbus.c,v 1.13 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zbbus.c,v 1.13.8.1 2021/08/04 02:53:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,8 +89,7 @@ zbbus_attach(device_t parent, device_t s
memset(&za, 0, sizeof za);
za.za_locs = sb1250_zbbus_devs[i];
config_found(self, &za, zbbus_print,
- CFARG_SUBMATCH, zbbus_submatch,
- CFARG_EOL);
+ CFARGS(.submatch = zbbus_submatch));
}
return;
Index: src/sys/arch/sgimips/dev/crmfb.c
diff -u src/sys/arch/sgimips/dev/crmfb.c:1.48 src/sys/arch/sgimips/dev/crmfb.c:1.48.8.1
--- src/sys/arch/sgimips/dev/crmfb.c:1.48 Sat Apr 24 23:36:47 2021
+++ src/sys/arch/sgimips/dev/crmfb.c Wed Aug 4 02:53:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: crmfb.c,v 1.48 2021/04/24 23:36:47 thorpej Exp $ */
+/* $NetBSD: crmfb.c,v 1.48.8.1 2021/08/04 02:53:00 thorpej Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <[email protected]>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: crmfb.c,v 1.48 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: crmfb.c,v 1.48.8.1 2021/08/04 02:53:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -415,7 +415,7 @@ crmfb_attach(device_t parent, device_t s
aa.accessops = &crmfb_accessops;
aa.accesscookie = &sc->sc_vd;
- config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &aa, wsemuldisplaydevprint, CFARGS_NONE);
sc->sc_cur_x = 0;
sc->sc_cur_y = 0;
Index: src/sys/arch/sgimips/dev/imc.c
diff -u src/sys/arch/sgimips/dev/imc.c:1.36 src/sys/arch/sgimips/dev/imc.c:1.36.8.1
--- src/sys/arch/sgimips/dev/imc.c:1.36 Sat Apr 24 23:36:47 2021
+++ src/sys/arch/sgimips/dev/imc.c Wed Aug 4 02:53:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: imc.c,v 1.36 2021/04/24 23:36:47 thorpej Exp $ */
+/* $NetBSD: imc.c,v 1.36.8.1 2021/08/04 02:53:00 thorpej Exp $ */
/*
* Copyright (c) 2001 Rafal K. Boni
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imc.c,v 1.36 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imc.c,v 1.36.8.1 2021/08/04 02:53:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -231,16 +231,14 @@ imc_attach(device_t parent, device_t sel
memset(&iaa, 0, sizeof(iaa));
config_found(self, &iaa, eisabusprint,
- CFARG_IATTR, "eisabus",
- CFARG_EOL);
+ CFARGS(.iattr = "eisabus"));
#endif
}
memset(&iaa, 0, sizeof(iaa));
config_found(self, &iaa, imc_print,
- CFARG_IATTR, "giobus",
- CFARG_EOL);
+ CFARGS(.iattr = "giobus"));
imc_watchdog_enable();
}
Index: src/sys/arch/sgimips/dev/pic.c
diff -u src/sys/arch/sgimips/dev/pic.c:1.18 src/sys/arch/sgimips/dev/pic.c:1.18.8.1
--- src/sys/arch/sgimips/dev/pic.c:1.18 Sat Apr 24 23:36:47 2021
+++ src/sys/arch/sgimips/dev/pic.c Wed Aug 4 02:53:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pic.c,v 1.18 2021/04/24 23:36:47 thorpej Exp $ */
+/* $NetBSD: pic.c,v 1.18.8.1 2021/08/04 02:53:00 thorpej Exp $ */
/*
* Copyright (c) 2002 Steve Rumble
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.18 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.18.8.1 2021/08/04 02:53:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -184,7 +184,7 @@ pic_attach(device_t parent, device_t sel
* machines use VME for their expansion bus.
*/
iaa.iaa_name = "gio";
- (void)config_found(self, (void *)&iaa, pic_print, CFARG_EOL);
+ (void)config_found(self, (void *)&iaa, pic_print, CFARGS_NONE);
pic_watchdog_enable();
}
Index: src/sys/arch/sgimips/dev/zs.c
diff -u src/sys/arch/sgimips/dev/zs.c:1.40 src/sys/arch/sgimips/dev/zs.c:1.40.8.1
--- src/sys/arch/sgimips/dev/zs.c:1.40 Sat Apr 24 23:36:47 2021
+++ src/sys/arch/sgimips/dev/zs.c Wed Aug 4 02:53:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.40 2021/04/24 23:36:47 thorpej Exp $ */
+/* $NetBSD: zs.c,v 1.40.8.1 2021/08/04 02:53:00 thorpej Exp $ */
/*-
* Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.40 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.40.8.1 2021/08/04 02:53:00 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -315,7 +315,7 @@ zs_hpc_attach(device_t parent, device_t
* The child attach will setup the hardware.
*/
if (!config_found(self, (void *)&zsc_args, zs_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/sgimips/dev/zs_kbd.c
diff -u src/sys/arch/sgimips/dev/zs_kbd.c:1.12 src/sys/arch/sgimips/dev/zs_kbd.c:1.12.8.1
--- src/sys/arch/sgimips/dev/zs_kbd.c:1.12 Sat Apr 24 23:36:47 2021
+++ src/sys/arch/sgimips/dev/zs_kbd.c Wed Aug 4 02:53:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_kbd.c,v 1.12 2021/04/24 23:36:47 thorpej Exp $ */
+/* $NetBSD: zs_kbd.c,v 1.12.8.1 2021/08/04 02:53:00 thorpej Exp $ */
/*
* Copyright (c) 2004 Steve Rumble
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_kbd.c,v 1.12 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_kbd.c,v 1.12.8.1 2021/08/04 02:53:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -248,7 +248,7 @@ zskbd_attach(device_t parent, device_t s
wskaa.accessops = &zskbd_wskbd_accessops;
wskaa.accesscookie = cs;
sc->sc_dc->wskbddev = config_found(self, &wskaa, wskbddevprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
static void
Index: src/sys/arch/sgimips/dev/zs_ms.c
diff -u src/sys/arch/sgimips/dev/zs_ms.c:1.9 src/sys/arch/sgimips/dev/zs_ms.c:1.9.8.1
--- src/sys/arch/sgimips/dev/zs_ms.c:1.9 Sat Apr 24 23:36:47 2021
+++ src/sys/arch/sgimips/dev/zs_ms.c Wed Aug 4 02:53:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_ms.c,v 1.9 2021/04/24 23:36:47 thorpej Exp $ */
+/* $NetBSD: zs_ms.c,v 1.9.8.1 2021/08/04 02:53:00 thorpej Exp $ */
/*
* Copyright (c) 2004 Steve Rumble
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_ms.c,v 1.9 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_ms.c,v 1.9.8.1 2021/08/04 02:53:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -171,7 +171,7 @@ zsms_attach(device_t parent, device_t se
wsmaa.accessops = &zsms_wsmouse_accessops;
wsmaa.accesscookie = sc;
sc->wsmousedev = config_found(self, &wsmaa, wsmousedevprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
void
Index: src/sys/arch/sgimips/gio/gio.c
diff -u src/sys/arch/sgimips/gio/gio.c:1.37 src/sys/arch/sgimips/gio/gio.c:1.37.8.1
--- src/sys/arch/sgimips/gio/gio.c:1.37 Sat Apr 24 23:36:48 2021
+++ src/sys/arch/sgimips/gio/gio.c Wed Aug 4 02:53:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gio.c,v 1.37 2021/04/24 23:36:48 thorpej Exp $ */
+/* $NetBSD: gio.c,v 1.37.8.1 2021/08/04 02:53:00 thorpej Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gio.c,v 1.37 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gio.c,v 1.37.8.1 2021/08/04 02:53:00 thorpej Exp $");
#include "opt_ddb.h"
@@ -220,8 +220,7 @@ gio_attach(device_t parent, device_t sel
if (config_found(self, &ga, gio_print,
- CFARG_SUBMATCH, gio_submatch,
- CFARG_EOL) != NULL) {
+ CFARGS(.submatch = gio_submatch)) != NULL) {
if (ngfx == MAXGFX)
panic("gio_attach: MAXGFX");
gfx[ngfx++] = gfx_bases[i].base;
@@ -269,13 +268,11 @@ gio_attach(device_t parent, device_t sel
ga.ga_product = bus_space_read_4(ga.ga_iot, ga.ga_ioh, 0);
config_found(self, &ga, gio_print,
- CFARG_SUBMATCH, gio_submatch,
- CFARG_EOL);
+ CFARGS(.submatch = gio_submatch));
}
config_search(self, &ga,
- CFARG_SEARCH, gio_search,
- CFARG_EOL);
+ CFARGS(.search = gio_search));
}
static int
@@ -337,7 +334,7 @@ gio_search(device_t parent, cfdata_t cf,
ga->ga_ioh = MIPS_PHYS_TO_KSEG1(ga->ga_addr);
if (config_probe(parent, cf, ga))
- config_attach(parent, cf, ga, gio_print, CFARG_EOL);
+ config_attach(parent, cf, ga, gio_print, CFARGS_NONE);
} while (cf->cf_fstate == FSTATE_STAR);
return 0;
Index: src/sys/arch/sgimips/gio/grtwo.c
diff -u src/sys/arch/sgimips/gio/grtwo.c:1.17 src/sys/arch/sgimips/gio/grtwo.c:1.17.8.1
--- src/sys/arch/sgimips/gio/grtwo.c:1.17 Sat Apr 24 23:36:48 2021
+++ src/sys/arch/sgimips/gio/grtwo.c Wed Aug 4 02:53:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: grtwo.c,v 1.17 2021/04/24 23:36:48 thorpej Exp $ */
+/* $NetBSD: grtwo.c,v 1.17.8.1 2021/08/04 02:53:00 thorpej Exp $ */
/*
* Copyright (c) 2004 Christopher SEKIYA
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grtwo.c,v 1.17 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grtwo.c,v 1.17.8.1 2021/08/04 02:53:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -528,7 +528,7 @@ grtwo_attach(device_t parent, device_t s
if ((cpu_intr_establish(6, IPL_TTY, grtwo_intr6, sc)) == NULL)
printf(": unable to establish interrupt!\n");
- config_found(self, &wa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &wa, wsemuldisplaydevprint, CFARGS_NONE);
}
int
Index: src/sys/arch/sgimips/gio/light.c
diff -u src/sys/arch/sgimips/gio/light.c:1.9 src/sys/arch/sgimips/gio/light.c:1.9.8.1
--- src/sys/arch/sgimips/gio/light.c:1.9 Sat Apr 24 23:36:48 2021
+++ src/sys/arch/sgimips/gio/light.c Wed Aug 4 02:53:00 2021
@@ -1,4 +1,4 @@
-/* $Id: light.c,v 1.9 2021/04/24 23:36:48 thorpej Exp $ */
+/* $Id: light.c,v 1.9.8.1 2021/08/04 02:53:00 thorpej Exp $ */
/*
* Copyright (c) 2006 Stephen M. Rumble
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: light.c,v 1.9 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: light.c,v 1.9.8.1 2021/08/04 02:53:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -336,7 +336,7 @@ light_attach(device_t parent, device_t s
wa.accessops = &light_accessops;
wa.accesscookie = sc->sc_dc;
- config_found(self, &wa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &wa, wsemuldisplaydevprint, CFARGS_NONE);
}
int
Index: src/sys/arch/sgimips/gio/newport.c
diff -u src/sys/arch/sgimips/gio/newport.c:1.22 src/sys/arch/sgimips/gio/newport.c:1.22.8.1
--- src/sys/arch/sgimips/gio/newport.c:1.22 Sat Apr 24 23:36:48 2021
+++ src/sys/arch/sgimips/gio/newport.c Wed Aug 4 02:53:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: newport.c,v 1.22 2021/04/24 23:36:48 thorpej Exp $ */
+/* $NetBSD: newport.c,v 1.22.8.1 2021/08/04 02:53:00 thorpej Exp $ */
/*
* Copyright (c) 2003 Ilpo Ruotsalainen
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: newport.c,v 1.22 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: newport.c,v 1.22.8.1 2021/08/04 02:53:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -639,7 +639,7 @@ newport_attach(device_t parent, device_t
wa.accessops = &newport_accessops;
wa.accesscookie = &sc->sc_dc->dc_vd;
- config_found(sc->sc_dev, &wa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dev, &wa, wsemuldisplaydevprint, CFARGS_NONE);
}
int
Index: src/sys/arch/sgimips/gio/pci_gio.c
diff -u src/sys/arch/sgimips/gio/pci_gio.c:1.18 src/sys/arch/sgimips/gio/pci_gio.c:1.18.8.1
--- src/sys/arch/sgimips/gio/pci_gio.c:1.18 Sat Apr 24 23:36:48 2021
+++ src/sys/arch/sgimips/gio/pci_gio.c Wed Aug 4 02:53:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_gio.c,v 1.18 2021/04/24 23:36:48 thorpej Exp $ */
+/* $NetBSD: pci_gio.c,v 1.18.8.1 2021/08/04 02:53:00 thorpej Exp $ */
/*
* Copyright (c) 2006 Stephen M. Rumble
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_gio.c,v 1.18 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_gio.c,v 1.18.8.1 2021/08/04 02:53:00 thorpej Exp $");
/*
* Glue for PCI devices that are connected to the GIO bus by various little
@@ -237,7 +237,7 @@ giopci_attach(device_t parent, device_t
pba.pba_flags = PCI_FLAGS_MEM_OKAY;
/* NB: do not set PCI_FLAGS_{MRL,MRM,MWI}_OKAY -- true ?! */
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
}
static int
Index: src/sys/arch/sgimips/hpc/hpc.c
diff -u src/sys/arch/sgimips/hpc/hpc.c:1.72 src/sys/arch/sgimips/hpc/hpc.c:1.72.8.1
--- src/sys/arch/sgimips/hpc/hpc.c:1.72 Sat Apr 24 23:36:48 2021
+++ src/sys/arch/sgimips/hpc/hpc.c Wed Aug 4 02:53:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hpc.c,v 1.72 2021/04/24 23:36:48 thorpej Exp $ */
+/* $NetBSD: hpc.c,v 1.72.8.1 2021/08/04 02:53:00 thorpej Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpc.c,v 1.72 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpc.c,v 1.72.8.1 2021/08/04 02:53:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -537,12 +537,10 @@ hpc_attach(device_t parent, device_t sel
/* XXXgross! avoid complaining in E++ and GIO32 SCSI cases */
if (hpctype != 3 && sc->sc_base != HPC_BASE_ADDRESS_0) {
config_found(self, &ha, NULL,
- CFARG_SUBMATCH, hpc_submatch,
- CFARG_EOL);
+ CFARGS(.submatch = hpc_submatch));
} else {
config_found(self, &ha, hpc_print,
- CFARG_SUBMATCH, hpc_submatch,
- CFARG_EOL);
+ CFARGS(.submatch = hpc_submatch));
}
}
Index: src/sys/arch/sgimips/hpc/pi1ppc.c
diff -u src/sys/arch/sgimips/hpc/pi1ppc.c:1.14 src/sys/arch/sgimips/hpc/pi1ppc.c:1.14.8.1
--- src/sys/arch/sgimips/hpc/pi1ppc.c:1.14 Sat Apr 24 23:36:48 2021
+++ src/sys/arch/sgimips/hpc/pi1ppc.c Wed Aug 4 02:53:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pi1ppc.c,v 1.14 2021/04/24 23:36:48 thorpej Exp $ */
+/* $NetBSD: pi1ppc.c,v 1.14.8.1 2021/08/04 02:53:00 thorpej Exp $ */
/*
* Copyright (c) 2001 Alcove - Nicolas Souchu
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pi1ppc.c,v 1.14 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pi1ppc.c,v 1.14.8.1 2021/08/04 02:53:00 thorpej Exp $");
#include "opt_pi1ppc.h"
@@ -281,7 +281,7 @@ pi1ppc_sc_attach(struct pi1ppc_softc *ls
/* Configure child of the device. */
lsc->child = config_found(lsc->sc_dev, &(sc_parport_adapter),
- pi1ppc_print, CFARG_EOL);
+ pi1ppc_print, CFARGS_NONE);
return;
}
Index: src/sys/arch/sgimips/ioc/ioc.c
diff -u src/sys/arch/sgimips/ioc/ioc.c:1.12 src/sys/arch/sgimips/ioc/ioc.c:1.12.8.1
--- src/sys/arch/sgimips/ioc/ioc.c:1.12 Sat Apr 24 23:36:48 2021
+++ src/sys/arch/sgimips/ioc/ioc.c Wed Aug 4 02:53:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ioc.c,v 1.12 2021/04/24 23:36:48 thorpej Exp $ */
+/* $NetBSD: ioc.c,v 1.12.8.1 2021/08/04 02:53:00 thorpej Exp $ */
/*
* Copyright (c) 2003 Christopher Sekiya
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.12 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.12.8.1 2021/08/04 02:53:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -158,8 +158,7 @@ ioc_attach(device_t parent, device_t sel
*/
config_search(self, NULL,
- CFARG_SEARCH, ioc_search,
- CFARG_EOL);
+ CFARGS(.search = ioc_search));
#endif
}
@@ -195,7 +194,7 @@ ioc_search(device_t parent, cfdata_t cf,
tryagain = 0;
if (config_probe(parent, cf, &iaa)) {
- config_attach(parent, cf, &iaa, ioc_print, CFARG_EOL);
+ config_attach(parent, cf, &iaa, ioc_print, CFARGS_NONE);
tryagain = (cf->cf_fstate == FSTATE_STAR);
}
} while (tryagain);
Index: src/sys/arch/sgimips/ioc/oioc.c
diff -u src/sys/arch/sgimips/ioc/oioc.c:1.5 src/sys/arch/sgimips/ioc/oioc.c:1.5.8.1
--- src/sys/arch/sgimips/ioc/oioc.c:1.5 Sat Apr 24 23:36:48 2021
+++ src/sys/arch/sgimips/ioc/oioc.c Wed Aug 4 02:53:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: oioc.c,v 1.5 2021/04/24 23:36:48 thorpej Exp $ */
+/* $NetBSD: oioc.c,v 1.5.8.1 2021/08/04 02:53:00 thorpej Exp $ */
/*
* Copyright (c) 2009 Stephen M. Rumble
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oioc.c,v 1.5 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oioc.c,v 1.5.8.1 2021/08/04 02:53:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -148,7 +148,7 @@ oioc_attach(device_t parent, device_t se
oa.oa_st = normal_memt;
oa.oa_sh = sc->sc_ioh;
oa.oa_dmat = &sgimips_default_bus_dma_tag;
- config_found(self, &oa, oioc_print, CFARG_EOL);
+ config_found(self, &oa, oioc_print, CFARGS_NONE);
}
}
Index: src/sys/arch/sgimips/mace/mace.c
diff -u src/sys/arch/sgimips/mace/mace.c:1.24 src/sys/arch/sgimips/mace/mace.c:1.24.8.1
--- src/sys/arch/sgimips/mace/mace.c:1.24 Sat Apr 24 23:36:48 2021
+++ src/sys/arch/sgimips/mace/mace.c Wed Aug 4 02:53:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mace.c,v 1.24 2021/04/24 23:36:48 thorpej Exp $ */
+/* $NetBSD: mace.c,v 1.24.8.1 2021/08/04 02:53:00 thorpej Exp $ */
/*
* Copyright (c) 2003 Christopher Sekiya
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mace.c,v 1.24 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mace.c,v 1.24.8.1 2021/08/04 02:53:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -197,8 +197,7 @@ mace_attach(device_t parent, device_t se
}
config_search(self, NULL,
- CFARG_SEARCH, mace_search,
- CFARG_EOL);
+ CFARGS(.search = mace_search));
}
@@ -238,7 +237,7 @@ mace_search(device_t parent, struct cfda
tryagain = 0;
if (config_probe(parent, cf, &maa)) {
- config_attach(parent, cf, &maa, mace_print, CFARG_EOL);
+ config_attach(parent, cf, &maa, mace_print, CFARGS_NONE);
tryagain = (cf->cf_fstate == FSTATE_STAR);
}
Index: src/sys/arch/sgimips/mace/pci_mace.c
diff -u src/sys/arch/sgimips/mace/pci_mace.c:1.24 src/sys/arch/sgimips/mace/pci_mace.c:1.24.8.1
--- src/sys/arch/sgimips/mace/pci_mace.c:1.24 Sat Apr 24 23:36:48 2021
+++ src/sys/arch/sgimips/mace/pci_mace.c Wed Aug 4 02:53:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_mace.c,v 1.24 2021/04/24 23:36:48 thorpej Exp $ */
+/* $NetBSD: pci_mace.c,v 1.24.8.1 2021/08/04 02:53:00 thorpej Exp $ */
/*
* Copyright (c) 2001,2003 Christopher Sekiya
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_mace.c,v 1.24 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_mace.c,v 1.24.8.1 2021/08/04 02:53:00 thorpej Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -205,7 +205,7 @@ macepci_attach(device_t parent, device_t
cpu_intr_establish(maa->maa_intr, IPL_NONE, macepci_intr, sc);
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
#endif
}
Index: src/sys/arch/sgimips/sgimips/mainbus.c
diff -u src/sys/arch/sgimips/sgimips/mainbus.c:1.21 src/sys/arch/sgimips/sgimips/mainbus.c:1.21.8.1
--- src/sys/arch/sgimips/sgimips/mainbus.c:1.21 Sat Apr 24 23:36:48 2021
+++ src/sys/arch/sgimips/sgimips/mainbus.c Wed Aug 4 02:53:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.21 2021/04/24 23:36:48 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.21.8.1 2021/08/04 02:53:00 thorpej Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21.8.1 2021/08/04 02:53:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -74,8 +74,7 @@ mainbus_attach(device_t parent, device_t
ncpus, ncpus == 1 ? "" : "s");
config_search(self, &ma,
- CFARG_SEARCH, mainbus_search,
- CFARG_EOL);
+ CFARGS(.search = mainbus_search));
}
static int
@@ -89,7 +88,7 @@ mainbus_search(device_t parent, cfdata_t
ma->ma_iot = 0;
ma->ma_ioh = MIPS_PHYS_TO_KSEG1(ma->ma_addr);
if (config_probe(parent, cf, ma))
- config_attach(parent, cf, ma, mainbus_print, CFARG_EOL);
+ config_attach(parent, cf, ma, mainbus_print, CFARGS_NONE);
} while (cf->cf_fstate == FSTATE_STAR);
return 0;
Index: src/sys/arch/sh3/dev/adc.c
diff -u src/sys/arch/sh3/dev/adc.c:1.14 src/sys/arch/sh3/dev/adc.c:1.14.8.1
--- src/sys/arch/sh3/dev/adc.c:1.14 Sat Apr 24 23:36:48 2021
+++ src/sys/arch/sh3/dev/adc.c Wed Aug 4 02:53:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: adc.c,v 1.14 2021/04/24 23:36:48 thorpej Exp $ */
+/* $NetBSD: adc.c,v 1.14.8.1 2021/08/04 02:53:01 thorpej Exp $ */
/*
* Copyright (c) 2003 Valeriy E. Ushakov
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adc.c,v 1.14 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adc.c,v 1.14.8.1 2021/08/04 02:53:01 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -80,8 +80,7 @@ adc_attach(device_t parent, device_t sel
aprint_normal("\n");
config_search(self, NULL,
- CFARG_SEARCH, adc_search,
- CFARG_EOL);
+ CFARGS(.search = adc_search));
/*
* XXX: TODO: provide hooks to manage power. For now register
@@ -99,7 +98,7 @@ adc_search(device_t parent, cfdata_t cf,
{
if (config_probe(parent, cf, NULL))
- config_attach(parent, cf, NULL, adc_print, CFARG_EOL);
+ config_attach(parent, cf, NULL, adc_print, CFARGS_NONE);
return (0);
}
Index: src/sys/arch/sh3/dev/shb.c
diff -u src/sys/arch/sh3/dev/shb.c:1.15 src/sys/arch/sh3/dev/shb.c:1.15.8.1
--- src/sys/arch/sh3/dev/shb.c:1.15 Sat Apr 24 23:36:48 2021
+++ src/sys/arch/sh3/dev/shb.c Wed Aug 4 02:53:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: shb.c,v 1.15 2021/04/24 23:36:48 thorpej Exp $ */
+/* $NetBSD: shb.c,v 1.15.8.1 2021/08/04 02:53:01 thorpej Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: shb.c,v 1.15 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shb.c,v 1.15.8.1 2021/08/04 02:53:01 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,8 +65,7 @@ shb_attach(device_t parent, device_t sel
aprint_normal("\n");
config_search(self, NULL,
- CFARG_SEARCH, shb_search,
- CFARG_EOL);
+ CFARGS(.search = shb_search));
/*
* XXX: TODO: provide hooks to manage on-chip modules. For
@@ -81,7 +80,7 @@ shb_search(device_t parent, cfdata_t cf,
{
if (config_probe(parent, cf, NULL))
- config_attach(parent, cf, NULL, shb_print, CFARG_EOL);
+ config_attach(parent, cf, NULL, shb_print, CFARGS_NONE);
return (0);
}
Index: src/sys/arch/sh3/dev/shpcic.c
diff -u src/sys/arch/sh3/dev/shpcic.c:1.21 src/sys/arch/sh3/dev/shpcic.c:1.21.8.1
--- src/sys/arch/sh3/dev/shpcic.c:1.21 Sat Apr 24 23:36:48 2021
+++ src/sys/arch/sh3/dev/shpcic.c Wed Aug 4 02:53:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: shpcic.c,v 1.21 2021/04/24 23:36:48 thorpej Exp $ */
+/* $NetBSD: shpcic.c,v 1.21.8.1 2021/08/04 02:53:01 thorpej Exp $ */
/*-
* Copyright (C) 2005 NONAKA Kimihiro <[email protected]>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: shpcic.c,v 1.21 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shpcic.c,v 1.21.8.1 2021/08/04 02:53:01 thorpej Exp $");
#include "opt_pci.h"
@@ -244,7 +244,7 @@ shpcic_attach(device_t parent, device_t
pba.pba_bus = 0;
pba.pba_bridgetag = NULL;
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
- config_found(self, &pba, NULL, CFARG_EOL);
+ config_found(self, &pba, NULL, CFARGS_NONE);
}
int
