[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>
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
*****************************************************************************/
|
||||
|
||||
/*
|
||||
* Copyright (C) 2000 - 2005, R. Byron Moore
|
||||
* Copyright (C) 2000 - 2006, R. Byron Moore
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -154,8 +154,8 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
|
||||
acpi_ut_get_node_name(prefix_node),
|
||||
path));
|
||||
} else {
|
||||
ACPI_REPORT_METHOD_ERROR("Method execution failed",
|
||||
prefix_node, path, status);
|
||||
ACPI_REPORT_MTERROR("Method execution failed",
|
||||
prefix_node, path, status);
|
||||
}
|
||||
|
||||
return_ACPI_STATUS(status);
|
||||
@@ -165,9 +165,8 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
|
||||
|
||||
if (!info.return_object) {
|
||||
if (expected_return_btypes) {
|
||||
ACPI_REPORT_METHOD_ERROR("No object was returned from",
|
||||
prefix_node, path,
|
||||
AE_NOT_EXIST);
|
||||
ACPI_REPORT_MTERROR("No object was returned from",
|
||||
prefix_node, path, AE_NOT_EXIST);
|
||||
|
||||
return_ACPI_STATUS(AE_NOT_EXIST);
|
||||
}
|
||||
@@ -212,15 +211,10 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
|
||||
/* Is the return object one of the expected types? */
|
||||
|
||||
if (!(expected_return_btypes & return_btype)) {
|
||||
ACPI_REPORT_METHOD_ERROR("Return object type is incorrect",
|
||||
prefix_node, path, AE_TYPE);
|
||||
ACPI_REPORT_MTERROR("Return object type is incorrect",
|
||||
prefix_node, path, AE_TYPE);
|
||||
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
|
||||
"Type returned from %s was incorrect: %s, expected Btypes: %X\n",
|
||||
path,
|
||||
acpi_ut_get_object_type_name(info.
|
||||
return_object),
|
||||
expected_return_btypes));
|
||||
ACPI_REPORT_ERROR(("Type returned from %s was incorrect: %s, expected Btypes: %X\n", path, acpi_ut_get_object_type_name(info.return_object), expected_return_btypes));
|
||||
|
||||
/* On error exit, we must delete the return object */
|
||||
|
||||
|
Reference in New Issue
Block a user