patch-2.4.10 linux/drivers/acpi/include/acparser.h

Next file: linux/drivers/acpi/include/acpiosxf.h
Previous file: linux/drivers/acpi/include/acoutput.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.9/linux/drivers/acpi/include/acparser.h linux/drivers/acpi/include/acparser.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: acparser.h - AML Parser subcomponent prototypes and defines
- *       $Revision: 49 $
+ *       $Revision: 51 $
  *
  *****************************************************************************/
 
@@ -50,25 +50,16 @@
 
 /* psapi - Parser external interfaces */
 
-ACPI_STATUS
+acpi_status
 acpi_psx_load_table (
 	u8                      *pcode_addr,
 	u32                     pcode_length);
 
-ACPI_STATUS
+acpi_status
 acpi_psx_execute (
-	ACPI_NAMESPACE_NODE     *method_node,
-	ACPI_OPERAND_OBJECT     **params,
-	ACPI_OPERAND_OBJECT     **return_obj_desc);
-
-
-u8
-acpi_ps_is_namespace_object_op (
-	u16                     opcode);
-u8
-acpi_ps_is_namespace_op (
-	u16                     opcode);
-
+	acpi_namespace_node     *method_node,
+	acpi_operand_object     **params,
+	acpi_operand_object     **return_obj_desc);
 
 /******************************************************************************
  *
@@ -81,43 +72,43 @@
 
 u8 *
 acpi_ps_get_next_package_end (
-	ACPI_PARSE_STATE        *parser_state);
+	acpi_parse_state        *parser_state);
 
 u32
 acpi_ps_get_next_package_length (
-	ACPI_PARSE_STATE        *parser_state);
+	acpi_parse_state        *parser_state);
 
 NATIVE_CHAR *
 acpi_ps_get_next_namestring (
-	ACPI_PARSE_STATE        *parser_state);
+	acpi_parse_state        *parser_state);
 
 void
 acpi_ps_get_next_simple_arg (
-	ACPI_PARSE_STATE        *parser_state,
+	acpi_parse_state        *parser_state,
 	u32                     arg_type,       /* type of argument */
-	ACPI_PARSE_OBJECT       *arg);           /* (OUT) argument data */
+	acpi_parse_object       *arg);           /* (OUT) argument data */
 
 void
 acpi_ps_get_next_namepath (
-	ACPI_PARSE_STATE        *parser_state,
-	ACPI_PARSE_OBJECT       *arg,
+	acpi_parse_state        *parser_state,
+	acpi_parse_object       *arg,
 	u32                     *arg_count,
 	u8                      method_call);
 
-ACPI_PARSE_OBJECT *
+acpi_parse_object *
 acpi_ps_get_next_field (
-	ACPI_PARSE_STATE        *parser_state);
+	acpi_parse_state        *parser_state);
 
-ACPI_PARSE_OBJECT *
+acpi_parse_object *
 acpi_ps_get_next_arg (
-	ACPI_PARSE_STATE        *parser_state,
+	acpi_parse_state        *parser_state,
 	u32                     arg_type,
 	u32                     *arg_count);
 
 
 /* psopcode - AML Opcode information */
 
-ACPI_OPCODE_INFO *
+const acpi_opcode_info *
 acpi_ps_get_opcode_info (
 	u16                     opcode);
 
@@ -128,151 +119,151 @@
 
 /* psparse - top level parsing routines */
 
-ACPI_STATUS
+acpi_status
 acpi_ps_find_object (
 	u16                     opcode,
-	ACPI_PARSE_OBJECT       *op,
-	ACPI_WALK_STATE         *walk_state,
-	ACPI_PARSE_OBJECT       **out_op);
+	acpi_parse_object       *op,
+	acpi_walk_state         *walk_state,
+	acpi_parse_object       **out_op);
 
 void
 acpi_ps_delete_parse_tree (
-	ACPI_PARSE_OBJECT       *root);
+	acpi_parse_object       *root);
 
-ACPI_STATUS
+acpi_status
 acpi_ps_parse_loop (
-	ACPI_WALK_STATE         *walk_state);
+	acpi_walk_state         *walk_state);
 
