Module Name: src
Committed By: thorpej
Date: Wed Aug 4 21:00:41 UTC 2021
Modified Files:
src/sys/dev/marvell [thorpej-cfargs2]: ehci_mv.c gt.c gtpci.c if_gfe.c
if_mvgbe.c mvpex.c mvsdio.c mvspi.c obio.c
src/sys/dev/mca [thorpej-cfargs2]: edc_mca.c mca.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/dev/marvell/ehci_mv.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/dev/marvell/gt.c
cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/dev/marvell/gtpci.c
cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/dev/marvell/if_gfe.c
cvs rdiff -u -r1.60 -r1.60.8.1 src/sys/dev/marvell/if_mvgbe.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/dev/marvell/mvpex.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/dev/marvell/mvsdio.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/dev/marvell/mvspi.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/dev/marvell/obio.c
cvs rdiff -u -r1.53 -r1.53.8.1 src/sys/dev/mca/edc_mca.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/dev/mca/mca.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/dev/marvell/ehci_mv.c
diff -u src/sys/dev/marvell/ehci_mv.c:1.9 src/sys/dev/marvell/ehci_mv.c:1.9.8.1
--- src/sys/dev/marvell/ehci_mv.c:1.9 Sat Apr 24 23:36:56 2021
+++ src/sys/dev/marvell/ehci_mv.c Wed Aug 4 21:00:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_mv.c,v 1.9 2021/04/24 23:36:56 thorpej Exp $ */
+/* $NetBSD: ehci_mv.c,v 1.9.8.1 2021/08/04 21:00:41 thorpej Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_mv.c,v 1.9 2021/04/24 23:36:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_mv.c,v 1.9.8.1 2021/08/04 21:00:41 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -247,7 +247,7 @@ mvusb_attach(device_t parent, device_t s
/* Attach usb device. */
sc->sc.sc_child = config_found(self, &sc->sc.sc_bus, usbctlprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
static void
Index: src/sys/dev/marvell/gt.c
diff -u src/sys/dev/marvell/gt.c:1.29 src/sys/dev/marvell/gt.c:1.29.8.1
--- src/sys/dev/marvell/gt.c:1.29 Sat Apr 24 23:36:56 2021
+++ src/sys/dev/marvell/gt.c Wed Aug 4 21:00:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gt.c,v 1.29 2021/04/24 23:36:56 thorpej Exp $ */
+/* $NetBSD: gt.c,v 1.29.8.1 2021/08/04 21:00:41 thorpej Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.29 2021/04/24 23:36:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.29.8.1 2021/08/04 21:00:41 thorpej Exp $");
#include "opt_marvell.h"
#include "gtmpsc.h"
@@ -236,8 +236,7 @@ gt_attach_peripherals(struct gt_softc *s
mva.mva_irq = gt_devs[i].irq;
config_found(sc->sc_dev, &mva, gt_cfprint,
- CFARG_SUBMATCH, gt_cfsearch,
- CFARG_EOL);
+ CFARGS(.submatch = gt_cfsearch));
}
}
Index: src/sys/dev/marvell/gtpci.c
diff -u src/sys/dev/marvell/gtpci.c:1.35 src/sys/dev/marvell/gtpci.c:1.35.8.1
--- src/sys/dev/marvell/gtpci.c:1.35 Sat Apr 24 23:36:56 2021
+++ src/sys/dev/marvell/gtpci.c Wed Aug 4 21:00:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gtpci.c,v 1.35 2021/04/24 23:36:56 thorpej Exp $ */
+/* $NetBSD: gtpci.c,v 1.35.8.1 2021/08/04 21:00:41 thorpej Exp $ */
/*
* Copyright (c) 2008, 2009 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.35 2021/04/24 23:36:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.35.8.1 2021/08/04 21:00:41 thorpej Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -492,7 +492,7 @@ gtpci_pci_config(struct gtpci_softc *sc,
pba.pba_flags |= PCI_FLAGS_MWI_OKAY;
pba.pba_bus = GTPCI_P2PC_BUSNUMBER(p2pc);
pba.pba_bridgetag = NULL;
- config_found(sc->sc_dev, &pba, NULL, CFARG_EOL);
+ config_found(sc->sc_dev, &pba, NULL, CFARGS_NONE);
}
Index: src/sys/dev/marvell/if_gfe.c
diff -u src/sys/dev/marvell/if_gfe.c:1.58 src/sys/dev/marvell/if_gfe.c:1.58.8.1
--- src/sys/dev/marvell/if_gfe.c:1.58 Sat Apr 24 23:36:56 2021
+++ src/sys/dev/marvell/if_gfe.c Wed Aug 4 21:00:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gfe.c,v 1.58 2021/04/24 23:36:56 thorpej Exp $ */
+/* $NetBSD: if_gfe.c,v 1.58.8.1 2021/08/04 21:00:41 thorpej Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.58 2021/04/24 23:36:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.58.8.1 2021/08/04 21:00:41 thorpej Exp $");
#include "opt_inet.h"
@@ -250,8 +250,7 @@ gfec_attach(device_t parent, device_t se
gfea.mva_dmat = mva->mva_dmat;
gfea.mva_irq = gfe_irqs[i];
config_found(sc->sc_dev, &gfea, gfec_print,
- CFARG_SUBMATCH, gfec_search,
- CFARG_EOL);
+ CFARGS(.submatch = gfec_search));
}
}
Index: src/sys/dev/marvell/if_mvgbe.c
diff -u src/sys/dev/marvell/if_mvgbe.c:1.60 src/sys/dev/marvell/if_mvgbe.c:1.60.8.1
--- src/sys/dev/marvell/if_mvgbe.c:1.60 Sat Apr 24 23:36:56 2021
+++ src/sys/dev/marvell/if_mvgbe.c Wed Aug 4 21:00:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mvgbe.c,v 1.60 2021/04/24 23:36:56 thorpej Exp $ */
+/* $NetBSD: if_mvgbe.c,v 1.60.8.1 2021/08/04 21:00:41 thorpej Exp $ */
/*
* Copyright (c) 2007, 2008, 2013 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.60 2021/04/24 23:36:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.60.8.1 2021/08/04 21:00:41 thorpej Exp $");
#include "opt_multiprocessor.h"
@@ -471,8 +471,7 @@ mvgbec_attach(device_t parent, device_t
gbea.mva_dmat = mva->mva_dmat;
gbea.mva_irq = mvgbe_ports[i].irqs[j];
child = config_found(csc->sc_dev, &gbea, mvgbec_print,
- CFARG_SUBMATCH, mvgbec_search,
- CFARG_EOL);
+ CFARGS(.submatch = mvgbec_search));
if (child) {
port = device_private(child);
mii = LIST_FIRST(&port->sc_mii.mii_phys);
Index: src/sys/dev/marvell/mvpex.c
diff -u src/sys/dev/marvell/mvpex.c:1.21 src/sys/dev/marvell/mvpex.c:1.21.8.1
--- src/sys/dev/marvell/mvpex.c:1.21 Sat Apr 24 23:36:56 2021
+++ src/sys/dev/marvell/mvpex.c Wed Aug 4 21:00:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mvpex.c,v 1.21 2021/04/24 23:36:56 thorpej Exp $ */
+/* $NetBSD: mvpex.c,v 1.21.8.1 2021/08/04 21:00:41 thorpej Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvpex.c,v 1.21 2021/04/24 23:36:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvpex.c,v 1.21.8.1 2021/08/04 21:00:41 thorpej Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -434,7 +434,7 @@ mvpex_pci_config(struct mvpex_softc *sc,
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
pba.pba_bus = MVPEX_STAT_PEXBUSNUM(stat);
pba.pba_bridgetag = NULL;
- config_found(sc->sc_dev, &pba, NULL, CFARG_EOL);
+ config_found(sc->sc_dev, &pba, NULL, CFARGS_NONE);
}
Index: src/sys/dev/marvell/mvsdio.c
diff -u src/sys/dev/marvell/mvsdio.c:1.7 src/sys/dev/marvell/mvsdio.c:1.7.8.1
--- src/sys/dev/marvell/mvsdio.c:1.7 Sat Apr 24 23:36:56 2021
+++ src/sys/dev/marvell/mvsdio.c Wed Aug 4 21:00:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsdio.c,v 1.7 2021/04/24 23:36:56 thorpej Exp $ */
+/* $NetBSD: mvsdio.c,v 1.7.8.1 2021/08/04 21:00:41 thorpej Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsdio.c,v 1.7 2021/04/24 23:36:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsdio.c,v 1.7.8.1 2021/08/04 21:00:41 thorpej Exp $");
#include "opt_mvsdio.h"
@@ -251,7 +251,7 @@ mvsdio_attach(device_t parent, device_t
#ifndef MVSDIO_CARD_DETECT
saa.saa_caps |= SMC_CAPS_POLL_CARD_DET;
#endif
- sc->sc_sdmmc = config_found(sc->sc_dev, &saa, NULL, CFARG_EOL);
+ sc->sc_sdmmc = config_found(sc->sc_dev, &saa, NULL, CFARGS_NONE);
}
static int
Index: src/sys/dev/marvell/mvspi.c
diff -u src/sys/dev/marvell/mvspi.c:1.6 src/sys/dev/marvell/mvspi.c:1.6.8.1
--- src/sys/dev/marvell/mvspi.c:1.6 Sat Apr 24 23:36:56 2021
+++ src/sys/dev/marvell/mvspi.c Wed Aug 4 21:00:41 2021
@@ -150,7 +150,7 @@ mvspi_attach(struct device *parent, stru
*/
memset(&sba, 0, sizeof(sba));
sba.sba_controller = &sc->sc_spi;
- config_found(self, &sba, spibus_print, CFARG_EOL);
+ config_found(self, &sba, spibus_print, CFARGS_NONE);
}
int
Index: src/sys/dev/marvell/obio.c
diff -u src/sys/dev/marvell/obio.c:1.16 src/sys/dev/marvell/obio.c:1.16.8.1
--- src/sys/dev/marvell/obio.c:1.16 Sat Apr 24 23:36:56 2021
+++ src/sys/dev/marvell/obio.c Wed Aug 4 21:00:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.16 2021/04/24 23:36:56 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.16.8.1 2021/08/04 21:00:41 thorpej Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.16 2021/04/24 23:36:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.16.8.1 2021/08/04 21:00:41 thorpej Exp $");
#include "opt_marvell.h"
@@ -138,8 +138,7 @@ obio_attach(device_t parent, device_t se
GT_LowAddr_GET(datal), GT_HighAddr_GET(datah));
config_search(self, NULL,
- CFARG_SEARCH, obio_cfsearch,
- CFARG_EOL);
+ CFARGS(.search = obio_cfsearch));
}
@@ -172,7 +171,7 @@ obio_cfsearch(device_t parent, cfdata_t
oa.oa_irq = cf->cf_loc[OBIOCF_IRQ];
if (config_probe(parent, cf, &oa))
- config_attach(parent, cf, &oa, obio_cfprint, CFARG_EOL);
+ config_attach(parent, cf, &oa, obio_cfprint, CFARGS_NONE);
return 0;
}
Index: src/sys/dev/mca/edc_mca.c
diff -u src/sys/dev/mca/edc_mca.c:1.53 src/sys/dev/mca/edc_mca.c:1.53.8.1
--- src/sys/dev/mca/edc_mca.c:1.53 Sat Apr 24 23:36:56 2021
+++ src/sys/dev/mca/edc_mca.c Wed Aug 4 21:00:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: edc_mca.c,v 1.53 2021/04/24 23:36:56 thorpej Exp $ */
+/* $NetBSD: edc_mca.c,v 1.53.8.1 2021/08/04 21:00:41 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.53 2021/04/24 23:36:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.53.8.1 2021/08/04 21:00:41 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -302,9 +302,8 @@ edc_mca_attach(device_t parent, device_t
sc->sc_ed[devno] = device_private(
config_found(self, &eda, NULL,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL));
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs)));
/* If initialization did not succeed, NULL the pointer. */
if (sc->sc_ed[devno]
Index: src/sys/dev/mca/mca.c
diff -u src/sys/dev/mca/mca.c:1.33 src/sys/dev/mca/mca.c:1.33.8.1
--- src/sys/dev/mca/mca.c:1.33 Sat Apr 24 23:36:56 2021
+++ src/sys/dev/mca/mca.c Wed Aug 4 21:00:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mca.c,v 1.33 2021/04/24 23:36:56 thorpej Exp $ */
+/* $NetBSD: mca.c,v 1.33.8.1 2021/08/04 21:00:41 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.33 2021/04/24 23:36:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.33.8.1 2021/08/04 21:00:41 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -154,9 +154,8 @@ mca_attach(device_t parent, device_t sel
if (ma.ma_pos[2] & MCA_POS2_ENABLE
|| mca_match_disabled(ma.ma_id))
config_found(self, &ma, mca_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
else {
mca_print(&ma, device_xname(self));
aprint_normal(" disabled\n");
