Adjust for ACPICA 20110623. trunk
authorjruoho <jruoho@NetBSD.org>
Tue, 28 Jun 2011 09:11:33 +0000
branchtrunk
changeset 202298 bdd5a5293ba4
parent 202297 f985977ed720
child 202299 b90632244489
Adjust for ACPICA 20110623.
external/bsd/acpica/bin/iasl/Makefile
sys/external/bsd/acpica/conf/files.acpica
--- a/external/bsd/acpica/bin/iasl/Makefile	Tue Jun 28 09:09:43 2011 +0000
+++ b/external/bsd/acpica/bin/iasl/Makefile	Tue Jun 28 09:11:33 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/18 17:34:22 jruoho Exp $
+# $NetBSD: Makefile,v 1.4 2011/06/28 09:11:33 jruoho Exp $
 
 .if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
 PROG=	iasl
@@ -16,8 +16,8 @@
 LDADD+=		-ll -ly -lrt -lpthread
 DPADD+=		${LIBL} ${LIBY} ${LIBRT} ${LIBPTHREAD}
 
-DPSRCS= aslcompilerparse.c
-DPSRCS+=aslcompilerlex.c
+DPSRCS= aslcompilerparse.c aslcompilerlex.c \
+	dtparserparse.c dtparserlex.c
 
 .PATH:	${TOPDIR}
 SRCS+=  aslcompilerparse.c aslcompilerlex.c adfile.c \
@@ -30,6 +30,7 @@
 	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     \
+	dtparserparse.c dtparserlex.c				\
 	dtsubtable.c dttable.c dttemplate.c dtutils.c
 
 .PATH: ${TOPDIR}/../common
@@ -71,7 +72,7 @@
 	utmisc.c utmutex.c utobject.c utosi.c utresrc.c         \
 	utstate.c utxface.c utxferror.c
 
-.PATH: ${TOPDIR}/..
+.PATH: ${TOPDIR}/../os_specific/service_layers
 SRCS+=	osunixxf.c
 
 aslcompilerparse.c: ${TOPDIR}/aslcompiler.y
@@ -81,7 +82,16 @@
 aslcompilerlex.c: ${TOPDIR}/aslcompiler.l
 	${LEX} -i -PAslCompiler -o${.TARGET} ${.ALLSRC}
 
-CLEANFILES+=	aslcompilerlex.c aslcompilerparse.c \
-		aslcompiler.y.h aslcompilerparse.output
+dtparserparse.c: ${TOPDIR}/dtparser.y
+	${YACC} -v -d -o${.TARGET} -pDtParser ${.ALLSRC}
+	mv -f ${.PREFIX}.h dtparser.y.h
+
+dtparserlex.c: ${TOPDIR}/dtparser.l
+	${LEX} -i -PDtParser -o${.TARGET} ${.ALLSRC}
+
+CLEANFILES+=	aslcompilerlex.c aslcompilerparse.c	\
+		aslcompiler.y.h aslcompilerparse.output \
+		dtparserlex.c dtparserparse.c		\
+		dtparser.y.h dtparserparse.output
 
 .include <bsd.prog.mk>
--- a/sys/external/bsd/acpica/conf/files.acpica	Tue Jun 28 09:09:43 2011 +0000
+++ b/sys/external/bsd/acpica/conf/files.acpica	Tue Jun 28 09:11:33 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpica,v 1.3 2011/02/17 12:08:14 jruoho Exp $
+# $NetBSD: files.acpica,v 1.4 2011/06/28 09:16:42 jruoho Exp $
 
 define		acpica
 makeoptions	acpi	CPPFLAGS+="-I$S/external/bsd/acpica/dist/include"
@@ -45,6 +45,7 @@
 
 # events/
 file	external/bsd/acpica/dist/events/evevent.c		acpica
+file	external/bsd/acpica/dist/events/evglock.c		acpica
 file	external/bsd/acpica/dist/events/evgpe.c			acpica
 file	external/bsd/acpica/dist/events/evgpeblk.c		acpica
 file	external/bsd/acpica/dist/events/evgpeinit.c		acpica