svn commit: r231844 - in head: sys/conf sys/contrib/dev/acpica
sys/contrib/dev/acpica/compiler sys/contrib/dev/acpica/components
sys/contrib/dev/acpica/components/debugger
sys/contrib/dev/acpica/co...
Jung-uk Kim
jkim at FreeBSD.org
Thu Feb 16 22:59:30 UTC 2012
Author: jkim
Date: Thu Feb 16 22:59:29 2012
New Revision: 231844
URL: http://svn.freebsd.org/changeset/base/231844
Log:
Merge ACPICA 20120215.
Added:
head/sys/contrib/dev/acpica/components/
- copied from r231827, head/sys/contrib/dev/acpica/debugger/
- copied from r231827, head/sys/contrib/dev/acpica/disassembler/
- copied from r231827, head/sys/contrib/dev/acpica/dispatcher/
- copied from r231827, head/sys/contrib/dev/acpica/events/
- copied from r231827, head/sys/contrib/dev/acpica/executer/
- copied from r231827, head/sys/contrib/dev/acpica/hardware/
head/sys/contrib/dev/acpica/components/hardware/hwesleep.c
- copied, changed from r231801, vendor-sys/acpica/dist/source/components/hardware/hwesleep.c
head/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c
- copied, changed from r231801, vendor-sys/acpica/dist/source/components/hardware/hwxfsleep.c
- copied from r231827, head/sys/contrib/dev/acpica/namespace/
- copied from r231827, head/sys/contrib/dev/acpica/parser/
- copied from r231827, head/sys/contrib/dev/acpica/resources/
- copied from r231827, head/sys/contrib/dev/acpica/tables/
- copied from r231827, head/sys/contrib/dev/acpica/utilities/
Directory Properties:
head/sys/contrib/dev/acpica/components/debugger/ (props changed)
head/sys/contrib/dev/acpica/components/disassembler/ (props changed)
head/sys/contrib/dev/acpica/components/dispatcher/ (props changed)
head/sys/contrib/dev/acpica/components/events/ (props changed)
head/sys/contrib/dev/acpica/components/executer/ (props changed)
head/sys/contrib/dev/acpica/components/hardware/ (props changed)
head/sys/contrib/dev/acpica/components/namespace/ (props changed)
head/sys/contrib/dev/acpica/components/parser/ (props changed)
head/sys/contrib/dev/acpica/components/resources/ (props changed)
head/sys/contrib/dev/acpica/components/tables/ (props changed)
head/sys/contrib/dev/acpica/components/utilities/ (props changed)
Deleted:
head/sys/contrib/dev/acpica/debugger/
head/sys/contrib/dev/acpica/disassembler/
head/sys/contrib/dev/acpica/dispatcher/
head/sys/contrib/dev/acpica/events/
head/sys/contrib/dev/acpica/executer/
head/sys/contrib/dev/acpica/hardware/
head/sys/contrib/dev/acpica/namespace/
head/sys/contrib/dev/acpica/parser/
head/sys/contrib/dev/acpica/resources/
head/sys/contrib/dev/acpica/tables/
head/sys/contrib/dev/acpica/utilities/
Modified:
head/sys/conf/files
head/sys/contrib/dev/acpica/acpica_prep.sh
head/sys/contrib/dev/acpica/changes.txt (contents, props changed)
head/sys/contrib/dev/acpica/compiler/aslrestype2s.c
head/sys/contrib/dev/acpica/compiler/aslstubs.c
head/sys/contrib/dev/acpica/components/debugger/dbcmds.c
head/sys/contrib/dev/acpica/components/debugger/dbdisply.c
head/sys/contrib/dev/acpica/components/debugger/dbinput.c
head/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c
head/sys/contrib/dev/acpica/components/events/evevent.c
head/sys/contrib/dev/acpica/components/events/evglock.c
head/sys/contrib/dev/acpica/components/events/evgpe.c
head/sys/contrib/dev/acpica/components/events/evgpeblk.c
head/sys/contrib/dev/acpica/components/events/evgpeinit.c
head/sys/contrib/dev/acpica/components/events/evgpeutil.c
head/sys/contrib/dev/acpica/components/events/evmisc.c
head/sys/contrib/dev/acpica/components/events/evsci.c
head/sys/contrib/dev/acpica/components/events/evxface.c
head/sys/contrib/dev/acpica/components/events/evxfevnt.c
head/sys/contrib/dev/acpica/components/events/evxfgpe.c
head/sys/contrib/dev/acpica/components/executer/exfldio.c
head/sys/contrib/dev/acpica/components/hardware/hwacpi.c
head/sys/contrib/dev/acpica/components/hardware/hwgpe.c
head/sys/contrib/dev/acpica/components/hardware/hwregs.c
head/sys/contrib/dev/acpica/components/hardware/hwsleep.c
head/sys/contrib/dev/acpica/components/hardware/hwtimer.c
head/sys/contrib/dev/acpica/components/hardware/hwxface.c
head/sys/contrib/dev/acpica/components/tables/tbinstal.c
head/sys/contrib/dev/acpica/components/tables/tbutils.c
head/sys/contrib/dev/acpica/components/utilities/utdecode.c
head/sys/contrib/dev/acpica/components/utilities/utglobal.c
head/sys/contrib/dev/acpica/components/utilities/utinit.c
head/sys/contrib/dev/acpica/components/utilities/utxface.c
head/sys/contrib/dev/acpica/include/acconfig.h
head/sys/contrib/dev/acpica/include/acdebug.h
head/sys/contrib/dev/acpica/include/acevents.h
head/sys/contrib/dev/acpica/include/acexcep.h
head/sys/contrib/dev/acpica/include/acglobal.h
head/sys/contrib/dev/acpica/include/achware.h
head/sys/contrib/dev/acpica/include/acmacros.h
head/sys/contrib/dev/acpica/include/acpiosxf.h
head/sys/contrib/dev/acpica/include/acpixf.h
head/sys/contrib/dev/acpica/include/actables.h
head/sys/contrib/dev/acpica/include/actbl.h
head/sys/contrib/dev/acpica/include/actypes.h
head/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
head/sys/dev/acpica/Osd/OsdMemory.c
head/sys/dev/acpica/Osd/OsdTable.c
head/sys/dev/acpica/acpi.c
head/sys/modules/acpi/acpi/Makefile
head/usr.sbin/acpi/Makefile.inc
head/usr.sbin/acpi/acpidb/Makefile
head/usr.sbin/acpi/iasl/Makefile
Directory Properties:
head/sys/contrib/dev/acpica/common/ (props changed)
head/sys/contrib/dev/acpica/compiler/ (props changed)
head/sys/contrib/dev/acpica/include/ (props changed)
head/sys/contrib/dev/acpica/os_specific/ (props changed)
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Thu Feb 16 22:51:44 2012 (r231843)
+++ head/sys/conf/files Thu Feb 16 22:59:29 2012 (r231844)
@@ -153,155 +153,157 @@ 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/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/dbmethod.c optional acpi acpi_debug
-contrib/dev/acpica/debugger/dbnames.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/dmresrcl2.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/dsargs.c optional acpi
-contrib/dev/acpica/dispatcher/dscontrol.c optional acpi
-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/dswload2.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/evglock.c optional acpi
-contrib/dev/acpica/events/evgpe.c optional acpi
-contrib/dev/acpica/events/evgpeblk.c optional acpi
-contrib/dev/acpica/events/evgpeinit.c optional acpi
-contrib/dev/acpica/events/evgpeutil.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/evxfgpe.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/exdebug.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/hwpci.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/nsrepair.c optional acpi
-contrib/dev/acpica/namespace/nsrepair2.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/rsserial.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/utaddress.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/utdecode.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/utids.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/utosi.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/dev/acpica/utilities/utxferror.c optional acpi
-#contrib/dev/acpica/utilities/utxfmutex.c optional acpi
+contrib/dev/acpica/components/debugger/dbcmds.c optional acpi acpi_debug
+contrib/dev/acpica/components/debugger/dbdisply.c optional acpi acpi_debug
+contrib/dev/acpica/components/debugger/dbexec.c optional acpi acpi_debug
+contrib/dev/acpica/components/debugger/dbfileio.c optional acpi acpi_debug
+contrib/dev/acpica/components/debugger/dbhistry.c optional acpi acpi_debug
+contrib/dev/acpica/components/debugger/dbinput.c optional acpi acpi_debug
+contrib/dev/acpica/components/debugger/dbmethod.c optional acpi acpi_debug
+contrib/dev/acpica/components/debugger/dbnames.c optional acpi acpi_debug
+contrib/dev/acpica/components/debugger/dbstats.c optional acpi acpi_debug
+contrib/dev/acpica/components/debugger/dbutils.c optional acpi acpi_debug
+contrib/dev/acpica/components/debugger/dbxface.c optional acpi acpi_debug
+contrib/dev/acpica/components/disassembler/dmbuffer.c optional acpi acpi_debug
+contrib/dev/acpica/components/disassembler/dmnames.c optional acpi acpi_debug
+contrib/dev/acpica/components/disassembler/dmopcode.c optional acpi acpi_debug
+contrib/dev/acpica/components/disassembler/dmobject.c optional acpi acpi_debug
+contrib/dev/acpica/components/disassembler/dmresrc.c optional acpi acpi_debug
+contrib/dev/acpica/components/disassembler/dmresrcl.c optional acpi acpi_debug
+contrib/dev/acpica/components/disassembler/dmresrcl2.c optional acpi acpi_debug
+contrib/dev/acpica/components/disassembler/dmresrcs.c optional acpi acpi_debug
+contrib/dev/acpica/components/disassembler/dmutils.c optional acpi acpi_debug
+contrib/dev/acpica/components/disassembler/dmwalk.c optional acpi acpi_debug
+contrib/dev/acpica/components/dispatcher/dsargs.c optional acpi
+contrib/dev/acpica/components/dispatcher/dscontrol.c optional acpi
+contrib/dev/acpica/components/dispatcher/dsfield.c optional acpi
+contrib/dev/acpica/components/dispatcher/dsinit.c optional acpi
+contrib/dev/acpica/components/dispatcher/dsmethod.c optional acpi
+contrib/dev/acpica/components/dispatcher/dsmthdat.c optional acpi
+contrib/dev/acpica/components/dispatcher/dsobject.c optional acpi
+contrib/dev/acpica/components/dispatcher/dsopcode.c optional acpi
+contrib/dev/acpica/components/dispatcher/dsutils.c optional acpi
+contrib/dev/acpica/components/dispatcher/dswexec.c optional acpi
+contrib/dev/acpica/components/dispatcher/dswload.c optional acpi
+contrib/dev/acpica/components/dispatcher/dswload2.c optional acpi
+contrib/dev/acpica/components/dispatcher/dswscope.c optional acpi
+contrib/dev/acpica/components/dispatcher/dswstate.c optional acpi
+contrib/dev/acpica/components/events/evevent.c optional acpi
+contrib/dev/acpica/components/events/evglock.c optional acpi
+contrib/dev/acpica/components/events/evgpe.c optional acpi
+contrib/dev/acpica/components/events/evgpeblk.c optional acpi
+contrib/dev/acpica/components/events/evgpeinit.c optional acpi
+contrib/dev/acpica/components/events/evgpeutil.c optional acpi
+contrib/dev/acpica/components/events/evmisc.c optional acpi
+contrib/dev/acpica/components/events/evregion.c optional acpi
+contrib/dev/acpica/components/events/evrgnini.c optional acpi
+contrib/dev/acpica/components/events/evsci.c optional acpi
+contrib/dev/acpica/components/events/evxface.c optional acpi
+contrib/dev/acpica/components/events/evxfevnt.c optional acpi
+contrib/dev/acpica/components/events/evxfgpe.c optional acpi
+contrib/dev/acpica/components/events/evxfregn.c optional acpi
+contrib/dev/acpica/components/executer/exconfig.c optional acpi
+contrib/dev/acpica/components/executer/exconvrt.c optional acpi
+contrib/dev/acpica/components/executer/excreate.c optional acpi
+contrib/dev/acpica/components/executer/exdebug.c optional acpi
+contrib/dev/acpica/components/executer/exdump.c optional acpi
+contrib/dev/acpica/components/executer/exfield.c optional acpi
+contrib/dev/acpica/components/executer/exfldio.c optional acpi
+contrib/dev/acpica/components/executer/exmisc.c optional acpi
+contrib/dev/acpica/components/executer/exmutex.c optional acpi
+contrib/dev/acpica/components/executer/exnames.c optional acpi
+contrib/dev/acpica/components/executer/exoparg1.c optional acpi
+contrib/dev/acpica/components/executer/exoparg2.c optional acpi
+contrib/dev/acpica/components/executer/exoparg3.c optional acpi
+contrib/dev/acpica/components/executer/exoparg6.c optional acpi
+contrib/dev/acpica/components/executer/exprep.c optional acpi
+contrib/dev/acpica/components/executer/exregion.c optional acpi
+contrib/dev/acpica/components/executer/exresnte.c optional acpi
+contrib/dev/acpica/components/executer/exresolv.c optional acpi
+contrib/dev/acpica/components/executer/exresop.c optional acpi
+contrib/dev/acpica/components/executer/exstore.c optional acpi
+contrib/dev/acpica/components/executer/exstoren.c optional acpi
+contrib/dev/acpica/components/executer/exstorob.c optional acpi
+contrib/dev/acpica/components/executer/exsystem.c optional acpi
+contrib/dev/acpica/components/executer/exutils.c optional acpi
+contrib/dev/acpica/components/hardware/hwacpi.c optional acpi
+contrib/dev/acpica/components/hardware/hwesleep.c optional acpi
+contrib/dev/acpica/components/hardware/hwgpe.c optional acpi
+contrib/dev/acpica/components/hardware/hwpci.c optional acpi
+contrib/dev/acpica/components/hardware/hwregs.c optional acpi
+contrib/dev/acpica/components/hardware/hwsleep.c optional acpi
+contrib/dev/acpica/components/hardware/hwtimer.c optional acpi
+contrib/dev/acpica/components/hardware/hwvalid.c optional acpi
+contrib/dev/acpica/components/hardware/hwxface.c optional acpi
+contrib/dev/acpica/components/hardware/hwxfsleep.c optional acpi
+contrib/dev/acpica/components/namespace/nsaccess.c optional acpi
+contrib/dev/acpica/components/namespace/nsalloc.c optional acpi
+contrib/dev/acpica/components/namespace/nsdump.c optional acpi
+contrib/dev/acpica/components/namespace/nseval.c optional acpi
+contrib/dev/acpica/components/namespace/nsinit.c optional acpi
+contrib/dev/acpica/components/namespace/nsload.c optional acpi
+contrib/dev/acpica/components/namespace/nsnames.c optional acpi
+contrib/dev/acpica/components/namespace/nsobject.c optional acpi
+contrib/dev/acpica/components/namespace/nsparse.c optional acpi
+contrib/dev/acpica/components/namespace/nspredef.c optional acpi
+contrib/dev/acpica/components/namespace/nsrepair.c optional acpi
+contrib/dev/acpica/components/namespace/nsrepair2.c optional acpi
+contrib/dev/acpica/components/namespace/nssearch.c optional acpi
+contrib/dev/acpica/components/namespace/nsutils.c optional acpi
+contrib/dev/acpica/components/namespace/nswalk.c optional acpi
+contrib/dev/acpica/components/namespace/nsxfeval.c optional acpi
+contrib/dev/acpica/components/namespace/nsxfname.c optional acpi
+contrib/dev/acpica/components/namespace/nsxfobj.c optional acpi
+contrib/dev/acpica/components/parser/psargs.c optional acpi
+contrib/dev/acpica/components/parser/psloop.c optional acpi
+contrib/dev/acpica/components/parser/psopcode.c optional acpi
+contrib/dev/acpica/components/parser/psparse.c optional acpi
+contrib/dev/acpica/components/parser/psscope.c optional acpi
+contrib/dev/acpica/components/parser/pstree.c optional acpi
+contrib/dev/acpica/components/parser/psutils.c optional acpi
+contrib/dev/acpica/components/parser/pswalk.c optional acpi
+contrib/dev/acpica/components/parser/psxface.c optional acpi
+contrib/dev/acpica/components/resources/rsaddr.c optional acpi
+contrib/dev/acpica/components/resources/rscalc.c optional acpi
+contrib/dev/acpica/components/resources/rscreate.c optional acpi
+contrib/dev/acpica/components/resources/rsdump.c optional acpi
+contrib/dev/acpica/components/resources/rsinfo.c optional acpi
+contrib/dev/acpica/components/resources/rsio.c optional acpi
+contrib/dev/acpica/components/resources/rsirq.c optional acpi
+contrib/dev/acpica/components/resources/rslist.c optional acpi
+contrib/dev/acpica/components/resources/rsmemory.c optional acpi
+contrib/dev/acpica/components/resources/rsmisc.c optional acpi
+contrib/dev/acpica/components/resources/rsserial.c optional acpi
+contrib/dev/acpica/components/resources/rsutils.c optional acpi
+contrib/dev/acpica/components/resources/rsxface.c optional acpi
+contrib/dev/acpica/components/tables/tbfadt.c optional acpi
+contrib/dev/acpica/components/tables/tbfind.c optional acpi
+contrib/dev/acpica/components/tables/tbinstal.c optional acpi
+contrib/dev/acpica/components/tables/tbutils.c optional acpi
+contrib/dev/acpica/components/tables/tbxface.c optional acpi
+contrib/dev/acpica/components/tables/tbxfroot.c optional acpi
+contrib/dev/acpica/components/utilities/utaddress.c optional acpi
+contrib/dev/acpica/components/utilities/utalloc.c optional acpi
+contrib/dev/acpica/components/utilities/utcache.c optional acpi
+contrib/dev/acpica/components/utilities/utcopy.c optional acpi
+contrib/dev/acpica/components/utilities/utdebug.c optional acpi
+contrib/dev/acpica/components/utilities/utdecode.c optional acpi
+contrib/dev/acpica/components/utilities/utdelete.c optional acpi
+contrib/dev/acpica/components/utilities/uteval.c optional acpi
+contrib/dev/acpica/components/utilities/utglobal.c optional acpi
+contrib/dev/acpica/components/utilities/utids.c optional acpi
+contrib/dev/acpica/components/utilities/utinit.c optional acpi
+contrib/dev/acpica/components/utilities/utlock.c optional acpi
+contrib/dev/acpica/components/utilities/utmath.c optional acpi
+contrib/dev/acpica/components/utilities/utmisc.c optional acpi
+contrib/dev/acpica/components/utilities/utmutex.c optional acpi
+contrib/dev/acpica/components/utilities/utobject.c optional acpi
+contrib/dev/acpica/components/utilities/utosi.c optional acpi
+contrib/dev/acpica/components/utilities/utresrc.c optional acpi
+contrib/dev/acpica/components/utilities/utstate.c optional acpi
+contrib/dev/acpica/components/utilities/utxface.c optional acpi
+contrib/dev/acpica/components/utilities/utxferror.c optional acpi
+#contrib/dev/acpica/components/utilities/utxfmutex.c optional acpi
contrib/ipfilter/netinet/fil.c optional ipfilter inet \
compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -I$S/contrib/ipfilter"
contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet \
Modified: head/sys/contrib/dev/acpica/acpica_prep.sh
==============================================================================
--- head/sys/contrib/dev/acpica/acpica_prep.sh Thu Feb 16 22:51:44 2012 (r231843)
+++ head/sys/contrib/dev/acpica/acpica_prep.sh Thu Feb 16 22:59:29 2012 (r231844)
@@ -14,12 +14,10 @@ wrk=`realpath ./_acpi_ca_unpack`
dst=`realpath ./acpi_ca_destination`
# files that should keep their full directory path
-fulldirs="common compiler debugger disassembler dispatcher events \
- executer hardware include namespace os_specific parser \
- resources tables utilities"
+fulldirs="common compiler components include os_specific"
# files to remove
-stripdirs="generate tests tools"
+stripdirs="generate libraries tests tools"
stripfiles="Makefile README acintel.h aclinux.h acmsvc.h acnetbsd.h \
acos2.h accygwin.h acefi.h acwin.h acwin64.h osunixdir.c \
oswindir.c oswintbl.c oswinxf.c readme.txt utclib.c"
Modified: head/sys/contrib/dev/acpica/changes.txt
==============================================================================
--- head/sys/contrib/dev/acpica/changes.txt Thu Feb 16 22:51:44 2012 (r231843)
+++ head/sys/contrib/dev/acpica/changes.txt Thu Feb 16 22:59:29 2012 (r231844)
@@ -1,4 +1,96 @@
----------------------------------------
+15 February 2012. Summary of changes for version 20120215:
+
+This release is available at www.acpica.org/downloads.
+The ACPI 5.0 specification is available at www.acpi.info.
+
+1) ACPICA Core Subsystem:
+
+There have been some major changes to the sleep/wake support code, as
+described below (a - e).
+
+a) The AcpiLeaveSleepState has been split into two interfaces, similar to
+AcpiEnterSleepStatePrep and AcpiEnterSleepState. The new interface is
+AcpiLeaveSleepStatePrep. This allows the host to perform actions between the
+time the _BFS method is called and the _WAK method is called. NOTE: all hosts
+must update their wake/resume code or else sleep/wake will not work properly.
+Rafael Wysocki.
+
+b) In AcpiLeaveSleepState, now enable all runtime GPEs before calling the _WAK
+method. Some machines require that the GPEs are enabled before the _WAK method
+is executed. Thomas Renninger.
+
+c) In AcpiLeaveSleepState, now always clear the WAK_STS (wake status) bit.
+Some BIOS code assumes that WAK_STS will be cleared on resume and use it to
+determine whether the system is rebooting or resuming. Matthew Garrett.
+
+d) Move the invocations of _GTS (Going To Sleep) and _BFS (Back From Sleep) to
+match the ACPI specification requirement. Rafael Wysocki.
+
+e) Implemented full support for the ACPI 5.0 SleepStatus and SleepControl
+registers within the V5 FADT. This support adds two new files:
+hardware/hwesleep.c implements the support for the new registers. Moved all
+sleep/wake external interfaces to hardware/hwxfsleep.c.
+
+
+Added a new OSL interface for ACPI table overrides,
+AcpiOsPhysicalTableOverride. This interface allows the host to override a
+table via a physical address, instead of the logical address required by
+AcpiOsTableOverride. This simplifies the host implementation. Initial
+implementation by Thomas Renninger. The ACPICA implementation creates a single
+shared function for table overrides that attempts both a logical and a
+physical override.
+
+Expanded the OSL memory read/write interfaces to 64-bit data
+(AcpiOsReadMemory, AcpiOsWriteMemory.) This enables full 64-bit memory
+transfer support for GAS register structures passed to AcpiRead and AcpiWrite.
+
+Implemented the ACPI_REDUCED_HARDWARE option to allow the creation of a custom
+build of ACPICA that supports only the ACPI 5.0 reduced hardware (SoC) model.
+See the ACPICA reference for details. ACPICA BZ 942. This option removes about
+10% of the code and 5% of the static data, and the following hardware ACPI
+features become unavailable:
+ PM Event and Control registers
+ SCI interrupt (and handler)
+ Fixed Events
+ General Purpose Events (GPEs)
+ Global Lock
+ ACPI PM timer
+ FACS table (Waking vectors and Global Lock)
+
+Updated the unix tarball directory structure to match the ACPICA git source
+tree. This ensures that the generic unix makefiles work properly (in
+generate/unix). Also updated the Linux makefiles to match. ACPICA BZ 867.
+
+Updated the return value of the _REV predefined method to integer value 5 to
+reflect ACPI 5.0 support.
+
+Moved the external ACPI PM timer interface prototypes to the public acpixf.h
+file where they belong.
+
+Example Code and Data Size: These are the sizes for the OS-independent
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The debug
+version of the code includes the debug output trace mechanism and has a much
+larger code and data size.
+
+ Previous Release:
+ Non-Debug Version: 92.8K Code, 24.9K Data, 117.7K Total
+ Debug Version: 171.7K Code, 72.9K Data, 244.5K Total
+ Current Release:
+ Non-Debug Version: 93.0K Code, 25.0K Data, 118.0K Total
+ Debug Version: 172.5K Code, 73.2K Data, 245.7K Total
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+Disassembler: Fixed a problem with the new ACPI 5.0 serial resource
+descriptors (I2C, SPI, UART) where the resource produce/consumer bit was
+incorrectly displayed.
+
+AcpiHelp: Add display of ACPI/PNP device IDs that are defined in the ACPI
+specification.
+
+----------------------------------------
11 January 2012. Summary of changes for version 20120111:
This release is available at www.acpica.org/downloads.
Modified: head/sys/contrib/dev/acpica/compiler/aslrestype2s.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslrestype2s.c Thu Feb 16 22:51:44 2012 (r231843)
+++ head/sys/contrib/dev/acpica/compiler/aslrestype2s.c Thu Feb 16 22:59:29 2012 (r231844)
@@ -192,7 +192,7 @@ RsGetVendorData (
UINT16 ActualLength = 0;
- /* VendorData field is always optional */
+ /* Vendor Data field is always optional */
if (InitializerOp->Asl.ParseOpcode == PARSEOP_DEFAULT_ARG)
{
@@ -374,7 +374,7 @@ RsDoGpioIntDescriptor (
CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.PinConfig));
break;
- case 4: /* DebounceTimeout [WORD] (_DBT) */
+ case 4: /* Debounce Timeout [WORD] (_DBT) */
Descriptor->Gpio.DebounceTimeout = (UINT16) InitializerOp->Asl.Value.Integer;
RsCreateWordField (InitializerOp, ACPI_RESTAG_DEBOUNCETIME,
@@ -405,7 +405,7 @@ RsDoGpioIntDescriptor (
RsSetFlagBits16 (&Descriptor->Gpio.Flags, InitializerOp, 0, 1);
break;
- case 8: /* ResourceTag (Descriptor Name) */
+ case 8: /* Resource Tag (Descriptor Name) */
UtAttachNamepathToOwner (Op, InitializerOp);
break;
@@ -566,7 +566,7 @@ RsDoGpioIoDescriptor (
CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.PinConfig));
break;
- case 2: /* DebounceTimeout [WORD] (_DBT) */
+ case 2: /* Debounce Timeout [WORD] (_DBT) */
Descriptor->Gpio.DebounceTimeout = (UINT16) InitializerOp->Asl.Value.Integer;
RsCreateWordField (InitializerOp, ACPI_RESTAG_DEBOUNCETIME,
@@ -611,7 +611,7 @@ RsDoGpioIoDescriptor (
RsSetFlagBits16 (&Descriptor->Gpio.Flags, InitializerOp, 0, 1);
break;
- case 8: /* ResourceTag (Descriptor Name) */
+ case 8: /* Resource Tag (Descriptor Name) */
UtAttachNamepathToOwner (Op, InitializerOp);
break;
@@ -762,14 +762,14 @@ RsDoI2cSerialBusDescriptor (
CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.Flags), 0);
break;
- case 2: /* ConnectionSpeed [DWORD] (_SPE) */
+ case 2: /* Connection Speed [DWORD] (_SPE) */
Descriptor->I2cSerialBus.ConnectionSpeed = (UINT32) InitializerOp->Asl.Value.Integer;
RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.ConnectionSpeed));
break;
- case 3: /* Addresssing Mode [Flag] (_MOD) */
+ case 3: /* Addressing Mode [Flag] (_MOD) */
RsSetFlagBits16 (&Descriptor->I2cSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
@@ -800,7 +800,7 @@ RsDoI2cSerialBusDescriptor (
RsSetFlagBits (&Descriptor->I2cSerialBus.Flags, InitializerOp, 1, 1);
break;
- case 7: /* ResourceTag (Descriptor Name) */
+ case 7: /* Resource Tag (Descriptor Name) */
UtAttachNamepathToOwner (Op, InitializerOp);
break;
@@ -929,7 +929,7 @@ RsDoSpiSerialBusDescriptor (
CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.Flags), 0);
break;
- case 5: /* ConnectionSpeed [DWORD] (_SPE) */
+ case 5: /* Connection Speed [DWORD] (_SPE) */
Descriptor->SpiSerialBus.ConnectionSpeed = (UINT32) InitializerOp->Asl.Value.Integer;
RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
@@ -974,7 +974,7 @@ RsDoSpiSerialBusDescriptor (
RsSetFlagBits (&Descriptor->SpiSerialBus.Flags, InitializerOp, 1, 1);
break;
- case 11: /* ResourceTag (Descriptor Name) */
+ case 11: /* Resource Tag (Descriptor Name) */
UtAttachNamepathToOwner (Op, InitializerOp);
break;
@@ -1068,7 +1068,7 @@ RsDoUartSerialBusDescriptor (
{
switch (i)
{
- case 0: /* ConnectionSpeed (Baud Rate) [DWORD] (_SPE) */
+ case 0: /* Connection Speed (Baud Rate) [DWORD] (_SPE) */
Descriptor->UartSerialBus.DefaultBaudRate = (UINT32) InitializerOp->Asl.Value.Integer;
RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
@@ -1165,7 +1165,7 @@ RsDoUartSerialBusDescriptor (
CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.Flags), 0);
break;
- case 12: /* ResourceTag (Descriptor Name) */
+ case 12: /* Resource Tag (Descriptor Name) */
UtAttachNamepathToOwner (Op, InitializerOp);
break;
Modified: head/sys/contrib/dev/acpica/compiler/aslstubs.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslstubs.c Thu Feb 16 22:51:44 2012 (r231843)
+++ head/sys/contrib/dev/acpica/compiler/aslstubs.c Thu Feb 16 22:59:29 2012 (r231844)
@@ -128,13 +128,6 @@ AcpiDsStoreObjectToLocal (
}
ACPI_STATUS
-AcpiEvDeleteGpeBlock (
- ACPI_GPE_BLOCK_INFO *GpeBlock)
-{
- return (AE_OK);
-}
-
-ACPI_STATUS
AcpiEvQueueNotifyRequest (
ACPI_NAMESPACE_NODE *Node,
UINT32 NotifyValue)
@@ -149,6 +142,14 @@ AcpiEvIsNotifyObject (
return (FALSE);
}
+#if (!ACPI_REDUCED_HARDWARE)
+ACPI_STATUS
+AcpiEvDeleteGpeBlock (
+ ACPI_GPE_BLOCK_INFO *GpeBlock)
+{
+ return (AE_OK);
+}
+
ACPI_STATUS
AcpiEvAcquireGlobalLock (
UINT16 Timeout)
@@ -162,6 +163,7 @@ AcpiEvReleaseGlobalLock (
{
return (AE_OK);
}
+#endif /* !ACPI_REDUCED_HARDWARE */
ACPI_STATUS
AcpiEvInitializeRegion (
Modified: head/sys/contrib/dev/acpica/components/debugger/dbcmds.c
==============================================================================
--- head/sys/contrib/dev/acpica/debugger/dbcmds.c Thu Feb 16 15:36:05 2012 (r231827)
+++ head/sys/contrib/dev/acpica/components/debugger/dbcmds.c Thu Feb 16 22:59:29 2012 (r231844)
@@ -161,28 +161,49 @@ AcpiDbSleep (
UINT8 SleepState;
+ ACPI_FUNCTION_TRACE (AcpiDbSleep);
+
+
SleepState = (UINT8) ACPI_STRTOUL (ObjectArg, NULL, 0);
AcpiOsPrintf ("**** Prepare to sleep ****\n");
Status = AcpiEnterSleepStatePrep (SleepState);
if (ACPI_FAILURE (Status))
{
- return (Status);
+ goto ErrorExit;
}
AcpiOsPrintf ("**** Going to sleep ****\n");
Status = AcpiEnterSleepState (SleepState);
if (ACPI_FAILURE (Status))
{
- return (Status);
+ goto ErrorExit;
+ }
+
+ AcpiOsPrintf ("**** Prepare to return from sleep ****\n");
+ Status = AcpiLeaveSleepStatePrep (SleepState);
+ if (ACPI_FAILURE (Status))
+ {
+ goto ErrorExit;
}
- AcpiOsPrintf ("**** returning from sleep ****\n");
+ AcpiOsPrintf ("**** Returning from sleep ****\n");
Status = AcpiLeaveSleepState (SleepState);
+ if (ACPI_FAILURE (Status))
+ {
+ goto ErrorExit;
+ }
+
+ return (Status);
+
+ErrorExit:
+
+ ACPI_EXCEPTION ((AE_INFO, Status, "During sleep test"));
return (Status);
}
+
/*******************************************************************************
*
* FUNCTION: AcpiDbDisplayLocks
@@ -1019,6 +1040,7 @@ AcpiDbDisplayResources (
}
+#if (!ACPI_REDUCED_HARDWARE)
/*******************************************************************************
*
* FUNCTION: AcpiDbGenerateGpe
@@ -1057,5 +1079,6 @@ AcpiDbGenerateGpe (
(void) AcpiEvGpeDispatch (NULL, GpeEventInfo, GpeNumber);
}
+#endif /* !ACPI_REDUCED_HARDWARE */
#endif /* ACPI_DEBUGGER */
Modified: head/sys/contrib/dev/acpica/components/debugger/dbdisply.c
==============================================================================
--- head/sys/contrib/dev/acpica/debugger/dbdisply.c Thu Feb 16 15:36:05 2012 (r231827)
+++ head/sys/contrib/dev/acpica/components/debugger/dbdisply.c Thu Feb 16 22:59:29 2012 (r231844)
@@ -770,6 +770,7 @@ AcpiDbDisplayArgumentObject (
}
+#if (!ACPI_REDUCED_HARDWARE)
/*******************************************************************************
*
* FUNCTION: AcpiDbDisplayGpes
@@ -932,6 +933,7 @@ AcpiDbDisplayGpes (
GpeXruptInfo = GpeXruptInfo->Next;
}
}
+#endif /* !ACPI_REDUCED_HARDWARE */
/*******************************************************************************
@@ -1011,6 +1013,8 @@ AcpiDbDisplayHandlers (
}
}
+#if (!ACPI_REDUCED_HARDWARE)
+
/* Fixed event handlers */
AcpiOsPrintf ("\nFixed Event Handlers:\n");
@@ -1029,6 +1033,8 @@ AcpiDbDisplayHandlers (
}
}
+#endif /* !ACPI_REDUCED_HARDWARE */
+
/* Miscellaneous global handlers */
AcpiOsPrintf ("\nMiscellaneous Global Handlers:\n");
Modified: head/sys/contrib/dev/acpica/components/debugger/dbinput.c
==============================================================================
--- head/sys/contrib/dev/acpica/debugger/dbinput.c Thu Feb 16 15:36:05 2012 (r231827)
+++ head/sys/contrib/dev/acpica/components/debugger/dbinput.c Thu Feb 16 22:59:29 2012 (r231844)
@@ -662,12 +662,15 @@ AcpiDbCommandDispatch (
break;
case CMD_ENABLEACPI:
+#if (!ACPI_REDUCED_HARDWARE)
+
Status = AcpiEnable();
if (ACPI_FAILURE(Status))
{
AcpiOsPrintf("AcpiEnable failed (Status=%X)\n", Status);
return (Status);
}
+#endif /* !ACPI_REDUCED_HARDWARE */
break;
case CMD_EVENT:
Modified: head/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c
==============================================================================
--- head/sys/contrib/dev/acpica/disassembler/dmresrcl2.c Thu Feb 16 15:36:05 2012 (r231827)
+++ head/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c Thu Feb 16 22:59:29 2012 (r231844)
@@ -503,7 +503,7 @@ AcpiDmI2cSerialBusDescriptor (
AcpiOsPrintf ("0x%2.2X, ", Resource->I2cSerialBus.ResSourceIndex);
AcpiOsPrintf ("%s, ",
- AcpiGbl_ConsumeDecode [(Resource->I2cSerialBus.Flags & 1)]);
+ AcpiGbl_ConsumeDecode [(Resource->I2cSerialBus.Flags >> 1) & 1]);
/* Insert a descriptor name */
@@ -578,7 +578,7 @@ AcpiDmSpiSerialBusDescriptor (
AcpiOsPrintf ("0x%2.2X, ", Resource->SpiSerialBus.ResSourceIndex);
AcpiOsPrintf ("%s, ",
- AcpiGbl_ConsumeDecode [(Resource->SpiSerialBus.Flags & 1)]);
+ AcpiGbl_ConsumeDecode [(Resource->SpiSerialBus.Flags >> 1) & 1]);
/* Insert a descriptor name */
@@ -656,7 +656,7 @@ AcpiDmUartSerialBusDescriptor (
AcpiOsPrintf ("0x%2.2X, ", Resource->UartSerialBus.ResSourceIndex);
AcpiOsPrintf ("%s, ",
- AcpiGbl_ConsumeDecode [(Resource->UartSerialBus.Flags & 1)]);
+ AcpiGbl_ConsumeDecode [(Resource->UartSerialBus.Flags >> 1) & 1]);
/* Insert a descriptor name */
Modified: head/sys/contrib/dev/acpica/components/events/evevent.c
==============================================================================
--- head/sys/contrib/dev/acpica/events/evevent.c Thu Feb 16 15:36:05 2012 (r231827)
+++ head/sys/contrib/dev/acpica/components/events/evevent.c Thu Feb 16 22:59:29 2012 (r231844)
@@ -48,6 +48,8 @@
#define _COMPONENT ACPI_EVENTS
ACPI_MODULE_NAME ("evevent")
+#if (!ACPI_REDUCED_HARDWARE) /* Entire module */
+
/* Local prototypes */
static ACPI_STATUS
@@ -329,4 +331,6 @@ AcpiEvFixedEventDispatch (
AcpiGbl_FixedEventHandlers[Event].Context));
}
+#endif /* !ACPI_REDUCED_HARDWARE */
+
Modified: head/sys/contrib/dev/acpica/components/events/evglock.c
==============================================================================
--- head/sys/contrib/dev/acpica/events/evglock.c Thu Feb 16 15:36:05 2012 (r231827)
+++ head/sys/contrib/dev/acpica/components/events/evglock.c Thu Feb 16 22:59:29 2012 (r231844)
@@ -49,6 +49,7 @@
#define _COMPONENT ACPI_EVENTS
ACPI_MODULE_NAME ("evglock")
+#if (!ACPI_REDUCED_HARDWARE) /* Entire module */
/* Local prototypes */
@@ -372,3 +373,5 @@ AcpiEvReleaseGlobalLock (
AcpiOsReleaseMutex (AcpiGbl_GlobalLockMutex->Mutex.OsMutex);
return_ACPI_STATUS (Status);
}
+
+#endif /* !ACPI_REDUCED_HARDWARE */
Modified: head/sys/contrib/dev/acpica/components/events/evgpe.c
==============================================================================
--- head/sys/contrib/dev/acpica/events/evgpe.c Thu Feb 16 15:36:05 2012 (r231827)
+++ head/sys/contrib/dev/acpica/components/events/evgpe.c Thu Feb 16 22:59:29 2012 (r231844)
@@ -49,6 +49,8 @@
#define _COMPONENT ACPI_EVENTS
ACPI_MODULE_NAME ("evgpe")
+#if (!ACPI_REDUCED_HARDWARE) /* Entire module */
+
/* Local prototypes */
static void ACPI_SYSTEM_XFACE
@@ -826,3 +828,4 @@ AcpiEvGpeDispatch (
return_UINT32 (ACPI_INTERRUPT_HANDLED);
}
+#endif /* !ACPI_REDUCED_HARDWARE */
Modified: head/sys/contrib/dev/acpica/components/events/evgpeblk.c
==============================================================================
--- head/sys/contrib/dev/acpica/events/evgpeblk.c Thu Feb 16 15:36:05 2012 (r231827)
+++ head/sys/contrib/dev/acpica/components/events/evgpeblk.c Thu Feb 16 22:59:29 2012 (r231844)
@@ -49,6 +49,8 @@
#define _COMPONENT ACPI_EVENTS
ACPI_MODULE_NAME ("evgpeblk")
+#if (!ACPI_REDUCED_HARDWARE) /* Entire module */
+
/* Local prototypes */
static ACPI_STATUS
@@ -545,3 +547,4 @@ AcpiEvInitializeGpeBlock (
return_ACPI_STATUS (AE_OK);
}
+#endif /* !ACPI_REDUCED_HARDWARE */
Modified: head/sys/contrib/dev/acpica/components/events/evgpeinit.c
==============================================================================
--- head/sys/contrib/dev/acpica/events/evgpeinit.c Thu Feb 16 15:36:05 2012 (r231827)
+++ head/sys/contrib/dev/acpica/components/events/evgpeinit.c Thu Feb 16 22:59:29 2012 (r231844)
@@ -50,6 +50,7 @@
#define _COMPONENT ACPI_EVENTS
ACPI_MODULE_NAME ("evgpeinit")
+#if (!ACPI_REDUCED_HARDWARE) /* Entire module */
/*
* Note: History of _PRW support in ACPICA
@@ -457,3 +458,5 @@ AcpiEvMatchGpeMethod (
Name, GpeNumber));
return_ACPI_STATUS (AE_OK);
}
+
+#endif /* !ACPI_REDUCED_HARDWARE */
Modified: head/sys/contrib/dev/acpica/components/events/evgpeutil.c
==============================================================================
--- head/sys/contrib/dev/acpica/events/evgpeutil.c Thu Feb 16 15:36:05 2012 (r231827)
+++ head/sys/contrib/dev/acpica/components/events/evgpeutil.c Thu Feb 16 22:59:29 2012 (r231844)
@@ -41,7 +41,6 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
-
#include <contrib/dev/acpica/include/acpi.h>
#include <contrib/dev/acpica/include/accommon.h>
#include <contrib/dev/acpica/include/acevents.h>
@@ -50,6 +49,7 @@
ACPI_MODULE_NAME ("evgpeutil")
+#if (!ACPI_REDUCED_HARDWARE) /* Entire module */
/*******************************************************************************
*
* FUNCTION: AcpiEvWalkGpeList
@@ -422,3 +422,4 @@ AcpiEvDeleteGpeHandlers (
return_ACPI_STATUS (AE_OK);
}
+#endif /* !ACPI_REDUCED_HARDWARE */
Modified: head/sys/contrib/dev/acpica/components/events/evmisc.c
==============================================================================
--- head/sys/contrib/dev/acpica/events/evmisc.c Thu Feb 16 15:36:05 2012 (r231827)
+++ head/sys/contrib/dev/acpica/components/events/evmisc.c Thu Feb 16 22:59:29 2012 (r231844)
@@ -120,27 +120,29 @@ AcpiEvQueueNotifyRequest (
/*
- * For value 3 (Ejection Request), some device method may need to be run.
- * For value 2 (Device Wake) if _PRW exists, the _PS0 method may need
- * to be run.
+ * For value 0x03 (Ejection Request), may need to run a device method.
+ * For value 0x02 (Device Wake), if _PRW exists, may need to run
+ * the _PS0 method.
* For value 0x80 (Status Change) on the power button or sleep button,
- * initiate soft-off or sleep operation?
+ * initiate soft-off or sleep operation.
+ *
+ * For all cases, simply dispatch the notify to the handler.
*/
ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
- "Dispatching Notify on [%4.4s] Node %p Value 0x%2.2X (%s)\n",
- AcpiUtGetNodeName (Node), Node, NotifyValue,
- AcpiUtGetNotifyName (NotifyValue)));
+ "Dispatching Notify on [%4.4s] (%s) Value 0x%2.2X (%s) Node %p\n",
+ AcpiUtGetNodeName (Node), AcpiUtGetTypeName (Node->Type),
+ NotifyValue, AcpiUtGetNotifyName (NotifyValue), Node));
/* Get the notify object attached to the NS Node */
ObjDesc = AcpiNsGetAttachedObject (Node);
if (ObjDesc)
{
- /* We have the notify object, Get the right handler */
+ /* We have the notify object, Get the correct handler */
switch (Node->Type)
{
- /* Notify allowed only on these types */
+ /* Notify is allowed only on these types */
case ACPI_TYPE_DEVICE:
case ACPI_TYPE_THERMAL:
@@ -165,7 +167,7 @@ AcpiEvQueueNotifyRequest (
}
/*
- * If there is any handler to run, schedule the dispatcher.
+ * If there is a handler to run, schedule the dispatcher.
* Check for:
* 1) Global system notify handler
* 2) Global device notify handler
@@ -291,6 +293,7 @@ AcpiEvNotifyDispatch (
}
+#if (!ACPI_REDUCED_HARDWARE)
/******************************************************************************
*
* FUNCTION: AcpiEvTerminate
@@ -370,3 +373,5 @@ AcpiEvTerminate (
}
return_VOID;
}
+
+#endif /* !ACPI_REDUCED_HARDWARE */
Modified: head/sys/contrib/dev/acpica/components/events/evsci.c
==============================================================================
--- head/sys/contrib/dev/acpica/events/evsci.c Thu Feb 16 15:36:05 2012 (r231827)
+++ head/sys/contrib/dev/acpica/components/events/evsci.c Thu Feb 16 22:59:29 2012 (r231844)
@@ -50,6 +50,8 @@
#define _COMPONENT ACPI_EVENTS
ACPI_MODULE_NAME ("evsci")
+#if (!ACPI_REDUCED_HARDWARE) /* Entire module */
+
/* Local prototypes */
static UINT32 ACPI_SYSTEM_XFACE
@@ -204,4 +206,4 @@ AcpiEvRemoveSciHandler (
return_ACPI_STATUS (Status);
}
-
+#endif /* !ACPI_REDUCED_HARDWARE */
Modified: head/sys/contrib/dev/acpica/components/events/evxface.c
==============================================================================
--- head/sys/contrib/dev/acpica/events/evxface.c Thu Feb 16 15:36:05 2012 (r231827)
+++ head/sys/contrib/dev/acpica/components/events/evxface.c Thu Feb 16 22:59:29 2012 (r231844)
@@ -56,257 +56,6 @@
/*******************************************************************************
*
- * FUNCTION: AcpiInstallExceptionHandler
- *
- * PARAMETERS: Handler - Pointer to the handler function for the
- * event
- *
- * RETURN: Status
- *
- * DESCRIPTION: Saves the pointer to the handler function
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiInstallExceptionHandler (
- ACPI_EXCEPTION_HANDLER Handler)
-{
- ACPI_STATUS Status;
-
-
- ACPI_FUNCTION_TRACE (AcpiInstallExceptionHandler);
-
-
- Status = AcpiUtAcquireMutex (ACPI_MTX_EVENTS);
- if (ACPI_FAILURE (Status))
- {
- return_ACPI_STATUS (Status);
- }
-
- /* Don't allow two handlers. */
-
- if (AcpiGbl_ExceptionHandler)
- {
- Status = AE_ALREADY_EXISTS;
- goto Cleanup;
- }
-
- /* Install the handler */
-
- AcpiGbl_ExceptionHandler = Handler;
-
-Cleanup:
- (void) AcpiUtReleaseMutex (ACPI_MTX_EVENTS);
- return_ACPI_STATUS (Status);
-}
-
-ACPI_EXPORT_SYMBOL (AcpiInstallExceptionHandler)
-
-
-/*******************************************************************************
- *
- * FUNCTION: AcpiInstallGlobalEventHandler
- *
- * PARAMETERS: Handler - Pointer to the global event handler function
- * Context - Value passed to the handler on each event
- *
- * RETURN: Status
- *
- * DESCRIPTION: Saves the pointer to the handler function. The global handler
- * is invoked upon each incoming GPE and Fixed Event. It is
- * invoked at interrupt level at the time of the event dispatch.
- * Can be used to update event counters, etc.
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiInstallGlobalEventHandler (
- ACPI_GBL_EVENT_HANDLER Handler,
- void *Context)
-{
- ACPI_STATUS Status;
-
-
- ACPI_FUNCTION_TRACE (AcpiInstallGlobalEventHandler);
-
-
- /* Parameter validation */
-
- if (!Handler)
- {
- return_ACPI_STATUS (AE_BAD_PARAMETER);
- }
-
- Status = AcpiUtAcquireMutex (ACPI_MTX_EVENTS);
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-head
mailing list