[src/trunk]: src/sys Switch to ACPICA 20090730, and update for API changes.

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

details:   https://anonhg.NetBSD.org/src/rev/d1e24cf96aa7
branches:  trunk
changeset: 746698:d1e24cf96aa7
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Aug 18 16:41:02 2009 +0000

description:
Switch to ACPICA 20090730, and update for API changes.

diffstat:

 sys/arch/amd64/amd64/machdep.c       |   12 +-
 sys/arch/amd64/amd64/mainbus.c       |   24 ++--
 sys/arch/i386/i386/machdep.c         |   12 +-
 sys/arch/i386/i386/mainbus.c         |   28 ++--
 sys/arch/x86/acpi/acpi_wakeup.c      |   10 +-
 sys/arch/x86/pci/pci_intr_machdep.c  |   16 +-
 sys/arch/x86/pci/pci_machdep.c       |   10 +-
 sys/arch/x86/x86/acpi_machdep.c      |    6 +-
 sys/arch/x86/x86/intr.c              |   16 +-
 sys/arch/x86/x86/ioapic.c            |    8 +-
 sys/arch/x86/x86/ipi.c               |    8 +-
 sys/arch/x86/x86/mpacpi.c            |   36 ++-----
 sys/arch/x86/x86/mpbios.c            |   20 ++--
 sys/arch/xen/x86/intr.c              |   14 +-
 sys/arch/xen/x86/mainbus.c           |   16 +-
 sys/arch/xen/xen/hypervisor.c        |   18 +-
 sys/arch/xen/xen/pci_intr_machdep.c  |    8 +-
 sys/arch/xen/xen/xen_acpi_machdep.c  |    6 +-
 sys/dev/acpi/acpi.c                  |   32 ++----
 sys/dev/acpi/acpica.h                |    5 +-
 sys/dev/acpi/acpica/OsdEnvironment.c |   20 +---
 sys/dev/acpi/acpica/OsdInterrupt.c   |   24 ++--
 sys/dev/acpi/acpica/OsdMemory.c      |   12 +--
 sys/dev/acpi/acpica/OsdMisc.c        |   13 +-
 sys/dev/acpi/acpica/OsdSchedule.c    |   34 +-----
 sys/dev/acpi/acpica/OsdSynch.c       |   52 +++-------
 sys/dev/acpi/acpica/files.acpica     |  167 ++--------------------------------
 sys/dev/acpi/files.acpi              |    6 +-
 sys/dev/acpi/sony_acpi.c             |   16 +--
 sys/dev/acpi/wss_acpi.c              |    8 +-
 sys/dev/acpi/ym_acpi.c               |    6 +-
 31 files changed, 216 insertions(+), 447 deletions(-)

diffs (truncated from 2053 to 300 lines):

diff -r 62a110c892ee -r d1e24cf96aa7 sys/arch/amd64/amd64/machdep.c
--- a/sys/arch/amd64/amd64/machdep.c    Tue Aug 18 16:38:51 2009 +0000
+++ b/sys/arch/amd64/amd64/machdep.c    Tue Aug 18 16:41:02 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.131 2009/08/15 23:44:58 matt Exp $       */
+/*     $NetBSD: machdep.c,v 1.132 2009/08/18 16:41:02 jmcneill Exp $   */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008
@@ -112,7 +112,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.131 2009/08/15 23:44:58 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.132 2009/08/18 16:41:02 jmcneill Exp $");
 
 /* #define XENDEBUG_LOW  */
 
@@ -203,9 +203,9 @@
 #include <ddb/db_interface.h>
 #endif
 
-#include "acpi.h"
+#include "acpica.h"
 
-#if NACPI > 0
+#if NACPICA > 0
 #include <dev/acpi/acpivar.h>
 #define ACPI_MACHDEP_PRIVATE
 #include <machine/acpi_machdep.h>
