svn commit: r267974 - in vendor-sys/acpica/dist: . generate/unix/acpibin generate/unix/acpidump generate/unix/acpiexamples generate/unix/acpiexec generate/unix/acpihelp generate/unix/acpinames gene...
Jung-uk Kim
jkim at FreeBSD.org
Fri Jun 27 19:10:41 UTC 2014
Author: jkim
Date: Fri Jun 27 19:10:35 2014
New Revision: 267974
URL: http://svnweb.freebsd.org/changeset/base/267974
Log:
Import ACPICA 20140627.
Added:
vendor-sys/acpica/dist/source/components/utilities/utfileio.c (contents, props changed)
vendor-sys/acpica/dist/source/components/utilities/utprint.c (contents, props changed)
vendor-sys/acpica/dist/source/include/platform/acenvex.h (contents, props changed)
vendor-sys/acpica/dist/source/include/platform/aclinuxex.h (contents, props changed)
vendor-sys/acpica/dist/source/os_specific/service_layers/osefitbl.c (contents, props changed)
vendor-sys/acpica/dist/source/os_specific/service_layers/osefixf.c (contents, props changed)
vendor-sys/acpica/dist/source/os_specific/service_layers/oslibcfs.c (contents, props changed)
Modified:
vendor-sys/acpica/dist/Makefile
vendor-sys/acpica/dist/changes.txt
vendor-sys/acpica/dist/generate/unix/acpibin/Makefile
vendor-sys/acpica/dist/generate/unix/acpidump/Makefile
vendor-sys/acpica/dist/generate/unix/acpiexamples/Makefile
vendor-sys/acpica/dist/generate/unix/acpiexec/Makefile
vendor-sys/acpica/dist/generate/unix/acpihelp/Makefile
vendor-sys/acpica/dist/generate/unix/acpinames/Makefile
vendor-sys/acpica/dist/generate/unix/acpisrc/Makefile
vendor-sys/acpica/dist/generate/unix/acpixtract/Makefile
vendor-sys/acpica/dist/generate/unix/iasl/Makefile
vendor-sys/acpica/dist/source/common/ahpredef.c
vendor-sys/acpica/dist/source/common/cmfsize.c
vendor-sys/acpica/dist/source/common/getopt.c
vendor-sys/acpica/dist/source/compiler/aslanalyze.c
vendor-sys/acpica/dist/source/compiler/aslcompiler.h
vendor-sys/acpica/dist/source/compiler/aslmain.c
vendor-sys/acpica/dist/source/compiler/aslmessages.c
vendor-sys/acpica/dist/source/compiler/aslmessages.h
vendor-sys/acpica/dist/source/compiler/aslmethod.c
vendor-sys/acpica/dist/source/compiler/asloptions.c
vendor-sys/acpica/dist/source/compiler/aslstubs.c
vendor-sys/acpica/dist/source/components/debugger/dbfileio.c
vendor-sys/acpica/dist/source/components/debugger/dbtest.c
vendor-sys/acpica/dist/source/components/disassembler/dmbuffer.c
vendor-sys/acpica/dist/source/components/disassembler/dmwalk.c
vendor-sys/acpica/dist/source/components/executer/exfield.c
vendor-sys/acpica/dist/source/components/hardware/hwregs.c
vendor-sys/acpica/dist/source/components/namespace/nsobject.c
vendor-sys/acpica/dist/source/components/tables/tbdata.c
vendor-sys/acpica/dist/source/components/tables/tbinstal.c
vendor-sys/acpica/dist/source/components/tables/tbutils.c
vendor-sys/acpica/dist/source/components/utilities/utbuffer.c
vendor-sys/acpica/dist/source/components/utilities/utclib.c
vendor-sys/acpica/dist/source/components/utilities/utcopy.c
vendor-sys/acpica/dist/source/components/utilities/utdebug.c
vendor-sys/acpica/dist/source/components/utilities/utglobal.c
vendor-sys/acpica/dist/source/components/utilities/utinit.c
vendor-sys/acpica/dist/source/include/acapps.h
vendor-sys/acpica/dist/source/include/acdebug.h
vendor-sys/acpica/dist/source/include/acglobal.h
vendor-sys/acpica/dist/source/include/acnames.h
vendor-sys/acpica/dist/source/include/acpi.h
vendor-sys/acpica/dist/source/include/acpiosxf.h
vendor-sys/acpica/dist/source/include/acpixf.h
vendor-sys/acpica/dist/source/include/acpredef.h
vendor-sys/acpica/dist/source/include/actables.h
vendor-sys/acpica/dist/source/include/actypes.h
vendor-sys/acpica/dist/source/include/acutils.h
vendor-sys/acpica/dist/source/include/platform/accygwin.h
vendor-sys/acpica/dist/source/include/platform/acefi.h
vendor-sys/acpica/dist/source/include/platform/acenv.h
vendor-sys/acpica/dist/source/include/platform/aclinux.h
vendor-sys/acpica/dist/source/os_specific/service_layers/oslinuxtbl.c
vendor-sys/acpica/dist/source/os_specific/service_layers/osunixxf.c
vendor-sys/acpica/dist/source/os_specific/service_layers/oswinxf.c
vendor-sys/acpica/dist/source/tools/acpibin/abcompare.c
vendor-sys/acpica/dist/source/tools/acpibin/abmain.c
vendor-sys/acpica/dist/source/tools/acpidump/acpidump.h
vendor-sys/acpica/dist/source/tools/acpidump/apdump.c
vendor-sys/acpica/dist/source/tools/acpidump/apfiles.c
vendor-sys/acpica/dist/source/tools/acpidump/apmain.c
vendor-sys/acpica/dist/source/tools/acpiexec/aehandlers.c
vendor-sys/acpica/dist/source/tools/acpiexec/aemain.c
vendor-sys/acpica/dist/source/tools/acpiexec/aetables.c
vendor-sys/acpica/dist/source/tools/acpihelp/ahmain.c
vendor-sys/acpica/dist/source/tools/acpinames/anmain.c
vendor-sys/acpica/dist/source/tools/acpinames/anstubs.c
vendor-sys/acpica/dist/source/tools/acpinames/antables.c
vendor-sys/acpica/dist/source/tools/acpisrc/asmain.c
vendor-sys/acpica/dist/source/tools/acpisrc/astable.c
vendor-sys/acpica/dist/source/tools/acpixtract/axmain.c
vendor-sys/acpica/dist/source/tools/examples/examples.c
vendor-sys/acpica/dist/source/tools/examples/exstubs.c
vendor-sys/acpica/dist/source/tools/examples/extables.c
Modified: vendor-sys/acpica/dist/Makefile
==============================================================================
--- vendor-sys/acpica/dist/Makefile Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/Makefile Fri Jun 27 19:10:35 2014 (r267974)
@@ -10,7 +10,13 @@
# code directories. This prevents collisions between different
# compilations of the same source file with different compile options.
#
-BUILD_DIRECTORY_PATH = "generate/unix"
-include generate/unix/Makefile.config
-include generate/unix/Makefile.common
+ifeq ($(OS),efi)
+ BUILD_DIRECTORY_PATH = "generate/efi"
+ include generate/efi/Makefile.config
+ include generate/efi/Makefile.common
+else
+ BUILD_DIRECTORY_PATH = "generate/unix"
+ include generate/unix/Makefile.config
+ include generate/unix/Makefile.common
+endif
Modified: vendor-sys/acpica/dist/changes.txt
==============================================================================
--- vendor-sys/acpica/dist/changes.txt Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/changes.txt Fri Jun 27 19:10:35 2014 (r267974)
@@ -1,4 +1,105 @@
----------------------------------------
+27 June 2014. Summary of changes for version 20140627:
+
+1) ACPICA kernel-resident subsystem:
+
+Formatted Output: Implemented local versions of standard formatted output
+utilities such as printf, etc. Over time, it has been discovered that
+there are in fact many portability issues with printf, and the addition
+of this feature will fix/prevent these issues once and for all. Some
+known issues are summarized below:
+
+1) Output of 64-bit values is not portable. For example, UINT64 is %ull
+for the Linux kernel and is %uI64 for some MSVC versions.
+2) Invoking printf consistently in a manner that is portable across both
+32-bit and 64-bit platforms is difficult at best in many situations.
+3) The output format for pointers varies from system to system (leading
+zeros especially), and leads to inconsistent output from ACPICA across
+platforms.
+4) Certain platform-specific printf formats may conflict with ACPICA use.
+5) If there is no local C library available, ACPICA now has local support
+for printf.
+
+-- To address these printf issues in a complete manner, ACPICA now
+directly implements a small subset of printf format specifiers, only
+those that it requires. Adds a new file, utilities/utprint.c. Lv Zheng.
+
+Implemented support for ACPICA generation within the EFI environment.
+Initially, the AcpiDump utility is supported in the UEFI shell
+environment. Lv Zheng.
+
+Added a new external interface, AcpiLogError, to improve ACPICA
+portability. This allows the host to redirect error messages from the
+ACPICA utilities. Lv Zheng.
+
+Added and deployed new OSL file I/O interfaces to improve ACPICA
+portability:
+ AcpiOsOpenFile
+ AcpiOsCloseFile
+ AcpiOsReadFile
+ AcpiOsWriteFile
+ AcpiOsGetFileOffset
+ AcpiOsSetFileOffset
+There are C library implementations of these functions in the new file
+service_layers/oslibcfs.c -- however, the functions can be implemented by
+the local host in any way necessary. Lv Zheng.
+
+Implemented a mechanism to disable/enable ACPI table checksum validation
+at runtime. This can be useful when loading tables very early during OS
+initialization when it may not be possible to map the entire table in
+order to compute the checksum. Lv Zheng.
+
+Fixed a buffer allocation issue for the Generic Serial Bus support.
+Originally, a fixed buffer length was used. This change allows for
+variable-length buffers based upon the protocol indicated by the field
+access attributes. Reported by Lan Tianyu. Lv Zheng.
+
+Fixed a problem where an object detached from a namespace node was not
+properly terminated/cleared and could cause a circular list problem if
+reattached. ACPICA BZ 1063. David Box.
+
+Fixed a possible recursive lock acquisition in hwregs.c. Rakib Mullick.
+
+Fixed a possible memory leak in an error return path within the function
+AcpiUtCopyIobjectToIobject. ACPICA BZ 1087. Colin Ian King.
+
+Example Code and Data Size: These are the sizes for the OS-independent
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The
+debug version of the code includes the debug output trace mechanism and
+has a much larger code and data size.
+
+ Current Release:
+ Non-Debug Version: 98.7K Code, 27.2K Data, 125.9K Total
+ Debug Version: 191.7K Code, 79.6K Data, 271.3K Total
+ Previous Release:
+ Non-Debug Version: 96.8K Code, 27.2K Data, 124.0K Total
+ Debug Version: 189.5K Code, 79.7K Data, 269.2K Total
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+Disassembler: Add dump of ASCII equivalent text within a comment at the
+end of each line of the output for the Buffer() ASL operator.
+
+AcpiDump: Miscellaneous changes:
+ Fixed repetitive table dump in -n mode.
+ For older EFI platforms, use the ACPI 1.0 GUID during RSDP search if
+the ACPI 2.0 GUID fails.
+
+iASL: Fixed a problem where the compiler could fault if incorrectly given
+an acpidump output file as input. ACPICA BZ 1088. David Box.
+
+AcpiExec/AcpiNames: Fixed a problem where these utilities could fault if
+they are invoked without any arguments.
+
+Debugger: Fixed a possible memory leak in an error return path. ACPICA BZ
+1086. Colin Ian King.
+
+Disassembler: Cleaned up a block of code that extracts a parent Op
+object. Added a comment that explains that the parent is guaranteed to be
+valid in this case. ACPICA BZ 1069.
+
+----------------------------------------
24 April 2014. Summary of changes for version 20140424:
1) ACPICA kernel-resident subsystem:
Modified: vendor-sys/acpica/dist/generate/unix/acpibin/Makefile
==============================================================================
--- vendor-sys/acpica/dist/generate/unix/acpibin/Makefile Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/generate/unix/acpibin/Makefile Fri Jun 27 19:10:35 2014 (r267974)
@@ -34,6 +34,7 @@ OBJECTS = \
$(OBJDIR)/utalloc.o\
$(OBJDIR)/utbuffer.o\
$(OBJDIR)/utcache.o\
+ $(OBJDIR)/utdebug.o\
$(OBJDIR)/utdecode.o\
$(OBJDIR)/utexcep.o\
$(OBJDIR)/utglobal.o\
@@ -41,9 +42,11 @@ OBJECTS = \
$(OBJDIR)/utmath.o\
$(OBJDIR)/utmisc.o\
$(OBJDIR)/utmutex.o\
+ $(OBJDIR)/utprint.o\
$(OBJDIR)/utstate.o\
$(OBJDIR)/utstring.o\
$(OBJDIR)/utxferror.o\
+ $(OBJDIR)/oslibcfs.o\
$(OBJDIR)/osunixxf.o
#
Modified: vendor-sys/acpica/dist/generate/unix/acpidump/Makefile
==============================================================================
--- vendor-sys/acpica/dist/generate/unix/acpidump/Makefile Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/generate/unix/acpidump/Makefile Fri Jun 27 19:10:35 2014 (r267974)
@@ -33,13 +33,18 @@ OBJECTS = \
$(OBJDIR)/apmain.o\
$(OBJDIR)/cmfsize.o\
$(OBJDIR)/getopt.o\
+ $(OBJDIR)/oslibcfs.o\
$(OBJDIR)/osunixdir.o\
$(OBJDIR)/osunixmap.o\
+ $(OBJDIR)/osunixxf.o\
$(OBJDIR)/tbprint.o\
$(OBJDIR)/tbxfroot.o\
$(OBJDIR)/utbuffer.o\
+ $(OBJDIR)/utdebug.o\
$(OBJDIR)/utexcep.o\
+ $(OBJDIR)/utglobal.o\
$(OBJDIR)/utmath.o\
+ $(OBJDIR)/utprint.o\
$(OBJDIR)/utstring.o\
$(OBJDIR)/utxferror.o
Modified: vendor-sys/acpica/dist/generate/unix/acpiexamples/Makefile
==============================================================================
--- vendor-sys/acpica/dist/generate/unix/acpiexamples/Makefile Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/generate/unix/acpiexamples/Makefile Fri Jun 27 19:10:35 2014 (r267974)
@@ -20,9 +20,10 @@ PROG = $(OBJDIR)/acpiexamples
#
vpath %.c \
$(ACPIEXAMPLES)\
- $(ACPICA_DEBUGGER)\
$(ACPICA_DISPATCHER)\
+ $(ACPICA_EVENTS)\
$(ACPICA_EXECUTER)\
+ $(ACPICA_HARDWARE)\
$(ACPICA_NAMESPACE)\
$(ACPICA_PARSER)\
$(ACPICA_TABLES)\
@@ -51,6 +52,12 @@ OBJECTS = \
$(OBJDIR)/dswload2.o\
$(OBJDIR)/dswscope.o\
$(OBJDIR)/dswstate.o\
+ $(OBJDIR)/evhandler.o\
+ $(OBJDIR)/evmisc.o\
+ $(OBJDIR)/evregion.o\
+ $(OBJDIR)/evrgnini.o\
+ $(OBJDIR)/evxface.o\
+ $(OBJDIR)/evxfregn.o\
$(OBJDIR)/exconfig.o\
$(OBJDIR)/exconvrt.o\
$(OBJDIR)/excreate.o\
@@ -75,8 +82,10 @@ OBJECTS = \
$(OBJDIR)/exstorob.o\
$(OBJDIR)/exsystem.o\
$(OBJDIR)/exutils.o\
+ $(OBJDIR)/hwpci.o\
$(OBJDIR)/nsaccess.o\
$(OBJDIR)/nsalloc.o\
+ $(OBJDIR)/nsarguments.o\
$(OBJDIR)/nsconvert.o\
$(OBJDIR)/nsdump.o\
$(OBJDIR)/nseval.o\
@@ -85,12 +94,17 @@ OBJECTS = \
$(OBJDIR)/nsnames.o\
$(OBJDIR)/nsobject.o\
$(OBJDIR)/nsparse.o\
+ $(OBJDIR)/nspredef.o\
+ $(OBJDIR)/nsprepkg.o\
+ $(OBJDIR)/nsrepair.o\
+ $(OBJDIR)/nsrepair2.o\
$(OBJDIR)/nssearch.o\
$(OBJDIR)/nsutils.o\
$(OBJDIR)/nswalk.o\
$(OBJDIR)/nsxfeval.o\
$(OBJDIR)/nsxfname.o\
$(OBJDIR)/nsxfobj.o\
+ $(OBJDIR)/oslibcfs.o\
$(OBJDIR)/osunixxf.o\
$(OBJDIR)/psargs.o\
$(OBJDIR)/psloop.o\
@@ -121,8 +135,11 @@ OBJECTS = \
$(OBJDIR)/utdecode.o\
$(OBJDIR)/utdelete.o\
$(OBJDIR)/uterror.o\
+ $(OBJDIR)/uteval.o\
$(OBJDIR)/utexcep.o\
$(OBJDIR)/utglobal.o\
+ $(OBJDIR)/utids.o\
+ $(OBJDIR)/utinit.o\
$(OBJDIR)/utlock.o\
$(OBJDIR)/utmath.o\
$(OBJDIR)/utmisc.o\
@@ -130,6 +147,9 @@ OBJECTS = \
$(OBJDIR)/utobject.o\
$(OBJDIR)/utosi.o\
$(OBJDIR)/utownerid.o\
+ $(OBJDIR)/utpredef.o\
+ $(OBJDIR)/utprint.o\
+ $(OBJDIR)/utresrc.o\
$(OBJDIR)/utstate.o\
$(OBJDIR)/utstring.o\
$(OBJDIR)/utxface.o\
Modified: vendor-sys/acpica/dist/generate/unix/acpiexec/Makefile
==============================================================================
--- vendor-sys/acpica/dist/generate/unix/acpiexec/Makefile Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/generate/unix/acpiexec/Makefile Fri Jun 27 19:10:35 2014 (r267974)
@@ -155,6 +155,7 @@ OBJECTS = \
$(OBJDIR)/nsxfeval.o\
$(OBJDIR)/nsxfname.o\
$(OBJDIR)/nsxfobj.o\
+ $(OBJDIR)/oslibcfs.o\
$(OBJDIR)/osunixxf.o\
$(OBJDIR)/psargs.o\
$(OBJDIR)/psloop.o\
@@ -201,6 +202,7 @@ OBJECTS = \
$(OBJDIR)/uterror.o\
$(OBJDIR)/uteval.o\
$(OBJDIR)/utexcep.o\
+ $(OBJDIR)/utfileio.o\
$(OBJDIR)/utglobal.o\
$(OBJDIR)/utids.o\
$(OBJDIR)/utinit.o\
@@ -212,6 +214,7 @@ OBJECTS = \
$(OBJDIR)/utosi.o\
$(OBJDIR)/utownerid.o\
$(OBJDIR)/utpredef.o\
+ $(OBJDIR)/utprint.o\
$(OBJDIR)/utresrc.o\
$(OBJDIR)/utstate.o\
$(OBJDIR)/utstring.o\
Modified: vendor-sys/acpica/dist/generate/unix/acpihelp/Makefile
==============================================================================
--- vendor-sys/acpica/dist/generate/unix/acpihelp/Makefile Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/generate/unix/acpihelp/Makefile Fri Jun 27 19:10:35 2014 (r267974)
@@ -21,7 +21,8 @@ PROG = $(OBJDIR)/acpihelp
vpath %.c \
$(ACPIHELP)\
$(ACPICA_COMMON)\
- $(ACPICA_UTILITIES)
+ $(ACPICA_UTILITIES)\
+ $(ACPICA_OSL)
HEADERS = \
$(wildcard $(ACPIHELP)/*.h)
@@ -35,8 +36,14 @@ OBJECTS = \
$(OBJDIR)/ahpredef.o\
$(OBJDIR)/ahmain.o\
$(OBJDIR)/getopt.o\
+ $(OBJDIR)/oslibcfs.o\
+ $(OBJDIR)/osunixxf.o\
+ $(OBJDIR)/utdebug.o\
$(OBJDIR)/utexcep.o\
- $(OBJDIR)/utpredef.o
+ $(OBJDIR)/utglobal.o\
+ $(OBJDIR)/utmath.o\
+ $(OBJDIR)/utpredef.o\
+ $(OBJDIR)/utprint.o
#
# Flags specific to acpihelp
Modified: vendor-sys/acpica/dist/generate/unix/acpinames/Makefile
==============================================================================
--- vendor-sys/acpica/dist/generate/unix/acpinames/Makefile Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/generate/unix/acpinames/Makefile Fri Jun 27 19:10:35 2014 (r267974)
@@ -21,7 +21,6 @@ PROG = $(OBJDIR)/acpinames
#
vpath %.c \
$(ACPINAMES)\
- $(ACPICA_DEBUGGER)\
$(ACPICA_DISPATCHER)\
$(ACPICA_EXECUTER)\
$(ACPICA_NAMESPACE)\
@@ -39,7 +38,6 @@ OBJECTS = \
$(OBJDIR)/anstubs.o\
$(OBJDIR)/antables.o\
$(OBJDIR)/cmfsize.o\
- $(OBJDIR)/dbfileio.o\
$(OBJDIR)/dsfield.o\
$(OBJDIR)/dsmthdat.o\
$(OBJDIR)/dsobject.o\
@@ -49,9 +47,12 @@ OBJECTS = \
$(OBJDIR)/dswscope.o\
$(OBJDIR)/dswstate.o\
$(OBJDIR)/excreate.o\
+ $(OBJDIR)/exdump.o\
+ $(OBJDIR)/exmutex.o\
$(OBJDIR)/exnames.o\
$(OBJDIR)/exresnte.o\
$(OBJDIR)/exresolv.o\
+ $(OBJDIR)/exsystem.o\
$(OBJDIR)/exutils.o\
$(OBJDIR)/getopt.o\
$(OBJDIR)/nsaccess.o\
@@ -68,6 +69,7 @@ OBJECTS = \
$(OBJDIR)/nsxfeval.o\
$(OBJDIR)/nsxfname.o\
$(OBJDIR)/nsxfobj.o\
+ $(OBJDIR)/oslibcfs.o\
$(OBJDIR)/osunixxf.o\
$(OBJDIR)/psargs.o\
$(OBJDIR)/psloop.o\
@@ -91,13 +93,18 @@ OBJECTS = \
$(OBJDIR)/tbxfroot.o\
$(OBJDIR)/utaddress.o\
$(OBJDIR)/utalloc.o\
+ $(OBJDIR)/utbuffer.o\
$(OBJDIR)/utcache.o\
$(OBJDIR)/utdebug.o\
$(OBJDIR)/utdecode.o\
$(OBJDIR)/utdelete.o\
$(OBJDIR)/uterror.o\
+ $(OBJDIR)/uteval.o\
$(OBJDIR)/utexcep.o\
+ $(OBJDIR)/utfileio.o\
$(OBJDIR)/utglobal.o\
+ $(OBJDIR)/utids.o\
+ $(OBJDIR)/utinit.o\
$(OBJDIR)/utlock.o\
$(OBJDIR)/utmath.o\
$(OBJDIR)/utmisc.o\
@@ -105,6 +112,7 @@ OBJECTS = \
$(OBJDIR)/utobject.o\
$(OBJDIR)/utosi.o\
$(OBJDIR)/utownerid.o\
+ $(OBJDIR)/utprint.o\
$(OBJDIR)/utstate.o\
$(OBJDIR)/utstring.o\
$(OBJDIR)/utxface.o\
Modified: vendor-sys/acpica/dist/generate/unix/acpisrc/Makefile
==============================================================================
--- vendor-sys/acpica/dist/generate/unix/acpisrc/Makefile Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/generate/unix/acpisrc/Makefile Fri Jun 27 19:10:35 2014 (r267974)
@@ -19,6 +19,7 @@ PROG = $(OBJDIR)/acpisrc
#
vpath %.c \
$(ACPISRC)\
+ $(ACPICA_UTILITIES)\
$(ACPICA_COMMON)\
$(ACPICA_OSL)
@@ -33,9 +34,17 @@ OBJECTS = \
$(OBJDIR)/asremove.o\
$(OBJDIR)/astable.o\
$(OBJDIR)/asutils.o\
- $(OBJDIR)/cmfsize.o\
+ $(OBJDIR)/cmfsize.o\
$(OBJDIR)/getopt.o \
- $(OBJDIR)/osunixdir.o
+ $(OBJDIR)/oslibcfs.o\
+ $(OBJDIR)/osunixdir.o\
+ $(OBJDIR)/osunixxf.o\
+ $(OBJDIR)/utdebug.o\
+ $(OBJDIR)/utexcep.o\
+ $(OBJDIR)/utglobal.o\
+ $(OBJDIR)/utmath.o\
+ $(OBJDIR)/utprint.o\
+ $(OBJDIR)/utxferror.o
#
# Compile flags specific to acpisrc
Modified: vendor-sys/acpica/dist/generate/unix/acpixtract/Makefile
==============================================================================
--- vendor-sys/acpica/dist/generate/unix/acpixtract/Makefile Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/generate/unix/acpixtract/Makefile Fri Jun 27 19:10:35 2014 (r267974)
@@ -19,7 +19,9 @@ PROG = $(OBJDIR)/acpixtract
#
vpath %.c \
$(ACPIXTRACT)\
- $(ACPICA_COMMON)
+ $(ACPICA_UTILITIES)\
+ $(ACPICA_COMMON)\
+ $(ACPICA_OSL)
HEADERS = \
$(wildcard $(ACPIXTRACT)/*.h)
@@ -27,7 +29,15 @@ HEADERS = \
OBJECTS = \
$(OBJDIR)/acpixtract.o\
$(OBJDIR)/axmain.o\
- $(OBJDIR)/getopt.o
+ $(OBJDIR)/getopt.o\
+ $(OBJDIR)/oslibcfs.o\
+ $(OBJDIR)/osunixxf.o\
+ $(OBJDIR)/utdebug.o\
+ $(OBJDIR)/utexcep.o\
+ $(OBJDIR)/utglobal.o\
+ $(OBJDIR)/utmath.o\
+ $(OBJDIR)/utprint.o\
+ $(OBJDIR)/utxferror.o
#
# Flags specific to acpixtract
Modified: vendor-sys/acpica/dist/generate/unix/iasl/Makefile
==============================================================================
--- vendor-sys/acpica/dist/generate/unix/iasl/Makefile Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/generate/unix/iasl/Makefile Fri Jun 27 19:10:35 2014 (r267974)
@@ -160,6 +160,7 @@ OBJECTS = \
$(OBJDIR)/nswalk.o\
$(OBJDIR)/nsxfobj.o\
$(OBJDIR)/osunixxf.o\
+ $(OBJDIR)/oslibcfs.o\
$(OBJDIR)/prexpress.o\
$(OBJDIR)/prmacros.o\
$(OBJDIR)/prscan.o\
@@ -190,6 +191,7 @@ OBJECTS = \
$(OBJDIR)/utdelete.o\
$(OBJDIR)/uterror.o\
$(OBJDIR)/utexcep.o\
+ $(OBJDIR)/utfileio.o\
$(OBJDIR)/utglobal.o\
$(OBJDIR)/utinit.o\
$(OBJDIR)/utlock.o\
@@ -199,6 +201,7 @@ OBJECTS = \
$(OBJDIR)/utobject.o\
$(OBJDIR)/utownerid.o\
$(OBJDIR)/utpredef.o\
+ $(OBJDIR)/utprint.o\
$(OBJDIR)/utresrc.o\
$(OBJDIR)/utstate.o\
$(OBJDIR)/utstring.o\
Modified: vendor-sys/acpica/dist/source/common/ahpredef.c
==============================================================================
--- vendor-sys/acpica/dist/source/common/ahpredef.c Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/source/common/ahpredef.c Fri Jun 27 19:10:35 2014 (r267974)
@@ -217,7 +217,6 @@ const AH_PREDEFINED_NAME AslPredefine
AH_PREDEF ("_PR3", "Power Resources for D3hot", "Returns a list of dependent power resources to enter state D3hot"),
AH_PREDEF ("_PRE", "Power Resources for Enumeration", "Returns a list of dependent power resources to enumerate devices on a bus"),
AH_PREDEF ("_PRL", "Power Source Redundancy List", "Returns a list of power source devices in the same redundancy grouping"),
- AH_PREDEF ("_PRP", "Device Properties", "Returns a list of device property information"),
AH_PREDEF ("_PRS", "Possible Resource Settings", "Returns a list of a device's possible resource settings"),
AH_PREDEF ("_PRT", "PCI Routing Table", "Returns a list of PCI interrupt mappings"),
AH_PREDEF ("_PRW", "Power Resources for Wake", "Returns a list of dependent power resources for waking"),
Modified: vendor-sys/acpica/dist/source/common/cmfsize.c
==============================================================================
--- vendor-sys/acpica/dist/source/common/cmfsize.c Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/source/common/cmfsize.c Fri Jun 27 19:10:35 2014 (r267974)
@@ -59,33 +59,34 @@
* RETURN: File Size. On error, -1 (ACPI_UINT32_MAX)
*
* DESCRIPTION: Get the size of a file. Uses seek-to-EOF. File must be open.
- * Does not disturb the current file pointer. Uses perror for
- * error messages.
+ * Does not disturb the current file pointer.
*
******************************************************************************/
UINT32
CmGetFileSize (
- FILE *File)
+ ACPI_FILE File)
{
long FileSize;
long CurrentOffset;
+ ACPI_STATUS Status;
/* Save the current file pointer, seek to EOF to obtain file size */
- CurrentOffset = ftell (File);
+ CurrentOffset = AcpiOsGetFileOffset (File);
if (CurrentOffset < 0)
{
goto OffsetError;
}
- if (fseek (File, 0, SEEK_END))
+ Status = AcpiOsSetFileOffset (File, 0, ACPI_FILE_END);
+ if (ACPI_FAILURE (Status))
{
goto SeekError;
}
- FileSize = ftell (File);
+ FileSize = AcpiOsGetFileOffset (File);
if (FileSize < 0)
{
goto OffsetError;
@@ -93,7 +94,8 @@ CmGetFileSize (
/* Restore original file pointer */
- if (fseek (File, CurrentOffset, SEEK_SET))
+ Status = AcpiOsSetFileOffset (File, CurrentOffset, ACPI_FILE_BEGIN);
+ if (ACPI_FAILURE (Status))
{
goto SeekError;
}
@@ -102,10 +104,10 @@ CmGetFileSize (
OffsetError:
- perror ("Could not get file offset");
+ AcpiLogError ("Could not get file offset");
return (ACPI_UINT32_MAX);
SeekError:
- perror ("Could not seek file");
+ AcpiLogError ("Could not set file offset");
return (ACPI_UINT32_MAX);
}
Modified: vendor-sys/acpica/dist/source/common/getopt.c
==============================================================================
--- vendor-sys/acpica/dist/source/common/getopt.c Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/source/common/getopt.c Fri Jun 27 19:10:35 2014 (r267974)
@@ -51,14 +51,12 @@
* "f|" - Option has required single-char sub-options
*/
-#include <stdio.h>
-#include <string.h>
#include "acpi.h"
#include "accommon.h"
#include "acapps.h"
#define ACPI_OPTION_ERROR(msg, badchar) \
- if (AcpiGbl_Opterr) {fprintf (stderr, "%s%c\n", msg, badchar);}
+ if (AcpiGbl_Opterr) {AcpiLogError ("%s%c\n", msg, badchar);}
int AcpiGbl_Opterr = 1;
@@ -123,7 +121,7 @@ AcpiGetoptArgument (
* PARAMETERS: argc, argv - from main
* opts - options info list
*
- * RETURN: Option character or EOF
+ * RETURN: Option character or ACPI_OPT_END
*
* DESCRIPTION: Get the next option
*
@@ -145,12 +143,12 @@ AcpiGetopt(
argv[AcpiGbl_Optind][0] != '-' ||
argv[AcpiGbl_Optind][1] == '\0')
{
- return (EOF);
+ return (ACPI_OPT_END);
}
- else if (strcmp (argv[AcpiGbl_Optind], "--") == 0)
+ else if (ACPI_STRCMP (argv[AcpiGbl_Optind], "--") == 0)
{
AcpiGbl_Optind++;
- return (EOF);
+ return (ACPI_OPT_END);
}
}
@@ -161,7 +159,7 @@ AcpiGetopt(
/* Make sure that the option is legal */
if (CurrentChar == ':' ||
- (OptsPtr = strchr (opts, CurrentChar)) == NULL)
+ (OptsPtr = ACPI_STRCHR (opts, CurrentChar)) == NULL)
{
ACPI_OPTION_ERROR ("Illegal option: -", CurrentChar);
Modified: vendor-sys/acpica/dist/source/compiler/aslanalyze.c
==============================================================================
--- vendor-sys/acpica/dist/source/compiler/aslanalyze.c Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/source/compiler/aslanalyze.c Fri Jun 27 19:10:35 2014 (r267974)
@@ -569,51 +569,3 @@ ApCheckRegMethod (
AslError (ASL_WARNING, ASL_MSG_NO_REGION, Op, NULL);
}
-
-
-/*******************************************************************************
- *
- * FUNCTION: ApFindNameInScope
- *
- * PARAMETERS: Name - Name to search for
- * Op - Current parse op
- *
- * RETURN: TRUE if name found in the same scope as Op.
- *
- * DESCRIPTION: Determine if a name appears in the same scope as Op, as either
- * a Method() or a Name().
- *
- ******************************************************************************/
-
-BOOLEAN
-ApFindNameInScope (
- char *Name,
- ACPI_PARSE_OBJECT *Op)
-{
- ACPI_PARSE_OBJECT *Next;
- ACPI_PARSE_OBJECT *Parent;
-
-
- /* Get the start of the current scope */
-
- Parent = Op->Asl.Parent;
- Next = Parent->Asl.Child;
-
- /* Search entire scope for a match to the name */
-
- while (Next)
- {
- if ((Next->Asl.ParseOpcode == PARSEOP_METHOD) ||
- (Next->Asl.ParseOpcode == PARSEOP_NAME))
- {
- if (ACPI_COMPARE_NAME (Name, Next->Asl.NameSeg))
- {
- return (TRUE);
- }
- }
-
- Next = Next->Asl.Next;
- }
-
- return (FALSE);
-}
Modified: vendor-sys/acpica/dist/source/compiler/aslcompiler.h
==============================================================================
--- vendor-sys/acpica/dist/source/compiler/aslcompiler.h Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/source/compiler/aslcompiler.h Fri Jun 27 19:10:35 2014 (r267974)
@@ -275,11 +275,6 @@ void
ApCheckRegMethod (
ACPI_PARSE_OBJECT *Op);
-BOOLEAN
-ApFindNameInScope (
- char *Name,
- ACPI_PARSE_OBJECT *Op);
-
/*
* aslerror - error handling/reporting
@@ -350,10 +345,6 @@ void
AeClearErrorLog (
void);
-ACPI_PHYSICAL_ADDRESS
-AeLocalGetRootPointer (
- void);
-
/*
* asllisting - generate all "listing" type files
Modified: vendor-sys/acpica/dist/source/compiler/aslmain.c
==============================================================================
--- vendor-sys/acpica/dist/source/compiler/aslmain.c Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/source/compiler/aslmain.c Fri Jun 27 19:10:35 2014 (r267974)
@@ -341,6 +341,7 @@ main (
return (-1);
}
+ AcpiOsInitialize ();
ACPI_DEBUG_INITIALIZE (); /* For debug version only */
/* Initialize preprocessor and compiler before command line processing */
Modified: vendor-sys/acpica/dist/source/compiler/aslmessages.c
==============================================================================
--- vendor-sys/acpica/dist/source/compiler/aslmessages.c Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/source/compiler/aslmessages.c Fri Jun 27 19:10:35 2014 (r267974)
@@ -233,7 +233,6 @@ const char *AslComp
/* ASL_MSG_WRITE */ "Could not write file",
/* ASL_MSG_RANGE */ "Constant out of range",
/* ASL_MSG_BUFFER_ALLOCATION */ "Could not allocate line buffer",
-/* ASL_MSG_MISSING_DEPENDENCY */ "Missing dependency"
};
/* Table compiler */
Modified: vendor-sys/acpica/dist/source/compiler/aslmessages.h
==============================================================================
--- vendor-sys/acpica/dist/source/compiler/aslmessages.h Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/source/compiler/aslmessages.h Fri Jun 27 19:10:35 2014 (r267974)
@@ -235,7 +235,6 @@ typedef enum
ASL_MSG_WRITE,
ASL_MSG_RANGE,
ASL_MSG_BUFFER_ALLOCATION,
- ASL_MSG_MISSING_DEPENDENCY,
/* These messages are used by the Data Table compiler only */
Modified: vendor-sys/acpica/dist/source/compiler/aslmethod.c
==============================================================================
--- vendor-sys/acpica/dist/source/compiler/aslmethod.c Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/source/compiler/aslmethod.c Fri Jun 27 19:10:35 2014 (r267974)
@@ -108,17 +108,6 @@ MtMethodAnalysisWalkBegin (
WalkInfo->MethodStack = MethodInfo;
- /* Special handling for _PRP, must have a _HID also */
-
- if (!ACPI_STRCMP (METHOD_NAME__PRP, Op->Asl.NameSeg))
- {
- if (!ApFindNameInScope (METHOD_NAME__HID, Op))
- {
- AslError (ASL_WARNING, ASL_MSG_MISSING_DEPENDENCY, Op,
- "_PRP requires _HID in same scope");
- }
- }
-
/* Get the name node */
Next = Op->Asl.Child;
@@ -424,15 +413,6 @@ MtMethodAnalysisWalkBegin (
}
}
- else if (!ACPI_STRCMP (METHOD_NAME__PRP, Op->Asl.NameSeg))
- {
- if (!ApFindNameInScope (METHOD_NAME__HID, Op))
- {
- AslError (ASL_WARNING, ASL_MSG_MISSING_DEPENDENCY, Op,
- "_PRP requires _HID in same scope");
- }
- }
-
break;
default:
Modified: vendor-sys/acpica/dist/source/compiler/asloptions.c
==============================================================================
--- vendor-sys/acpica/dist/source/compiler/asloptions.c Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/source/compiler/asloptions.c Fri Jun 27 19:10:35 2014 (r267974)
@@ -168,7 +168,7 @@ AslDoOptions (
/* Get the command line options */
- while ((j = AcpiGetopt (argc, argv, ASL_SUPPORTED_OPTIONS)) != EOF) switch (j)
+ while ((j = AcpiGetopt (argc, argv, ASL_SUPPORTED_OPTIONS)) != ACPI_OPT_END) switch (j)
{
case '@': /* Begin a response file */
Modified: vendor-sys/acpica/dist/source/compiler/aslstubs.c
==============================================================================
--- vendor-sys/acpica/dist/source/compiler/aslstubs.c Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/source/compiler/aslstubs.c Fri Jun 27 19:10:35 2014 (r267974)
@@ -57,13 +57,6 @@
* Things like Events, Global Lock, etc. are not used
* by the compiler, so they are stubbed out here.
*/
-ACPI_PHYSICAL_ADDRESS
-AeLocalGetRootPointer (
- void)
-{
- return (0);
-}
-
void
AcpiNsExecModuleCodeList (
void)
@@ -232,21 +225,3 @@ AcpiTbFindTable (
{
return (AE_SUPPORT);
}
-
-/* OSL interfaces */
-
-ACPI_THREAD_ID
-AcpiOsGetThreadId (
- void)
-{
- return (1);
-}
-
-ACPI_STATUS
-AcpiOsExecute (
- ACPI_EXECUTE_TYPE Type,
- ACPI_OSD_EXEC_CALLBACK Function,
- void *Context)
-{
- return (AE_SUPPORT);
-}
Modified: vendor-sys/acpica/dist/source/components/debugger/dbfileio.c
==============================================================================
--- vendor-sys/acpica/dist/source/components/debugger/dbfileio.c Fri Jun 27 19:07:35 2014 (r267973)
+++ vendor-sys/acpica/dist/source/components/debugger/dbfileio.c Fri Jun 27 19:10:35 2014 (r267974)
@@ -46,14 +46,7 @@
#include "acpi.h"
#include "accommon.h"
#include "acdebug.h"
-
-#ifdef ACPI_APPLICATION
#include "actables.h"
-#endif
-
-#ifdef ACPI_ASL_COMPILER
-#include "aslcompiler.h"
-#endif
#if (defined ACPI_DEBUGGER || defined ACPI_DISASSEMBLER)
@@ -62,18 +55,6 @@
#ifdef ACPI_DEBUGGER
-/* Local prototypes */
-
-#ifdef ACPI_APPLICATION
-
-static ACPI_STATUS
-AcpiDbCheckTextModeCorruption (
- UINT8 *Table,
- UINT32 TableLength,
- UINT32 FileLength);
-
-#endif
-
/*******************************************************************************
*
* FUNCTION: AcpiDbCloseDebugFile
@@ -146,245 +127,6 @@ AcpiDbOpenDebugFile (
/*******************************************************************************
*
- * FUNCTION: AcpiDbCheckTextModeCorruption
- *
- * PARAMETERS: Table - Table buffer
- * TableLength - Length of table from the table header
- * FileLength - Length of the file that contains the table
- *
- * RETURN: Status
- *
- * DESCRIPTION: Check table for text mode file corruption where all linefeed
- * characters (LF) have been replaced by carriage return linefeed
- * pairs (CR/LF).
- *
- ******************************************************************************/
-
-static ACPI_STATUS
-AcpiDbCheckTextModeCorruption (
- UINT8 *Table,
- UINT32 TableLength,
- UINT32 FileLength)
-{
- UINT32 i;
- UINT32 Pairs = 0;
-
-
- if (TableLength != FileLength)
- {
- ACPI_WARNING ((AE_INFO,
- "File length (0x%X) is not the same as the table length (0x%X)",
- FileLength, TableLength));
- }
-
- /* Scan entire table to determine if each LF has been prefixed with a CR */
-
- for (i = 1; i < FileLength; i++)
- {
- if (Table[i] == 0x0A)
- {
- if (Table[i - 1] != 0x0D)
- {
- /* The LF does not have a preceding CR, table not corrupted */
-
- return (AE_OK);
- }
- else
- {
- /* Found a CR/LF pair */
-
- Pairs++;
- }
- i++;
- }
- }
-
- if (!Pairs)
- {
- return (AE_OK);
- }
-
- /*
- * Entire table scanned, each CR is part of a CR/LF pair --
- * meaning that the table was treated as a text file somewhere.
- *
- * NOTE: We can't "fix" the table, because any existing CR/LF pairs in the
- * original table are left untouched by the text conversion process --
- * meaning that we cannot simply replace CR/LF pairs with LFs.
- */
- AcpiOsPrintf ("Table has been corrupted by text mode conversion\n");
- AcpiOsPrintf ("All LFs (%u) were changed to CR/LF pairs\n", Pairs);
- AcpiOsPrintf ("Table cannot be repaired!\n");
- return (AE_BAD_VALUE);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION: AcpiDbReadTable
- *
- * PARAMETERS: fp - File that contains table
- * Table - Return value, buffer with table
- * TableLength - Return value, length of table
- *
- * RETURN: Status
- *
- * DESCRIPTION: Load the DSDT from the file pointer
- *
- ******************************************************************************/
-
-static ACPI_STATUS
-AcpiDbReadTable (
- FILE *fp,
- ACPI_TABLE_HEADER **Table,
- UINT32 *TableLength)
-{
- ACPI_TABLE_HEADER TableHeader;
- UINT32 Actual;
- ACPI_STATUS Status;
- UINT32 FileSize;
- BOOLEAN StandardHeader = TRUE;
-
-
- /* Get the file size */
-
- FileSize = CmGetFileSize (fp);
- if (FileSize == ACPI_UINT32_MAX)
- {
- return (AE_ERROR);
- }
-
- if (FileSize < 4)
- {
- return (AE_BAD_HEADER);
- }
-
- /* Read the signature */
-
- if (fread (&TableHeader, 1, 4, fp) != 4)
- {
- AcpiOsPrintf ("Could not read the table signature\n");
- return (AE_BAD_HEADER);
- }
-
- fseek (fp, 0, SEEK_SET);
-
- /* The RSDP table does not have standard ACPI header */
-
- if (ACPI_COMPARE_NAME (TableHeader.Signature, "RSD "))
- {
- *TableLength = FileSize;
- StandardHeader = FALSE;
- }
- else
- {
- /* Read the table header */
-
- if (fread (&TableHeader, 1, sizeof (ACPI_TABLE_HEADER), fp) !=
- sizeof (ACPI_TABLE_HEADER))
- {
- AcpiOsPrintf ("Could not read the table header\n");
- return (AE_BAD_HEADER);
- }
-
-#if 0
- /* Validate the table header/length */
-
- Status = AcpiTbValidateTableHeader (&TableHeader);
- if (ACPI_FAILURE (Status))
- {
- AcpiOsPrintf ("Table header is invalid!\n");
- return (Status);
- }
-#endif
-
- /* File size must be at least as long as the Header-specified length */
-
- if (TableHeader.Length > FileSize)
- {
- AcpiOsPrintf (
- "TableHeader length [0x%X] greater than the input file size [0x%X]\n",
- TableHeader.Length, FileSize);
-
-#ifdef ACPI_ASL_COMPILER
- Status = FlCheckForAscii (fp, NULL, FALSE);
- if (ACPI_SUCCESS (Status))
- {
- AcpiOsPrintf ("File appears to be ASCII only, must be binary\n",
- TableHeader.Length, FileSize);
- }
-#endif
- return (AE_BAD_HEADER);
- }
-
-#ifdef ACPI_OBSOLETE_CODE
- /* We only support a limited number of table types */
-
- if (!ACPI_COMPARE_NAME ((char *) TableHeader.Signature, ACPI_SIG_DSDT) &&
- !ACPI_COMPARE_NAME ((char *) TableHeader.Signature, ACPI_SIG_PSDT) &&
- !ACPI_COMPARE_NAME ((char *) TableHeader.Signature, ACPI_SIG_SSDT))
- {
- AcpiOsPrintf ("Table signature [%4.4s] is invalid or not supported\n",
- (char *) TableHeader.Signature);
- ACPI_DUMP_BUFFER (&TableHeader, sizeof (ACPI_TABLE_HEADER));
- return (AE_ERROR);
- }
-#endif
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-all
mailing list