* grub-core/commands/acpihalt.c (skip_ext_op): Skip index field op.

	* include/grub/acpi.h (GRUB_ACPI_EXTOPCODE_INDEX_FIELD_OP): New
	enum value.

diff --git a/ChangeLog b/ChangeLog
index 34a092ca27020bf2f98876b7eb44d96cbd381721..1c21262b9e4adc9ebf646bf7442d3332a1eb2d15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-16  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/commands/acpihalt.c (skip_ext_op): Skip index field op.
+       * include/grub/acpi.h (GRUB_ACPI_EXTOPCODE_INDEX_FIELD_OP): New
+       enum value.
+
 2010-10-16  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/commands/acpihalt.c (get_sleep_type): Accept \_S5_ as

diff --git a/grub-core/commands/acpihalt.c b/grub-core/commands/acpihalt.c
index d28a743238a7ed7a81f1228528d52e4b4763da8d..2789e2eca1d3e506458cf0f0fe9b4aa2e0daba6f 100644 (file)
--- a/grub-core/commands/acpihalt.c
+++ b/grub-core/commands/acpihalt.c
@@ -142,6 +142,7 @@ skip_ext_op (const grub_uint8_t *ptr, const grub_uint8_t *end)
        return 0;
       break;
     case GRUB_ACPI_EXTOPCODE_FIELD_OP:
+    case GRUB_ACPI_EXTOPCODE_INDEX_FIELD_OP:
       ptr++;
       ptr += decode_length (ptr, 0);
       break;

diff --git a/include/grub/acpi.h b/include/grub/acpi.h
index c7ab82dad2493bdc7584617124716442b295ddb9..c843a06216e49758058a0c9173070619859fa4b9 100644 (file)
--- a/include/grub/acpi.h
+++ b/include/grub/acpi.h
@@ -169,7 +169,8 @@ enum
   {
     GRUB_ACPI_EXTOPCODE_MUTEX = 0x01,
     GRUB_ACPI_EXTOPCODE_OPERATION_REGION = 0x80,
-    GRUB_ACPI_EXTOPCODE_FIELD_OP = 0x81
+    GRUB_ACPI_EXTOPCODE_FIELD_OP = 0x81,
+    GRUB_ACPI_EXTOPCODE_INDEX_FIELD_OP = 0x86,
   };
 
 #endif /* ! GRUB_ACPI_HEADER */