When a merge does not work automatically, git prevents

[linux-2.6] / include / acpi / acparser.h

diff --git a/include/acpi/acparser.h b/include/acpi/acparser.h
index c0395ef2b0d0602be9907e21fc04fb120398905f..f692ad56cd823364d100475d8c87fb49f6b26a81 100644 (file)
--- a/include/acpi/acparser.h
+++ b/include/acpi/acparser.h
@@ -63,17 +63,7 @@
 #define ACPI_PARSE_MODE_MASK            0x0030
 
 #define ACPI_PARSE_DEFERRED_OP          0x0100
-
-/* Parser external interfaces */
-
-acpi_status
-acpi_psx_load_table (
-       u8                              *pcode_addr,
-       u32                             pcode_length);
-
-acpi_status
-acpi_psx_execute (
-       struct acpi_parameter_info      *info);
+#define ACPI_PARSE_DISASSEMBLE          0x0200
 
 
 /******************************************************************************
@@ -83,16 +73,21 @@ acpi_psx_execute (
  *****************************************************************************/
 
 
-/* psargs - Parse AML opcode arguments */
+/*
+ * psxface - Parser external interfaces
+ */
+acpi_status
+acpi_ps_execute_method (
+       struct acpi_parameter_info      *info);
+
 
+/*
+ * psargs - Parse AML opcode arguments
+ */
 u8 *
 acpi_ps_get_next_package_end (
        struct acpi_parse_state         *parser_state);
 
-u32
-acpi_ps_get_next_package_length (
-       struct acpi_parse_state         *parser_state);
-
 char *
 acpi_ps_get_next_namestring (
        struct acpi_parse_state         *parser_state);
@@ -110,10 +105,6 @@ acpi_ps_get_next_namepath (
        union acpi_parse_object         *arg,
        u8                              method_call);
 
-union acpi_parse_object *
-acpi_ps_get_next_field (
-       struct acpi_parse_state         *parser_state);
-
 acpi_status
 acpi_ps_get_next_arg (
        struct acpi_walk_state          *walk_state,
@@ -122,8 +113,9 @@ acpi_ps_get_next_arg (
        union acpi_parse_object         **return_arg);
 
 
-/* psfind */
-
+/*
+ * psfind
+ */
 union acpi_parse_object *
 acpi_ps_find_name (
        union acpi_parse_object         *scope,
@@ -135,8 +127,9 @@ acpi_ps_get_parent (
        union acpi_parse_object         *op);
 
 
-/* psopcode - AML Opcode information */
-
+/*
+ * psopcode - AML Opcode information
+ */
 const struct acpi_opcode_info *
 acpi_ps_get_opcode_info (
        u16                             opcode);
@@ -146,13 +139,22 @@ acpi_ps_get_opcode_name (
        u16                             opcode);
 
 
-/* psparse - top level parsing routines */
+/*
+ * psparse - top level parsing routines
+ */
+acpi_status
+acpi_ps_parse_aml (
+       struct acpi_walk_state          *walk_state);
 
 u32
 acpi_ps_get_opcode_size (
        u32                             opcode);
 
-void
+u16
+acpi_ps_peek_opcode (
+       struct acpi_parse_state         *state);
+
+acpi_status
 acpi_ps_complete_this_op (
        struct acpi_walk_state          *walk_state,
        union acpi_parse_object         *op);
@@ -163,39 +165,18 @@ acpi_ps_next_parse_state (
        union acpi_parse_object         *op,
        acpi_status                     callback_status);
 
-acpi_status
-acpi_ps_find_object (
-       struct acpi_walk_state          *walk_state,
-       union acpi_parse_object         **out_op);
-
-void
-acpi_ps_delete_parse_tree (
-       union acpi_parse_object         *root);
 
+/*
+ * psloop - main parse loop
+ */
 acpi_status
 acpi_ps_parse_loop (
        struct acpi_walk_state          *walk_state);
 
-acpi_status
-acpi_ps_parse_aml (
-       struct acpi_walk_state          *walk_state);
-
-acpi_status
-acpi_ps_parse_table (
-       u8                              *aml,
-       u32                             aml_size,
-       acpi_parse_downwards            descending_callback,
-       acpi_parse_upwards              ascending_callback,
-       union acpi_parse_object         **root_object);
-
-u16
-acpi_ps_peek_opcode (
-       struct acpi_parse_state         *state);
-
-
-/* psscope - Scope stack management routines */
-
 
+/*
+ * psscope - Scope stack management routines
+ */
 acpi_status
 acpi_ps_init_scope (
        struct acpi_parse_state         *parser_state,
@@ -228,8 +209,9 @@ acpi_ps_cleanup_scope (
        struct acpi_parse_state         *state);
 
 
-/* pstree - parse tree manipulation routines */
-
+/*
+ * pstree - parse tree manipulation routines
+ */
 void
 acpi_ps_append_arg(
        union acpi_parse_object         *op,
@@ -247,20 +229,17 @@ acpi_ps_get_arg(
        union acpi_parse_object         *op,
        u32                              argn);
 
-#ifdef ACPI_FUTURE_USAGE
-union acpi_parse_object *
-acpi_ps_get_child (
-       union acpi_parse_object         *op);
-
+#ifdef ACPI_FUTURE_USAGE
 union acpi_parse_object *
 acpi_ps_get_depth_next (
        union acpi_parse_object         *origin,
        union acpi_parse_object         *op);
-#endif  /*  ACPI_FUTURE_USAGE  */
+#endif /* ACPI_FUTURE_USAGE */
 
 
-/* pswalk - parse tree walk routines */
-
+/*
+ * pswalk - parse tree walk routines
+ */
 acpi_status
 acpi_ps_walk_parsed_aml (
        union acpi_parse_object         *start_op,
@@ -283,9 +262,14 @@ acpi_status
 acpi_ps_delete_completed_op (
        struct acpi_walk_state          *walk_state);
 
+void
+acpi_ps_delete_parse_tree (
+       union acpi_parse_object         *root);
 
-/* psutils - parser utilities */
 
+/*
+ * psutils - parser utilities
+ */
 union acpi_parse_object *
 acpi_ps_create_scope_op (
        void);
@@ -303,12 +287,6 @@ void
 acpi_ps_free_op (
        union acpi_parse_object         *op);
 
-#ifdef ACPI_ENABLE_OBJECT_CACHE
-void
-acpi_ps_delete_parse_cache (
-       void);
-#endif
-
 u8
 acpi_ps_is_leading_char (
        u32                             c);
@@ -317,11 +295,11 @@ u8
 acpi_ps_is_prefix_char (
        u32                             c);
 
-#ifdef ACPI_FUTURE_USAGE
+#ifdef ACPI_FUTURE_USAGE
 u32
 acpi_ps_get_name(
        union acpi_parse_object         *op);
-#endif
+#endif /* ACPI_FUTURE_USAGE */
 
 void
 acpi_ps_set_name(
@@ -329,8 +307,9 @@ acpi_ps_set_name(
        u32                             name);
 
 
-/* psdump - display parser tree */
-
+/*
+ * psdump - display parser tree
+ */
 u32
 acpi_ps_sprint_path (
        char                            *buffer_start,