Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a90c7e8 authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

[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: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 3c5c3638

drivers/acpi/dispatcher/dsfield.c

+4 −5
Original line number Diff line number Diff line
@@ -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
@@ -293,7 +293,7 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info, 
			    + (acpi_integer) arg->common.value.size;



			if (position > ACPI_UINT32_MAX) {

				ACPI_REPORT_ERROR(("Field [%4.4s] bit offset too large (> 0xFFFFFFFF)\n", (char *)&info->field_node->name));

				ACPI_REPORT_ERROR(("Field [%4.4s] bit offset too large (> 0xFFFFFFFF)\n", ACPI_CAST_PTR(char, &info->field_node->name)));

				return_ACPI_STATUS(AE_SUPPORT);

			}
@@ -302,8 +302,7 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info, 


		default:



			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

					  "Invalid opcode in field list: %X\n",

			ACPI_REPORT_ERROR(("Invalid opcode in field list: %X\n",

					   arg->common.aml_opcode));

			return_ACPI_STATUS(AE_AML_BAD_OPCODE);

		}

drivers/acpi/dispatcher/dsinit.c

+6 −14
Original line number Diff line number Diff line
@@ -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
@@ -84,7 +84,7 @@ acpi_ds_init_one_object(acpi_handle obj_handle, 
	acpi_object_type type;

	acpi_status status;



	ACPI_FUNCTION_NAME("ds_init_one_object");

	ACPI_FUNCTION_ENTRY();



	/*

	 * We are only interested in NS nodes owned by the table that
@@ -105,11 +105,7 @@ acpi_ds_init_one_object(acpi_handle obj_handle, 


		status = acpi_ds_initialize_region(obj_handle);

		if (ACPI_FAILURE(status)) {

			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

					  "Region %p [%4.4s] - Init failure, %s\n",

					  obj_handle,

					  acpi_ut_get_node_name(obj_handle),

					  acpi_format_exception(status)));

			ACPI_REPORT_ERROR(("Region %p [%4.4s] - Init failure, %s\n", obj_handle, acpi_ut_get_node_name(obj_handle), acpi_format_exception(status)));

		}



		info->op_region_count++;
@@ -148,11 +144,7 @@ acpi_ds_init_one_object(acpi_handle obj_handle, 
		 */

		status = acpi_ds_parse_method(obj_handle);

		if (ACPI_FAILURE(status)) {

			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

					  "\n+Method %p [%4.4s] - parse failure, %s\n",

					  obj_handle,

					  acpi_ut_get_node_name(obj_handle),

					  acpi_format_exception(status)));

			ACPI_REPORT_ERROR(("\n+Method %p [%4.4s] - parse failure, %s\n", obj_handle, acpi_ut_get_node_name(obj_handle), acpi_format_exception(status)));



			/* This parse failed, but we will continue parsing more methods */

		}
@@ -214,7 +206,7 @@ acpi_ds_initialize_objects(struct acpi_table_desc * table_desc, 
	status = acpi_walk_namespace(ACPI_TYPE_ANY, start_node, ACPI_UINT32_MAX,

				     acpi_ds_init_one_object, &info, NULL);

	if (ACPI_FAILURE(status)) {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "walk_namespace failed, %s\n",

		ACPI_REPORT_ERROR(("walk_namespace failed, %s\n",

				   acpi_format_exception(status)));

	}

drivers/acpi/dispatcher/dsmethod.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/acpi/dispatcher/dsmthdat.c

+9 −19
Original line number Diff line number Diff line
@@ -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
@@ -260,9 +260,7 @@ acpi_ds_method_data_get_node(u16 opcode, 
	case AML_LOCAL_OP:



		if (index > ACPI_METHOD_MAX_LOCAL) {

			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

					  "Local index %d is invalid (max %d)\n",

					  index, ACPI_METHOD_MAX_LOCAL));

			ACPI_REPORT_ERROR(("Local index %d is invalid (max %d)\n", index, ACPI_METHOD_MAX_LOCAL));

			return_ACPI_STATUS(AE_AML_INVALID_INDEX);

		}
