Module Name: src
Committed By: dyoung
Date: Mon Mar 29 16:35:59 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi.c acpi_ec.c
Log Message:
Attach acpiecdt with acpibus_attach_args. Sverre Froyen reports that
this helps his Thinkpad boot again.
To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/acpi/acpi_ec.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.162 src/sys/dev/acpi/acpi.c:1.163
--- src/sys/dev/acpi/acpi.c:1.162 Mon Mar 22 11:13:23 2010
+++ src/sys/dev/acpi/acpi.c Mon Mar 29 16:35:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.162 2010/03/22 11:13:23 jruoho Exp $ */
+/* $NetBSD: acpi.c,v 1.163 2010/03/29 16:35:59 dyoung 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.162 2010/03/22 11:13:23 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.163 2010/03/29 16:35:59 dyoung Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -508,7 +508,7 @@
}
/* Early EC handler initialization if ECDT table is available. */
- config_found_ia(self, "acpiecdtbus", NULL, NULL);
+ config_found_ia(self, "acpiecdtbus", aa, NULL);
rv = AcpiInitializeObjects(ACPI_FULL_INITIALIZATION);
if (ACPI_FAILURE(rv)) {
@@ -611,7 +611,7 @@
}
/* Early EC handler initialization if ECDT table is available. */
- config_found_ia(self, "acpiecdtbus", NULL, NULL);
+ config_found_ia(self, "acpiecdtbus", aa, NULL);
rv = AcpiInitializeObjects(ACPI_FULL_INITIALIZATION);
if (ACPI_FAILURE(rv)) {
Index: src/sys/dev/acpi/acpi_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.63 src/sys/dev/acpi/acpi_ec.c:1.64
--- src/sys/dev/acpi/acpi_ec.c:1.63 Wed Mar 24 01:13:30 2010
+++ src/sys/dev/acpi/acpi_ec.c Mon Mar 29 16:35:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.63 2010/03/24 01:13:30 dyoung Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.64 2010/03/29 16:35:59 dyoung Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger <jo...@netbsd.org>.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.63 2010/03/24 01:13:30 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.64 2010/03/29 16:35:59 dyoung Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -226,7 +226,7 @@
static void
acpiecdt_attach(device_t parent, device_t self, void *aux)
{
- struct acpi_attach_args *aa = aux;
+ struct acpibus_attach_args *aa = aux;
ACPI_HANDLE ec_handle;
bus_addr_t cmd_reg, data_reg;
uint8_t gpebit;
