ACPICA 20050408 from Bob Moore

Fixed three cases in the interpreter where an "index"
argument to an ASL function was still (internally) 32
bits instead of the required 64 bits.  This was the Index
argument to the Index, Mid, and Match operators.

The "strupr" function is now permanently local
(acpi_ut_strupr), since this is not a POSIX-defined
function and not present in most kernel-level C
libraries. References to the C library strupr function
have been removed from the headers.

Completed the deployment of static
functions/prototypes. All prototypes with the static
attribute have been moved from the headers to the owning
C file.

ACPICA 20050329 from Bob Moore

An error is now generated if an attempt is made to create
a Buffer Field of length zero (A CreateField with a length
operand of zero.)

The interpreter now issues a warning whenever executable
code at the module level is detected during ACPI table
load. This will give some idea of the prevalence of this
type of code.

Implemented support for references to named objects (other
than control methods) within package objects.

Enhanced package object output for the debug
object. Package objects are now completely dumped, showing
all elements.

Enhanced miscellaneous object output for the debug
object. Any object can now be written to the debug object
(for example, a device object can be written, and the type
of the object will be displayed.)

The "static" qualifier has been added to all local
functions across the core subsystem.

The number of "long" lines (> 80 chars) within the source
has been significantly reduced, by about 1/3.

Cleaned up all header files to ensure that all CA/iASL
functions are prototyped (even static functions) and the
formatting is consistent.

Two new header files have been added, acopcode.h and
acnames.h.

Removed several obsolete functions that were no longer
used.

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 24 insertions, 21 deletions

diff --git a/drivers/acpi/parser/psscope.c b/drivers/acpi/parser/psscope.c
index dcbed49608b0..8dcd1b1e7131 100644
--- a/drivers/acpi/parser/psscope.c
+++ b/drivers/acpi/parser/psscope.c
@@ -65,6 +65,7 @@ union acpi_parse_object *
 acpi_ps_get_parent_scope (
         struct acpi_parse_state         *parser_state)
 {
+
         return (parser_state->scope->parse_scope.op);
 }
 
@@ -87,8 +88,10 @@ u8
 acpi_ps_has_completed_scope (
         struct acpi_parse_state         *parser_state)
 {
-        return ((u8) ((parser_state->aml >= parser_state->scope->parse_scope.arg_end ||
-                           !parser_state->scope->parse_scope.arg_count)));
+
+        return ((u8)
+                        ((parser_state->aml >= parser_state->scope->parse_scope.arg_end ||
+                         !parser_state->scope->parse_scope.arg_count)));
 }
 
 
@@ -167,23 +170,23 @@ acpi_ps_push_scope (
                 return_ACPI_STATUS (AE_NO_MEMORY);
         }
 
-        scope->common.data_type        = ACPI_DESC_TYPE_STATE_PSCOPE;
-        scope->parse_scope.op          = op;
-        scope->parse_scope.arg_list    = remaining_args;
-        scope->parse_scope.arg_count   = arg_count;
-        scope->parse_scope.pkg_end     = parser_state->pkg_end;
+        scope->common.data_type    = ACPI_DESC_TYPE_STATE_PSCOPE;
+        scope->parse_scope.op      = op;
+        scope->parse_scope.arg_list = remaining_args;
+        scope->parse_scope.arg_count = arg_count;
+        scope->parse_scope.pkg_end = parser_state->pkg_end;
 
         /* Push onto scope stack */
 
         acpi_ut_push_generic_state (&parser_state->scope, scope);
 
         if (arg_count == ACPI_VAR_ARGS) {
-                /* multiple arguments */
+                /* Multiple arguments */
 
                 scope->parse_scope.arg_end = parser_state->pkg_end;
         }
         else {
-                /* single argument */
+                /* Single argument */
 
                 scope->parse_scope.arg_end = ACPI_TO_POINTER (ACPI_MAX_PTR);
         }
@@ -221,18 +224,17 @@ acpi_ps_pop_scope (
         ACPI_FUNCTION_TRACE ("ps_pop_scope");
 
 
-        /*
-         * 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 = acpi_ut_pop_generic_state (&parser_state->scope);
 
                 /* return to parsing previous op */
 
-                *op                     = scope->parse_scope.op;
-                *arg_list               = scope->parse_scope.arg_list;
-                *arg_count              = scope->parse_scope.arg_count;
-                parser_state->pkg_end   = scope->parse_scope.pkg_end;
+                *op                 = scope->parse_scope.op;
+                *arg_list           = scope->parse_scope.arg_list;
+                *arg_count          = scope->parse_scope.arg_count;
+                parser_state->pkg_end = scope->parse_scope.pkg_end;
 
                 /* All done with this scope state structure */
 
@@ -241,12 +243,13 @@ acpi_ps_pop_scope (
         else {
                 /* empty parse stack, prepare to fetch next opcode */
 
-                *op                     = NULL;
-                *arg_list               = 0;
-                *arg_count              = 0;
+                *op       = NULL;
+                *arg_list = 0;
+                *arg_count = 0;
         }
 
-        ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Popped Op %p Args %X\n", *op, *arg_count));
+        ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
+                "Popped Op %p Args %X\n", *op, *arg_count));
         return_VOID;
 }
 
@@ -257,7 +260,7 @@ acpi_ps_pop_scope (
  *
  * PARAMETERS:  parser_state        - Current parser state object
  *
- * RETURN:      Status
+ * RETURN:      None
  *
  * DESCRIPTION: Destroy available list, remaining stack levels, and return
  *              root scope