summaryrefslogtreecommitdiffstats
path: root/sys/contrib/dev/acpica/dswscope.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/contrib/dev/acpica/dswscope.c')
-rw-r--r--sys/contrib/dev/acpica/dswscope.c35
1 files changed, 17 insertions, 18 deletions
diff --git a/sys/contrib/dev/acpica/dswscope.c b/sys/contrib/dev/acpica/dswscope.c
index 934de71..5f1cc62 100644
--- a/sys/contrib/dev/acpica/dswscope.c
+++ b/sys/contrib/dev/acpica/dswscope.c
@@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: dswscope - Scope stack manipulation
- * $Revision: 60 $
+ * $Revision: 1.63 $
*
*****************************************************************************/
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2004, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2005, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -124,14 +124,13 @@
ACPI_MODULE_NAME ("dswscope")
-#define STACK_POP(head) head
-
-
/****************************************************************************
*
* FUNCTION: AcpiDsScopeStackClear
*
- * PARAMETERS: None
+ * PARAMETERS: WalkState - Current state
+ *
+ * RETURN: None
*
* DESCRIPTION: Pop (and free) everything on the scope stack except the
* root scope object (which remains at the stack top.)
@@ -155,7 +154,8 @@ AcpiDsScopeStackClear (
WalkState->ScopeInfo = ScopeInfo->Scope.Next;
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
- "Popped object type (%s)\n", AcpiUtGetTypeName (ScopeInfo->Common.Value)));
+ "Popped object type (%s)\n",
+ AcpiUtGetTypeName (ScopeInfo->Common.Value)));
AcpiUtDeleteGenericState (ScopeInfo);
}
}
@@ -165,8 +165,11 @@ AcpiDsScopeStackClear (
*
* FUNCTION: AcpiDsScopeStackPush
*
- * PARAMETERS: *Node, - Name to be made current
- * Type, - Type of frame being pushed
+ * PARAMETERS: Node - Name to be made current
+ * Type - Type of frame being pushed
+ * WalkState - Current state
+ *
+ * RETURN: Status
*
* DESCRIPTION: Push the current scope on the scope stack, and make the
* passed Node current.
@@ -198,7 +201,8 @@ AcpiDsScopeStackPush (
if (!AcpiUtValidObjectType (Type))
{
- ACPI_REPORT_WARNING (("DsScopeStackPush: Invalid object type: 0x%X\n", Type));
+ ACPI_REPORT_WARNING ((
+ "DsScopeStackPush: Invalid object type: 0x%X\n", Type));
}
/* Allocate a new scope object */
@@ -250,16 +254,11 @@ AcpiDsScopeStackPush (
*
* FUNCTION: AcpiDsScopeStackPop
*
- * PARAMETERS: Type - The type of frame to be found
+ * PARAMETERS: WalkState - Current state
*
- * DESCRIPTION: Pop the scope stack until a frame of the requested type
- * is found.
+ * RETURN: Status
*
- * RETURN: Count of frames popped. If no frame of the requested type
- * was found, the count is returned as a negative number and
- * the scope stack is emptied (which sets the current scope
- * to the root). If the scope stack was empty at entry, the
- * function is a no-op and returns 0.
+ * DESCRIPTION: Pop the scope stack once.
*
***************************************************************************/
OpenPOWER on IntegriCloud