patch-2.4.10 linux/drivers/acpi/parser/psscope.c

• Lines: 155
• Date: Sun Sep 23 09:42:32 2001
• Orig file: v2.4.9/linux/drivers/acpi/parser/psscope.c
• Orig date: Tue Jul 3 17:08:19 2001

diff -u --recursive --new-file v2.4.9/linux/drivers/acpi/parser/psscope.c linux/drivers/acpi/parser/psscope.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: psscope - Parser scope stack management routines
- *              $Revision: 27 $
+ *              $Revision: 29 $
  *
  *****************************************************************************/
 
@@ -43,9 +43,9 @@
  *
  ******************************************************************************/
 
-ACPI_PARSE_OBJECT *
+acpi_parse_object *
 acpi_ps_get_parent_scope (
-	ACPI_PARSE_STATE        *parser_state)
+	acpi_parse_state        *parser_state)
 {
 	return (parser_state->scope->parse_scope.op);
 }
@@ -67,7 +67,7 @@
 
 u8
 acpi_ps_has_completed_scope (
-	ACPI_PARSE_STATE        *parser_state)
+	acpi_parse_state        *parser_state)
 {
 	return ((u8) ((parser_state->aml >= parser_state->scope->parse_scope.arg_end ||
 			   !parser_state->scope->parse_scope.arg_count)));
@@ -87,17 +87,20 @@
  *
  ******************************************************************************/
 
-ACPI_STATUS
+acpi_status
 acpi_ps_init_scope (
-	ACPI_PARSE_STATE        *parser_state,
-	ACPI_PARSE_OBJECT       *root_op)
+	acpi_parse_state        *parser_state,
+	acpi_parse_object       *root_op)
 {
-	ACPI_GENERIC_STATE      *scope;
+	acpi_generic_state      *scope;
+
+
+	FUNCTION_TRACE_PTR ("Ps_init_scope", root_op);
 
 
 	scope = acpi_ut_create_generic_state ();
 	if (!scope) {
-		return (AE_NO_MEMORY);
+		return_ACPI_STATUS (AE_NO_MEMORY);
 	}
 
 	scope->parse_scope.op       = root_op;
@@ -108,7 +111,7 @@
 	parser_state->scope         = scope;
 	parser_state->start_op      = root_op;
 
-	return (AE_OK);
+	return_ACPI_STATUS (AE_OK);
 }
 
 
@@ -127,14 +130,17 @@
  *
  ******************************************************************************/
 
-ACPI_STATUS
+acpi_status
 acpi_ps_push_scope (
-	ACPI_PARSE_STATE        *parser_state,
-	ACPI_PARSE_OBJECT       *op,
+	acpi_parse_state        *parser_state,
+	acpi_parse_object       *op,
 	u32                     remaining_args,
 	u32                     arg_count)
 {
-	ACPI_GENERIC_STATE      *scope;
+	acpi_generic_state      *scope;
+
+
+	FUNCTION_TRACE_PTR ("Ps_push_scope", op);
 
 
 	scope = acpi_ut_create_generic_state ();
@@ -165,7 +171,7 @@
 		scope->parse_scope.arg_end = ACPI_MAX_AML;
 	}
 
-	return (AE_OK);
+	return_ACPI_STATUS (AE_OK);
 }
 
 
@@ -187,12 +193,15 @@
 
 void
 acpi_ps_pop_scope (
-	ACPI_PARSE_STATE        *parser_state,
-	ACPI_PARSE_OBJECT       **op,
+	acpi_parse_state        *parser_state,
+	acpi_parse_object       **op,
 	u32                     *arg_list,
 	u32                     *arg_count)
 {
-	ACPI_GENERIC_STATE      *scope = parser_state->scope;
+	acpi_generic_state      *scope = parser_state->scope;
+
+
+	FUNCTION_TRACE ("Ps_pop_scope");
 
 
 	/*
@@ -201,7 +210,6 @@
 	if (scope->common.next) {
 		scope = acpi_ut_pop_generic_state (&parser_state->scope);
 
-
 		/* return to parsing previous op */
 
 		*op                     = scope->parse_scope.op;
@@ -223,7 +231,8 @@
 	}
 
 
-	return;
+	ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Popped Op %p Args %X\n", *op, *arg_count));
+	return_VOID;
 }
 
 
@@ -242,9 +251,11 @@
 
 void
 acpi_ps_cleanup_scope (
-	ACPI_PARSE_STATE        *parser_state)
+	acpi_parse_state        *parser_state)
 {
-	ACPI_GENERIC_STATE      *scope;
+	acpi_generic_state      *scope;
+
+	FUNCTION_TRACE_PTR ("Ps_cleanup_scope", parser_state);
 
 
 	if (!parser_state) {
@@ -259,6 +270,6 @@
 		acpi_ut_delete_generic_state (scope);
 	}
 
-	return;
+	return_VOID;
 }