Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 5 Jun 2009 18:44:36 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r193530 - in head/sys: amd64/acpica boot/i386/libi386 boot/ia64/ski conf dev/acpi_support dev/acpica dev/acpica/Osd dev/asmc dev/fdc dev/ipmi dev/pci i386/acpica i386/cpufreq ia64/acpic...
Message-ID:  <200906051844.n55IiahT034660@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Fri Jun  5 18:44:36 2009
New Revision: 193530
URL: http://svn.freebsd.org/changeset/base/193530

Log:
  Import ACPICA 20090521.

Modified:
  head/sys/amd64/acpica/OsdEnvironment.c
  head/sys/amd64/acpica/acpi_machdep.c
  head/sys/amd64/acpica/acpi_wakeup.c
  head/sys/amd64/acpica/madt.c
  head/sys/boot/i386/libi386/Makefile
  head/sys/boot/i386/libi386/biosacpi.c
  head/sys/boot/ia64/ski/acpi_stub.c
  head/sys/conf/files
  head/sys/dev/acpi_support/acpi_aiboost.c
  head/sys/dev/acpi_support/acpi_asus.c
  head/sys/dev/acpi_support/acpi_fujitsu.c
  head/sys/dev/acpi_support/acpi_ibm.c
  head/sys/dev/acpi_support/acpi_panasonic.c
  head/sys/dev/acpi_support/acpi_sony.c
  head/sys/dev/acpi_support/acpi_toshiba.c
  head/sys/dev/acpica/Osd/OsdDebug.c
  head/sys/dev/acpica/Osd/OsdHardware.c
  head/sys/dev/acpica/Osd/OsdInterrupt.c
  head/sys/dev/acpica/Osd/OsdMemory.c
  head/sys/dev/acpica/Osd/OsdSchedule.c
  head/sys/dev/acpica/Osd/OsdStream.c
  head/sys/dev/acpica/Osd/OsdSynch.c
  head/sys/dev/acpica/Osd/OsdTable.c
  head/sys/dev/acpica/acpi.c
  head/sys/dev/acpica/acpi_acad.c
  head/sys/dev/acpica/acpi_battery.c
  head/sys/dev/acpica/acpi_button.c
  head/sys/dev/acpica/acpi_cmbat.c
  head/sys/dev/acpica/acpi_cpu.c
  head/sys/dev/acpica/acpi_dock.c
  head/sys/dev/acpica/acpi_ec.c
  head/sys/dev/acpica/acpi_hpet.c
  head/sys/dev/acpica/acpi_if.m
  head/sys/dev/acpica/acpi_isab.c
  head/sys/dev/acpica/acpi_lid.c
  head/sys/dev/acpica/acpi_package.c
  head/sys/dev/acpica/acpi_pci.c
  head/sys/dev/acpica/acpi_pci_link.c
  head/sys/dev/acpica/acpi_pcib.c
  head/sys/dev/acpica/acpi_pcib_acpi.c
  head/sys/dev/acpica/acpi_pcib_pci.c
  head/sys/dev/acpica/acpi_perf.c
  head/sys/dev/acpica/acpi_powerres.c
  head/sys/dev/acpica/acpi_quirk.c
  head/sys/dev/acpica/acpi_resource.c
  head/sys/dev/acpica/acpi_smbat.c
  head/sys/dev/acpica/acpi_thermal.c
  head/sys/dev/acpica/acpi_throttle.c
  head/sys/dev/acpica/acpi_timer.c
  head/sys/dev/acpica/acpi_video.c
  head/sys/dev/asmc/asmc.c
  head/sys/dev/fdc/fdc_acpi.c
  head/sys/dev/ipmi/ipmi_acpi.c
  head/sys/dev/pci/pci.c
  head/sys/i386/acpica/OsdEnvironment.c
  head/sys/i386/acpica/acpi_machdep.c
  head/sys/i386/acpica/acpi_wakeup.c
  head/sys/i386/acpica/madt.c
  head/sys/i386/cpufreq/est.c
  head/sys/i386/cpufreq/hwpstate.c
  head/sys/i386/cpufreq/p4tcc.c
  head/sys/ia64/acpica/OsdEnvironment.c
  head/sys/ia64/acpica/acpi_machdep.c
  head/sys/ia64/acpica/acpi_wakeup.c
  head/sys/ia64/acpica/madt.c
  head/sys/ia64/ia64/nexus.c
  head/sys/modules/acpi/acpi/Makefile
  head/sys/modules/acpi/acpi_aiboost/Makefile
  head/sys/modules/acpi/acpi_asus/Makefile
  head/sys/modules/acpi/acpi_dock/Makefile
  head/sys/modules/acpi/acpi_fujitsu/Makefile
  head/sys/modules/acpi/acpi_ibm/Makefile
  head/sys/modules/acpi/acpi_panasonic/Makefile
  head/sys/modules/acpi/acpi_sony/Makefile
  head/sys/modules/acpi/acpi_toshiba/Makefile
  head/sys/modules/acpi/acpi_video/Makefile
  head/sys/modules/cpufreq/Makefile
  head/sys/modules/fdc/Makefile

Modified: head/sys/amd64/acpica/OsdEnvironment.c
==============================================================================
--- head/sys/amd64/acpica/OsdEnvironment.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/amd64/acpica/OsdEnvironment.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -36,8 +36,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/linker_set.h>
 #include <sys/sysctl.h>
 
-#include <contrib/dev/acpica/acpi.h>
-#include <contrib/dev/acpica/actables.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/actables.h>
 
 static u_long amd64_acpi_root;
 
@@ -63,7 +63,7 @@ AcpiOsGetRootPointer(void)
 
 	if (amd64_acpi_root == 0 &&
 	    (resource_long_value("acpi", 0, "rsdp", (long *)&ptr) == 0 ||
-	    AcpiFindRootPointer((ACPI_NATIVE_UINT *)&ptr) == AE_OK) &&
+	    AcpiFindRootPointer((ACPI_SIZE *)&ptr) == AE_OK) &&
 	    ptr != 0)
 		amd64_acpi_root = ptr;
 

Modified: head/sys/amd64/acpica/acpi_machdep.c
==============================================================================
--- head/sys/amd64/acpica/acpi_machdep.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/amd64/acpica/acpi_machdep.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -33,7 +33,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/sysctl.h>
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+
 #include <dev/acpica/acpivar.h>
 
 #include <machine/nexusvar.h>

