Module Name: src Committed By: thorpej Date: Thu Aug 5 00:41:14 UTC 2021
Modified Files: src/sys/rump/dev/lib/libpci [thorpej-cfargs2]: pci_at_mainbus.c src/sys/rump/dev/lib/libugenhc [thorpej-cfargs2]: ugenhc.c src/sys/rump/librump/rumpkern [thorpej-cfargs2]: rump_autoconf.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/rump/dev/lib/libpci/pci_at_mainbus.c cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/rump/dev/lib/libugenhc/ugenhc.c cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/rump/librump/rumpkern/rump_autoconf.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/rump/dev/lib/libpci/pci_at_mainbus.c diff -u src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.9 src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.9.8.1 --- src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.9 Sat Apr 24 23:37:01 2021 +++ src/sys/rump/dev/lib/libpci/pci_at_mainbus.c Thu Aug 5 00:41:14 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_at_mainbus.c,v 1.9 2021/04/24 23:37:01 thorpej Exp $ */ +/* $NetBSD: pci_at_mainbus.c,v 1.9.8.1 2021/08/05 00:41:14 thorpej Exp $ */ /* * Copyright (c) 2010 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pci_at_mainbus.c,v 1.9 2021/04/24 23:37:01 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_at_mainbus.c,v 1.9.8.1 2021/08/05 00:41:14 thorpej Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -99,6 +99,5 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV_AFTERM if (!mainbus) panic("no mainbus. use maintaxi instead?"); config_found(mainbus, &pba, pcibusprint, - CFARG_IATTR, "pcibus", - CFARG_EOL); + CFARGS(.iattr = "pcibus")); } Index: src/sys/rump/dev/lib/libugenhc/ugenhc.c diff -u src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.28 src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.28.8.1 --- src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.28 Sat Apr 24 23:37:01 2021 +++ src/sys/rump/dev/lib/libugenhc/ugenhc.c Thu Aug 5 00:41:14 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ugenhc.c,v 1.28 2021/04/24 23:37:01 thorpej Exp $ */ +/* $NetBSD: ugenhc.c,v 1.28.8.1 2021/08/05 00:41:14 thorpej Exp $ */ /* * Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.28 2021/04/24 23:37:01 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.28.8.1 2021/08/05 00:41:14 thorpej Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -959,5 +959,5 @@ ugenhc_attach(device_t parent, device_t mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE); - config_found(self, &sc->sc_bus, usbctlprint, CFARG_EOL); + config_found(self, &sc->sc_bus, usbctlprint, CFARGS_NONE); } Index: src/sys/rump/librump/rumpkern/rump_autoconf.c diff -u src/sys/rump/librump/rumpkern/rump_autoconf.c:1.2 src/sys/rump/librump/rumpkern/rump_autoconf.c:1.2.8.1 --- src/sys/rump/librump/rumpkern/rump_autoconf.c:1.2 Sat Apr 24 23:37:01 2021 +++ src/sys/rump/librump/rumpkern/rump_autoconf.c Thu Aug 5 00:41:14 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_autoconf.c,v 1.2 2021/04/24 23:37:01 thorpej Exp $ */ +/* $NetBSD: rump_autoconf.c,v 1.2.8.1 2021/08/05 00:41:14 thorpej Exp $ */ /* * Copyright (c) 2009 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rump_autoconf.c,v 1.2 2021/04/24 23:37:01 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rump_autoconf.c,v 1.2.8.1 2021/08/05 00:41:14 thorpej Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -107,9 +107,7 @@ mainbus_attach(device_t parent, device_t aprint_normal("\n"); config_search(self, NULL, - CFARG_SEARCH, mainbus_search, - CFARG_IATTR, "mainbus", - CFARG_EOL); + CFARGS(.search = mainbus_search)); } static int @@ -119,7 +117,7 @@ mainbus_search(device_t parent, cfdata_t maa.maa_unit = cf->cf_unit; if (config_probe(parent, cf, &maa)) - config_attach(parent, cf, &maa, NULL, CFARG_EOL); + config_attach(parent, cf, &maa, NULL, CFARGS_NONE); return 0; }