[src/trunk]: src/sys/arch Merge changes for ACPI-CA 20050408.

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

details:   https://anonhg.NetBSD.org/src/rev/5f5e9deb27af
branches:  trunk
changeset: 580651:5f5e9deb27af
user:      kochi <kochi%NetBSD.org@localhost>
date:      Mon May 02 14:54:46 2005 +0000

description:
Merge changes for ACPI-CA 20050408.

diffstat:

 sys/arch/i386/acpi/acpi_wakeup.c    |  10 ++++++----
 sys/arch/x86/include/acpi_machdep.h |   6 +++---
 sys/arch/x86/x86/acpi_machdep.c     |   8 ++++----
 3 files changed, 13 insertions(+), 11 deletions(-)

diffs (94 lines):

diff -r ca44a0c5dd9f -r 5f5e9deb27af sys/arch/i386/acpi/acpi_wakeup.c
--- a/sys/arch/i386/acpi/acpi_wakeup.c  Mon May 02 14:53:04 2005 +0000
+++ b/sys/arch/i386/acpi/acpi_wakeup.c  Mon May 02 14:54:46 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi_wakeup.c,v 1.15 2005/04/21 14:03:24 yamt Exp $    */
+/*     $NetBSD: acpi_wakeup.c,v 1.16 2005/05/02 14:54:46 kochi Exp $   */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.15 2005/04/21 14:03:24 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.16 2005/05/02 14:54:46 kochi Exp $");
 
 /*-
  * Copyright (c) 2001 Takanori Watanabe <takawata%jp.freebsd.org@localhost>
@@ -149,7 +149,8 @@
        ef = read_eflags();
        disable_intr();
 
-       AcpiHwDisableNonWakeupGpes();
+       AcpiHwDisableAllGpes(ACPI_ISR);
+       AcpiHwEnableAllWakeupGpes(ACPI_ISR);
 
        /* flush caches */
 
@@ -168,7 +169,8 @@
                        break;
        } while (!ret);
 
-       AcpiHwEnableNonWakeupGpes();
+       AcpiHwDisableAllGpes(ACPI_NOT_ISR);
+       AcpiHwEnableAllRuntimeGpes(ACPI_NOT_ISR);
 
        write_eflags(ef);
 
diff -r ca44a0c5dd9f -r 5f5e9deb27af sys/arch/x86/include/acpi_machdep.h
--- a/sys/arch/x86/include/acpi_machdep.h       Mon May 02 14:53:04 2005 +0000
+++ b/sys/arch/x86/include/acpi_machdep.h       Mon May 02 14:54:46 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi_machdep.h,v 1.1 2003/05/11 18:20:38 fvdl Exp $    */
+/*     $NetBSD: acpi_machdep.h,v 1.2 2005/05/02 14:55:12 kochi Exp $   */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -54,8 +54,8 @@
 #define        acpi_md_OsOut16(x, v)   outw((x), (v))
 #define        acpi_md_OsOut32(x, v)   outl((x), (v))
 
-ACPI_STATUS    acpi_md_OsInstallInterruptHandler(UINT32, OSD_HANDLER, void *,
-                   void **);
+ACPI_STATUS    acpi_md_OsInstallInterruptHandler(UINT32,
+                   ACPI_OSD_HANDLER, void *, void **);
 void           acpi_md_OsRemoveInterruptHandler(void *);
 
 ACPI_STATUS    acpi_md_OsMapMemory(ACPI_PHYSICAL_ADDRESS, UINT32, void **);
diff -r ca44a0c5dd9f -r 5f5e9deb27af sys/arch/x86/x86/acpi_machdep.c
--- a/sys/arch/x86/x86/acpi_machdep.c   Mon May 02 14:53:04 2005 +0000
+++ b/sys/arch/x86/x86/acpi_machdep.c   Mon May 02 14:54:46 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi_machdep.c,v 1.6 2004/04/10 14:17:21 kochi Exp $   */
+/*     $NetBSD: acpi_machdep.c,v 1.7 2005/05/02 14:55:12 kochi Exp $   */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.6 2004/04/10 14:17:21 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.7 2005/05/02 14:55:12 kochi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -76,7 +76,7 @@
 
 struct acpi_intr_defer {
        UINT32  number;
-       OSD_HANDLER function;
+       ACPI_OSD_HANDLER function;
        void *context;
        void *ih;
        LIST_ENTRY(acpi_intr_defer) list;
@@ -110,7 +110,7 @@
 
 ACPI_STATUS
 acpi_md_OsInstallInterruptHandler(UINT32 InterruptNumber,
-    OSD_HANDLER ServiceRoutine, void *Context, void **cookiep)
+    ACPI_OSD_HANDLER ServiceRoutine, void *Context, void **cookiep)
 {
        void *ih;
        struct pic *pic;