patch-2.4.6 linux/drivers/acpi/dispatcher/dswstate.c

• Lines: 232
• Date: Wed Jun 20 17:47:39 2001
• Orig file: v2.4.5/linux/drivers/acpi/dispatcher/dswstate.c
• Orig date: Mon Jan 22 13:23:42 2001

diff -u --recursive --new-file v2.4.5/linux/drivers/acpi/dispatcher/dswstate.c linux/drivers/acpi/dispatcher/dswstate.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: dswstate - Dispatcher parse tree walk management routines
- *              $Revision: 38 $
+ *              $Revision: 45 $
  *
  *****************************************************************************/
 
@@ -31,7 +31,7 @@
 #include "acnamesp.h"
 #include "acinterp.h"
 
-#define _COMPONENT          DISPATCHER
+#define _COMPONENT          ACPI_DISPATCHER
 	 MODULE_NAME         ("dswstate")
 
 
@@ -57,6 +57,9 @@
 	ACPI_GENERIC_STATE      *state;
 
 
+	PROC_NAME ("Ds_result_insert");
+
+
 	state = walk_state->results;
 	if (!state) {
 		return (AE_NOT_EXIST);
@@ -100,6 +103,9 @@
 	ACPI_GENERIC_STATE      *state;
 
 
+	PROC_NAME ("Ds_result_remove");
+
+
 	state = walk_state->results;
 	if (!state) {
 		return (AE_NOT_EXIST);
@@ -147,6 +153,9 @@
 	ACPI_GENERIC_STATE      *state;
 
 
+	PROC_NAME ("Ds_result_pop");
+
+
 	state = walk_state->results;
 	if (!state) {
 		return (AE_OK);
@@ -199,6 +208,9 @@
 	ACPI_GENERIC_STATE      *state;
 
 
+	PROC_NAME ("Ds_result_pop_from_bottom");
+
+
 	state = walk_state->results;
 	if (!state) {
 		return (AE_NOT_EXIST);
@@ -254,6 +266,9 @@
 	ACPI_GENERIC_STATE      *state;
 
 
+	PROC_NAME ("Ds_result_push");
+
+
 	state = walk_state->results;
 	if (!state) {
 		return (AE_AML_INTERNAL);
@@ -295,12 +310,12 @@
 	ACPI_GENERIC_STATE      *state;
 
 
-	state = acpi_cm_create_generic_state ();
+	state = acpi_ut_create_generic_state ();
 	if (!state) {
 		return (AE_NO_MEMORY);
 	}
 
-	acpi_cm_push_generic_state (&walk_state->results, state);
+	acpi_ut_push_generic_state (&walk_state->results, state);
 
 	return (AE_OK);
 }
@@ -332,9 +347,9 @@
 	}
 
 
-	state = acpi_cm_pop_generic_state (&walk_state->results);
+	state = acpi_ut_pop_generic_state (&walk_state->results);
 
-	acpi_cm_delete_generic_state (state);
+	acpi_ut_delete_generic_state (state);
 
 	return (AE_OK);
 }
@@ -364,7 +379,7 @@
 
 	for (i = 0; i < OBJ_NUM_OPERANDS; i++) {
 		if (walk_state->operands[i]) {
-			acpi_cm_remove_reference (walk_state->operands[i]);
+			acpi_ut_remove_reference (walk_state->operands[i]);
 			walk_state->operands[i] = NULL;
 		}
 	}
@@ -432,10 +447,10 @@
 	/* Check for stack underflow */
 
 	if (walk_state->num_operands == 0) {
+		*object = NULL;
 		return (AE_AML_NO_OPERAND);
 	}
 
-
 	/* Pop the stack */
 
 	walk_state->num_operands--;
@@ -443,6 +458,7 @@
 	/* Check for a valid operand */
 
 	if (!walk_state->operands [walk_state->num_operands]) {
+		*object = NULL;
 		return (AE_AML_NO_OPERAND);
 	}
 
@@ -529,7 +545,7 @@
 		walk_state->num_operands--;
 		obj_desc = walk_state->operands [walk_state->num_operands];
 		if (obj_desc) {
-			acpi_cm_remove_reference (walk_state->operands [walk_state->num_operands]);
+			acpi_ut_remove_reference (walk_state->operands [walk_state->num_operands]);
 			walk_state->operands [walk_state->num_operands] = NULL;
 		}
 	}
@@ -696,7 +712,7 @@
 	ACPI_STATUS             status;
 
 
-	acpi_cm_acquire_mutex (ACPI_MTX_CACHES);
+	acpi_ut_acquire_mutex (ACPI_MTX_CACHES);
 	acpi_gbl_walk_state_cache_requests++;
 
 	/* Check the cache first */
@@ -710,17 +726,17 @@
 		acpi_gbl_walk_state_cache_hits++;
 		acpi_gbl_walk_state_cache_depth--;
 
-		acpi_cm_release_mutex (ACPI_MTX_CACHES);
+		acpi_ut_release_mutex (ACPI_MTX_CACHES);
 	}
 
 	else {
 		/* The cache is empty, create a new object */
 
-		/* Avoid deadlock with Acpi_cm_callocate */
+		/* Avoid deadlock with Acpi_ut_callocate */
 
-		acpi_cm_release_mutex (ACPI_MTX_CACHES);
+		acpi_ut_release_mutex (ACPI_MTX_CACHES);
 
-		walk_state = acpi_cm_callocate (sizeof (ACPI_WALK_STATE));
+		walk_state = acpi_ut_callocate (sizeof (ACPI_WALK_STATE));
 		if (!walk_state) {
 			return (NULL);
 		}
@@ -730,6 +746,7 @@
 	walk_state->owner_id        = owner_id;
 	walk_state->origin          = origin;
 	walk_state->method_desc     = mth_desc;
+	walk_state->walk_list       = walk_list;
 
 	/* Init the method args/local */
 
@@ -787,7 +804,7 @@
 		state = walk_state->control_state;
 		walk_state->control_state = state->common.next;
 
-		acpi_cm_delete_generic_state (state);
+		acpi_ut_delete_generic_state (state);
 	}
 
 	/* Always must free any linked parse states */
