Merge ACPICA 20140926.

6 files changed, 69 insertions, 41 deletions

diff --git a/usr.sbin/acpi/acpiconf/Makefile b/usr.sbin/acpi/acpiconf/Makefile
index 5f862a2c621e..0bbadc1e8fb9 100644
--- a/usr.sbin/acpi/acpiconf/Makefile
+++ b/usr.sbin/acpi/acpiconf/Makefile
@@ -3,5 +3,6 @@
 
 PROG=	acpiconf
 MAN=	acpiconf.8
+WARNS?=	3
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile
index c08c70b41b62..15d114d7892e 100644
--- a/usr.sbin/acpi/acpidb/Makefile
+++ b/usr.sbin/acpi/acpidb/Makefile
@@ -3,10 +3,13 @@
 PROG=	acpidb
 SRCS=	acpidb.c
 
+# common
+SRCS+=	acgetline.c ahids.c ahuuids.c cmfsize.c
+
 # components/debugger
 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
+	dbtest.c dbutils.c dbxface.c
 
 # components/disassembler
 SRCS+=	dmbuffer.c dmdeferred.c dmnames.c dmobject.c dmopcode.c	\
@@ -46,26 +49,27 @@ 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 rsdumpinfo.c	\
 	rsinfo.c rsio.c rsirq.c rslist.c rsmemory.c rsmisc.c	\
 	rsserial.c rsutils.c rsxface.c
 
 # components/tables
-SRCS+=	tbfadt.c tbfind.c tbinstal.c tbprint.c tbutils.c	\
-	tbxface.c tbxfload.c
+SRCS+=	tbdata.c tbfadt.c tbfind.c tbinstal.c tbprint.c		\
+	tbutils.c tbxface.c tbxfload.c
 
 # components/utilities
 SRCS+=	utaddress.c utalloc.c utbuffer.c utcache.c utcopy.c	\
 	utdebug.c utdecode.c utdelete.c uterror.c uteval.c	\
-	utexcep.c utglobal.c utids.c utinit.c utlock.c utmath.c	\
-	utmisc.c utmutex.c utobject.c utosi.c utownerid.c	\
-	utpredef.c utresrc.c utstate.c utstring.c uttrack.c	\
+	utexcep.c utfileio.c utglobal.c uthex.c utids.c		\
+	utinit.c utlock.c utmath.c utmisc.c utmutex.c		\
+	utobject.c utosi.c utownerid.c utpredef.c utprint.c	\
+	utresrc.c utstate.c utstring.c uttrack.c utuuid.c	\
 	utxface.c utxferror.c utxfinit.c
 
+# os_specific/service_layers
+SRCS+=	oslibcfs.c osunixxf.c
+
 MAN=	acpidb.8
 WARNS?=	3
 
diff --git a/usr.sbin/acpi/acpidb/acpidb.c b/usr.sbin/acpi/acpidb/acpidb.c
index 3cd8d3fc7456..3688cafd70cd 100644
--- a/usr.sbin/acpi/acpidb/acpidb.c
+++ b/usr.sbin/acpi/acpidb/acpidb.c
@@ -45,6 +45,7 @@
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acdebug.h>
+#include <contrib/dev/acpica/include/amlresrc.h>
 
 /*
  * Dummy DSDT Table Header
@@ -89,9 +90,9 @@ static UINT64		 aml_simulate_prompt(char *msg, UINT64 def_val);
 static void		 aml_simulation_regload(const char *dumpfile);
 static void		 aml_simulation_regdump(const char *dumpfile);
 
-/* Stubs to simplify linkage to the ACPI CA core subsystem. */
+/* Stubs to simplify linkage to the ACPICA core subsystem. */
 ACPI_PHYSICAL_ADDRESS
