Print this page
update to acpica-unix2-20140114
update to acpica-unix2-20131218
acpica-unix2-20130823
PANKOVs restructure

@@ -4,11 +4,11 @@
  *                        dispatch to interpreter.
  *
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:

@@ -162,11 +162,11 @@
         goto Cleanup;
     }
 
     /* Truncate the predicate to 32-bits if necessary */
 
-    AcpiExTruncateFor32bitTable (LocalObjDesc);
+    (void) AcpiExTruncateFor32bitTable (LocalObjDesc);
 
     /*
      * Save the result of the predicate evaluation on
      * the control stack
      */

@@ -316,11 +316,10 @@
     case AML_CLASS_CONTROL:
 
         Status = AcpiDsExecBeginControlOp (WalkState, Op);
         break;
 
-
     case AML_CLASS_NAMED_OBJECT:
 
         if (WalkState->WalkType & ACPI_WALK_METHOD)
         {
             /*

@@ -348,18 +347,17 @@
                 }
             }
         }
         break;
 
-
     case AML_CLASS_EXECUTE:
     case AML_CLASS_CREATE:
 
         break;
 
-
     default:
+
         break;
     }
 
     /* Nothing to do here during method execution */
 

@@ -439,11 +437,10 @@
                 goto Cleanup;
             }
         }
         break;
 
-
     case AML_CLASS_EXECUTE:     /* Most operators with arguments */
 
         /* Build resolved operand stack */
 
         Status = AcpiDsCreateOperands (WalkState, FirstArg);

@@ -512,11 +509,10 @@
         {
             Status = AcpiDsResultPush (WalkState->ResultObj, WalkState);
         }
         break;
 
-
     default:
 
         switch (OpType)
         {
         case AML_TYPE_CONTROL:    /* Type 1 opcode, IF/ELSE/WHILE/NOOP */

@@ -525,13 +521,11 @@
 
             Status = AcpiDsExecEndControlOp (WalkState, Op);
 
             break;
 
-
         case AML_TYPE_METHOD_CALL:
-
             /*
              * If the method is referenced from within a package
              * declaration, it is not a invocation of the method, just
              * a reference to it.
              */

@@ -545,11 +539,12 @@
                 Op->Common.Node = (ACPI_NAMESPACE_NODE *) Op->Asl.Value.Arg->Asl.Node;
                 AcpiUtAddReference (Op->Asl.Value.Arg->Asl.Node->Object);
                 return_ACPI_STATUS (AE_OK);
             }
 
-            ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Method invocation, Op=%p\n", Op));
+            ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
+                "Method invocation, Op=%p\n", Op));
 
             /*
              * (AML_METHODCALL) Op->Asl.Value.Arg->Asl.Node contains
              * the method Node pointer
              */

@@ -594,11 +589,10 @@
              * Return now; we don't want to disturb anything,
              * especially the operand count!
              */
             return_ACPI_STATUS (Status);
 
-
         case AML_TYPE_CREATE_FIELD:
 
             ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
                 "Executing CreateField Buffer/Index Op=%p\n", Op));
 

@@ -618,11 +612,10 @@
                 "Executing CreateObject (Buffer/Package) Op=%p\n", Op));
 
             switch (Op->Common.Parent->Common.AmlOpcode)
             {
             case AML_NAME_OP:
-
                 /*
                  * Put the Node on the object stack (Contains the ACPI Name
                  * of this object)
                  */
                 WalkState->Operands[0] = (void *) Op->Common.Parent->Common.Node;

@@ -659,11 +652,10 @@
             {
                 Status = AcpiDsResultPush (WalkState->ResultObj, WalkState);
             }
             break;
 
-
         case AML_TYPE_NAMED_FIELD:
         case AML_TYPE_NAMED_COMPLEX:
         case AML_TYPE_NAMED_SIMPLE:
         case AML_TYPE_NAMED_NO_OBJ:
 

@@ -706,30 +698,27 @@
                     break;
                 }
             }
             break;
 
-
         case AML_TYPE_UNDEFINED:
 
             ACPI_ERROR ((AE_INFO,
                 "Undefined opcode type Op=%p", Op));
             return_ACPI_STATUS (AE_NOT_IMPLEMENTED);
 
-
         case AML_TYPE_BOGUS:
 
             ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
                 "Internal opcode=%X type Op=%p\n",
                 WalkState->Opcode, Op));
             break;
 
-
         default:
 
             ACPI_ERROR ((AE_INFO,
-                "Unimplemented opcode, class=0x%X type=0x%X Opcode=-0x%X Op=%p",
+                "Unimplemented opcode, class=0x%X type=0x%X Opcode=0x%X Op=%p",
                 OpClass, OpType, Op->Common.AmlOpcode, Op));
 
             Status = AE_NOT_IMPLEMENTED;
             break;
         }

@@ -737,11 +726,11 @@
 
     /*
      * ACPI 2.0 support for 64-bit integers: Truncate numeric
      * result value if we are executing from a 32-bit ACPI table
      */
-    AcpiExTruncateFor32bitTable (WalkState->ResultObj);
+    (void) AcpiExTruncateFor32bitTable (WalkState->ResultObj);
 
     /*
      * Check if we just completed the evaluation of a
      * conditional predicate
      */

@@ -791,7 +780,5 @@
     /* Always clear the object stack */
 
     WalkState->NumOperands = 0;
     return_ACPI_STATUS (Status);
 }
-
-