@@ -796,7 +813,7 @@
 		state = walk_state->scope_info;
 		walk_state->scope_info = state->common.next;
 
-		acpi_cm_delete_generic_state (state);
+		acpi_ut_delete_generic_state (state);
 	}
 
 	/* Always must free any stacked result states */
@@ -805,20 +822,20 @@
 		state = walk_state->results;
 		walk_state->results = state->common.next;
 
-		acpi_cm_delete_generic_state (state);
+		acpi_ut_delete_generic_state (state);
 	}
 
 
 	/* If walk cache is full, just free this wallkstate object */
 
 	if (acpi_gbl_walk_state_cache_depth >= MAX_WALK_CACHE_DEPTH) {
-		acpi_cm_free (walk_state);
+		acpi_ut_free (walk_state);
 	}
 
 	/* Otherwise put this object back into the cache */
 
 	else {
-		acpi_cm_acquire_mutex (ACPI_MTX_CACHES);
+		acpi_ut_acquire_mutex (ACPI_MTX_CACHES);
 
 		/* Clear the state */
 
@@ -832,7 +849,7 @@
 		acpi_gbl_walk_state_cache_depth++;
 
 
-		acpi_cm_release_mutex (ACPI_MTX_CACHES);
+		acpi_ut_release_mutex (ACPI_MTX_CACHES);
 	}
 
 	return;
@@ -865,7 +882,7 @@
 		/* Delete one cached state object */
 
 		next = acpi_gbl_walk_state_cache->next;
-		acpi_cm_free (acpi_gbl_walk_state_cache);
+		acpi_ut_free (acpi_gbl_walk_state_cache);
 		acpi_gbl_walk_state_cache = next;
 		acpi_gbl_walk_state_cache_depth--;
 	}