patch-2.4.14 linux/drivers/acpi/include/acstruct.h

• Lines: 163
• Date: Wed Oct 24 14:06:22 2001
• Orig file: v2.4.13/linux/drivers/acpi/include/acstruct.h
• Orig date: Sun Sep 23 11:40:56 2001

diff -u --recursive --new-file v2.4.13/linux/drivers/acpi/include/acstruct.h linux/drivers/acpi/include/acstruct.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acstruct.h - Internal structs
- *       $Revision: 5 $
+ *       $Revision: 10 $
  *
  *****************************************************************************/
 
@@ -51,46 +51,50 @@
 	u8                      data_type;                          /* To differentiate various internal objs MUST BE FIRST!*/\
 	acpi_owner_id           owner_id;                           /* Owner of objects created during the walk */
 	u8                      last_predicate;                     /* Result of last predicate */
+	u8                      current_result;                     /* */
 	u8                      next_op_info;                       /* Info about Next_op */
 	u8                      num_operands;                       /* Stack pointer for Operands[] array */
-	u8                      current_result;                     /* */
+	u8                      return_used;
+	u8                      walk_type;
+	u16                     current_sync_level;                 /* Mutex Sync (nested acquire) level */
+	u16                     opcode;                             /* Current AML opcode */
+	u32                     arg_count;                          /* push for fixed or var args */
+	u32                     aml_offset;
+	u32                     arg_types;
+	u32                     method_breakpoint;                  /* For single stepping */
+	u32                     parse_flags;
+	u32                     prev_arg_types;
 
-	struct acpi_walk_state  *next;                              /* Next Walk_state in list */
+
+	u8                      *aml_last_while;
+	struct acpi_node        arguments[MTH_NUM_ARGS];            /* Control method arguments */
+	union acpi_operand_obj  **caller_return_desc;
+	acpi_generic_state      *control_state;                     /* List of control states (nested IFs) */
+	struct acpi_node        local_variables[MTH_NUM_LOCALS];    /* Control method locals */
+	struct acpi_node        *method_call_node;                  /* Called method Node*/
+	acpi_parse_object       *method_call_op;                    /* Method_call Op if running a method */
+	union acpi_operand_obj  *method_desc;                       /* Method descriptor if running a method */
+	struct acpi_node        *method_node;                       /* Method Node if running a method */
+	acpi_parse_object       *op;                                /* Current parser op */
+	union acpi_operand_obj  *operands[OBJ_NUM_OPERANDS+1];      /* Operands passed to the interpreter (+1 for NULL terminator) */
+	const acpi_opcode_info  *op_info;                           /* Info on current opcode */
 	acpi_parse_object       *origin;                            /* Start of walk [Obsolete] */
+	union acpi_operand_obj  **params;
+	acpi_parse_state        parser_state;                       /* Current state of parser */
+	union acpi_operand_obj  *result_obj;
+	acpi_generic_state      *results;                           /* Stack of accumulated results */
+	union acpi_operand_obj  *return_desc;                       /* Return object, if any */
+	acpi_generic_state      *scope_info;                        /* Stack of nested scopes */
 
 /* TBD: Obsolete with removal of WALK procedure ? */
 	acpi_parse_object       *prev_op;                           /* Last op that was processed */
 	acpi_parse_object       *next_op;                           /* next op to be processed */
 
 
-	acpi_generic_state      *results;                           /* Stack of accumulated results */
-	acpi_generic_state      *control_state;                     /* List of control states (nested IFs) */
-	acpi_generic_state      *scope_info;                        /* Stack of nested scopes */
-	acpi_parse_state        *parser_state;                      /* Current state of parser */
-	u8                      *aml_last_while;
-	const acpi_opcode_info  *op_info;                           /* Info on current opcode */
 	acpi_parse_downwards    descending_callback;
 	acpi_parse_upwards      ascending_callback;
-
-	union acpi_operand_obj  *return_desc;                       /* Return object, if any */
-	union acpi_operand_obj  *method_desc;                       /* Method descriptor if running a method */
-	struct acpi_node        *method_node;                       /* Method Node if running a method */
-	acpi_parse_object       *method_call_op;                    /* Method_call Op if running a method */
-	struct acpi_node        *method_call_node;                  /* Called method Node*/
-	union acpi_operand_obj  *operands[OBJ_NUM_OPERANDS];        /* Operands passed to the interpreter */
-	struct acpi_node        arguments[MTH_NUM_ARGS];            /* Control method arguments */
-	struct acpi_node        local_variables[MTH_NUM_LOCALS];    /* Control method locals */
 	struct acpi_walk_list   *walk_list;
-	u32                     parse_flags;
-	u8                      walk_type;
-	u8                      return_used;
-	u16                     opcode;                             /* Current AML opcode */
-	u32                     prev_arg_types;
-	u16                     current_sync_level;                 /* Mutex Sync (nested acquire) level */
-
-	/* Debug support */
-
-	u32                     method_breakpoint;
+	struct acpi_walk_state  *next;                              /* Next Walk_state in list */
 
 
 } acpi_walk_state;
@@ -121,7 +125,7 @@
 	u16                     object_count;
 	acpi_table_desc         *table_desc;
 
-} ACPI_INIT_WALK_INFO;
+} acpi_init_walk_info;
 
 
 /* Info used by TBD */
@@ -133,7 +137,7 @@
 	u16                     num_INI;
 	acpi_table_desc         *table_desc;
 
-} ACPI_DEVICE_WALK_INFO;
+} acpi_device_walk_info;
 
 
 /* TBD: [Restructure] Merge with struct above */
@@ -142,16 +146,54 @@
 {
 	u32                     debug_level;
 	u32                     owner_id;
+	u8                      display_type;
+
+} acpi_walk_info;
+
+/* Display Types */
 
-} ACPI_WALK_INFO;
+#define ACPI_DISPLAY_SUMMARY    0
+#define ACPI_DISPLAY_OBJECTS    1
 
 typedef struct acpi_get_devices_info
 {
-	ACPI_WALK_CALLBACK      user_function;
+	acpi_walk_callback      user_function;
 	void                    *context;
 	NATIVE_CHAR             *hid;
 
-} ACPI_GET_DEVICES_INFO;
+} acpi_get_devices_info;
+
+
+typedef union acpi_aml_operands
+{
+	acpi_operand_object         *operands[7];
+
+	struct
+	{
+		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;
+
+	} index;
+
+	struct
+	{
+		acpi_operand_object     *source;
+		ACPI_OBJECT_INTEGER     *index;
+		ACPI_OBJECT_INTEGER     *length;
+		acpi_operand_object     *target;
+
+	} mid;
+
+} ACPI_AML_OPERANDS;
 
 
 #endif