Merge ACPICA 20130117.

2 files changed, 31 insertions, 28 deletions

diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile
index 548a800..9eccb4d 100644
--- a/usr.sbin/acpi/acpidb/Makefile
+++ b/usr.sbin/acpi/acpidb/Makefile
@@ -4,9 +4,9 @@ PROG=	acpidb
 SRCS=	acpidb.c
 
 # components/debugger
-SRCS+=	dbcmds.c dbdisply.c dbexec.c dbfileio.c dbhistry.c	\
-	dbinput.c dbmethod.c dbnames.c dbstats.c dbutils.c	\
-	dbxface.c
+SRCS+=	dbcmds.c dbconvert.c dbdisply.c dbexec.c dbfileio.c	\
+	dbhistry.c dbinput.c dbmethod.c dbnames.c dbstats.c	\
+	dbutils.c dbxface.c
 
 # components/disassembler
 SRCS+=	dmbuffer.c dmdeferred.c dmnames.c dmobject.c dmopcode.c	\
@@ -20,8 +20,8 @@ SRCS+=	dsargs.c dscontrol.c dsfield.c dsinit.c dsmethod.c	\
 
 # components/events
 SRCS+=	evevent.c evglock.c evgpe.c evgpeblk.c evgpeinit.c	\
-	evgpeutil.c evmisc.c evregion.c evrgnini.c evsci.c	\
-	evxface.c evxfevnt.c evxfregn.c
+	evgpeutil.c evhandler.c evmisc.c evregion.c evrgnini.c	\
+	evsci.c evxface.c evxfevnt.c evxfregn.c
 
 # components/executer
 SRCS+=	exconfig.c exconvrt.c excreate.c exdebug.c exdump.c	\
@@ -37,19 +37,20 @@ SRCS+=	hwacpi.c hwesleep.c hwgpe.c hwpci.c hwregs.c hwsleep.c	\
 # components/namespace
 SRCS+=	nsaccess.c nsalloc.c nsdump.c nseval.c nsinit.c		\
 	nsload.c nsnames.c nsobject.c nsparse.c nspredef.c	\
-	nsrepair.c nsrepair2.c nssearch.c nsutils.c nswalk.c	\
-	nsxfeval.c nsxfname.c nsxfobj.c
+	nsprepkg.c nsrepair.c nsrepair2.c nssearch.c nsutils.c	\
+	nswalk.c nsxfeval.c nsxfname.c nsxfobj.c
 
 # components/parser
-SRCS+=	psargs.c psloop.c psopcode.c psparse.c psscope.c	\
-	pstree.c psutils.c pswalk.c psxface.c
+SRCS+=	psargs.c psloop.c psobject.c psopcode.c psopinfo.c	\
+	psparse.c psscope.c pstree.c psutils.c pswalk.c		\
+	psxface.c
 
 # components/os_specific/service_layers
 SRCS+=	osunixxf.c
 
 # components/resources
-SRCS+=	rsaddr.c rscalc.c rscreate.c rsdump.c rsinfo.c		\
-	rsio.c rsirq.c rslist.c rsmemory.c rsmisc.c		\
+SRCS+=	rsaddr.c rscalc.c rscreate.c rsdump.c rsdumpinfo.c	\
+	rsinfo.c rsio.c rsirq.c rslist.c rsmemory.c rsmisc.c	\
 	rsserial.c rsutils.c rsxface.c
 
 # components/tables
@@ -60,8 +61,8 @@ SRCS+=	tbfadt.c tbfind.c tbinstal.c tbutils.c tbxface.c	\
 SRCS+=	utaddress.c utalloc.c utcache.c utcopy.c utdebug.c	\
 	utdecode.c utdelete.c uteval.c utexcep.c utglobal.c	\
 	utids.c	utinit.c utlock.c utmath.c utmisc.c utmutex.c	\
