Vendor import of Intel ACPI-CA 20070320

1 files changed, 151 insertions, 125 deletions

diff --git a/sys/contrib/dev/acpica/acstruct.h b/sys/contrib/dev/acpica/acstruct.h
index b45e9f4bacdf..7861e7ad22cf 100644
--- a/sys/contrib/dev/acpica/acstruct.h
+++ b/sys/contrib/dev/acpica/acstruct.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acstruct.h - Internal structs
- *       $Revision: 1.37 $
+ *       $Revision: 1.47 $
  *
  *****************************************************************************/
 
@@ -9,7 +9,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2005, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2007, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -117,6 +117,7 @@
 #ifndef __ACSTRUCT_H__
 #define __ACSTRUCT_H__
 
+/* acpisrc:StructDefs -- for acpisrc conversion */
 
 /*****************************************************************************
  *
@@ -126,68 +127,81 @@
 
 
 /*
- * Walk state - current state of a parse tree walk.  Used for both a leisurely stroll through
- * the tree (for whatever reason), and for control method execution.
+ * Walk state - current state of a parse tree walk.  Used for both a leisurely
+ * stroll through the tree (for whatever reason), and for control method
+ * execution.
  */
 #define ACPI_NEXT_OP_DOWNWARD       1
 #define ACPI_NEXT_OP_UPWARD         2
 
+/*
+ * Groups of definitions for WalkType used for different implementations of
+ * walkers (never simultaneously) - flags for interpreter:
+ */
 #define ACPI_WALK_NON_METHOD        0
-#define ACPI_WALK_METHOD            1
-#define ACPI_WALK_METHOD_RESTART    2
-#define ACPI_WALK_CONST_REQUIRED    3
-#define ACPI_WALK_CONST_OPTIONAL    4
+#define ACPI_WALK_METHOD            0x01
+#define ACPI_WALK_METHOD_RESTART    0x02
+
+/* Flags for iASL compiler only */
+
+#define ACPI_WALK_CONST_REQUIRED    0x10
+#define ACPI_WALK_CONST_OPTIONAL    0x20
+
 
 typedef struct acpi_walk_state
 {
-    UINT8                       DataType;                           /* To differentiate various internal objs MUST BE FIRST!*/\
-    UINT8                       WalkType;
-    ACPI_OWNER_ID               OwnerId;                            /* Owner of objects created during the walk */
-    BOOLEAN                     LastPredicate;                      /* Result of last predicate */
-    UINT8                       CurrentResult;                      /* */
-    UINT8                       NextOpInfo;                         /* Info about NextOp */
-    UINT8                       NumOperands;                        /* Stack pointer for Operands[] array */
-    UINT8                       ReturnUsed;
-    UINT16                      Opcode;                             /* Current AML opcode */
-    UINT8                       ScopeDepth;
-    UINT8                       PassNumber;                         /* Parse pass during table load */
-    UINT32                      ArgCount;                           /* push for fixed or var args */
-    UINT32                      AmlOffset;
-    UINT32                      ArgTypes;
-    UINT32                      MethodBreakpoint;                   /* For single stepping */
-    UINT32                      UserBreakpoint;                     /* User AML breakpoint */
-    UINT32                      ParseFlags;
-    UINT32                      PrevArgTypes;
-
-    UINT8                       *AmlLastWhile;
-    struct acpi_namespace_node  Arguments[ACPI_METHOD_NUM_ARGS];    /* Control method arguments */
-    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  LocalVariables[ACPI_METHOD_NUM_LOCALS];     /* Control method locals */
-    struct acpi_namespace_node  *MethodCallNode;                    /* Called method Node*/
-    ACPI_PARSE_OBJECT           *MethodCallOp;                      /* MethodCall Op if running a method */
-    union acpi_operand_object   *MethodDesc;                        /* Method descriptor if running a method */
-    struct acpi_namespace_node  *MethodNode;                        /* Method node if running a method. */
-    ACPI_PARSE_OBJECT           *Op;                                /* Current parser op */
-    union acpi_operand_object   *Operands[ACPI_OBJ_NUM_OPERANDS+1]; /* Operands passed to the interpreter (+1 for NULL terminator) */
-    const ACPI_OPCODE_INFO      *OpInfo;                            /* Info on current opcode */
-    ACPI_PARSE_OBJECT           *Origin;                            /* Start of walk [Obsolete] */
-    union acpi_operand_object   **Params;
-    ACPI_PARSE_STATE            ParserState;                        /* Current state of parser */
-    union acpi_operand_object   *ResultObj;
-    ACPI_GENERIC_STATE          *Results;                           /* Stack of accumulated results */
-    union acpi_operand_object   *ReturnDesc;                        /* Return object, if any */
-    ACPI_GENERIC_STATE          *ScopeInfo;                         /* Stack of nested scopes */
-
-    ACPI_PARSE_OBJECT           *PrevOp;                            /* Last op that was processed */
-    ACPI_PARSE_OBJECT           *NextOp;                            /* next op to be processed */
-    ACPI_PARSE_DOWNWARDS        DescendingCallback;
-    ACPI_PARSE_UPWARDS          AscendingCallback;
-    ACPI_THREAD_STATE           *Thread;
-    struct acpi_walk_state      *Next;                              /* Next WalkState in list */
+    struct acpi_walk_state          *Next;              /* Next WalkState in list */
+    UINT8                           DescriptorType;     /* To differentiate various internal objs */
+    UINT8                           WalkType;
+    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 */
+    UINT32                          UserBreakpoint;     /* User AML breakpoint */
+    UINT32                          ParseFlags;
+
+    ACPI_PARSE_STATE                ParserState;        /* Current state of parser */
+    UINT32                          PrevArgTypes;
+    UINT32                          ArgCount;           /* push for fixed or var args */
+
+    struct acpi_namespace_node      Arguments[ACPI_METHOD_NUM_ARGS];        /* Control method arguments */
+    struct acpi_namespace_node      LocalVariables[ACPI_METHOD_NUM_LOCALS]; /* Control method locals */
+    union acpi_operand_object       *Operands[ACPI_OBJ_NUM_OPERANDS + 1];   /* Operands passed to the interpreter (+1 for NULL terminator) */
+    union acpi_operand_object       **Params;
+
+    UINT8                           *AmlLastWhile;
+    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 */
+    union acpi_operand_object       *MethodDesc;        /* Method descriptor if running a method */
+    struct acpi_namespace_node      *MethodNode;        /* Method node if running a method. */
+    ACPI_PARSE_OBJECT               *Op;                /* Current parser op */
+    const ACPI_OPCODE_INFO          *OpInfo;            /* Info on current opcode */
+    ACPI_PARSE_OBJECT               *Origin;            /* Start of walk [Obsolete] */
+    union acpi_operand_object       *ResultObj;
+    ACPI_GENERIC_STATE              *Results;           /* Stack of accumulated results */
+    union acpi_operand_object       *ReturnDesc;        /* Return object, if any */
+    ACPI_GENERIC_STATE              *ScopeInfo;         /* Stack of nested scopes */
+    ACPI_PARSE_OBJECT               *PrevOp;            /* Last op that was processed */
+    ACPI_PARSE_OBJECT               *NextOp;            /* next op to be processed */
+    ACPI_THREAD_STATE               *Thread;
+    ACPI_PARSE_DOWNWARDS            DescendingCallback;
+    ACPI_PARSE_UPWARDS              AscendingCallback;
 
 } ACPI_WALK_STATE;
 
