[src/trunk]: src/sys/dev/acpi Add ACPI_DISABLE_ON_POWEROFF option.

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

details:   https://anonhg.NetBSD.org/src/rev/e8d785f8225c
branches:  trunk
changeset: 567279:e8d785f8225c
user:      kochi <kochi%NetBSD.org@localhost>
date:      Mon Jun 07 15:33:17 2004 +0000

description:
Add ACPI_DISABLE_ON_POWEROFF option.
Note: the default behavior is changed.  Now we don't disable the ACPI
subsystem on power off (halt -p) by default.
'options ACPI_DISABLE_ON_POWEROFF' in a kernel config file makes the kernel
behave the way we used to be.

diffstat:

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

diffs (46 lines):

diff -r d263d15c87fe -r e8d785f8225c sys/dev/acpi/acpi.c
--- a/sys/dev/acpi/acpi.c       Mon Jun 07 15:30:03 2004 +0000
+++ b/sys/dev/acpi/acpi.c       Mon Jun 07 15:33:17 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi.c,v 1.65 2004/05/26 17:15:17 kochi Exp $  */
+/*     $NetBSD: acpi.c,v 1.66 2004/06/07 15:33:17 kochi Exp $  */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.65 2004/05/26 17:15:17 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.66 2004/06/07 15:33:17 kochi Exp $");
 
 #include "opt_acpi.h"
 
@@ -380,11 +380,13 @@
 {
        ACPI_STATUS rv = AE_OK;
 
+#ifdef ACPI_DISABLE_ON_POWEROFF
        if (acpi_active) {
                rv = AcpiDisable();
                if (ACPI_SUCCESS(rv))
                        acpi_active = 0;
        }
+#endif
        return rv;
 }
 
diff -r d263d15c87fe -r e8d785f8225c sys/dev/acpi/files.acpi
--- a/sys/dev/acpi/files.acpi   Mon Jun 07 15:30:03 2004 +0000
+++ b/sys/dev/acpi/files.acpi   Mon Jun 07 15:33:17 2004 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: files.acpi,v 1.26 2004/05/27 11:26:33 kochi Exp $
+#      $NetBSD: files.acpi,v 1.27 2004/06/07 15:33:17 kochi Exp $
 
 include "dev/acpi/acpica/files.acpica"
 
-defflag        opt_acpi.h      ACPIVERBOSE ACPI_DEBUG ACPI_PCI_FIXUP ACPI_ACTIVATE_DEV
+defflag        opt_acpi.h      ACPIVERBOSE ACPI_DEBUG ACPI_PCI_FIXUP ACPI_ACTIVATE_DEV ACPI_DISABLE_ON_POWEROFF
 
 device acpi { }: sysmon_power, sysmon_taskq
 attach acpi at acpibus