summaryrefslogtreecommitdiffstats
path: root/usr.sbin/acpi
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2011-11-28 23:36:48 +0000
committerjkim <jkim@FreeBSD.org>2011-11-28 23:36:48 +0000
commit1bdf3ee8a88f36389b6ebd626dc91b14c9674b9d (patch)
tree9ddf54564f2132efa4b2bc210ee8f94df85b4d86 /usr.sbin/acpi
parent7cc588c10b92dcba82aa8dd93162b1a9d4e5f342 (diff)
parent371a323d3dee8126616c1fdb31a8319c8718310f (diff)
downloadFreeBSD-src-1bdf3ee8a88f36389b6ebd626dc91b14c9674b9d.zip
FreeBSD-src-1bdf3ee8a88f36389b6ebd626dc91b14c9674b9d.tar.gz
Merge ACPICA 20111123.
Diffstat (limited to 'usr.sbin/acpi')
-rw-r--r--usr.sbin/acpi/Makefile.inc27
-rw-r--r--usr.sbin/acpi/acpidb/Makefile8
-rw-r--r--usr.sbin/acpi/acpidb/acpidb.c3
-rw-r--r--usr.sbin/acpi/iasl/Makefile19
4 files changed, 31 insertions, 26 deletions
diff --git a/usr.sbin/acpi/Makefile.inc b/usr.sbin/acpi/Makefile.inc
index 9d387bc..d729ed8 100644
--- a/usr.sbin/acpi/Makefile.inc
+++ b/usr.sbin/acpi/Makefile.inc
@@ -8,17 +8,18 @@ CFLAGS+= -I${.CURDIR}/../../../sys
.include "${.CURDIR}/../../Makefile.inc"
.endif
-.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}/parser \
- ${ACPICA_DIR}/resources \
- ${ACPICA_DIR}/tables \
+.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}/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 17e164f..3918108 100644
--- a/usr.sbin/acpi/acpidb/Makefile
+++ b/usr.sbin/acpi/acpidb/Makefile
@@ -2,7 +2,6 @@
PROG= acpidb
SRCS= acpidb.c
-SRCS+= osunixxf.c
# debugger
SRCS+= dbcmds.c dbdisply.c dbexec.c dbfileio.c dbhistry.c \
@@ -11,7 +10,7 @@ SRCS+= dbcmds.c dbdisply.c dbexec.c dbfileio.c dbhistry.c \
# disassembler
SRCS+= dmbuffer.c dmnames.c dmobject.c dmopcode.c dmresrc.c \
- dmresrcl.c dmresrcs.c dmutils.c dmwalk.c
+ dmresrcl.c dmresrcl2.c dmresrcs.c dmutils.c dmwalk.c
# events
SRCS+= evevent.c evglock.c evgpe.c evgpeblk.c evgpeinit.c \
@@ -44,10 +43,13 @@ SRCS+= nsaccess.c nsalloc.c nsdump.c nseval.c nsinit.c \
nsrepair.c nsrepair2.c nssearch.c nsutils.c nswalk.c \
nsxfeval.c nsxfname.c nsxfobj.c
+# os_specific/service_layers
+SRCS+= osunixxf.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
+ rsserial.c rsutils.c rsxface.c
# tables
SRCS+= tbfadt.c tbfind.c tbinstal.c tbutils.c tbxface.c \
diff --git a/usr.sbin/acpi/acpidb/acpidb.c b/usr.sbin/acpi/acpidb/acpidb.c
index 2ffb696..4095252 100644
--- a/usr.sbin/acpi/acpidb/acpidb.c
+++ b/usr.sbin/acpi/acpidb/acpidb.c
@@ -43,7 +43,8 @@
#include <unistd.h>
#include <contrib/dev/acpica/include/acpi.h>
-#include <contrib/dev/acpica/tools/acpiexec/aecommon.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <contrib/dev/acpica/include/acdebug.h>
/*
* Dummy DSDT Table Header
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index ec7d44a..993ecae 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -2,7 +2,6 @@
PROG= iasl
SRCS= adfile.c adisasm.c adwalk.c
-SRCS+= osunixxf.c
# common
SRCS+= dmextern.c dmrestag.c dmtable.c dmtbdump.c dmtbinfo.c \
@@ -16,18 +15,19 @@ SRCS+= aslanalyze.c aslbtypes.c aslcodegen.c aslcompile.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 \
- dtparser.y.h dtparserlex.c dtparserparse.c dtsubtable.c \
- dttable.c dttemplate.c dtutils.c
+ aslrestype2q.c aslrestype2s.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 dtparser.y.h dtparserlex.c \
+ dtparserparse.c dtsubtable.c dttable.c dttemplate.c \
+ dtutils.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
+ dmresrcl.c dmresrcl2.c dmresrcs.c dmutils.c dmwalk.c
# interpreter/dispatcher
SRCS+= dsargs.c dscontrol.c dsfield.c dsobject.c dsopcode.c \
@@ -48,6 +48,9 @@ SRCS+= psargs.c psloop.c psopcode.c psparse.c psscope.c \
SRCS+= nsaccess.c nsalloc.c nsdump.c nsnames.c nsobject.c \
nsparse.c nssearch.c nsutils.c nswalk.c nsxfobj.c
+# os_specific/service_layers
+SRCS+= osunixxf.c
+
# tables
SRCS+= tbfadt.c tbinstal.c tbutils.c tbxface.c
@@ -64,8 +67,6 @@ MAN= iasl.8
CFLAGS+= -DACPI_ASL_COMPILER -I.
LFLAGS= -i -s
YFLAGS= -d
-DPADD= ${LIBPTHREAD}
-LDADD= -lpthread
CLEANFILES= aslcompiler.y.h aslcompilerlex.c aslcompilerparse.c \
aslcompilerparse.h dtparser.y.h dtparserlex.c \
OpenPOWER on IntegriCloud