patch-2.4.22 linux-2.4.22/drivers/acpi/parser/pswalk.c
Next file: linux-2.4.22/drivers/acpi/parser/psxface.c
Previous file: linux-2.4.22/drivers/acpi/parser/psutils.c
Back to the patch index
Back to the overall index
- Lines: 321
- Date:
2003-08-25 04:44:41.000000000 -0700
- Orig file:
linux-2.4.21/drivers/acpi/parser/pswalk.c
- Orig date:
2001-10-24 14:06:22.000000000 -0700
diff -urN linux-2.4.21/drivers/acpi/parser/pswalk.c linux-2.4.22/drivers/acpi/parser/pswalk.c
@@ -1,47 +1,62 @@
/******************************************************************************
*
* Module Name: pswalk - Parser routines to walk parsed op tree(s)
- * $Revision: 58 $
*
*****************************************************************************/
/*
- * Copyright (C) 2000, 2001 R. Byron Moore
+ * Copyright (C) 2000 - 2003, R. Byron Moore
+ * All rights reserved.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions, and the following disclaimer,
+ * without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ * substantially similar to the "NO WARRANTY" disclaimer below
+ * ("Disclaimer") and any redistribution must be conditioned upon
+ * including a substantially similar Disclaimer requirement for further
+ * binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
*/
-#include "acpi.h"
-#include "amlcode.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acnamesp.h"
-#include "acinterp.h"
+#include <acpi/acpi.h>
+#include <acpi/acparser.h>
+#include <acpi/acdispat.h>
#define _COMPONENT ACPI_PARSER
- MODULE_NAME ("pswalk")
+ ACPI_MODULE_NAME ("pswalk")
/*******************************************************************************
*
- * FUNCTION: Acpi_ps_get_next_walk_op
+ * FUNCTION: acpi_ps_get_next_walk_op
*
- * PARAMETERS: Walk_state - Current state of the walk
+ * PARAMETERS: walk_state - Current state of the walk
* Op - Current Op to be walked
- * Ascending_callback - Procedure called when Op is complete
+ * ascending_callback - Procedure called when Op is complete
*
* RETURN: Status
*
@@ -51,22 +66,22 @@
acpi_status
acpi_ps_get_next_walk_op (
- acpi_walk_state *walk_state,
- acpi_parse_object *op,
- acpi_parse_upwards ascending_callback)
+ struct acpi_walk_state *walk_state,
+ union acpi_parse_object *op,
+ acpi_parse_upwards ascending_callback)
{
- acpi_parse_object *next;
- acpi_parse_object *parent;
- acpi_parse_object *grand_parent;
- acpi_status status;
+ union acpi_parse_object *next;
+ union acpi_parse_object *parent;
+ union acpi_parse_object *grand_parent;
+ acpi_status status;
- FUNCTION_TRACE_PTR ("Ps_get_next_walk_op", op);
+ ACPI_FUNCTION_TRACE_PTR ("ps_get_next_walk_op", op);
/* Check for a argument only if we are descending in the tree */
- if (walk_state->next_op_info != NEXT_OP_UPWARD) {
+ if (walk_state->next_op_info != ACPI_NEXT_OP_UPWARD) {
/* Look for an argument or child of the current op */
next = acpi_ps_get_arg (op, 0);
@@ -75,22 +90,21 @@
walk_state->prev_op = op;
walk_state->next_op = next;
- walk_state->next_op_info = NEXT_OP_DOWNWARD;
+ walk_state->next_op_info = ACPI_NEXT_OP_DOWNWARD;
return_ACPI_STATUS (AE_OK);
}
-
/*
* No more children, this Op is complete. Save Next and Parent
* in case the Op object gets deleted by the callback routine
*/
- next = op->next;
- parent = op->parent;
+ next = op->common.next;
+ parent = op->common.parent;
walk_state->op = op;
- walk_state->op_info = acpi_ps_get_opcode_info (op->opcode);
- walk_state->opcode = op->opcode;
+ walk_state->op_info = acpi_ps_get_opcode_info (op->common.aml_opcode);
+ walk_state->opcode = op->common.aml_opcode;
status = ascending_callback (walk_state);
@@ -115,7 +129,7 @@
walk_state->prev_op = op;
walk_state->next_op = next;
- walk_state->next_op_info = NEXT_OP_DOWNWARD;
+ walk_state->next_op_info = ACPI_NEXT_OP_DOWNWARD;
/* Continue downward */
@@ -127,7 +141,6 @@
* the tree
*/
}
-
else {
/*
* We are resuming a walk, and we were (are) going upward in the tree.
@@ -136,7 +149,6 @@
parent = op;
}
-
/*
* Look for a sibling of the current Op's parent
* Continue moving up the tree until we find a node that has not been
@@ -145,12 +157,12 @@
while (parent) {
/* We are moving up the tree, therefore this parent Op is complete */
- grand_parent = parent->parent;
- next = parent->next;
+ grand_parent = parent->common.parent;
+ next = parent->common.next;
walk_state->op = parent;
- walk_state->op_info = acpi_ps_get_opcode_info (parent->opcode);
- walk_state->opcode = parent->opcode;
+ walk_state->op_info = acpi_ps_get_opcode_info (parent->common.aml_opcode);
+ walk_state->opcode = parent->common.aml_opcode;
status = ascending_callback (walk_state);
@@ -175,7 +187,7 @@
walk_state->prev_op = parent;
walk_state->next_op = next;
- walk_state->next_op_info = NEXT_OP_DOWNWARD;
+ walk_state->next_op_info = ACPI_NEXT_OP_DOWNWARD;
return_ACPI_STATUS (status);
}
@@ -188,9 +200,10 @@
}
- /* Got all the way to the top of the tree, we must be done! */
- /* However, the code should have terminated in the loop above */
-
+ /*
+ * Got all the way to the top of the tree, we must be done!
+ * However, the code should have terminated in the loop above
+ */
walk_state->next_op = NULL;
return_ACPI_STATUS (AE_OK);
@@ -199,22 +212,22 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ps_delete_completed_op
+ * FUNCTION: acpi_ps_delete_completed_op
*
* PARAMETERS: State - Walk state
* Op - Completed op
*
* RETURN: AE_OK
*
- * DESCRIPTION: Callback function for Acpi_ps_get_next_walk_op(). Used during
- * Acpi_ps_delete_parse tree to delete Op objects when all sub-objects
+ * DESCRIPTION: Callback function for acpi_ps_get_next_walk_op(). Used during
+ * acpi_ps_delete_parse tree to delete Op objects when all sub-objects
* have been visited (and deleted.)
*
******************************************************************************/
-static acpi_status
+acpi_status
acpi_ps_delete_completed_op (
- acpi_walk_state *walk_state)
+ struct acpi_walk_state *walk_state)
{
acpi_ps_free_op (walk_state->op);
@@ -224,9 +237,9 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ps_delete_parse_tree
+ * FUNCTION: acpi_ps_delete_parse_tree
*
- * PARAMETERS: Subtree_root - Root of tree (or subtree) to delete
+ * PARAMETERS: subtree_root - Root of tree (or subtree) to delete
*
* RETURN: None
*
@@ -236,13 +249,14 @@
void
acpi_ps_delete_parse_tree (
- acpi_parse_object *subtree_root)
+ union acpi_parse_object *subtree_root)
{
- acpi_walk_state *walk_state;
- acpi_walk_list walk_list;
+ struct acpi_walk_state *walk_state;
+ struct acpi_thread_state *thread;
+ acpi_status status;
- FUNCTION_TRACE_PTR ("Ps_delete_parse_tree", subtree_root);
+ ACPI_FUNCTION_TRACE_PTR ("ps_delete_parse_tree", subtree_root);
if (!subtree_root) {
@@ -251,11 +265,12 @@
/* Create and initialize a new walk list */
- walk_list.walk_state = NULL;
- walk_list.acquired_mutex_list.prev = NULL;
- walk_list.acquired_mutex_list.next = NULL;
+ thread = acpi_ut_create_thread_state ();
+ if (!thread) {
+ return_VOID;
+ }
- walk_state = acpi_ds_create_walk_state (TABLE_ID_DSDT, NULL, NULL, &walk_list);
+ walk_state = acpi_ds_create_walk_state (0, NULL, NULL, thread);
if (!walk_state) {
return_VOID;
}
@@ -264,25 +279,26 @@
walk_state->descending_callback = NULL;
walk_state->ascending_callback = NULL;
-
walk_state->origin = subtree_root;
walk_state->next_op = subtree_root;
-
/* Head downward in the tree */
- walk_state->next_op_info = NEXT_OP_DOWNWARD;
+ walk_state->next_op_info = ACPI_NEXT_OP_DOWNWARD;
/* Visit all nodes in the subtree */
while (walk_state->next_op) {
- acpi_ps_get_next_walk_op (walk_state, walk_state->next_op,
+ status = acpi_ps_get_next_walk_op (walk_state, walk_state->next_op,
acpi_ps_delete_completed_op);
+ if (ACPI_FAILURE (status)) {
+ break;
+ }
}
/* We are done with this walk */
- acpi_ex_release_all_mutexes ((acpi_operand_object *) &walk_list.acquired_mutex_list);
+ acpi_ut_delete_generic_state (ACPI_CAST_PTR (union acpi_generic_state, thread));
acpi_ds_delete_walk_state (walk_state);
return_VOID;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)