Catch up with ACPI-CA 20051021 import

4 files changed, 108 insertions, 63 deletions

diff --git a/usr.sbin/acpi/Makefile.inc b/usr.sbin/acpi/Makefile.inc
index 2fce920..3237afb 100644
--- a/usr.sbin/acpi/Makefile.inc
+++ b/usr.sbin/acpi/Makefile.inc
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 ACPICA_DIR= ${.CURDIR}/../../../sys/contrib/dev/acpica
-CFLAGS+= -I${.CURDIR}/../../../sys -I${ACPICA_DIR} -I${ACPICA_DIR}/compiler
+CFLAGS+= -I${.CURDIR}/../../../sys
 
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile
index 5541b56..7ad2970 100644
--- a/usr.sbin/acpi/acpidb/Makefile
+++ b/usr.sbin/acpi/acpidb/Makefile
@@ -1,38 +1,61 @@
 # $FreeBSD$
 
 PROG=	acpidb
-SRCS+=	acpidb.c
+SRCS=	acpidb.c
 SRCS+=	osunixxf.c
-SRCS+=	dbcmds.c dbdisply.c dbexec.c dbfileio.c \
-	dbhistry.c dbinput.c dbstats.c dbutils.c \
-	dbxface.c dmbuffer.c dmnames.c dmobject.c \
-	dmopcode.c dmresrc.c dmresrcl.c dmresrcs.c \
-	dmutils.c dmwalk.c dsfield.c dsinit.c \
-	dsmethod.c dsmthdat.c dsobject.c dsopcode.c \
-	dsutils.c dswexec.c dswload.c dswscope.c dswstate.c \
-	evevent.c evgpe.c evgpeblk.c evmisc.c \
-	evregion.c evrgnini.c evsci.c evxface.c \
-	evxfevnt.c evxfregn.c exconfig.c exconvrt.c \
-	excreate.c exdump.c exfield.c exfldio.c \
-	exmisc.c exmutex.c exnames.c exoparg1.c \
-	exoparg2.c exoparg3.c exoparg6.c exprep.c \
-	exregion.c exresnte.c exresolv.c exresop.c \
-	exstore.c exstoren.c exstorob.c exsystem.c exutils.c \
-	hwacpi.c hwgpe.c hwregs.c hwsleep.c \
-	nsaccess.c nsalloc.c nsdump.c nseval.c \
-	nsinit.c nsload.c nsnames.c nsobject.c \
-	nsparse.c nssearch.c nsutils.c nswalk.c \
-	nsxfeval.c nsxfname.c nsxfobj.c \
-	psargs.c psopcode.c psparse.c psscope.c \
-	pstree.c psutils.c pswalk.c psxface.c \
-	rsaddr.c rscalc.c rscreate.c rsdump.c \
-	rsio.c rsirq.c rslist.c rsmemory.c \
-	rsmisc.c rsutils.c rsxface.c \
-	tbconvrt.c tbget.c tbgetall.c tbinstal.c \
-	tbrsdt.c tbutils.c tbxface.c tbxfroot.c \
-	utalloc.c utcopy.c utdebug.c utdelete.c \
-	uteval.c utglobal.c utinit.c utmath.c \
-	utmisc.c utobject.c utxface.c
+
+# debugger
+SRCS+=	dbcmds.c dbdisply.c dbexec.c dbfileio.c dbhistry.c	\
+	dbinput.c dbstats.c dbutils.c dbxface.c
+
+# disassembler
+SRCS+=	dmbuffer.c dmnames.c dmobject.c dmopcode.c dmresrc.c	\
+	dmresrcl.c dmresrcs.c dmutils.c dmwalk.c
+
+# events
+SRCS+=	evevent.c evgpe.c evgpeblk.c evmisc.c evregion.c	\
+	evrgnini.c evsci.c evxface.c evxfevnt.c evxfregn.c
+
+# hardware
+SRCS+=	hwacpi.c hwgpe.c hwregs.c hwsleep.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
+
+# interpreter/executer
+SRCS+=	exconfig.c exconvrt.c excreate.c exdump.c exfield.c	\
+	exfldio.c exmisc.c exmutex.c exnames.c exoparg1.c	\
+	exoparg2.c exoparg3.c exoparg6.c exprep.c exregion.c	\
+	exresnte.c exresolv.c exresop.c exstore.c exstoren.c	\
+	exstorob.c exsystem.c exutils.c
+
+# interpreter/parser
+SRCS+=	psargs.c psloop.c psopcode.c psparse.c psscope.c	\
+	pstree.c psutils.c pswalk.c psxface.c
+
+# namespace
+SRCS+=	nsaccess.c nsalloc.c nsdump.c nseval.c nsinit.c		\
+	nsload.c nsnames.c nsobject.c nsparse.c nssearch.c	\
+	nsutils.c nswalk.c nsxfeval.c nsxfname.c nsxfobj.c
+
+# resources
+SRCS+=	rsaddr.c rscalc.c rscreate.c rsdump.c rsinfo.c		\
+	rsio.c rsirq.c rslist.c rsmemory.c rsmisc.c		\
+	rsutils.c rsxface.c
+
+# tables
+SRCS+=	tbconvrt.c tbget.c tbgetall.c tbinstal.c tbrsdt.c	\
+	tbutils.c tbxface.c tbxfroot.c
+
+# tools/acpiexec
+SRCS+=	aeexec.c
+
+# utilities
+SRCS+=	utalloc.c utcache.c utcopy.c utdebug.c utdelete.c	\
+	uteval.c utglobal.c utinit.c utmath.c utmisc.c		\
+	utmutex.c utobject.c utstate.c utxface.c
 
 MAN=	acpidb.8
 WARNS?=	2
