1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-23 07:31:31 +00:00

Merge ACPICA 20100121.

This commit is contained in:
Jung-uk Kim 2010-01-21 21:14:28 +00:00
commit 9a179dd8be
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=202771
223 changed files with 835 additions and 702 deletions

View File

@ -1,8 +1,56 @@
----------------------------------------
21 January 2010. Summary of changes for version 20100121:
1) ACPI CA Core Subsystem:
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: 14 December 2009. Summary of changes for version 20091214:
This release is available at www.acpica.org/downloads
1) ACPI CA Core Subsystem: 1) ACPI CA Core Subsystem:
Enhanced automatic data type conversions for predefined name repairs. This Enhanced automatic data type conversions for predefined name repairs. This
@ -68,8 +116,6 @@ depend on a specific initial value for a region or field.
---------------------------------------- ----------------------------------------
12 November 2009. Summary of changes for version 20091112: 12 November 2009. Summary of changes for version 20091112:
This release is available at www.acpica.org/downloads
1) ACPI CA Core Subsystem: 1) ACPI CA Core Subsystem:
Implemented a post-order callback to AcpiWalkNamespace. The existing 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: 13 October 2009. Summary of changes for version 20091013:
This release is available at www.acpica.org/downloads
1) ACPI CA Core Subsystem: 1) ACPI CA Core Subsystem:
Fixed a problem where an Operation Region _REG method could be executed more 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: 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: 1) ACPI CA Core Subsystem:
Fix a possible deadlock in the GPE dispatch. Remove call to Fix a possible deadlock in the GPE dispatch. Remove call to
@ -1129,9 +1170,6 @@ completion message. Previously, no message was displayed in this case.
---------------------------------------- ----------------------------------------
01 July 2008. Summary of changes for version 20080701: 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 0) Git source tree / acpica.org
Fixed a problem where a git-clone from http would not transfer the entire Fixed a problem where a git-clone from http would not transfer the entire

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -667,8 +667,8 @@ AnCheckForReservedName (
{ {
/* The next two characters must be hex digits */ /* The next two characters must be hex digits */
if ((isxdigit (Name[2])) && if ((isxdigit ((int) Name[2])) &&
(isxdigit (Name[3]))) (isxdigit ((int) Name[3])))
{ {
return (ACPI_EVENT_RESERVED_NAME); return (ACPI_EVENT_RESERVED_NAME);
} }
@ -1236,7 +1236,7 @@ AnMethodAnalysisWalkBegin (
*/ */
for (i = 0; Next->Asl.Value.String[i]; i++) 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, AslError (ASL_ERROR, ASL_MSG_ALPHANUMERIC_STRING,
Next, Next->Asl.Value.String); Next, Next->Asl.Value.String);
@ -2157,7 +2157,7 @@ AnOtherSemanticAnalysisWalkBegin (
*/ */
if (((ArgNode->Asl.ParseOpcode == PARSEOP_WORDCONST) || if (((ArgNode->Asl.ParseOpcode == PARSEOP_WORDCONST) ||
(ArgNode->Asl.ParseOpcode == PARSEOP_INTEGER)) && (ArgNode->Asl.ParseOpcode == PARSEOP_INTEGER)) &&
(ArgNode->Asl.Value.Integer >= (ACPI_INTEGER) ACPI_WAIT_FOREVER)) (ArgNode->Asl.Value.Integer >= (UINT64) ACPI_WAIT_FOREVER))
{ {
break; break;
} }

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -511,7 +511,7 @@ TrCreateLeafNode (
ACPI_PARSE_OBJECT * ACPI_PARSE_OBJECT *
TrCreateValuedLeafNode ( TrCreateValuedLeafNode (
UINT32 ParseOpcode, UINT32 ParseOpcode,
ACPI_INTEGER Value); UINT64 Value);
ACPI_PARSE_OBJECT * ACPI_PARSE_OBJECT *
TrLinkChildren ( TrLinkChildren (
@ -718,7 +718,7 @@ UtCheckIntegerRange (
UINT32 LowValue, UINT32 LowValue,
UINT32 HighValue); UINT32 HighValue);
ACPI_INTEGER UINT64
UtDoConstant ( UtDoConstant (
char *String); char *String);

View File

@ -10,7 +10,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -10,7 +10,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -2388,7 +2388,7 @@ QWordConstExpr
ConstExprTerm ConstExprTerm
: PARSEOP_ZERO {$$ = TrCreateValuedLeafNode (PARSEOP_ZERO, 0);} : PARSEOP_ZERO {$$ = TrCreateValuedLeafNode (PARSEOP_ZERO, 0);}
| PARSEOP_ONE {$$ = TrCreateValuedLeafNode (PARSEOP_ONE, 1);} | 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 */ /* OptionalCount must appear before ByteList or an incorrect reduction will result */

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -127,7 +127,7 @@
#define IntelAcpiCA "Intel ACPI Component Architecture" #define IntelAcpiCA "Intel ACPI Component Architecture"
#define CompilerId "ASL Optimizing Compiler" #define CompilerId "ASL Optimizing Compiler"
#define DisassemblerId "AML Disassembler" #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 CompilerCompliance "Supports ACPI Specification Revision 4.0"
#define CompilerName "iasl" #define CompilerName "iasl"
#define CompilerCreatorId "INTL" #define CompilerCreatorId "INTL"

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -169,13 +169,7 @@ AeAddToErrorLog (
ASL_ERROR_MSG *Prev; ASL_ERROR_MSG *Prev;
if (!Gbl_ErrorLog) /* If Gbl_ErrorLog is null, this is the first error node */
{
Gbl_ErrorLog = Enode;
return;
}
/* List is sorted according to line number */
if (!Gbl_ErrorLog) if (!Gbl_ErrorLog)
{ {
@ -183,8 +177,10 @@ AeAddToErrorLog (
return; 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; Prev = NULL;
Next = Gbl_ErrorLog; Next = Gbl_ErrorLog;

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -10,7 +10,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -165,7 +165,6 @@ ASL_EXTERN char ASL_INIT_GLOBAL (*Gbl_LineBufPtr, Gbl_Curren
ASL_EXTERN ASL_ERROR_MSG ASL_INIT_GLOBAL (*Gbl_ErrorLog,NULL); ASL_EXTERN ASL_ERROR_MSG ASL_INIT_GLOBAL (*Gbl_ErrorLog,NULL);
ASL_EXTERN ASL_ERROR_MSG ASL_INIT_GLOBAL (*Gbl_NextError,NULL); ASL_EXTERN ASL_ERROR_MSG ASL_INIT_GLOBAL (*Gbl_NextError,NULL);
extern UINT32 Gbl_ExceptionCount[];
/* Option flags */ /* Option flags */
@ -278,5 +277,12 @@ ASL_EXTERN char MsgBuffer[ASL_MSG_BUFFER_SIZE];
ASL_EXTERN char StringBuffer[ASL_MSG_BUFFER_SIZE]; ASL_EXTERN char StringBuffer[ASL_MSG_BUFFER_SIZE];
ASL_EXTERN char StringBuffer2[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 */ #endif /* __ASLGLOBAL_H */

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -534,7 +534,7 @@ LdNamespace1Begin (
if (Op->Asl.CompileFlags == NODE_IS_RESOURCE_DESC) if (Op->Asl.CompileFlags == NODE_IS_RESOURCE_DESC)
{ {
Status = LdLoadResourceElements (Op, WalkState); Status = LdLoadResourceElements (Op, WalkState);
goto Exit; return_ACPI_STATUS (Status);
} }
ObjectType = AslMapNamedOpcodeToDataType (Op->Asl.AmlOpcode); ObjectType = AslMapNamedOpcodeToDataType (Op->Asl.AmlOpcode);
@ -578,7 +578,7 @@ LdNamespace1Begin (
AslCoreSubsystemError (Op, Status, AslCoreSubsystemError (Op, Status,
"Failure from namespace lookup", FALSE); "Failure from namespace lookup", FALSE);
goto Exit; return_ACPI_STATUS (Status);
} }
/* We found a node with this name, now check the type */ /* We found a node with this name, now check the type */
@ -713,15 +713,14 @@ LdNamespace1Begin (
AslError (ASL_ERROR, ASL_MSG_NAME_EXISTS, Op, AslError (ASL_ERROR, ASL_MSG_NAME_EXISTS, Op,
Op->Asl.ExternalName); Op->Asl.ExternalName);
Status = AE_OK; return_ACPI_STATUS (AE_OK);
goto Exit;
} }
} }
else else
{ {
AslCoreSubsystemError (Op, Status, AslCoreSubsystemError (Op, Status,
"Failure from namespace lookup", FALSE); "Failure from namespace lookup", FALSE);
goto Exit; return_ACPI_STATUS (Status);
} }
} }
@ -759,8 +758,7 @@ LdNamespace1Begin (
Node->Value = (UINT32) Op->Asl.Extra; Node->Value = (UINT32) Op->Asl.Extra;
} }
Exit: return_ACPI_STATUS (Status);
return (Status);
} }

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -165,9 +165,6 @@ static int
AslDoResponseFile ( AslDoResponseFile (
char *Filename); char *Filename);
extern int AcpiGbl_Opterr;
extern int AcpiGbl_Optind;
#define ASL_TOKEN_SEPARATORS " \t\n" #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:" #define ASL_SUPPORTED_OPTIONS "@:2b:cd^e:fgh^i^I:l^o:p:r:s:t:v:w:x:"

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -328,7 +328,7 @@ OpcSetOptimalIntegerSize (
} }
break; break;
case ACPI_INTEGER_MAX: case ACPI_UINT64_MAX:
/* Check for table integer width (32 or 64) */ /* Check for table integer width (32 or 64) */
@ -568,7 +568,7 @@ OpcDoEisaId (
if (i < 3) if (i < 3)
{ {
if (!isupper (InString[i])) if (!isupper ((int) InString[i]))
{ {
Status = AE_BAD_PARAMETER; Status = AE_BAD_PARAMETER;
} }
@ -576,7 +576,7 @@ OpcDoEisaId (
/* Last 4 characters must be hex digits */ /* Last 4 characters must be hex digits */
else if (!isxdigit (InString[i])) else if (!isxdigit ((int) InString[i]))
{ {
Status = AE_BAD_PARAMETER; Status = AE_BAD_PARAMETER;
} }
@ -666,7 +666,7 @@ OpcDoUuId (
} }
else else
{ {
if (!isxdigit (InString[i])) if (!isxdigit ((int) InString[i]))
{ {
Status = AE_BAD_PARAMETER; Status = AE_BAD_PARAMETER;
} }

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -604,7 +604,7 @@ OpnDoRegion (
} }
else 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++) 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, AslError (ASL_ERROR, ASL_MSG_TABLE_SIGNATURE, Child,
"Contains non-alphanumeric characters"); "Contains non-alphanumeric characters");

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -184,7 +184,7 @@ RsCreateBitField (
{ {
Op->Asl.ExternalName = Name; 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); Op->Asl.CompileFlags |= (NODE_IS_RESOURCE_FIELD | NODE_IS_BIT_OFFSET);
} }

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -554,7 +554,7 @@ TrDoSwitch (
NewOp = NewOp2; NewOp = NewOp2;
NewOp2 = TrCreateValuedLeafNode (PARSEOP_NAMESTRING, NewOp2 = TrCreateValuedLeafNode (PARSEOP_NAMESTRING,
(ACPI_INTEGER) ACPI_TO_INTEGER (PredicateValueName)); (UINT64) ACPI_TO_INTEGER (PredicateValueName));
NewOp->Asl.Next = NewOp2; NewOp->Asl.Next = NewOp2;
TrAmlInitLineNumbers (NewOp2, Predicate); TrAmlInitLineNumbers (NewOp2, Predicate);
@ -612,7 +612,7 @@ TrDoSwitch (
* CaseOp->Child->Peer is the beginning of the case block * CaseOp->Child->Peer is the beginning of the case block
*/ */
NewOp = TrCreateValuedLeafNode (PARSEOP_NAMESTRING, NewOp = TrCreateValuedLeafNode (PARSEOP_NAMESTRING,
(ACPI_INTEGER) ACPI_TO_INTEGER (PredicateValueName)); (UINT64) ACPI_TO_INTEGER (PredicateValueName));
NewOp->Asl.Next = Predicate; NewOp->Asl.Next = Predicate;
TrAmlInitLineNumbers (NewOp, Predicate); TrAmlInitLineNumbers (NewOp, Predicate);
@ -761,7 +761,7 @@ TrDoSwitch (
/* Create the NameSeg child for the Name node */ /* Create the NameSeg child for the Name node */
NewOp2 = TrCreateValuedLeafNode (PARSEOP_NAMESEG, NewOp2 = TrCreateValuedLeafNode (PARSEOP_NAMESEG,
(ACPI_INTEGER) ACPI_TO_INTEGER (PredicateValueName)); (UINT64) ACPI_TO_INTEGER (PredicateValueName));
NewOp2->Asl.CompileFlags |= NODE_IS_NAME_DECLARATION; NewOp2->Asl.CompileFlags |= NODE_IS_NAME_DECLARATION;
NewOp->Asl.Child = NewOp2; NewOp->Asl.Child = NewOp2;
@ -771,22 +771,22 @@ TrDoSwitch (
{ {
case ACPI_BTYPE_INTEGER: case ACPI_BTYPE_INTEGER:
NewOp2->Asl.Next = TrCreateValuedLeafNode (PARSEOP_ZERO, NewOp2->Asl.Next = TrCreateValuedLeafNode (PARSEOP_ZERO,
(ACPI_INTEGER) 0); (UINT64) 0);
break; break;
case ACPI_BTYPE_STRING: case ACPI_BTYPE_STRING:
NewOp2->Asl.Next = TrCreateValuedLeafNode (PARSEOP_STRING_LITERAL, NewOp2->Asl.Next = TrCreateValuedLeafNode (PARSEOP_STRING_LITERAL,
(ACPI_INTEGER) ACPI_TO_INTEGER ("")); (UINT64) ACPI_TO_INTEGER (""));
break; break;
case ACPI_BTYPE_BUFFER: case ACPI_BTYPE_BUFFER:
(void) TrLinkPeerNode (NewOp2, TrCreateValuedLeafNode (PARSEOP_BUFFER, (void) TrLinkPeerNode (NewOp2, TrCreateValuedLeafNode (PARSEOP_BUFFER,
(ACPI_INTEGER) 0)); (UINT64) 0));
Next = NewOp2->Asl.Next; Next = NewOp2->Asl.Next;
(void) TrLinkChildren (Next, 1, TrCreateValuedLeafNode (PARSEOP_ZERO, (void) TrLinkChildren (Next, 1, TrCreateValuedLeafNode (PARSEOP_ZERO,
(ACPI_INTEGER) 1)); (UINT64) 1));
(void) TrLinkPeerNode (Next->Asl.Child, (void) TrLinkPeerNode (Next->Asl.Child,
TrCreateValuedLeafNode (PARSEOP_DEFAULT_ARG, (ACPI_INTEGER) 0)); TrCreateValuedLeafNode (PARSEOP_DEFAULT_ARG, (UINT64) 0));
TrAmlSetSubtreeParent (Next->Asl.Child, Next); TrAmlSetSubtreeParent (Next->Asl.Child, Next);
break; break;
@ -821,7 +821,7 @@ TrDoSwitch (
Predicate->Asl.Parent = StoreOp; Predicate->Asl.Parent = StoreOp;
NewOp = TrCreateValuedLeafNode (PARSEOP_NAMESEG, NewOp = TrCreateValuedLeafNode (PARSEOP_NAMESEG,
(ACPI_INTEGER) ACPI_TO_INTEGER (PredicateValueName)); (UINT64) ACPI_TO_INTEGER (PredicateValueName));
NewOp->Asl.Parent = StoreOp; NewOp->Asl.Parent = StoreOp;
Predicate->Asl.Next = NewOp; Predicate->Asl.Next = NewOp;

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -490,7 +490,7 @@ TrCreateLeafNode (
ACPI_PARSE_OBJECT * ACPI_PARSE_OBJECT *
TrCreateValuedLeafNode ( TrCreateValuedLeafNode (
UINT32 ParseOpcode, UINT32 ParseOpcode,
ACPI_INTEGER Value) UINT64 Value)
{ {
ACPI_PARSE_OBJECT *Op; ACPI_PARSE_OBJECT *Op;

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -571,11 +571,6 @@ char *AslErrorLevel [ASL_NUM_REPORT_LEVELS] = {
#define ASL_ERROR_LEVEL_LENGTH 8 /* Length of strings above */ #define ASL_ERROR_LEVEL_LENGTH 8 /* Length of strings above */
/* Exception counters */ #endif /* ASL_EXCEPTIONS */
UINT32 Gbl_ExceptionCount[ASL_NUM_REPORT_LEVELS] = {0,0,0,0,0,0};
#endif
#endif /* __ASLTYPES_H */ #endif /* __ASLTYPES_H */

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -142,7 +142,7 @@ static ACPI_STATUS
UtStrtoul64 ( UtStrtoul64 (
char *String, char *String,
UINT32 Base, UINT32 Base,
ACPI_INTEGER *RetInteger); UINT64 *RetInteger);
static void static void
UtPadNameWithUnderscores ( UtPadNameWithUnderscores (
@ -846,12 +846,12 @@ UtAttachNamepathToOwner (
* *
******************************************************************************/ ******************************************************************************/
ACPI_INTEGER UINT64
UtDoConstant ( UtDoConstant (
char *String) char *String)
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_INTEGER Converted; UINT64 Converted;
char ErrBuf[64]; char ErrBuf[64];
@ -888,11 +888,11 @@ static ACPI_STATUS
UtStrtoul64 ( UtStrtoul64 (
char *String, char *String,
UINT32 Base, UINT32 Base,
ACPI_INTEGER *RetInteger) UINT64 *RetInteger)
{ {
UINT32 Index; UINT32 Index;
UINT32 Sign; UINT32 Sign;
ACPI_INTEGER ReturnValue = 0; UINT64 ReturnValue = 0;
ACPI_STATUS Status = AE_OK; ACPI_STATUS Status = AE_OK;
@ -916,7 +916,7 @@ UtStrtoul64 (
/* Skip over any white space in the buffer: */ /* Skip over any white space in the buffer: */
while (isspace (*String) || *String == '\t') while (isspace ((int) *String) || *String == '\t')
{ {
++String; ++String;
} }
@ -948,7 +948,7 @@ UtStrtoul64 (
{ {
if (*String == '0') if (*String == '0')
{ {
if (tolower (*(++String)) == 'x') if (tolower ((int) *(++String)) == 'x')
{ {
Base = 16; Base = 16;
++String; ++String;
@ -975,7 +975,7 @@ UtStrtoul64 (
if (Base == 16 && if (Base == 16 &&
*String == '0' && *String == '0' &&
tolower (*(++String)) == 'x') tolower ((int) *(++String)) == 'x')
{ {
String++; String++;
} }
@ -984,14 +984,14 @@ UtStrtoul64 (
while (*String) while (*String)
{ {
if (isdigit (*String)) if (isdigit ((int) *String))
{ {
Index = ((UINT8) *String) - '0'; Index = ((UINT8) *String) - '0';
} }
else else
{ {
Index = (UINT8) toupper (*String); Index = (UINT8) toupper ((int) *String);
if (isupper ((char) Index)) if (isupper ((int) Index))
{ {
Index = Index - 'A' + 10; Index = Index - 'A' + 10;
} }
@ -1008,8 +1008,8 @@ UtStrtoul64 (
/* Check to see if value is out of range: */ /* Check to see if value is out of range: */
if (ReturnValue > ((ACPI_INTEGER_MAX - (ACPI_INTEGER) Index) / if (ReturnValue > ((ACPI_UINT64_MAX - (UINT64) Index) /
(ACPI_INTEGER) Base)) (UINT64) Base))
{ {
goto ErrorExit; goto ErrorExit;
} }

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -243,7 +243,7 @@ AcpiDbExecuteMethod (
default: default:
Params[i].Type = ACPI_TYPE_INTEGER; Params[i].Type = ACPI_TYPE_INTEGER;
Params[i].Integer.Value = i * (ACPI_INTEGER) 0x1000; Params[i].Integer.Value = i * (UINT64) 0x1000;
break; break;
} }
} }
@ -484,7 +484,7 @@ AcpiDbExecute (
* Allow any handlers in separate threads to complete. * Allow any handlers in separate threads to complete.
* (Such as Notify handlers invoked from AML executed above). * (Such as Notify handlers invoked from AML executed above).
*/ */
AcpiOsSleep ((ACPI_INTEGER) 10); AcpiOsSleep ((UINT64) 10);
#ifdef ACPI_DEBUG_OUTPUT #ifdef ACPI_DEBUG_OUTPUT

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -150,9 +150,6 @@ AcpiDbCheckTextModeCorruption (
UINT32 TableLength, UINT32 TableLength,
UINT32 FileLength); UINT32 FileLength);
static ACPI_STATUS
AeLocalLoadTable (
ACPI_TABLE_HEADER *TablePtr);
#endif #endif
/******************************************************************************* /*******************************************************************************
@ -424,7 +421,7 @@ AcpiDbReadTable (
{ {
/* Now validate the checksum */ /* Now validate the checksum */
Status = AcpiTbChecksum ((void *) *Table, Status = AcpiTbVerifyChecksum ((void *) *Table,
ACPI_CAST_PTR (ACPI_TABLE_HEADER, *Table)->Length); ACPI_CAST_PTR (ACPI_TABLE_HEADER, *Table)->Length);
if (Status == AE_BAD_CHECKSUM) if (Status == AE_BAD_CHECKSUM)

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -473,8 +473,8 @@ AcpiDmDisassembleOneOp (
case AML_QWORD_OP: case AML_QWORD_OP:
AcpiOsPrintf ("0x%8.8X%8.8X", Op->Common.Value.Integer64.Hi, AcpiOsPrintf ("0x%8.8X%8.8X",
Op->Common.Value.Integer64.Lo); ACPI_FORMAT_UINT64 (Op->Common.Value.Integer));
break; break;

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -314,7 +314,7 @@ AcpiDsGetFieldNames (
ACPI_PARSE_OBJECT *Arg) ACPI_PARSE_OBJECT *Arg)
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_INTEGER Position; UINT64 Position;
ACPI_FUNCTION_TRACE_PTR (DsGetFieldNames, Info); ACPI_FUNCTION_TRACE_PTR (DsGetFieldNames, Info);
@ -338,8 +338,8 @@ AcpiDsGetFieldNames (
{ {
case AML_INT_RESERVEDFIELD_OP: case AML_INT_RESERVEDFIELD_OP:
Position = (ACPI_INTEGER) Info->FieldBitPosition Position = (UINT64) Info->FieldBitPosition
+ (ACPI_INTEGER) Arg->Common.Value.Size; + (UINT64) Arg->Common.Value.Size;
if (Position > ACPI_UINT32_MAX) if (Position > ACPI_UINT32_MAX)
{ {
@ -406,8 +406,8 @@ AcpiDsGetFieldNames (
/* Keep track of bit position for the next field */ /* Keep track of bit position for the next field */
Position = (ACPI_INTEGER) Info->FieldBitPosition Position = (UINT64) Info->FieldBitPosition
+ (ACPI_INTEGER) Arg->Common.Value.Size; + (UINT64) Arg->Common.Value.Size;
if (Position > ACPI_UINT32_MAX) if (Position > ACPI_UINT32_MAX)
{ {

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -787,7 +787,7 @@ AcpiDsInitObjectFromOp (
case AML_ONES_OP: case AML_ONES_OP:
ObjDesc->Integer.Value = ACPI_INTEGER_MAX; ObjDesc->Integer.Value = ACPI_UINT64_MAX;
/* Truncate value if we are executing from a 32-bit ACPI table */ /* Truncate value if we are executing from a 32-bit ACPI table */

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -442,7 +442,7 @@ AcpiEvExecuteRegMethod (
* RegionOffset - Where in the region to read or write * RegionOffset - Where in the region to read or write
* BitWidth - Field width in bits (8, 16, 32, or 64) * BitWidth - Field width in bits (8, 16, 32, or 64)
* Value - Pointer to in or out value, must be * Value - Pointer to in or out value, must be
* full 64-bit ACPI_INTEGER * a full 64-bit integer
* *
* RETURN: Status * RETURN: Status
* *
@ -457,7 +457,7 @@ AcpiEvAddressSpaceDispatch (
UINT32 Function, UINT32 Function,
UINT32 RegionOffset, UINT32 RegionOffset,
UINT32 BitWidth, UINT32 BitWidth,
ACPI_INTEGER *Value) UINT64 *Value)
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_ADR_SPACE_HANDLER Handler; ACPI_ADR_SPACE_HANDLER Handler;

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -260,7 +260,7 @@ AcpiEvPciConfigRegionSetup (
void **RegionContext) void **RegionContext)
{ {
ACPI_STATUS Status = AE_OK; ACPI_STATUS Status = AE_OK;
ACPI_INTEGER PciValue; UINT64 PciValue;
ACPI_PCI_ID *PciId = *RegionContext; ACPI_PCI_ID *PciId = *RegionContext;
ACPI_OPERAND_OBJECT *HandlerObj; ACPI_OPERAND_OBJECT *HandlerObj;
ACPI_NAMESPACE_NODE *ParentNode; ACPI_NAMESPACE_NODE *ParentNode;

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -387,7 +387,7 @@ AcpiExRegionRead (
UINT8 *Buffer) UINT8 *Buffer)
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_INTEGER Value; UINT64 Value;
UINT32 RegionOffset = 0; UINT32 RegionOffset = 0;
UINT32 i; UINT32 i;
@ -610,7 +610,10 @@ AcpiExLoadOp (
Status = AcpiTbAddTable (&TableDesc, &TableIndex); Status = AcpiTbAddTable (&TableDesc, &TableIndex);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
goto Cleanup; /* Delete allocated table buffer */
AcpiTbDeleteTable (&TableDesc);
return_ACPI_STATUS (Status);
} }
/* /*
@ -653,13 +656,6 @@ AcpiExLoadOp (
AcpiGbl_TableHandlerContext); AcpiGbl_TableHandlerContext);
} }
Cleanup:
if (ACPI_FAILURE (Status))
{
/* Delete allocated table buffer */
AcpiTbDeleteTable (&TableDesc);
}
return_ACPI_STATUS (Status); return_ACPI_STATUS (Status);
} }

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -129,7 +129,7 @@
static UINT32 static UINT32
AcpiExConvertToAscii ( AcpiExConvertToAscii (
ACPI_INTEGER Integer, UINT64 Integer,
UINT16 Base, UINT16 Base,
UINT8 *String, UINT8 *String,
UINT8 MaxLength); UINT8 MaxLength);
@ -158,7 +158,7 @@ AcpiExConvertToInteger (
{ {
ACPI_OPERAND_OBJECT *ReturnDesc; ACPI_OPERAND_OBJECT *ReturnDesc;
UINT8 *Pointer; UINT8 *Pointer;
ACPI_INTEGER Result; UINT64 Result;
UINT32 i; UINT32 i;
UINT32 Count; UINT32 Count;
ACPI_STATUS Status; ACPI_STATUS Status;
@ -247,7 +247,7 @@ AcpiExConvertToInteger (
* Little endian is used, meaning that the first byte of the buffer * Little endian is used, meaning that the first byte of the buffer
* is the LSB of the integer * is the LSB of the integer
*/ */
Result |= (((ACPI_INTEGER) Pointer[i]) << (i * 8)); Result |= (((UINT64) Pointer[i]) << (i * 8));
} }
break; break;
@ -389,12 +389,12 @@ AcpiExConvertToBuffer (
static UINT32 static UINT32
AcpiExConvertToAscii ( AcpiExConvertToAscii (
ACPI_INTEGER Integer, UINT64 Integer,
UINT16 Base, UINT16 Base,
UINT8 *String, UINT8 *String,
UINT8 DataWidth) UINT8 DataWidth)
{ {
ACPI_INTEGER Digit; UINT64 Digit;
UINT32 i; UINT32 i;
UINT32 j; UINT32 j;
UINT32 k = 0; UINT32 k = 0;
@ -659,7 +659,7 @@ AcpiExConvertToString (
for (i = 0; i < ObjDesc->Buffer.Length; i++) for (i = 0; i < ObjDesc->Buffer.Length; i++)
{ {
NewBuf += AcpiExConvertToAscii ( NewBuf += AcpiExConvertToAscii (
(ACPI_INTEGER) ObjDesc->Buffer.Pointer[i], Base, (UINT64) ObjDesc->Buffer.Pointer[i], Base,
NewBuf, 1); NewBuf, 1);
*NewBuf++ = Separator; /* each separated by a comma or space */ *NewBuf++ = Separator; /* each separated by a comma or space */
} }

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -217,7 +217,7 @@ AcpiExReadDataFromField (
/* Call the region handler for the read */ /* Call the region handler for the read */
Status = AcpiExAccessRegion (ObjDesc, 0, Status = AcpiExAccessRegion (ObjDesc, 0,
ACPI_CAST_PTR (ACPI_INTEGER, BufferDesc->Buffer.Pointer), ACPI_CAST_PTR (UINT64, BufferDesc->Buffer.Pointer),
Function); Function);
AcpiExReleaseGlobalLock (ObjDesc->CommonField.FieldFlags); AcpiExReleaseGlobalLock (ObjDesc->CommonField.FieldFlags);
goto Exit; goto Exit;
@ -226,7 +226,7 @@ AcpiExReadDataFromField (
/* /*
* Allocate a buffer for the contents of the field. * Allocate a buffer for the contents of the field.
* *
* If the field is larger than the size of an ACPI_INTEGER, create * If the field is larger than the current integer width, create
* a BUFFER to hold it. Otherwise, use an INTEGER. This allows * a BUFFER to hold it. Otherwise, use an INTEGER. This allows
* the use of arithmetic operators on the returned value if the * the use of arithmetic operators on the returned value if the
* field size is equal or smaller than an Integer. * field size is equal or smaller than an Integer.
@ -408,7 +408,7 @@ AcpiExWriteDataToField (
* same buffer) * same buffer)
*/ */
Status = AcpiExAccessRegion (ObjDesc, 0, Status = AcpiExAccessRegion (ObjDesc, 0,
(ACPI_INTEGER *) Buffer, Function); (UINT64 *) Buffer, Function);
AcpiExReleaseGlobalLock (ObjDesc->CommonField.FieldFlags); AcpiExReleaseGlobalLock (ObjDesc->CommonField.FieldFlags);
*ResultDesc = BufferDesc; *ResultDesc = BufferDesc;

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -133,13 +133,13 @@ static ACPI_STATUS
AcpiExFieldDatumIo ( AcpiExFieldDatumIo (
ACPI_OPERAND_OBJECT *ObjDesc, ACPI_OPERAND_OBJECT *ObjDesc,
UINT32 FieldDatumByteOffset, UINT32 FieldDatumByteOffset,
ACPI_INTEGER *Value, UINT64 *Value,
UINT32 ReadWrite); UINT32 ReadWrite);
static BOOLEAN static BOOLEAN
AcpiExRegisterOverflow ( AcpiExRegisterOverflow (
ACPI_OPERAND_OBJECT *ObjDesc, ACPI_OPERAND_OBJECT *ObjDesc,
ACPI_INTEGER Value); UINT64 Value);
static ACPI_STATUS static ACPI_STATUS
AcpiExSetupRegion ( AcpiExSetupRegion (
@ -296,7 +296,7 @@ AcpiExSetupRegion (
* FieldDatumByteOffset - Byte offset of this datum within the * FieldDatumByteOffset - Byte offset of this datum within the
* parent field * parent field
* Value - Where to store value (must at least * Value - Where to store value (must at least
* the size of ACPI_INTEGER) * 64 bits)
* Function - Read or Write flag plus other region- * Function - Read or Write flag plus other region-
* dependent flags * dependent flags
* *
@ -310,7 +310,7 @@ ACPI_STATUS
AcpiExAccessRegion ( AcpiExAccessRegion (
ACPI_OPERAND_OBJECT *ObjDesc, ACPI_OPERAND_OBJECT *ObjDesc,
UINT32 FieldDatumByteOffset, UINT32 FieldDatumByteOffset,
ACPI_INTEGER *Value, UINT64 *Value,
UINT32 Function) UINT32 Function)
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
@ -408,7 +408,7 @@ AcpiExAccessRegion (
static BOOLEAN static BOOLEAN
AcpiExRegisterOverflow ( AcpiExRegisterOverflow (
ACPI_OPERAND_OBJECT *ObjDesc, ACPI_OPERAND_OBJECT *ObjDesc,
ACPI_INTEGER Value) UINT64 Value)
{ {
if (ObjDesc->CommonField.BitLength >= ACPI_INTEGER_BIT_SIZE) if (ObjDesc->CommonField.BitLength >= ACPI_INTEGER_BIT_SIZE)
@ -420,7 +420,7 @@ AcpiExRegisterOverflow (
return (FALSE); return (FALSE);
} }
if (Value >= ((ACPI_INTEGER) 1 << ObjDesc->CommonField.BitLength)) if (Value >= ((UINT64) 1 << ObjDesc->CommonField.BitLength))
{ {
/* /*
* The Value is larger than the maximum value that can fit into * The Value is larger than the maximum value that can fit into
@ -457,11 +457,11 @@ static ACPI_STATUS
AcpiExFieldDatumIo ( AcpiExFieldDatumIo (
ACPI_OPERAND_OBJECT *ObjDesc, ACPI_OPERAND_OBJECT *ObjDesc,
UINT32 FieldDatumByteOffset, UINT32 FieldDatumByteOffset,
ACPI_INTEGER *Value, UINT64 *Value,
UINT32 ReadWrite) UINT32 ReadWrite)
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_INTEGER LocalValue; UINT64 LocalValue;
ACPI_FUNCTION_TRACE_U32 (ExFieldDatumIo, FieldDatumByteOffset); ACPI_FUNCTION_TRACE_U32 (ExFieldDatumIo, FieldDatumByteOffset);
@ -543,7 +543,7 @@ AcpiExFieldDatumIo (
* the register * the register
*/ */
if (AcpiExRegisterOverflow (ObjDesc->BankField.BankObj, if (AcpiExRegisterOverflow (ObjDesc->BankField.BankObj,
(ACPI_INTEGER) ObjDesc->BankField.Value)) (UINT64) ObjDesc->BankField.Value))
{ {
return_ACPI_STATUS (AE_AML_REGISTER_LIMIT); return_ACPI_STATUS (AE_AML_REGISTER_LIMIT);
} }
@ -586,7 +586,7 @@ AcpiExFieldDatumIo (
* the register * the register
*/ */
if (AcpiExRegisterOverflow (ObjDesc->IndexField.IndexObj, if (AcpiExRegisterOverflow (ObjDesc->IndexField.IndexObj,
(ACPI_INTEGER) ObjDesc->IndexField.Value)) (UINT64) ObjDesc->IndexField.Value))
{ {
return_ACPI_STATUS (AE_AML_REGISTER_LIMIT); return_ACPI_STATUS (AE_AML_REGISTER_LIMIT);
} }
@ -615,7 +615,7 @@ AcpiExFieldDatumIo (
"Read from Data Register\n")); "Read from Data Register\n"));
Status = AcpiExExtractFromField (ObjDesc->IndexField.DataObj, Status = AcpiExExtractFromField (ObjDesc->IndexField.DataObj,
Value, sizeof (ACPI_INTEGER)); Value, sizeof (UINT64));
} }
else else
{ {
@ -626,7 +626,7 @@ AcpiExFieldDatumIo (
ACPI_FORMAT_UINT64 (*Value))); ACPI_FORMAT_UINT64 (*Value)));
Status = AcpiExInsertIntoField (ObjDesc->IndexField.DataObj, Status = AcpiExInsertIntoField (ObjDesc->IndexField.DataObj,
Value, sizeof (ACPI_INTEGER)); Value, sizeof (UINT64));
} }
break; break;
@ -679,13 +679,13 @@ AcpiExFieldDatumIo (
ACPI_STATUS ACPI_STATUS
AcpiExWriteWithUpdateRule ( AcpiExWriteWithUpdateRule (
ACPI_OPERAND_OBJECT *ObjDesc, ACPI_OPERAND_OBJECT *ObjDesc,
ACPI_INTEGER Mask, UINT64 Mask,
ACPI_INTEGER FieldValue, UINT64 FieldValue,
UINT32 FieldDatumByteOffset) UINT32 FieldDatumByteOffset)
{ {
ACPI_STATUS Status = AE_OK; ACPI_STATUS Status = AE_OK;
ACPI_INTEGER MergedValue; UINT64 MergedValue;
ACPI_INTEGER CurrentValue; UINT64 CurrentValue;
ACPI_FUNCTION_TRACE_U32 (ExWriteWithUpdateRule, Mask); ACPI_FUNCTION_TRACE_U32 (ExWriteWithUpdateRule, Mask);
@ -697,7 +697,7 @@ AcpiExWriteWithUpdateRule (
/* If the mask is all ones, we don't need to worry about the update rule */ /* If the mask is all ones, we don't need to worry about the update rule */
if (Mask != ACPI_INTEGER_MAX) if (Mask != ACPI_UINT64_MAX)
{ {
/* Decode the update rule */ /* Decode the update rule */
@ -787,8 +787,8 @@ AcpiExExtractFromField (
UINT32 BufferLength) UINT32 BufferLength)
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_INTEGER RawDatum; UINT64 RawDatum;
ACPI_INTEGER MergedDatum; UINT64 MergedDatum;
UINT32 FieldOffset = 0; UINT32 FieldOffset = 0;
UINT32 BufferOffset = 0; UINT32 BufferOffset = 0;
UINT32 BufferTailBits; UINT32 BufferTailBits;
@ -917,10 +917,10 @@ AcpiExInsertIntoField (
UINT32 BufferLength) UINT32 BufferLength)
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_INTEGER Mask; UINT64 Mask;
ACPI_INTEGER WidthMask; UINT64 WidthMask;
ACPI_INTEGER MergedDatum; UINT64 MergedDatum;
ACPI_INTEGER RawDatum = 0; UINT64 RawDatum = 0;
UINT32 FieldOffset = 0; UINT32 FieldOffset = 0;
UINT32 BufferOffset = 0; UINT32 BufferOffset = 0;
UINT32 BufferTailBits; UINT32 BufferTailBits;
@ -972,7 +972,7 @@ AcpiExInsertIntoField (
*/ */
if (ObjDesc->CommonField.AccessBitWidth == ACPI_INTEGER_BIT_SIZE) if (ObjDesc->CommonField.AccessBitWidth == ACPI_INTEGER_BIT_SIZE)
{ {
WidthMask = ACPI_INTEGER_MAX; WidthMask = ACPI_UINT64_MAX;
} }
else else
{ {

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -508,11 +508,11 @@ AcpiExDoConcatenate (
* *
******************************************************************************/ ******************************************************************************/
ACPI_INTEGER UINT64
AcpiExDoMathOp ( AcpiExDoMathOp (
UINT16 Opcode, UINT16 Opcode,
ACPI_INTEGER Integer0, UINT64 Integer0,
ACPI_INTEGER Integer1) UINT64 Integer1)
{ {
ACPI_FUNCTION_ENTRY (); ACPI_FUNCTION_ENTRY ();
@ -615,8 +615,8 @@ AcpiExDoMathOp (
ACPI_STATUS ACPI_STATUS
AcpiExDoLogicalNumericOp ( AcpiExDoLogicalNumericOp (
UINT16 Opcode, UINT16 Opcode,
ACPI_INTEGER Integer0, UINT64 Integer0,
ACPI_INTEGER Integer1, UINT64 Integer1,
BOOLEAN *LogicalResult) BOOLEAN *LogicalResult)
{ {
ACPI_STATUS Status = AE_OK; ACPI_STATUS Status = AE_OK;
@ -690,8 +690,8 @@ AcpiExDoLogicalOp (
BOOLEAN *LogicalResult) BOOLEAN *LogicalResult)
{ {
ACPI_OPERAND_OBJECT *LocalOperand1 = Operand1; ACPI_OPERAND_OBJECT *LocalOperand1 = Operand1;
ACPI_INTEGER Integer0; UINT64 Integer0;
ACPI_INTEGER Integer1; UINT64 Integer1;
UINT32 Length0; UINT32 Length0;
UINT32 Length1; UINT32 Length1;
ACPI_STATUS Status = AE_OK; ACPI_STATUS Status = AE_OK;

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -368,8 +368,8 @@ AcpiExOpcode_1A_1T_1R (
ACPI_OPERAND_OBJECT *ReturnDesc2 = NULL; ACPI_OPERAND_OBJECT *ReturnDesc2 = NULL;
UINT32 Temp32; UINT32 Temp32;
UINT32 i; UINT32 i;
ACPI_INTEGER PowerOfTen; UINT64 PowerOfTen;
ACPI_INTEGER Digit; UINT64 Digit;
ACPI_FUNCTION_TRACE_STR (ExOpcode_1A_1T_1R, ACPI_FUNCTION_TRACE_STR (ExOpcode_1A_1T_1R,
@ -477,7 +477,7 @@ AcpiExOpcode_1A_1T_1R (
/* Sum the digit into the result with the current power of 10 */ /* Sum the digit into the result with the current power of 10 */
ReturnDesc->Integer.Value += ReturnDesc->Integer.Value +=
(((ACPI_INTEGER) Temp32) * PowerOfTen); (((UINT64) Temp32) * PowerOfTen);
/* Shift to next BCD digit */ /* Shift to next BCD digit */
@ -506,7 +506,7 @@ AcpiExOpcode_1A_1T_1R (
* remainder from above * remainder from above
*/ */
ReturnDesc->Integer.Value |= ReturnDesc->Integer.Value |=
(((ACPI_INTEGER) Temp32) << ACPI_MUL_4 (i)); (((UINT64) Temp32) << ACPI_MUL_4 (i));
} }
/* Overflow if there is any data left in Digit */ /* Overflow if there is any data left in Digit */
@ -553,7 +553,7 @@ AcpiExOpcode_1A_1T_1R (
/* The object exists in the namespace, return TRUE */ /* The object exists in the namespace, return TRUE */
ReturnDesc->Integer.Value = ACPI_INTEGER_MAX; ReturnDesc->Integer.Value = ACPI_UINT64_MAX;
goto Cleanup; goto Cleanup;
@ -719,7 +719,7 @@ AcpiExOpcode_1A_0T_1R (
ACPI_OPERAND_OBJECT *ReturnDesc = NULL; ACPI_OPERAND_OBJECT *ReturnDesc = NULL;
ACPI_STATUS Status = AE_OK; ACPI_STATUS Status = AE_OK;
UINT32 Type; UINT32 Type;
ACPI_INTEGER Value; UINT64 Value;
ACPI_FUNCTION_TRACE_STR (ExOpcode_1A_0T_1R, ACPI_FUNCTION_TRACE_STR (ExOpcode_1A_0T_1R,
@ -745,7 +745,7 @@ AcpiExOpcode_1A_0T_1R (
*/ */
if (!Operand[0]->Integer.Value) if (!Operand[0]->Integer.Value)
{ {
ReturnDesc->Integer.Value = ACPI_INTEGER_MAX; ReturnDesc->Integer.Value = ACPI_UINT64_MAX;
} }
break; break;

View File

@ -8,7 +8,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -383,7 +383,7 @@ AcpiExOpcode_2A_1T_1R (
{ {
ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0]; ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0];
ACPI_OPERAND_OBJECT *ReturnDesc = NULL; ACPI_OPERAND_OBJECT *ReturnDesc = NULL;
ACPI_INTEGER Index; UINT64 Index;
ACPI_STATUS Status = AE_OK; ACPI_STATUS Status = AE_OK;
ACPI_SIZE Length; ACPI_SIZE Length;
@ -716,7 +716,7 @@ AcpiExOpcode_2A_0T_1R (
*/ */
if (LogicalResult) if (LogicalResult)
{ {
ReturnDesc->Integer.Value = ACPI_INTEGER_MAX; ReturnDesc->Integer.Value = ACPI_UINT64_MAX;
} }
Cleanup: Cleanup:

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -239,7 +239,7 @@ AcpiExOpcode_3A_1T_1R (
ACPI_OPERAND_OBJECT *ReturnDesc = NULL; ACPI_OPERAND_OBJECT *ReturnDesc = NULL;
char *Buffer = NULL; char *Buffer = NULL;
ACPI_STATUS Status = AE_OK; ACPI_STATUS Status = AE_OK;
ACPI_INTEGER Index; UINT64 Index;
ACPI_SIZE Length; ACPI_SIZE Length;

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -305,7 +305,7 @@ AcpiExOpcode_6A_0T_1R (
ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0]; ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0];
ACPI_OPERAND_OBJECT *ReturnDesc = NULL; ACPI_OPERAND_OBJECT *ReturnDesc = NULL;
ACPI_STATUS Status = AE_OK; ACPI_STATUS Status = AE_OK;
ACPI_INTEGER Index; UINT64 Index;
ACPI_OPERAND_OBJECT *ThisElement; ACPI_OPERAND_OBJECT *ThisElement;
@ -344,9 +344,9 @@ AcpiExOpcode_6A_0T_1R (
} }
/* Create an integer for the return value */ /* Create an integer for the return value */
/* Default return value is ACPI_INTEGER_MAX if no match found */ /* Default return value is ACPI_UINT64_MAX if no match found */
ReturnDesc = AcpiUtCreateIntegerObject (ACPI_INTEGER_MAX); ReturnDesc = AcpiUtCreateIntegerObject (ACPI_UINT64_MAX);
if (!ReturnDesc) if (!ReturnDesc)
{ {
Status = AE_NO_MEMORY; Status = AE_NO_MEMORY;
@ -362,7 +362,7 @@ AcpiExOpcode_6A_0T_1R (
* *
* Upon finding a match, the loop will terminate via "break" at * Upon finding a match, the loop will terminate via "break" at
* the bottom. If it terminates "normally", MatchValue will be * the bottom. If it terminates "normally", MatchValue will be
* ACPI_INTEGER_MAX (Ones) (its initial value) indicating that no * ACPI_UINT64_MAX (Ones) (its initial value) indicating that no
* match was found. * match was found.
*/ */
for ( ; Index < Operand[0]->Package.Count; Index++) for ( ; Index < Operand[0]->Package.Count; Index++)

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -149,7 +149,7 @@ AcpiExSystemMemorySpaceHandler (
UINT32 Function, UINT32 Function,
ACPI_PHYSICAL_ADDRESS Address, ACPI_PHYSICAL_ADDRESS Address,
UINT32 BitWidth, UINT32 BitWidth,
ACPI_INTEGER *Value, UINT64 *Value,
void *HandlerContext, void *HandlerContext,
void *RegionContext) void *RegionContext)
{ {
@ -198,7 +198,7 @@ AcpiExSystemMemorySpaceHandler (
* Hardware does not support non-aligned data transfers, we must verify * Hardware does not support non-aligned data transfers, we must verify
* the request. * the request.
*/ */
(void) AcpiUtShortDivide ((ACPI_INTEGER) Address, Length, NULL, &Remainder); (void) AcpiUtShortDivide ((UINT64) Address, Length, NULL, &Remainder);
if (Remainder != 0) if (Remainder != 0)
{ {
return_ACPI_STATUS (AE_AML_ALIGNMENT); return_ACPI_STATUS (AE_AML_ALIGNMENT);
@ -211,8 +211,8 @@ AcpiExSystemMemorySpaceHandler (
* 2) Address beyond the current mapping? * 2) Address beyond the current mapping?
*/ */
if ((Address < MemInfo->MappedPhysicalAddress) || if ((Address < MemInfo->MappedPhysicalAddress) ||
(((ACPI_INTEGER) Address + Length) > (((UINT64) Address + Length) >
((ACPI_INTEGER) ((UINT64)
MemInfo->MappedPhysicalAddress + MemInfo->MappedLength))) MemInfo->MappedPhysicalAddress + MemInfo->MappedLength)))
{ {
/* /*
@ -282,7 +282,7 @@ AcpiExSystemMemorySpaceHandler (
* access * access
*/ */
LogicalAddrPtr = MemInfo->MappedLogicalAddress + LogicalAddrPtr = MemInfo->MappedLogicalAddress +
((ACPI_INTEGER) Address - (ACPI_INTEGER) MemInfo->MappedPhysicalAddress); ((UINT64) Address - (UINT64) MemInfo->MappedPhysicalAddress);
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
"System-Memory (width %d) R/W %d Address=%8.8X%8.8X\n", "System-Memory (width %d) R/W %d Address=%8.8X%8.8X\n",
@ -304,19 +304,19 @@ AcpiExSystemMemorySpaceHandler (
switch (BitWidth) switch (BitWidth)
{ {
case 8: case 8:
*Value = (ACPI_INTEGER) ACPI_GET8 (LogicalAddrPtr); *Value = (UINT64) ACPI_GET8 (LogicalAddrPtr);
break; break;
case 16: case 16:
*Value = (ACPI_INTEGER) ACPI_GET16 (LogicalAddrPtr); *Value = (UINT64) ACPI_GET16 (LogicalAddrPtr);
break; break;
case 32: case 32:
*Value = (ACPI_INTEGER) ACPI_GET32 (LogicalAddrPtr); *Value = (UINT64) ACPI_GET32 (LogicalAddrPtr);
break; break;
case 64: case 64:
*Value = (ACPI_INTEGER) ACPI_GET64 (LogicalAddrPtr); *Value = (UINT64) ACPI_GET64 (LogicalAddrPtr);
break; break;
default: default:
@ -383,7 +383,7 @@ AcpiExSystemIoSpaceHandler (
UINT32 Function, UINT32 Function,
ACPI_PHYSICAL_ADDRESS Address, ACPI_PHYSICAL_ADDRESS Address,
UINT32 BitWidth, UINT32 BitWidth,
ACPI_INTEGER *Value, UINT64 *Value,
void *HandlerContext, void *HandlerContext,
void *RegionContext) void *RegionContext)
{ {
@ -447,7 +447,7 @@ AcpiExPciConfigSpaceHandler (
UINT32 Function, UINT32 Function,
ACPI_PHYSICAL_ADDRESS Address, ACPI_PHYSICAL_ADDRESS Address,
UINT32 BitWidth, UINT32 BitWidth,
ACPI_INTEGER *Value, UINT64 *Value,
void *HandlerContext, void *HandlerContext,
void *RegionContext) void *RegionContext)
{ {
@ -527,7 +527,7 @@ AcpiExCmosSpaceHandler (
UINT32 Function, UINT32 Function,
ACPI_PHYSICAL_ADDRESS Address, ACPI_PHYSICAL_ADDRESS Address,
UINT32 BitWidth, UINT32 BitWidth,
ACPI_INTEGER *Value, UINT64 *Value,
void *HandlerContext, void *HandlerContext,
void *RegionContext) void *RegionContext)
{ {
@ -564,7 +564,7 @@ AcpiExPciBarSpaceHandler (
UINT32 Function, UINT32 Function,
ACPI_PHYSICAL_ADDRESS Address, ACPI_PHYSICAL_ADDRESS Address,
UINT32 BitWidth, UINT32 BitWidth,
ACPI_INTEGER *Value, UINT64 *Value,
void *HandlerContext, void *HandlerContext,
void *RegionContext) void *RegionContext)
{ {
@ -601,7 +601,7 @@ AcpiExDataTableSpaceHandler (
UINT32 Function, UINT32 Function,
ACPI_PHYSICAL_ADDRESS Address, ACPI_PHYSICAL_ADDRESS Address,
UINT32 BitWidth, UINT32 BitWidth,
ACPI_INTEGER *Value, UINT64 *Value,
void *HandlerContext, void *HandlerContext,
void *RegionContext) void *RegionContext)
{ {

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -10,7 +10,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License

View File

@ -9,7 +9,7 @@
* *
* 1. Copyright Notice * 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. * All rights reserved.
* *
* 2. License * 2. License
@ -293,7 +293,7 @@ AcpiExSystemDoStall (
ACPI_STATUS ACPI_STATUS
AcpiExSystemDoSuspend ( AcpiExSystemDoSuspend (
ACPI_INTEGER HowLong) UINT64 HowLong)
{ {
ACPI_FUNCTION_ENTRY (); ACPI_FUNCTION_ENTRY ();

Some files were not shown because too many files have changed in this diff Show More