Module Name: src
Committed By: thorpej
Date: Wed Aug 4 16:59:14 UTC 2021
Modified Files:
src/sys/arch/evbarm/adi_brh [thorpej-cfargs2]: obio.c
src/sys/arch/evbarm/armadillo [thorpej-cfargs2]: armadillo9_iic.c
src/sys/arch/evbarm/g42xxeb [thorpej-cfargs2]: g42xxeb_kmkbd.c
g42xxeb_lcd.c gb225.c gb225_pcic.c obio.c
src/sys/arch/evbarm/gumstix [thorpej-cfargs2]: gxiic.c gxio.c gxlcd.c
src/sys/arch/evbarm/hdl_g [thorpej-cfargs2]: obio.c
src/sys/arch/evbarm/ifpga [thorpej-cfargs2]: ifpga.c
src/sys/arch/evbarm/iq80310 [thorpej-cfargs2]: obio.c
src/sys/arch/evbarm/iq80321 [thorpej-cfargs2]: obio.c
src/sys/arch/evbarm/iyonix [thorpej-cfargs2]: obio.c
src/sys/arch/evbarm/lubbock [thorpej-cfargs2]: lubbock_lcd.c obio.c
sacc_obio.c
src/sys/arch/evbarm/mini2440 [thorpej-cfargs2]: mini2440_lcd.c
src/sys/arch/evbarm/mpcsa [thorpej-cfargs2]: mpcsa_leds.c
src/sys/arch/evbarm/netwalker [thorpej-cfargs2]: netwalker_btn.c
src/sys/arch/evbarm/nslu2 [thorpej-cfargs2]: nslu2_iic.c
src/sys/arch/evbarm/smdk2xx0 [thorpej-cfargs2]: smdk2410_kbd.c
smdk2410_lcd.c
src/sys/arch/evbarm/tsarm [thorpej-cfargs2]: tskp.c tslcd.c tspld.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/evbarm/adi_brh/obio.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/evbarm/armadillo/armadillo9_iic.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/evbarm/g42xxeb/gb225.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/evbarm/g42xxeb/gb225_pcic.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/evbarm/g42xxeb/obio.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/evbarm/gumstix/gxiic.c
cvs rdiff -u -r1.27 -r1.27.8.1 src/sys/arch/evbarm/gumstix/gxio.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/evbarm/gumstix/gxlcd.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/evbarm/hdl_g/obio.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/arch/evbarm/ifpga/ifpga.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/evbarm/iq80310/obio.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/evbarm/iq80321/obio.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/evbarm/iyonix/obio.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/evbarm/lubbock/lubbock_lcd.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/evbarm/lubbock/obio.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/evbarm/lubbock/sacc_obio.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/evbarm/mini2440/mini2440_lcd.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/evbarm/mpcsa/mpcsa_leds.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/evbarm/netwalker/netwalker_btn.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/evbarm/nslu2/nslu2_iic.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/evbarm/tsarm/tskp.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/evbarm/tsarm/tslcd.c
cvs rdiff -u -r1.25 -r1.25.8.1 src/sys/arch/evbarm/tsarm/tspld.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/evbarm/adi_brh/obio.c
diff -u src/sys/arch/evbarm/adi_brh/obio.c:1.12 src/sys/arch/evbarm/adi_brh/obio.c:1.12.8.1
--- src/sys/arch/evbarm/adi_brh/obio.c:1.12 Sat Apr 24 23:36:32 2021
+++ src/sys/arch/evbarm/adi_brh/obio.c Wed Aug 4 16:59:12 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.12 2021/04/24 23:36:32 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.12.8.1 2021/08/04 16:59:12 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.12 2021/04/24 23:36:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.12.8.1 2021/08/04 16:59:12 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -105,8 +105,7 @@ obio_attach(device_t parent, device_t se
* configuration file.
*/
config_search(self, NULL,
- CFARG_SEARCH, obio_search,
- CFARG_EOL);
+ CFARGS(.search = obio_search));
}
int
@@ -138,7 +137,7 @@ obio_search(device_t parent, cfdata_t cf
oba.oba_irq = cf->cf_loc[OBIOCF_IRQ];
if (config_probe(parent, cf, &oba))
- config_attach(parent, cf, &oba, obio_print, CFARG_EOL);
+ config_attach(parent, cf, &oba, obio_print, CFARGS_NONE);
return (0);
}
Index: src/sys/arch/evbarm/armadillo/armadillo9_iic.c
diff -u src/sys/arch/evbarm/armadillo/armadillo9_iic.c:1.10 src/sys/arch/evbarm/armadillo/armadillo9_iic.c:1.10.8.1
--- src/sys/arch/evbarm/armadillo/armadillo9_iic.c:1.10 Sat Apr 24 23:36:32 2021
+++ src/sys/arch/evbarm/armadillo/armadillo9_iic.c Wed Aug 4 16:59:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: armadillo9_iic.c,v 1.10 2021/04/24 23:36:32 thorpej Exp $ */
+/* $NetBSD: armadillo9_iic.c,v 1.10.8.1 2021/08/04 16:59:13 thorpej Exp $ */
/*
* Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_iic.c,v 1.10 2021/04/24 23:36:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_iic.c,v 1.10.8.1 2021/08/04 16:59:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -119,7 +119,7 @@ armadillo9iic_attach(device_t parent, de
printf("\n");
- config_found(self, &iba, iicbus_print, CFARG_EOL);
+ config_found(self, &iba, iicbus_print, CFARGS_NONE);
#if NSEEPROM > 0
/* read mac address */
Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c
diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c:1.15 src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c:1.15.8.1
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c:1.15 Sat Apr 24 23:36:32 2021
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c Wed Aug 4 16:59:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: g42xxeb_kmkbd.c,v 1.15 2021/04/24 23:36:32 thorpej Exp $ */
+/* $NetBSD: g42xxeb_kmkbd.c,v 1.15.8.1 2021/08/04 16:59:13 thorpej Exp $ */
/*-
* Copyright (c) 2002, 2003, 2005 Genetec corp.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: g42xxeb_kmkbd.c,v 1.15 2021/04/24 23:36:32 thorpej Exp $" );
+__KERNEL_RCSID(0, "$NetBSD: g42xxeb_kmkbd.c,v 1.15.8.1 2021/08/04 16:59:13 thorpej Exp $" );
#include <sys/param.h>
#include <sys/systm.h>
@@ -230,7 +230,7 @@ kmkbd_attach(device_t parent, device_t s
/* Attach the wskbd. */
- sc->wskbddev = config_found(self, &a, wskbddevprint, CFARG_EOL);
+ sc->wskbddev = config_found(self, &a, wskbddevprint, CFARGS_NONE);
}
Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c
diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c:1.17 src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c:1.17.8.1
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c:1.17 Sat Apr 24 23:36:32 2021
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c Wed Aug 4 16:59:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: g42xxeb_lcd.c,v 1.17 2021/04/24 23:36:32 thorpej Exp $ */
+/* $NetBSD: g42xxeb_lcd.c,v 1.17.8.1 2021/08/04 16:59:13 thorpej Exp $ */
/*-
* Copyright (c) 2001, 2002, 2005 Genetec corp.
@@ -237,7 +237,7 @@ void lcd_attach(device_t parent, device_
aa.accesscookie = sc;
(void) config_found(self, &aa, wsemuldisplaydevprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
#else
{
Index: src/sys/arch/evbarm/g42xxeb/gb225.c
diff -u src/sys/arch/evbarm/g42xxeb/gb225.c:1.11 src/sys/arch/evbarm/g42xxeb/gb225.c:1.11.8.1
--- src/sys/arch/evbarm/g42xxeb/gb225.c:1.11 Sat Apr 24 23:36:32 2021
+++ src/sys/arch/evbarm/g42xxeb/gb225.c Wed Aug 4 16:59:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gb225.c,v 1.11 2021/04/24 23:36:32 thorpej Exp $ */
+/* $NetBSD: gb225.c,v 1.11.8.1 2021/08/04 16:59:13 thorpej Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec corp. All rights reserved.
@@ -174,8 +174,7 @@ opio_attach(device_t parent, device_t se
* Attach each devices
*/
config_search(self, NULL,
- CFARG_SEARCH, opio_search,
- CFARG_EOL);
+ CFARGS(.search = opio_search));
}
int
@@ -191,7 +190,7 @@ opio_search(device_t parent, cfdata_t cf
oba.oba_intr = cf->cf_loc[OPIOCF_INTR];
if (config_probe(parent, cf, &oba))
- config_attach(parent, cf, &oba, opio_print, CFARG_EOL);
+ config_attach(parent, cf, &oba, opio_print, CFARGS_NONE);
return 0;
}
Index: src/sys/arch/evbarm/g42xxeb/gb225_pcic.c
diff -u src/sys/arch/evbarm/g42xxeb/gb225_pcic.c:1.14 src/sys/arch/evbarm/g42xxeb/gb225_pcic.c:1.14.8.1
--- src/sys/arch/evbarm/g42xxeb/gb225_pcic.c:1.14 Sat Apr 24 23:36:32 2021
+++ src/sys/arch/evbarm/g42xxeb/gb225_pcic.c Wed Aug 4 16:59:13 2021
@@ -183,7 +183,7 @@ opcic_attach(device_t parent, device_t s
sc->sc_socket[i].ss.pcmcia =
config_found(sc->sc_pc.sc_dev, &paa, opcic_print,
- CFARG_EOL);
+ CFARGS_NONE);
#ifndef DONT_USE_CARD_DETECT_INTR
/* interrupt for card insertion/removal */
Index: src/sys/arch/evbarm/g42xxeb/obio.c
diff -u src/sys/arch/evbarm/g42xxeb/obio.c:1.12 src/sys/arch/evbarm/g42xxeb/obio.c:1.12.8.1
--- src/sys/arch/evbarm/g42xxeb/obio.c:1.12 Sat Apr 24 23:36:32 2021
+++ src/sys/arch/evbarm/g42xxeb/obio.c Wed Aug 4 16:59:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.12 2021/04/24 23:36:32 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.12.8.1 2021/08/04 16:59:13 thorpej Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec corp. All rights reserved.
@@ -262,8 +262,7 @@ obio_attach(device_t parent, device_t se
* Attach each devices
*/
config_search(self, NULL,
- CFARG_SEARCH, obio_search,
- CFARG_EOL);
+ CFARGS(.search = obio_search));
return;
fail:
@@ -282,7 +281,7 @@ obio_search(device_t parent, cfdata_t cf
oba.oba_intr = cf->cf_loc[OBIOCF_INTR];
if (config_probe(parent, cf, &oba))
- config_attach(parent, cf, &oba, obio_print, CFARG_EOL);
+ config_attach(parent, cf, &oba, obio_print, CFARGS_NONE);
return 0;
}
Index: src/sys/arch/evbarm/gumstix/gxiic.c
diff -u src/sys/arch/evbarm/gumstix/gxiic.c:1.10 src/sys/arch/evbarm/gumstix/gxiic.c:1.10.8.1
--- src/sys/arch/evbarm/gumstix/gxiic.c:1.10 Sat Apr 24 23:36:32 2021
+++ src/sys/arch/evbarm/gumstix/gxiic.c Wed Aug 4 16:59:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gxiic.c,v 1.10 2021/04/24 23:36:32 thorpej Exp $ */
+/* $NetBSD: gxiic.c,v 1.10.8.1 2021/08/04 16:59:13 thorpej Exp $ */
/*
* Copyright (c) 2007 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gxiic.c,v 1.10 2021/04/24 23:36:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gxiic.c,v 1.10.8.1 2021/08/04 16:59:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -105,7 +105,7 @@ gxiicattach(device_t parent, device_t se
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &sc->sc_i2c;
pxa2x0_i2c_open(&sc->sc_pxa_i2c);
- config_found(sc->sc_pxa_i2c.sc_dev, &iba, iicbus_print, CFARG_EOL);
+ config_found(sc->sc_pxa_i2c.sc_dev, &iba, iicbus_print, CFARGS_NONE);
pxa2x0_i2c_close(&sc->sc_pxa_i2c);
}
Index: src/sys/arch/evbarm/gumstix/gxio.c
diff -u src/sys/arch/evbarm/gumstix/gxio.c:1.27 src/sys/arch/evbarm/gumstix/gxio.c:1.27.8.1
--- src/sys/arch/evbarm/gumstix/gxio.c:1.27 Sat Apr 24 23:36:32 2021
+++ src/sys/arch/evbarm/gumstix/gxio.c Wed Aug 4 16:59:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gxio.c,v 1.27 2021/04/24 23:36:32 thorpej Exp $ */
+/* $NetBSD: gxio.c,v 1.27.8.1 2021/08/04 16:59:13 thorpej Exp $ */
/*
* Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation.
* All rights reserved.
@@ -31,7 +31,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gxio.c,v 1.27 2021/04/24 23:36:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gxio.c,v 1.27.8.1 2021/08/04 16:59:13 thorpej Exp $");
#include "opt_cputypes.h"
#include "opt_gumstix.h"
@@ -391,8 +391,7 @@ gxioattach(device_t parent, device_t sel
* Attach each gumstix(busheader)/overo expansion board devices.
*/
config_search(self, NULL,
- CFARG_SEARCH, gxiosearch,
- CFARG_EOL);
+ CFARGS(.search = gxiosearch));
}
/* ARGSUSED */
@@ -408,7 +407,7 @@ gxiosearch(device_t parent, cfdata_t cf,
gxa.gxa_gpirq = cf->cf_loc[GXIOCF_GPIRQ];
if (config_probe(parent, cf, &gxa))
- config_attach(parent, cf, &gxa, gxioprint, CFARG_EOL);
+ config_attach(parent, cf, &gxa, gxioprint, CFARGS_NONE);
return 0;
}
Index: src/sys/arch/evbarm/gumstix/gxlcd.c
diff -u src/sys/arch/evbarm/gumstix/gxlcd.c:1.4 src/sys/arch/evbarm/gumstix/gxlcd.c:1.4.8.1
--- src/sys/arch/evbarm/gumstix/gxlcd.c:1.4 Sat Apr 24 23:36:32 2021
+++ src/sys/arch/evbarm/gumstix/gxlcd.c Wed Aug 4 16:59:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gxlcd.c,v 1.4 2021/04/24 23:36:32 thorpej Exp $ */
+/* $NetBSD: gxlcd.c,v 1.4.8.1 2021/08/04 16:59:13 thorpej Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gxlcd.c,v 1.4 2021/04/24 23:36:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gxlcd.c,v 1.4.8.1 2021/08/04 16:59:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -166,7 +166,7 @@ gxlcd_attach(device_t parent, device_t s
pxa2x0_lcd_setup_wsscreen(&gxlcd_std_screen, &CURRENT_DISPLAY, NULL);
- (void) config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ (void) config_found(self, &aa, wsemuldisplaydevprint, CFARGS_NONE);
}
void
Index: src/sys/arch/evbarm/hdl_g/obio.c
diff -u src/sys/arch/evbarm/hdl_g/obio.c:1.4 src/sys/arch/evbarm/hdl_g/obio.c:1.4.8.1
--- src/sys/arch/evbarm/hdl_g/obio.c:1.4 Sat Apr 24 23:36:32 2021
+++ src/sys/arch/evbarm/hdl_g/obio.c Wed Aug 4 16:59:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.4 2021/04/24 23:36:32 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.4.8.1 2021/08/04 16:59:13 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.4 2021/04/24 23:36:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.4.8.1 2021/08/04 16:59:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,8 +87,7 @@ obio_attach(device_t parent, device_t se
* configuration file.
*/
config_search(self, NULL,
- CFARG_SEARCH, obio_search,
- CFARG_EOL);
+ CFARGS(.search = obio_search));
}
int
@@ -124,7 +123,7 @@ obio_search(device_t parent, cfdata_t cf
oba.oba_irq = -1;
if (config_probe(parent, cf, &oba))
- config_attach(parent, cf, &oba, obio_print, CFARG_EOL);
+ config_attach(parent, cf, &oba, obio_print, CFARGS_NONE);
return 0;
}
Index: src/sys/arch/evbarm/ifpga/ifpga.c
diff -u src/sys/arch/evbarm/ifpga/ifpga.c:1.29 src/sys/arch/evbarm/ifpga/ifpga.c:1.29.8.1
--- src/sys/arch/evbarm/ifpga/ifpga.c:1.29 Sat Apr 24 23:36:32 2021
+++ src/sys/arch/evbarm/ifpga/ifpga.c Wed Aug 4 16:59:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ifpga.c,v 1.29 2021/04/24 23:36:32 thorpej Exp $ */
+/* $NetBSD: ifpga.c,v 1.29.8.1 2021/08/04 16:59:13 thorpej Exp $ */
/*
* Copyright (c) 2001 ARM Ltd
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ifpga.c,v 1.29 2021/04/24 23:36:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ifpga.c,v 1.29.8.1 2021/08/04 16:59:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -124,7 +124,7 @@ ifpga_search(device_t parent, cfdata_t c
tryagain = 0;
if (config_probe(parent, cf, &ifa)) {
- config_attach(parent, cf, &ifa, ifpga_print, CFARG_EOL);
+ config_attach(parent, cf, &ifa, ifpga_print, CFARGS_NONE);
tryagain = (cf->cf_fstate == FSTATE_STAR);
}
} while (tryagain);
@@ -314,9 +314,8 @@ ifpga_attach(device_t parent, device_t s
/* Finally, search for children. */
config_search(self, NULL,
- CFARG_SEARCH, ifpga_search,
- CFARG_IATTR, "ifpga",
- CFARG_EOL);
+ CFARGS(.search = ifpga_search,
+ .iattr = "ifpga"));
#if NPCI > 0
integrator_pci_dma_init(&ifpga_pci_bus_dma_tag);
@@ -331,8 +330,7 @@ ifpga_attach(device_t parent, device_t s
pci_pba.pba_bridgetag = NULL;
config_found(self, &pci_pba, pcibusprint,
- CFARG_IATTR, "pcibus",
- CFARG_EOL);
+ CFARGS(.iattr = "pcibus"));
#endif
}
Index: src/sys/arch/evbarm/iq80310/obio.c
diff -u src/sys/arch/evbarm/iq80310/obio.c:1.21 src/sys/arch/evbarm/iq80310/obio.c:1.21.8.1
--- src/sys/arch/evbarm/iq80310/obio.c:1.21 Sat Apr 24 23:36:33 2021
+++ src/sys/arch/evbarm/iq80310/obio.c Wed Aug 4 16:59:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.21 2021/04/24 23:36:33 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.21.8.1 2021/08/04 16:59:13 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.21 2021/04/24 23:36:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.21.8.1 2021/08/04 16:59:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,8 +125,7 @@ obio_attach(device_t parent, device_t se
* configuration file.
*/
config_search(self, NULL,
- CFARG_SEARCH, obio_search,
- CFARG_EOL);
+ CFARGS(.search = obio_search));
}
int
@@ -160,7 +159,7 @@ obio_search(device_t parent, cfdata_t cf
oba.oba_irq = -1;
if (config_probe(parent, cf, &oba))
- config_attach(parent, cf, &oba, obio_print, CFARG_EOL);
+ config_attach(parent, cf, &oba, obio_print, CFARGS_NONE);
return (0);
}
Index: src/sys/arch/evbarm/iq80321/obio.c
diff -u src/sys/arch/evbarm/iq80321/obio.c:1.17 src/sys/arch/evbarm/iq80321/obio.c:1.17.8.1
--- src/sys/arch/evbarm/iq80321/obio.c:1.17 Sat Apr 24 23:36:33 2021
+++ src/sys/arch/evbarm/iq80321/obio.c Wed Aug 4 16:59:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.17 2021/04/24 23:36:33 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.17.8.1 2021/08/04 16:59:13 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.17 2021/04/24 23:36:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.17.8.1 2021/08/04 16:59:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -104,8 +104,7 @@ obio_attach(device_t parent, device_t se
* configuration file.
*/
config_search(self, NULL,
- CFARG_SEARCH, obio_search,
- CFARG_EOL);
+ CFARGS(.search = obio_search));
}
int
@@ -141,7 +140,7 @@ obio_search(device_t parent, cfdata_t cf
oba.oba_irq = -1;
if (config_probe(parent, cf, &oba))
- config_attach(parent, cf, &oba, obio_print, CFARG_EOL);
+ config_attach(parent, cf, &oba, obio_print, CFARGS_NONE);
return (0);
}
Index: src/sys/arch/evbarm/iyonix/obio.c
diff -u src/sys/arch/evbarm/iyonix/obio.c:1.2 src/sys/arch/evbarm/iyonix/obio.c:1.2.8.1
--- src/sys/arch/evbarm/iyonix/obio.c:1.2 Sat Apr 24 23:36:33 2021
+++ src/sys/arch/evbarm/iyonix/obio.c Wed Aug 4 16:59:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.2 2021/04/24 23:36:33 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.2.8.1 2021/08/04 16:59:13 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.2 2021/04/24 23:36:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.2.8.1 2021/08/04 16:59:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -103,8 +103,7 @@ obio_attach(device_t parent, device_t se
* configuration file.
*/
config_search(self, NULL,
- CFARG_SEARCH, obio_search,
- CFARG_EOL);
+ CFARGS(.search = obio_search));
}
int
@@ -140,7 +139,7 @@ obio_search(device_t parent, cfdata_t cf
oba.oba_irq = -1;
if (config_probe(parent, cf, &oba))
- config_attach(parent, cf, &oba, obio_print, CFARG_EOL);
+ config_attach(parent, cf, &oba, obio_print, CFARGS_NONE);
return (0);
}
Index: src/sys/arch/evbarm/lubbock/lubbock_lcd.c
diff -u src/sys/arch/evbarm/lubbock/lubbock_lcd.c:1.16 src/sys/arch/evbarm/lubbock/lubbock_lcd.c:1.16.8.1
--- src/sys/arch/evbarm/lubbock/lubbock_lcd.c:1.16 Sat Apr 24 23:36:33 2021
+++ src/sys/arch/evbarm/lubbock/lubbock_lcd.c Wed Aug 4 16:59:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lubbock_lcd.c,v 1.16 2021/04/24 23:36:33 thorpej Exp $ */
+/* $NetBSD: lubbock_lcd.c,v 1.16.8.1 2021/08/04 16:59:13 thorpej Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved.
@@ -40,7 +40,7 @@
* LCD panel geometry
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lubbock_lcd.c,v 1.16 2021/04/24 23:36:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_lcd.c,v 1.16.8.1 2021/08/04 16:59:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -214,7 +214,7 @@ void lcd_attach( device_t parent, device
aa.accesscookie = sc;
(void) config_found(self, &aa, wsemuldisplaydevprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
#else
{
Index: src/sys/arch/evbarm/lubbock/obio.c
diff -u src/sys/arch/evbarm/lubbock/obio.c:1.11 src/sys/arch/evbarm/lubbock/obio.c:1.11.8.1
--- src/sys/arch/evbarm/lubbock/obio.c:1.11 Sat Apr 24 23:36:33 2021
+++ src/sys/arch/evbarm/lubbock/obio.c Wed Aug 4 16:59:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.11 2021/04/24 23:36:33 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.11.8.1 2021/08/04 16:59:13 thorpej Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.11 2021/04/24 23:36:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.11.8.1 2021/08/04 16:59:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -284,8 +284,7 @@ obio_attach(device_t parent, device_t se
* Attach each devices
*/
config_search(self, NULL,
- CFARG_SEARCH, obio_search,
- CFARG_EOL);
+ CFARGS(.search = obio_search));
}
int
@@ -300,7 +299,7 @@ obio_search(device_t parent, cfdata_t cf
oba.oba_intr = cf->cf_loc[OBIOCF_INTR];
if (config_probe(parent, cf, &oba))
- config_attach(parent, cf, &oba, obio_print, CFARG_EOL);
+ config_attach(parent, cf, &oba, obio_print, CFARGS_NONE);
return 0;
}
Index: src/sys/arch/evbarm/lubbock/sacc_obio.c
diff -u src/sys/arch/evbarm/lubbock/sacc_obio.c:1.14 src/sys/arch/evbarm/lubbock/sacc_obio.c:1.14.8.1
--- src/sys/arch/evbarm/lubbock/sacc_obio.c:1.14 Sat Apr 24 23:36:34 2021
+++ src/sys/arch/evbarm/lubbock/sacc_obio.c Wed Aug 4 16:59:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sacc_obio.c,v 1.14 2021/04/24 23:36:34 thorpej Exp $ */
+/* $NetBSD: sacc_obio.c,v 1.14.8.1 2021/08/04 16:59:13 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sacc_obio.c,v 1.14 2021/04/24 23:36:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sacc_obio.c,v 1.14.8.1 2021/08/04 16:59:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -175,8 +175,7 @@ sacc_obio_attach(device_t parent, device
* Attach each devices
*/
config_search(self, NULL,
- CFARG_SEARCH, sa1111_search,
- CFARG_EOL);
+ CFARGS(.search = sa1111_search));
return;
Index: src/sys/arch/evbarm/mini2440/mini2440_lcd.c
diff -u src/sys/arch/evbarm/mini2440/mini2440_lcd.c:1.5 src/sys/arch/evbarm/mini2440/mini2440_lcd.c:1.5.8.1
--- src/sys/arch/evbarm/mini2440/mini2440_lcd.c:1.5 Sat Apr 24 23:36:34 2021
+++ src/sys/arch/evbarm/mini2440/mini2440_lcd.c Wed Aug 4 16:59:14 2021
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mini2440_lcd.c,v 1.5 2021/04/24 23:36:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mini2440_lcd.c,v 1.5.8.1 2021/08/04 16:59:14 thorpej Exp $");
/*
* LCD driver for FriendlyARM MINI2440.
@@ -292,7 +292,7 @@ lcd_attach(device_t parent, device_t sel
aa.accesscookie = sc;
- (void) config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ (void) config_found(self, &aa, wsemuldisplaydevprint, CFARGS_NONE);
#else
screen = s3c24x0_lcd_new_screen(sc, 240, 320, 16);
Index: src/sys/arch/evbarm/mpcsa/mpcsa_leds.c
diff -u src/sys/arch/evbarm/mpcsa/mpcsa_leds.c:1.6 src/sys/arch/evbarm/mpcsa/mpcsa_leds.c:1.6.8.1
--- src/sys/arch/evbarm/mpcsa/mpcsa_leds.c:1.6 Sat Apr 24 23:36:34 2021
+++ src/sys/arch/evbarm/mpcsa/mpcsa_leds.c Wed Aug 4 16:59:14 2021
@@ -1,5 +1,5 @@
-/* $Id: mpcsa_leds.c,v 1.6 2021/04/24 23:36:34 thorpej Exp $ */
-/* $NetBSD: mpcsa_leds.c,v 1.6 2021/04/24 23:36:34 thorpej Exp $ */
+/* $Id: mpcsa_leds.c,v 1.6.8.1 2021/08/04 16:59:14 thorpej Exp $ */
+/* $NetBSD: mpcsa_leds.c,v 1.6.8.1 2021/08/04 16:59:14 thorpej Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpcsa_leds.c,v 1.6 2021/04/24 23:36:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpcsa_leds.c,v 1.6.8.1 2021/08/04 16:59:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -162,7 +162,7 @@ mpcsa_leds_attach(device_t parent, devic
gba.gba_gc = &sc->sc_gpio_chipset;
gba.gba_pins = sc->sc_pins;
gba.gba_npins = MPCSA_LEDS_NPINS;
- config_found(self, &gba, mpcsa_ledsbus_print, CFARG_EOL);
+ config_found(self, &gba, mpcsa_ledsbus_print, CFARGS_NONE);
#endif
/* attach device */
Index: src/sys/arch/evbarm/netwalker/netwalker_btn.c
diff -u src/sys/arch/evbarm/netwalker/netwalker_btn.c:1.3 src/sys/arch/evbarm/netwalker/netwalker_btn.c:1.3.8.1
--- src/sys/arch/evbarm/netwalker/netwalker_btn.c:1.3 Sat Apr 24 23:36:34 2021
+++ src/sys/arch/evbarm/netwalker/netwalker_btn.c Wed Aug 4 16:59:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netwalker_btn.c,v 1.3 2021/04/24 23:36:34 thorpej Exp $ */
+/* $NetBSD: netwalker_btn.c,v 1.3.8.1 2021/08/04 16:59:14 thorpej Exp $ */
/*
* Copyright (c) 2014 Genetec Corporation. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netwalker_btn.c,v 1.3 2021/04/24 23:36:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwalker_btn.c,v 1.3.8.1 2021/08/04 16:59:14 thorpej Exp $");
#include "opt_imxspi.h"
#include "opt_mousebtn.h"
@@ -180,7 +180,7 @@ mousebtn_attach(device_t parent, device_
a.accesscookie = sc;
sc->sc_buttons = 0;
- sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL);
+ sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARGS_NONE);
}
static int
Index: src/sys/arch/evbarm/nslu2/nslu2_iic.c
diff -u src/sys/arch/evbarm/nslu2/nslu2_iic.c:1.11 src/sys/arch/evbarm/nslu2/nslu2_iic.c:1.11.8.1
--- src/sys/arch/evbarm/nslu2/nslu2_iic.c:1.11 Sat Apr 24 23:36:34 2021
+++ src/sys/arch/evbarm/nslu2/nslu2_iic.c Wed Aug 4 16:59:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nslu2_iic.c,v 1.11 2021/04/24 23:36:34 thorpej Exp $ */
+/* $NetBSD: nslu2_iic.c,v 1.11.8.1 2021/08/04 16:59:14 thorpej Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -188,7 +188,7 @@ slugiic_deferred_attach(device_t self)
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &sc->sc_ic;
- config_found(self, &iba, iicbus_print, CFARG_EOL);
+ config_found(self, &iba, iicbus_print, CFARGS_NONE);
}
static int
Index: src/sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c:1.9 src/sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c:1.9.8.1
--- src/sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c:1.9 Sat Apr 24 23:36:34 2021
+++ src/sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c Wed Aug 4 16:59:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2410_kbd.c,v 1.9 2021/04/24 23:36:34 thorpej Exp $ */
+/* $NetBSD: smdk2410_kbd.c,v 1.9.8.1 2021/08/04 16:59:14 thorpej Exp $ */
/*
* Copyright (c) 2004 Genetec Corporation. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2410_kbd.c,v 1.9 2021/04/24 23:36:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2410_kbd.c,v 1.9.8.1 2021/08/04 16:59:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -340,7 +340,7 @@ sskbd_attach(device_t parent, device_t s
a.accessops = &sskbd_accessops;
a.accesscookie = sc;
- sc->wskbddev = config_found(self, &a, wskbddevprint, CFARG_EOL);
+ sc->wskbddev = config_found(self, &a, wskbddevprint, CFARGS_NONE);
}
Index: src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c:1.11 src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c:1.11.8.1
--- src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c:1.11 Sat Apr 24 23:36:34 2021
+++ src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c Wed Aug 4 16:59:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2410_lcd.c,v 1.11 2021/04/24 23:36:34 thorpej Exp $ */
+/* $NetBSD: smdk2410_lcd.c,v 1.11.8.1 2021/08/04 16:59:14 thorpej Exp $ */
/*
* Copyright (c) 2004 Genetec Corporation. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2410_lcd.c,v 1.11 2021/04/24 23:36:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2410_lcd.c,v 1.11.8.1 2021/08/04 16:59:14 thorpej Exp $");
/*
* LCD driver for Samsung SMDK2410.
@@ -255,7 +255,7 @@ lcd_attach(device_t parent, device_t sel
aa.accesscookie = sc;
- (void) config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ (void) config_found(self, &aa, wsemuldisplaydevprint, CFARGS_NONE);
#else
screen = s3c24x0_lcd_new_screen(sc, 240, 320, 16);
Index: src/sys/arch/evbarm/tsarm/tskp.c
diff -u src/sys/arch/evbarm/tsarm/tskp.c:1.11 src/sys/arch/evbarm/tsarm/tskp.c:1.11.8.1
--- src/sys/arch/evbarm/tsarm/tskp.c:1.11 Sat Apr 24 23:36:34 2021
+++ src/sys/arch/evbarm/tsarm/tskp.c Wed Aug 4 16:59:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tskp.c,v 1.11 2021/04/24 23:36:34 thorpej Exp $ */
+/* $NetBSD: tskp.c,v 1.11.8.1 2021/08/04 16:59:14 thorpej Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tskp.c,v 1.11 2021/04/24 23:36:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tskp.c,v 1.11.8.1 2021/08/04 16:59:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -151,7 +151,7 @@ tskp_attach(device_t parent, device_t se
wa.accessops = &mxkp_accessops;
wa.accesscookie = &sc->sc_mxkp;
sc->sc_mxkp.sc_wskbddev = config_found(self, &wa, wskbddevprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
static void
Index: src/sys/arch/evbarm/tsarm/tslcd.c
diff -u src/sys/arch/evbarm/tsarm/tslcd.c:1.19 src/sys/arch/evbarm/tsarm/tslcd.c:1.19.8.1
--- src/sys/arch/evbarm/tsarm/tslcd.c:1.19 Sat Apr 24 23:36:34 2021
+++ src/sys/arch/evbarm/tsarm/tslcd.c Wed Aug 4 16:59:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tslcd.c,v 1.19 2021/04/24 23:36:34 thorpej Exp $ */
+/* $NetBSD: tslcd.c,v 1.19.8.1 2021/08/04 16:59:14 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tslcd.c,v 1.19 2021/04/24 23:36:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tslcd.c,v 1.19.8.1 2021/08/04 16:59:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -165,7 +165,7 @@ tslcd_attach(device_t parent, device_t s
waa.scrdata = &tslcd_screenlist;
waa.accessops = &hlcd_accessops;
waa.accesscookie = &sc->sc_hlcd.sc_screen;
- config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE);
}
static void
Index: src/sys/arch/evbarm/tsarm/tspld.c
diff -u src/sys/arch/evbarm/tsarm/tspld.c:1.25 src/sys/arch/evbarm/tsarm/tspld.c:1.25.8.1
--- src/sys/arch/evbarm/tsarm/tspld.c:1.25 Sat Apr 24 23:36:34 2021
+++ src/sys/arch/evbarm/tsarm/tspld.c Wed Aug 4 16:59:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tspld.c,v 1.25 2021/04/24 23:36:34 thorpej Exp $ */
+/* $NetBSD: tspld.c,v 1.25.8.1 2021/08/04 16:59:14 thorpej Exp $ */
/*-
* Copyright (c) 2004 Jesse Off
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tspld.c,v 1.25 2021/04/24 23:36:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tspld.c,v 1.25.8.1 2021/08/04 16:59:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -443,7 +443,7 @@ tspld_search(device_t parent, cfdata_t c
sa.ta_iot = sc->sc_iot;
if (config_probe(parent, cf, &sa))
- config_attach(parent, cf, &sa, tspld_print, CFARG_EOL);
+ config_attach(parent, cf, &sa, tspld_print, CFARGS_NONE);
return (0);
}
@@ -470,17 +470,14 @@ tspld_callback(device_t self)
iba.iba_memt = &isa_mem_bs_tag;
isa_bs_mallocok();
config_found(self, &iba, isabusprint,
- CFARG_IATTR, "isabus",
- CFARG_EOL);
+ CFARGS(.iattr = "isabus"));
#endif
/*
* Attach each devices
*/
config_search(self, NULL,
- CFARG_SEARCH, tspld_search,
- CFARG_IATTR, "tspldbus",
- CFARG_EOL);
-
+ CFARGS(.search = tspld_search,
+ .iattr = "tspldbus"));
}
static int