@@ -196,112 +210,124 @@ typedef struct acpi_walk_state
 
 typedef struct acpi_init_walk_info
 {
-    UINT16                  MethodCount;
-    UINT16                  DeviceCount;
-    UINT16                  OpRegionCount;
-    UINT16                  FieldCount;
-    UINT16                  BufferCount;
-    UINT16                  PackageCount;
-    UINT16                  OpRegionInit;
-    UINT16                  FieldInit;
-    UINT16                  BufferInit;
-    UINT16                  PackageInit;
-    UINT16                  ObjectCount;
-    ACPI_TABLE_DESC         *TableDesc;
+    UINT16                          MethodCount;
+    UINT16                          DeviceCount;
+    UINT16                          OpRegionCount;
+    UINT16                          FieldCount;
+    UINT16                          BufferCount;
+    UINT16                          PackageCount;
+    UINT16                          OpRegionInit;
+    UINT16                          FieldInit;
+    UINT16                          BufferInit;
+    UINT16                          PackageInit;
+    UINT16                          ObjectCount;
+    ACPI_OWNER_ID                   OwnerId;
+    ACPI_NATIVE_UINT                TableIndex;
 
 } ACPI_INIT_WALK_INFO;
 
 
-/* Info used by AcpiNsInitializeDevices */
-
-typedef struct acpi_device_walk_info
-{
-    UINT16                  DeviceCount;
-    UINT16                  Num_STA;
-    UINT16                  Num_INI;
-    ACPI_TABLE_DESC         *TableDesc;
-
-} ACPI_DEVICE_WALK_INFO;
-
-
-/* TBD: [Restructure] Merge with struct above */
-
-typedef struct acpi_walk_info
-{
-    UINT32                  DebugLevel;
-    UINT32                  Count;
-    ACPI_OWNER_ID           OwnerId;
-    UINT8                   DisplayType;
-
-} ACPI_WALK_INFO;
-
-/* Display Types */
-
-#define ACPI_DISPLAY_SUMMARY    (UINT8) 0
-#define ACPI_DISPLAY_OBJECTS    (UINT8) 1
-#define ACPI_DISPLAY_MASK       (UINT8) 1
-
-#define ACPI_DISPLAY_SHORT      (UINT8) 2
-
 typedef struct acpi_get_devices_info
 {
-    ACPI_WALK_CALLBACK      UserFunction;
-    void                    *Context;
-    char                    *Hid;
+    ACPI_WALK_CALLBACK              UserFunction;
+    void                            *Context;
+    char                            *Hid;
 
 } ACPI_GET_DEVICES_INFO;
 
 
 typedef union acpi_aml_operands
 {
-    ACPI_OPERAND_OBJECT         *Operands[7];
+    ACPI_OPERAND_OBJECT             *Operands[7];
 
     struct
     {
-        ACPI_OBJECT_INTEGER     *Type;
-        ACPI_OBJECT_INTEGER     *Code;
-        ACPI_OBJECT_INTEGER     *Argument;
+        ACPI_OBJECT_INTEGER             *Type;
+        ACPI_OBJECT_INTEGER             *Code;
+        ACPI_OBJECT_INTEGER             *Argument;
 
     } Fatal;
 
     struct
     {
-        ACPI_OPERAND_OBJECT     *Source;
-        ACPI_OBJECT_INTEGER     *Index;
-        ACPI_OPERAND_OBJECT     *Target;
+        ACPI_OPERAND_OBJECT             *Source;
+        ACPI_OBJECT_INTEGER             *Index;
+        ACPI_OPERAND_OBJECT             *Target;
 
     } Index;
 
     struct
     {
-        ACPI_OPERAND_OBJECT     *Source;
-        ACPI_OBJECT_INTEGER     *Index;
-        ACPI_OBJECT_INTEGER     *Length;
-        ACPI_OPERAND_OBJECT     *Target;
+        ACPI_OPERAND_OBJECT             *Source;
+        ACPI_OBJECT_INTEGER             *Index;
+        ACPI_OBJECT_INTEGER             *Length;
+        ACPI_OPERAND_OBJECT             *Target;
 
     } Mid;
 
 } ACPI_AML_OPERANDS;
 
 
