[src/netbsd-2-0]: src/sys Pullup patch (requested by kochi in ticket #463)

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

details:   https://anonhg.NetBSD.org/src/rev/1c8023be6906
branches:  netbsd-2-0
changeset: 561349:1c8023be6906
user:      jmc <jmc%NetBSD.org@localhost>
date:      Mon Jun 14 03:18:47 2004 +0000

description:
Pullup patch (requested by kochi in ticket #463)

Add ACPI_DISABLE_ON_POWEROFF option. PR#24869

diffstat:

 sys/arch/amd64/conf/GENERIC       |  6 ++++--
 sys/arch/i386/conf/GENERIC        |  5 +++--
 sys/arch/i386/conf/GENERIC_LAPTOP |  6 ++++--
 sys/dev/acpi/acpi.c               |  6 ++++--
 sys/dev/acpi/files.acpi           |  4 ++--
 5 files changed, 17 insertions(+), 10 deletions(-)

diffs (126 lines):

diff -r 8d278bdb618a -r 1c8023be6906 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sun Jun 13 08:47:40 2004 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Mon Jun 14 03:18:47 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.21 2004/01/14 22:29:03 jonathan Exp $
+# $NetBSD: GENERIC,v 1.21.2.1 2004/06/14 03:18:47 jmc Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.21 $"
+#ident                 "GENERIC-$Revision: 1.21.2.1 $"
 
 maxusers       32              # estimated number of users
 
@@ -209,6 +209,8 @@
 #options       MPACPI_SCANPCI          # MPBIOS configures PCI roots
 #options       ACPI_PCI_FIXUP          # PCI interrupt routing via ACPI
 #options       ACPI_ACTIVATE_DEV       # If set, activate inactive devices
+#options       ACPICA_PEDANTIC         # force strict conformance to the Spec.
+#options       ACPI_DISABLE_ON_POWEROFF        # disable acpi on power off
 
 # ACPI devices
 #acpiacad*     at acpi?                # ACPI AC Adapter
diff -r 8d278bdb618a -r 1c8023be6906 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sun Jun 13 08:47:40 2004 +0000
+++ b/sys/arch/i386/conf/GENERIC        Mon Jun 14 03:18:47 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.595.2.3 2004/06/07 09:45:49 tron Exp $
+# $NetBSD: GENERIC,v 1.595.2.4 2004/06/14 03:18:51 jmc Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.595.2.3 $"
+#ident                 "GENERIC-$Revision: 1.595.2.4 $"
 
 maxusers       32              # estimated number of users
 
@@ -278,6 +278,7 @@
 #options       ACPI_PCI_FIXUP          # PCI interrupt routing via ACPI
 #options       ACPI_ACTIVATE_DEV       # If set, activate inactive devices
 #options       ACPICA_PEDANTIC         # force strict conformance to the Spec.
+#options       ACPI_DISABLE_ON_POWEROFF        # disable acpi on power off
 
 # ACPI devices
 #acpiacad*     at acpi?                # ACPI AC Adapter
diff -r 8d278bdb618a -r 1c8023be6906 sys/arch/i386/conf/GENERIC_LAPTOP
--- a/sys/arch/i386/conf/GENERIC_LAPTOP Sun Jun 13 08:47:40 2004 +0000
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP Mon Jun 14 03:18:47 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC_LAPTOP,v 1.90.2.2 2004/05/05 15:30:07 tron Exp $
+#      $NetBSD: GENERIC_LAPTOP,v 1.90.2.3 2004/06/14 03:18:54 jmc Exp $
 #      From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp
 #
 #      GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled
@@ -8,7 +8,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.90.2.2 $"
+#ident                 "GENERIC-$Revision: 1.90.2.3 $"
 
 maxusers       32              # estimated number of users
 
@@ -219,6 +219,8 @@
 #acpi0                 at mainbus0
 #options       ACPI_PCI_FIXUP          # PCI interrupt routing via ACPI
 #options       ACPI_ACTIVATE_DEV       # If set, activate inactive devices
+#options       ACPICA_PEDANTIC         # force strict conformance to the Spec.
+#options       ACPI_DISABLE_ON_POWEROFF        # disable acpi on power off
 
 # ACPI devices
 #acpiacad*     at acpi?                # ACPI AC Adapter
diff -r 8d278bdb618a -r 1c8023be6906 sys/dev/acpi/acpi.c
--- a/sys/dev/acpi/acpi.c       Sun Jun 13 08:47:40 2004 +0000
+++ b/sys/dev/acpi/acpi.c       Mon Jun 14 03:18:47 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi.c,v 1.59.2.2 2004/04/28 05:25:31 jmc Exp $        */
+/*     $NetBSD: acpi.c,v 1.59.2.3 2004/06/14 03:18:58 jmc Exp $        */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.59.2.2 2004/04/28 05:25:31 jmc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.59.2.3 2004/06/14 03:18:58 jmc 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 8d278bdb618a -r 1c8023be6906 sys/dev/acpi/files.acpi
--- a/sys/dev/acpi/files.acpi   Sun Jun 13 08:47:40 2004 +0000
+++ b/sys/dev/acpi/files.acpi   Mon Jun 14 03:18:47 2004 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: files.acpi,v 1.22.2.1 2004/04/28 05:25:23 jmc Exp $
+#      $NetBSD: files.acpi,v 1.22.2.2 2004/06/14 03:19:01 jmc 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