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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
acpi
/
dispatcher
/
dswstate.c
diff --git
a/drivers/acpi/dispatcher/dswstate.c
b/drivers/acpi/dispatcher/dswstate.c
index
7817e55
..
fa78cb7
100644
(file)
--- a/
drivers/acpi/dispatcher/dswstate.c
+++ b/
drivers/acpi/dispatcher/dswstate.c
@@
-66,6
+66,7
@@
void *acpi_ds_obj_stack_get_value(u32 index,
#endif
#ifdef ACPI_FUTURE_USAGE
#endif
#ifdef ACPI_FUTURE_USAGE
+
/*******************************************************************************
*
* FUNCTION: acpi_ds_result_remove
/*******************************************************************************
*
* FUNCTION: acpi_ds_result_remove
@@
-87,7
+88,7
@@
acpi_ds_result_remove(union acpi_operand_object **object,
{
union acpi_generic_state *state;
{
union acpi_generic_state *state;
- ACPI_FUNCTION_NAME(
ds_result_remove
);
+ ACPI_FUNCTION_NAME(
"ds_result_remove"
);
state = walk_state->results;
if (!state) {
state = walk_state->results;
if (!state) {
@@
-127,6
+128,7
@@
acpi_ds_result_remove(union acpi_operand_object **object,
return (AE_OK);
}
return (AE_OK);
}
+
#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
@@
-150,7
+152,7
@@
acpi_ds_result_pop(union acpi_operand_object ** object,
acpi_native_uint index;
union acpi_generic_state *state;
acpi_native_uint index;
union acpi_generic_state *state;
- ACPI_FUNCTION_NAME(
ds_result_pop
);
+ ACPI_FUNCTION_NAME(
"ds_result_pop"
);
state = walk_state->results;
if (!state) {
state = walk_state->results;
if (!state) {
@@
-168,7
+170,6
@@
acpi_ds_result_pop(union acpi_operand_object ** object,
state->results.num_results--;
for (index = ACPI_OBJ_NUM_OPERANDS; index; index--) {
state->results.num_results--;
for (index = ACPI_OBJ_NUM_OPERANDS; index; index--) {
-
/* Check for a valid result object */
if (state->results.obj_desc[index - 1]) {
/* Check for a valid result object */
if (state->results.obj_desc[index - 1]) {
@@
-212,7
+213,7
@@
acpi_ds_result_pop_from_bottom(union acpi_operand_object ** object,
acpi_native_uint index;
union acpi_generic_state *state;
acpi_native_uint index;
union acpi_generic_state *state;
- ACPI_FUNCTION_NAME(
ds_result_pop_from_bottom
);
+ ACPI_FUNCTION_NAME(
"ds_result_pop_from_bottom"
);
state = walk_state->results;
if (!state) {
state = walk_state->results;
if (!state) {
@@
-277,7
+278,7
@@
acpi_ds_result_push(union acpi_operand_object * object,
{
union acpi_generic_state *state;
{
union acpi_generic_state *state;
- ACPI_FUNCTION_NAME(
ds_result_push
);
+ ACPI_FUNCTION_NAME(
"ds_result_push"
);
state = walk_state->results;
if (!state) {
state = walk_state->results;
if (!state) {
@@
-330,14
+331,14
@@
acpi_status acpi_ds_result_stack_push(struct acpi_walk_state * walk_state)
{
union acpi_generic_state *state;
{
union acpi_generic_state *state;
- ACPI_FUNCTION_NAME(
ds_result_stack_push
);
+ ACPI_FUNCTION_NAME(
"ds_result_stack_push"
);
state = acpi_ut_create_generic_state();
if (!state) {
return (AE_NO_MEMORY);
}
state = acpi_ut_create_generic_state();
if (!state) {
return (AE_NO_MEMORY);
}
- state->common.d
escriptor
_type = ACPI_DESC_TYPE_STATE_RESULT;
+ state->common.d
ata
_type = ACPI_DESC_TYPE_STATE_RESULT;
acpi_ut_push_generic_state(&walk_state->results, state);
ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Results=%p State=%p\n",
acpi_ut_push_generic_state(&walk_state->results, state);
ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Results=%p State=%p\n",
@@
-362,7
+363,7
@@
acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state * walk_state)
{
union acpi_generic_state *state;
{
union acpi_generic_state *state;
- ACPI_FUNCTION_NAME(
ds_result_stack_pop
);
+ ACPI_FUNCTION_NAME(
"ds_result_stack_pop"
);
/* Check for stack underflow */
/* Check for stack underflow */
@@
-375,7
+376,7
@@
acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state * walk_state)
state = acpi_ut_pop_generic_state(&walk_state->results);
ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
state = acpi_ut_pop_generic_state(&walk_state->results);
ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
- "Result=%p
RemainingR
esults=%X State=%p\n",
+ "Result=%p
remaining_r
esults=%X State=%p\n",
state, state->results.num_results, walk_state));
acpi_ut_delete_generic_state(state);
state, state->results.num_results, walk_state));
acpi_ut_delete_generic_state(state);
@@
-399,7
+400,7
@@
acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state * walk_state)
acpi_status
acpi_ds_obj_stack_push(void *object, struct acpi_walk_state * walk_state)
{
acpi_status
acpi_ds_obj_stack_push(void *object, struct acpi_walk_state * walk_state)
{
- ACPI_FUNCTION_NAME(
ds_obj_stack_push
);
+ ACPI_FUNCTION_NAME(
"ds_obj_stack_push"
);
/* Check for stack overflow */
/* Check for stack overflow */
@@
-444,10
+445,9
@@
acpi_ds_obj_stack_pop(u32 pop_count, struct acpi_walk_state * walk_state)
{
u32 i;
{
u32 i;
- ACPI_FUNCTION_NAME(
ds_obj_stack_pop
);
+ ACPI_FUNCTION_NAME(
"ds_obj_stack_pop"
);
for (i = 0; i < pop_count; i++) {
for (i = 0; i < pop_count; i++) {
-
/* Check for stack underflow */
if (walk_state->num_operands == 0) {
/* Check for stack underflow */
if (walk_state->num_operands == 0) {
@@
-491,10
+491,9
@@
acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
u32 i;
union acpi_operand_object *obj_desc;
u32 i;
union acpi_operand_object *obj_desc;
- ACPI_FUNCTION_NAME(
ds_obj_stack_pop_and_delete
);
+ ACPI_FUNCTION_NAME(
"ds_obj_stack_pop_and_delete"
);
for (i = 0; i < pop_count; i++) {
for (i = 0; i < pop_count; i++) {
-
/* Check for stack underflow */
if (walk_state->num_operands == 0) {
/* Check for stack underflow */
if (walk_state->num_operands == 0) {
@@
-539,13
+538,13
@@
acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
struct acpi_walk_state *acpi_ds_get_current_walk_state(struct acpi_thread_state
*thread)
{
struct acpi_walk_state *acpi_ds_get_current_walk_state(struct acpi_thread_state
*thread)
{
- ACPI_FUNCTION_NAME(
ds_get_current_walk_state
);
+ ACPI_FUNCTION_NAME(
"ds_get_current_walk_state"
);
if (!thread) {
return (NULL);
}
if (!thread) {
return (NULL);
}
- ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "Current
WalkS
tate %p\n",
+ ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "Current
walk_s
tate %p\n",
thread->walk_state_list));
return (thread->walk_state_list);
thread->walk_state_list));
return (thread->walk_state_list);
@@
-568,7
+567,7
@@
void
acpi_ds_push_walk_state(struct acpi_walk_state *walk_state,
struct acpi_thread_state *thread)
{
acpi_ds_push_walk_state(struct acpi_walk_state *walk_state,
struct acpi_thread_state *thread)
{
- ACPI_FUNCTION_TRACE(
ds_push_walk_state
);
+ ACPI_FUNCTION_TRACE(
"ds_push_walk_state"
);
walk_state->next = thread->walk_state_list;
thread->walk_state_list = walk_state;
walk_state->next = thread->walk_state_list;
thread->walk_state_list = walk_state;
@@
-594,12
+593,11
@@
struct acpi_walk_state *acpi_ds_pop_walk_state(struct acpi_thread_state *thread)
{
struct acpi_walk_state *walk_state;
{
struct acpi_walk_state *walk_state;
- ACPI_FUNCTION_TRACE(
ds_pop_walk_state
);
+ ACPI_FUNCTION_TRACE(
"ds_pop_walk_state"
);
walk_state = thread->walk_state_list;
if (walk_state) {
walk_state = thread->walk_state_list;
if (walk_state) {
-
/* Next walk state becomes the current walk state */
thread->walk_state_list = walk_state->next;
/* Next walk state becomes the current walk state */
thread->walk_state_list = walk_state->next;
@@
-620,7
+618,7
@@
struct acpi_walk_state *acpi_ds_pop_walk_state(struct acpi_thread_state *thread)
*
* PARAMETERS: owner_id - ID for object creation
* Origin - Starting point for this walk
*
* PARAMETERS: owner_id - ID for object creation
* Origin - Starting point for this walk
- * m
ethod_desc
- Method object
+ * m
th_desc
- Method object
* Thread - Current thread state
*
* RETURN: Pointer to the new walk state.
* Thread - Current thread state
*
* RETURN: Pointer to the new walk state.
@@
-634,24
+632,24
@@
struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id,
union acpi_parse_object
*origin,
union acpi_operand_object
union acpi_parse_object
*origin,
union acpi_operand_object
- *m
ethod
_desc,
+ *m
th
_desc,
struct acpi_thread_state
*thread)
{
struct acpi_walk_state *walk_state;
acpi_status status;
struct acpi_thread_state
*thread)
{
struct acpi_walk_state *walk_state;
acpi_status status;
- ACPI_FUNCTION_TRACE(
ds_create_walk_state
);
+ ACPI_FUNCTION_TRACE(
"ds_create_walk_state"
);
- walk_state = ACPI_
ALLOCATE_ZEROED
(sizeof(struct acpi_walk_state));
+ walk_state = ACPI_
MEM_CALLOCATE
(sizeof(struct acpi_walk_state));
if (!walk_state) {
return_PTR(NULL);
}
if (!walk_state) {
return_PTR(NULL);
}
- walk_state->descriptor_type = ACPI_DESC_TYPE_WALK;
- walk_state->method_desc = method_desc;
+ walk_state->data_type = ACPI_DESC_TYPE_WALK;
walk_state->owner_id = owner_id;
walk_state->origin = origin;
walk_state->owner_id = owner_id;
walk_state->origin = origin;
+ walk_state->method_desc = mth_desc;
walk_state->thread = thread;
walk_state->parser_state.start_op = origin;
walk_state->thread = thread;
walk_state->parser_state.start_op = origin;
@@
-666,7
+664,7
@@
struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id,
status = acpi_ds_result_stack_push(walk_state);
if (ACPI_FAILURE(status)) {
status = acpi_ds_result_stack_push(walk_state);
if (ACPI_FAILURE(status)) {
- ACPI_FREE(walk_state);
+ ACPI_
MEM_
FREE(walk_state);
return_PTR(NULL);
}
return_PTR(NULL);
}
@@
-703,13
+701,13
@@
acpi_ds_init_aml_walk(struct acpi_walk_state *walk_state,
struct acpi_namespace_node *method_node,
u8 * aml_start,
u32 aml_length,
struct acpi_namespace_node *method_node,
u8 * aml_start,
u32 aml_length,
- struct acpi_
evaluate
_info *info, u8 pass_number)
+ struct acpi_
parameter
_info *info, u8 pass_number)
{
acpi_status status;
struct acpi_parse_state *parser_state = &walk_state->parser_state;
union acpi_parse_object *extra_op;
{
acpi_status status;
struct acpi_parse_state *parser_state = &walk_state->parser_state;
union acpi_parse_object *extra_op;
- ACPI_FUNCTION_TRACE(
ds_init_aml_walk
);
+ ACPI_FUNCTION_TRACE(
"ds_init_aml_walk"
);
walk_state->parser_state.aml =
walk_state->parser_state.aml_start = aml_start;
walk_state->parser_state.aml =
walk_state->parser_state.aml_start = aml_start;
@@
-780,7
+778,6
@@
acpi_ds_init_aml_walk(struct acpi_walk_state *walk_state,
}
if (parser_state->start_node) {
}
if (parser_state->start_node) {
-
/* Push start scope on scope stack and make it current */
status =
/* Push start scope on scope stack and make it current */
status =
@@
-813,24
+810,21
@@
void acpi_ds_delete_walk_state(struct acpi_walk_state *walk_state)
{
union acpi_generic_state *state;
{
union acpi_generic_state *state;
- ACPI_FUNCTION_TRACE_PTR(
ds_delete_walk_state
, walk_state);
+ ACPI_FUNCTION_TRACE_PTR(
"ds_delete_walk_state"
, walk_state);
if (!walk_state) {
return;
}
if (!walk_state) {
return;
}
- if (walk_state->d
escriptor
_type != ACPI_DESC_TYPE_WALK) {
+ if (walk_state->d
ata
_type != ACPI_DESC_TYPE_WALK) {
ACPI_ERROR((AE_INFO, "%p is not a valid walk state",
walk_state));
return;
}
ACPI_ERROR((AE_INFO, "%p is not a valid walk state",
walk_state));
return;
}
- /* There should not be any open scopes */
-
if (walk_state->parser_state.scope) {
ACPI_ERROR((AE_INFO, "%p walk still has a scope list",
walk_state));
if (walk_state->parser_state.scope) {
ACPI_ERROR((AE_INFO, "%p walk still has a scope list",
walk_state));
- acpi_ps_cleanup_scope(&walk_state->parser_state);
}
/* Always must free any linked control states */
}
/* Always must free any linked control states */
@@
-860,7
+854,7
@@
void acpi_ds_delete_walk_state(struct acpi_walk_state *walk_state)
acpi_ut_delete_generic_state(state);
}
acpi_ut_delete_generic_state(state);
}
- ACPI_FREE(walk_state);
+ ACPI_
MEM_
FREE(walk_state);
return_VOID;
}
return_VOID;
}
@@
-885,7
+879,7
@@
acpi_ds_result_insert(void *object,
{
union acpi_generic_state *state;
{
union acpi_generic_state *state;
- ACPI_FUNCTION_NAME(
ds_result_insert
);
+ ACPI_FUNCTION_NAME(
"ds_result_insert"
);
state = walk_state->results;
if (!state) {
state = walk_state->results;
if (!state) {
@@
-943,7
+937,7
@@
acpi_status acpi_ds_obj_stack_delete_all(struct acpi_walk_state * walk_state)
{
u32 i;
{
u32 i;
- ACPI_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 */
/* The stack size is configurable, but fixed */
@@
-975,7
+969,7
@@
acpi_status
acpi_ds_obj_stack_pop_object(union acpi_operand_object **object,
struct acpi_walk_state *walk_state)
{
acpi_ds_obj_stack_pop_object(union acpi_operand_object **object,
struct acpi_walk_state *walk_state)
{
- ACPI_FUNCTION_NAME(
ds_obj_stack_pop_object
);
+ ACPI_FUNCTION_NAME(
"ds_obj_stack_pop_object"
);
/* Check for stack underflow */
/* Check for stack underflow */
@@
-1031,7
+1025,7
@@
acpi_ds_obj_stack_pop_object(union acpi_operand_object **object,
void *acpi_ds_obj_stack_get_value(u32 index, struct acpi_walk_state *walk_state)
{
void *acpi_ds_obj_stack_get_value(u32 index, struct acpi_walk_state *walk_state)
{
- ACPI_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 */
/* Can't do it if the stack is empty */