[src/trunk]: src/sys/dev/acpi As the _PSW control method was deprecated in AC...

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

details:   https://anonhg.NetBSD.org/src/rev/1f2c1d6e967f
branches:  trunk
changeset: 750431:1f2c1d6e967f
user:      jruoho <jruoho%NetBSD.org@localhost>
date:      Thu Dec 31 10:12:51 2009 +0000

description:
As the _PSW control method was deprecated in ACPI 3.0, augment the wake
event call with the newer _DSW control method.

ok pgoyette@, jmcneill@

diffstat:

 sys/dev/acpi/acpi_lid.c |  38 ++++++++++++++++++++++++++++++++------
 1 files changed, 32 insertions(+), 6 deletions(-)

diffs (64 lines):

diff -r 2738ca9dae1a -r 1f2c1d6e967f sys/dev/acpi/acpi_lid.c
--- a/sys/dev/acpi/acpi_lid.c   Thu Dec 31 10:07:13 2009 +0000
+++ b/sys/dev/acpi/acpi_lid.c   Thu Dec 31 10:12:51 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi_lid.c,v 1.29 2009/11/29 21:32:50 cegger Exp $     */
+/*     $NetBSD: acpi_lid.c,v 1.30 2009/12/31 10:12:51 jruoho Exp $     */
 
 /*
  * Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.29 2009/11/29 21:32:50 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.30 2009/12/31 10:12:51 jruoho Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -153,15 +153,41 @@
 acpilid_wake_event(device_t dv, bool enable)
 {
        struct acpilid_softc *sc = device_private(dv);
+       ACPI_OBJECT_LIST arg;
+       ACPI_OBJECT obj[3];
+       ACPI_STATUS rv;
 
-       ACPI_STATUS rv;
+       /*
+        * First try to call the Device Sleep Wake control method, _DSW.
+        * Only if this is not available, resort to to the Power State
+        * Wake control method, _PSW, which was deprecated in ACPI 3.0.
+        */
+       obj[0].Integer.Value = enable ? 1 : 0;
+       obj[1].Integer.Value = obj[2].Integer.Value = 0;
+       obj[0].Type = obj[1].Type = obj[2].Type = ACPI_TYPE_INTEGER;
+
+       arg.Count = 3;
+       arg.Pointer = obj;
+
+       rv = AcpiEvaluateObject(sc->sc_node->ad_handle, "_DSW", &arg, NULL);
+
+       if (ACPI_SUCCESS(rv))
+               return;
+
+       if (rv != AE_NOT_FOUND)
+               goto fail;
 
        rv = acpi_eval_set_integer(sc->sc_node->ad_handle, "_PSW",
            enable ? 1 : 0);
+
        if (ACPI_FAILURE(rv) && rv != AE_NOT_FOUND)
-               aprint_error_dev(dv,
-                   "unable to evaluate _PSW handler: %s\n",
-                   AcpiFormatException(rv));
+               goto fail;
+
+       return;
+
+fail:
+       aprint_error_dev(dv, "unable to evaluate wake control method: %s\n",
+           AcpiFormatException(rv));
 }
 
 /*