Module Name: src
Committed By: skrll
Date: Mon Dec 20 11:17:40 UTC 2021
Modified Files:
src/sys/dev/acpi: acpi.c acpi_pci.c acpi_util.c acpi_verbose.c
acpi_wakedev.c acpivar.h
Log Message:
Fix struct member prefix to be consistent. same code before and after.
To generate a diff of this commit:
cvs rdiff -u -r1.293 -r1.294 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/acpi/acpi_pci.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/acpi/acpi_util.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/acpi/acpi_verbose.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/acpi/acpi_wakedev.c
cvs rdiff -u -r1.87 -r1.88 src/sys/dev/acpi/acpivar.h
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.293 src/sys/dev/acpi/acpi.c:1.294
--- src/sys/dev/acpi/acpi.c:1.293 Sat Aug 7 16:19:09 2021
+++ src/sys/dev/acpi/acpi.c Mon Dec 20 11:17:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.293 2021/08/07 16:19:09 thorpej Exp $ */
+/* $NetBSD: acpi.c,v 1.294 2021/12/20 11:17:40 skrll 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.293 2021/08/07 16:19:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.294 2021/12/20 11:17:40 skrll Exp $");
#include "pci.h"
#include "opt_acpi.h"
@@ -471,7 +471,7 @@ acpi_attach(device_t parent, device_t se
sc->sc_dmat = aa->aa_dmat;
sc->sc_dmat64 = aa->aa_dmat64;
- SIMPLEQ_INIT(&sc->ad_head);
+ SIMPLEQ_INIT(&sc->sc_head);
acpi_softc = sc;
@@ -635,7 +635,7 @@ acpi_childdet(device_t self, device_t ch
if (sc->sc_wdrt == child)
sc->sc_wdrt = NULL;
- SIMPLEQ_FOREACH(ad, &sc->ad_head, ad_list) {
+ SIMPLEQ_FOREACH(ad, &sc->sc_head, ad_list) {
if (ad->ad_device == child)
ad->ad_device = NULL;
@@ -730,12 +730,13 @@ acpi_config_tree(struct acpi_softc *sc)
(void)config_defer(sc->sc_dev, acpi_rescan_capabilities);
}
+// XXXNH?
static void
acpi_config_dma(struct acpi_softc *sc)
{
struct acpi_devnode *ad;
- SIMPLEQ_FOREACH(ad, &sc->ad_head, ad_list) {
+ SIMPLEQ_FOREACH(ad, &sc->sc_head, ad_list) {
if (ad->ad_device != NULL)
continue;
@@ -801,7 +802,7 @@ acpi_make_devnode(ACPI_HANDLE handle, ui
acpi_wakedev_init(ad);
SIMPLEQ_INIT(&ad->ad_child_head);
- SIMPLEQ_INSERT_TAIL(&sc->ad_head, ad, ad_list);
+ SIMPLEQ_INSERT_TAIL(&sc->sc_head, ad, ad_list);
if (ad->ad_parent != NULL) {
@@ -934,7 +935,7 @@ acpi_rescan_early(struct acpi_softc *sc)
* We want these devices to attach regardless of
* the device status and other restrictions.
*/
- SIMPLEQ_FOREACH(ad, &sc->ad_head, ad_list) {
+ SIMPLEQ_FOREACH(ad, &sc->sc_head, ad_list) {
if (ad->ad_device != NULL)
continue;
@@ -972,7 +973,7 @@ acpi_rescan_nodes(struct acpi_softc *sc)
struct acpi_devnode *ad;
ACPI_DEVICE_INFO *di;
- SIMPLEQ_FOREACH(ad, &sc->ad_head, ad_list) {
+ SIMPLEQ_FOREACH(ad, &sc->sc_head, ad_list) {
if (ad->ad_device != NULL)
continue;
@@ -1039,7 +1040,7 @@ acpi_rescan_capabilities(device_t self)
ACPI_HANDLE tmp;
ACPI_STATUS rv;
- SIMPLEQ_FOREACH(ad, &sc->ad_head, ad_list) {
+ SIMPLEQ_FOREACH(ad, &sc->sc_head, ad_list) {
if (ad->ad_devinfo->Type != ACPI_TYPE_DEVICE)
continue;
@@ -1183,7 +1184,7 @@ acpi_notify_handler(ACPI_HANDLE handle,
* that have registered a handler with us.
* The opaque pointer is always the device_t.
*/
- SIMPLEQ_FOREACH(ad, &sc->ad_head, ad_list) {
+ SIMPLEQ_FOREACH(ad, &sc->sc_head, ad_list) {
if (ad->ad_device == NULL)
continue;
Index: src/sys/dev/acpi/acpi_pci.c
diff -u src/sys/dev/acpi/acpi_pci.c:1.32 src/sys/dev/acpi/acpi_pci.c:1.33
--- src/sys/dev/acpi/acpi_pci.c:1.32 Wed Sep 15 17:33:08 2021
+++ src/sys/dev/acpi/acpi_pci.c Mon Dec 20 11:17:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_pci.c,v 1.32 2021/09/15 17:33:08 thorpej Exp $ */
+/* $NetBSD: acpi_pci.c,v 1.33 2021/12/20 11:17:40 skrll Exp $ */
/*
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pci.c,v 1.32 2021/09/15 17:33:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci.c,v 1.33 2021/12/20 11:17:40 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -379,7 +379,7 @@ acpi_pcidev_find(uint16_t segment, uint1
if (sc == NULL)
return NULL;
- SIMPLEQ_FOREACH(ad, &sc->ad_head, ad_list) {
+ SIMPLEQ_FOREACH(ad, &sc->sc_head, ad_list) {
if (ad->ad_pciinfo != NULL &&
(ad->ad_pciinfo->ap_flags & ACPI_PCI_INFO_DEVICE) &&
@@ -427,7 +427,7 @@ acpi_pciroot_find(uint16_t segment, uint
if (sc == NULL)
return NULL;
- SIMPLEQ_FOREACH(ad, &sc->ad_head, ad_list) {
+ SIMPLEQ_FOREACH(ad, &sc->sc_head, ad_list) {
if (ad->ad_pciinfo != NULL &&
(ad->ad_pciinfo->ap_flags & ACPI_PCI_INFO_BRIDGE) &&
Index: src/sys/dev/acpi/acpi_util.c
diff -u src/sys/dev/acpi/acpi_util.c:1.26 src/sys/dev/acpi/acpi_util.c:1.27
--- src/sys/dev/acpi/acpi_util.c:1.26 Wed Sep 15 17:33:08 2021
+++ src/sys/dev/acpi/acpi_util.c Mon Dec 20 11:17:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_util.c,v 1.26 2021/09/15 17:33:08 thorpej Exp $ */
+/* $NetBSD: acpi_util.c,v 1.27 2021/12/20 11:17:40 skrll Exp $ */
/*-
* Copyright (c) 2003, 2007, 2021 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_util.c,v 1.26 2021/09/15 17:33:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_util.c,v 1.27 2021/12/20 11:17:40 skrll Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -657,7 +657,7 @@ acpi_match_cpu_info(struct cpu_info *ci)
* In both cases the MADT entries are used
* for the match (see ACPI 4.0, section 8.4).
*/
- SIMPLEQ_FOREACH(ad, &sc->ad_head, ad_list) {
+ SIMPLEQ_FOREACH(ad, &sc->sc_head, ad_list) {
hdl = ad->ad_handle;
Index: src/sys/dev/acpi/acpi_verbose.c
diff -u src/sys/dev/acpi/acpi_verbose.c:1.19 src/sys/dev/acpi/acpi_verbose.c:1.20
--- src/sys/dev/acpi/acpi_verbose.c:1.19 Sat Apr 7 15:49:52 2018
+++ src/sys/dev/acpi/acpi_verbose.c Mon Dec 20 11:17:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_verbose.c,v 1.19 2018/04/07 15:49:52 christos Exp $ */
+/* $NetBSD: acpi_verbose.c,v 1.20 2021/12/20 11:17:40 skrll Exp $ */
/*-
* Copyright (c) 2003, 2007, 2010 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_verbose.c,v 1.19 2018/04/07 15:49:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_verbose.c,v 1.20 2021/12/20 11:17:40 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -465,7 +465,7 @@ acpi_print_devnodes(struct acpi_softc *s
struct acpi_devnode *ad;
ACPI_DEVICE_INFO *di;
- SIMPLEQ_FOREACH(ad, &sc->ad_head, ad_list) {
+ SIMPLEQ_FOREACH(ad, &sc->sc_head, ad_list) {
di = ad->ad_devinfo;
aprint_normal_dev(sc->sc_dev, "[%-4s] ", ad->ad_name);
Index: src/sys/dev/acpi/acpi_wakedev.c
diff -u src/sys/dev/acpi/acpi_wakedev.c:1.27 src/sys/dev/acpi/acpi_wakedev.c:1.28
--- src/sys/dev/acpi/acpi_wakedev.c:1.27 Thu Jun 1 02:45:09 2017
+++ src/sys/dev/acpi/acpi_wakedev.c Mon Dec 20 11:17:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakedev.c,v 1.27 2017/06/01 02:45:09 chs Exp $ */
+/* $NetBSD: acpi_wakedev.c,v 1.28 2021/12/20 11:17:40 skrll Exp $ */
/*-
* Copyright (c) 2009, 2010, 2011 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakedev.c,v 1.27 2017/06/01 02:45:09 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakedev.c,v 1.28 2021/12/20 11:17:40 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -292,7 +292,7 @@ acpi_wakedev_commit(struct acpi_softc *s
*
* 3. Execute _DSW or _PSW method.
*/
- SIMPLEQ_FOREACH(ad, &sc->ad_head, ad_list) {
+ SIMPLEQ_FOREACH(ad, &sc->sc_head, ad_list) {
if (ad->ad_wakedev == NULL)
continue;
Index: src/sys/dev/acpi/acpivar.h
diff -u src/sys/dev/acpi/acpivar.h:1.87 src/sys/dev/acpi/acpivar.h:1.88
--- src/sys/dev/acpi/acpivar.h:1.87 Sat Aug 7 18:39:40 2021
+++ src/sys/dev/acpi/acpivar.h Mon Dec 20 11:17:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: acpivar.h,v 1.87 2021/08/07 18:39:40 jmcneill Exp $ */
+/* $NetBSD: acpivar.h,v 1.88 2021/12/20 11:17:40 skrll Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -176,7 +176,7 @@ struct acpi_softc {
struct sysmon_pswitch sc_smpsw_power;
struct sysmon_pswitch sc_smpsw_sleep;
- SIMPLEQ_HEAD(, acpi_devnode) ad_head;
+ SIMPLEQ_HEAD(, acpi_devnode) sc_head;
};
/*
