Module Name: src
Committed By: thorpej
Date: Wed Aug 4 18:24:14 UTC 2021
Modified Files:
src/sys/dev/fdt [thorpej-cfargs2]: dwc2_fdt.c dwc3_fdt.c ehci_fdt.c
fdt_i2c.c fdt_spi.c fdtbus.c gpiokeys.c ohci_fdt.c
virtio_mmio_fdt.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/dev/fdt/dwc2_fdt.c
cvs rdiff -u -r1.15 -r1.15.4.1 src/sys/dev/fdt/dwc3_fdt.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/dev/fdt/ehci_fdt.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/dev/fdt/fdt_i2c.c \
src/sys/dev/fdt/gpiokeys.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/dev/fdt/fdt_spi.c
cvs rdiff -u -r1.41 -r1.41.8.1 src/sys/dev/fdt/fdtbus.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/dev/fdt/ohci_fdt.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/dev/fdt/virtio_mmio_fdt.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/fdt/dwc2_fdt.c
diff -u src/sys/dev/fdt/dwc2_fdt.c:1.11 src/sys/dev/fdt/dwc2_fdt.c:1.11.8.1
--- src/sys/dev/fdt/dwc2_fdt.c:1.11 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/fdt/dwc2_fdt.c Wed Aug 4 18:24:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2_fdt.c,v 1.11 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: dwc2_fdt.c,v 1.11.8.1 2021/08/04 18:24:13 thorpej Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2_fdt.c,v 1.11 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2_fdt.c,v 1.11.8.1 2021/08/04 18:24:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -204,7 +204,7 @@ dwc2_fdt_deferred(device_t self)
return;
}
sc->sc_dwc2.sc_child = config_found(sc->sc_dwc2.sc_dev,
- &sc->sc_dwc2.sc_bus, usbctlprint, CFARG_EOL);
+ &sc->sc_dwc2.sc_bus, usbctlprint, CFARGS_NONE);
}
static void
Index: src/sys/dev/fdt/dwc3_fdt.c
diff -u src/sys/dev/fdt/dwc3_fdt.c:1.15 src/sys/dev/fdt/dwc3_fdt.c:1.15.4.1
--- src/sys/dev/fdt/dwc3_fdt.c:1.15 Tue May 18 11:13:31 2021
+++ src/sys/dev/fdt/dwc3_fdt.c Wed Aug 4 18:24:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc3_fdt.c,v 1.15 2021/05/18 11:13:31 jmcneill Exp $ */
+/* $NetBSD: dwc3_fdt.c,v 1.15.4.1 2021/08/04 18:24:13 thorpej Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc3_fdt.c,v 1.15 2021/05/18 11:13:31 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc3_fdt.c,v 1.15.4.1 2021/08/04 18:24:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -327,7 +327,7 @@ dwc3_fdt_attach(device_t parent, device_
return;
}
- sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARG_EOL);
+ sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARGS_NONE);
sc->sc_child2 = config_found(self, &sc->sc_bus2, usbctlprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
Index: src/sys/dev/fdt/ehci_fdt.c
diff -u src/sys/dev/fdt/ehci_fdt.c:1.7 src/sys/dev/fdt/ehci_fdt.c:1.7.8.1
--- src/sys/dev/fdt/ehci_fdt.c:1.7 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/fdt/ehci_fdt.c Wed Aug 4 18:24:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_fdt.c,v 1.7 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: ehci_fdt.c,v 1.7.8.1 2021/08/04 18:24:13 thorpej Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_fdt.c,v 1.7 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_fdt.c,v 1.7.8.1 2021/08/04 18:24:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -150,5 +150,5 @@ ehci_fdt_attach(device_t parent, device_
pmf_device_register1(self, NULL, NULL, ehci_shutdown);
- sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARG_EOL);
+ sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARGS_NONE);
}
Index: src/sys/dev/fdt/fdt_i2c.c
diff -u src/sys/dev/fdt/fdt_i2c.c:1.10 src/sys/dev/fdt/fdt_i2c.c:1.10.8.1
--- src/sys/dev/fdt/fdt_i2c.c:1.10 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/fdt/fdt_i2c.c Wed Aug 4 18:24:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_i2c.c,v 1.10 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: fdt_i2c.c,v 1.10.8.1 2021/08/04 18:24:13 thorpej Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_i2c.c,v 1.10 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_i2c.c,v 1.10.8.1 2021/08/04 18:24:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -123,8 +123,7 @@ fdtbus_attach_i2cbus(device_t dev, int p
prop_dictionary_set_bool(props, "i2c-no-indirect-config", true);
ret = config_found(dev, &iba, print,
- CFARG_IATTR, "i2cbus",
- CFARG_EOL);
+ CFARGS(.iattr = "i2cbus"));
if (iba.iba_child_devices)
prop_object_release(iba.iba_child_devices);
Index: src/sys/dev/fdt/gpiokeys.c
diff -u src/sys/dev/fdt/gpiokeys.c:1.10 src/sys/dev/fdt/gpiokeys.c:1.10.8.1
--- src/sys/dev/fdt/gpiokeys.c:1.10 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/fdt/gpiokeys.c Wed Aug 4 18:24:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gpiokeys.c,v 1.10 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: gpiokeys.c,v 1.10.8.1 2021/08/04 18:24:14 thorpej Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpiokeys.c,v 1.10 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpiokeys.c,v 1.10.8.1 2021/08/04 18:24:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -266,7 +266,7 @@ gpiokeys_attach(device_t parent, device_
a.accessops = &gpiokeys_accessops;
a.accesscookie = sc;
sc->sc_wskbddev =
- config_found(self, &a, wskbddevprint, CFARG_EOL);
+ config_found(self, &a, wskbddevprint, CFARGS_NONE);
}
callout_init(&sc->sc_tick, CALLOUT_MPSAFE);
Index: src/sys/dev/fdt/fdt_spi.c
diff -u src/sys/dev/fdt/fdt_spi.c:1.2 src/sys/dev/fdt/fdt_spi.c:1.2.8.1
--- src/sys/dev/fdt/fdt_spi.c:1.2 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/fdt/fdt_spi.c Wed Aug 4 18:24:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_spi.c,v 1.2 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: fdt_spi.c,v 1.2.8.1 2021/08/04 18:24:13 thorpej Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_spi.c,v 1.2 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_spi.c,v 1.2.8.1 2021/08/04 18:24:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -105,8 +105,7 @@ fdtbus_attach_spibus(device_t dev, int p
prop_object_release(devs);
ret = config_found(dev, &sba, print,
- CFARG_IATTR, "spibus",
- CFARG_EOL);
+ CFARGS(.iattr = "spibus"));
if (sba.sba_child_devices)
prop_object_release(sba.sba_child_devices);
Index: src/sys/dev/fdt/fdtbus.c
diff -u src/sys/dev/fdt/fdtbus.c:1.41 src/sys/dev/fdt/fdtbus.c:1.41.8.1
--- src/sys/dev/fdt/fdtbus.c:1.41 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/fdt/fdtbus.c Wed Aug 4 18:24:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtbus.c,v 1.41 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: fdtbus.c,v 1.41.8.1 2021/08/04 18:24:13 thorpej Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.41 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.41.8.1 2021/08/04 18:24:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -346,10 +346,9 @@ fdt_scan_best(struct fdt_softc *sc, stru
};
fdt_init_attach_args(&sc->sc_faa, node, true, &faa);
cf = config_search(node->n_bus, &faa,
- CFARG_SUBMATCH, fdt_scan_submatch,
- CFARG_IATTR, "fdt",
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = fdt_scan_submatch,
+ .iattr = "fdt",
+ .locators = locs));
if (cf == NULL)
continue;
match = config_match(node->n_bus, cf, &faa);
@@ -395,20 +394,20 @@ fdt_scan(struct fdt_softc *sc, int pass)
if (quiet) {
node->n_dev = config_attach(node->n_bus, node->n_cf,
&faa, fdtbus_print,
- CFARG_LOCATORS, locs,
- CFARG_DEVHANDLE, devhandle_from_of(node->n_phandle),
- CFARG_EOL);
+ CFARGS(.locators = locs,
+ .devhandle =
+ devhandle_from_of(node->n_phandle)));
} else {
/*
* Default pass.
*/
node->n_dev = config_found(node->n_bus, &faa,
fdtbus_print,
- CFARG_SUBMATCH, fdt_scan_submatch,
- CFARG_IATTR, "fdt",
- CFARG_LOCATORS, locs,
- CFARG_DEVHANDLE, devhandle_from_of(node->n_phandle),
- CFARG_EOL);
+ CFARGS(.submatch = fdt_scan_submatch,
+ .iattr = "fdt",
+ .locators = locs,
+ .devhandle =
+ devhandle_from_of(node->n_phandle)));
}
if (node->n_dev != NULL)
Index: src/sys/dev/fdt/ohci_fdt.c
diff -u src/sys/dev/fdt/ohci_fdt.c:1.6 src/sys/dev/fdt/ohci_fdt.c:1.6.8.1
--- src/sys/dev/fdt/ohci_fdt.c:1.6 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/fdt/ohci_fdt.c Wed Aug 4 18:24:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_fdt.c,v 1.6 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: ohci_fdt.c,v 1.6.8.1 2021/08/04 18:24:14 thorpej Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_fdt.c,v 1.6 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_fdt.c,v 1.6.8.1 2021/08/04 18:24:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -146,5 +146,5 @@ ohci_fdt_attach(device_t parent, device_
pmf_device_register1(self, NULL, NULL, ohci_shutdown);
- sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARG_EOL);
+ sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint, CFARGS_NONE);
}
Index: src/sys/dev/fdt/virtio_mmio_fdt.c
diff -u src/sys/dev/fdt/virtio_mmio_fdt.c:1.8 src/sys/dev/fdt/virtio_mmio_fdt.c:1.8.8.1
--- src/sys/dev/fdt/virtio_mmio_fdt.c:1.8 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/fdt/virtio_mmio_fdt.c Wed Aug 4 18:24:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_mmio_fdt.c,v 1.8 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: virtio_mmio_fdt.c,v 1.8.8.1 2021/08/04 18:24:14 thorpej Exp $ */
/*
* Copyright (c) 2018 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio_mmio_fdt.c,v 1.8 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_mmio_fdt.c,v 1.8.8.1 2021/08/04 18:24:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -123,7 +123,7 @@ virtio_mmio_fdt_rescan(device_t self, co
memset(&va, 0, sizeof(va));
va.sc_childdevid = vsc->sc_childdevid;
- config_found(self, &va, NULL, CFARG_EOL);
+ config_found(self, &va, NULL, CFARGS_NONE);
if (virtio_attach_failed(vsc))
return 0;
