svn commit: r202771 - in head: sys/contrib/dev/acpica
sys/contrib/dev/acpica/common sys/contrib/dev/acpica/compiler
sys/contrib/dev/acpica/debugger
sys/contrib/dev/acpica/disassembler sys/contrib/d...
Jung-uk Kim
jkim at FreeBSD.org
Thu Jan 21 21:14:29 UTC 2010
Author: jkim
Date: Thu Jan 21 21:14:28 2010
New Revision: 202771
URL: http://svn.freebsd.org/changeset/base/202771
Log:
Merge ACPICA 20100121.
Modified:
head/sys/contrib/dev/acpica/changes.txt
head/sys/contrib/dev/acpica/common/adfile.c
head/sys/contrib/dev/acpica/common/adisasm.c
head/sys/contrib/dev/acpica/common/adwalk.c
head/sys/contrib/dev/acpica/common/dmextern.c
head/sys/contrib/dev/acpica/common/dmrestag.c
head/sys/contrib/dev/acpica/common/dmtable.c
head/sys/contrib/dev/acpica/common/dmtbdump.c
head/sys/contrib/dev/acpica/common/dmtbinfo.c
head/sys/contrib/dev/acpica/common/getopt.c
head/sys/contrib/dev/acpica/compiler/aslanalyze.c
head/sys/contrib/dev/acpica/compiler/aslcodegen.c
head/sys/contrib/dev/acpica/compiler/aslcompile.c
head/sys/contrib/dev/acpica/compiler/aslcompiler.h
head/sys/contrib/dev/acpica/compiler/aslcompiler.l
head/sys/contrib/dev/acpica/compiler/aslcompiler.y
head/sys/contrib/dev/acpica/compiler/asldefine.h
head/sys/contrib/dev/acpica/compiler/aslerror.c
head/sys/contrib/dev/acpica/compiler/aslfiles.c
head/sys/contrib/dev/acpica/compiler/aslfold.c
head/sys/contrib/dev/acpica/compiler/aslglobal.h
head/sys/contrib/dev/acpica/compiler/asllength.c
head/sys/contrib/dev/acpica/compiler/asllisting.c
head/sys/contrib/dev/acpica/compiler/aslload.c
head/sys/contrib/dev/acpica/compiler/asllookup.c
head/sys/contrib/dev/acpica/compiler/aslmain.c
head/sys/contrib/dev/acpica/compiler/aslmap.c
head/sys/contrib/dev/acpica/compiler/aslopcodes.c
head/sys/contrib/dev/acpica/compiler/asloperands.c
head/sys/contrib/dev/acpica/compiler/aslopt.c
head/sys/contrib/dev/acpica/compiler/aslresource.c
head/sys/contrib/dev/acpica/compiler/aslrestype1.c
head/sys/contrib/dev/acpica/compiler/aslrestype2.c
head/sys/contrib/dev/acpica/compiler/aslstartup.c
head/sys/contrib/dev/acpica/compiler/aslstubs.c
head/sys/contrib/dev/acpica/compiler/asltransform.c
head/sys/contrib/dev/acpica/compiler/asltree.c
head/sys/contrib/dev/acpica/compiler/asltypes.h
head/sys/contrib/dev/acpica/compiler/aslutils.c
head/sys/contrib/dev/acpica/debugger/dbcmds.c
head/sys/contrib/dev/acpica/debugger/dbdisply.c
head/sys/contrib/dev/acpica/debugger/dbexec.c
head/sys/contrib/dev/acpica/debugger/dbfileio.c
head/sys/contrib/dev/acpica/debugger/dbhistry.c
head/sys/contrib/dev/acpica/debugger/dbinput.c
head/sys/contrib/dev/acpica/debugger/dbstats.c
head/sys/contrib/dev/acpica/debugger/dbutils.c
head/sys/contrib/dev/acpica/debugger/dbxface.c
head/sys/contrib/dev/acpica/disassembler/dmbuffer.c
head/sys/contrib/dev/acpica/disassembler/dmnames.c
head/sys/contrib/dev/acpica/disassembler/dmobject.c
head/sys/contrib/dev/acpica/disassembler/dmopcode.c
head/sys/contrib/dev/acpica/disassembler/dmresrc.c
head/sys/contrib/dev/acpica/disassembler/dmresrcl.c
head/sys/contrib/dev/acpica/disassembler/dmresrcs.c
head/sys/contrib/dev/acpica/disassembler/dmutils.c
head/sys/contrib/dev/acpica/disassembler/dmwalk.c
head/sys/contrib/dev/acpica/dispatcher/dsfield.c
head/sys/contrib/dev/acpica/dispatcher/dsinit.c
head/sys/contrib/dev/acpica/dispatcher/dsmethod.c
head/sys/contrib/dev/acpica/dispatcher/dsmthdat.c
head/sys/contrib/dev/acpica/dispatcher/dsobject.c
head/sys/contrib/dev/acpica/dispatcher/dsopcode.c
head/sys/contrib/dev/acpica/dispatcher/dsutils.c
head/sys/contrib/dev/acpica/dispatcher/dswexec.c
head/sys/contrib/dev/acpica/dispatcher/dswload.c
head/sys/contrib/dev/acpica/dispatcher/dswscope.c
head/sys/contrib/dev/acpica/dispatcher/dswstate.c
head/sys/contrib/dev/acpica/events/evevent.c
head/sys/contrib/dev/acpica/events/evgpe.c
head/sys/contrib/dev/acpica/events/evgpeblk.c
head/sys/contrib/dev/acpica/events/evmisc.c
head/sys/contrib/dev/acpica/events/evregion.c
head/sys/contrib/dev/acpica/events/evrgnini.c
head/sys/contrib/dev/acpica/events/evsci.c
head/sys/contrib/dev/acpica/events/evxface.c
head/sys/contrib/dev/acpica/events/evxfevnt.c
head/sys/contrib/dev/acpica/events/evxfregn.c
head/sys/contrib/dev/acpica/executer/exconfig.c
head/sys/contrib/dev/acpica/executer/exconvrt.c
head/sys/contrib/dev/acpica/executer/excreate.c
head/sys/contrib/dev/acpica/executer/exdump.c
head/sys/contrib/dev/acpica/executer/exfield.c
head/sys/contrib/dev/acpica/executer/exfldio.c
head/sys/contrib/dev/acpica/executer/exmisc.c
head/sys/contrib/dev/acpica/executer/exmutex.c
head/sys/contrib/dev/acpica/executer/exnames.c
head/sys/contrib/dev/acpica/executer/exoparg1.c
head/sys/contrib/dev/acpica/executer/exoparg2.c
head/sys/contrib/dev/acpica/executer/exoparg3.c
head/sys/contrib/dev/acpica/executer/exoparg6.c
head/sys/contrib/dev/acpica/executer/exprep.c
head/sys/contrib/dev/acpica/executer/exregion.c
head/sys/contrib/dev/acpica/executer/exresnte.c
head/sys/contrib/dev/acpica/executer/exresolv.c
head/sys/contrib/dev/acpica/executer/exresop.c
head/sys/contrib/dev/acpica/executer/exstore.c
head/sys/contrib/dev/acpica/executer/exstoren.c
head/sys/contrib/dev/acpica/executer/exstorob.c
head/sys/contrib/dev/acpica/executer/exsystem.c
head/sys/contrib/dev/acpica/executer/exutils.c
head/sys/contrib/dev/acpica/hardware/hwacpi.c
head/sys/contrib/dev/acpica/hardware/hwgpe.c
head/sys/contrib/dev/acpica/hardware/hwregs.c
head/sys/contrib/dev/acpica/hardware/hwsleep.c
head/sys/contrib/dev/acpica/hardware/hwtimer.c
head/sys/contrib/dev/acpica/hardware/hwvalid.c
head/sys/contrib/dev/acpica/hardware/hwxface.c
head/sys/contrib/dev/acpica/include/acapps.h
head/sys/contrib/dev/acpica/include/accommon.h
head/sys/contrib/dev/acpica/include/acconfig.h
head/sys/contrib/dev/acpica/include/acdebug.h
head/sys/contrib/dev/acpica/include/acdisasm.h
head/sys/contrib/dev/acpica/include/acdispat.h
head/sys/contrib/dev/acpica/include/acevents.h
head/sys/contrib/dev/acpica/include/acexcep.h
head/sys/contrib/dev/acpica/include/acglobal.h
head/sys/contrib/dev/acpica/include/achware.h
head/sys/contrib/dev/acpica/include/acinterp.h
head/sys/contrib/dev/acpica/include/aclocal.h
head/sys/contrib/dev/acpica/include/acmacros.h
head/sys/contrib/dev/acpica/include/acnames.h
head/sys/contrib/dev/acpica/include/acnamesp.h
head/sys/contrib/dev/acpica/include/acobject.h
head/sys/contrib/dev/acpica/include/acopcode.h
head/sys/contrib/dev/acpica/include/acoutput.h
head/sys/contrib/dev/acpica/include/acparser.h
head/sys/contrib/dev/acpica/include/acpi.h
head/sys/contrib/dev/acpica/include/acpiosxf.h
head/sys/contrib/dev/acpica/include/acpixf.h
head/sys/contrib/dev/acpica/include/acpredef.h
head/sys/contrib/dev/acpica/include/acresrc.h
head/sys/contrib/dev/acpica/include/acrestyp.h
head/sys/contrib/dev/acpica/include/acstruct.h
head/sys/contrib/dev/acpica/include/actables.h
head/sys/contrib/dev/acpica/include/actbl.h
head/sys/contrib/dev/acpica/include/actbl1.h
head/sys/contrib/dev/acpica/include/actbl2.h
head/sys/contrib/dev/acpica/include/actypes.h
head/sys/contrib/dev/acpica/include/acutils.h
head/sys/contrib/dev/acpica/include/amlcode.h
head/sys/contrib/dev/acpica/include/amlresrc.h
head/sys/contrib/dev/acpica/include/platform/acenv.h
head/sys/contrib/dev/acpica/include/platform/acfreebsd.h
head/sys/contrib/dev/acpica/include/platform/acgcc.h
head/sys/contrib/dev/acpica/namespace/nsaccess.c
head/sys/contrib/dev/acpica/namespace/nsalloc.c
head/sys/contrib/dev/acpica/namespace/nsdump.c
head/sys/contrib/dev/acpica/namespace/nsdumpdv.c
head/sys/contrib/dev/acpica/namespace/nseval.c
head/sys/contrib/dev/acpica/namespace/nsinit.c
head/sys/contrib/dev/acpica/namespace/nsload.c
head/sys/contrib/dev/acpica/namespace/nsnames.c
head/sys/contrib/dev/acpica/namespace/nsobject.c
head/sys/contrib/dev/acpica/namespace/nsparse.c
head/sys/contrib/dev/acpica/namespace/nspredef.c
head/sys/contrib/dev/acpica/namespace/nsrepair.c
head/sys/contrib/dev/acpica/namespace/nsrepair2.c
head/sys/contrib/dev/acpica/namespace/nssearch.c
head/sys/contrib/dev/acpica/namespace/nsutils.c
head/sys/contrib/dev/acpica/namespace/nswalk.c
head/sys/contrib/dev/acpica/namespace/nsxfeval.c
head/sys/contrib/dev/acpica/namespace/nsxfname.c
head/sys/contrib/dev/acpica/namespace/nsxfobj.c
head/sys/contrib/dev/acpica/osunixxf.c
head/sys/contrib/dev/acpica/parser/psargs.c
head/sys/contrib/dev/acpica/parser/psloop.c
head/sys/contrib/dev/acpica/parser/psopcode.c
head/sys/contrib/dev/acpica/parser/psparse.c
head/sys/contrib/dev/acpica/parser/psscope.c
head/sys/contrib/dev/acpica/parser/pstree.c
head/sys/contrib/dev/acpica/parser/psutils.c
head/sys/contrib/dev/acpica/parser/pswalk.c
head/sys/contrib/dev/acpica/parser/psxface.c
head/sys/contrib/dev/acpica/resources/rsaddr.c
head/sys/contrib/dev/acpica/resources/rscalc.c
head/sys/contrib/dev/acpica/resources/rscreate.c
head/sys/contrib/dev/acpica/resources/rsdump.c
head/sys/contrib/dev/acpica/resources/rsinfo.c
head/sys/contrib/dev/acpica/resources/rsio.c
head/sys/contrib/dev/acpica/resources/rsirq.c
head/sys/contrib/dev/acpica/resources/rslist.c
head/sys/contrib/dev/acpica/resources/rsmemory.c
head/sys/contrib/dev/acpica/resources/rsmisc.c
head/sys/contrib/dev/acpica/resources/rsutils.c
head/sys/contrib/dev/acpica/resources/rsxface.c
head/sys/contrib/dev/acpica/tables/tbfadt.c
head/sys/contrib/dev/acpica/tables/tbfind.c
head/sys/contrib/dev/acpica/tables/tbinstal.c
head/sys/contrib/dev/acpica/tables/tbutils.c
head/sys/contrib/dev/acpica/tables/tbxface.c
head/sys/contrib/dev/acpica/tables/tbxfroot.c
head/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h
head/sys/contrib/dev/acpica/utilities/utalloc.c
head/sys/contrib/dev/acpica/utilities/utcache.c
head/sys/contrib/dev/acpica/utilities/utcopy.c
head/sys/contrib/dev/acpica/utilities/utdebug.c
head/sys/contrib/dev/acpica/utilities/utdelete.c
head/sys/contrib/dev/acpica/utilities/uteval.c
head/sys/contrib/dev/acpica/utilities/utglobal.c
head/sys/contrib/dev/acpica/utilities/utids.c
head/sys/contrib/dev/acpica/utilities/utinit.c
head/sys/contrib/dev/acpica/utilities/utlock.c
head/sys/contrib/dev/acpica/utilities/utmath.c
head/sys/contrib/dev/acpica/utilities/utmisc.c
head/sys/contrib/dev/acpica/utilities/utmutex.c
head/sys/contrib/dev/acpica/utilities/utobject.c
head/sys/contrib/dev/acpica/utilities/utresrc.c
head/sys/contrib/dev/acpica/utilities/utstate.c
head/sys/contrib/dev/acpica/utilities/uttrack.c
head/sys/contrib/dev/acpica/utilities/utxface.c
head/sys/dev/acpi_support/acpi_ibm.c
head/sys/dev/acpi_support/acpi_panasonic.c
head/sys/dev/acpi_support/acpi_wmi.c
head/sys/dev/acpica/Osd/OsdHardware.c
head/sys/dev/acpica/Osd/OsdSchedule.c
head/sys/dev/acpica/acpi_ec.c
head/sys/dev/acpica/acpi_if.m
head/sys/dev/acpica/acpi_package.c
head/sys/dev/acpica/acpi_powerres.c
head/sys/dev/acpica/acpi_smbat.c
head/sys/dev/acpica/acpivar.h
head/usr.sbin/acpi/acpidb/acpidb.c
Directory Properties:
head/sys/contrib/dev/acpica/ (props changed)
Modified: head/sys/contrib/dev/acpica/changes.txt
==============================================================================
--- head/sys/contrib/dev/acpica/changes.txt Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/changes.txt Thu Jan 21 21:14:28 2010 (r202771)
@@ -1,7 +1,55 @@
----------------------------------------
-14 December 2009. Summary of changes for version 20091214:
+21 January 2010. Summary of changes for version 20100121:
+
+1) ACPI CA Core Subsystem:
-This release is available at www.acpica.org/downloads
+Added the 2010 copyright to all module headers and signons. This affects
+virtually every file in the ACPICA core subsystem, the iASL compiler, the
+tools/utilities, and the test suites.
+
+Implemented a change to the AcpiGetDevices interface to eliminate unnecessary
+invocations of the _STA method. In the case where a specific _HID is
+requested, do not run _STA until a _HID match is found. This eliminates
+potentially dozens of _STA calls during a search for a particular device/HID,
+which in turn can improve boot times. ACPICA BZ 828. Lin Ming.
+
+Implemented an additional repair for predefined method return values. Attempt
+to repair unexpected NULL elements within returned Package objects. Create an
+Integer of value zero, a NULL String, or a zero-length Buffer as appropriate.
+ACPICA BZ 818. Lin Ming, Bob Moore.
+
+Removed the obsolete ACPI_INTEGER data type. This type was introduced as the
+code was migrated from ACPI 1.0 (with 32-bit AML integers) to ACPI 2.0 (with
+64-bit AML integers). It is now obsolete and this change removes it from the
+ACPICA code base, replaced by UINT64. The original typedef has been retained
+for now for compatibility with existing device driver code. ACPICA BZ 824.
+
+Removed the unused UINT32_STRUCT type, and the obsolete Integer64 field in
+the parse tree object.
+
+Added additional warning options for the gcc-4 generation. Updated the source
+accordingly. This includes some code restructuring to eliminate unreachable
+code, elimination of some gotos, elimination of unused return values, some
+additional casting, and removal of redundant declarations.
+
+Example Code and Data Size: These are the sizes for the OS-independent
+acpica.lib produced by the Microsoft Visual C++ 6.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:
+ Non-Debug Version: 87.0K Code, 18.0K Data, 105.0K Total
+ Debug Version: 163.4K Code, 50.8K Data, 214.2K Total
+ Current Release:
+ Non-Debug Version: 87.1K Code, 18.0K Data, 105.1K Total
+ Debug Version: 163.5K Code, 50.9K Data, 214.4K Total
+
+2) iASL Compiler/Disassembler and Tools:
+
+No functional changes for this release.
+
+----------------------------------------
+14 December 2009. Summary of changes for version 20091214:
1) ACPI CA Core Subsystem:
@@ -68,8 +116,6 @@ depend on a specific initial value for a
----------------------------------------
12 November 2009. Summary of changes for version 20091112:
-This release is available at www.acpica.org/downloads
-
1) ACPI CA Core Subsystem:
Implemented a post-order callback to AcpiWalkNamespace. The existing
@@ -141,8 +187,6 @@ level set very high.
----------------------------------------
13 October 2009. Summary of changes for version 20091013:
-This release is available at www.acpica.org/downloads
-
1) ACPI CA Core Subsystem:
Fixed a problem where an Operation Region _REG method could be executed more
@@ -1037,9 +1081,6 @@ header.
29 July 2008. Summary of changes for version 20080729:
-This release is available at http://acpica.org/downloads
-Direct git access via http://www.acpica.org/repos/acpica.git
-
1) ACPI CA Core Subsystem:
Fix a possible deadlock in the GPE dispatch. Remove call to
@@ -1129,9 +1170,6 @@ completion message. Previously, no messa
----------------------------------------
01 July 2008. Summary of changes for version 20080701:
-This release is available at http://acpica.org/downloads
-Direct git access via http://www.acpica.org/repos/acpica.git
-
0) Git source tree / acpica.org
Fixed a problem where a git-clone from http would not transfer the entire
Modified: head/sys/contrib/dev/acpica/common/adfile.c
==============================================================================
--- head/sys/contrib/dev/acpica/common/adfile.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/common/adfile.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/common/adisasm.c
==============================================================================
--- head/sys/contrib/dev/acpica/common/adisasm.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/common/adisasm.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/common/adwalk.c
==============================================================================
--- head/sys/contrib/dev/acpica/common/adwalk.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/common/adwalk.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/common/dmextern.c
==============================================================================
--- head/sys/contrib/dev/acpica/common/dmextern.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/common/dmextern.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/common/dmrestag.c
==============================================================================
--- head/sys/contrib/dev/acpica/common/dmrestag.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/common/dmrestag.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/common/dmtable.c
==============================================================================
--- head/sys/contrib/dev/acpica/common/dmtable.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/common/dmtable.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/common/dmtbdump.c
==============================================================================
--- head/sys/contrib/dev/acpica/common/dmtbdump.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/common/dmtbdump.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/common/dmtbinfo.c
==============================================================================
--- head/sys/contrib/dev/acpica/common/dmtbinfo.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/common/dmtbinfo.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/common/getopt.c
==============================================================================
--- head/sys/contrib/dev/acpica/common/getopt.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/common/getopt.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/compiler/aslanalyze.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslanalyze.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/aslanalyze.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -667,8 +667,8 @@ AnCheckForReservedName (
{
/* The next two characters must be hex digits */
- if ((isxdigit (Name[2])) &&
- (isxdigit (Name[3])))
+ if ((isxdigit ((int) Name[2])) &&
+ (isxdigit ((int) Name[3])))
{
return (ACPI_EVENT_RESERVED_NAME);
}
@@ -1236,7 +1236,7 @@ AnMethodAnalysisWalkBegin (
*/
for (i = 0; Next->Asl.Value.String[i]; i++)
{
- if (!isalnum (Next->Asl.Value.String[i]))
+ if (!isalnum ((int) Next->Asl.Value.String[i]))
{
AslError (ASL_ERROR, ASL_MSG_ALPHANUMERIC_STRING,
Next, Next->Asl.Value.String);
@@ -2157,7 +2157,7 @@ AnOtherSemanticAnalysisWalkBegin (
*/
if (((ArgNode->Asl.ParseOpcode == PARSEOP_WORDCONST) ||
(ArgNode->Asl.ParseOpcode == PARSEOP_INTEGER)) &&
- (ArgNode->Asl.Value.Integer >= (ACPI_INTEGER) ACPI_WAIT_FOREVER))
+ (ArgNode->Asl.Value.Integer >= (UINT64) ACPI_WAIT_FOREVER))
{
break;
}
Modified: head/sys/contrib/dev/acpica/compiler/aslcodegen.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslcodegen.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/aslcodegen.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/compiler/aslcompile.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslcompile.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/aslcompile.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/compiler/aslcompiler.h
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslcompiler.h Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/aslcompiler.h Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -511,7 +511,7 @@ TrCreateLeafNode (
ACPI_PARSE_OBJECT *
TrCreateValuedLeafNode (
UINT32 ParseOpcode,
- ACPI_INTEGER Value);
+ UINT64 Value);
ACPI_PARSE_OBJECT *
TrLinkChildren (
@@ -718,7 +718,7 @@ UtCheckIntegerRange (
UINT32 LowValue,
UINT32 HighValue);
-ACPI_INTEGER
+UINT64
UtDoConstant (
char *String);
Modified: head/sys/contrib/dev/acpica/compiler/aslcompiler.l
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslcompiler.l Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/aslcompiler.l Thu Jan 21 21:14:28 2010 (r202771)
@@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/compiler/aslcompiler.y
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslcompiler.y Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/aslcompiler.y Thu Jan 21 21:14:28 2010 (r202771)
@@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -2388,7 +2388,7 @@ QWordConstExpr
ConstExprTerm
: PARSEOP_ZERO {$$ = TrCreateValuedLeafNode (PARSEOP_ZERO, 0);}
| PARSEOP_ONE {$$ = TrCreateValuedLeafNode (PARSEOP_ONE, 1);}
- | PARSEOP_ONES {$$ = TrCreateValuedLeafNode (PARSEOP_ONES, ACPI_INTEGER_MAX);}
+ | PARSEOP_ONES {$$ = TrCreateValuedLeafNode (PARSEOP_ONES, ACPI_UINT64_MAX);}
;
/* OptionalCount must appear before ByteList or an incorrect reduction will result */
Modified: head/sys/contrib/dev/acpica/compiler/asldefine.h
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/asldefine.h Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/asldefine.h Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -127,7 +127,7 @@
#define IntelAcpiCA "Intel ACPI Component Architecture"
#define CompilerId "ASL Optimizing Compiler"
#define DisassemblerId "AML Disassembler"
-#define CompilerCopyright "Copyright (C) 2000 - 2009 Intel Corporation"
+#define CompilerCopyright "Copyright (c) 2000 - 2010 Intel Corporation"
#define CompilerCompliance "Supports ACPI Specification Revision 4.0"
#define CompilerName "iasl"
#define CompilerCreatorId "INTL"
Modified: head/sys/contrib/dev/acpica/compiler/aslerror.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslerror.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/aslerror.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -169,13 +169,7 @@ AeAddToErrorLog (
ASL_ERROR_MSG *Prev;
- if (!Gbl_ErrorLog)
- {
- Gbl_ErrorLog = Enode;
- return;
- }
-
- /* List is sorted according to line number */
+ /* If Gbl_ErrorLog is null, this is the first error node */
if (!Gbl_ErrorLog)
{
@@ -183,8 +177,10 @@ AeAddToErrorLog (
return;
}
- /* Walk error list until we find a line number greater than ours */
-
+ /*
+ * Walk error list until we find a line number greater than ours.
+ * List is sorted according to line number.
+ */
Prev = NULL;
Next = Gbl_ErrorLog;
Modified: head/sys/contrib/dev/acpica/compiler/aslfiles.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslfiles.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/aslfiles.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/compiler/aslfold.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslfold.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/aslfold.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/compiler/aslglobal.h
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslglobal.h Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/aslglobal.h Thu Jan 21 21:14:28 2010 (r202771)
@@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -165,7 +165,6 @@ ASL_EXTERN char ASL_
ASL_EXTERN ASL_ERROR_MSG ASL_INIT_GLOBAL (*Gbl_ErrorLog,NULL);
ASL_EXTERN ASL_ERROR_MSG ASL_INIT_GLOBAL (*Gbl_NextError,NULL);
-extern UINT32 Gbl_ExceptionCount[];
/* Option flags */
@@ -278,5 +277,12 @@ ASL_EXTERN char MsgB
ASL_EXTERN char StringBuffer[ASL_MSG_BUFFER_SIZE];
ASL_EXTERN char StringBuffer2[ASL_MSG_BUFFER_SIZE];
+
+#ifdef _DECLARE_GLOBALS
+UINT32 Gbl_ExceptionCount[ASL_NUM_REPORT_LEVELS] = {0,0,0,0,0,0};
+#else
+extern UINT32 Gbl_ExceptionCount[ASL_NUM_REPORT_LEVELS];
+#endif
+
#endif /* __ASLGLOBAL_H */
Modified: head/sys/contrib/dev/acpica/compiler/asllength.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/asllength.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/asllength.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/compiler/asllisting.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/asllisting.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/asllisting.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/compiler/aslload.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslload.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/aslload.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -534,7 +534,7 @@ LdNamespace1Begin (
if (Op->Asl.CompileFlags == NODE_IS_RESOURCE_DESC)
{
Status = LdLoadResourceElements (Op, WalkState);
- goto Exit;
+ return_ACPI_STATUS (Status);
}
ObjectType = AslMapNamedOpcodeToDataType (Op->Asl.AmlOpcode);
@@ -578,7 +578,7 @@ LdNamespace1Begin (
AslCoreSubsystemError (Op, Status,
"Failure from namespace lookup", FALSE);
- goto Exit;
+ return_ACPI_STATUS (Status);
}
/* We found a node with this name, now check the type */
@@ -713,15 +713,14 @@ LdNamespace1Begin (
AslError (ASL_ERROR, ASL_MSG_NAME_EXISTS, Op,
Op->Asl.ExternalName);
- Status = AE_OK;
- goto Exit;
+ return_ACPI_STATUS (AE_OK);
}
}
else
{
AslCoreSubsystemError (Op, Status,
"Failure from namespace lookup", FALSE);
- goto Exit;
+ return_ACPI_STATUS (Status);
}
}
@@ -759,8 +758,7 @@ FinishNode:
Node->Value = (UINT32) Op->Asl.Extra;
}
-Exit:
- return (Status);
+ return_ACPI_STATUS (Status);
}
Modified: head/sys/contrib/dev/acpica/compiler/asllookup.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/asllookup.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/asllookup.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/compiler/aslmain.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslmain.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/aslmain.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -165,9 +165,6 @@ static int
AslDoResponseFile (
char *Filename);
-extern int AcpiGbl_Opterr;
-extern int AcpiGbl_Optind;
-
#define ASL_TOKEN_SEPARATORS " \t\n"
#define ASL_SUPPORTED_OPTIONS "@:2b:cd^e:fgh^i^I:l^o:p:r:s:t:v:w:x:"
Modified: head/sys/contrib/dev/acpica/compiler/aslmap.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslmap.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/aslmap.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/compiler/aslopcodes.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslopcodes.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/aslopcodes.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -328,7 +328,7 @@ OpcSetOptimalIntegerSize (
}
break;
- case ACPI_INTEGER_MAX:
+ case ACPI_UINT64_MAX:
/* Check for table integer width (32 or 64) */
@@ -568,7 +568,7 @@ OpcDoEisaId (
if (i < 3)
{
- if (!isupper (InString[i]))
+ if (!isupper ((int) InString[i]))
{
Status = AE_BAD_PARAMETER;
}
@@ -576,7 +576,7 @@ OpcDoEisaId (
/* Last 4 characters must be hex digits */
- else if (!isxdigit (InString[i]))
+ else if (!isxdigit ((int) InString[i]))
{
Status = AE_BAD_PARAMETER;
}
@@ -666,7 +666,7 @@ OpcDoUuId (
}
else
{
- if (!isxdigit (InString[i]))
+ if (!isxdigit ((int) InString[i]))
{
Status = AE_BAD_PARAMETER;
}
Modified: head/sys/contrib/dev/acpica/compiler/asloperands.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/asloperands.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/asloperands.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -604,7 +604,7 @@ OpnDoRegion (
}
else
{
- Op->Asl.Value.Integer = ACPI_INTEGER_MAX;
+ Op->Asl.Value.Integer = ACPI_UINT64_MAX;
}
}
@@ -1007,7 +1007,7 @@ OpnDoDefinitionBlock (
for (i = 0; i < 4; i++)
{
- if (!isalnum (Gbl_TableSignature[i]))
+ if (!isalnum ((int) Gbl_TableSignature[i]))
{
AslError (ASL_ERROR, ASL_MSG_TABLE_SIGNATURE, Child,
"Contains non-alphanumeric characters");
Modified: head/sys/contrib/dev/acpica/compiler/aslopt.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslopt.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/aslopt.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/compiler/aslresource.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslresource.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/aslresource.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -184,7 +184,7 @@ RsCreateBitField (
{
Op->Asl.ExternalName = Name;
- Op->Asl.Value.Integer = ((ACPI_INTEGER) ByteOffset * 8) + BitOffset;
+ Op->Asl.Value.Integer = ((UINT64) ByteOffset * 8) + BitOffset;
Op->Asl.CompileFlags |= (NODE_IS_RESOURCE_FIELD | NODE_IS_BIT_OFFSET);
}
Modified: head/sys/contrib/dev/acpica/compiler/aslrestype1.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslrestype1.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/aslrestype1.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/compiler/aslrestype2.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslrestype2.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/aslrestype2.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/compiler/aslstartup.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslstartup.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/aslstartup.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/compiler/aslstubs.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslstubs.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/aslstubs.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/compiler/asltransform.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/asltransform.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/asltransform.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -554,7 +554,7 @@ TrDoSwitch (
NewOp = NewOp2;
NewOp2 = TrCreateValuedLeafNode (PARSEOP_NAMESTRING,
- (ACPI_INTEGER) ACPI_TO_INTEGER (PredicateValueName));
+ (UINT64) ACPI_TO_INTEGER (PredicateValueName));
NewOp->Asl.Next = NewOp2;
TrAmlInitLineNumbers (NewOp2, Predicate);
@@ -612,7 +612,7 @@ TrDoSwitch (
* CaseOp->Child->Peer is the beginning of the case block
*/
NewOp = TrCreateValuedLeafNode (PARSEOP_NAMESTRING,
- (ACPI_INTEGER) ACPI_TO_INTEGER (PredicateValueName));
+ (UINT64) ACPI_TO_INTEGER (PredicateValueName));
NewOp->Asl.Next = Predicate;
TrAmlInitLineNumbers (NewOp, Predicate);
@@ -761,7 +761,7 @@ TrDoSwitch (
/* Create the NameSeg child for the Name node */
NewOp2 = TrCreateValuedLeafNode (PARSEOP_NAMESEG,
- (ACPI_INTEGER) ACPI_TO_INTEGER (PredicateValueName));
+ (UINT64) ACPI_TO_INTEGER (PredicateValueName));
NewOp2->Asl.CompileFlags |= NODE_IS_NAME_DECLARATION;
NewOp->Asl.Child = NewOp2;
@@ -771,22 +771,22 @@ TrDoSwitch (
{
case ACPI_BTYPE_INTEGER:
NewOp2->Asl.Next = TrCreateValuedLeafNode (PARSEOP_ZERO,
- (ACPI_INTEGER) 0);
+ (UINT64) 0);
break;
case ACPI_BTYPE_STRING:
NewOp2->Asl.Next = TrCreateValuedLeafNode (PARSEOP_STRING_LITERAL,
- (ACPI_INTEGER) ACPI_TO_INTEGER (""));
+ (UINT64) ACPI_TO_INTEGER (""));
break;
case ACPI_BTYPE_BUFFER:
(void) TrLinkPeerNode (NewOp2, TrCreateValuedLeafNode (PARSEOP_BUFFER,
- (ACPI_INTEGER) 0));
+ (UINT64) 0));
Next = NewOp2->Asl.Next;
(void) TrLinkChildren (Next, 1, TrCreateValuedLeafNode (PARSEOP_ZERO,
- (ACPI_INTEGER) 1));
+ (UINT64) 1));
(void) TrLinkPeerNode (Next->Asl.Child,
- TrCreateValuedLeafNode (PARSEOP_DEFAULT_ARG, (ACPI_INTEGER) 0));
+ TrCreateValuedLeafNode (PARSEOP_DEFAULT_ARG, (UINT64) 0));
TrAmlSetSubtreeParent (Next->Asl.Child, Next);
break;
@@ -821,7 +821,7 @@ TrDoSwitch (
Predicate->Asl.Parent = StoreOp;
NewOp = TrCreateValuedLeafNode (PARSEOP_NAMESEG,
- (ACPI_INTEGER) ACPI_TO_INTEGER (PredicateValueName));
+ (UINT64) ACPI_TO_INTEGER (PredicateValueName));
NewOp->Asl.Parent = StoreOp;
Predicate->Asl.Next = NewOp;
Modified: head/sys/contrib/dev/acpica/compiler/asltree.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/asltree.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/asltree.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -490,7 +490,7 @@ TrCreateLeafNode (
ACPI_PARSE_OBJECT *
TrCreateValuedLeafNode (
UINT32 ParseOpcode,
- ACPI_INTEGER Value)
+ UINT64 Value)
{
ACPI_PARSE_OBJECT *Op;
Modified: head/sys/contrib/dev/acpica/compiler/asltypes.h
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/asltypes.h Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/asltypes.h Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -571,11 +571,6 @@ char *AslErrorLevel [
#define ASL_ERROR_LEVEL_LENGTH 8 /* Length of strings above */
-/* Exception counters */
-
-UINT32 Gbl_ExceptionCount[ASL_NUM_REPORT_LEVELS] = {0,0,0,0,0,0};
-
-#endif
-
+#endif /* ASL_EXCEPTIONS */
#endif /* __ASLTYPES_H */
Modified: head/sys/contrib/dev/acpica/compiler/aslutils.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslutils.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/compiler/aslutils.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -142,7 +142,7 @@ static ACPI_STATUS
UtStrtoul64 (
char *String,
UINT32 Base,
- ACPI_INTEGER *RetInteger);
+ UINT64 *RetInteger);
static void
UtPadNameWithUnderscores (
@@ -846,12 +846,12 @@ UtAttachNamepathToOwner (
*
******************************************************************************/
-ACPI_INTEGER
+UINT64
UtDoConstant (
char *String)
{
ACPI_STATUS Status;
- ACPI_INTEGER Converted;
+ UINT64 Converted;
char ErrBuf[64];
@@ -888,11 +888,11 @@ static ACPI_STATUS
UtStrtoul64 (
char *String,
UINT32 Base,
- ACPI_INTEGER *RetInteger)
+ UINT64 *RetInteger)
{
UINT32 Index;
UINT32 Sign;
- ACPI_INTEGER ReturnValue = 0;
+ UINT64 ReturnValue = 0;
ACPI_STATUS Status = AE_OK;
@@ -916,7 +916,7 @@ UtStrtoul64 (
/* Skip over any white space in the buffer: */
- while (isspace (*String) || *String == '\t')
+ while (isspace ((int) *String) || *String == '\t')
{
++String;
}
@@ -948,7 +948,7 @@ UtStrtoul64 (
{
if (*String == '0')
{
- if (tolower (*(++String)) == 'x')
+ if (tolower ((int) *(++String)) == 'x')
{
Base = 16;
++String;
@@ -975,7 +975,7 @@ UtStrtoul64 (
if (Base == 16 &&
*String == '0' &&
- tolower (*(++String)) == 'x')
+ tolower ((int) *(++String)) == 'x')
{
String++;
}
@@ -984,14 +984,14 @@ UtStrtoul64 (
while (*String)
{
- if (isdigit (*String))
+ if (isdigit ((int) *String))
{
Index = ((UINT8) *String) - '0';
}
else
{
- Index = (UINT8) toupper (*String);
- if (isupper ((char) Index))
+ Index = (UINT8) toupper ((int) *String);
+ if (isupper ((int) Index))
{
Index = Index - 'A' + 10;
}
@@ -1008,8 +1008,8 @@ UtStrtoul64 (
/* Check to see if value is out of range: */
- if (ReturnValue > ((ACPI_INTEGER_MAX - (ACPI_INTEGER) Index) /
- (ACPI_INTEGER) Base))
+ if (ReturnValue > ((ACPI_UINT64_MAX - (UINT64) Index) /
+ (UINT64) Base))
{
goto ErrorExit;
}
Modified: head/sys/contrib/dev/acpica/debugger/dbcmds.c
==============================================================================
--- head/sys/contrib/dev/acpica/debugger/dbcmds.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/debugger/dbcmds.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/debugger/dbdisply.c
==============================================================================
--- head/sys/contrib/dev/acpica/debugger/dbdisply.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/debugger/dbdisply.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
Modified: head/sys/contrib/dev/acpica/debugger/dbexec.c
==============================================================================
--- head/sys/contrib/dev/acpica/debugger/dbexec.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/debugger/dbexec.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -243,7 +243,7 @@ AcpiDbExecuteMethod (
default:
Params[i].Type = ACPI_TYPE_INTEGER;
- Params[i].Integer.Value = i * (ACPI_INTEGER) 0x1000;
+ Params[i].Integer.Value = i * (UINT64) 0x1000;
break;
}
}
@@ -484,7 +484,7 @@ AcpiDbExecute (
* Allow any handlers in separate threads to complete.
* (Such as Notify handlers invoked from AML executed above).
*/
- AcpiOsSleep ((ACPI_INTEGER) 10);
+ AcpiOsSleep ((UINT64) 10);
#ifdef ACPI_DEBUG_OUTPUT
Modified: head/sys/contrib/dev/acpica/debugger/dbfileio.c
==============================================================================
--- head/sys/contrib/dev/acpica/debugger/dbfileio.c Thu Jan 21 21:12:36 2010 (r202770)
+++ head/sys/contrib/dev/acpica/debugger/dbfileio.c Thu Jan 21 21:14:28 2010 (r202771)
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -150,9 +150,6 @@ AcpiDbCheckTextModeCorruption (
UINT32 TableLength,
UINT32 FileLength);
-static ACPI_STATUS
-AeLocalLoadTable (
- ACPI_TABLE_HEADER *TablePtr);
#endif
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-all
mailing list