-ACPI_STATUS
+acpi_status
 acpi_ps_parse_aml (
-	ACPI_PARSE_OBJECT       *start_scope,
+	acpi_parse_object       *start_scope,
 	u8                      *aml,
 	u32                     aml_size,
 	u32                     parse_flags,
-	ACPI_NAMESPACE_NODE     *method_node,
-	ACPI_OPERAND_OBJECT     **params,
-	ACPI_OPERAND_OBJECT     **caller_return_desc,
-	ACPI_PARSE_DOWNWARDS    descending_callback,
-	ACPI_PARSE_UPWARDS      ascending_callback);
+	acpi_namespace_node     *method_node,
+	acpi_operand_object     **params,
+	acpi_operand_object     **caller_return_desc,
+	acpi_parse_downwards    descending_callback,
+	acpi_parse_upwards      ascending_callback);
 
-ACPI_STATUS
+acpi_status
 acpi_ps_parse_table (
 	u8                      *aml,
 	u32                     aml_size,
-	ACPI_PARSE_DOWNWARDS    descending_callback,
-	ACPI_PARSE_UPWARDS      ascending_callback,
-	ACPI_PARSE_OBJECT       **root_object);
+	acpi_parse_downwards    descending_callback,
+	acpi_parse_upwards      ascending_callback,
+	acpi_parse_object       **root_object);
 
 u16
 acpi_ps_peek_opcode (
-	ACPI_PARSE_STATE        *state);
+	acpi_parse_state        *state);
 
 
 /* psscope - Scope stack management routines */
 
 
-ACPI_STATUS
+acpi_status
 acpi_ps_init_scope (
-	ACPI_PARSE_STATE        *parser_state,
-	ACPI_PARSE_OBJECT       *root);
+	acpi_parse_state        *parser_state,
+	acpi_parse_object       *root);
 
-ACPI_PARSE_OBJECT *
+acpi_parse_object *
 acpi_ps_get_parent_scope (
-	ACPI_PARSE_STATE        *state);
+	acpi_parse_state        *state);
 
 u8
 acpi_ps_has_completed_scope (
-	ACPI_PARSE_STATE        *parser_state);
+	acpi_parse_state        *parser_state);
 
 void
 acpi_ps_pop_scope (
-	ACPI_PARSE_STATE        *parser_state,
-	ACPI_PARSE_OBJECT       **op,
+	acpi_parse_state        *parser_state,
+	acpi_parse_object       **op,
 	u32                     *arg_list,
 	u32                     *arg_count);
 
-ACPI_STATUS
+acpi_status
 acpi_ps_push_scope (
-	ACPI_PARSE_STATE        *parser_state,
-	ACPI_PARSE_OBJECT       *op,
+	acpi_parse_state        *parser_state,
+	acpi_parse_object       *op,
 	u32                     remaining_args,
 	u32                     arg_count);
 
 void
 acpi_ps_cleanup_scope (
-	ACPI_PARSE_STATE        *state);
+	acpi_parse_state        *state);
 
 
 /* pstree - parse tree manipulation routines */
 
 void
 acpi_ps_append_arg(
-	ACPI_PARSE_OBJECT       *op,
-	ACPI_PARSE_OBJECT       *arg);
+	acpi_parse_object       *op,
+	acpi_parse_object       *arg);
 
-ACPI_PARSE_OBJECT*
+acpi_parse_object*
 acpi_ps_find (
-	ACPI_PARSE_OBJECT       *scope,
+	acpi_parse_object       *scope,
 	NATIVE_CHAR             *path,
 	u16                     opcode,
 	u32                     create);
 
-ACPI_PARSE_OBJECT *
+acpi_parse_object *
 acpi_ps_get_arg(
-	ACPI_PARSE_OBJECT       *op,
+	acpi_parse_object       *op,
 	u32                      argn);
 
-ACPI_PARSE_OBJECT *
+acpi_parse_object *
 acpi_ps_get_child (
-	ACPI_PARSE_OBJECT       *op);
+	acpi_parse_object       *op);
 