Modified: head/sys/amd64/acpica/acpi_wakeup.c
==============================================================================
--- head/sys/amd64/acpica/acpi_wakeup.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/amd64/acpica/acpi_wakeup.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -53,7 +53,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/smp.h>
 #endif
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+
 #include <dev/acpica/acpivar.h>
 
 #include "acpi_wakecode.h"

Modified: head/sys/amd64/acpica/madt.c
==============================================================================
--- head/sys/amd64/acpica/madt.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/amd64/acpica/madt.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -48,8 +48,10 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 
-#include <contrib/dev/acpica/acpi.h>
-#include <contrib/dev/acpica/actables.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <contrib/dev/acpica/include/actables.h>
+
 #include <dev/acpica/acpivar.h>
 #include <dev/pci/pcivar.h>
 

Modified: head/sys/boot/i386/libi386/Makefile
==============================================================================
--- head/sys/boot/i386/libi386/Makefile	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/boot/i386/libi386/Makefile	Fri Jun  5 18:44:36 2009	(r193530)
@@ -48,7 +48,7 @@ CFLAGS+= -DTERM_EMU
 CFLAGS+= -Dalloca=__builtin_alloca
 
 CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \
-		-I${.CURDIR}/../../../contrib/dev/acpica \
+		-I${.CURDIR}/../../../contrib/dev/acpica/include \
 		-I${.CURDIR}/../../.. -I.
 # the location of libstand
 CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/

Modified: head/sys/boot/i386/libi386/biosacpi.c
==============================================================================
--- head/sys/boot/i386/libi386/biosacpi.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/boot/i386/libi386/biosacpi.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <btxv86.h>
 #include "libi386.h"
 
-#include "acfreebsd.h"
+#include "platform/acfreebsd.h"
 #include "acconfig.h"
 #define ACPI_SYSTEM_XFACE
 #include "actypes.h"

Modified: head/sys/boot/ia64/ski/acpi_stub.c
==============================================================================
--- head/sys/boot/ia64/ski/acpi_stub.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/boot/ia64/ski/acpi_stub.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -27,7 +27,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
 
 #define APIC_IO_SAPIC                   6
 #define APIC_LOCAL_SAPIC                7

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/conf/files	Fri Jun  5 18:44:36 2009	(r193530)
@@ -122,131 +122,134 @@ contrib/altq/altq/altq_rio.c	optional al
 contrib/altq/altq/altq_rmclass.c optional altq
 contrib/altq/altq/altq_subr.c	optional altq \
 	compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/dev/acpica/dbcmds.c	optional acpi acpi_debug