-	utobject.c utosi.c utresrc.c utstate.c uttrack.c	\
-	utxface.c utxferror.c utxfinit.c
+	utobject.c utosi.c utownerid.c utresrc.c utstate.c	\
+	utstring.c uttrack.c utxface.c utxferror.c utxfinit.c
 
 MAN=	acpidb.8
 WARNS?=	2
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index f4eda5f..b348141 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -10,18 +10,19 @@ SRCS+=	ahpredef.c dmextern.c dmrestag.c dmtable.c dmtbdump.c	\
 # compiler
 SRCS+=	aslanalyze.c aslbtypes.c aslcodegen.c aslcompile.c	\
 	aslcompiler.y.h aslcompilerlex.c aslcompilerparse.c	\
-	aslerror.c aslfiles.c aslfold.c asllength.c		\
-	asllisting.c aslload.c asllookup.c aslmain.c aslmap.c	\
-	aslopcodes.c asloperands.c aslopt.c aslpredef.c		\
-	aslresource.c aslrestype1.c aslrestype1i.c		\
-	aslrestype2.c aslrestype2d.c aslrestype2e.c		\
-	aslrestype2q.c aslrestype2s.c aslrestype2w.c		\
-	aslstartup.c aslstubs.c	asltransform.c asltree.c	\
-	aslutils.c asluuid.c aslwalks.c dtcompile.c dtexpress.c	\
-	dtfield.c dtio.c dtparser.y.h dtparserlex.c		\
-	dtparserparse.c dtsubtable.c dttable.c dttemplate.c	\
-	dtutils.c prexpress.c prmacros.c prparser.y.h		\
-	prparserlex.c prparserparse.c prscan.c prutils.c
+	aslerror.c aslfileio.c aslfiles.c aslfold.c aslhex.c	\
+	asllength.c asllisting.c aslload.c asllookup.c		\
+	aslmain.c aslmap.c aslmethod.c aslnamesp.c aslopcodes.c	\
+	asloperands.c aslopt.c aslpredef.c aslresource.c	\
+	aslrestype1.c aslrestype1i.c aslrestype2.c		\
+	aslrestype2d.c aslrestype2e.c aslrestype2q.c		\
+	aslrestype2s.c aslrestype2w.c aslstartup.c aslstubs.c	\
+	asltransform.c asltree.c aslutils.c asluuid.c		\
+	aslwalks.c aslxref.c dtcompile.c dtexpress.c dtfield.c	\
+	dtio.c dtparser.y.h dtparserlex.c dtparserparse.c	\
+	dtsubtable.c dttable.c dttemplate.c dtutils.c		\
+	prexpress.c prmacros.c prparser.y.h prparserlex.c	\
+	prparserparse.c prscan.c prutils.c
 
 # components/debugger
 SRCS+=	dbfileio.c
@@ -42,8 +43,8 @@ SRCS+=	exconvrt.c excreate.c exdump.c exmisc.c exmutex.c	\
 	exstoren.c exstorob.c exsystem.c exutils.c
 
 # components/parser
-SRCS+=	psargs.c psloop.c psopcode.c psparse.c psscope.c	\
-	pstree.c psutils.c pswalk.c
+SRCS+=	psargs.c psloop.c psobject.c psopcode.c psopinfo.c	\
+	psparse.c psscope.c pstree.c psutils.c pswalk.c
 
 # components/namespace
 SRCS+=	nsaccess.c nsalloc.c nsdump.c nsnames.c nsobject.c	\
@@ -56,7 +57,8 @@ SRCS+=	tbfadt.c tbinstal.c tbutils.c tbxface.c
 SRCS+=	utaddress.c utalloc.c utcache.c utcopy.c utdebug.c	\
 	utdecode.c utdelete.c utexcep.c utglobal.c utinit.c	\
 	utlock.c utmath.c utmisc.c utmutex.c utobject.c		\
-	utresrc.c utstate.c utxface.c utxferror.c
+	utownerid.c utresrc.c utstate.c utstring.c utxface.c	\
+	utxferror.c
 
 # os_specific/service_layers
 SRCS+=	osunixxf.c