a5bd9f6
From 0484a13a5db39105b817cb9b10702d038e26b918 Mon Sep 17 00:00:00 2001
a5bd9f6
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
a5bd9f6
Date: Fri, 1 Feb 2013 21:48:01 +0100
a5bd9f6
Subject: [PATCH 148/364] Missing part of last commit
a5bd9f6
a5bd9f6
---
a5bd9f6
 include/grub/acpi.h | 31 ++++++++++++++++++++++++++++++-
a5bd9f6
 1 file changed, 30 insertions(+), 1 deletion(-)
a5bd9f6
a5bd9f6
diff --git a/include/grub/acpi.h b/include/grub/acpi.h
a5bd9f6
index ee0a108..52d190c 100644
a5bd9f6
--- a/include/grub/acpi.h
a5bd9f6
+++ b/include/grub/acpi.h
a5bd9f6
@@ -88,12 +88,32 @@ struct grub_acpi_madt
a5bd9f6
 
a5bd9f6
 enum
a5bd9f6
   {
a5bd9f6
+    GRUB_ACPI_MADT_ENTRY_TYPE_LAPIC = 0,
a5bd9f6
+    GRUB_ACPI_MADT_ENTRY_TYPE_IOAPIC = 1,
a5bd9f6
     GRUB_ACPI_MADT_ENTRY_TYPE_INTERRUPT_OVERRIDE = 2,
a5bd9f6
+    GRUB_ACPI_MADT_ENTRY_TYPE_LAPIC_NMI = 4,
a5bd9f6
     GRUB_ACPI_MADT_ENTRY_TYPE_SAPIC = 6,
a5bd9f6
     GRUB_ACPI_MADT_ENTRY_TYPE_LSAPIC = 7,
a5bd9f6
     GRUB_ACPI_MADT_ENTRY_TYPE_PLATFORM_INT_SOURCE = 8
a5bd9f6
   };
a5bd9f6
 
a5bd9f6
+struct grub_acpi_madt_entry_lapic
a5bd9f6
+{
a5bd9f6
+  struct grub_acpi_madt_entry_header hdr;
a5bd9f6
+  grub_uint8_t acpiid;
a5bd9f6
+  grub_uint8_t apicid;
a5bd9f6
+  grub_uint32_t flags;
a5bd9f6
+};
a5bd9f6
+
a5bd9f6
+struct grub_acpi_madt_entry_ioapic
a5bd9f6
+{
a5bd9f6
+  struct grub_acpi_madt_entry_header hdr;
a5bd9f6
+  grub_uint8_t id;
a5bd9f6
+  grub_uint8_t pad;
a5bd9f6
+  grub_uint32_t address;
a5bd9f6
+  grub_uint32_t global_sys_interrupt;
a5bd9f6
+};
a5bd9f6
+
a5bd9f6
 struct grub_acpi_madt_entry_interrupt_override
a5bd9f6
 {
a5bd9f6
   struct grub_acpi_madt_entry_header hdr;
a5bd9f6
@@ -101,7 +121,16 @@ struct grub_acpi_madt_entry_interrupt_override
a5bd9f6
   grub_uint8_t source;
a5bd9f6
   grub_uint32_t global_sys_interrupt;
a5bd9f6
   grub_uint16_t flags;
a5bd9f6
-};
a5bd9f6
+} __attribute__ ((packed));
a5bd9f6
+
a5bd9f6
+
a5bd9f6
+struct grub_acpi_madt_entry_lapic_nmi
a5bd9f6
+{
a5bd9f6
+  struct grub_acpi_madt_entry_header hdr;
a5bd9f6
+  grub_uint8_t acpiid;
a5bd9f6
+  grub_uint16_t flags;
a5bd9f6
+  grub_uint8_t lint;
a5bd9f6
+} __attribute__ ((packed));
a5bd9f6
 
a5bd9f6
 struct grub_acpi_madt_entry_sapic
a5bd9f6
 {
a5bd9f6
-- 
a5bd9f6
1.8.1.4
a5bd9f6