Module Name: src
Committed By: thorpej
Date: Wed Aug 4 02:35:50 UTC 2021
Modified Files:
src/sys/arch/ia64/ia64 [thorpej-cfargs2]: mainbus.c
src/sys/arch/ibmnws/ibmnws [thorpej-cfargs2]: mainbus.c
src/sys/arch/iyonix/iyonix [thorpej-cfargs2]: obio.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/ia64/ia64/mainbus.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/ibmnws/ibmnws/mainbus.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/iyonix/iyonix/obio.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/ia64/ia64/mainbus.c
diff -u src/sys/arch/ia64/ia64/mainbus.c:1.12 src/sys/arch/ia64/ia64/mainbus.c:1.12.8.1
--- src/sys/arch/ia64/ia64/mainbus.c:1.12 Sat Apr 24 23:36:40 2021
+++ src/sys/arch/ia64/ia64/mainbus.c Wed Aug 4 02:35:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.12 2021/04/24 23:36:40 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.12.8.1 2021/08/04 02:35:50 thorpej Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.12 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.12.8.1 2021/08/04 02:35:50 thorpej Exp $");
#include "acpica.h"
@@ -108,8 +108,7 @@ mainbus_attach(device_t parent, device_t
if (entry->Header.Type == ACPI_MADT_TYPE_LOCAL_SAPIC)
config_found(self, entry, NULL,
- CFARG_IATTR, "cpubus",
- CFARG_EOL);
+ CFARGS(.iattr = "cpubus"));
p += entry->Header.Length;
}
@@ -129,8 +128,7 @@ mainbus_attach(device_t parent, device_t
aaa.aa_dmat = NULL; /* XXX */
aaa.aa_dmat64 = NULL; /* XXX */
config_found(self, &aaa, NULL,
- CFARG_IATTR, "acpibus",
- CFARG_EOL);
+ CFARGS(.iattr = "acpibus"));
#endif
return;
Index: src/sys/arch/ibmnws/ibmnws/mainbus.c
diff -u src/sys/arch/ibmnws/ibmnws/mainbus.c:1.16 src/sys/arch/ibmnws/ibmnws/mainbus.c:1.16.8.1
--- src/sys/arch/ibmnws/ibmnws/mainbus.c:1.16 Sat Apr 24 23:36:40 2021
+++ src/sys/arch/ibmnws/ibmnws/mainbus.c Wed Aug 4 02:35:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.16 2021/04/24 23:36:40 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.16.8.1 2021/08/04 02:35:50 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -108,8 +108,7 @@ mainbus_attach(device_t parent, device_t
ca.ca_name = "cpu";
ca.ca_node = 0;
config_found(self, &ca, mainbus_print,
- CFARG_IATTR, "mainbus",
- CFARG_EOL);
+ CFARGS(.iattr = "mainbus"));
#if NOBIO > 0
obio_reserve_resource_map();
@@ -148,8 +147,7 @@ mainbus_attach(device_t parent, device_t
mba.mba_pba.pba_bridgetag = NULL;
mba.mba_pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
config_found(self, &mba.mba_pba, pcibusprint,
- CFARG_IATTR, "pcibus",
- CFARG_EOL);
+ CFARGS(.iattr = "pcibus"));
#endif
#if NOBIO > 0
@@ -162,8 +160,7 @@ mainbus_attach(device_t parent, device_t
mba.mba_pba.pba_iot = &isa_io_space_tag;
mba.mba_pba.pba_memt = &isa_mem_space_tag;
config_found(self, &mba.mba_pba, mainbus_print,
- CFARG_IATTR, "mainbus",
- CFARG_EOL);
+ CFARGS(.iattr = "mainbus"));
}
#endif
#endif
Index: src/sys/arch/iyonix/iyonix/obio.c
diff -u src/sys/arch/iyonix/iyonix/obio.c:1.7 src/sys/arch/iyonix/iyonix/obio.c:1.7.8.1
--- src/sys/arch/iyonix/iyonix/obio.c:1.7 Sat Apr 24 23:36:40 2021
+++ src/sys/arch/iyonix/iyonix/obio.c Wed Aug 4 02:35:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.7 2021/04/24 23:36:40 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.7.8.1 2021/08/04 02:35:50 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.7 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.7.8.1 2021/08/04 02:35:50 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);
}
