diff options
author | jkim <jkim@FreeBSD.org> | 2015-02-18 20:33:00 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2015-02-18 20:33:00 +0000 |
commit | a1a0103e5c0491f9378743fd890ce7c1b5731996 (patch) | |
tree | fb0545399f40531160cc35b45423b4a49e6dbb79 /usr.sbin/acpi | |
parent | e88977434bd97898228c4330df94ca93ffd4b3bf (diff) | |
parent | c289b811b42daf9e7ef5c37a35e951d01c23715a (diff) | |
download | FreeBSD-src-a1a0103e5c0491f9378743fd890ce7c1b5731996.zip FreeBSD-src-a1a0103e5c0491f9378743fd890ce7c1b5731996.tar.gz |
Merge ACPICA 20141107 and 20150204.
Diffstat (limited to 'usr.sbin/acpi')
-rw-r--r-- | usr.sbin/acpi/acpidb/Makefile | 6 | ||||
-rw-r--r-- | usr.sbin/acpi/acpidb/acpidb.c | 6 | ||||
-rw-r--r-- | usr.sbin/acpi/iasl/Makefile | 25 |
3 files changed, 22 insertions, 15 deletions
diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile index 9df03bd..d470a9b 100644 --- a/usr.sbin/acpi/acpidb/Makefile +++ b/usr.sbin/acpi/acpidb/Makefile @@ -12,9 +12,9 @@ SRCS+= dbcmds.c dbconvert.c dbdisply.c dbexec.c dbfileio.c \ dbtest.c dbutils.c dbxface.c # components/disassembler -SRCS+= dmbuffer.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 dmobject.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 \ diff --git a/usr.sbin/acpi/acpidb/acpidb.c b/usr.sbin/acpi/acpidb/acpidb.c index 3688caf..f49420f 100644 --- a/usr.sbin/acpi/acpidb/acpidb.c +++ b/usr.sbin/acpi/acpidb/acpidb.c @@ -74,6 +74,7 @@ static struct ACPIRegionContentList RegionContentList; static int aml_simulation_initialized = 0; ACPI_PHYSICAL_ADDRESS AeLocalGetRootPointer(void); +void AeDoObjectOverrides(void); void AeTableOverride(ACPI_TABLE_HEADER *, ACPI_TABLE_HEADER **); static void aml_simulation_init(void); @@ -99,6 +100,11 @@ AcpiOsGetRootPointer(void) } void +AeDoObjectOverrides(void) +{ +} + +void AeTableOverride(ACPI_TABLE_HEADER *ExistingTable, ACPI_TABLE_HEADER **NewTable) { } diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile index 8f021a3..7f6a1bd 100644 --- a/usr.sbin/acpi/iasl/Makefile +++ b/usr.sbin/acpi/iasl/Makefile @@ -16,23 +16,24 @@ SRCS+= aslanalyze.c aslascii.c aslbtypes.c aslcodegen.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 + 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 # components/debugger SRCS+= dbfileio.c # components/disassembler -SRCS+= dmbuffer.c dmdeferred.c dmnames.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 dsobject.c dsopcode.c \ |