svn commit: r217355 - in vendor-sys/acpica/dist: . common compiler
debugger disassembler dispatcher events executer
generate/lint hardware include include/platform namespace
os_specific/service_lay...
Jung-uk Kim
jkim at FreeBSD.org
Thu Jan 13 16:12:34 UTC 2011
Author: jkim
Date: Thu Jan 13 16:12:34 2011
New Revision: 217355
URL: http://svn.freebsd.org/changeset/base/217355
Log:
Import ACPICA 20110112.
Added:
vendor-sys/acpica/dist/compiler/asluuid.c (contents, props changed)
vendor-sys/acpica/dist/tools/acpinames/
vendor-sys/acpica/dist/tools/acpinames/acpinames.h (contents, props changed)
vendor-sys/acpica/dist/tools/acpinames/anmain.c (contents, props changed)
vendor-sys/acpica/dist/tools/acpinames/anstubs.c (contents, props changed)
vendor-sys/acpica/dist/tools/acpinames/antables.c (contents, props changed)
Modified:
vendor-sys/acpica/dist/changes.txt (contents, props changed)
vendor-sys/acpica/dist/common/adfile.c (contents, props changed)
vendor-sys/acpica/dist/common/adisasm.c (contents, props changed)
vendor-sys/acpica/dist/common/adwalk.c (contents, props changed)
vendor-sys/acpica/dist/common/dmextern.c
vendor-sys/acpica/dist/common/dmrestag.c (contents, props changed)
vendor-sys/acpica/dist/common/dmtable.c (contents, props changed)
vendor-sys/acpica/dist/common/dmtbdump.c (contents, props changed)
vendor-sys/acpica/dist/common/dmtbinfo.c (contents, props changed)
vendor-sys/acpica/dist/common/getopt.c (contents, props changed)
vendor-sys/acpica/dist/compiler/Makefile
vendor-sys/acpica/dist/compiler/aslanalyze.c (contents, props changed)
vendor-sys/acpica/dist/compiler/aslcodegen.c (contents, props changed)
vendor-sys/acpica/dist/compiler/aslcompile.c (contents, props changed)
vendor-sys/acpica/dist/compiler/aslcompiler.h (contents, props changed)
vendor-sys/acpica/dist/compiler/aslcompiler.l (contents, props changed)
vendor-sys/acpica/dist/compiler/aslcompiler.y (contents, props changed)
vendor-sys/acpica/dist/compiler/asldefine.h (contents, props changed)
vendor-sys/acpica/dist/compiler/aslerror.c (contents, props changed)
vendor-sys/acpica/dist/compiler/aslfiles.c (contents, props changed)
vendor-sys/acpica/dist/compiler/aslfold.c (contents, props changed)
vendor-sys/acpica/dist/compiler/aslglobal.h (contents, props changed)
vendor-sys/acpica/dist/compiler/asllength.c (contents, props changed)
vendor-sys/acpica/dist/compiler/asllisting.c (contents, props changed)
vendor-sys/acpica/dist/compiler/aslload.c (contents, props changed)
vendor-sys/acpica/dist/compiler/asllookup.c (contents, props changed)
vendor-sys/acpica/dist/compiler/aslmain.c (contents, props changed)
vendor-sys/acpica/dist/compiler/aslmap.c (contents, props changed)
vendor-sys/acpica/dist/compiler/aslmessages.h
vendor-sys/acpica/dist/compiler/aslopcodes.c (contents, props changed)
vendor-sys/acpica/dist/compiler/asloperands.c (contents, props changed)
vendor-sys/acpica/dist/compiler/aslopt.c (contents, props changed)
vendor-sys/acpica/dist/compiler/aslpredef.c
vendor-sys/acpica/dist/compiler/aslresource.c (contents, props changed)
vendor-sys/acpica/dist/compiler/aslrestype1.c (contents, props changed)
vendor-sys/acpica/dist/compiler/aslrestype1i.c
vendor-sys/acpica/dist/compiler/aslrestype2.c (contents, props changed)
vendor-sys/acpica/dist/compiler/aslrestype2d.c
vendor-sys/acpica/dist/compiler/aslrestype2e.c
vendor-sys/acpica/dist/compiler/aslrestype2q.c
vendor-sys/acpica/dist/compiler/aslrestype2w.c
vendor-sys/acpica/dist/compiler/aslstartup.c
vendor-sys/acpica/dist/compiler/aslstubs.c (contents, props changed)
vendor-sys/acpica/dist/compiler/asltransform.c (contents, props changed)
vendor-sys/acpica/dist/compiler/asltree.c (contents, props changed)
vendor-sys/acpica/dist/compiler/asltypes.h (contents, props changed)
vendor-sys/acpica/dist/compiler/aslutils.c (contents, props changed)
vendor-sys/acpica/dist/compiler/dtcompile.c
vendor-sys/acpica/dist/compiler/dtcompiler.h
vendor-sys/acpica/dist/compiler/dtfield.c
vendor-sys/acpica/dist/compiler/dtio.c
vendor-sys/acpica/dist/compiler/dtsubtable.c
vendor-sys/acpica/dist/compiler/dttable.c
vendor-sys/acpica/dist/compiler/dttemplate.c
vendor-sys/acpica/dist/compiler/dttemplate.h
vendor-sys/acpica/dist/compiler/dtutils.c
vendor-sys/acpica/dist/debugger/dbcmds.c (contents, props changed)
vendor-sys/acpica/dist/debugger/dbdisply.c (contents, props changed)
vendor-sys/acpica/dist/debugger/dbexec.c (contents, props changed)
vendor-sys/acpica/dist/debugger/dbfileio.c (contents, props changed)
vendor-sys/acpica/dist/debugger/dbhistry.c (contents, props changed)
vendor-sys/acpica/dist/debugger/dbinput.c (contents, props changed)
vendor-sys/acpica/dist/debugger/dbstats.c (contents, props changed)
vendor-sys/acpica/dist/debugger/dbutils.c (contents, props changed)
vendor-sys/acpica/dist/debugger/dbxface.c (contents, props changed)
vendor-sys/acpica/dist/disassembler/dmbuffer.c (contents, props changed)
vendor-sys/acpica/dist/disassembler/dmnames.c (contents, props changed)
vendor-sys/acpica/dist/disassembler/dmobject.c (contents, props changed)
vendor-sys/acpica/dist/disassembler/dmopcode.c (contents, props changed)
vendor-sys/acpica/dist/disassembler/dmresrc.c (contents, props changed)
vendor-sys/acpica/dist/disassembler/dmresrcl.c (contents, props changed)
vendor-sys/acpica/dist/disassembler/dmresrcs.c (contents, props changed)
vendor-sys/acpica/dist/disassembler/dmutils.c (contents, props changed)
vendor-sys/acpica/dist/disassembler/dmwalk.c (contents, props changed)
vendor-sys/acpica/dist/dispatcher/dsfield.c (contents, props changed)
vendor-sys/acpica/dist/dispatcher/dsinit.c (contents, props changed)
vendor-sys/acpica/dist/dispatcher/dsmethod.c (contents, props changed)
vendor-sys/acpica/dist/dispatcher/dsmthdat.c (contents, props changed)
vendor-sys/acpica/dist/dispatcher/dsobject.c (contents, props changed)
vendor-sys/acpica/dist/dispatcher/dsopcode.c (contents, props changed)
vendor-sys/acpica/dist/dispatcher/dsutils.c (contents, props changed)
vendor-sys/acpica/dist/dispatcher/dswexec.c (contents, props changed)
vendor-sys/acpica/dist/dispatcher/dswload.c (contents, props changed)
vendor-sys/acpica/dist/dispatcher/dswscope.c (contents, props changed)
vendor-sys/acpica/dist/dispatcher/dswstate.c (contents, props changed)
vendor-sys/acpica/dist/events/evevent.c (contents, props changed)
vendor-sys/acpica/dist/events/evgpe.c (contents, props changed)
vendor-sys/acpica/dist/events/evgpeblk.c (contents, props changed)
vendor-sys/acpica/dist/events/evgpeinit.c
vendor-sys/acpica/dist/events/evgpeutil.c
vendor-sys/acpica/dist/events/evmisc.c (contents, props changed)
vendor-sys/acpica/dist/events/evregion.c (contents, props changed)
vendor-sys/acpica/dist/events/evrgnini.c (contents, props changed)
vendor-sys/acpica/dist/events/evsci.c (contents, props changed)
vendor-sys/acpica/dist/events/evxface.c (contents, props changed)
vendor-sys/acpica/dist/events/evxfevnt.c (contents, props changed)
vendor-sys/acpica/dist/events/evxfgpe.c
vendor-sys/acpica/dist/events/evxfregn.c (contents, props changed)
vendor-sys/acpica/dist/executer/exconfig.c (contents, props changed)
vendor-sys/acpica/dist/executer/exconvrt.c (contents, props changed)
vendor-sys/acpica/dist/executer/excreate.c (contents, props changed)
vendor-sys/acpica/dist/executer/exdebug.c
vendor-sys/acpica/dist/executer/exdump.c (contents, props changed)
vendor-sys/acpica/dist/executer/exfield.c (contents, props changed)
vendor-sys/acpica/dist/executer/exfldio.c (contents, props changed)
vendor-sys/acpica/dist/executer/exmisc.c (contents, props changed)
vendor-sys/acpica/dist/executer/exmutex.c (contents, props changed)
vendor-sys/acpica/dist/executer/exnames.c (contents, props changed)
vendor-sys/acpica/dist/executer/exoparg1.c (contents, props changed)
vendor-sys/acpica/dist/executer/exoparg2.c (contents, props changed)
vendor-sys/acpica/dist/executer/exoparg3.c (contents, props changed)
vendor-sys/acpica/dist/executer/exoparg6.c (contents, props changed)
vendor-sys/acpica/dist/executer/exprep.c (contents, props changed)
vendor-sys/acpica/dist/executer/exregion.c (contents, props changed)
vendor-sys/acpica/dist/executer/exresnte.c (contents, props changed)
vendor-sys/acpica/dist/executer/exresolv.c (contents, props changed)
vendor-sys/acpica/dist/executer/exresop.c (contents, props changed)
vendor-sys/acpica/dist/executer/exstore.c (contents, props changed)
vendor-sys/acpica/dist/executer/exstoren.c (contents, props changed)
vendor-sys/acpica/dist/executer/exstorob.c (contents, props changed)
vendor-sys/acpica/dist/executer/exsystem.c (contents, props changed)
vendor-sys/acpica/dist/executer/exutils.c (contents, props changed)
vendor-sys/acpica/dist/generate/lint/options.lnt (contents, props changed)
vendor-sys/acpica/dist/hardware/hwacpi.c (contents, props changed)
vendor-sys/acpica/dist/hardware/hwgpe.c (contents, props changed)
vendor-sys/acpica/dist/hardware/hwpci.c
vendor-sys/acpica/dist/hardware/hwregs.c (contents, props changed)
vendor-sys/acpica/dist/hardware/hwsleep.c (contents, props changed)
vendor-sys/acpica/dist/hardware/hwtimer.c (contents, props changed)
vendor-sys/acpica/dist/hardware/hwvalid.c
vendor-sys/acpica/dist/hardware/hwxface.c
vendor-sys/acpica/dist/include/acapps.h (contents, props changed)
vendor-sys/acpica/dist/include/accommon.h
vendor-sys/acpica/dist/include/acconfig.h (contents, props changed)
vendor-sys/acpica/dist/include/acdebug.h (contents, props changed)
vendor-sys/acpica/dist/include/acdisasm.h (contents, props changed)
vendor-sys/acpica/dist/include/acdispat.h (contents, props changed)
vendor-sys/acpica/dist/include/acevents.h (contents, props changed)
vendor-sys/acpica/dist/include/acexcep.h (contents, props changed)
vendor-sys/acpica/dist/include/acglobal.h (contents, props changed)
vendor-sys/acpica/dist/include/achware.h (contents, props changed)
vendor-sys/acpica/dist/include/acinterp.h (contents, props changed)
vendor-sys/acpica/dist/include/aclocal.h (contents, props changed)
vendor-sys/acpica/dist/include/acmacros.h (contents, props changed)
vendor-sys/acpica/dist/include/acnames.h (contents, props changed)
vendor-sys/acpica/dist/include/acnamesp.h (contents, props changed)
vendor-sys/acpica/dist/include/acobject.h (contents, props changed)
vendor-sys/acpica/dist/include/acopcode.h (contents, props changed)
vendor-sys/acpica/dist/include/acoutput.h (contents, props changed)
vendor-sys/acpica/dist/include/acparser.h (contents, props changed)
vendor-sys/acpica/dist/include/acpi.h (contents, props changed)
vendor-sys/acpica/dist/include/acpiosxf.h (contents, props changed)
vendor-sys/acpica/dist/include/acpixf.h (contents, props changed)
vendor-sys/acpica/dist/include/acpredef.h
vendor-sys/acpica/dist/include/acresrc.h (contents, props changed)
vendor-sys/acpica/dist/include/acrestyp.h
vendor-sys/acpica/dist/include/acstruct.h (contents, props changed)
vendor-sys/acpica/dist/include/actables.h (contents, props changed)
vendor-sys/acpica/dist/include/actbl.h (contents, props changed)
vendor-sys/acpica/dist/include/actbl1.h (contents, props changed)
vendor-sys/acpica/dist/include/actbl2.h (contents, props changed)
vendor-sys/acpica/dist/include/actypes.h (contents, props changed)
vendor-sys/acpica/dist/include/acutils.h (contents, props changed)
vendor-sys/acpica/dist/include/amlcode.h (contents, props changed)
vendor-sys/acpica/dist/include/amlresrc.h (contents, props changed)
vendor-sys/acpica/dist/include/platform/accygwin.h
vendor-sys/acpica/dist/include/platform/acefi.h (contents, props changed)
vendor-sys/acpica/dist/include/platform/acenv.h (contents, props changed)
vendor-sys/acpica/dist/include/platform/acfreebsd.h (contents, props changed)
vendor-sys/acpica/dist/include/platform/acgcc.h (contents, props changed)
vendor-sys/acpica/dist/include/platform/acintel.h
vendor-sys/acpica/dist/include/platform/aclinux.h
vendor-sys/acpica/dist/include/platform/acmsvc.h
vendor-sys/acpica/dist/include/platform/acnetbsd.h
vendor-sys/acpica/dist/include/platform/acos2.h
vendor-sys/acpica/dist/include/platform/acwin.h
vendor-sys/acpica/dist/include/platform/acwin64.h
vendor-sys/acpica/dist/namespace/nsaccess.c (contents, props changed)
vendor-sys/acpica/dist/namespace/nsalloc.c (contents, props changed)
vendor-sys/acpica/dist/namespace/nsdump.c (contents, props changed)
vendor-sys/acpica/dist/namespace/nsdumpdv.c (contents, props changed)
vendor-sys/acpica/dist/namespace/nseval.c (contents, props changed)
vendor-sys/acpica/dist/namespace/nsinit.c (contents, props changed)
vendor-sys/acpica/dist/namespace/nsload.c (contents, props changed)
vendor-sys/acpica/dist/namespace/nsnames.c (contents, props changed)
vendor-sys/acpica/dist/namespace/nsobject.c (contents, props changed)
vendor-sys/acpica/dist/namespace/nsparse.c (contents, props changed)
vendor-sys/acpica/dist/namespace/nspredef.c
vendor-sys/acpica/dist/namespace/nsrepair.c
vendor-sys/acpica/dist/namespace/nsrepair2.c
vendor-sys/acpica/dist/namespace/nssearch.c (contents, props changed)
vendor-sys/acpica/dist/namespace/nsutils.c (contents, props changed)
vendor-sys/acpica/dist/namespace/nswalk.c (contents, props changed)
vendor-sys/acpica/dist/namespace/nsxfeval.c (contents, props changed)
vendor-sys/acpica/dist/namespace/nsxfname.c (contents, props changed)
vendor-sys/acpica/dist/namespace/nsxfobj.c (contents, props changed)
vendor-sys/acpica/dist/os_specific/service_layers/osunixdir.c
vendor-sys/acpica/dist/os_specific/service_layers/osunixxf.c
vendor-sys/acpica/dist/os_specific/service_layers/oswindir.c
vendor-sys/acpica/dist/os_specific/service_layers/oswintbl.c
vendor-sys/acpica/dist/os_specific/service_layers/oswinxf.c
vendor-sys/acpica/dist/osunixxf.c (contents, props changed)
vendor-sys/acpica/dist/parser/psargs.c (contents, props changed)
vendor-sys/acpica/dist/parser/psloop.c (contents, props changed)
vendor-sys/acpica/dist/parser/psopcode.c (contents, props changed)
vendor-sys/acpica/dist/parser/psparse.c (contents, props changed)
vendor-sys/acpica/dist/parser/psscope.c (contents, props changed)
vendor-sys/acpica/dist/parser/pstree.c (contents, props changed)
vendor-sys/acpica/dist/parser/psutils.c (contents, props changed)
vendor-sys/acpica/dist/parser/pswalk.c (contents, props changed)
vendor-sys/acpica/dist/parser/psxface.c (contents, props changed)
vendor-sys/acpica/dist/resources/rsaddr.c (contents, props changed)
vendor-sys/acpica/dist/resources/rscalc.c (contents, props changed)
vendor-sys/acpica/dist/resources/rscreate.c (contents, props changed)
vendor-sys/acpica/dist/resources/rsdump.c (contents, props changed)
vendor-sys/acpica/dist/resources/rsinfo.c (contents, props changed)
vendor-sys/acpica/dist/resources/rsio.c (contents, props changed)
vendor-sys/acpica/dist/resources/rsirq.c (contents, props changed)
vendor-sys/acpica/dist/resources/rslist.c (contents, props changed)
vendor-sys/acpica/dist/resources/rsmemory.c (contents, props changed)
vendor-sys/acpica/dist/resources/rsmisc.c (contents, props changed)
vendor-sys/acpica/dist/resources/rsutils.c (contents, props changed)
vendor-sys/acpica/dist/resources/rsxface.c (contents, props changed)
vendor-sys/acpica/dist/tables/tbfadt.c (contents, props changed)
vendor-sys/acpica/dist/tables/tbfind.c (contents, props changed)
vendor-sys/acpica/dist/tables/tbinstal.c (contents, props changed)
vendor-sys/acpica/dist/tables/tbutils.c (contents, props changed)
vendor-sys/acpica/dist/tables/tbxface.c (contents, props changed)
vendor-sys/acpica/dist/tables/tbxfroot.c (contents, props changed)
vendor-sys/acpica/dist/tests/misc/grammar.asl (contents, props changed)
vendor-sys/acpica/dist/tools/acpiexec/aecommon.h (contents, props changed)
vendor-sys/acpica/dist/tools/acpiexec/aeexec.c
vendor-sys/acpica/dist/tools/acpiexec/aehandlers.c
vendor-sys/acpica/dist/tools/acpiexec/aemain.c
vendor-sys/acpica/dist/tools/acpiexec/aetables.c
vendor-sys/acpica/dist/tools/acpiexec/aetables.h
vendor-sys/acpica/dist/tools/acpiexec/osunixdir.c
vendor-sys/acpica/dist/tools/acpisrc/acpisrc.h
vendor-sys/acpica/dist/tools/acpisrc/ascase.c
vendor-sys/acpica/dist/tools/acpisrc/asconvrt.c
vendor-sys/acpica/dist/tools/acpisrc/asfile.c
vendor-sys/acpica/dist/tools/acpisrc/asmain.c
vendor-sys/acpica/dist/tools/acpisrc/asremove.c
vendor-sys/acpica/dist/tools/acpisrc/astable.c
vendor-sys/acpica/dist/tools/acpisrc/asutils.c
vendor-sys/acpica/dist/tools/acpisrc/osunixdir.c
vendor-sys/acpica/dist/tools/acpixtract/acpixtract.c
vendor-sys/acpica/dist/tools/examples/examples.c
vendor-sys/acpica/dist/utilities/utalloc.c (contents, props changed)
vendor-sys/acpica/dist/utilities/utcache.c (contents, props changed)
vendor-sys/acpica/dist/utilities/utclib.c (contents, props changed)
vendor-sys/acpica/dist/utilities/utcopy.c (contents, props changed)
vendor-sys/acpica/dist/utilities/utdebug.c (contents, props changed)
vendor-sys/acpica/dist/utilities/utdelete.c (contents, props changed)
vendor-sys/acpica/dist/utilities/uteval.c (contents, props changed)
vendor-sys/acpica/dist/utilities/utglobal.c (contents, props changed)
vendor-sys/acpica/dist/utilities/utids.c
vendor-sys/acpica/dist/utilities/utinit.c (contents, props changed)
vendor-sys/acpica/dist/utilities/utlock.c
vendor-sys/acpica/dist/utilities/utmath.c (contents, props changed)
vendor-sys/acpica/dist/utilities/utmisc.c (contents, props changed)
vendor-sys/acpica/dist/utilities/utmutex.c (contents, props changed)
vendor-sys/acpica/dist/utilities/utobject.c (contents, props changed)
vendor-sys/acpica/dist/utilities/utosi.c
vendor-sys/acpica/dist/utilities/utresrc.c (contents, props changed)
vendor-sys/acpica/dist/utilities/utstate.c (contents, props changed)
vendor-sys/acpica/dist/utilities/uttrack.c (contents, props changed)
vendor-sys/acpica/dist/utilities/utxface.c (contents, props changed)
vendor-sys/acpica/dist/utilities/utxferror.c
Directory Properties:
vendor-sys/acpica/dist/README (props changed)
vendor-sys/acpica/dist/generate/lint/files.lnt (props changed)
vendor-sys/acpica/dist/generate/lint/lint.bat (props changed)
vendor-sys/acpica/dist/generate/lint/lset.bat (props changed)
vendor-sys/acpica/dist/generate/lint/std16.lnt (props changed)
vendor-sys/acpica/dist/generate/lint/std32.lnt (props changed)
vendor-sys/acpica/dist/generate/lint/std64.lnt (props changed)
vendor-sys/acpica/dist/tests/misc/badcode.asl (props changed)
Modified: vendor-sys/acpica/dist/changes.txt
==============================================================================
--- vendor-sys/acpica/dist/changes.txt Thu Jan 13 15:17:29 2011 (r217354)
+++ vendor-sys/acpica/dist/changes.txt Thu Jan 13 16:12:34 2011 (r217355)
@@ -1,7 +1,76 @@
----------------------------------------
-09 December 2010. Summary of changes for version 20101209:
+12 January 2011. Summary of changes for version 20110112:
+
+1) ACPI CA Core Subsystem:
-This release is available at www.acpica.org/downloads
+Fixed a race condition between method execution and namespace walks that can
+possibly cause a fault. The problem was apparently introduced in version
+20100528 as a result of a performance optimization that reduces the number of
+namespace walks upon method exit by using the delete_namespace_subtree
+function instead of the delete_namespace_by_owner function used previously.
+Bug is a missing namespace lock in the delete_namespace_subtree function.
+dana.myers at oracle.com
+
+Fixed several issues and a possible fault with the automatic "serialized"
+method support. History: This support changes a method to "serialized" on the
+fly if the method generates an AE_ALREADY_EXISTS error, indicating the
+possibility that it cannot handle reentrancy. This fix repairs a couple of
+issues seen in the field, especially on machines with many cores:
+
+ 1) Delete method children only upon the exit of the last thread,
+ so as to not delete objects out from under other running threads
+ (and possibly causing a fault.)
+ 2) Set the "serialized" bit for the method only upon the exit of the
+ Last thread, so as to not cause deadlock when running threads
+ attempt to exit.
+ 3) Cleanup the use of the AML "MethodFlags" and internal method flags
+ so that there is no longer any confusion between the two.
+
+ Lin Ming, Bob Moore. Reported by dana.myers at oracle.com.
+
+Debugger: Now lock the namespace for duration of a namespace dump. Prevents
+issues if the namespace is changing dynamically underneath the debugger.
+Especially affects temporary namespace nodes, since the debugger displays
+these also.
+
+Updated the ordering of include files. The ACPICA headers should appear
+before any compiler-specific headers (stdio.h, etc.) so that acenv.h can set
+any necessary compiler-specific defines, etc. Affects the ACPI-related tools
+and utilities.
+
+Updated all ACPICA copyrights and signons to 2011. Added the 2011 copyright
+to all module headers and signons, including the Linux header. This affects
+virtually every file in the ACPICA core subsystem, iASL compiler, and all
+utilities.
+
+Added project files for MS Visual Studio 2008 (VC++ 9.0). The original
+project files for VC++ 6.0 are now obsolete. New project files can be found
+under acpica/generate/msvc9. See acpica/generate/msvc9/readme.txt for
+details.
+
+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.
+
+ Previous Release (VC 6.0):
+ Non-Debug Version: 89.8K Code, 18.9K Data, 108.7K Total
+ Debug Version: 166.6K Code, 52.1K Data, 218.7K Total
+ Current Release (VC 9.0):
+ Non-Debug Version: 89.7K Code, 23.7K Data, 113.4K Total
+ Debug Version: 163.9K Code, 67.5K Data, 231.4K Total
+
+2) iASL Compiler/Disassembler and Tools:
+
+iASL: Added generic data types to the Data Table compiler. Add "generic" data
+types such as UINT32, String, Unicode, etc., to simplify the generation of
+platform-defined tables such as UEFI. Lin Ming.
+
+iASL: Added listing support for the Data Table Compiler. Adds listing support
+(-l) to display actual binary output for each line of input code.
+
+----------------------------------------
+09 December 2010. Summary of changes for version 20101209:
1) ACPI CA Core Subsystem:
@@ -73,8 +142,6 @@ execution, including the buffer overflow
----------------------------------------
13 October 2010. Summary of changes for version 20101013:
-This release is available at www.acpica.org/downloads
-
1) ACPI CA Core Subsystem:
Added support to clear the PCIEXP_WAKE event. When clearing ACPI events, now
@@ -133,8 +200,6 @@ iASL: Moved all compiler messages to a n
----------------------------------------
15 September 2010. Summary of changes for version 20100915:
-This release is available at www.acpica.org/downloads
-
1) ACPI CA Core Subsystem:
Removed the AcpiOsDerivePciId OSL interface. The various host implementations
Modified: vendor-sys/acpica/dist/common/adfile.c
==============================================================================
--- vendor-sys/acpica/dist/common/adfile.c Thu Jan 13 15:17:29 2011 (r217354)
+++ vendor-sys/acpica/dist/common/adfile.c Thu Jan 13 16:12:34 2011 (r217355)
@@ -4,114 +4,42 @@
*
*****************************************************************************/
-/******************************************************************************
- *
- * 1. Copyright Notice
- *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+/*
+ * Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
- * 2. License
- *
- * 2.1. This is your license from Intel Corp. under its intellectual property
- * rights. You may have additional license terms from the party that provided
- * you this software, covering your right to use that party's intellectual
- * property rights.
- *
- * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a
- * copy of the source code appearing in this file ("Covered Code") an
- * irrevocable, perpetual, worldwide license under Intel's copyrights in the
- * base code distributed originally by Intel ("Original Intel Code") to copy,
- * make derivatives, distribute, use and display any portion of the Covered
- * Code in any form, with the right to sublicense such rights; and
- *
- * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent
- * license (with the right to sublicense), under only those claims of Intel
- * patents that are infringed by the Original Intel Code, to make, use, sell,
- * offer to sell, and import the Covered Code and derivative works thereof
- * solely to the minimum extent necessary to exercise the above copyright
- * license, and in no event shall the patent license extend to any additions
- * to or modifications of the Original Intel Code. No other license or right
- * is granted directly or by implication, estoppel or otherwise;
- *
- * The above copyright and patent license is granted only if the following
- * conditions are met:
- *
- * 3. Conditions
- *
- * 3.1. Redistribution of Source with Rights to Further Distribute Source.
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification with rights to further distribute source must include
- * the above Copyright Notice, the above License, this list of Conditions,
- * and the following Disclaimer and Export Compliance provision. In addition,
- * Licensee must cause all Covered Code to which Licensee contributes to
- * contain a file documenting the changes Licensee made to create that Covered
- * Code and the date of any change. Licensee must include in that file the
- * documentation of any changes made by any predecessor Licensee. Licensee
- * must include a prominent statement that the modification is derived,
- * directly or indirectly, from Original Intel Code.
- *
- * 3.2. Redistribution of Source with no Rights to Further Distribute Source.
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification without rights to further distribute source must
- * include the following Disclaimer and Export Compliance provision in the
- * documentation and/or other materials provided with distribution. In
- * addition, Licensee may not authorize further sublicense of source of any
- * portion of the Covered Code, and must include terms to the effect that the
- * license from Licensee to its licensee is limited to the intellectual
- * property embodied in the software Licensee provides to its licensee, and
- * not to intellectual property embodied in modifications its licensee may
- * make.
- *
- * 3.3. Redistribution of Executable. Redistribution in executable form of any
- * substantial portion of the Covered Code or modification must reproduce the
- * above Copyright Notice, and the following Disclaimer and Export Compliance
- * provision in the documentation and/or other materials provided with the
- * distribution.
- *
- * 3.4. Intel retains all right, title, and interest in and to the Original
- * Intel Code.
- *
- * 3.5. Neither the name Intel nor any other trademark owned or controlled by
- * Intel shall be used in advertising or otherwise to promote the sale, use or
- * other dealings in products derived from or relating to the Covered Code
- * without prior written authorization from Intel.
- *
- * 4. Disclaimer and Export Compliance
- *
- * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED
- * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE
- * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE,
- * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY
- * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY
- * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A
- * PARTICULAR PURPOSE.
- *
- * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES
- * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR
- * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT,
- * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY
- * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL
- * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS
- * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY
- * LIMITED REMEDY.
- *
- * 4.3. Licensee shall not export, either directly or indirectly, any of this
- * software or system incorporating such software without first obtaining any
- * required license or other approval from the U. S. Department of Commerce or
- * any other agency or department of the United States Government. In the
- * event Licensee exports any such software from the United States or
- * re-exports any such software from a foreign destination, Licensee shall
- * ensure that the distribution and export/re-export of the software is in
- * compliance with all laws, regulations, orders, or other restrictions of the
- * U.S. Export Administration Regulations. Licensee agrees that neither it nor
- * any of its subsidiaries will export/re-export any technical data, process,
- * software, or service, directly or indirectly, to any country for which the
- * United States government or any agency thereof requires an export license,
- * other governmental approval, or letter of assurance, without first obtaining
- * such license, approval or letter.
- *
- *****************************************************************************/
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions, and the following disclaimer,
+ * without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ * substantially similar to the "NO WARRANTY" disclaimer below
+ * ("Disclaimer") and any redistribution must be conditioned upon
+ * including a substantially similar Disclaimer requirement for further
+ * binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
#include "acpi.h"
Modified: vendor-sys/acpica/dist/common/adisasm.c
==============================================================================
--- vendor-sys/acpica/dist/common/adisasm.c Thu Jan 13 15:17:29 2011 (r217354)
+++ vendor-sys/acpica/dist/common/adisasm.c Thu Jan 13 16:12:34 2011 (r217355)
@@ -4,114 +4,42 @@
*
*****************************************************************************/
-/******************************************************************************
- *
- * 1. Copyright Notice
- *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+/*
+ * Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
- * 2. License
- *
- * 2.1. This is your license from Intel Corp. under its intellectual property
- * rights. You may have additional license terms from the party that provided
- * you this software, covering your right to use that party's intellectual
- * property rights.
- *
- * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a
- * copy of the source code appearing in this file ("Covered Code") an
- * irrevocable, perpetual, worldwide license under Intel's copyrights in the
- * base code distributed originally by Intel ("Original Intel Code") to copy,
- * make derivatives, distribute, use and display any portion of the Covered
- * Code in any form, with the right to sublicense such rights; and
- *
- * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent
- * license (with the right to sublicense), under only those claims of Intel
- * patents that are infringed by the Original Intel Code, to make, use, sell,
- * offer to sell, and import the Covered Code and derivative works thereof
- * solely to the minimum extent necessary to exercise the above copyright
- * license, and in no event shall the patent license extend to any additions
- * to or modifications of the Original Intel Code. No other license or right
- * is granted directly or by implication, estoppel or otherwise;
- *
- * The above copyright and patent license is granted only if the following
- * conditions are met:
- *
- * 3. Conditions
- *
- * 3.1. Redistribution of Source with Rights to Further Distribute Source.
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification with rights to further distribute source must include
- * the above Copyright Notice, the above License, this list of Conditions,
- * and the following Disclaimer and Export Compliance provision. In addition,
- * Licensee must cause all Covered Code to which Licensee contributes to
- * contain a file documenting the changes Licensee made to create that Covered
- * Code and the date of any change. Licensee must include in that file the
- * documentation of any changes made by any predecessor Licensee. Licensee
- * must include a prominent statement that the modification is derived,
- * directly or indirectly, from Original Intel Code.
- *
- * 3.2. Redistribution of Source with no Rights to Further Distribute Source.
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification without rights to further distribute source must
- * include the following Disclaimer and Export Compliance provision in the
- * documentation and/or other materials provided with distribution. In
- * addition, Licensee may not authorize further sublicense of source of any
- * portion of the Covered Code, and must include terms to the effect that the
- * license from Licensee to its licensee is limited to the intellectual
- * property embodied in the software Licensee provides to its licensee, and
- * not to intellectual property embodied in modifications its licensee may
- * make.
- *
- * 3.3. Redistribution of Executable. Redistribution in executable form of any
- * substantial portion of the Covered Code or modification must reproduce the
- * above Copyright Notice, and the following Disclaimer and Export Compliance
- * provision in the documentation and/or other materials provided with the
- * distribution.
- *
- * 3.4. Intel retains all right, title, and interest in and to the Original
- * Intel Code.
- *
- * 3.5. Neither the name Intel nor any other trademark owned or controlled by
- * Intel shall be used in advertising or otherwise to promote the sale, use or
- * other dealings in products derived from or relating to the Covered Code
- * without prior written authorization from Intel.
- *
- * 4. Disclaimer and Export Compliance
- *
- * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED
- * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE
- * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE,
- * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY
- * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY
- * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A
- * PARTICULAR PURPOSE.
- *
- * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES
- * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR
- * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT,
- * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY
- * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL
- * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS
- * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY
- * LIMITED REMEDY.
- *
- * 4.3. Licensee shall not export, either directly or indirectly, any of this
- * software or system incorporating such software without first obtaining any
- * required license or other approval from the U. S. Department of Commerce or
- * any other agency or department of the United States Government. In the
- * event Licensee exports any such software from the United States or
- * re-exports any such software from a foreign destination, Licensee shall
- * ensure that the distribution and export/re-export of the software is in
- * compliance with all laws, regulations, orders, or other restrictions of the
- * U.S. Export Administration Regulations. Licensee agrees that neither it nor
- * any of its subsidiaries will export/re-export any technical data, process,
- * software, or service, directly or indirectly, to any country for which the
- * United States government or any agency thereof requires an export license,
- * other governmental approval, or letter of assurance, without first obtaining
- * such license, approval or letter.
- *
- *****************************************************************************/
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions, and the following disclaimer,
+ * without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ * substantially similar to the "NO WARRANTY" disclaimer below
+ * ("Disclaimer") and any redistribution must be conditioned upon
+ * including a substantially similar Disclaimer requirement for further
+ * binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
#include "acpi.h"
@@ -667,7 +595,7 @@ AdCreateTableHeader (
if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_DSDT))
{
- AcpiOsPrintf (" **** ACPI 1.0, no 64-bit math support");
+ AcpiOsPrintf (" **** 32-bit table (V1), no 64-bit math support");
}
break;
Modified: vendor-sys/acpica/dist/common/adwalk.c
==============================================================================
--- vendor-sys/acpica/dist/common/adwalk.c Thu Jan 13 15:17:29 2011 (r217354)
+++ vendor-sys/acpica/dist/common/adwalk.c Thu Jan 13 16:12:34 2011 (r217355)
@@ -4,114 +4,42 @@
*
*****************************************************************************/
-/******************************************************************************
- *
- * 1. Copyright Notice
- *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+/*
+ * Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
- * 2. License
- *
- * 2.1. This is your license from Intel Corp. under its intellectual property
- * rights. You may have additional license terms from the party that provided
- * you this software, covering your right to use that party's intellectual
- * property rights.
- *
- * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a
- * copy of the source code appearing in this file ("Covered Code") an
- * irrevocable, perpetual, worldwide license under Intel's copyrights in the
- * base code distributed originally by Intel ("Original Intel Code") to copy,
- * make derivatives, distribute, use and display any portion of the Covered
- * Code in any form, with the right to sublicense such rights; and
- *
- * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent
- * license (with the right to sublicense), under only those claims of Intel
- * patents that are infringed by the Original Intel Code, to make, use, sell,
- * offer to sell, and import the Covered Code and derivative works thereof
- * solely to the minimum extent necessary to exercise the above copyright
- * license, and in no event shall the patent license extend to any additions
- * to or modifications of the Original Intel Code. No other license or right
- * is granted directly or by implication, estoppel or otherwise;
- *
- * The above copyright and patent license is granted only if the following
- * conditions are met:
- *
- * 3. Conditions
- *
- * 3.1. Redistribution of Source with Rights to Further Distribute Source.
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification with rights to further distribute source must include
- * the above Copyright Notice, the above License, this list of Conditions,
- * and the following Disclaimer and Export Compliance provision. In addition,
- * Licensee must cause all Covered Code to which Licensee contributes to
- * contain a file documenting the changes Licensee made to create that Covered
- * Code and the date of any change. Licensee must include in that file the
- * documentation of any changes made by any predecessor Licensee. Licensee
- * must include a prominent statement that the modification is derived,
- * directly or indirectly, from Original Intel Code.
- *
- * 3.2. Redistribution of Source with no Rights to Further Distribute Source.
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification without rights to further distribute source must
- * include the following Disclaimer and Export Compliance provision in the
- * documentation and/or other materials provided with distribution. In
- * addition, Licensee may not authorize further sublicense of source of any
- * portion of the Covered Code, and must include terms to the effect that the
- * license from Licensee to its licensee is limited to the intellectual
- * property embodied in the software Licensee provides to its licensee, and
- * not to intellectual property embodied in modifications its licensee may
- * make.
- *
- * 3.3. Redistribution of Executable. Redistribution in executable form of any
- * substantial portion of the Covered Code or modification must reproduce the
- * above Copyright Notice, and the following Disclaimer and Export Compliance
- * provision in the documentation and/or other materials provided with the
- * distribution.
- *
- * 3.4. Intel retains all right, title, and interest in and to the Original
- * Intel Code.
- *
- * 3.5. Neither the name Intel nor any other trademark owned or controlled by
- * Intel shall be used in advertising or otherwise to promote the sale, use or
- * other dealings in products derived from or relating to the Covered Code
- * without prior written authorization from Intel.
- *
- * 4. Disclaimer and Export Compliance
- *
- * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED
- * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE
- * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE,
- * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY
- * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY
- * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A
- * PARTICULAR PURPOSE.
- *
- * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES
- * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR
- * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT,
- * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY
- * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL
- * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS
- * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY
- * LIMITED REMEDY.
- *
- * 4.3. Licensee shall not export, either directly or indirectly, any of this
- * software or system incorporating such software without first obtaining any
- * required license or other approval from the U. S. Department of Commerce or
- * any other agency or department of the United States Government. In the
- * event Licensee exports any such software from the United States or
- * re-exports any such software from a foreign destination, Licensee shall
- * ensure that the distribution and export/re-export of the software is in
- * compliance with all laws, regulations, orders, or other restrictions of the
- * U.S. Export Administration Regulations. Licensee agrees that neither it nor
- * any of its subsidiaries will export/re-export any technical data, process,
- * software, or service, directly or indirectly, to any country for which the
- * United States government or any agency thereof requires an export license,
- * other governmental approval, or letter of assurance, without first obtaining
- * such license, approval or letter.
- *
- *****************************************************************************/
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions, and the following disclaimer,
+ * without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ * substantially similar to the "NO WARRANTY" disclaimer below
+ * ("Disclaimer") and any redistribution must be conditioned upon
+ * including a substantially similar Disclaimer requirement for further
+ * binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
#include "acpi.h"
Modified: vendor-sys/acpica/dist/common/dmextern.c
==============================================================================
--- vendor-sys/acpica/dist/common/dmextern.c Thu Jan 13 15:17:29 2011 (r217354)
+++ vendor-sys/acpica/dist/common/dmextern.c Thu Jan 13 16:12:34 2011 (r217355)
@@ -4,114 +4,42 @@
*
*****************************************************************************/
-/******************************************************************************
- *
- * 1. Copyright Notice
- *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+/*
+ * Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
- * 2. License
- *
- * 2.1. This is your license from Intel Corp. under its intellectual property
- * rights. You may have additional license terms from the party that provided
- * you this software, covering your right to use that party's intellectual
- * property rights.
- *
- * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a
- * copy of the source code appearing in this file ("Covered Code") an
- * irrevocable, perpetual, worldwide license under Intel's copyrights in the
- * base code distributed originally by Intel ("Original Intel Code") to copy,
- * make derivatives, distribute, use and display any portion of the Covered
- * Code in any form, with the right to sublicense such rights; and
- *
- * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent
- * license (with the right to sublicense), under only those claims of Intel
- * patents that are infringed by the Original Intel Code, to make, use, sell,
- * offer to sell, and import the Covered Code and derivative works thereof
- * solely to the minimum extent necessary to exercise the above copyright
- * license, and in no event shall the patent license extend to any additions
- * to or modifications of the Original Intel Code. No other license or right
- * is granted directly or by implication, estoppel or otherwise;
- *
- * The above copyright and patent license is granted only if the following
- * conditions are met:
- *
- * 3. Conditions
- *
- * 3.1. Redistribution of Source with Rights to Further Distribute Source.
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification with rights to further distribute source must include
- * the above Copyright Notice, the above License, this list of Conditions,
- * and the following Disclaimer and Export Compliance provision. In addition,
- * Licensee must cause all Covered Code to which Licensee contributes to
- * contain a file documenting the changes Licensee made to create that Covered
- * Code and the date of any change. Licensee must include in that file the
- * documentation of any changes made by any predecessor Licensee. Licensee
- * must include a prominent statement that the modification is derived,
- * directly or indirectly, from Original Intel Code.
- *
- * 3.2. Redistribution of Source with no Rights to Further Distribute Source.
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification without rights to further distribute source must
- * include the following Disclaimer and Export Compliance provision in the
- * documentation and/or other materials provided with distribution. In
- * addition, Licensee may not authorize further sublicense of source of any
- * portion of the Covered Code, and must include terms to the effect that the
- * license from Licensee to its licensee is limited to the intellectual
- * property embodied in the software Licensee provides to its licensee, and
- * not to intellectual property embodied in modifications its licensee may
- * make.
- *
- * 3.3. Redistribution of Executable. Redistribution in executable form of any
- * substantial portion of the Covered Code or modification must reproduce the
- * above Copyright Notice, and the following Disclaimer and Export Compliance
- * provision in the documentation and/or other materials provided with the
- * distribution.
- *
- * 3.4. Intel retains all right, title, and interest in and to the Original
- * Intel Code.
- *
- * 3.5. Neither the name Intel nor any other trademark owned or controlled by
- * Intel shall be used in advertising or otherwise to promote the sale, use or
- * other dealings in products derived from or relating to the Covered Code
- * without prior written authorization from Intel.
- *
- * 4. Disclaimer and Export Compliance
- *
- * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED
- * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE
- * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE,
- * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY
- * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY
- * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A
- * PARTICULAR PURPOSE.
- *
- * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES
- * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR
- * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT,
- * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY
- * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL
- * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS
- * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY
- * LIMITED REMEDY.
- *
- * 4.3. Licensee shall not export, either directly or indirectly, any of this
- * software or system incorporating such software without first obtaining any
- * required license or other approval from the U. S. Department of Commerce or
- * any other agency or department of the United States Government. In the
- * event Licensee exports any such software from the United States or
- * re-exports any such software from a foreign destination, Licensee shall
- * ensure that the distribution and export/re-export of the software is in
- * compliance with all laws, regulations, orders, or other restrictions of the
- * U.S. Export Administration Regulations. Licensee agrees that neither it nor
- * any of its subsidiaries will export/re-export any technical data, process,
- * software, or service, directly or indirectly, to any country for which the
- * United States government or any agency thereof requires an export license,
- * other governmental approval, or letter of assurance, without first obtaining
- * such license, approval or letter.
- *
- *****************************************************************************/
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions, and the following disclaimer,
+ * without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ * substantially similar to the "NO WARRANTY" disclaimer below
+ * ("Disclaimer") and any redistribution must be conditioned upon
+ * including a substantially similar Disclaimer requirement for further
+ * binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
#include "acpi.h"
#include "accommon.h"
Modified: vendor-sys/acpica/dist/common/dmrestag.c
==============================================================================
--- vendor-sys/acpica/dist/common/dmrestag.c Thu Jan 13 15:17:29 2011 (r217354)
+++ vendor-sys/acpica/dist/common/dmrestag.c Thu Jan 13 16:12:34 2011 (r217355)
@@ -4,114 +4,42 @@
*
*****************************************************************************/
-/******************************************************************************
- *
- * 1. Copyright Notice
- *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+/*
+ * Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
- * 2. License
- *
- * 2.1. This is your license from Intel Corp. under its intellectual property
- * rights. You may have additional license terms from the party that provided
- * you this software, covering your right to use that party's intellectual
- * property rights.
- *
- * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a
- * copy of the source code appearing in this file ("Covered Code") an
- * irrevocable, perpetual, worldwide license under Intel's copyrights in the
- * base code distributed originally by Intel ("Original Intel Code") to copy,
- * make derivatives, distribute, use and display any portion of the Covered
- * Code in any form, with the right to sublicense such rights; and
- *
- * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent
- * license (with the right to sublicense), under only those claims of Intel
- * patents that are infringed by the Original Intel Code, to make, use, sell,
- * offer to sell, and import the Covered Code and derivative works thereof
- * solely to the minimum extent necessary to exercise the above copyright
- * license, and in no event shall the patent license extend to any additions
- * to or modifications of the Original Intel Code. No other license or right
- * is granted directly or by implication, estoppel or otherwise;
- *
- * The above copyright and patent license is granted only if the following
- * conditions are met:
- *
- * 3. Conditions
- *
- * 3.1. Redistribution of Source with Rights to Further Distribute Source.
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification with rights to further distribute source must include
- * the above Copyright Notice, the above License, this list of Conditions,
- * and the following Disclaimer and Export Compliance provision. In addition,
- * Licensee must cause all Covered Code to which Licensee contributes to
- * contain a file documenting the changes Licensee made to create that Covered
- * Code and the date of any change. Licensee must include in that file the
- * documentation of any changes made by any predecessor Licensee. Licensee
- * must include a prominent statement that the modification is derived,
- * directly or indirectly, from Original Intel Code.
- *
- * 3.2. Redistribution of Source with no Rights to Further Distribute Source.
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification without rights to further distribute source must
- * include the following Disclaimer and Export Compliance provision in the
- * documentation and/or other materials provided with distribution. In
- * addition, Licensee may not authorize further sublicense of source of any
- * portion of the Covered Code, and must include terms to the effect that the
- * license from Licensee to its licensee is limited to the intellectual
- * property embodied in the software Licensee provides to its licensee, and
- * not to intellectual property embodied in modifications its licensee may
- * make.
- *
- * 3.3. Redistribution of Executable. Redistribution in executable form of any
- * substantial portion of the Covered Code or modification must reproduce the
- * above Copyright Notice, and the following Disclaimer and Export Compliance
- * provision in the documentation and/or other materials provided with the
- * distribution.
- *
- * 3.4. Intel retains all right, title, and interest in and to the Original
- * Intel Code.
- *
- * 3.5. Neither the name Intel nor any other trademark owned or controlled by
- * Intel shall be used in advertising or otherwise to promote the sale, use or
- * other dealings in products derived from or relating to the Covered Code
- * without prior written authorization from Intel.
- *
- * 4. Disclaimer and Export Compliance
- *
- * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED
- * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE
- * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE,
- * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY
- * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY
- * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A
- * PARTICULAR PURPOSE.
- *
- * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES
- * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR
- * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT,
- * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY
- * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL
- * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS
- * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY
- * LIMITED REMEDY.
- *
- * 4.3. Licensee shall not export, either directly or indirectly, any of this
- * software or system incorporating such software without first obtaining any
- * required license or other approval from the U. S. Department of Commerce or
- * any other agency or department of the United States Government. In the
- * event Licensee exports any such software from the United States or
- * re-exports any such software from a foreign destination, Licensee shall
- * ensure that the distribution and export/re-export of the software is in
- * compliance with all laws, regulations, orders, or other restrictions of the
- * U.S. Export Administration Regulations. Licensee agrees that neither it nor
- * any of its subsidiaries will export/re-export any technical data, process,
- * software, or service, directly or indirectly, to any country for which the
- * United States government or any agency thereof requires an export license,
- * other governmental approval, or letter of assurance, without first obtaining
- * such license, approval or letter.
- *
- *****************************************************************************/
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions, and the following disclaimer,
+ * without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ * substantially similar to the "NO WARRANTY" disclaimer below
+ * ("Disclaimer") and any redistribution must be conditioned upon
+ * including a substantially similar Disclaimer requirement for further
+ * binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
#include "acpi.h"
Modified: vendor-sys/acpica/dist/common/dmtable.c
==============================================================================
--- vendor-sys/acpica/dist/common/dmtable.c Thu Jan 13 15:17:29 2011 (r217354)
+++ vendor-sys/acpica/dist/common/dmtable.c Thu Jan 13 16:12:34 2011 (r217355)
@@ -4,114 +4,42 @@
*
*****************************************************************************/
-/******************************************************************************
- *
- * 1. Copyright Notice
- *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+/*
+ * Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
- * 2. License
- *
- * 2.1. This is your license from Intel Corp. under its intellectual property
- * rights. You may have additional license terms from the party that provided
- * you this software, covering your right to use that party's intellectual
- * property rights.
- *
- * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a
- * copy of the source code appearing in this file ("Covered Code") an
- * irrevocable, perpetual, worldwide license under Intel's copyrights in the
- * base code distributed originally by Intel ("Original Intel Code") to copy,
- * make derivatives, distribute, use and display any portion of the Covered
- * Code in any form, with the right to sublicense such rights; and
- *
- * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent
- * license (with the right to sublicense), under only those claims of Intel
- * patents that are infringed by the Original Intel Code, to make, use, sell,
- * offer to sell, and import the Covered Code and derivative works thereof
- * solely to the minimum extent necessary to exercise the above copyright
- * license, and in no event shall the patent license extend to any additions
- * to or modifications of the Original Intel Code. No other license or right
- * is granted directly or by implication, estoppel or otherwise;
- *
- * The above copyright and patent license is granted only if the following
- * conditions are met:
- *
- * 3. Conditions
- *
- * 3.1. Redistribution of Source with Rights to Further Distribute Source.
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification with rights to further distribute source must include
- * the above Copyright Notice, the above License, this list of Conditions,
- * and the following Disclaimer and Export Compliance provision. In addition,
- * Licensee must cause all Covered Code to which Licensee contributes to
- * contain a file documenting the changes Licensee made to create that Covered
- * Code and the date of any change. Licensee must include in that file the
- * documentation of any changes made by any predecessor Licensee. Licensee
- * must include a prominent statement that the modification is derived,
- * directly or indirectly, from Original Intel Code.
- *
- * 3.2. Redistribution of Source with no Rights to Further Distribute Source.
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification without rights to further distribute source must
- * include the following Disclaimer and Export Compliance provision in the
- * documentation and/or other materials provided with distribution. In
- * addition, Licensee may not authorize further sublicense of source of any
- * portion of the Covered Code, and must include terms to the effect that the
- * license from Licensee to its licensee is limited to the intellectual
- * property embodied in the software Licensee provides to its licensee, and
- * not to intellectual property embodied in modifications its licensee may
- * make.
- *
- * 3.3. Redistribution of Executable. Redistribution in executable form of any
- * substantial portion of the Covered Code or modification must reproduce the
- * above Copyright Notice, and the following Disclaimer and Export Compliance
- * provision in the documentation and/or other materials provided with the
- * distribution.
- *
- * 3.4. Intel retains all right, title, and interest in and to the Original
- * Intel Code.
- *
- * 3.5. Neither the name Intel nor any other trademark owned or controlled by
- * Intel shall be used in advertising or otherwise to promote the sale, use or
- * other dealings in products derived from or relating to the Covered Code
- * without prior written authorization from Intel.
- *
- * 4. Disclaimer and Export Compliance
- *
- * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED
- * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE
- * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE,
- * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY
- * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY
- * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A
- * PARTICULAR PURPOSE.
- *
- * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES
- * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR
- * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT,
- * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY
- * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL
- * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS
- * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY
- * LIMITED REMEDY.
- *
- * 4.3. Licensee shall not export, either directly or indirectly, any of this
- * software or system incorporating such software without first obtaining any
- * required license or other approval from the U. S. Department of Commerce or
- * any other agency or department of the United States Government. In the
- * event Licensee exports any such software from the United States or
- * re-exports any such software from a foreign destination, Licensee shall
- * ensure that the distribution and export/re-export of the software is in
- * compliance with all laws, regulations, orders, or other restrictions of the
- * U.S. Export Administration Regulations. Licensee agrees that neither it nor
- * any of its subsidiaries will export/re-export any technical data, process,
- * software, or service, directly or indirectly, to any country for which the
- * United States government or any agency thereof requires an export license,
- * other governmental approval, or letter of assurance, without first obtaining
- * such license, approval or letter.
- *
- *****************************************************************************/
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions, and the following disclaimer,
+ * without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ * substantially similar to the "NO WARRANTY" disclaimer below
+ * ("Disclaimer") and any redistribution must be conditioned upon
+ * including a substantially similar Disclaimer requirement for further
+ * binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-all
mailing list