-contrib/dev/acpica/dbdisply.c	optional acpi acpi_debug
-contrib/dev/acpica/dbexec.c	optional acpi acpi_debug
-contrib/dev/acpica/dbfileio.c	optional acpi acpi_debug
-contrib/dev/acpica/dbhistry.c	optional acpi acpi_debug
-contrib/dev/acpica/dbinput.c	optional acpi acpi_debug
-contrib/dev/acpica/dbstats.c	optional acpi acpi_debug
-contrib/dev/acpica/dbutils.c	optional acpi acpi_debug
-contrib/dev/acpica/dbxface.c	optional acpi acpi_debug
-contrib/dev/acpica/dmbuffer.c	optional acpi acpi_debug
-contrib/dev/acpica/dmnames.c	optional acpi acpi_debug
-contrib/dev/acpica/dmopcode.c	optional acpi acpi_debug
-contrib/dev/acpica/dmobject.c	optional acpi acpi_debug
-contrib/dev/acpica/dmresrc.c	optional acpi acpi_debug
-contrib/dev/acpica/dmresrcl.c	optional acpi acpi_debug
-contrib/dev/acpica/dmresrcs.c	optional acpi acpi_debug
-contrib/dev/acpica/dmutils.c	optional acpi acpi_debug
-contrib/dev/acpica/dmwalk.c	optional acpi acpi_debug
-contrib/dev/acpica/dsfield.c	optional acpi
-contrib/dev/acpica/dsinit.c	optional acpi
-contrib/dev/acpica/dsmethod.c	optional acpi
-contrib/dev/acpica/dsmthdat.c	optional acpi
-contrib/dev/acpica/dsobject.c	optional acpi
-contrib/dev/acpica/dsopcode.c	optional acpi
-contrib/dev/acpica/dsutils.c	optional acpi
-contrib/dev/acpica/dswexec.c	optional acpi
-contrib/dev/acpica/dswload.c	optional acpi
-contrib/dev/acpica/dswscope.c	optional acpi
-contrib/dev/acpica/dswstate.c	optional acpi
-contrib/dev/acpica/evevent.c	optional acpi
-contrib/dev/acpica/evgpe.c	optional acpi
-contrib/dev/acpica/evgpeblk.c	optional acpi
-contrib/dev/acpica/evmisc.c	optional acpi
-contrib/dev/acpica/evregion.c	optional acpi
-contrib/dev/acpica/evrgnini.c	optional acpi
-contrib/dev/acpica/evsci.c	optional acpi
-contrib/dev/acpica/evxface.c	optional acpi
-contrib/dev/acpica/evxfevnt.c	optional acpi
-contrib/dev/acpica/evxfregn.c	optional acpi
-contrib/dev/acpica/exconfig.c	optional acpi
-contrib/dev/acpica/exconvrt.c	optional acpi
-contrib/dev/acpica/excreate.c	optional acpi
-contrib/dev/acpica/exdump.c	optional acpi
-contrib/dev/acpica/exfield.c	optional acpi
-contrib/dev/acpica/exfldio.c	optional acpi
-contrib/dev/acpica/exmisc.c	optional acpi
-contrib/dev/acpica/exmutex.c	optional acpi
-contrib/dev/acpica/exnames.c	optional acpi
-contrib/dev/acpica/exoparg1.c	optional acpi
-contrib/dev/acpica/exoparg2.c	optional acpi
-contrib/dev/acpica/exoparg3.c	optional acpi
-contrib/dev/acpica/exoparg6.c	optional acpi
-contrib/dev/acpica/exprep.c	optional acpi
-contrib/dev/acpica/exregion.c	optional acpi
-contrib/dev/acpica/exresnte.c	optional acpi
-contrib/dev/acpica/exresolv.c	optional acpi
-contrib/dev/acpica/exresop.c	optional acpi
-contrib/dev/acpica/exstore.c	optional acpi
-contrib/dev/acpica/exstoren.c	optional acpi
-contrib/dev/acpica/exstorob.c	optional acpi
-contrib/dev/acpica/exsystem.c	optional acpi
-contrib/dev/acpica/exutils.c	optional acpi
-contrib/dev/acpica/hwacpi.c	optional acpi
-contrib/dev/acpica/hwgpe.c	optional acpi
-contrib/dev/acpica/hwregs.c	optional acpi
-contrib/dev/acpica/hwsleep.c	optional acpi
-contrib/dev/acpica/hwtimer.c	optional acpi
-contrib/dev/acpica/nsaccess.c	optional acpi
-contrib/dev/acpica/nsalloc.c	optional acpi
-contrib/dev/acpica/nsdump.c	optional acpi
-contrib/dev/acpica/nseval.c	optional acpi
-contrib/dev/acpica/nsinit.c	optional acpi
-contrib/dev/acpica/nsload.c	optional acpi
-contrib/dev/acpica/nsnames.c	optional acpi
-contrib/dev/acpica/nsobject.c	optional acpi
-contrib/dev/acpica/nsparse.c	optional acpi
-contrib/dev/acpica/nssearch.c	optional acpi
-contrib/dev/acpica/nsutils.c	optional acpi
-contrib/dev/acpica/nswalk.c	optional acpi
-contrib/dev/acpica/nsxfeval.c	optional acpi
-contrib/dev/acpica/nsxfname.c	optional acpi
-contrib/dev/acpica/nsxfobj.c	optional acpi
-contrib/dev/acpica/psargs.c	optional acpi
-contrib/dev/acpica/psloop.c	optional acpi
-contrib/dev/acpica/psopcode.c	optional acpi
-contrib/dev/acpica/psparse.c	optional acpi
-contrib/dev/acpica/psscope.c	optional acpi
-contrib/dev/acpica/pstree.c	optional acpi
-contrib/dev/acpica/psutils.c	optional acpi
-contrib/dev/acpica/pswalk.c	optional acpi
-contrib/dev/acpica/psxface.c	optional acpi
-contrib/dev/acpica/rsaddr.c	optional acpi
-contrib/dev/acpica/rscalc.c	optional acpi
-contrib/dev/acpica/rscreate.c	optional acpi
-contrib/dev/acpica/rsdump.c	optional acpi
-contrib/dev/acpica/rsinfo.c	optional acpi
-contrib/dev/acpica/rsio.c	optional acpi
-contrib/dev/acpica/rsirq.c	optional acpi
-contrib/dev/acpica/rslist.c	optional acpi
-contrib/dev/acpica/rsmemory.c	optional acpi
-contrib/dev/acpica/rsmisc.c	optional acpi
-contrib/dev/acpica/rsutils.c	optional acpi
-contrib/dev/acpica/rsxface.c	optional acpi
-contrib/dev/acpica/tbfadt.c	optional acpi
-contrib/dev/acpica/tbfind.c	optional acpi
-contrib/dev/acpica/tbinstal.c	optional acpi
-contrib/dev/acpica/tbutils.c	optional acpi
-contrib/dev/acpica/tbxface.c	optional acpi
-contrib/dev/acpica/tbxfroot.c	optional acpi
-contrib/dev/acpica/utalloc.c	optional acpi
-contrib/dev/acpica/utcache.c	optional acpi
-contrib/dev/acpica/utclib.c	optional acpi
-contrib/dev/acpica/utcopy.c	optional acpi
-contrib/dev/acpica/utdebug.c	optional acpi
-contrib/dev/acpica/utdelete.c	optional acpi
-contrib/dev/acpica/uteval.c	optional acpi
-contrib/dev/acpica/utglobal.c	optional acpi
-contrib/dev/acpica/utinit.c	optional acpi
-contrib/dev/acpica/utmath.c	optional acpi
-contrib/dev/acpica/utmisc.c	optional acpi
-contrib/dev/acpica/utmutex.c	optional acpi
-contrib/dev/acpica/utobject.c	optional acpi
-contrib/dev/acpica/utresrc.c	optional acpi
-contrib/dev/acpica/utstate.c	optional acpi
-contrib/dev/acpica/utxface.c	optional acpi
+contrib/dev/acpica/debugger/dbcmds.c	optional acpi acpi_debug
+contrib/dev/acpica/debugger/dbdisply.c	optional acpi acpi_debug
+contrib/dev/acpica/debugger/dbexec.c	optional acpi acpi_debug
+contrib/dev/acpica/debugger/dbfileio.c	optional acpi acpi_debug
+contrib/dev/acpica/debugger/dbhistry.c	optional acpi acpi_debug
+contrib/dev/acpica/debugger/dbinput.c	optional acpi acpi_debug
+contrib/dev/acpica/debugger/dbstats.c	optional acpi acpi_debug
+contrib/dev/acpica/debugger/dbutils.c	optional acpi acpi_debug
+contrib/dev/acpica/debugger/dbxface.c	optional acpi acpi_debug
+contrib/dev/acpica/disassembler/dmbuffer.c	optional acpi acpi_debug
+contrib/dev/acpica/disassembler/dmnames.c	optional acpi acpi_debug
+contrib/dev/acpica/disassembler/dmopcode.c	optional acpi acpi_debug
+contrib/dev/acpica/disassembler/dmobject.c	optional acpi acpi_debug
+contrib/dev/acpica/disassembler/dmresrc.c	optional acpi acpi_debug
+contrib/dev/acpica/disassembler/dmresrcl.c	optional acpi acpi_debug
+contrib/dev/acpica/disassembler/dmresrcs.c	optional acpi acpi_debug
+contrib/dev/acpica/disassembler/dmutils.c	optional acpi acpi_debug
+contrib/dev/acpica/disassembler/dmwalk.c	optional acpi acpi_debug
+contrib/dev/acpica/dispatcher/dsfield.c		optional acpi
+contrib/dev/acpica/dispatcher/dsinit.c		optional acpi
+contrib/dev/acpica/dispatcher/dsmethod.c	optional acpi
+contrib/dev/acpica/dispatcher/dsmthdat.c	optional acpi
+contrib/dev/acpica/dispatcher/dsobject.c	optional acpi
+contrib/dev/acpica/dispatcher/dsopcode.c	optional acpi
+contrib/dev/acpica/dispatcher/dsutils.c		optional acpi
+contrib/dev/acpica/dispatcher/dswexec.c		optional acpi
+contrib/dev/acpica/dispatcher/dswload.c		optional acpi
+contrib/dev/acpica/dispatcher/dswscope.c	optional acpi
+contrib/dev/acpica/dispatcher/dswstate.c	optional acpi
+contrib/dev/acpica/events/evevent.c	optional acpi
+contrib/dev/acpica/events/evgpe.c	optional acpi
+contrib/dev/acpica/events/evgpeblk.c	optional acpi
+contrib/dev/acpica/events/evmisc.c	optional acpi
+contrib/dev/acpica/events/evregion.c	optional acpi
+contrib/dev/acpica/events/evrgnini.c	optional acpi
+contrib/dev/acpica/events/evsci.c	optional acpi
+contrib/dev/acpica/events/evxface.c	optional acpi
+contrib/dev/acpica/events/evxfevnt.c	optional acpi
+contrib/dev/acpica/events/evxfregn.c	optional acpi
+contrib/dev/acpica/executer/exconfig.c	optional acpi
+contrib/dev/acpica/executer/exconvrt.c	optional acpi
+contrib/dev/acpica/executer/excreate.c	optional acpi
+contrib/dev/acpica/executer/exdump.c	optional acpi
+contrib/dev/acpica/executer/exfield.c	optional acpi
+contrib/dev/acpica/executer/exfldio.c	optional acpi
+contrib/dev/acpica/executer/exmisc.c	optional acpi
+contrib/dev/acpica/executer/exmutex.c	optional acpi
+contrib/dev/acpica/executer/exnames.c	optional acpi
+contrib/dev/acpica/executer/exoparg1.c	optional acpi
+contrib/dev/acpica/executer/exoparg2.c	optional acpi
+contrib/dev/acpica/executer/exoparg3.c	optional acpi
+contrib/dev/acpica/executer/exoparg6.c	optional acpi
+contrib/dev/acpica/executer/exprep.c	optional acpi
+contrib/dev/acpica/executer/exregion.c	optional acpi
+contrib/dev/acpica/executer/exresnte.c	optional acpi
+contrib/dev/acpica/executer/exresolv.c	optional acpi
+contrib/dev/acpica/executer/exresop.c	optional acpi
+contrib/dev/acpica/executer/exstore.c	optional acpi
+contrib/dev/acpica/executer/exstoren.c	optional acpi
+contrib/dev/acpica/executer/exstorob.c	optional acpi
+contrib/dev/acpica/executer/exsystem.c	optional acpi
+contrib/dev/acpica/executer/exutils.c	optional acpi
+contrib/dev/acpica/hardware/hwacpi.c	optional acpi
+contrib/dev/acpica/hardware/hwgpe.c	optional acpi
+contrib/dev/acpica/hardware/hwregs.c	optional acpi
+contrib/dev/acpica/hardware/hwsleep.c	optional acpi
+contrib/dev/acpica/hardware/hwtimer.c	optional acpi
+contrib/dev/acpica/hardware/hwvalid.c	optional acpi
+contrib/dev/acpica/hardware/hwxface.c	optional acpi
+contrib/dev/acpica/namespace/nsaccess.c	optional acpi
+contrib/dev/acpica/namespace/nsalloc.c	optional acpi
+contrib/dev/acpica/namespace/nsdump.c	optional acpi
+contrib/dev/acpica/namespace/nseval.c	optional acpi
+contrib/dev/acpica/namespace/nsinit.c	optional acpi
+contrib/dev/acpica/namespace/nsload.c	optional acpi
+contrib/dev/acpica/namespace/nsnames.c	optional acpi
+contrib/dev/acpica/namespace/nsobject.c	optional acpi
+contrib/dev/acpica/namespace/nsparse.c	optional acpi
+contrib/dev/acpica/namespace/nspredef.c	optional acpi
+contrib/dev/acpica/namespace/nssearch.c	optional acpi
+contrib/dev/acpica/namespace/nsutils.c	optional acpi
+contrib/dev/acpica/namespace/nswalk.c	optional acpi
+contrib/dev/acpica/namespace/nsxfeval.c	optional acpi
+contrib/dev/acpica/namespace/nsxfname.c	optional acpi
+contrib/dev/acpica/namespace/nsxfobj.c	optional acpi
+contrib/dev/acpica/parser/psargs.c	optional acpi
+contrib/dev/acpica/parser/psloop.c	optional acpi
+contrib/dev/acpica/parser/psopcode.c	optional acpi
+contrib/dev/acpica/parser/psparse.c	optional acpi
+contrib/dev/acpica/parser/psscope.c	optional acpi
+contrib/dev/acpica/parser/pstree.c	optional acpi
+contrib/dev/acpica/parser/psutils.c	optional acpi
+contrib/dev/acpica/parser/pswalk.c	optional acpi
+contrib/dev/acpica/parser/psxface.c	optional acpi
+contrib/dev/acpica/resources/rsaddr.c	optional acpi
+contrib/dev/acpica/resources/rscalc.c	optional acpi
+contrib/dev/acpica/resources/rscreate.c	optional acpi
+contrib/dev/acpica/resources/rsdump.c	optional acpi
+contrib/dev/acpica/resources/rsinfo.c	optional acpi
+contrib/dev/acpica/resources/rsio.c	optional acpi
+contrib/dev/acpica/resources/rsirq.c	optional acpi
+contrib/dev/acpica/resources/rslist.c	optional acpi
+contrib/dev/acpica/resources/rsmemory.c	optional acpi
+contrib/dev/acpica/resources/rsmisc.c	optional acpi
+contrib/dev/acpica/resources/rsutils.c	optional acpi
+contrib/dev/acpica/resources/rsxface.c	optional acpi
+contrib/dev/acpica/tables/tbfadt.c	optional acpi
+contrib/dev/acpica/tables/tbfind.c	optional acpi
+contrib/dev/acpica/tables/tbinstal.c	optional acpi
+contrib/dev/acpica/tables/tbutils.c	optional acpi
+contrib/dev/acpica/tables/tbxface.c	optional acpi
+contrib/dev/acpica/tables/tbxfroot.c	optional acpi
+contrib/dev/acpica/utilities/utalloc.c	optional acpi
+contrib/dev/acpica/utilities/utcache.c	optional acpi
+contrib/dev/acpica/utilities/utcopy.c	optional acpi
+contrib/dev/acpica/utilities/utdebug.c	optional acpi
+contrib/dev/acpica/utilities/utdelete.c	optional acpi
+contrib/dev/acpica/utilities/uteval.c	optional acpi
+contrib/dev/acpica/utilities/utglobal.c	optional acpi
+contrib/dev/acpica/utilities/utinit.c	optional acpi
+contrib/dev/acpica/utilities/utlock.c	optional acpi
+contrib/dev/acpica/utilities/utmath.c	optional acpi
+contrib/dev/acpica/utilities/utmisc.c	optional acpi
+contrib/dev/acpica/utilities/utmutex.c	optional acpi
+contrib/dev/acpica/utilities/utobject.c	optional acpi
+contrib/dev/acpica/utilities/utresrc.c	optional acpi
+contrib/dev/acpica/utilities/utstate.c	optional acpi
+contrib/dev/acpica/utilities/utxface.c	optional acpi
 contrib/ipfilter/netinet/fil.c	optional ipfilter inet \
 	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet \

