Module Name: src
Committed By: thorpej
Date: Wed Aug 4 17:24:17 UTC 2021
Modified Files:
src/sys/dev/acpi [thorpej-cfargs2]: acpi.c acpi_display.c dwiic_acpi.c
ehci_acpi.c ipmi_acpi.c smbus_acpi.c virtio_acpi.c wss_acpi.c
xhci_acpi.c
src/sys/dev/acpi/wmi [thorpej-cfargs2]: wmi_acpi.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.292 -r1.292.4.1 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/dev/acpi/acpi_display.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/dev/acpi/dwiic_acpi.c \
src/sys/dev/acpi/virtio_acpi.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/dev/acpi/ehci_acpi.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/dev/acpi/ipmi_acpi.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/dev/acpi/smbus_acpi.c
cvs rdiff -u -r1.34 -r1.34.8.1 src/sys/dev/acpi/wss_acpi.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/dev/acpi/xhci_acpi.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/dev/acpi/wmi/wmi_acpi.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/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.292 src/sys/dev/acpi/acpi.c:1.292.4.1
--- src/sys/dev/acpi/acpi.c:1.292 Wed May 12 23:22:33 2021
+++ src/sys/dev/acpi/acpi.c Wed Aug 4 17:24:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.292 2021/05/12 23:22:33 thorpej Exp $ */
+/* $NetBSD: acpi.c,v 1.292.4.1 2021/08/04 17:24:17 thorpej Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.292 2021/05/12 23:22:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.292.4.1 2021/08/04 17:24:17 thorpej Exp $");
#include "pci.h"
#include "opt_acpi.h"
@@ -361,9 +361,8 @@ int
acpi_check(device_t parent, const char *ifattr)
{
return config_search(parent, NULL,
- CFARG_SUBMATCH, acpi_submatch,
- CFARG_IATTR, ifattr,
- CFARG_EOL) != NULL;
+ CFARGS(.submatch = acpi_submatch,
+ .iattr = ifattr)) != NULL;
}
int
@@ -492,8 +491,7 @@ acpi_attach(device_t parent, device_t se
* Early initialization of acpiec(4) via ECDT.
*/
config_found(self, aa, NULL,
- CFARG_IATTR, "acpiecdtbus",
- CFARG_EOL);
+ CFARGS(.iattr = "acpiecdtbus"));
rv = AcpiInitializeObjects(ACPI_FULL_INITIALIZATION);
@@ -558,8 +556,7 @@ acpi_attach(device_t parent, device_t se
continue;
}
config_found(sc->sc_dev, hdr, NULL,
- CFARG_IATTR, "acpisdtbus",
- CFARG_EOL);
+ CFARGS(.iattr = "acpisdtbus"));
AcpiPutTable(hdr);
}
@@ -898,8 +895,7 @@ acpi_rescan(device_t self, const char *i
if (ifattr_match(ifattr, "acpihpetbus") && sc->sc_hpet == NULL) {
sc->sc_hpet = config_found(sc->sc_dev, &aa, NULL,
- CFARG_IATTR, "acpihpetbus",
- CFARG_EOL);
+ CFARGS(.iattr = "acpihpetbus"));
}
/*
@@ -915,14 +911,12 @@ acpi_rescan(device_t self, const char *i
*/
if (ifattr_match(ifattr, "acpiapmbus") && sc->sc_apmbus == NULL) {
sc->sc_apmbus = config_found(sc->sc_dev, NULL, NULL,
- CFARG_IATTR, "acpiapmbus",
- CFARG_EOL);
+ CFARGS(.iattr = "acpiapmbus"));
}
if (ifattr_match(ifattr, "acpiwdrtbus") && sc->sc_wdrt == NULL) {
sc->sc_wdrt = config_found(sc->sc_dev, NULL, NULL,
- CFARG_IATTR, "acpiwdrtbus",
- CFARG_EOL);
+ CFARGS(.iattr = "acpiwdrtbus"));
}
return 0;
@@ -965,9 +959,8 @@ acpi_rescan_early(struct acpi_softc *sc)
aa.aa_dmat64 = ad->ad_dmat64;
ad->ad_device = config_found(sc->sc_dev, &aa, acpi_print,
- CFARG_IATTR, "acpinodebus",
- CFARG_DEVHANDLE, devhandle_from_acpi(ad->ad_handle),
- CFARG_EOL);
+ CFARGS(.iattr = "acpinodebus",
+ .devhandle = devhandle_from_acpi(ad->ad_handle)));
}
}
@@ -1033,9 +1026,8 @@ acpi_rescan_nodes(struct acpi_softc *sc)
aa.aa_dmat64 = ad->ad_dmat64;
ad->ad_device = config_found(sc->sc_dev, &aa, acpi_print,
- CFARG_IATTR, "acpinodebus",
- CFARG_DEVHANDLE, devhandle_from_acpi(ad->ad_handle),
- CFARG_EOL);
+ CFARGS(.iattr = "acpinodebus",
+ .devhandle = devhandle_from_acpi(ad->ad_handle)));
}
}
Index: src/sys/dev/acpi/acpi_display.c
diff -u src/sys/dev/acpi/acpi_display.c:1.19 src/sys/dev/acpi/acpi_display.c:1.19.8.1
--- src/sys/dev/acpi/acpi_display.c:1.19 Sat Apr 24 23:36:52 2021
+++ src/sys/dev/acpi/acpi_display.c Wed Aug 4 17:24:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_display.c,v 1.19 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: acpi_display.c,v 1.19.8.1 2021/08/04 17:24:17 thorpej Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_display.c,v 1.19 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_display.c,v 1.19.8.1 2021/08/04 17:24:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -573,7 +573,7 @@ acpidisp_vga_scan_outdevs(struct acpidis
aa.aa_mtx = &asc->sc_mtx;
ad->ad_device = config_found(asc->sc_dev,
- &aa, acpidisp_acpivga_print, CFARG_EOL);
+ &aa, acpidisp_acpivga_print, CFARGS_NONE);
}
}
Index: src/sys/dev/acpi/dwiic_acpi.c
diff -u src/sys/dev/acpi/dwiic_acpi.c:1.8 src/sys/dev/acpi/dwiic_acpi.c:1.8.8.1
--- src/sys/dev/acpi/dwiic_acpi.c:1.8 Sat Apr 24 23:36:52 2021
+++ src/sys/dev/acpi/dwiic_acpi.c Wed Aug 4 17:24:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dwiic_acpi.c,v 1.8 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: dwiic_acpi.c,v 1.8.8.1 2021/08/04 17:24:17 thorpej Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwiic_acpi.c,v 1.8 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwiic_acpi.c,v 1.8.8.1 2021/08/04 17:24:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -129,7 +129,7 @@ dwiic_acpi_attach(device_t parent, devic
dwiic_attach(sc);
- config_found(self, &sc->sc_iba, iicbus_print, CFARG_EOL);
+ config_found(self, &sc->sc_iba, iicbus_print, CFARGS_NONE);
pmf_device_register(self, dwiic_suspend, dwiic_resume);
Index: src/sys/dev/acpi/virtio_acpi.c
diff -u src/sys/dev/acpi/virtio_acpi.c:1.8 src/sys/dev/acpi/virtio_acpi.c:1.8.8.1
--- src/sys/dev/acpi/virtio_acpi.c:1.8 Sat Apr 24 23:36:52 2021
+++ src/sys/dev/acpi/virtio_acpi.c Wed Aug 4 17:24:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_acpi.c,v 1.8 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: virtio_acpi.c,v 1.8.8.1 2021/08/04 17:24:17 thorpej Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio_acpi.c,v 1.8 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_acpi.c,v 1.8.8.1 2021/08/04 17:24:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -160,7 +160,7 @@ virtio_acpi_rescan(device_t self, const
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;
Index: src/sys/dev/acpi/ehci_acpi.c
diff -u src/sys/dev/acpi/ehci_acpi.c:1.6 src/sys/dev/acpi/ehci_acpi.c:1.6.8.1
--- src/sys/dev/acpi/ehci_acpi.c:1.6 Sat Apr 24 23:36:52 2021
+++ src/sys/dev/acpi/ehci_acpi.c Wed Aug 4 17:24:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_acpi.c,v 1.6 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: ehci_acpi.c,v 1.6.8.1 2021/08/04 17:24:17 thorpej Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_acpi.c,v 1.6 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_acpi.c,v 1.6.8.1 2021/08/04 17:24:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -146,7 +146,7 @@ ehci_acpi_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);
done:
acpi_resource_cleanup(&res);
Index: src/sys/dev/acpi/ipmi_acpi.c
diff -u src/sys/dev/acpi/ipmi_acpi.c:1.5 src/sys/dev/acpi/ipmi_acpi.c:1.5.8.1
--- src/sys/dev/acpi/ipmi_acpi.c:1.5 Sat Apr 24 23:36:52 2021
+++ src/sys/dev/acpi/ipmi_acpi.c Wed Aug 4 17:24:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ipmi_acpi.c,v 1.5 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: ipmi_acpi.c,v 1.5.8.1 2021/08/04 17:24:17 thorpej Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipmi_acpi.c,v 1.5 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipmi_acpi.c,v 1.5.8.1 2021/08/04 17:24:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -156,7 +156,7 @@ ipmi_acpi_attach(device_t parent, device
if (reg2 > ia->iaa_if_iobase)
ia->iaa_if_iospacing = reg2 - ia->iaa_if_iobase;
- config_found(self, ia, NULL, CFARG_EOL);
+ config_found(self, ia, NULL, CFARGS_NONE);
break;
case IPMI_IF_SSIF:
Index: src/sys/dev/acpi/smbus_acpi.c
diff -u src/sys/dev/acpi/smbus_acpi.c:1.16 src/sys/dev/acpi/smbus_acpi.c:1.16.8.1
--- src/sys/dev/acpi/smbus_acpi.c:1.16 Sat Apr 24 23:36:52 2021
+++ src/sys/dev/acpi/smbus_acpi.c Wed Aug 4 17:24:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: smbus_acpi.c,v 1.16 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: smbus_acpi.c,v 1.16.8.1 2021/08/04 17:24:17 thorpej Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbus_acpi.c,v 1.16 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbus_acpi.c,v 1.16.8.1 2021/08/04 17:24:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -173,7 +173,7 @@ acpi_smbus_attach(device_t parent, devic
iba.iba_tag = &sc->sc_i2c_tag;
- config_found(self, &iba, iicbus_print, CFARG_EOL);
+ config_found(self, &iba, iicbus_print, CFARGS_NONE);
}
static int
Index: src/sys/dev/acpi/wss_acpi.c
diff -u src/sys/dev/acpi/wss_acpi.c:1.34 src/sys/dev/acpi/wss_acpi.c:1.34.8.1
--- src/sys/dev/acpi/wss_acpi.c:1.34 Sat Apr 24 23:36:52 2021
+++ src/sys/dev/acpi/wss_acpi.c Wed Aug 4 17:24:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_acpi.c,v 1.34 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: wss_acpi.c,v 1.34.8.1 2021/08/04 17:24:17 thorpej Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.34 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.34.8.1 2021/08/04 17:24:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -187,7 +187,7 @@ wss_acpi_attach(device_t parent, device_
arg.type = AUDIODEV_TYPE_OPL;
arg.hwif = 0;
arg.hdl = 0;
- config_found(self, &arg, audioprint, CFARG_EOL);
+ config_found(self, &arg, audioprint, CFARGS_NONE);
out:
acpi_resource_cleanup(&res);
Index: src/sys/dev/acpi/xhci_acpi.c
diff -u src/sys/dev/acpi/xhci_acpi.c:1.12 src/sys/dev/acpi/xhci_acpi.c:1.12.8.1
--- src/sys/dev/acpi/xhci_acpi.c:1.12 Sat Apr 24 23:36:52 2021
+++ src/sys/dev/acpi/xhci_acpi.c Wed Aug 4 17:24:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci_acpi.c,v 1.12 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: xhci_acpi.c,v 1.12.8.1 2021/08/04 17:24:17 thorpej Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci_acpi.c,v 1.12 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci_acpi.c,v 1.12.8.1 2021/08/04 17:24:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -160,9 +160,9 @@ xhci_acpi_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);
done:
acpi_resource_cleanup(&res);
Index: src/sys/dev/acpi/wmi/wmi_acpi.c
diff -u src/sys/dev/acpi/wmi/wmi_acpi.c:1.18 src/sys/dev/acpi/wmi/wmi_acpi.c:1.18.8.1
--- src/sys/dev/acpi/wmi/wmi_acpi.c:1.18 Sat Apr 24 23:36:52 2021
+++ src/sys/dev/acpi/wmi/wmi_acpi.c Wed Aug 4 17:24:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wmi_acpi.c,v 1.18 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: wmi_acpi.c,v 1.18.8.1 2021/08/04 17:24:17 thorpej Exp $ */
/*-
* Copyright (c) 2009, 2010 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wmi_acpi.c,v 1.18 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmi_acpi.c,v 1.18.8.1 2021/08/04 17:24:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -151,7 +151,7 @@ acpi_wmi_rescan(device_t self, const cha
if (sc->sc_child == NULL) {
sc->sc_child =
- config_found(self, NULL, acpi_wmi_print, CFARG_EOL);
+ config_found(self, NULL, acpi_wmi_print, CFARGS_NONE);
}
return 0;