-AeLocalGetRootPointer(void)
+AcpiOsGetRootPointer(void)
 {
 
 	return (0);
@@ -102,6 +103,18 @@ AeTableOverride(ACPI_TABLE_HEADER *ExistingTable, ACPI_TABLE_HEADER **NewTable)
 {
 }
 
+void
+MpSaveGpioInfo(ACPI_PARSE_OBJECT *Op, AML_RESOURCE *Resource,
+    UINT32 PinCount, UINT16 *PinList, char *DeviceName)
+{
+}
+
+void
+MpSaveSerialInfo(ACPI_PARSE_OBJECT *Op, AML_RESOURCE *Resource,
+    char *DeviceName)
+{
+}
+
 static void
 aml_simulation_init(void)
 {
diff --git a/usr.sbin/acpi/acpidump/Makefile b/usr.sbin/acpi/acpidump/Makefile
index e00450091222..e258f8e34f05 100644
--- a/usr.sbin/acpi/acpidump/Makefile
+++ b/usr.sbin/acpi/acpidump/Makefile
@@ -3,5 +3,6 @@
 PROG=	acpidump
 MAN=	acpidump.8
 SRCS=	acpi.c acpi_user.c acpidump.c
+WARNS?=	3
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c
index 66cd7bd0087d..ae7ebf2b8931 100644
--- a/usr.sbin/acpi/acpidump/acpi.c
+++ b/usr.sbin/acpi/acpidump/acpi.c
@@ -934,10 +934,10 @@ acpi_handle_dmar_remapping_structure(void *addr, int remaining)
 	case ACPI_DMAR_TYPE_RESERVED_MEMORY:
 		acpi_handle_dmar_rmrr(addr);
 		break;
-	case ACPI_DMAR_TYPE_ATSR:
+	case ACPI_DMAR_TYPE_ROOT_ATS:
 		acpi_handle_dmar_atsr(addr);
 		break;
-	case ACPI_DMAR_HARDWARE_AFFINITY:
+	case ACPI_DMAR_TYPE_HARDWARE_AFFINITY:
 		acpi_handle_dmar_rhsa(addr);
 		break;
 	default:
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index 161b2f412348..8f021a3d7e7a 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -1,29 +1,31 @@
 # $FreeBSD$
 
 PROG=	iasl
-SRCS=	adfile.c adisasm.c adwalk.c
 
 # common
-SRCS+=	ahpredef.c dmextern.c dmrestag.c dmtable.c dmtbdump.c	\
-	dmtbinfo.c getopt.c
+SRCS=	adfile.c adisasm.c adwalk.c ahids.c ahpredef.c		\
+	ahuuids.c cmfsize.c dmextern.c dmrestag.c dmtable.c	\
+	dmtbdump.c dmtbinfo.c getopt.c
 
 # compiler
-SRCS+=	aslanalyze.c aslbtypes.c aslcodegen.c aslcompile.c	\
-	aslcompiler.y.h aslcompilerlex.c aslcompilerparse.c	\
-	aslerror.c aslfileio.c aslfiles.c aslfold.c aslhex.c	\
-	asllength.c asllisting.c asllistsup.c aslload.c		\
-	asllookup.c aslmain.c aslmap.c aslmethod.c aslnamesp.c	\
-	asloffset.c aslopcodes.c asloperands.c aslopt.c		\
-	asloptions.c aslpredef.c aslprepkg.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
+SRCS+=	aslanalyze.c aslascii.c aslbtypes.c aslcodegen.c	\
+	aslcompile.c aslcompiler.y.h aslcompilerlex.c		\
+	aslcompilerparse.c aslerror.c aslfileio.c aslfiles.c	\
+	aslfold.c aslhex.c asllength.c asllisting.c		\
+	asllistsup.c aslload.c asllookup.c aslmain.c aslmap.c	\
+	aslmapenter.c aslmapoutput.c aslmaputils.c		\
+	aslmessages.c aslmethod.c aslnamesp.c asloffset.c	\
+	aslopcodes.c asloperands.c aslopt.c asloptions.c	\
+	aslpredef.c aslprepkg.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
@@ -52,17 +54,19 @@ SRCS+=	nsaccess.c nsalloc.c nsdump.c nsnames.c nsobject.c	\
 	nsparse.c nssearch.c nsutils.c nswalk.c
 
 # components/tables
-SRCS+=	tbfadt.c tbinstal.c tbprint.c tbutils.c tbxface.c
+SRCS+=	tbdata.c tbfadt.c tbinstal.c tbprint.c tbutils.c	\
+	tbxface.c
 
 # components/utilities
 SRCS+=	utaddress.c utalloc.c utbuffer.c utcache.c utcopy.c	\
 	utdebug.c utdecode.c utdelete.c uterror.c utexcep.c	\
-	utglobal.c utinit.c utlock.c utmath.c utmisc.c		\
-	utmutex.c utobject.c utownerid.c utpredef.c utresrc.c	\
-	utstate.c utstring.c utxface.c utxferror.c
+	utfileio.c utglobal.c uthex.c utinit.c utlock.c		\
+	utmath.c utmisc.c utmutex.c utobject.c utownerid.c	\
+	utpredef.c utprint.c utresrc.c utstate.c utstring.c	\
+	utuuid.c utxface.c utxferror.c
 
 # os_specific/service_layers
-SRCS+=	osunixxf.c
+SRCS+=	oslibcfs.c osunixxf.c
 
 WARNS?=	2
 
@@ -72,15 +76,20 @@ CFLAGS+= -DACPI_ASL_COMPILER -I.
 LFLAGS= -i -s
 YFLAGS= -d
 
-CLEANFILES= aslcompiler.y.h aslcompilerlex.c aslcompilerparse.c	\
-	aslcompilerparse.h dtparser.y.h dtparserlex.c		\
-	dtparserparse.c dtparserparse.h prparser.y.h		\
-	prparserlex.c prparserparse.c prparserparse.h
+CLEANFILES= aslcompiler.y aslcompiler.y.h aslcompilerlex.c	\
+	aslcompilerparse.c aslcompilerparse.h dtparser.y.h	\
+	dtparserlex.c dtparserparse.c dtparserparse.h		\
+	prparser.y.h prparserlex.c prparserparse.c		\
+	prparserparse.h
 
 aslcompilerlex.c: aslcompiler.l aslsupport.l
 	${LEX} ${LFLAGS} -PAslCompiler -o${.TARGET} \
 	    ${ACPICA_DIR}/compiler/aslcompiler.l
 
+aslcompiler.y: aslparser.y aslrules.y aslsupport.y asltokens.y asltypes.y
+	m4 -P -I${ACPICA_DIR}/compiler \
+	    ${ACPICA_DIR}/compiler/aslparser.y > ${.TARGET}
+
 .ORDER: aslcompilerparse.c aslcompilerparse.h
 aslcompilerparse.c aslcompilerparse.h: aslcompiler.y
 	${YACC} ${YFLAGS} -pAslCompiler -oaslcompilerparse.c ${.ALLSRC}