Merge ACPICA 20120215.

3 files changed, 43 insertions, 43 deletions

diff --git a/usr.sbin/acpi/Makefile.inc b/usr.sbin/acpi/Makefile.inc
index d729ed8..54c115c 100644
--- a/usr.sbin/acpi/Makefile.inc
+++ b/usr.sbin/acpi/Makefile.inc
@@ -11,15 +11,15 @@ CFLAGS+= -I${.CURDIR}/../../../sys
 .PATH:	${ACPICA_DIR}					\
 	${ACPICA_DIR}/common				\
 	${ACPICA_DIR}/compiler				\
-	${ACPICA_DIR}/debugger				\
-	${ACPICA_DIR}/disassembler			\
-	${ACPICA_DIR}/dispatcher			\
-	${ACPICA_DIR}/events				\
-	${ACPICA_DIR}/executer				\
-	${ACPICA_DIR}/hardware				\
-	${ACPICA_DIR}/namespace				\
+	${ACPICA_DIR}/components/debugger		\
+	${ACPICA_DIR}/components/disassembler		\
+	${ACPICA_DIR}/components/dispatcher		\
+	${ACPICA_DIR}/components/events			\
+	${ACPICA_DIR}/components/executer		\
+	${ACPICA_DIR}/components/hardware		\
+	${ACPICA_DIR}/components/namespace		\
+	${ACPICA_DIR}/components/parser			\
+	${ACPICA_DIR}/components/resources		\
+	${ACPICA_DIR}/components/tables			\
+	${ACPICA_DIR}/components/utilities		\
 	${ACPICA_DIR}/os_specific/service_layers	\
-	${ACPICA_DIR}/parser				\
-	${ACPICA_DIR}/resources				\
-	${ACPICA_DIR}/tables				\
-	${ACPICA_DIR}/utilities
diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile
index 5c48dc6..9d2d7ec 100644
--- a/usr.sbin/acpi/acpidb/Makefile
+++ b/usr.sbin/acpi/acpidb/Makefile
@@ -3,58 +3,58 @@
 PROG=	acpidb
 SRCS=	acpidb.c
 
-# debugger
+# 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
 
-# disassembler
+# components/disassembler
 SRCS+=	dmbuffer.c dmnames.c dmobject.c dmopcode.c dmresrc.c	\
 	dmresrcl.c dmresrcl2.c dmresrcs.c dmutils.c dmwalk.c
 
-# 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
-
-# hardware
-SRCS+=	hwacpi.c hwgpe.c hwpci.c hwregs.c hwsleep.c hwvalid.c	\
-	hwxface.c
-
-# interpreter/dispatcher
+# components/dispatcher
 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
+# 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
+
+# components/executer
 SRCS+=	exconfig.c exconvrt.c excreate.c exdebug.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
+# components/hardware
+SRCS+=	hwacpi.c hwesleep.c hwgpe.c hwpci.c hwregs.c hwsleep.c	\
+	hwvalid.c hwxface.c hwxfsleep.c
 
-# namespace
+# 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
 
-# os_specific/service_layers
+# components/parser
+SRCS+=	psargs.c psloop.c psopcode.c psparse.c psscope.c	\
+	pstree.c psutils.c pswalk.c psxface.c
+
+# components/os_specific/service_layers
 SRCS+=	osunixxf.c
 
-# resources
+# components/resources
 SRCS+=	rsaddr.c rscalc.c rscreate.c rsdump.c rsinfo.c		\
 	rsio.c rsirq.c rslist.c rsmemory.c rsmisc.c		\
 	rsserial.c rsutils.c rsxface.c
 
-# tables
+# components/tables
 SRCS+=	tbfadt.c tbfind.c tbinstal.c tbutils.c tbxface.c
 
-# utilities
+# components/utilities
 SRCS+=	utaddress.c 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		\
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index 32942a1..02b0efe 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -22,44 +22,44 @@ SRCS+=	aslanalyze.c aslbtypes.c aslcodegen.c aslcompile.c	\
 	dtparserparse.c dtsubtable.c dttable.c dttemplate.c	\
 	dtutils.c
 
-# debugger
+# components/debugger
 SRCS+=	dbfileio.c
 
-# disassembler
+# components/disassembler
 SRCS+=	dmbuffer.c dmnames.c dmopcode.c dmresrc.c dmresrcl.c	\
 	dmresrcl2.c dmresrcs.c dmutils.c dmwalk.c
 
-# interpreter/dispatcher
+# components/dispatcher
 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
+# components/executer
 SRCS+=	exconvrt.c excreate.c exdump.c exmisc.c exmutex.c	\
 	exnames.c exoparg1.c exoparg2.c exoparg3.c exoparg6.c	\
 	exprep.c exresnte.c exresolv.c exresop.c exstore.c	\
 	exstoren.c exstorob.c exsystem.c exutils.c
 
-# interpreter/parser
+# components/parser
 SRCS+=	psargs.c psloop.c psopcode.c psparse.c psscope.c	\
 	pstree.c psutils.c pswalk.c
 
-# namespace
+# components/namespace
 SRCS+=	nsaccess.c nsalloc.c nsdump.c nsnames.c nsobject.c	\
 	nsparse.c nssearch.c nsutils.c nswalk.c
 
-# os_specific/service_layers
-SRCS+=	osunixxf.c
-
-# tables
+# components/tables
 SRCS+=	tbfadt.c tbinstal.c tbutils.c tbxface.c
 
-# utilities
+# components/utilities
 SRCS+=	utaddress.c 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 utresrc.c	\
 	utstate.c utxface.c utxferror.c
 
+# os_specific/service_layers
+SRCS+=	osunixxf.c
+
 WARNS?=	2
 
 MAN=	iasl.8