Merge ACPICA 20110211.

2 files changed, 27 insertions, 24 deletions

diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile
index 737180e..0bfb492 100644
--- a/usr.sbin/acpi/acpidb/Makefile
+++ b/usr.sbin/acpi/acpidb/Makefile
@@ -6,7 +6,8 @@ SRCS+=	osunixxf.c
 
 # debugger
 SRCS+=	dbcmds.c dbdisply.c dbexec.c dbfileio.c dbhistry.c	\
-	dbinput.c dbstats.c dbutils.c dbxface.c
+	dbinput.c dbmethod.c dbnames.c dbstats.c dbutils.c	\
+	dbxface.c
 
 # disassembler
 SRCS+=	dmbuffer.c dmnames.c dmobject.c dmopcode.c dmresrc.c	\
@@ -22,9 +23,9 @@ SRCS+=	hwacpi.c hwgpe.c hwpci.c hwregs.c hwsleep.c hwvalid.c	\
 	hwxface.c
 
 # interpreter/dispatcher
-SRCS+=	dsfield.c dsinit.c dsmethod.c dsmthdat.c dsobject.c	\
-	dsopcode.c dsutils.c dswexec.c dswload.c dswscope.c	\
-	dswstate.c
+SRCS+=	dsargs.c dscontrol.c dsfield.c dsinit.c dsmethod.c	\
+	dsmthdat.c dsobject.c dsopcode.c dsutils.c dswexec.c	\
+	dswload.c dswload2.c dswscope.c dswstate.c
 
 # interpreter/executer
 SRCS+=	exconfig.c exconvrt.c excreate.c exdebug.c exdump.c	\
@@ -53,10 +54,10 @@ SRCS+=	tbfadt.c tbfind.c tbinstal.c tbutils.c tbxface.c	\
 	tbxfroot.c
 
 # utilities
-SRCS+=	utalloc.c utcache.c utcopy.c utdebug.c utdelete.c	\
-	uteval.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
+SRCS+=	utalloc.c utcache.c utcopy.c utdebug.c utdecode.c	\
+	utdelete.c uteval.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
 
 MAN=	acpidb.8
 WARNS?=	2
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index fa4041e..f91cbc8 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -9,16 +9,17 @@ SRCS+=	dmextern.c dmrestag.c dmtable.c dmtbdump.c dmtbinfo.c	\
 	getopt.c
 
 # compiler
-SRCS+=	aslanalyze.c aslcodegen.c aslcompile.c aslcompiler.y.h	\
-	aslcompilerlex.l aslcompilerparse.y 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		\
-	aslrestype2w.c aslstartup.c aslstubs.c asltransform.c	\
-	asltree.c aslutils.c asluuid.c dtcompile.c dtfield.c	\
-	dtio.c dtsubtable.c dttable.c dttemplate.c dtutils.c
+SRCS+=	aslanalyze.c aslbtypes.c aslcodegen.c aslcompile.c	\
+	aslcompiler.y.h	aslcompilerlex.l aslcompilerparse.y	\
+	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 aslrestype2w.c aslstartup.c aslstubs.c	\
+	asltransform.c asltree.c aslutils.c asluuid.c		\
+	aslwalks.c dtcompile.c dtexpress.c dtfield.c dtio.c	\
+	dtsubtable.c dttable.c dttemplate.c dtutils.c
 
 # debugger
 SRCS+=	dbfileio.c
@@ -28,8 +29,9 @@ SRCS+=	dmbuffer.c dmnames.c dmobject.c dmopcode.c dmresrc.c	\
 	dmresrcl.c dmresrcs.c dmutils.c dmwalk.c
 
 # interpreter/dispatcher
-SRCS+=	dsfield.c dsobject.c dsopcode.c dsutils.c dswexec.c	\
-	dswload.c dswscope.c dswstate.c
+SRCS+=	dsargs.c dscontrol.c dsfield.c dsobject.c dsopcode.c	\
+	dsutils.c dswexec.c dswload.c dswload2.c dswscope.c	\
+	dswstate.c
 
 # interpreter/executer
 SRCS+=	exconvrt.c excreate.c exdump.c exmisc.c exmutex.c	\
@@ -49,10 +51,10 @@ SRCS+=	nsaccess.c nsalloc.c nsdump.c nsnames.c nsobject.c	\
 SRCS+=	tbfadt.c tbinstal.c tbutils.c tbxface.c
 
 # utilities
-SRCS+=	utalloc.c utcache.c utcopy.c utdebug.c utdelete.c	\
-	utglobal.c utinit.c utlock.c utmath.c utmisc.c		\
-	utmutex.c utobject.c utosi.c utresrc.c utstate.c	\
-	utxface.c utxferror.c
+SRCS+=	utalloc.c utcache.c utcopy.c utdebug.c utdecode.c	\
+	utdelete.c utglobal.c utinit.c utlock.c utmath.c	\
+	utmisc.c utmutex.c utobject.c utosi.c utresrc.c		\
+	utstate.c utxface.c utxferror.c
 
 WARNS?=	2