[src/trunk]: src/sys/dev/acpi We were passing flags to AcpiEnableSubsystem() ...

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

details:   https://anonhg.NetBSD.org/src/rev/0a404baba191
branches:  trunk
changeset: 554675:0a404baba191
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Fri Oct 31 17:22:28 2003 +0000

description:
We were passing flags to AcpiEnableSubsystem() that aren't even used there.
Call AcpiInitializeObjects() to create global variables and run _INI methods.

diffstat:

 sys/dev/acpi/acpi.c |  19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diffs (50 lines):

diff -r 971c332f68a4 -r 0a404baba191 sys/dev/acpi/acpi.c
--- a/sys/dev/acpi/acpi.c       Fri Oct 31 17:21:01 2003 +0000
+++ b/sys/dev/acpi/acpi.c       Fri Oct 31 17:22:28 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi.c,v 1.46 2003/10/30 20:29:54 mycroft Exp $        */
+/*     $NetBSD: acpi.c,v 1.47 2003/10/31 17:22:28 mycroft Exp $        */
 
 /*
  * Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.46 2003/10/30 20:29:54 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.47 2003/10/31 17:22:28 mycroft Exp $");
 
 #include "opt_acpi.h"
 
@@ -271,23 +271,24 @@
 
        /*
         * Bring ACPI on-line.
-        *
-        * Note that we request that _STA (device init) and _INI (object init)
-        * methods not be run.
-        *
-        * XXX We need to arrange for the object init pass after we have
-        * XXX attached all of our children.
         */
 #ifdef ACPI_DEBUGGER
        if (acpi_dbgr & ACPI_DBGR_ENABLE)
                acpi_osd_debugger();
 #endif
-       rv = AcpiEnableSubsystem(ACPI_NO_DEVICE_INIT | ACPI_NO_OBJECT_INIT);
+
+       rv = AcpiEnableSubsystem(0);
        if (rv != AE_OK) {
                printf("%s: unable to enable ACPI: %d\n",
                    sc->sc_dev.dv_xname, rv);
                return;
        }
+       rv = AcpiInitializeObjects(0);
+       if (rv != AE_OK) {
+               printf("%s: unable to initialize ACPI objects: %d\n",
+                   sc->sc_dev.dv_xname, rv);
+               return;
+       }
        acpi_active = 1;
 
        /* Our current state is "awake". */