-
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: acpihelp: Add UUID support, restructure some existing files.
This adds a -u option to acpi_help to display all known ACPI UUIDs. Some existing files in the core code have been restructured. Three new files. [zetalog: changing drivers/acpi/acpica/Makefile accordingly] Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
- Loading branch information
Bob Moore
authored and
Rafael J. Wysocki
committed
Jul 30, 2014
1 parent
3589b8b
commit 73bbca0
Showing
6 changed files
with
217 additions
and
28 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
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,100 @@ | ||
| /****************************************************************************** | ||
| * | ||
| * Module Name: uthex -- Hex/ASCII support functions | ||
| * | ||
| *****************************************************************************/ | ||
|
|
||
| /* | ||
| * Copyright (C) 2000 - 2014, 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" | ||
|
|
||
| #define _COMPONENT ACPI_COMPILER | ||
| ACPI_MODULE_NAME("uthex") | ||
|
|
||
| /* Hex to ASCII conversion table */ | ||
| static char acpi_gbl_hex_to_ascii[] = { | ||
| '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', | ||
| 'E', 'F' | ||
| }; | ||
|
|
||
| /******************************************************************************* | ||
| * | ||
| * FUNCTION: acpi_ut_hex_to_ascii_char | ||
| * | ||
| * PARAMETERS: integer - Contains the hex digit | ||
| * position - bit position of the digit within the | ||
| * integer (multiple of 4) | ||
| * | ||
| * RETURN: The converted Ascii character | ||
| * | ||
| * DESCRIPTION: Convert a hex digit to an Ascii character | ||
| * | ||
| ******************************************************************************/ | ||
|
|
||
| char acpi_ut_hex_to_ascii_char(u64 integer, u32 position) | ||
| { | ||
|
|
||
| return (acpi_gbl_hex_to_ascii[(integer >> position) & 0xF]); | ||
| } | ||
|
|
||
| /******************************************************************************* | ||
| * | ||
| * FUNCTION: acpi_ut_hex_char_to_value | ||
| * | ||
| * PARAMETERS: ascii_char - Hex character in Ascii | ||
| * | ||
| * RETURN: The binary value of the ascii/hex character | ||
| * | ||
| * DESCRIPTION: Perform ascii-to-hex translation | ||
| * | ||
| ******************************************************************************/ | ||
|
|
||
| u8 acpi_ut_ascii_char_to_hex(int hex_char) | ||
| { | ||
|
|
||
| if (hex_char <= 0x39) { | ||
| return ((u8)(hex_char - 0x30)); | ||
| } | ||
|
|
||
| if (hex_char <= 0x46) { | ||
| return ((u8)(hex_char - 0x37)); | ||
| } | ||
|
|
||
| return ((u8)(hex_char - 0x57)); | ||
| } |
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,96 @@ | ||
| /****************************************************************************** | ||
| * | ||
| * Module Name: utuuid -- UUID support functions | ||
| * | ||
| *****************************************************************************/ | ||
|
|
||
| /* | ||
| * Copyright (C) 2000 - 2014, 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" | ||
|
|
||
| #define _COMPONENT ACPI_COMPILER | ||
| ACPI_MODULE_NAME("utuuid") | ||
|
|
||
| /* | ||
| * UUID support functions. | ||
| * | ||
| * This table is used to convert an input UUID ascii string to a 16 byte | ||
| * buffer and the reverse. The table maps a UUID buffer index 0-15 to | ||
| * the index within the 36-byte UUID string where the associated 2-byte | ||
| * hex value can be found. | ||
| * | ||
| * 36-byte UUID strings are of the form: | ||
| * aabbccdd-eeff-gghh-iijj-kkllmmnnoopp | ||
| * Where aa-pp are one byte hex numbers, made up of two hex digits | ||
| * | ||
| * Note: This table is basically the inverse of the string-to-offset table | ||
| * found in the ACPI spec in the description of the to_UUID macro. | ||
| */ | ||
| const u8 acpi_gbl_map_to_uuid_offset[UUID_BUFFER_LENGTH] = { | ||
| 6, 4, 2, 0, 11, 9, 16, 14, 19, 21, 24, 26, 28, 30, 32, 34 | ||
| }; | ||
|
|
||
| /******************************************************************************* | ||
| * | ||
| * FUNCTION: acpi_ut_convert_string_to_uuid | ||
| * | ||
| * PARAMETERS: in_string - 36-byte formatted UUID string | ||
| * uuid_buffer - Where the 16-byte UUID buffer is returned | ||
| * | ||
| * RETURN: None. Output data is returned in the uuid_buffer | ||
| * | ||
| * DESCRIPTION: Convert a 36-byte formatted UUID string to 16-byte UUID buffer | ||
| * | ||
| ******************************************************************************/ | ||
|
|
||
| void acpi_ut_convert_string_to_uuid(char *in_string, u8 *uuid_buffer) | ||
| { | ||
| u32 i; | ||
|
|
||
| for (i = 0; i < UUID_BUFFER_LENGTH; i++) { | ||
| uuid_buffer[i] = | ||
| (acpi_ut_ascii_char_to_hex | ||
| (in_string[acpi_gbl_map_to_uuid_offset[i]]) << 4); | ||
|
|
||
| uuid_buffer[i] |= | ||
| acpi_ut_ascii_char_to_hex(in_string | ||
| [acpi_gbl_map_to_uuid_offset[i] + | ||
| 1]); | ||
| } | ||
| } |