@@ -704,7 +704,7 @@
 
         if ((howto & RB_POWERDOWN) == RB_POWERDOWN) {
 #ifndef XEN
-#if NACPI > 0
+#if NACPICA > 0
                acpi_enter_sleep_state(acpi_softc, ACPI_STATE_S5);
                printf("WARNING: powerdown failed!\n");
 #endif
@@ -716,7 +716,7 @@
        x86_broadcast_ipi(X86_IPI_HALT);
 
        if (howto & RB_HALT) {
-#if NACPI > 0
+#if NACPICA > 0
                AcpiDisable();
 #endif
 
diff -r 62a110c892ee -r d1e24cf96aa7 sys/arch/amd64/amd64/mainbus.c
--- a/sys/arch/amd64/amd64/mainbus.c    Tue Aug 18 16:38:51 2009 +0000
+++ b/sys/arch/amd64/amd64/mainbus.c    Tue Aug 18 16:41:02 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mainbus.c,v 1.28 2009/06/13 13:35:11 tsutsui Exp $     */
+/*     $NetBSD: mainbus.c,v 1.29 2009/08/18 16:41:02 jmcneill Exp $    */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.28 2009/06/13 13:35:11 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.29 2009/08/18 16:41:02 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -47,7 +47,7 @@
 #include "pci.h"
 #include "isa.h"
 #include "isadma.h"
-#include "acpi.h"
+#include "acpica.h"
 #include "ipmi.h"
 
 #include "opt_acpi.h"
@@ -59,7 +59,7 @@
 #include <machine/mpbiosvar.h>
 #include <machine/mpacpi.h>
 
-#if NACPI > 0
+#if NACPICA > 0
 #include <dev/acpi/acpivar.h>
 #endif
 
@@ -93,7 +93,7 @@
        struct pcibus_attach_args mba_pba;
        struct isabus_attach_args mba_iba;
        struct cpu_attach_args mba_caa;
-#if NACPI > 0
+#if NACPICA > 0
        struct acpibus_attach_args mba_acpi;
 #endif
        struct apic_attach_args aaa_caa;
@@ -117,7 +117,7 @@
 };
 #endif
 
-#if defined(MPBIOS) || NACPI > 0
+#if defined(MPBIOS) || NACPICA > 0
 struct mp_bus *mp_busses;
 int mp_nbus;
 struct mp_intr_map *mp_intrs;
@@ -153,7 +153,7 @@
 #if NPCI > 0
        union mainbus_attach_args mba;
 #endif
-#if NACPI > 0
+#if NACPICA > 0
        int acpi_present = 0;
 #endif
 #ifdef MPBIOS
@@ -191,7 +191,7 @@
 #endif
 #endif
 
-#if NACPI > 0
+#if NACPICA > 0
        if ((boothowto & RB_MD2) == 0 && acpi_check(self, "acpibus"))
                acpi_present = acpi_probe();
        /*
@@ -221,7 +221,7 @@
                }
        }
 
-#if NISADMA > 0 && NACPI > 0
+#if NISADMA > 0 && NACPICA > 0
        /*
         * ACPI needs ISA DMA initialized before they start probing.
         */
@@ -229,7 +229,7 @@
            self);
 #endif
 
-#if NACPI > 0
+#if NACPICA > 0
        if (acpi_present) {
                mba.mba_acpi.aa_iot = X86_BUS_SPACE_IO;
                mba.mba_acpi.aa_memt = X86_BUS_SPACE_MEM;
@@ -263,7 +263,7 @@
                mba.mba_pba.pba_flags = pci_bus_flags();
                mba.mba_pba.pba_bus = 0;
                mba.mba_pba.pba_bridgetag = NULL;
-#if NACPI > 0 && defined(ACPI_SCANPCI)
+#if NACPICA > 0 && defined(ACPI_SCANPCI)
                if (npcibus == 0 && mpacpi_active)
                        npcibus = mp_pci_scan(self, &mba.mba_pba, pcibusprint);
 #endif
@@ -275,7 +275,7 @@
                        config_found_ia(self, "pcibus", &mba.mba_pba,
                            pcibusprint);
 
-#if NACPI > 0
+#if NACPICA > 0
                if (mp_verbose)
                        acpi_pci_link_state();
 #endif
diff -r 62a110c892ee -r d1e24cf96aa7 sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c      Tue Aug 18 16:38:51 2009 +0000
+++ b/sys/arch/i386/i386/machdep.c      Tue Aug 18 16:41:02 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.670 2009/07/29 12:02:05 cegger Exp $     */
+/*     $NetBSD: machdep.c,v 1.671 2009/08/18 16:41:02 jmcneill Exp $   */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.670 2009/07/29 12:02:05 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.671 2009/08/18 16:41:02 jmcneill Exp $");
 
 #include "opt_beep.h"
 #include "opt_compat_ibcs2.h"
@@ -188,7 +188,7 @@
 uint32_t arch_i386_xbox_memsize = 0;
 #endif
 
-#include "acpi.h"
+#include "acpica.h"
 #include "apmbios.h"
 #include "bioscall.h"
 
@@ -196,7 +196,7 @@
 #include <machine/bioscall.h>
 #endif
 
-#if NACPI > 0
+#if NACPICA > 0
 #include <dev/acpi/acpivar.h>
 #define ACPI_MACHDEP_PRIVATE
 #include <machine/acpi_machdep.h>
@@ -930,7 +930,7 @@
                        for (;;);
                }
 #endif
