ACPICA: Disassembler: Add support for the ToUUID opererator (macro).

This change adds support to disassemble a UUID back to the original
ToUUID operator. It will detect a UUID within a standard AML Buffer.
Also, a description of the UUID is emitted for "known" UUIDs, defined
as UUIDs that are defined in the ACPI specification.

Since this is a change for disassembler which is not shipped in the
Linux kernel, the Linux kernel is not affected.

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>

diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 91f801a2e6895703b54e9f7463ebdba2f692d11a..4c9fd7ceeb24b65ba247ae5bee118ab9b260328a 100644 (file)
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -730,12 +730,13 @@ union acpi_parse_value {
 #define ACPI_DASM_STRING                0x02   /* Buffer is a ASCII string */
 #define ACPI_DASM_UNICODE               0x03   /* Buffer is a Unicode string */
 #define ACPI_DASM_PLD_METHOD            0x04   /* Buffer is a _PLD method bit-packed buffer */
-#define ACPI_DASM_EISAID                0x05   /* Integer is an EISAID */
-#define ACPI_DASM_MATCHOP               0x06   /* Parent opcode is a Match() operator */
-#define ACPI_DASM_LNOT_PREFIX           0x07   /* Start of a Lnot_equal (etc.) pair of opcodes */
-#define ACPI_DASM_LNOT_SUFFIX           0x08   /* End  of a Lnot_equal (etc.) pair of opcodes */
-#define ACPI_DASM_HID_STRING            0x09   /* String is a _HID or _CID */
-#define ACPI_DASM_IGNORE                0x0A   /* Not used at this time */
+#define ACPI_DASM_UUID                  0x05   /* Buffer is a UUID/GUID */
+#define ACPI_DASM_EISAID                0x06   /* Integer is an EISAID */
+#define ACPI_DASM_MATCHOP               0x07   /* Parent opcode is a Match() operator */
+#define ACPI_DASM_LNOT_PREFIX           0x08   /* Start of a Lnot_equal (etc.) pair of opcodes */
+#define ACPI_DASM_LNOT_SUFFIX           0x09   /* End  of a Lnot_equal (etc.) pair of opcodes */
+#define ACPI_DASM_HID_STRING            0x0A   /* String is a _HID or _CID */
+#define ACPI_DASM_IGNORE                0x0B   /* Not used at this time */
 
 /*
  * Generic operation (for example:  If, While, Store)

diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h
index 932a60d6ed8283de2e5c893d9aad53626dabbbbe..5a0a3e5daf85de90c942ba59950023b5ffa2e49e 100644 (file)
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
@@ -217,6 +217,24 @@
 #define ACPI_NUM_sx_d_METHODS           4
 #define ACPI_NUM_sx_w_METHODS           5
 
+/******************************************************************************
+ *
+ * Miscellaneous constants
+ *
+ *****************************************************************************/
+
+/* UUID constants */
+
+#define UUID_BUFFER_LENGTH          16 /* Length of UUID in memory */
+#define UUID_STRING_LENGTH          36 /* Total length of a UUID string */
+
+/* Positions for required hyphens (dashes) in UUID strings */
+
+#define UUID_HYPHEN1_OFFSET         8
+#define UUID_HYPHEN2_OFFSET         13
+#define UUID_HYPHEN3_OFFSET         18
+#define UUID_HYPHEN4_OFFSET         23
+
 /******************************************************************************
  *
  * ACPI AML Debugger