-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ACPICA: Move predefined repair code to new file, no functional change
New file is nsrepair.c. This is in preparation for additional errror correcting code. Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lin Ming <ming.m.lin@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
- Loading branch information
Bob Moore
authored and
Len Brown
committed
Aug 28, 2009
1 parent
3ce804e
commit b2deadd
Showing
4 changed files
with
171 additions
and
119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| /****************************************************************************** | ||
| * | ||
| * Module Name: nsrepair - Repair for objects returned by predefined methods | ||
| * | ||
| *****************************************************************************/ | ||
|
|
||
| /* | ||
| * Copyright (C) 2000 - 2009, Intel Corp. | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions, and the following disclaimer, | ||
| * without modification. | ||
| * 2. Redistributions in binary form must reproduce at minimum a disclaimer | ||
| * substantially similar to the "NO WARRANTY" disclaimer below | ||
| * ("Disclaimer") and any redistribution must be conditioned upon | ||
| * including a substantially similar Disclaimer requirement for further | ||
| * binary redistribution. | ||
| * 3. Neither the names of the above-listed copyright holders nor the names | ||
| * of any contributors may be used to endorse or promote products derived | ||
| * from this software without specific prior written permission. | ||
| * | ||
| * Alternatively, this software may be distributed under the terms of the | ||
| * GNU General Public License ("GPL") version 2 as published by the Free | ||
| * Software Foundation. | ||
| * | ||
| * NO WARRANTY | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR | ||
| * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING | ||
| * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
| * POSSIBILITY OF SUCH DAMAGES. | ||
| */ | ||
|
|
||
| #include <acpi/acpi.h> | ||
| #include "accommon.h" | ||
| #include "acnamesp.h" | ||
| #include "acpredef.h" | ||
|
|
||
| #define _COMPONENT ACPI_NAMESPACE | ||
| ACPI_MODULE_NAME("nsrepair") | ||
|
|
||
| /******************************************************************************* | ||
| * | ||
| * FUNCTION: acpi_ns_repair_object | ||
| * | ||
| * PARAMETERS: Data - Pointer to validation data structure | ||
| * expected_btypes - Object types expected | ||
| * package_index - Index of object within parent package (if | ||
| * applicable - ACPI_NOT_PACKAGE_ELEMENT | ||
| * otherwise) | ||
| * return_object_ptr - Pointer to the object returned from the | ||
| * evaluation of a method or object | ||
| * | ||
| * RETURN: Status. AE_OK if repair was successful. | ||
| * | ||
| * DESCRIPTION: Attempt to repair/convert a return object of a type that was | ||
| * not expected. | ||
| * | ||
| ******************************************************************************/ | ||
| acpi_status | ||
| acpi_ns_repair_object(struct acpi_predefined_data *data, | ||
| u32 expected_btypes, | ||
| u32 package_index, | ||
| union acpi_operand_object **return_object_ptr) | ||
| { | ||
| union acpi_operand_object *return_object = *return_object_ptr; | ||
| union acpi_operand_object *new_object; | ||
| acpi_size length; | ||
|
|
||
| switch (return_object->common.type) { | ||
| case ACPI_TYPE_BUFFER: | ||
|
|
||
| /* Does the method/object legally return a string? */ | ||
|
|
||
| if (!(expected_btypes & ACPI_RTYPE_STRING)) { | ||
| return (AE_AML_OPERAND_TYPE); | ||
| } | ||
|
|
||
| /* | ||
| * Have a Buffer, expected a String, convert. Use a to_string | ||
| * conversion, no transform performed on the buffer data. The best | ||
| * example of this is the _BIF method, where the string data from | ||
| * the battery is often (incorrectly) returned as buffer object(s). | ||
| */ | ||
| length = 0; | ||
| while ((length < return_object->buffer.length) && | ||
| (return_object->buffer.pointer[length])) { | ||
| length++; | ||
| } | ||
|
|
||
| /* Allocate a new string object */ | ||
|
|
||
| new_object = acpi_ut_create_string_object(length); | ||
| if (!new_object) { | ||
| return (AE_NO_MEMORY); | ||
| } | ||
|
|
||
| /* | ||
| * Copy the raw buffer data with no transform. String is already NULL | ||
| * terminated at Length+1. | ||
| */ | ||
| ACPI_MEMCPY(new_object->string.pointer, | ||
| return_object->buffer.pointer, length); | ||
|
|
||
| /* | ||
| * If the original object is a package element, we need to: | ||
| * 1. Set the reference count of the new object to match the | ||
| * reference count of the old object. | ||
| * 2. Decrement the reference count of the original object. | ||
| */ | ||
| if (package_index != ACPI_NOT_PACKAGE_ELEMENT) { | ||
| new_object->common.reference_count = | ||
| return_object->common.reference_count; | ||
|
|
||
| if (return_object->common.reference_count > 1) { | ||
| return_object->common.reference_count--; | ||
| } | ||
|
|
||
| ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, | ||
| data->node_flags, | ||
| "Converted Buffer to expected String at index %u", | ||
| package_index)); | ||
| } else { | ||
| ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, | ||
| data->node_flags, | ||
| "Converted Buffer to expected String")); | ||
| } | ||
|
|
||
| /* Delete old object, install the new return object */ | ||
|
|
||
| acpi_ut_remove_reference(return_object); | ||
| *return_object_ptr = new_object; | ||
| data->flags |= ACPI_OBJECT_REPAIRED; | ||
| return (AE_OK); | ||
|
|
||
| default: | ||
| break; | ||
| } | ||
|
|
||
| return (AE_AML_OPERAND_TYPE); | ||
| } |