diff --git a/usr.sbin/acpi/acpidb/acpidb.c b/usr.sbin/acpi/acpidb/acpidb.c
index c53a265..5c9d528 100644
--- a/usr.sbin/acpi/acpidb/acpidb.c
+++ b/usr.sbin/acpi/acpidb/acpidb.c
@@ -41,9 +41,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <acpi.h>
-#include <acnamesp.h>
-#include <acdebug.h>
+#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/acnamesp.h>
+#include <contrib/dev/acpica/acdebug.h>
 
 /*
  * Dummy DSDT Table Header
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index afe0d81..9b341c2 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -1,38 +1,60 @@
 # $FreeBSD$
 
 PROG=	iasl
-SRCS=	aslcompiler.y.h aslcompilerlex.l aslcompilerparse.y \
-	aslanalyze.c aslcodegen.c \
-	aslcompile.c aslerror.c aslfiles.c asllength.c \
-	asllisting.c aslload.c asllookup.c aslmain.c \
-	aslmap.c aslopcodes.c asloperands.c aslresource.c \
-	aslrestype1.c aslrestype2.c asltree.c aslutils.c \
-	asltransform.c aslfold.c aslstubs.c aslopt.c
-SRCS+=	adisasm.c getopt.c osunixxf.c
-SRCS+=	dbfileio.c dmbuffer.c dmnames.c dmopcode.c dmobject.c \
-        dmresrc.c dmresrcl.c dmresrcs.c dmutils.c dmwalk.c \
-        dsopcode.c dsutils.c dswexec.c dswload.c \
-	dswscope.c dswstate.c dsfield.c dsobject.c \
-        exconvrt.c excreate.c exdump.c exmisc.c \
-        exmutex.c exnames.c exoparg1.c exoparg2.c \
-        exoparg3.c exoparg6.c exprep.c exregion.c \
-        exresnte.c exresolv.c exresop.c exstore.c \
-        exstoren.c exstorob.c exsystem.c exutils.c \
-        nsaccess.c nsalloc.c nsdump.c nsnames.c nsobject.c \
-	nsparse.c nssearch.c nsutils.c nswalk.c nsxfobj.c \
-        psargs.c psopcode.c psparse.c psscope.c \
-        pstree.c psutils.c pswalk.c \
-        tbinstal.c tbutils.c \
-	utalloc.c utcopy.c utdebug.c utdelete.c \
-        utglobal.c utobject.c utmisc.c utmath.c
+SRCS=	adisasm.c
+SRCS+=	osunixxf.c
 
-MAN=	iasl.8
+# common
+SRCS+=	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 aslresource.c aslrestype1.c	\
+	aslrestype2.c aslstubs.c asltransform.c asltree.c	\
+	aslutils.c
+
+# debugger
+SRCS+=	dbfileio.c
+
+# disassembler
+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
+
+# interpreter/executer
+SRCS+=	exconvrt.c excreate.c exdump.c exmisc.c exmutex.c	\
+	exnames.c exoparg1.c exoparg2.c exoparg3.c exoparg6.c	\
+	exprep.c exregion.c exresnte.c exresolv.c exresop.c	\
+	exstore.c exstoren.c exstorob.c exsystem.c exutils.c
 
-CFLAGS+= -D_ACPI_ASL_COMPILER -I.
+# interpreter/parser
+SRCS+=	psargs.c psloop.c psopcode.c psparse.c psscope.c	\
+	pstree.c psutils.c pswalk.c
+
+# namespace
+SRCS+=	nsaccess.c nsalloc.c nsdump.c nsnames.c nsobject.c	\
+	nsparse.c nssearch.c nsutils.c nswalk.c nsxfobj.c
+
+# tables
+SRCS+=	tbinstal.c tbutils.c
+
+# utilities
+SRCS+=	utalloc.c utcache.c utcopy.c utdebug.c utdelete.c	\
+	utglobal.c utmath.c utmisc.c utmutex.c utobject.c	\
+	utstate.c
+
+MAN=	iasl.8
 
+CFLAGS+= -DACPI_ASL_COMPILER -I.
 CFLAGS+= -D_USE_BERKELEY_YACC
-LFLAGS=	-i -PAslCompiler
-YFLAGS=	-d -pAslCompiler
+LFLAGS= -i -PAslCompiler
+YFLAGS= -d -pAslCompiler
 
 CLEANFILES= aslcompiler.y.h aslcompilerlex.l aslcompilerparse.y