Modified: head/sys/dev/acpi_support/acpi_aiboost.c
==============================================================================
--- head/sys/dev/acpi_support/acpi_aiboost.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpi_support/acpi_aiboost.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -31,7 +31,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
-#include <contrib/dev/acpica/acpi.h>
+
+#include <contrib/dev/acpica/include/acpi.h>
+
 #include "acpi_if.h"
 #include <sys/module.h>
 #include <dev/acpica/acpivar.h>

Modified: head/sys/dev/acpi_support/acpi_asus.c
==============================================================================
--- head/sys/dev/acpi_support/acpi_asus.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpi_support/acpi_asus.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -47,7 +47,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/sbuf.h>
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+
 #include <dev/acpica/acpivar.h>
 #include <dev/led/led.h>
 

Modified: head/sys/dev/acpi_support/acpi_fujitsu.c
==============================================================================
--- head/sys/dev/acpi_support/acpi_fujitsu.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpi_support/acpi_fujitsu.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -37,7 +37,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/sysctl.h>
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+
 #include <dev/acpica/acpivar.h>
 
 /* Hooks for the ACPI CA debugging infrastructure */

Modified: head/sys/dev/acpi_support/acpi_ibm.c
==============================================================================
--- head/sys/dev/acpi_support/acpi_ibm.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpi_support/acpi_ibm.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -42,7 +42,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <machine/cpufunc.h>
-#include <contrib/dev/acpica/acpi.h>
+
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+
 #include "acpi_if.h"
 #include <sys/module.h>
 #include <dev/acpica/acpivar.h>

