Module Name: src Committed By: thorpej Date: Tue Aug 3 23:24:35 UTC 2021
Modified Files: src/sys/arch/amd64/amd64 [thorpej-cfargs2]: amd64_mainbus.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/amd64/amd64/amd64_mainbus.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/amd64/amd64/amd64_mainbus.c diff -u src/sys/arch/amd64/amd64/amd64_mainbus.c:1.6 src/sys/arch/amd64/amd64/amd64_mainbus.c:1.6.8.1 --- src/sys/arch/amd64/amd64/amd64_mainbus.c:1.6 Sat Apr 24 23:36:24 2021 +++ src/sys/arch/amd64/amd64/amd64_mainbus.c Tue Aug 3 23:24:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: amd64_mainbus.c,v 1.6 2021/04/24 23:36:24 thorpej Exp $ */ +/* $NetBSD: amd64_mainbus.c,v 1.6.8.1 2021/08/03 23:24:35 thorpej Exp $ */ /* NetBSD: mainbus.c,v 1.39 2018/12/02 08:19:44 cherry Exp */ /* @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: amd64_mainbus.c,v 1.6 2021/04/24 23:36:24 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: amd64_mainbus.c,v 1.6.8.1 2021/08/03 23:24:35 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -180,8 +180,7 @@ amd64_mainbus_attach(device_t parent, de mba.mba_acpi.aa_dmat = &pci_bus_dma_tag; mba.mba_acpi.aa_dmat64 = &pci_bus_dma64_tag; config_found(self, &mba.mba_acpi, NULL, - CFARG_IATTR, "acpibus", - CFARG_EOL); + CFARGS(.iattr = "acpibus")); } #endif @@ -191,8 +190,7 @@ amd64_mainbus_attach(device_t parent, de mba.mba_ipmi.iaa_memt = x86_bus_space_mem; if (ipmi_probe(&mba.mba_ipmi)) config_found(self, &mba.mba_ipmi, NULL, - CFARG_IATTR, "ipmibus", - CFARG_EOL); + CFARGS(.iattr = "ipmibus")); #endif #if NPCI > 0 @@ -220,8 +218,7 @@ amd64_mainbus_attach(device_t parent, de #endif if (npcibus == 0) config_found(self, &mba.mba_pba, pcibusprint, - CFARG_IATTR, "pcibus", - CFARG_EOL); + CFARGS(.iattr = "pcibus")); #if NACPICA > 0 if (mp_verbose) @@ -236,8 +233,7 @@ amd64_mainbus_attach(device_t parent, de mba.mba_iba.iba_iot = x86_bus_space_io; mba.mba_iba.iba_memt = x86_bus_space_mem; config_found(self, &mba.mba_iba, isabusprint, - CFARG_IATTR, "isabus", - CFARG_EOL); + CFARGS(.iattr = "isabus")); } #endif