diff options
author | jkim <jkim@FreeBSD.org> | 2016-09-30 22:40:58 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2016-09-30 22:40:58 +0000 |
commit | dba8c0a565199df70a86f6a036d00c92f0c7675f (patch) | |
tree | cf4924274c6e92898c01efb3c8ba31b34f0630f2 /usr.sbin/acpi | |
parent | 0f41551ef9dde560d9d191d7190af02904dbf611 (diff) | |
download | FreeBSD-src-dba8c0a565199df70a86f6a036d00c92f0c7675f.zip FreeBSD-src-dba8c0a565199df70a86f6a036d00c92f0c7675f.tar.gz |
MFC: r284583, r285797, r285799, r287168, r298714, r298720, r298838,
r300879
Merge ACPICA up to 20160527.
Requested by: mav
Diffstat (limited to 'usr.sbin/acpi')
-rw-r--r-- | usr.sbin/acpi/acpidb/Makefile | 37 | ||||
-rw-r--r-- | usr.sbin/acpi/acpidb/acpidb.c | 7 | ||||
-rw-r--r-- | usr.sbin/acpi/iasl/Makefile | 63 |
3 files changed, 58 insertions, 49 deletions
diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile index cf79bae..3669e3b 100644 --- a/usr.sbin/acpi/acpidb/Makefile +++ b/usr.sbin/acpi/acpidb/Makefile @@ -4,22 +4,22 @@ PROG= acpidb SRCS= acpidb.c # common -SRCS+= acgetline.c ahids.c ahuuids.c cmfsize.c +SRCS+= acfileio.c 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 \ - dbtest.c dbutils.c dbxface.c + dbhistry.c dbinput.c dbmethod.c dbnames.c dbobject.c \ + dbstats.c dbtest.c dbutils.c dbxface.c # components/disassembler -SRCS+= dmbuffer.c dmcstyle.c dmdeferred.c dmnames.c dmobject.c \ - dmopcode.c dmresrc.c dmresrcl.c dmresrcl2.c dmresrcs.c \ - dmutils.c dmwalk.c +SRCS+= dmbuffer.c dmcstyle.c dmdeferred.c dmnames.c dmopcode.c \ + dmresrc.c dmresrcl.c dmresrcl2.c dmresrcs.c dmutils.c \ + dmwalk.c # 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 +SRCS+= dsargs.c dscontrol.c dsdebug.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 # components/events SRCS+= evevent.c evglock.c evgpe.c evgpeblk.c evgpeinit.c \ @@ -27,11 +27,12 @@ SRCS+= evevent.c evglock.c evgpe.c evgpeblk.c evgpeinit.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 +SRCS+= exconcat.c 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 extrace.c \ + exutils.c # components/hardware SRCS+= hwacpi.c hwesleep.c hwgpe.c hwpci.c hwregs.c hwsleep.c \ @@ -59,10 +60,10 @@ 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 utfileio.c utglobal.c uthex.c utids.c \ - utinit.c utlock.c utmath.c utmisc.c utmutex.c \ +SRCS+= utaddress.c utalloc.c utascii.c utbuffer.c utcache.c \ + utcopy.c utdebug.c utdecode.c utdelete.c uterror.c \ + uteval.c utexcep.c utglobal.c uthex.c utids.c utinit.c \ + utlock.c utmath.c utmisc.c utmutex.c utnonansi.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 diff --git a/usr.sbin/acpi/acpidb/acpidb.c b/usr.sbin/acpi/acpidb/acpidb.c index 7f4e49f..fefe6da 100644 --- a/usr.sbin/acpi/acpidb/acpidb.c +++ b/usr.sbin/acpi/acpidb/acpidb.c @@ -44,6 +44,7 @@ #include <contrib/dev/acpica/include/acpi.h> #include <contrib/dev/acpica/include/accommon.h> +#include <contrib/dev/acpica/include/acapps.h> #include <contrib/dev/acpica/include/acdebug.h> #include <contrib/dev/acpica/include/amlresrc.h> @@ -381,6 +382,7 @@ static int load_dsdt(const char *dsdtfile) { char filetmp[PATH_MAX]; + ACPI_NEW_TABLE_DESC *list; u_int8_t *code; struct stat sb; int dounlink, error, fd; @@ -488,9 +490,10 @@ load_dsdt(const char *dsdtfile) return (-1); } - AcpiDbGetTableFromFile(filetmp, NULL, TRUE); + list = NULL; + AcGetAllTablesFromFile(filetmp, TRUE, &list); - AcpiDbInitialize(); + AcpiInitializeDebugger(); AcpiGbl_DebuggerConfiguration = 0; AcpiDbUserCommands(':', NULL); diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile index e9faad2..87c7294 100644 --- a/usr.sbin/acpi/iasl/Makefile +++ b/usr.sbin/acpi/iasl/Makefile @@ -3,29 +3,31 @@ PROG= iasl # common -SRCS= adfile.c adisasm.c adwalk.c ahids.c ahpredef.c \ - ahtable.c ahuuids.c cmfsize.c dmextern.c dmrestag.c \ - dmtable.c dmtbdump.c dmtbinfo.c getopt.c +SRCS= acfileio.c adfile.c adisasm.c adwalk.c ahids.c \ + ahpredef.c ahtable.c ahuuids.c cmfsize.c dmextern.c \ + dmrestag.c dmtable.c dmtables.c dmtbdump.c dmtbinfo.c \ + getopt.c # compiler 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 aslprintf.c aslprune.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 + aslcompilerparse.c asldebug.c aslerror.c aslexternal.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 aslpld.c aslpredef.c aslprepkg.c \ + aslprintf.c aslprune.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 \ + aslxrefout.c dtcompile.c dtexpress.c dtfield.c dtio.c \ + dtparser.y.h dtparserlex.c dtparserparse.c dtsubtable.c \ + dttable.c dttable1.c dttable2.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 @@ -41,10 +43,10 @@ SRCS+= dsargs.c dscontrol.c dsfield.c dsobject.c dsopcode.c \ dswstate.c # 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 +SRCS+= exconcat.c 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 # components/parser SRCS+= psargs.c psloop.c psobject.c psopcode.c psopinfo.c \ @@ -56,13 +58,13 @@ SRCS+= nsaccess.c nsalloc.c nsdump.c nsnames.c nsobject.c \ # components/tables SRCS+= tbdata.c tbfadt.c tbinstal.c tbprint.c tbutils.c \ - tbxface.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 utexcep.c \ - utfileio.c utglobal.c uthex.c utinit.c utlock.c \ - utmath.c utmisc.c utmutex.c utobject.c utownerid.c \ +SRCS+= utaddress.c utalloc.c utascii.c utbuffer.c utcache.c \ + utcopy.c utdebug.c utdecode.c utdelete.c uterror.c \ + utexcep.c utglobal.c uthex.c utinit.c utlock.c utmath.c \ + utmisc.c utmutex.c utnonansi.c utobject.c utownerid.c \ utpredef.c utprint.c utresrc.c utstate.c utstring.c \ utuuid.c utxface.c utxferror.c @@ -83,11 +85,14 @@ CLEANFILES= aslcompiler.y aslcompiler.y.h aslcompilerlex.c \ prparser.y.h prparserlex.c prparserparse.c \ prparserparse.h +PARSER= aslcstyle.y aslparser.y aslresources.y aslrules.y \ + aslsupport.y asltokens.y asltypes.y + 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 +aslcompiler.y: ${PARSER} m4 -P -I${ACPICA_DIR}/compiler \ ${ACPICA_DIR}/compiler/aslparser.y > ${.TARGET} |