Module Name: src Committed By: thorpej Date: Wed Aug 4 03:23:10 UTC 2021
Modified Files: src/sys/arch/evbppc/ev64260 [thorpej-cfargs2]: mainbus.c src/sys/arch/evbppc/explora/dev [thorpej-cfargs2]: elb.c fb_elb.c src/sys/arch/evbppc/mpc85xx [thorpej-cfargs2]: autoconf.c src/sys/arch/evbppc/pmppc [thorpej-cfargs2]: mainbus.c src/sys/arch/evbppc/virtex [thorpej-cfargs2]: design_gsrd1.c design_gsrd2.c src/sys/arch/evbppc/virtex/dev [thorpej-cfargs2]: tft.c src/sys/arch/evbppc/walnut/dev [thorpej-cfargs2]: pbus.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/evbppc/ev64260/mainbus.c cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/evbppc/explora/dev/elb.c cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/evbppc/explora/dev/fb_elb.c cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/evbppc/mpc85xx/autoconf.c cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/evbppc/pmppc/mainbus.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/evbppc/virtex/design_gsrd1.c cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/evbppc/virtex/design_gsrd2.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/evbppc/virtex/dev/tft.c cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/evbppc/walnut/dev/pbus.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/evbppc/ev64260/mainbus.c diff -u src/sys/arch/evbppc/ev64260/mainbus.c:1.8 src/sys/arch/evbppc/ev64260/mainbus.c:1.8.8.1 --- src/sys/arch/evbppc/ev64260/mainbus.c:1.8 Sat Apr 24 23:36:36 2021 +++ src/sys/arch/evbppc/ev64260/mainbus.c Wed Aug 4 03:23:10 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.8 2021/04/24 23:36:36 thorpej Exp $ */ +/* $NetBSD: mainbus.c,v 1.8.8.1 2021/08/04 03:23:10 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.8 2021/04/24 23:36:36 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.8.8.1 2021/08/04 03:23:10 thorpej Exp $"); #include "mainbus.h" #include "opt_multiprocessor.h" @@ -86,7 +86,7 @@ mainbus_attach(device_t parent, device_t mba.mba_name = "cpu"; mba.mba_unit = 0; mba.mba_addr = MAINBUSCF_ADDR_DEFAULT; - config_found(self, &mba, mainbus_cfprint, CFARG_EOL); + config_found(self, &mba, mainbus_cfprint, CFARGS_NONE); #ifdef MULTIPROCESSOR /* @@ -95,7 +95,7 @@ mainbus_attach(device_t parent, device_t mba.mba_name = "cpu"; mba.mba_unit = 1; mba.mba_addr = MAINBUSCF_ADDR_DEFAULT; - config_found(self, &mba, mainbus_cfprint, CFARG_EOL); + config_found(self, &mba, mainbus_cfprint, CFARGS_NONE); #endif /* @@ -104,7 +104,7 @@ mainbus_attach(device_t parent, device_t mba.mba_name = "gt"; mba.mba_unit = -1; mba.mba_addr = gt_base; - config_found(self, &mba, mainbus_cfprint, CFARG_EOL); + config_found(self, &mba, mainbus_cfprint, CFARGS_NONE); } int Index: src/sys/arch/evbppc/explora/dev/elb.c diff -u src/sys/arch/evbppc/explora/dev/elb.c:1.10 src/sys/arch/evbppc/explora/dev/elb.c:1.10.8.1 --- src/sys/arch/evbppc/explora/dev/elb.c:1.10 Sat Apr 24 23:36:36 2021 +++ src/sys/arch/evbppc/explora/dev/elb.c Wed Aug 4 03:23:10 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: elb.c,v 1.10 2021/04/24 23:36:36 thorpej Exp $ */ +/* $NetBSD: elb.c,v 1.10.8.1 2021/08/04 03:23:10 thorpej Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: elb.c,v 1.10 2021/04/24 23:36:36 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: elb.c,v 1.10.8.1 2021/08/04 03:23:10 thorpej Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -141,7 +141,7 @@ elb_attach(device_t parent, device_t sel eaa.elb_base2 = elb->elb_addr2; eaa.elb_irq = elb->elb_irq; - (void) config_found(self, &eaa, elb_print, CFARG_EOL); + (void) config_found(self, &eaa, elb_print, CFARGS_NONE); } } Index: src/sys/arch/evbppc/explora/dev/fb_elb.c diff -u src/sys/arch/evbppc/explora/dev/fb_elb.c:1.19 src/sys/arch/evbppc/explora/dev/fb_elb.c:1.19.8.1 --- src/sys/arch/evbppc/explora/dev/fb_elb.c:1.19 Sat Apr 24 23:36:36 2021 +++ src/sys/arch/evbppc/explora/dev/fb_elb.c Wed Aug 4 03:23:10 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: fb_elb.c,v 1.19 2021/04/24 23:36:36 thorpej Exp $ */ +/* $NetBSD: fb_elb.c,v 1.19.8.1 2021/08/04 03:23:10 thorpej Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.19 2021/04/24 23:36:36 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.19.8.1 2021/08/04 03:23:10 thorpej Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -214,7 +214,7 @@ fb_elb_attach(device_t parent, device_t waa.accessops = &accessops; waa.accesscookie = sc; - config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL); + config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE); } static void Index: src/sys/arch/evbppc/mpc85xx/autoconf.c diff -u src/sys/arch/evbppc/mpc85xx/autoconf.c:1.10 src/sys/arch/evbppc/mpc85xx/autoconf.c:1.10.8.1 --- src/sys/arch/evbppc/mpc85xx/autoconf.c:1.10 Sat Apr 24 23:36:36 2021 +++ src/sys/arch/evbppc/mpc85xx/autoconf.c Wed Aug 4 03:23:10 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.10 2021/04/24 23:36:36 thorpej Exp $ */ +/* $NetBSD: autoconf.c,v 1.10.8.1 2021/08/04 03:23:10 thorpej Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.10 2021/04/24 23:36:36 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.10.8.1 2021/08/04 03:23:10 thorpej Exp $"); #define __INTR_PRIVATE @@ -156,7 +156,7 @@ mainbus_attach(device_t parent, device_t ma.ma_le_memt = curcpu()->ci_softc->cpu_le_bst; ma.ma_dmat = &booke_bus_dma_tag; - config_found(self, &ma, mainbus_print, CFARG_EOL); + config_found(self, &ma, mainbus_print, CFARGS_NONE); } CFATTACH_DECL_NEW(mainbus, 0, mainbus_match, mainbus_attach, NULL, NULL); Index: src/sys/arch/evbppc/pmppc/mainbus.c diff -u src/sys/arch/evbppc/pmppc/mainbus.c:1.7 src/sys/arch/evbppc/pmppc/mainbus.c:1.7.8.1 --- src/sys/arch/evbppc/pmppc/mainbus.c:1.7 Sat Apr 24 23:36:36 2021 +++ src/sys/arch/evbppc/pmppc/mainbus.c Wed Aug 4 03:23:10 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.7 2021/04/24 23:36:36 thorpej Exp $ */ +/* $NetBSD: mainbus.c,v 1.7.8.1 2021/08/04 03:23:10 thorpej Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.7 2021/04/24 23:36:36 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.7.8.1 2021/08/04 03:23:10 thorpej Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -115,15 +115,14 @@ mainbus_attach(device_t parent, device_t maa.mb_name = "cpu"; maa.mb_addr = MAINBUSCF_ADDR_DEFAULT; maa.mb_irq = MAINBUSCF_IRQ_DEFAULT; - config_found(self, &maa, mainbus_print, CFARG_EOL); + config_found(self, &maa, mainbus_print, CFARGS_NONE); if (a_config.a_has_rtc) { maa.mb_name = "rtc"; maa.mb_addr = PMPPC_RTC; maa.mb_irq = PMPPC_I_RTC_INT; config_found(self, &maa, mainbus_print, - CFARG_SUBMATCH, mainbus_submatch, - CFARG_EOL); + CFARGS(.submatch = mainbus_submatch)); } if (a_config.a_has_eth) { @@ -131,8 +130,7 @@ mainbus_attach(device_t parent, device_t maa.mb_addr = PMPPC_CS_IO_BASE; maa.mb_irq = PMPPC_I_ETH_INT; config_found(self, &maa, mainbus_print, - CFARG_SUBMATCH, mainbus_submatch, - CFARG_EOL); + CFARGS(.submatch = mainbus_submatch)); maa.mb_bt = &pmppc_mem_tag; } if (a_config.a_flash_width != 0) { @@ -142,14 +140,13 @@ mainbus_attach(device_t parent, device_t maa.u.mb_flash.size = a_config.a_flash_size; maa.u.mb_flash.width = a_config.a_flash_width; config_found(self, &maa, mainbus_print, - CFARG_SUBMATCH, mainbus_submatch, - CFARG_EOL); + CFARGS(.submatch = mainbus_submatch)); } maa.mb_name = "cpc"; maa.mb_addr = MAINBUSCF_ADDR_DEFAULT; maa.mb_irq = MAINBUSCF_IRQ_DEFAULT; - config_found(self, &maa, mainbus_print, CFARG_EOL); + config_found(self, &maa, mainbus_print, CFARGS_NONE); } static int cpu_match(device_t, cfdata_t, void *); Index: src/sys/arch/evbppc/virtex/design_gsrd1.c diff -u src/sys/arch/evbppc/virtex/design_gsrd1.c:1.6 src/sys/arch/evbppc/virtex/design_gsrd1.c:1.6.8.1 --- src/sys/arch/evbppc/virtex/design_gsrd1.c:1.6 Sat Apr 24 23:36:36 2021 +++ src/sys/arch/evbppc/virtex/design_gsrd1.c Wed Aug 4 03:23:10 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: design_gsrd1.c,v 1.6 2021/04/24 23:36:36 thorpej Exp $ */ +/* $NetBSD: design_gsrd1.c,v 1.6.8.1 2021/08/04 03:23:10 thorpej Exp $ */ /* * Copyright (c) 2006 Jachym Holecek @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: design_gsrd1.c,v 1.6 2021/04/24 23:36:36 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: design_gsrd1.c,v 1.6.8.1 2021/08/04 03:23:10 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -349,8 +349,7 @@ virtex_autoconf(device_t self, struct pl vaa.vaa_tx_dmac = virtex_mpmc_mapdma(g->gdv_tx_dma, &tx); config_found(self, &vaa, xcvbus_print, - CFARG_IATTR, g->gdv_attr, - CFARG_EOL); + CFARGS(.attr = g->gdv_attr)); } /* Setup the dispatch handler. */ Index: src/sys/arch/evbppc/virtex/design_gsrd2.c diff -u src/sys/arch/evbppc/virtex/design_gsrd2.c:1.7 src/sys/arch/evbppc/virtex/design_gsrd2.c:1.7.8.1 --- src/sys/arch/evbppc/virtex/design_gsrd2.c:1.7 Sat Apr 24 23:36:36 2021 +++ src/sys/arch/evbppc/virtex/design_gsrd2.c Wed Aug 4 03:23:10 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: design_gsrd2.c,v 1.7 2021/04/24 23:36:36 thorpej Exp $ */ +/* $NetBSD: design_gsrd2.c,v 1.7.8.1 2021/08/04 03:23:10 thorpej Exp $ */ /* * Copyright (c) 2006 Jachym Holecek @@ -32,7 +32,7 @@ #include "opt_virtex.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: design_gsrd2.c,v 1.7 2021/04/24 23:36:36 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: design_gsrd2.c,v 1.7.8.1 2021/08/04 03:23:10 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -406,8 +406,7 @@ virtex_autoconf(device_t self, struct pl vaa.vaa_tx_dmac = virtex_mpmc_mapdma(g->gdv_tx_dma, &tx); config_found(self, &vaa, xcvbus_print, - CFARG_IATTR, g->gdv_attr, - CFARG_EOL); + CFARGS(.iattr = g->gdv_attr)); } /* Setup the dispatch handler. */ Index: src/sys/arch/evbppc/virtex/dev/tft.c diff -u src/sys/arch/evbppc/virtex/dev/tft.c:1.6 src/sys/arch/evbppc/virtex/dev/tft.c:1.6.8.1 --- src/sys/arch/evbppc/virtex/dev/tft.c:1.6 Sat Apr 24 23:36:36 2021 +++ src/sys/arch/evbppc/virtex/dev/tft.c Wed Aug 4 03:23:10 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: tft.c,v 1.6 2021/04/24 23:36:36 thorpej Exp $ */ +/* $NetBSD: tft.c,v 1.6.8.1 2021/08/04 03:23:10 thorpej Exp $ */ /* * Copyright (c) 2006 Jachym Holecek @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tft.c,v 1.6 2021/04/24 23:36:36 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tft.c,v 1.6.8.1 2021/08/04 03:23:10 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -134,7 +134,7 @@ tft_attach(device_t self, struct wsdispl waa.accessops = accessops; waa.accesscookie = &sc->sc_vc_data; - config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL); + config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE); } static void Index: src/sys/arch/evbppc/walnut/dev/pbus.c diff -u src/sys/arch/evbppc/walnut/dev/pbus.c:1.14 src/sys/arch/evbppc/walnut/dev/pbus.c:1.14.8.1 --- src/sys/arch/evbppc/walnut/dev/pbus.c:1.14 Sat Apr 24 23:36:36 2021 +++ src/sys/arch/evbppc/walnut/dev/pbus.c Wed Aug 4 03:23:10 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pbus.c,v 1.14 2021/04/24 23:36:36 thorpej Exp $ */ +/* $NetBSD: pbus.c,v 1.14.8.1 2021/08/04 03:23:10 thorpej Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pbus.c,v 1.14 2021/04/24 23:36:36 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pbus.c,v 1.14.8.1 2021/08/04 03:23:10 thorpej Exp $"); #include "locators.h" #include "pckbc.h" @@ -158,9 +158,8 @@ pbus_attach(device_t parent, device_t se }; config_found(self, &pba, pbus_print, - CFARG_SUBMATCH, config_stdsubmatch, - CFARG_LOCATORS, locs, - CFARG_EOL); + CFARGS(.submatch = config_stdsubmatch, + .locators = locs)); } #if NPCKBC > 0