[src/trunk]: src/sys/dev/acpi Attach acpiecdt with acpibus_attach_args. Sver...

[dyoung <dyoung%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/134d905c4d5b
branches:  trunk
changeset: 753466:134d905c4d5b
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Mon Mar 29 16:35:59 2010 +0000

description:
Attach acpiecdt with acpibus_attach_args.  Sverre Froyen reports that
this helps his Thinkpad boot again.

diffstat:

 sys/dev/acpi/acpi.c    |  8 ++++----
 sys/dev/acpi/acpi_ec.c |  6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 7389b92090d9 -r 134d905c4d5b sys/dev/acpi/acpi.c
--- a/sys/dev/acpi/acpi.c       Mon Mar 29 15:51:03 2010 +0000
+++ b/sys/dev/acpi/acpi.c       Mon Mar 29 16:35:59 2010 +0000
@@ -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)) {
diff -r 7389b92090d9 -r 134d905c4d5b sys/dev/acpi/acpi_ec.c
--- a/sys/dev/acpi/acpi_ec.c    Mon Mar 29 15:51:03 2010 +0000
+++ b/sys/dev/acpi/acpi_ec.c    Mon Mar 29 16:35:59 2010 +0000
@@ -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 <joerg%NetBSD.org@localhost>.
@@ -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;