patch-2.4.22 linux-2.4.22/drivers/acpi/dispatcher/dswstate.c
Next file: linux-2.4.22/drivers/acpi/driver.c
Previous file: linux-2.4.22/drivers/acpi/dispatcher/dswscope.c
Back to the patch index
Back to the overall index
- Lines: 999
- Date:
2003-08-25 04:44:41.000000000 -0700
- Orig file:
linux-2.4.21/drivers/acpi/dispatcher/dswstate.c
- Orig date:
2001-10-24 14:06:22.000000000 -0700
diff -urN linux-2.4.21/drivers/acpi/dispatcher/dswstate.c linux-2.4.22/drivers/acpi/dispatcher/dswstate.c
@@ -1,46 +1,62 @@
/******************************************************************************
*
* Module Name: dswstate - Dispatcher parse tree walk management routines
- * $Revision: 54 $
*
*****************************************************************************/
/*
- * 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>
+#include <acpi/acnamesp.h>
#define _COMPONENT ACPI_DISPATCHER
- MODULE_NAME ("dswstate")
+ ACPI_MODULE_NAME ("dswstate")
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_result_insert
+ * FUNCTION: acpi_ds_result_insert
*
* PARAMETERS: Object - Object to push
- * Walk_state - Current Walk state
+ * walk_state - Current Walk state
*
* RETURN: Status
*
@@ -50,14 +66,14 @@
acpi_status
acpi_ds_result_insert (
- void *object,
- u32 index,
- acpi_walk_state *walk_state)
+ void *object,
+ u32 index,
+ struct acpi_walk_state *walk_state)
{
- acpi_generic_state *state;
+ union acpi_generic_state *state;
- PROC_NAME ("Ds_result_insert");
+ ACPI_FUNCTION_NAME ("ds_result_insert");
state = walk_state->results;
@@ -67,7 +83,7 @@
return (AE_NOT_EXIST);
}
- if (index >= OBJ_NUM_OPERANDS) {
+ if (index >= ACPI_OBJ_NUM_OPERANDS) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
"Index out of range: %X Obj=%p State=%p Num=%X\n",
index, object, walk_state, state->results.num_results));
@@ -86,7 +102,7 @@
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
"Obj=%p [%s] State=%p Num=%X Cur=%X\n",
- object, object ? acpi_ut_get_type_name (((acpi_operand_object *) object)->common.type) : "NULL",
+ object, object ? acpi_ut_get_object_type_name ((union acpi_operand_object *) object) : "NULL",
walk_state, state->results.num_results, walk_state->current_result));
return (AE_OK);
@@ -95,10 +111,10 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_result_remove
+ * FUNCTION: acpi_ds_result_remove
*
* PARAMETERS: Object - Where to return the popped object
- * Walk_state - Current Walk state
+ * walk_state - Current Walk state
*
* RETURN: Status
*
@@ -109,14 +125,14 @@
acpi_status
acpi_ds_result_remove (
- acpi_operand_object **object,
- u32 index,
- acpi_walk_state *walk_state)
+ union acpi_operand_object **object,
+ u32 index,
+ struct acpi_walk_state *walk_state)
{
- acpi_generic_state *state;
+ union acpi_generic_state *state;
- PROC_NAME ("Ds_result_remove");
+ ACPI_FUNCTION_NAME ("ds_result_remove");
state = walk_state->results;
@@ -126,13 +142,12 @@
return (AE_NOT_EXIST);
}
- if (index >= OBJ_NUM_OPERANDS) {
+ if (index >= ACPI_OBJ_MAX_OPERAND) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
"Index out of range: %X State=%p Num=%X\n",
index, walk_state, state->results.num_results));
}
-
/* Check for a valid result object */
if (!state->results.obj_desc [index]) {
@@ -151,7 +166,7 @@
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
"Obj=%p [%s] Index=%X State=%p Num=%X\n",
- *object, (*object) ? acpi_ut_get_type_name ((*object)->common.type) : "NULL",
+ *object, (*object) ? acpi_ut_get_object_type_name (*object) : "NULL",
index, walk_state, state->results.num_results));
return (AE_OK);
@@ -160,10 +175,10 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_result_pop
+ * FUNCTION: acpi_ds_result_pop
*
* PARAMETERS: Object - Where to return the popped object
- * Walk_state - Current Walk state
+ * walk_state - Current Walk state
*
* RETURN: Status
*
@@ -174,14 +189,14 @@
acpi_status
acpi_ds_result_pop (
- acpi_operand_object **object,
- acpi_walk_state *walk_state)
+ union acpi_operand_object **object,
+ struct acpi_walk_state *walk_state)
{
- u32 index;
- acpi_generic_state *state;
+ acpi_native_uint index;
+ union acpi_generic_state *state;
- PROC_NAME ("Ds_result_pop");
+ ACPI_FUNCTION_NAME ("ds_result_pop");
state = walk_state->results;
@@ -199,7 +214,7 @@
state->results.num_results--;
- for (index = OBJ_NUM_OPERANDS; index; index--) {
+ for (index = ACPI_OBJ_NUM_OPERANDS; index; index--) {
/* Check for a valid result object */
if (state->results.obj_desc [index -1]) {
@@ -207,8 +222,8 @@
state->results.obj_desc [index -1] = NULL;
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Obj=%p [%s] Index=%X State=%p Num=%X\n",
- *object, (*object) ? acpi_ut_get_type_name ((*object)->common.type) : "NULL",
- index -1, walk_state, state->results.num_results));
+ *object, (*object) ? acpi_ut_get_object_type_name (*object) : "NULL",
+ (u32) index -1, walk_state, state->results.num_results));
return (AE_OK);
}
@@ -220,10 +235,10 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_result_pop_from_bottom
+ * FUNCTION: acpi_ds_result_pop_from_bottom
*
* PARAMETERS: Object - Where to return the popped object
- * Walk_state - Current Walk state
+ * walk_state - Current Walk state
*
* RETURN: Status
*
@@ -234,14 +249,14 @@
acpi_status
acpi_ds_result_pop_from_bottom (
- acpi_operand_object **object,
- acpi_walk_state *walk_state)
+ union acpi_operand_object **object,
+ struct acpi_walk_state *walk_state)
{
- u32 index;
- acpi_generic_state *state;
+ acpi_native_uint index;
+ union acpi_generic_state *state;
- PROC_NAME ("Ds_result_pop_from_bottom");
+ ACPI_FUNCTION_NAME ("ds_result_pop_from_bottom");
state = walk_state->results;
@@ -251,7 +266,6 @@
return (AE_NOT_EXIST);
}
-
if (!state->results.num_results) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "No result objects! State=%p\n", walk_state));
return (AE_AML_NO_RETURN_VALUE);
@@ -273,12 +287,12 @@
if (!*object) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Null operand! State=%p #Ops=%X, Index=%X\n",
- walk_state, state->results.num_results, index));
+ walk_state, state->results.num_results, (u32) index));
return (AE_AML_NO_RETURN_VALUE);
}
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Obj=%p [%s], Results=%p State=%p\n",
- *object, (*object) ? acpi_ut_get_type_name ((*object)->common.type) : "NULL",
+ *object, (*object) ? acpi_ut_get_object_type_name (*object) : "NULL",
state, walk_state));
@@ -288,10 +302,10 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_result_push
+ * FUNCTION: acpi_ds_result_push
*
* PARAMETERS: Object - Where to return the popped object
- * Walk_state - Current Walk state
+ * walk_state - Current Walk state
*
* RETURN: Status
*
@@ -301,13 +315,13 @@
acpi_status
acpi_ds_result_push (
- acpi_operand_object *object,
- acpi_walk_state *walk_state)
+ union acpi_operand_object *object,
+ struct acpi_walk_state *walk_state)
{
- acpi_generic_state *state;
+ union acpi_generic_state *state;
- PROC_NAME ("Ds_result_push");
+ ACPI_FUNCTION_NAME ("ds_result_push");
state = walk_state->results;
@@ -316,7 +330,7 @@
return (AE_AML_INTERNAL);
}
- if (state->results.num_results == OBJ_NUM_OPERANDS) {
+ if (state->results.num_results == ACPI_OBJ_NUM_OPERANDS) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
"Result stack overflow: Obj=%p State=%p Num=%X\n",
object, walk_state, state->results.num_results));
@@ -329,12 +343,11 @@
return (AE_BAD_PARAMETER);
}
-
state->results.obj_desc [state->results.num_results] = object;
state->results.num_results++;
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Obj=%p [%s] State=%p Num=%X Cur=%X\n",
- object, object ? acpi_ut_get_type_name (((acpi_operand_object *) object)->common.type) : "NULL",
+ object, object ? acpi_ut_get_object_type_name ((union acpi_operand_object *) object) : "NULL",
walk_state, state->results.num_results, walk_state->current_result));
return (AE_OK);
@@ -343,24 +356,24 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_result_stack_push
+ * FUNCTION: acpi_ds_result_stack_push
*
* PARAMETERS: Object - Object to push
- * Walk_state - Current Walk state
+ * walk_state - Current Walk state
*
* RETURN: Status
*
- * DESCRIPTION:
+ * DESCRIPTION: Push an object onto the walk_state result stack.
*
******************************************************************************/
acpi_status
acpi_ds_result_stack_push (
- acpi_walk_state *walk_state)
+ struct acpi_walk_state *walk_state)
{
- acpi_generic_state *state;
+ union acpi_generic_state *state;
- PROC_NAME ("Ds_result_stack_push");
+ ACPI_FUNCTION_NAME ("ds_result_stack_push");
state = acpi_ut_create_generic_state ();
@@ -380,23 +393,23 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_result_stack_pop
+ * FUNCTION: acpi_ds_result_stack_pop
*
- * PARAMETERS: Walk_state - Current Walk state
+ * PARAMETERS: walk_state - Current Walk state
*
* RETURN: Status
*
- * DESCRIPTION:
+ * DESCRIPTION: Pop an object off of the walk_state result stack.
*
******************************************************************************/
acpi_status
acpi_ds_result_stack_pop (
- acpi_walk_state *walk_state)
+ struct acpi_walk_state *walk_state)
{
- acpi_generic_state *state;
+ union acpi_generic_state *state;
- PROC_NAME ("Ds_result_stack_pop");
+ ACPI_FUNCTION_NAME ("ds_result_stack_pop");
/* Check for stack underflow */
@@ -411,7 +424,7 @@
state = acpi_ut_pop_generic_state (&walk_state->results);
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
- "Result=%p Remaining_results=%X State=%p\n",
+ "Result=%p remaining_results=%X State=%p\n",
state, state->results.num_results, walk_state));
acpi_ut_delete_generic_state (state);
@@ -422,9 +435,9 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_obj_stack_delete_all
+ * FUNCTION: acpi_ds_obj_stack_delete_all
*
- * PARAMETERS: Walk_state - Current Walk state
+ * PARAMETERS: walk_state - Current Walk state
*
* RETURN: Status
*
@@ -435,17 +448,17 @@
acpi_status
acpi_ds_obj_stack_delete_all (
- acpi_walk_state *walk_state)
+ struct acpi_walk_state *walk_state)
{
- u32 i;
+ u32 i;
- FUNCTION_TRACE_PTR ("Ds_obj_stack_delete_all", walk_state);
+ ACPI_FUNCTION_TRACE_PTR ("ds_obj_stack_delete_all", walk_state);
/* The stack size is configurable, but fixed */
- for (i = 0; i < OBJ_NUM_OPERANDS; i++) {
+ for (i = 0; i < ACPI_OBJ_NUM_OPERANDS; i++) {
if (walk_state->operands[i]) {
acpi_ut_remove_reference (walk_state->operands[i]);
walk_state->operands[i] = NULL;
@@ -458,10 +471,10 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_obj_stack_push
+ * FUNCTION: acpi_ds_obj_stack_push
*
* PARAMETERS: Object - Object to push
- * Walk_state - Current Walk state
+ * walk_state - Current Walk state
*
* RETURN: Status
*
@@ -471,15 +484,15 @@
acpi_status
acpi_ds_obj_stack_push (
- void *object,
- acpi_walk_state *walk_state)
+ void *object,
+ struct acpi_walk_state *walk_state)
{
- PROC_NAME ("Ds_obj_stack_push");
+ ACPI_FUNCTION_NAME ("ds_obj_stack_push");
/* Check for stack overflow */
- if (walk_state->num_operands >= OBJ_NUM_OPERANDS) {
+ if (walk_state->num_operands >= ACPI_OBJ_NUM_OPERANDS) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
"overflow! Obj=%p State=%p #Ops=%X\n",
object, walk_state, walk_state->num_operands));
@@ -492,7 +505,7 @@
walk_state->num_operands++;
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Obj=%p [%s] State=%p #Ops=%X\n",
- object, acpi_ut_get_type_name (((acpi_operand_object *) object)->common.type),
+ object, acpi_ut_get_object_type_name ((union acpi_operand_object *) object),
walk_state, walk_state->num_operands));
return (AE_OK);
@@ -502,10 +515,10 @@
#if 0
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_obj_stack_pop_object
+ * FUNCTION: acpi_ds_obj_stack_pop_object
*
- * PARAMETERS: Pop_count - Number of objects/entries to pop
- * Walk_state - Current Walk state
+ * PARAMETERS: pop_count - Number of objects/entries to pop
+ * walk_state - Current Walk state
*
* RETURN: Status
*
@@ -516,10 +529,10 @@
acpi_status
acpi_ds_obj_stack_pop_object (
- acpi_operand_object **object,
- acpi_walk_state *walk_state)
+ union acpi_operand_object **object,
+ struct acpi_walk_state *walk_state)
{
- PROC_NAME ("Ds_obj_stack_pop_object");
+ ACPI_FUNCTION_NAME ("ds_obj_stack_pop_object");
/* Check for stack underflow */
@@ -552,7 +565,7 @@
walk_state->operands [walk_state->num_operands] = NULL;
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Obj=%p [%s] State=%p #Ops=%X\n",
- *object, acpi_ut_get_type_name ((*object)->common.type),
+ *object, acpi_ut_get_object_type_name (*object),
walk_state, walk_state->num_operands));
return (AE_OK);
@@ -561,10 +574,10 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_obj_stack_pop
+ * FUNCTION: acpi_ds_obj_stack_pop
*
- * PARAMETERS: Pop_count - Number of objects/entries to pop
- * Walk_state - Current Walk state
+ * PARAMETERS: pop_count - Number of objects/entries to pop
+ * walk_state - Current Walk state
*
* RETURN: Status
*
@@ -575,12 +588,12 @@
acpi_status
acpi_ds_obj_stack_pop (
- u32 pop_count,
- acpi_walk_state *walk_state)
+ u32 pop_count,
+ struct acpi_walk_state *walk_state)
{
- u32 i;
+ u32 i;
- PROC_NAME ("Ds_obj_stack_pop");
+ ACPI_FUNCTION_NAME ("ds_obj_stack_pop");
for (i = 0; i < pop_count; i++) {
@@ -608,10 +621,10 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_obj_stack_pop_and_delete
+ * FUNCTION: acpi_ds_obj_stack_pop_and_delete
*
- * PARAMETERS: Pop_count - Number of objects/entries to pop
- * Walk_state - Current Walk state
+ * PARAMETERS: pop_count - Number of objects/entries to pop
+ * walk_state - Current Walk state
*
* RETURN: Status
*
@@ -622,13 +635,13 @@
acpi_status
acpi_ds_obj_stack_pop_and_delete (
- u32 pop_count,
- acpi_walk_state *walk_state)
+ u32 pop_count,
+ struct acpi_walk_state *walk_state)
{
- u32 i;
- acpi_operand_object *obj_desc;
+ u32 i;
+ union acpi_operand_object *obj_desc;
- PROC_NAME ("Ds_obj_stack_pop_and_delete");
+ ACPI_FUNCTION_NAME ("ds_obj_stack_pop_and_delete");
for (i = 0; i < pop_count; i++) {
@@ -660,11 +673,11 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_obj_stack_get_value
+ * FUNCTION: acpi_ds_obj_stack_get_value
*
* PARAMETERS: Index - Stack index whose value is desired. Based
* on the top of the stack (index=0 == top)
- * Walk_state - Current Walk state
+ * walk_state - Current Walk state
*
* RETURN: Status
*
@@ -675,11 +688,11 @@
void *
acpi_ds_obj_stack_get_value (
- u32 index,
- acpi_walk_state *walk_state)
+ u32 index,
+ struct acpi_walk_state *walk_state)
{
- FUNCTION_TRACE_PTR ("Ds_obj_stack_get_value", walk_state);
+ ACPI_FUNCTION_TRACE_PTR ("ds_obj_stack_get_value", walk_state);
/* Can't do it if the stack is empty */
@@ -694,67 +707,66 @@
return_PTR (NULL);
}
-
- return_PTR (walk_state->operands[(NATIVE_UINT)(walk_state->num_operands - 1) -
+ return_PTR (walk_state->operands[(acpi_native_uint)(walk_state->num_operands - 1) -
index]);
}
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_get_current_walk_state
+ * FUNCTION: acpi_ds_get_current_walk_state
*
- * PARAMETERS: Walk_list - Get current active state for this walk list
+ * PARAMETERS: Thread - Get current active state for this Thread
*
* RETURN: Pointer to the current walk state
*
* DESCRIPTION: Get the walk state that is at the head of the list (the "current"
- * walk state.
+ * walk state.)
*
******************************************************************************/
-acpi_walk_state *
+struct acpi_walk_state *
acpi_ds_get_current_walk_state (
- acpi_walk_list *walk_list)
+ struct acpi_thread_state *thread)
{
- PROC_NAME ("Ds_get_current_walk_state");
-
+ ACPI_FUNCTION_NAME ("ds_get_current_walk_state");
- ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Ds_get_current_walk_state, =%p\n",
- walk_list->walk_state));
- if (!walk_list) {
+ if (!thread) {
return (NULL);
}
- return (walk_list->walk_state);
+ ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Current walk_state %p\n",
+ thread->walk_state_list));
+
+ return (thread->walk_state_list);
}
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_push_walk_state
+ * FUNCTION: acpi_ds_push_walk_state
*
- * PARAMETERS: Walk_state - State to push
- * Walk_list - The list that owns the walk stack
+ * PARAMETERS: walk_state - State to push
+ * walk_list - The list that owns the walk stack
*
* RETURN: None
*
- * DESCRIPTION: Place the Walk_state at the head of the state list.
+ * DESCRIPTION: Place the walk_state at the head of the state list.
*
******************************************************************************/
void
acpi_ds_push_walk_state (
- acpi_walk_state *walk_state,
- acpi_walk_list *walk_list)
+ struct acpi_walk_state *walk_state,
+ struct acpi_thread_state *thread)
{
- FUNCTION_TRACE ("Ds_push_walk_state");
+ ACPI_FUNCTION_TRACE ("ds_push_walk_state");
- walk_state->next = walk_list->walk_state;
- walk_list->walk_state = walk_state;
+ walk_state->next = thread->walk_state_list;
+ thread->walk_state_list = walk_state;
return_VOID;
}
@@ -762,11 +774,11 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_pop_walk_state
+ * FUNCTION: acpi_ds_pop_walk_state
*
- * PARAMETERS: Walk_list - The list that owns the walk stack
+ * PARAMETERS: walk_list - The list that owns the walk stack
*
- * RETURN: A Walk_state object popped from the stack
+ * RETURN: A walk_state object popped from the stack
*
* DESCRIPTION: Remove and return the walkstate object that is at the head of
* the walk stack for the given walk list. NULL indicates that
@@ -774,27 +786,27 @@
*
******************************************************************************/
-acpi_walk_state *
+struct acpi_walk_state *
acpi_ds_pop_walk_state (
- acpi_walk_list *walk_list)
+ struct acpi_thread_state *thread)
{
- acpi_walk_state *walk_state;
+ struct acpi_walk_state *walk_state;
- FUNCTION_TRACE ("Ds_pop_walk_state");
+ ACPI_FUNCTION_TRACE ("ds_pop_walk_state");
- walk_state = walk_list->walk_state;
+ walk_state = thread->walk_state_list;
if (walk_state) {
/* Next walk state becomes the current walk state */
- walk_list->walk_state = walk_state->next;
+ thread->walk_state_list = walk_state->next;
/*
* Don't clear the NEXT field, this serves as an indicator
* that there is a parent WALK STATE
- * Walk_state->Next = NULL;
+ * NO: walk_state->Next = NULL;
*/
}
@@ -804,30 +816,30 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_create_walk_state
+ * FUNCTION: acpi_ds_create_walk_state
*
* PARAMETERS: Origin - Starting point for this walk
- * Walk_list - Owning walk list
+ * Thread - Current thread state
*
* RETURN: Pointer to the new walk state.
*
- * DESCRIPTION: Allocate and initialize a new walk state. The current walk state
- * is set to this new state.
+ * DESCRIPTION: Allocate and initialize a new walk state. The current walk
+ * state is set to this new state.
*
******************************************************************************/
-acpi_walk_state *
+struct acpi_walk_state *
acpi_ds_create_walk_state (
- acpi_owner_id owner_id,
- acpi_parse_object *origin,
- acpi_operand_object *mth_desc,
- acpi_walk_list *walk_list)
+ acpi_owner_id owner_id,
+ union acpi_parse_object *origin,
+ union acpi_operand_object *mth_desc,
+ struct acpi_thread_state *thread)
{
- acpi_walk_state *walk_state;
- acpi_status status;
+ struct acpi_walk_state *walk_state;
+ acpi_status status;
- FUNCTION_TRACE ("Ds_create_walk_state");
+ ACPI_FUNCTION_TRACE ("ds_create_walk_state");
walk_state = acpi_ut_acquire_from_cache (ACPI_MEM_LIST_WALK);
@@ -839,11 +851,13 @@
walk_state->owner_id = owner_id;
walk_state->origin = origin;
walk_state->method_desc = mth_desc;
- walk_state->walk_list = walk_list;
+ walk_state->thread = thread;
+
+ walk_state->parser_state.start_op = origin;
/* Init the method args/local */
-#ifndef _ACPI_ASL_COMPILER
+#if (!defined (ACPI_NO_METHOD_EXECUTION) && !defined (ACPI_CONSTANT_EVAL_ONLY))
acpi_ds_method_data_init (walk_state);
#endif
@@ -856,20 +870,19 @@
/* Put the new state at the head of the walk list */
- if (walk_list) {
- acpi_ds_push_walk_state (walk_state, walk_list);
+ if (thread) {
+ acpi_ds_push_walk_state (walk_state, thread);
}
return_PTR (walk_state);
}
-#ifndef _ACPI_ASL_COMPILER
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_init_aml_walk
+ * FUNCTION: acpi_ds_init_aml_walk
*
- * PARAMETERS: Walk_state - New state to be initialized
+ * PARAMETERS: walk_state - New state to be initialized
*
* RETURN: None
*
@@ -879,20 +892,21 @@
acpi_status
acpi_ds_init_aml_walk (
- acpi_walk_state *walk_state,
- acpi_parse_object *op,
- acpi_namespace_node *method_node,
- u8 *aml_start,
- u32 aml_length,
- acpi_operand_object **params,
- acpi_operand_object **return_obj_desc,
- u32 pass_number)
+ struct acpi_walk_state *walk_state,
+ union acpi_parse_object *op,
+ struct acpi_namespace_node *method_node,
+ u8 *aml_start,
+ u32 aml_length,
+ union acpi_operand_object **params,
+ union acpi_operand_object **return_obj_desc,
+ u32 pass_number)
{
- acpi_status status;
- acpi_parse_state *parser_state = &walk_state->parser_state;
+ acpi_status status;
+ struct acpi_parse_state *parser_state = &walk_state->parser_state;
+ union acpi_parse_object *extra_op;
- FUNCTION_TRACE ("Ds_init_aml_walk");
+ ACPI_FUNCTION_TRACE ("ds_init_aml_walk");
walk_state->parser_state.aml =
@@ -900,8 +914,7 @@
walk_state->parser_state.aml_end =
walk_state->parser_state.pkg_end = aml_start + aml_length;
- /* The Next_op of the Next_walk will be the beginning of the method */
- /* TBD: [Restructure] -- obsolete? */
+ /* The next_op of the next_walk will be the beginning of the method */
walk_state->next_op = NULL;
walk_state->params = params;
@@ -914,11 +927,10 @@
if (method_node) {
walk_state->parser_state.start_node = method_node;
- walk_state->walk_type = WALK_METHOD;
+ walk_state->walk_type = ACPI_WALK_METHOD;
walk_state->method_node = method_node;
walk_state->method_desc = acpi_ns_get_attached_object (method_node);
-
/* Push start scope on scope stack and make it current */
status = acpi_ds_scope_stack_push (method_node, ACPI_TYPE_METHOD, walk_state);
@@ -928,13 +940,29 @@
/* Init the method arguments */
- acpi_ds_method_data_init_args (params, MTH_NUM_ARGS, walk_state);
+ status = acpi_ds_method_data_init_args (params, ACPI_METHOD_NUM_ARGS, walk_state);
+ if (ACPI_FAILURE (status)) {
+ return_ACPI_STATUS (status);
+ }
}
-
else {
- /* Setup the current scope */
+ /*
+ * Setup the current scope.
+ * Find a Named Op that has a namespace node associated with it.
+ * search upwards from this Op. Current scope is the first
+ * Op with a namespace node.
+ */
+ extra_op = parser_state->start_op;
+ while (extra_op && !extra_op->common.node) {
+ extra_op = extra_op->common.parent;
+ }
+ if (!extra_op) {
+ parser_state->start_node = NULL;
+ }
+ else {
+ parser_state->start_node = extra_op->common.node;
+ }
- parser_state->start_node = parser_state->start_op->node;
if (parser_state->start_node) {
/* Push start scope on scope stack and make it current */
@@ -946,18 +974,16 @@
}
}
- acpi_ds_init_callbacks (walk_state, pass_number);
-
- return_ACPI_STATUS (AE_OK);
+ status = acpi_ds_init_callbacks (walk_state, pass_number);
+ return_ACPI_STATUS (status);
}
-#endif
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_delete_walk_state
+ * FUNCTION: acpi_ds_delete_walk_state
*
- * PARAMETERS: Walk_state - State to delete
+ * PARAMETERS: walk_state - State to delete
*
* RETURN: Status
*
@@ -967,12 +993,12 @@
void
acpi_ds_delete_walk_state (
- acpi_walk_state *walk_state)
+ struct acpi_walk_state *walk_state)
{
- acpi_generic_state *state;
+ union acpi_generic_state *state;
- FUNCTION_TRACE_PTR ("Ds_delete_walk_state", walk_state);
+ ACPI_FUNCTION_TRACE_PTR ("ds_delete_walk_state", walk_state);
if (!walk_state) {
@@ -984,7 +1010,6 @@
return;
}
-
if (walk_state->parser_state.scope) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "%p walk still has a scope list\n", walk_state));
}
@@ -1023,7 +1048,7 @@
/******************************************************************************
*
- * FUNCTION: Acpi_ds_delete_walk_state_cache
+ * FUNCTION: acpi_ds_delete_walk_state_cache
*
* PARAMETERS: None
*
@@ -1038,7 +1063,7 @@
acpi_ds_delete_walk_state_cache (
void)
{
- FUNCTION_TRACE ("Ds_delete_walk_state_cache");
+ ACPI_FUNCTION_TRACE ("ds_delete_walk_state_cache");
acpi_ut_delete_generic_cache (ACPI_MEM_LIST_WALK);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)