Modified: head/sys/dev/acpi_support/acpi_panasonic.c
==============================================================================
--- head/sys/dev/acpi_support/acpi_panasonic.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpi_support/acpi_panasonic.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -37,7 +37,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/power.h>
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+
 #include <dev/acpica/acpivar.h>
 
 #define _COMPONENT	ACPI_OEM

Modified: head/sys/dev/acpi_support/acpi_sony.c
==============================================================================
--- head/sys/dev/acpi_support/acpi_sony.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpi_support/acpi_sony.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -31,7 +31,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
-#include <contrib/dev/acpica/acpi.h>
+
+#include <contrib/dev/acpica/include/acpi.h>
+
 #include "acpi_if.h"
 #include <sys/module.h>
 #include <dev/acpica/acpivar.h>

Modified: head/sys/dev/acpi_support/acpi_toshiba.c
==============================================================================
--- head/sys/dev/acpi_support/acpi_toshiba.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpi_support/acpi_toshiba.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -34,7 +34,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/bus.h>
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+
 #include <dev/acpica/acpivar.h>
 
 #define _COMPONENT	ACPI_OEM

Modified: head/sys/dev/acpica/Osd/OsdDebug.c
==============================================================================
--- head/sys/dev/acpica/Osd/OsdDebug.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/Osd/OsdDebug.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -41,8 +41,10 @@ __FBSDID("$FreeBSD$");
 #include <ddb/ddb.h>
 #include <ddb/db_output.h>
 
-#include <contrib/dev/acpica/acpi.h>
-#include <contrib/dev/acpica/acdebug.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <contrib/dev/acpica/include/acdebug.h>
+
 #include <dev/acpica/acpivar.h>
 
 UINT32

Modified: head/sys/dev/acpica/Osd/OsdHardware.c
==============================================================================
--- head/sys/dev/acpica/Osd/OsdHardware.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/Osd/OsdHardware.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
 
 #include <sys/bus.h>
 #include <sys/kernel.h>
@@ -65,75 +65,9 @@ __FBSDID("$FreeBSD$");
 #define ACPI_BUS_HANDLE		0
 #endif
 
