Module Name: src
Committed By: jruoho
Date: Thu Apr 8 04:40:51 UTC 2010
Modified Files:
src/sys/arch/i386/acpi: vald_acpi.c
src/sys/arch/x86/x86: mpacpi.c
src/sys/dev/acpi: acpi.c sony_acpi.c
Log Message:
ACPICA 20091112:
Implemented a post-order callback to AcpiWalkNamespace. The existing
interface only has a pre-order callback. This change adds an
additional parameter for a post-order callback which will be more
useful for bus scans. ACPICA BZ 779. Lin Ming. Updated the ACPICA
Programmer Reference.
We will use the old "pre-order callback" for the time being.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/i386/acpi/vald_acpi.c
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/x86/x86/mpacpi.c
cvs rdiff -u -r1.163 -r1.164 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/acpi/sony_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/arch/i386/acpi/vald_acpi.c
diff -u src/sys/arch/i386/acpi/vald_acpi.c:1.32 src/sys/arch/i386/acpi/vald_acpi.c:1.33
--- src/sys/arch/i386/acpi/vald_acpi.c:1.32 Thu Mar 4 21:54:35 2010
+++ src/sys/arch/i386/acpi/vald_acpi.c Thu Apr 8 04:40:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vald_acpi.c,v 1.32 2010/03/04 21:54:35 jruoho Exp $ */
+/* $NetBSD: vald_acpi.c,v 1.33 2010/04/08 04:40:51 jruoho Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vald_acpi.c,v 1.32 2010/03/04 21:54:35 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vald_acpi.c,v 1.33 2010/04/08 04:40:51 jruoho Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -501,7 +501,7 @@
return;
AcpiWalkNamespace(ACPI_TYPE_DEVICE, parent, 100,
- vald_acpi_libright_get_bus, sc, NULL);
+ vald_acpi_libright_get_bus, NULL, sc, NULL);
}
/*
Index: src/sys/arch/x86/x86/mpacpi.c
diff -u src/sys/arch/x86/x86/mpacpi.c:1.84 src/sys/arch/x86/x86/mpacpi.c:1.85
--- src/sys/arch/x86/x86/mpacpi.c:1.84 Sat Jan 9 20:56:17 2010
+++ src/sys/arch/x86/x86/mpacpi.c Thu Apr 8 04:40:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mpacpi.c,v 1.84 2010/01/09 20:56:17 cegger Exp $ */
+/* $NetBSD: mpacpi.c,v 1.85 2010/04/08 04:40:51 jruoho Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.84 2010/01/09 20:56:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.85 2010/04/08 04:40:51 jruoho Exp $");
#include "acpica.h"
#include "opt_acpi.h"
@@ -505,7 +505,7 @@
return ENOENT;
TAILQ_INIT(&mpacpi_pcibusses);
AcpiWalkNamespace(ACPI_TYPE_DEVICE, sbhandle, 100,
- mpacpi_pcibus_cb, acpi, NULL);
+ mpacpi_pcibus_cb, NULL, acpi, NULL);
return 0;
}
Index: src/sys/dev/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.163 src/sys/dev/acpi/acpi.c:1.164
--- src/sys/dev/acpi/acpi.c:1.163 Mon Mar 29 16:35:59 2010
+++ src/sys/dev/acpi/acpi.c Thu Apr 8 04:40:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.163 2010/03/29 16:35:59 dyoung Exp $ */
+/* $NetBSD: acpi.c,v 1.164 2010/04/08 04:40:51 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.163 2010/03/29 16:35:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.164 2010/04/08 04:40:51 jruoho Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -695,7 +695,7 @@
if (ACPI_SUCCESS(rv))
(void)AcpiWalkNamespace(ACPI_TYPE_ANY, parent, 100,
- acpi_make_devnode, sc, NULL);
+ acpi_make_devnode, NULL, sc, NULL);
}
acpi_rescan1(sc, NULL, NULL);
Index: src/sys/dev/acpi/sony_acpi.c
diff -u src/sys/dev/acpi/sony_acpi.c:1.15 src/sys/dev/acpi/sony_acpi.c:1.16
--- src/sys/dev/acpi/sony_acpi.c:1.15 Fri Mar 5 14:00:17 2010
+++ src/sys/dev/acpi/sony_acpi.c Thu Apr 8 04:40:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sony_acpi.c,v 1.15 2010/03/05 14:00:17 jruoho Exp $ */
+/* $NetBSD: sony_acpi.c,v 1.16 2010/04/08 04:40:51 jruoho Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sony_acpi.c,v 1.15 2010/03/05 14:00:17 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sony_acpi.c,v 1.16 2010/04/08 04:40:51 jruoho Exp $");
#include <sys/param.h>
#include <sys/sysctl.h>
@@ -248,7 +248,7 @@
sc->sc_dev = self;
rv = AcpiWalkNamespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, 100,
- sony_acpi_find_pic, sc, NULL);
+ sony_acpi_find_pic, NULL, sc, NULL);
if (ACPI_FAILURE(rv))
aprint_error_dev(self, "couldn't walk namespace: %s\n",
AcpiFormatException(rv));
@@ -289,7 +289,7 @@
/* Install sysctl handler */
rv = AcpiWalkNamespace(ACPI_TYPE_METHOD,
- sc->sc_node->ad_handle, 1, sony_walk_cb, sc, NULL);
+ sc->sc_node->ad_handle, 1, sony_walk_cb, NULL, sc, NULL);
#ifdef DIAGNOSTIC
if (ACPI_FAILURE(rv))
aprint_error_dev(self, "Cannot walk ACPI namespace (%u)\n",