-ACPI_PARSE_OBJECT *
+acpi_parse_object *
 acpi_ps_get_depth_next (
-	ACPI_PARSE_OBJECT       *origin,
-	ACPI_PARSE_OBJECT       *op);
+	acpi_parse_object       *origin,
+	acpi_parse_object       *op);
 
 
 /* pswalk - parse tree walk routines */
 
-ACPI_STATUS
+acpi_status
 acpi_ps_walk_parsed_aml (
-	ACPI_PARSE_OBJECT       *start_op,
-	ACPI_PARSE_OBJECT       *end_op,
-	ACPI_OPERAND_OBJECT     *mth_desc,
-	ACPI_NAMESPACE_NODE     *start_node,
-	ACPI_OPERAND_OBJECT     **params,
-	ACPI_OPERAND_OBJECT     **caller_return_desc,
-	ACPI_OWNER_ID           owner_id,
-	ACPI_PARSE_DOWNWARDS    descending_callback,
-	ACPI_PARSE_UPWARDS      ascending_callback);
+	acpi_parse_object       *start_op,
+	acpi_parse_object       *end_op,
+	acpi_operand_object     *mth_desc,
+	acpi_namespace_node     *start_node,
+	acpi_operand_object     **params,
+	acpi_operand_object     **caller_return_desc,
+	acpi_owner_id           owner_id,
+	acpi_parse_downwards    descending_callback,
+	acpi_parse_upwards      ascending_callback);
 
-ACPI_STATUS
+acpi_status
 acpi_ps_get_next_walk_op (
-	ACPI_WALK_STATE         *walk_state,
-	ACPI_PARSE_OBJECT       *op,
-	ACPI_PARSE_UPWARDS      ascending_callback);
+	acpi_walk_state         *walk_state,
+	acpi_parse_object       *op,
+	acpi_parse_upwards      ascending_callback);
 
 
 /* psutils - parser utilities */
 
 
-ACPI_PARSE_STATE *
+acpi_parse_state *
 acpi_ps_create_state (
 	u8                      *aml,
 	u32                     aml_size);
 
 void
 acpi_ps_init_op (
-	ACPI_PARSE_OBJECT       *op,
+	acpi_parse_object       *op,
 	u16                     opcode);
 
-ACPI_PARSE_OBJECT *
+acpi_parse_object *
 acpi_ps_alloc_op (
 	u16                     opcode);
 
 void
 acpi_ps_free_op (
-	ACPI_PARSE_OBJECT       *op);
+	acpi_parse_object       *op);
 
 void
 acpi_ps_delete_parse_cache (
@@ -286,41 +277,13 @@
 acpi_ps_is_prefix_char (
 	u32                     c);
 
-u8
-acpi_ps_is_named_op (
-	u16                     opcode);
-
-u8
-acpi_ps_is_node_op (
-	u16                     opcode);
-
-u8
-acpi_ps_is_deferred_op (
-	u16                     opcode);
-
-u8
-acpi_ps_is_bytelist_op(
-	u16                     opcode);
-
-u8
-acpi_ps_is_field_op(
-	u16                     opcode);
-
-u8
-acpi_ps_is_create_field_op (
-	u16                     opcode);
-
-ACPI_PARSE2_OBJECT*
-acpi_ps_to_extended_op(
-	ACPI_PARSE_OBJECT       *op);
-
 u32
 acpi_ps_get_name(
-	ACPI_PARSE_OBJECT       *op);
+	acpi_parse_object       *op);
 
 void
 acpi_ps_set_name(
-	ACPI_PARSE_OBJECT       *op,
+	acpi_parse_object       *op,
 	u32                     name);
 
 
@@ -330,17 +293,17 @@
 acpi_ps_sprint_path (
 	NATIVE_CHAR             *buffer_start,
 	u32                     buffer_size,
-	ACPI_PARSE_OBJECT       *op);
+	acpi_parse_object       *op);
 
 u32
 acpi_ps_sprint_op (
 	NATIVE_CHAR             *buffer_start,
 	u32                     buffer_size,
-	ACPI_PARSE_OBJECT       *op);
+	acpi_parse_object       *op);
 
 void
 acpi_ps_show (
-	ACPI_PARSE_OBJECT       *op);
+	acpi_parse_object       *op);
 
 
 #endif /* __ACPARSER_H__ */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)