-/*
- * Some BIOS vendors use AML to read/write directly to IO space.  This
- * can cause a problem if such accesses interfere with the OS's access to
- * the same ports.  Windows XP and newer systems block accesses to certain
- * IO ports.  We print a message or block accesses based on a tunable.
- */
-static int illegal_bios_ports[] = {
-	0x000, 0x00f,	/* DMA controller 1 */
-	0x020, 0x021,	/* PIC */
-	0x040, 0x043,	/* Timer 1 */
-	0x048, 0x04b,	/* Timer 2 failsafe */
-	0x070, 0x071,	/* CMOS and RTC */
-	0x074, 0x076,	/* Extended CMOS */
-	0x081, 0x083,	/* DMA1 page registers */
-	0x087, 0x087,	/* DMA1 ch0 low page */
-	0x089, 0x08b,	/* DMA2 ch2 (0x89), ch3 low page (0x8a, 0x8b) */
-	0x08f, 0x091,	/* DMA2 low page refresh (0x8f) */
-			/* Arb ctrl port, card select feedback (0x90, 0x91) */
-	0x093, 0x094,	/* System board setup */
-	0x096, 0x097,	/* POS channel select */
-	0x0a0, 0x0a1,	/* PIC (cascaded) */
-	0x0c0, 0x0df,	/* ISA DMA */
-	0x4d0, 0x4d1,	/* PIC ELCR (edge/level control) */
-	0xcf8, 0xcff,	/* PCI config space. Microsoft adds 0xd00 also but
-			   that seems incorrect. */
-	-1, -1
-};
-
-/* Block accesses to bad IO port addresses or just print a warning. */
-static int block_bad_io;
-TUNABLE_INT("debug.acpi.block_bad_io", &block_bad_io);
-
-/*
- * Look up bad ports in our table.  Returns 0 if ok, 1 if marked bad but
- * access is still allowed, or -1 to deny access.
- */
-static int
-acpi_os_check_port(UINT32 addr, UINT32 width)
-{
-	int error, *port;
-
-	error = 0;
-	for (port = illegal_bios_ports; *port != -1; port += 2) {
-		if ((addr >= port[0] && addr <= port[1]) ||
-		    (addr < port[0] && addr + (width / 8) > port[0])) {
-			if (block_bad_io)
-			    error = -1;
-			else
-			    error = 1;
-			break;
-		}
-	}
-
-	return (error);
-}
-
 ACPI_STATUS
 AcpiOsReadPort(ACPI_IO_ADDRESS InPort, UINT32 *Value, UINT32 Width)
 {
-    int error;
-
-    error = acpi_os_check_port(InPort, Width);
-    if (error != 0) {
-	if (bootverbose)
-		printf("acpi: bad read from port 0x%03x (%d)\n",
-			(int)InPort, Width);
-	if (error == -1)
-	    return (AE_BAD_PARAMETER);
-    }
 
     switch (Width) {
     case 8:
@@ -159,16 +93,6 @@ AcpiOsReadPort(ACPI_IO_ADDRESS InPort, U
 ACPI_STATUS
 AcpiOsWritePort(ACPI_IO_ADDRESS OutPort, UINT32	Value, UINT32 Width)
 {
-    int error;
-
-    error = acpi_os_check_port(OutPort, Width);
-    if (error != 0) {
-	if (bootverbose)
-		printf("acpi: bad write to port 0x%03x (%d), val %#x\n",
-			(int)OutPort, Width, Value);
-	if (error == -1)
-	    return (AE_BAD_PARAMETER);
-    }
 
     switch (Width) {
     case 8:

Modified: head/sys/dev/acpica/Osd/OsdInterrupt.c
==============================================================================
--- head/sys/dev/acpica/Osd/OsdInterrupt.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/Osd/OsdInterrupt.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -39,7 +39,9 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <sys/rman.h>
  
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+
 #include <dev/acpica/acpivar.h>
 
 #define _COMPONENT	ACPI_OS_SERVICES

Modified: head/sys/dev/acpica/Osd/OsdMemory.c
==============================================================================
--- head/sys/dev/acpica/Osd/OsdMemory.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/Osd/OsdMemory.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -33,7 +33,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
 
 #include <sys/kernel.h>
 #include <sys/malloc.h>
@@ -55,7 +55,7 @@ AcpiOsFree(void *Memory)
 }
 
 void *
-AcpiOsMapMemory(ACPI_PHYSICAL_ADDRESS PhysicalAddress, ACPI_NATIVE_UINT Length)
+AcpiOsMapMemory(ACPI_PHYSICAL_ADDRESS PhysicalAddress, ACPI_SIZE Length)
 {
     return (pmap_mapbios((vm_offset_t)PhysicalAddress, Length));
 }
@@ -80,17 +80,6 @@ AcpiOsValidateInterface (char *Interface
     return (AE_SUPPORT);
 }
 
-/*
- * There is no clean way to do this.  We make the charitable assumption
- * that callers will not pass garbage to us.
- */
-ACPI_STATUS
-AcpiOsValidateAddress (UINT8 SpaceId, ACPI_PHYSICAL_ADDRESS Address,
-    ACPI_SIZE Length)
-{
-    return (AE_OK);
-}
-
 BOOLEAN
 AcpiOsReadable (void *Pointer, ACPI_SIZE Length)
 {

Modified: head/sys/dev/acpica/Osd/OsdSchedule.c
==============================================================================
--- head/sys/dev/acpica/Osd/OsdSchedule.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/Osd/OsdSchedule.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -43,7 +43,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/taskqueue.h>
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+
 #include <dev/acpica/acpivar.h>
 
 #define _COMPONENT	ACPI_OS_SERVICES

Modified: head/sys/dev/acpica/Osd/OsdStream.c
==============================================================================
--- head/sys/dev/acpica/Osd/OsdStream.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/Osd/OsdStream.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
 
 void
 AcpiOsPrintf(const char *Format, ...)

Modified: head/sys/dev/acpica/Osd/OsdSynch.c
==============================================================================
--- head/sys/dev/acpica/Osd/OsdSynch.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/Osd/OsdSynch.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -32,7 +32,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
 
 #include "opt_acpi.h"
 #include <sys/kernel.h>
@@ -367,7 +368,7 @@ AcpiOsDeleteLock (ACPI_SPINLOCK Handle)
  * (and thus can't block) but since we have ithreads, we don't worry
  * about potentially blocking.
  */
-ACPI_NATIVE_UINT
+ACPI_CPU_FLAGS
 AcpiOsAcquireLock (ACPI_SPINLOCK Handle)
 {
     struct acpi_spinlock *h = (struct acpi_spinlock *)Handle;

Modified: head/sys/dev/acpica/Osd/OsdTable.c
==============================================================================
--- head/sys/dev/acpica/Osd/OsdTable.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/Osd/OsdTable.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -36,8 +36,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/linker.h>
 
-#include <contrib/dev/acpica/acpi.h>
-#include <contrib/dev/acpica/actables.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/actables.h>
 
 #undef _COMPONENT
 #define	_COMPONENT      ACPI_TABLES
@@ -67,17 +67,30 @@ ACPI_STATUS
 AcpiOsTableOverride(ACPI_TABLE_HEADER *ExistingTable,
     ACPI_TABLE_HEADER **NewTable)
 {
-    caddr_t acpi_dsdt, p;
+    char modname[] = "acpi_dsdt";
+    caddr_t acpi_table, p, s;
 
     if (ExistingTable == NULL || NewTable == NULL)
 	return (AE_BAD_PARAMETER);
 
+#ifdef notyet
+    for (int i = 0; i < ACPI_NAME_SIZE; i++)
+	modname[i + 5] = tolower(ExistingTable->Signature[i]);
+#else
     /* If we're not overriding the DSDT, just return. */
-    if ((acpi_dsdt = preload_search_by_type("acpi_dsdt")) == NULL ||
-	(p = preload_search_info(acpi_dsdt, MODINFO_ADDR)) == NULL) {
+    if (strncmp(ExistingTable->Signature, ACPI_SIG_DSDT, ACPI_NAME_SIZE) != 0) {
 	*NewTable = NULL;
-    } else
+	return (AE_OK);
+    }
+#endif
+
+    if ((acpi_table = preload_search_by_type(modname)) != NULL &&
+	(p = preload_search_info(acpi_table, MODINFO_ADDR)) != NULL &&
+	(s = preload_search_info(acpi_table, MODINFO_SIZE)) != NULL &&
+	*(size_t *)s != 0)
 	*NewTable = *(ACPI_TABLE_HEADER **)p;
+    else
+	*NewTable = NULL;
 
     return (AE_OK);
 }

Modified: head/sys/dev/acpica/acpi.c
==============================================================================
--- head/sys/dev/acpica/acpi.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/acpi.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -61,11 +61,12 @@ __FBSDID("$FreeBSD$");
 #include <isa/isavar.h>
 #include <isa/pnpvar.h>
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <contrib/dev/acpica/include/acnamesp.h>
+
 #include <dev/acpica/acpivar.h>
 #include <dev/acpica/acpiio.h>
-#include <contrib/dev/acpica/achware.h>
-#include <contrib/dev/acpica/acnamesp.h>
 
 #include "pci_if.h"
 #include <dev/pci/pcivar.h>
@@ -416,7 +417,6 @@ static int
 acpi_attach(device_t dev)
 {
     struct acpi_softc	*sc;
-    ACPI_TABLE_FACS	*facs;
     ACPI_STATUS		status;
     int			error, state;
     UINT32		flags;
@@ -593,14 +593,7 @@ acpi_attach(device_t dev)
     }
 
     /* Only enable S4BIOS by default if the FACS says it is available. */
-    status = AcpiGetTable(ACPI_SIG_FACS, 0, (ACPI_TABLE_HEADER **)&facs);
-    if (ACPI_FAILURE(status)) {
-	device_printf(dev, "couldn't get FACS: %s\n",
-		      AcpiFormatException(status));
-	error = ENXIO;
-	goto out;
-    }
-    if (facs->Flags & ACPI_FACS_S4_BIOS_PRESENT)
+    if (AcpiGbl_FACS->Flags & ACPI_FACS_S4_BIOS_PRESENT)
 	sc->acpi_s4bios = 1;
 
     /* Probe all supported sleep states. */
@@ -1848,8 +1841,7 @@ acpi_shutdown_final(void *arg, int howto
 	(AcpiGbl_FADT.Flags & ACPI_FADT_RESET_REGISTER) &&
 	sc->acpi_handle_reboot) {
 	/* Reboot using the reset register. */
-	status = AcpiHwLowLevelWrite(
-	    AcpiGbl_FADT.ResetRegister.BitWidth,
+	status = AcpiWrite(
 	    AcpiGbl_FADT.ResetValue, &AcpiGbl_FADT.ResetRegister);
 	if (ACPI_FAILURE(status))
 	    device_printf(sc->acpi_dev, "reset failed - %s\n",
@@ -3391,8 +3383,6 @@ static struct debugtag	dbg_layer[] = {
 };
 
 static struct debugtag dbg_level[] = {
-    {"ACPI_LV_ERROR",		ACPI_LV_ERROR},
-    {"ACPI_LV_WARN",		ACPI_LV_WARN},
     {"ACPI_LV_INIT",		ACPI_LV_INIT},
     {"ACPI_LV_DEBUG_OBJECT",	ACPI_LV_DEBUG_OBJECT},
     {"ACPI_LV_INFO",		ACPI_LV_INFO},

Modified: head/sys/dev/acpica/acpi_acad.c
==============================================================================
--- head/sys/dev/acpica/acpi_acad.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/acpi_acad.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -40,7 +40,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/conf.h>
 #include <sys/power.h>
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+
 #include <dev/acpica/acpivar.h>
 #include <dev/acpica/acpiio.h>
 #include <isa/isavar.h>

Modified: head/sys/dev/acpica/acpi_battery.c
==============================================================================
--- head/sys/dev/acpica/acpi_battery.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/acpi_battery.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -36,7 +36,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/ioccom.h>
 #include <sys/sysctl.h>
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+
 #include <dev/acpica/acpivar.h>
 #include <dev/acpica/acpiio.h>
 

Modified: head/sys/dev/acpica/acpi_button.c
==============================================================================
--- head/sys/dev/acpica/acpi_button.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/acpi_button.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -35,7 +35,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/bus.h>
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+
 #include <dev/acpica/acpivar.h>
 
 /* Hooks for the ACPI CA debugging infrastructure */

Modified: head/sys/dev/acpica/acpi_cmbat.c
==============================================================================
--- head/sys/dev/acpica/acpi_cmbat.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/acpi_cmbat.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -41,7 +41,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <sys/malloc.h>
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+
 #include <dev/acpica/acpivar.h>
 #include <dev/acpica/acpiio.h>
 

Modified: head/sys/dev/acpica/acpi_cpu.c
==============================================================================
--- head/sys/dev/acpica/acpi_cpu.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/acpi_cpu.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -46,7 +46,9 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <sys/rman.h>
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+
 #include <dev/acpica/acpivar.h>
 
 /*
@@ -897,9 +899,9 @@ acpi_cpu_idle()
      * time if USB is loaded.
      */
     if ((cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0) {
-	AcpiGetRegister(ACPI_BITREG_BUS_MASTER_STATUS, &bm_active);
+	AcpiReadBitRegister(ACPI_BITREG_BUS_MASTER_STATUS, &bm_active);
 	if (bm_active != 0) {
-	    AcpiSetRegister(ACPI_BITREG_BUS_MASTER_STATUS, 1);
+	    AcpiWriteBitRegister(ACPI_BITREG_BUS_MASTER_STATUS, 1);
 	    cx_next_idx = min(cx_next_idx, sc->cpu_non_c3);
 	}
     }
@@ -926,8 +928,8 @@ acpi_cpu_idle()
      */
     if (cx_next->type == ACPI_STATE_C3) {
 	if ((cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0) {
-	    AcpiSetRegister(ACPI_BITREG_ARB_DISABLE, 1);
-	    AcpiSetRegister(ACPI_BITREG_BUS_MASTER_RLD, 1);
+	    AcpiWriteBitRegister(ACPI_BITREG_ARB_DISABLE, 1);
+	    AcpiWriteBitRegister(ACPI_BITREG_BUS_MASTER_RLD, 1);
 	} else
 	    ACPI_FLUSH_CPU_CACHE();
     }
@@ -938,7 +940,7 @@ acpi_cpu_idle()
      * get the time very close to the CPU start/stop clock logic, this
      * is the only reliable time source.
      */
-    AcpiHwLowLevelRead(32, &start_time, &AcpiGbl_FADT.XPmTimerBlock);
+    AcpiRead(&start_time, &AcpiGbl_FADT.XPmTimerBlock);
     CPU_GET_REG(cx_next->p_lvlx, 1);
 
     /*
@@ -947,14 +949,14 @@ acpi_cpu_idle()
      * the processor has stopped.  Doing it again provides enough
      * margin that we are certain to have a correct value.
      */
-    AcpiHwLowLevelRead(32, &end_time, &AcpiGbl_FADT.XPmTimerBlock);
-    AcpiHwLowLevelRead(32, &end_time, &AcpiGbl_FADT.XPmTimerBlock);
+    AcpiRead(&end_time, &AcpiGbl_FADT.XPmTimerBlock);
+    AcpiRead(&end_time, &AcpiGbl_FADT.XPmTimerBlock);
 
     /* Enable bus master arbitration and disable bus master wakeup. */
     if (cx_next->type == ACPI_STATE_C3 &&
 	(cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0) {
-	AcpiSetRegister(ACPI_BITREG_ARB_DISABLE, 0);
-	AcpiSetRegister(ACPI_BITREG_BUS_MASTER_RLD, 0);
+	AcpiWriteBitRegister(ACPI_BITREG_ARB_DISABLE, 0);
+	AcpiWriteBitRegister(ACPI_BITREG_BUS_MASTER_RLD, 0);
     }
     ACPI_ENABLE_IRQS();
 
@@ -1069,11 +1071,11 @@ acpi_cpu_quirks(void)
 	    	val |= PIIX4_STOP_BREAK_MASK;
 		pci_write_config(acpi_dev, PIIX4_DEVACTB_REG, val, 4);
 	    }
-	    AcpiGetRegister(ACPI_BITREG_BUS_MASTER_RLD, &val);
+	    AcpiReadBitRegister(ACPI_BITREG_BUS_MASTER_RLD, &val);
 	    if (val) {
 		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
 		    "acpi_cpu: PIIX4: reset BRLD_EN_BM\n"));
-		AcpiSetRegister(ACPI_BITREG_BUS_MASTER_RLD, 0);
+		AcpiWriteBitRegister(ACPI_BITREG_BUS_MASTER_RLD, 0);
 	    }
 	    break;
 	default:

Modified: head/sys/dev/acpica/acpi_dock.c
==============================================================================
--- head/sys/dev/acpica/acpi_dock.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/acpi_dock.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -32,8 +32,9 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 
-#include <contrib/dev/acpica/acpi.h>
-#include <contrib/dev/acpica/acnamesp.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+
 #include <dev/acpica/acpivar.h>
 #include <dev/acpica/acpiio.h>
 

Modified: head/sys/dev/acpica/acpi_ec.c
==============================================================================
--- head/sys/dev/acpica/acpi_ec.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/acpi_ec.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -42,7 +42,9 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+
 #include <dev/acpica/acpivar.h>
 
 /* Hooks for the ACPI CA debugging infrastructure */

Modified: head/sys/dev/acpica/acpi_hpet.c
==============================================================================
--- head/sys/dev/acpica/acpi_hpet.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/acpi_hpet.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -36,7 +36,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/time.h>
 #include <sys/timetc.h>
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+
 #include <dev/acpica/acpivar.h>
 #include <dev/acpica/acpi_hpet.h>
 

Modified: head/sys/dev/acpica/acpi_if.m
==============================================================================
--- head/sys/dev/acpica/acpi_if.m	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/acpi_if.m	Fri Jun  5 18:44:36 2009	(r193530)
@@ -28,7 +28,8 @@
 
 #include <sys/bus.h>
 #include <sys/types.h>
-#include <contrib/dev/acpica/acpi.h>
+
+#include <contrib/dev/acpica/include/acpi.h>
 
 INTERFACE acpi;
 

Modified: head/sys/dev/acpica/acpi_isab.c
==============================================================================
--- head/sys/dev/acpica/acpi_isab.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/acpi_isab.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -39,7 +39,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/module.h>
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+
 #include <dev/acpica/acpivar.h>
 #include <isa/isavar.h>
 

Modified: head/sys/dev/acpica/acpi_lid.c
==============================================================================
--- head/sys/dev/acpica/acpi_lid.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/acpi_lid.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -37,7 +37,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/proc.h>
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+
 #include <dev/acpica/acpivar.h>
 
 /* Hooks for the ACPI CA debugging infrastructure */

Modified: head/sys/dev/acpica/acpi_package.c
==============================================================================
--- head/sys/dev/acpica/acpi_package.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/acpi_package.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -36,7 +36,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+
 #include <dev/acpica/acpivar.h>
 
 /*

Modified: head/sys/dev/acpica/acpi_pci.c
==============================================================================
--- head/sys/dev/acpica/acpi_pci.c	Fri Jun  5 18:43:13 2009	(r193529)
+++ head/sys/dev/acpica/acpi_pci.c	Fri Jun  5 18:44:36 2009	(r193530)
@@ -36,7 +36,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/module.h>
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+
 #include <dev/acpica/acpivar.h>
 
 #include <sys/pciio.h>

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906051844.n55IiahT034660>