diff options
author | Bob Moore <robert.moore@intel.com> | 2006-01-13 16:22:00 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-01-20 02:23:50 -0500 |
commit | 4a90c7e86202f46fa9af011bdbcdf36e355d1721 (patch) | |
tree | 3784cffb2166330d6f94ea53996fbeef36f58ce3 /drivers/acpi/executer/exoparg1.c | |
parent | 3c5c363826e435cf4d54d917202567e5b57cae5f (diff) |
[ACPI] ACPICA 20060113
Added 2006 copyright.
At SuSE's suggestion, enabled all error messages
without enabling function tracing, ie with CONFIG_ACPI_DEBUG=n
Replaced all instances of the ACPI_DEBUG_PRINT macro invoked at
the ACPI_DB_ERROR and ACPI_DB_WARN debug levels with
the ACPI_REPORT_ERROR and ACPI_REPORT_WARNING macros,
respectively. This preserves all error and warning messages
in the non-debug version of the ACPICA code (this has been
referred to as the "debug lite" option.) Over 200 cases
were converted to create a total of over 380 error/warning
messages across the ACPICA code. This increases the code
and data size of the default non-debug version by about 13K.
Added ACPI_NO_ERROR_MESSAGES flag to enable deleting all messages.
The size of the debug version remains about the same.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/executer/exoparg1.c')
-rw-r--r-- | drivers/acpi/executer/exoparg1.c | 59 |
1 files changed, 23 insertions, 36 deletions
diff --git a/drivers/acpi/executer/exoparg1.c b/drivers/acpi/executer/exoparg1.c index 97e34542f5e4..bc8837ecb716 100644 --- a/drivers/acpi/executer/exoparg1.c +++ b/drivers/acpi/executer/exoparg1.c | |||
@@ -6,7 +6,7 @@ | |||
6 | *****************************************************************************/ | 6 | *****************************************************************************/ |
7 | 7 | ||
8 | /* | 8 | /* |
9 | * Copyright (C) 2000 - 2005, R. Byron Moore | 9 | * Copyright (C) 2000 - 2006, R. Byron Moore |
10 | * All rights reserved. | 10 | * All rights reserved. |
11 | * | 11 | * |
12 | * Redistribution and use in source and binary forms, with or without | 12 | * Redistribution and use in source and binary forms, with or without |
@@ -111,7 +111,8 @@ acpi_status acpi_ex_opcode_0A_0T_1R(struct acpi_walk_state *walk_state) | |||
111 | 111 | ||
112 | default: /* Unknown opcode */ | 112 | default: /* Unknown opcode */ |
113 | 113 | ||
114 | ACPI_REPORT_ERROR(("acpi_ex_opcode_0A_0T_1R: Unknown opcode %X\n", walk_state->opcode)); | 114 | ACPI_REPORT_ERROR(("Unknown AML opcode %X\n", |
115 | walk_state->opcode)); | ||
115 | status = AE_AML_BAD_OPCODE; | 116 | status = AE_AML_BAD_OPCODE; |
116 | break; | 117 | break; |
117 | } | 118 | } |
@@ -188,7 +189,8 @@ acpi_status acpi_ex_opcode_1A_0T_0R(struct acpi_walk_state *walk_state) | |||
188 | 189 | ||
189 | default: /* Unknown opcode */ | 190 | default: /* Unknown opcode */ |
190 | 191 | ||
191 | ACPI_REPORT_ERROR(("acpi_ex_opcode_1A_0T_0R: Unknown opcode %X\n", walk_state->opcode)); | 192 | ACPI_REPORT_ERROR(("Unknown AML opcode %X\n", |
193 | walk_state->opcode)); | ||
192 | status = AE_AML_BAD_OPCODE; | 194 | status = AE_AML_BAD_OPCODE; |
193 | break; | 195 | break; |
194 | } | 196 | } |
@@ -227,7 +229,8 @@ acpi_status acpi_ex_opcode_1A_1T_0R(struct acpi_walk_state *walk_state) | |||
227 | 229 | ||
228 | default: /* Unknown opcode */ | 230 | default: /* Unknown opcode */ |
229 | 231 | ||
230 | ACPI_REPORT_ERROR(("acpi_ex_opcode_1A_1T_0R: Unknown opcode %X\n", walk_state->opcode)); | 232 | ACPI_REPORT_ERROR(("Unknown AML opcode %X\n", |
233 | walk_state->opcode)); | ||
231 | status = AE_AML_BAD_OPCODE; | 234 | status = AE_AML_BAD_OPCODE; |
232 | goto cleanup; | 235 | goto cleanup; |
233 | } | 236 | } |
@@ -346,9 +349,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state) | |||
346 | /* Check the range of the digit */ | 349 | /* Check the range of the digit */ |
347 | 350 | ||
348 | if (temp32 > 9) { | 351 | if (temp32 > 9) { |
349 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 352 | ACPI_REPORT_ERROR(("BCD digit too large (not decimal): 0x%X\n", temp32)); |
350 | "BCD digit too large (not decimal): 0x%X\n", | ||
351 | temp32)); | ||
352 | 353 | ||
353 | status = AE_AML_NUMERIC_OVERFLOW; | 354 | status = AE_AML_NUMERIC_OVERFLOW; |
354 | goto cleanup; | 355 | goto cleanup; |
@@ -393,12 +394,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state) | |||
393 | /* Overflow if there is any data left in Digit */ | 394 | /* Overflow if there is any data left in Digit */ |
394 | 395 | ||
395 | if (digit > 0) { | 396 | if (digit > 0) { |
396 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 397 | ACPI_REPORT_ERROR(("Integer too large to convert to BCD: %8.8X%8.8X\n", ACPI_FORMAT_UINT64(operand[0]->integer.value))); |
397 | "Integer too large to convert to BCD: %8.8X%8.8X\n", | ||
398 | ACPI_FORMAT_UINT64(operand | ||
399 | [0]-> | ||
400 | integer. | ||
401 | value))); | ||
402 | status = AE_AML_NUMERIC_OVERFLOW; | 398 | status = AE_AML_NUMERIC_OVERFLOW; |
403 | goto cleanup; | 399 | goto cleanup; |
404 | } | 400 | } |
@@ -525,15 +521,16 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state) | |||
525 | 521 | ||
526 | /* These are two obsolete opcodes */ | 522 | /* These are two obsolete opcodes */ |
527 | 523 | ||
528 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 524 | ACPI_REPORT_ERROR(("%s is obsolete and not implemented\n", |
529 | "%s is obsolete and not implemented\n", | 525 | acpi_ps_get_opcode_name(walk_state-> |
530 | acpi_ps_get_opcode_name(walk_state->opcode))); | 526 | opcode))); |
531 | status = AE_SUPPORT; | 527 | status = AE_SUPPORT; |
532 | goto cleanup; | 528 | goto cleanup; |
533 | 529 | ||
534 | default: /* Unknown opcode */ | 530 | default: /* Unknown opcode */ |
535 | 531 | ||
536 | ACPI_REPORT_ERROR(("acpi_ex_opcode_1A_1T_1R: Unknown opcode %X\n", walk_state->opcode)); | 532 | ACPI_REPORT_ERROR(("Unknown AML opcode %X\n", |
533 | walk_state->opcode)); | ||
537 | status = AE_AML_BAD_OPCODE; | 534 | status = AE_AML_BAD_OPCODE; |
538 | goto cleanup; | 535 | goto cleanup; |
539 | } | 536 | } |
@@ -639,11 +636,10 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state) | |||
639 | acpi_ex_resolve_operands(AML_LNOT_OP, &temp_desc, | 636 | acpi_ex_resolve_operands(AML_LNOT_OP, &temp_desc, |
640 | walk_state); | 637 | walk_state); |
641 | if (ACPI_FAILURE(status)) { | 638 | if (ACPI_FAILURE(status)) { |
642 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 639 | ACPI_REPORT_ERROR(("%s: bad operand(s) %s\n", |
643 | "%s: bad operand(s) %s\n", | 640 | acpi_ps_get_opcode_name(walk_state-> |
644 | acpi_ps_get_opcode_name(walk_state-> | 641 | opcode), |
645 | opcode), | 642 | acpi_format_exception(status))); |
646 | acpi_format_exception(status))); | ||
647 | 643 | ||
648 | goto cleanup; | 644 | goto cleanup; |
649 | } | 645 | } |
@@ -742,9 +738,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state) | |||
742 | break; | 738 | break; |
743 | 739 | ||
744 | default: | 740 | default: |
745 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 741 | ACPI_REPORT_ERROR(("Operand is not Buf/Int/Str/Pkg - found type %s\n", acpi_ut_get_type_name(type))); |
746 | "size_of - Operand is not Buf/Int/Str/Pkg - found type %s\n", | ||
747 | acpi_ut_get_type_name(type))); | ||
748 | status = AE_AML_OPERAND_TYPE; | 742 | status = AE_AML_OPERAND_TYPE; |
749 | goto cleanup; | 743 | goto cleanup; |
750 | } | 744 | } |
@@ -941,11 +935,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state) | |||
941 | 935 | ||
942 | default: | 936 | default: |
943 | 937 | ||
944 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 938 | ACPI_REPORT_ERROR(("Unknown Index target_type %X in obj %p\n", operand[0]->reference.target_type, operand[0])); |
945 | "Unknown Index target_type %X in obj %p\n", | ||
946 | operand[0]->reference. | ||
947 | target_type, | ||
948 | operand[0])); | ||
949 | status = AE_AML_OPERAND_TYPE; | 939 | status = AE_AML_OPERAND_TYPE; |
950 | goto cleanup; | 940 | goto cleanup; |
951 | } | 941 | } |
@@ -971,11 +961,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state) | |||
971 | break; | 961 | break; |
972 | 962 | ||
973 | default: | 963 | default: |
974 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 964 | ACPI_REPORT_ERROR(("Unknown opcode in ref(%p) - %X\n", operand[0], operand[0]->reference.opcode)); |
975 | "Unknown opcode in ref(%p) - %X\n", | ||
976 | operand[0], | ||
977 | operand[0]->reference. | ||
978 | opcode)); | ||
979 | 965 | ||
980 | status = AE_TYPE; | 966 | status = AE_TYPE; |
981 | goto cleanup; | 967 | goto cleanup; |
@@ -985,7 +971,8 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state) | |||
985 | 971 | ||
986 | default: | 972 | default: |
987 | 973 | ||
988 | ACPI_REPORT_ERROR(("acpi_ex_opcode_1A_0T_1R: Unknown opcode %X\n", walk_state->opcode)); | 974 | ACPI_REPORT_ERROR(("Unknown AML opcode %X\n", |
975 | walk_state->opcode)); | ||
989 | status = AE_AML_BAD_OPCODE; | 976 | status = AE_AML_BAD_OPCODE; |
990 | goto cleanup; | 977 | goto cleanup; |
991 | } | 978 | } |