Date: Tue, 2 Jun 2009 22:52:58 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r193357 - in projects/acpica_20090521/usr.sbin/acpi: . acpiconf acpidb iasl Message-ID: <200906022252.n52MqwQd030880@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Tue Jun 2 22:52:58 2009 New Revision: 193357 URL: http://svn.freebsd.org/changeset/base/193357 Log: Merge ACPI utilities as well. Modified: projects/acpica_20090521/usr.sbin/acpi/Makefile.inc projects/acpica_20090521/usr.sbin/acpi/acpiconf/acpiconf.c projects/acpica_20090521/usr.sbin/acpi/acpidb/Makefile projects/acpica_20090521/usr.sbin/acpi/acpidb/acpidb.c projects/acpica_20090521/usr.sbin/acpi/iasl/Makefile Modified: projects/acpica_20090521/usr.sbin/acpi/Makefile.inc ============================================================================== --- projects/acpica_20090521/usr.sbin/acpi/Makefile.inc Tue Jun 2 22:31:57 2009 (r193356) +++ projects/acpica_20090521/usr.sbin/acpi/Makefile.inc Tue Jun 2 22:52:58 2009 (r193357) @@ -8,4 +8,17 @@ CFLAGS+= -I${.CURDIR}/../../../sys .include "${.CURDIR}/../../Makefile.inc" .endif -.PATH: ${ACPICA_DIR} ${ACPICA_DIR}/compiler ${ACPICA_DIR}/common +.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 \ + ${ACPICA_DIR}/utilities Modified: projects/acpica_20090521/usr.sbin/acpi/acpiconf/acpiconf.c ============================================================================== --- projects/acpica_20090521/usr.sbin/acpi/acpiconf/acpiconf.c Tue Jun 2 22:31:57 2009 (r193356) +++ projects/acpica_20090521/usr.sbin/acpi/acpiconf/acpiconf.c Tue Jun 2 22:52:58 2009 (r193357) @@ -37,7 +37,8 @@ #include <unistd.h> #include <dev/acpica/acpiio.h> -#include <contrib/dev/acpica/acpi.h> + +#include <contrib/dev/acpica/include/acpi.h> #define ACPIDEV "/dev/acpi" Modified: projects/acpica_20090521/usr.sbin/acpi/acpidb/Makefile ============================================================================== --- projects/acpica_20090521/usr.sbin/acpi/acpidb/Makefile Tue Jun 2 22:31:57 2009 (r193356) +++ projects/acpica_20090521/usr.sbin/acpi/acpidb/Makefile Tue Jun 2 22:52:58 2009 (r193357) @@ -17,7 +17,7 @@ SRCS+= evevent.c evgpe.c evgpeblk.c evmi evrgnini.c evsci.c evxface.c evxfevnt.c evxfregn.c # hardware -SRCS+= hwacpi.c hwgpe.c hwregs.c hwsleep.c +SRCS+= hwacpi.c hwgpe.c hwregs.c hwsleep.c hwvalid.c hwxface.c # interpreter/dispatcher SRCS+= dsfield.c dsinit.c dsmethod.c dsmthdat.c dsobject.c \ @@ -37,8 +37,9 @@ SRCS+= psargs.c psloop.c psopcode.c pspa # 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 + nsload.c nsnames.c nsobject.c nsparse.c nspredef.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 \ @@ -51,14 +52,15 @@ SRCS+= tbfadt.c tbfind.c tbinstal.c tbut # utilities SRCS+= utalloc.c utcache.c utcopy.c utdebug.c utdelete.c \ - uteval.c utglobal.c utinit.c utmath.c utmisc.c \ + uteval.c utglobal.c utinit.c utlock.c utmath.c utmisc.c \ utmutex.c utobject.c utresrc.c utstate.c uttrack.c \ utxface.c MAN= acpidb.8 WARNS?= 2 -CFLAGS+= -DACPI_EXEC_APP -CFLAGS+=-fno-strict-aliasing +CFLAGS+= -DACPI_EXEC_APP -fno-strict-aliasing +DPADD= ${LIBPTHREAD} +LDADD= -lpthread .include <bsd.prog.mk> Modified: projects/acpica_20090521/usr.sbin/acpi/acpidb/acpidb.c ============================================================================== --- projects/acpica_20090521/usr.sbin/acpi/acpidb/acpidb.c Tue Jun 2 22:31:57 2009 (r193356) +++ projects/acpica_20090521/usr.sbin/acpi/acpidb/acpidb.c Tue Jun 2 22:52:58 2009 (r193357) @@ -42,9 +42,8 @@ #include <stdlib.h> #include <unistd.h> -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acdebug.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/tools/acpiexec/aecommon.h> /* * Dummy DSDT Table Header @@ -90,7 +89,13 @@ static void aml_simulation_regdump(con ACPI_STATUS AeLocalGetRootPointer(void) { - return AE_ERROR; + + return (AE_ERROR); +} + +void +AeTableOverride(ACPI_TABLE_HEADER *ExistingTable, ACPI_TABLE_HEADER **NewTable) +{ } static void Modified: projects/acpica_20090521/usr.sbin/acpi/iasl/Makefile ============================================================================== --- projects/acpica_20090521/usr.sbin/acpi/iasl/Makefile Tue Jun 2 22:31:57 2009 (r193356) +++ projects/acpica_20090521/usr.sbin/acpi/iasl/Makefile Tue Jun 2 22:52:58 2009 (r193357) @@ -13,8 +13,8 @@ SRCS+= aslanalyze.c aslcodegen.c aslcomp 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 + aslrestype2.c aslstartup.c aslstubs.c asltransform.c \ + asltree.c aslutils.c # debugger SRCS+= dbfileio.c @@ -46,8 +46,8 @@ SRCS+= tbfadt.c tbinstal.c tbutils.c tbx # utilities SRCS+= utalloc.c utcache.c utcopy.c utdebug.c utdelete.c \ - utglobal.c utmath.c utmisc.c utmutex.c utobject.c \ - utresrc.c utstate.c + utglobal.c utinit.c utlock.c utmath.c utmisc.c \ + utmutex.c utobject.c utresrc.c utstate.c utxface.c MAN= iasl.8 @@ -55,6 +55,8 @@ CFLAGS+= -DACPI_ASL_COMPILER -I. CFLAGS+= -D_USE_BERKELEY_YACC LFLAGS= -i -PAslCompiler YFLAGS= -d -pAslCompiler +DPADD= ${LIBPTHREAD} +LDADD= -lpthread CLEANFILES= aslcompiler.y.h aslcompilerlex.l aslcompilerparse.y
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906022252.n52MqwQd030880>