-#if NACPI > 0
+#if NACPICA > 0
                if (acpi_softc != NULL) {
                        acpi_enter_sleep_state(acpi_softc, ACPI_STATE_S5);
                        printf("WARNING: ACPI powerdown failed!\n");
@@ -958,7 +958,7 @@
 #endif
 
        if (howto & RB_HALT) {
-#if NACPI > 0
+#if NACPICA > 0
                AcpiDisable();
 #endif
 
diff -r 62a110c892ee -r d1e24cf96aa7 sys/arch/i386/i386/mainbus.c
--- a/sys/arch/i386/i386/mainbus.c      Tue Aug 18 16:38:51 2009 +0000
+++ b/sys/arch/i386/i386/mainbus.c      Tue Aug 18 16:41:02 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mainbus.c,v 1.86 2009/08/04 06:55:26 dsl Exp $ */
+/*     $NetBSD: mainbus.c,v 1.87 2009/08/18 16:41:02 jmcneill Exp $    */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.86 2009/08/04 06:55:26 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.87 2009/08/18 16:41:02 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,7 +52,7 @@
 #include "mca.h"
 #include "apmbios.h"
 #include "pnpbios.h"
-#include "acpi.h"
+#include "acpica.h"
 #include "ipmi.h"
 
 #include "opt_acpi.h"
@@ -73,7 +73,7 @@
 #include <arch/i386/pnpbios/pnpbiosvar.h>
 #endif
 
-#if NACPI > 0
+#if NACPICA > 0
 #include <dev/acpi/acpivar.h>
 #endif
 
@@ -130,7 +130,7 @@
 #endif
        struct cpu_attach_args mba_caa;
        struct apic_attach_args aaa_caa;
-#if NACPI > 0
+#if NACPICA > 0
        struct acpibus_attach_args mba_acpi;
 #endif
 #if NIPMI > 0
@@ -158,7 +158,7 @@
  */
 int    eisa_has_been_seen;
 
-#if defined(MPBIOS) || NACPI > 0
+#if defined(MPBIOS) || NACPICA > 0
 struct mp_bus *mp_busses;
 int mp_nbus;
 struct mp_intr_map *mp_intrs;
@@ -249,7 +249,7 @@
 #endif
 #endif
 
-#if NACPI > 0
+#if NACPICA > 0
        if ((boothowto & RB_MD2) == 0 && acpi_check(self, "acpibus"))
                sc->sc_acpi_present = acpi_probe() != 0;
        /*
@@ -279,7 +279,7 @@
                }
        }
 
-#if NISADMA > 0 && (NACPI > 0 || NPNPBIOS > 0)
+#if NISADMA > 0 && (NACPICA > 0 || NPNPBIOS > 0)
        /*
         * ACPI and PNPBIOS need ISA DMA initialized before they start probing.
         */
@@ -313,7 +313,7 @@
 #endif
 
 #if NAPMBIOS > 0
-#if NACPI > 0
+#if NACPICA > 0
        if (acpi_active == 0)
 #endif
        if (apm_busprobe())
@@ -336,13 +336,13 @@
 mainbus_rescan(device_t self, const char *ifattr, const int *locators)
 {
        struct mainbus_softc *sc = device_private(self);
-#if NACPI > 0 || NIPMI > 0 || NMCA > 0 || NPCI > 0 || NPNPBIOS > 0
+#if NACPICA > 0 || NIPMI > 0 || NMCA > 0 || NPCI > 0 || NPNPBIOS > 0
        union mainbus_attach_args mba;
 #endif