git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
acpi
/
dispatcher
/
dswexec.c
diff --git
a/drivers/acpi/dispatcher/dswexec.c
b/drivers/acpi/dispatcher/dswexec.c
index
f1af655
..
d7a616c
100644
(file)
--- a/
drivers/acpi/dispatcher/dswexec.c
+++ b/
drivers/acpi/dispatcher/dswexec.c
@@
-49,7
+49,6
@@
#include <acpi/acinterp.h>
#include <acpi/acnamesp.h>
#include <acpi/acdebug.h>
#include <acpi/acinterp.h>
#include <acpi/acnamesp.h>
#include <acpi/acdebug.h>
-#include <acpi/acdisasm.h>
#define _COMPONENT ACPI_DISPATCHER
ACPI_MODULE_NAME("dswexec")
#define _COMPONENT ACPI_DISPATCHER
ACPI_MODULE_NAME("dswexec")
@@
-93,7
+92,7
@@
acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
union acpi_operand_object *obj_desc;
union acpi_operand_object *local_obj_desc = NULL;
union acpi_operand_object *obj_desc;
union acpi_operand_object *local_obj_desc = NULL;
- ACPI_FUNCTION_TRACE_PTR(
"ds_get_predicate_value"
, walk_state);
+ ACPI_FUNCTION_TRACE_PTR(
ds_get_predicate_value
, walk_state);
walk_state->control_state->common.state = 0;
walk_state->control_state->common.state = 0;
@@
-123,7
+122,7
@@
acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
if (!obj_desc) {
ACPI_ERROR((AE_INFO,
if (!obj_desc) {
ACPI_ERROR((AE_INFO,
- "No predicate
obj_d
esc=%p State=%p",
+ "No predicate
ObjD
esc=%p State=%p",
obj_desc, walk_state));
return_ACPI_STATUS(AE_AML_NO_OPERAND);
obj_desc, walk_state));
return_ACPI_STATUS(AE_AML_NO_OPERAND);
@@
-140,7
+139,7
@@
acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
if (ACPI_GET_OBJECT_TYPE(local_obj_desc) != ACPI_TYPE_INTEGER) {
ACPI_ERROR((AE_INFO,
if (ACPI_GET_OBJECT_TYPE(local_obj_desc) != ACPI_TYPE_INTEGER) {
ACPI_ERROR((AE_INFO,
- "Bad predicate (not an integer)
obj_d
esc=%p State=%p Type=%X",
+ "Bad predicate (not an integer)
ObjD
esc=%p State=%p Type=%X",
obj_desc, walk_state,
ACPI_GET_OBJECT_TYPE(obj_desc)));
obj_desc, walk_state,
ACPI_GET_OBJECT_TYPE(obj_desc)));
@@
-214,7
+213,7
@@
acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
acpi_status status = AE_OK;
u32 opcode_class;
acpi_status status = AE_OK;
u32 opcode_class;
- ACPI_FUNCTION_TRACE_PTR(
"ds_exec_begin_op"
, walk_state);
+ ACPI_FUNCTION_TRACE_PTR(
ds_exec_begin_op
, walk_state);
op = walk_state->op;
if (!op) {
op = walk_state->op;
if (!op) {
@@
-296,7
+295,7
@@
acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
case AML_CLASS_NAMED_OBJECT:
case AML_CLASS_NAMED_OBJECT:
- if (walk_state->walk_type
==
ACPI_WALK_METHOD) {
+ if (walk_state->walk_type
&
ACPI_WALK_METHOD) {
/*
* Found a named object declaration during method execution;
* we must enter this object into the namespace. The created
/*
* Found a named object declaration during method execution;
* we must enter this object into the namespace. The created
@@
-314,10
+313,10
@@
acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
case AML_CLASS_EXECUTE:
case AML_CLASS_CREATE:
/*
case AML_CLASS_EXECUTE:
case AML_CLASS_CREATE:
/*
- * Most operators with arguments
.
+ * Most operators with arguments
(except create_xxx_field operators)
* Start a new result/operand state
*/
* Start a new result/operand state
*/
- if (walk_state->op
code != AML_CREATE_FIELD_OP
) {
+ if (walk_state->op
_info->object_type != ACPI_TYPE_BUFFER_FIELD
) {
status = acpi_ds_result_stack_push(walk_state);
}
break;
status = acpi_ds_result_stack_push(walk_state);
}
break;
@@
-354,7
+353,7
@@
acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
union acpi_parse_object *next_op;
union acpi_parse_object *first_arg;
union acpi_parse_object *next_op;
union acpi_parse_object *first_arg;
- ACPI_FUNCTION_TRACE_PTR(
"ds_exec_end_op"
, walk_state);
+ ACPI_FUNCTION_TRACE_PTR(
ds_exec_end_op
, walk_state);
op = walk_state->op;
op_type = walk_state->op_info->type;
op = walk_state->op;
op_type = walk_state->op_info->type;
@@
-409,6
+408,7
@@
acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
* being the object_type and size_of operators.
*/
if (!(walk_state->op_info->flags & AML_NO_OPERAND_RESOLVE)) {
* being the object_type and size_of operators.
*/
if (!(walk_state->op_info->flags & AML_NO_OPERAND_RESOLVE)) {
+
/* Resolve all operands */
status = acpi_ex_resolve_operands(walk_state->opcode,
/* Resolve all operands */
status = acpi_ex_resolve_operands(walk_state->opcode,
@@
-423,7
+423,7
@@
acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
acpi_ps_get_opcode_name
(walk_state->opcode),
walk_state->num_operands,
acpi_ps_get_opcode_name
(walk_state->opcode),
walk_state->num_operands,
- "after
ex_resolve_o
perands");
+ "after
ExResolveO
perands");
}
}
}
}
@@
-437,7
+437,7
@@
acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
acpi_gbl_op_type_dispatch[op_type] (walk_state);
} else {
/*
acpi_gbl_op_type_dispatch[op_type] (walk_state);
} else {
/*
- * Treat constructs of the form "Store(
local_x,local_x
)" as noops when the
+ * Treat constructs of the form "Store(
LocalX,LocalX
)" as noops when the
* Local is uninitialized.
*/
if ((status == AE_AML_UNINITIALIZED_LOCAL) &&
* Local is uninitialized.
*/
if ((status == AE_AML_UNINITIALIZED_LOCAL) &&
@@
-472,7
+472,6
@@
acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
acpi_ds_result_push(walk_state->result_obj,
walk_state);
}
acpi_ds_result_push(walk_state->result_obj,
walk_state);
}
-
break;
default:
break;
default:
@@
-510,6
+509,7
@@
acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
"Method Reference in a Package, Op=%p\n",
op));
ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
"Method Reference in a Package, Op=%p\n",
op));
+
op->common.node =
(struct acpi_namespace_node *)op->asl.value.
arg->asl.node->object;
op->common.node =
(struct acpi_namespace_node *)op->asl.value.
arg->asl.node->object;
@@
-548,6
+548,7
@@
acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
*/
status = acpi_ds_resolve_operands(walk_state);
if (ACPI_FAILURE(status)) {
*/
status = acpi_ds_resolve_operands(walk_state);
if (ACPI_FAILURE(status)) {
+
/* On error, clear all resolved operands */
acpi_ds_clear_operands(walk_state);
/* On error, clear all resolved operands */
acpi_ds_clear_operands(walk_state);
@@
-569,7
+570,7
@@
acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
case AML_TYPE_CREATE_FIELD:
ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
case AML_TYPE_CREATE_FIELD:
ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
- "Executing
create_f
ield Buffer/Index Op=%p\n",
+ "Executing
CreateF
ield Buffer/Index Op=%p\n",
op));
status = acpi_ds_load2_end_op(walk_state);
op));
status = acpi_ds_load2_end_op(walk_state);
@@
-584,7
+585,7
@@
acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
case AML_TYPE_CREATE_OBJECT:
ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
case AML_TYPE_CREATE_OBJECT:
ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
- "Executing
create_o
bject (Buffer/Package) Op=%p\n",
+ "Executing
CreateO
bject (Buffer/Package) Op=%p\n",
op));
switch (op->common.parent->common.aml_opcode) {
op));
switch (op->common.parent->common.aml_opcode) {
@@
-657,7
+658,7
@@
acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
if (op->common.aml_opcode == AML_REGION_OP) {
ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
if (op->common.aml_opcode == AML_REGION_OP) {
ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
- "Executing
op_r
egion Address/Length Op=%p\n",
+ "Executing
OpR
egion Address/Length Op=%p\n",
op));
status =
op));
status =
@@
-669,7
+670,6
@@
acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
status = acpi_ds_result_stack_pop(walk_state);
}
status = acpi_ds_result_stack_pop(walk_state);
}
-
break;
case AML_TYPE_UNDEFINED:
break;
case AML_TYPE_UNDEFINED:
@@
-707,7
+707,6
@@
acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
* Check if we just completed the evaluation of a
* conditional predicate
*/
* Check if we just completed the evaluation of a
* conditional predicate
*/
-
if ((ACPI_SUCCESS(status)) &&
(walk_state->control_state) &&
(walk_state->control_state->common.state ==
if ((ACPI_SUCCESS(status)) &&
(walk_state->control_state) &&
(walk_state->control_state->common.state ==
@@
-722,6
+721,7
@@
acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
cleanup:
if (walk_state->result_obj) {
cleanup:
if (walk_state->result_obj) {
+
/* Break to debugger to display result */
ACPI_DEBUGGER_EXEC(acpi_db_display_result_object
/* Break to debugger to display result */
ACPI_DEBUGGER_EXEC(acpi_db_display_result_object