@@ -274,8 +272,7 @@ acpi_ds_method_data_get_node(u16 opcode, 
	case AML_ARG_OP:



		if (index > ACPI_METHOD_MAX_ARG) {

			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

					  "Arg index %d is invalid (max %d)\n",

			ACPI_REPORT_ERROR(("Arg index %d is invalid (max %d)\n",

					   index, ACPI_METHOD_MAX_ARG));

			return_ACPI_STATUS(AE_AML_INVALID_INDEX);

		}
@@ -286,8 +283,7 @@ acpi_ds_method_data_get_node(u16 opcode, 
		break;



	default:

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Opcode %d is invalid\n",

				  opcode));

		ACPI_REPORT_ERROR(("Opcode %d is invalid\n", opcode));

		return_ACPI_STATUS(AE_AML_BAD_OPCODE);

	}
@@ -378,8 +374,7 @@ acpi_ds_method_data_get_value(u16 opcode, 
	/* Validate the object descriptor */



	if (!dest_desc) {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

				  "Null object descriptor pointer\n"));

		ACPI_REPORT_ERROR(("Null object descriptor pointer\n"));

		return_ACPI_STATUS(AE_BAD_PARAMETER);

	}
@@ -424,23 +419,18 @@ acpi_ds_method_data_get_value(u16 opcode, 
			switch (opcode) {

			case AML_ARG_OP:



				ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

						  "Uninitialized Arg[%d] at node %p\n",

						  index, node));

				ACPI_REPORT_ERROR(("Uninitialized Arg[%d] at node %p\n", index, node));



				return_ACPI_STATUS(AE_AML_UNINITIALIZED_ARG);



			case AML_LOCAL_OP:



				ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

						  "Uninitialized Local[%d] at node %p\n",

						  index, node));

				ACPI_REPORT_ERROR(("Uninitialized Local[%d] at node %p\n", index, node));



				return_ACPI_STATUS(AE_AML_UNINITIALIZED_LOCAL);



			default:

				ACPI_REPORT_ERROR(("Not Arg/Local opcode: %X\n",

						   opcode));

				ACPI_REPORT_ERROR(("Not a Arg/Local opcode: %X\n", opcode));

				return_ACPI_STATUS(AE_AML_INTERNAL);

			}

	}

drivers/acpi/dispatcher/dsobject.c

+7 −14
Original line number Diff line number Diff line
@@ -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
@@ -214,10 +214,7 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state, 
	byte_list = arg->named.next;

	if (byte_list) {

		if (byte_list->common.aml_opcode != AML_INT_BYTELIST_OP) {

			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

					  "Expecting bytelist, got AML opcode %X in op %p\n",

					  byte_list->common.aml_opcode,

					  byte_list));

			ACPI_REPORT_ERROR(("Expecting bytelist, got AML opcode %X in op %p\n", byte_list->common.aml_opcode, byte_list));



			acpi_ut_remove_reference(obj_desc);

			return (AE_TYPE);
@@ -543,9 +540,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state, 


			default:



				ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

						  "Unknown constant opcode %X\n",

						  opcode));

				ACPI_REPORT_ERROR(("Unknown constant opcode %X\n", opcode));

				status = AE_AML_OPERAND_TYPE;

				break;

			}
@@ -560,8 +555,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state, 
			break;



		default:

			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

					  "Unknown Integer type %X\n",

			ACPI_REPORT_ERROR(("Unknown Integer type %X\n",

					   op_info->type));

			status = AE_AML_OPERAND_TYPE;

			break;
@@ -640,8 +634,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state, 


	default:



		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

				  "Unimplemented data type: %X\n",

		ACPI_REPORT_ERROR(("Unimplemented data type: %X\n",

				   ACPI_GET_OBJECT_TYPE(obj_desc)));



		status = AE_AML_OPERAND_TYPE;