This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / acpi / executer / exresop.c

diff --git a/drivers/acpi/executer/exresop.c b/drivers/acpi/executer/exresop.c
index 51df1a7..d410bd7 100644 (file)
--- a/drivers/acpi/executer/exresop.c
+++ b/drivers/acpi/executer/exresop.c
@@ -160,7 +160,7 @@ acpi_ex_resolve_operands (
                return_ACPI_STATUS (AE_AML_INTERNAL);
        }
 
-       ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Opcode %X [%s] required_operand_types=%8.8X \n",
+       ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Opcode %X [%s] operand_types=%X \n",
                opcode, op_info->name, arg_types));
 
        /*
@@ -227,13 +227,12 @@ acpi_ex_resolve_operands (
                                case AML_LOAD_OP:   /* ddb_handle from LOAD_OP or LOAD_TABLE_OP */
 
                                        ACPI_DEBUG_ONLY_MEMBERS (ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
-                                               "Operand is a Reference, ref_opcode [%s]\n",
-                                               (acpi_ps_get_opcode_info (obj_desc->reference.opcode))->name)));
+                                               "Reference Opcode: %s\n", op_info->name)));
                                        break;
 
                                default:
                                        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                                               "Operand is a Reference, Unknown Reference Opcode %X [%s]\n",
+                                               "Unknown Reference Opcode %X [%s]\n",
                                                obj_desc->reference.opcode,
                                                (acpi_ps_get_opcode_info (obj_desc->reference.opcode))->name));
 
@@ -399,7 +398,7 @@ acpi_ex_resolve_operands (
                         * But we can implicitly convert from a STRING or BUFFER
                         * Aka - "Implicit Source Operand Conversion"
                         */
-                       status = acpi_ex_convert_to_integer (obj_desc, stack_ptr, 16);
+                       status = acpi_ex_convert_to_integer (obj_desc, stack_ptr, walk_state);
                        if (ACPI_FAILURE (status)) {
                                if (status == AE_TYPE) {
                                        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
@@ -421,7 +420,7 @@ acpi_ex_resolve_operands (
                         * But we can implicitly convert from a STRING or INTEGER
                         * Aka - "Implicit Source Operand Conversion"
                         */
-                       status = acpi_ex_convert_to_buffer (obj_desc, stack_ptr);
+                       status = acpi_ex_convert_to_buffer (obj_desc, stack_ptr, walk_state);
                        if (ACPI_FAILURE (status)) {
                                if (status == AE_TYPE) {
                                        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
@@ -443,8 +442,7 @@ acpi_ex_resolve_operands (
                         * But we can implicitly convert from a BUFFER or INTEGER
                         * Aka - "Implicit Source Operand Conversion"
                         */
-                       status = acpi_ex_convert_to_string (obj_desc, stack_ptr,
-                                        ACPI_IMPLICIT_CONVERT_HEX);
+                       status = acpi_ex_convert_to_string (obj_desc, stack_ptr, 16, ACPI_UINT32_MAX, walk_state);
                        if (ACPI_FAILURE (status)) {
                                if (status == AE_TYPE) {
                                        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
@@ -496,7 +494,7 @@ acpi_ex_resolve_operands (
 
                                /* Highest priority conversion is to type Buffer */
 
-                               status = acpi_ex_convert_to_buffer (obj_desc, stack_ptr);
+                               status = acpi_ex_convert_to_buffer (obj_desc, stack_ptr, walk_state);
                                if (ACPI_FAILURE (status)) {
                                        return_ACPI_STATUS (status);
                                }