-/* Internal method parameter list */
-
-typedef struct acpi_parameter_info
+/*
+ * Structure used to pass object evaluation parameters.
+ * Purpose is to reduce CPU stack use.
+ */
+typedef struct acpi_evaluate_info
 {
-    ACPI_NAMESPACE_NODE     *Node;
-    ACPI_OPERAND_OBJECT     *ObjDesc;
-    ACPI_OPERAND_OBJECT     **Parameters;
-    ACPI_OPERAND_OBJECT     *ReturnObject;
-    UINT8                   PassNumber;
-    UINT8                   ParameterType;
-    UINT8                   ReturnObjectType;
-
-} ACPI_PARAMETER_INFO;
+    ACPI_NAMESPACE_NODE             *PrefixNode;
+    char                            *Pathname;
+    ACPI_OPERAND_OBJECT             *ObjDesc;
+    ACPI_OPERAND_OBJECT             **Parameters;
+    ACPI_NAMESPACE_NODE             *ResolvedNode;
+    ACPI_OPERAND_OBJECT             *ReturnObject;
+    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
+
+
+/* Info used by AcpiNsInitializeDevices */
+
+typedef struct acpi_device_walk_info
+{
+    UINT16                          DeviceCount;
+    UINT16                          Num_STA;
+    UINT16                          Num_INI;
+    ACPI_TABLE_DESC                 *TableDesc;
+    ACPI_EVALUATE_INFO              *EvaluateInfo;
+
+} ACPI_DEVICE_WALK_INFO;
+
+
+/* TBD: [Restructure] Merge with struct above */
+
+typedef struct acpi_walk_info
+{
+    UINT32                          DebugLevel;
+    UINT32                          Count;
+    ACPI_OWNER_ID                   OwnerId;
+    UINT8                           DisplayType;
+
+} ACPI_WALK_INFO;
+
+/* Display Types */
+
+#define ACPI_DISPLAY_SUMMARY        (UINT8) 0
+#define ACPI_DISPLAY_OBJECTS        (UINT8) 1
+#define ACPI_DISPLAY_MASK           (UINT8) 1
+
+#define ACPI_DISPLAY_SHORT          (UINT8) 2
+
 
 #endif