1 files changed, 26 insertions, 23 deletions

diff --git a/sys/contrib/dev/acpica/psscope.c b/sys/contrib/dev/acpica/psscope.c
index 786838b..0065910 100644
--- a/sys/contrib/dev/acpica/psscope.c
+++ b/sys/contrib/dev/acpica/psscope.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: psscope - Parser scope stack management routines
- *              $Revision: 38 $
+ *              $Revision: 1.42 $
  *
  *****************************************************************************/
 
@@ -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
@@ -138,6 +138,7 @@ ACPI_PARSE_OBJECT *
 AcpiPsGetParentScope (
     ACPI_PARSE_STATE        *ParserState)
 {
+
     return (ParserState->Scope->ParseScope.Op);
 }
 
@@ -160,8 +161,10 @@ BOOLEAN
 AcpiPsHasCompletedScope (
     ACPI_PARSE_STATE        *ParserState)
 {
-    return ((BOOLEAN) ((ParserState->Aml >= ParserState->Scope->ParseScope.ArgEnd ||
-                        !ParserState->Scope->ParseScope.ArgCount)));
+
+    return ((BOOLEAN)
+            ((ParserState->Aml >= ParserState->Scope->ParseScope.ArgEnd ||
+             !ParserState->Scope->ParseScope.ArgCount)));
 }
 
 
@@ -242,11 +245,11 @@ AcpiPsPushScope (
         return_ACPI_STATUS (AE_NO_MEMORY);
     }
 
-    Scope->Common.DataType         = ACPI_DESC_TYPE_STATE_PSCOPE;
-    Scope->ParseScope.Op           = Op;
-    Scope->ParseScope.ArgList      = RemainingArgs;
-    Scope->ParseScope.ArgCount     = ArgCount;
-    Scope->ParseScope.PkgEnd       = ParserState->PkgEnd;
+    Scope->Common.DataType     = ACPI_DESC_TYPE_STATE_PSCOPE;
+    Scope->ParseScope.Op       = Op;
+    Scope->ParseScope.ArgList  = RemainingArgs;
+    Scope->ParseScope.ArgCount = ArgCount;
+    Scope->ParseScope.PkgEnd   = ParserState->PkgEnd;
 
     /* Push onto scope stack */
 
@@ -254,13 +257,13 @@ AcpiPsPushScope (
 
     if (ArgCount == ACPI_VAR_ARGS)
     {
-        /* multiple arguments */
+        /* Multiple arguments */
 
         Scope->ParseScope.ArgEnd = ParserState->PkgEnd;
     }
     else
     {
-        /* single argument */
+        /* Single argument */
 
         Scope->ParseScope.ArgEnd = ACPI_TO_POINTER (ACPI_MAX_PTR);
     }
@@ -298,19 +301,18 @@ AcpiPsPopScope (
     ACPI_FUNCTION_TRACE ("PsPopScope");
 
 
-    /*
-     * Only pop the scope if there is in fact a next scope
-     */
+    /* Only pop the scope if there is in fact a next scope */
+
     if (Scope->Common.Next)
     {
         Scope = AcpiUtPopGenericState (&ParserState->Scope);
 
         /* return to parsing previous op */
 
-        *Op                     = Scope->ParseScope.Op;
-        *ArgList                = Scope->ParseScope.ArgList;
-        *ArgCount               = Scope->ParseScope.ArgCount;
-        ParserState->PkgEnd     = Scope->ParseScope.PkgEnd;
+        *Op                 = Scope->ParseScope.Op;
+        *ArgList            = Scope->ParseScope.ArgList;
+        *ArgCount           = Scope->ParseScope.ArgCount;
+        ParserState->PkgEnd = Scope->ParseScope.PkgEnd;
 
         /* All done with this scope state structure */
 
@@ -320,12 +322,13 @@ AcpiPsPopScope (
     {
         /* empty parse stack, prepare to fetch next opcode */
 
-        *Op                     = NULL;
-        *ArgList                = 0;
-        *ArgCount               = 0;
+        *Op       = NULL;
+        *ArgList  = 0;
+        *ArgCount = 0;
     }
 
-    ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Popped Op %p Args %X\n", *Op, *ArgCount));
+    ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
+        "Popped Op %p Args %X\n", *Op, *ArgCount));
     return_VOID;
 }
 
@@ -336,7 +339,7 @@ AcpiPsPopScope (
  *
  * PARAMETERS:  ParserState         - Current parser state object
  *
- * RETURN:      Status
+ * RETURN:      None
  *
  * DESCRIPTION: Destroy available list, remaining stack levels, and return
  *              root scope