diff options
Diffstat (limited to 'usr/src/uts/intel/sys/acpi/acstruct.h')
| -rw-r--r-- | usr/src/uts/intel/sys/acpi/acstruct.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/usr/src/uts/intel/sys/acpi/acstruct.h b/usr/src/uts/intel/sys/acpi/acstruct.h index 87744cced2..f01f73455c 100644 --- a/usr/src/uts/intel/sys/acpi/acstruct.h +++ b/usr/src/uts/intel/sys/acpi/acstruct.h @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acstruct.h - Internal structs - * $Revision: 1.44 $ + * $Revision: 1.50 $ * *****************************************************************************/ @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2006, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2008, Intel Corp. * All rights reserved. * * 2. License @@ -156,12 +156,15 @@ typedef struct acpi_walk_state UINT16 Opcode; /* Current AML opcode */ UINT8 NextOpInfo; /* Info about NextOp */ UINT8 NumOperands; /* Stack pointer for Operands[] array */ + UINT8 OperandIndex; /* Index into operand stack, to be used by AcpiDsObjStackPush */ ACPI_OWNER_ID OwnerId; /* Owner of objects created during the walk */ BOOLEAN LastPredicate; /* Result of last predicate */ UINT8 CurrentResult; UINT8 ReturnUsed; UINT8 ScopeDepth; UINT8 PassNumber; /* Parse pass during table load */ + UINT8 ResultSize; /* Total elements for the result stack */ + UINT8 ResultCount; /* Current number of occupied elements of result stack */ UINT32 AmlOffset; UINT32 ArgTypes; UINT32 MethodBreakpoint; /* For single stepping */ @@ -181,7 +184,6 @@ typedef struct acpi_walk_state union acpi_operand_object **CallerReturnDesc; ACPI_GENERIC_STATE *ControlState; /* List of control states (nested IFs) */ struct acpi_namespace_node *DeferredNode; /* Used when executing deferred opcodes */ - struct acpi_gpe_event_info *GpeEventInfo; /* Info for GPE (_Lxx/_Exx methods only */ union acpi_operand_object *ImplicitReturnObj; struct acpi_namespace_node *MethodCallNode; /* Called method Node*/ ACPI_PARSE_OBJECT *MethodCallOp; /* MethodCall Op if running a method */ @@ -218,7 +220,8 @@ typedef struct acpi_init_walk_info UINT16 BufferInit; UINT16 PackageInit; UINT16 ObjectCount; - ACPI_TABLE_DESC *TableDesc; + ACPI_OWNER_ID OwnerId; + UINT32 TableIndex; } ACPI_INIT_WALK_INFO; @@ -276,18 +279,13 @@ typedef struct acpi_evaluate_info ACPI_OPERAND_OBJECT **Parameters; ACPI_NAMESPACE_NODE *ResolvedNode; ACPI_OPERAND_OBJECT *ReturnObject; + UINT8 ParamCount; UINT8 PassNumber; - UINT8 ParameterType; UINT8 ReturnObjectType; UINT8 Flags; } ACPI_EVALUATE_INFO; -/* Types for ParameterType above */ - -#define ACPI_PARAM_ARGS 0 -#define ACPI_PARAM_GPE 1 - /* Values for Flags above */ #define ACPI_IGNORE_RETURN_VALUE 1 |