Update the ACPI device information for ARM Juno.

[mirror_edk2.git] / ArmPlatformPkg / ArmJunoPkg / AcpiTables / Madt.aslc

diff --git a/ArmPlatformPkg/ArmJunoPkg/AcpiTables/Madt.aslc b/ArmPlatformPkg/ArmJunoPkg/AcpiTables/Madt.aslc
index f8f50800c0bc150cc876540607da842c976045fe..d63a19b3904a62a2e460b18944d7c2f637a2f59b 100644 (file)
--- a/ArmPlatformPkg/ArmJunoPkg/AcpiTables/Madt.aslc
+++ b/ArmPlatformPkg/ArmJunoPkg/AcpiTables/Madt.aslc
@@ -26,19 +26,19 @@
   #pragma pack (1)\r
 \r
   typedef struct {\r
-    EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER   Header;\r
+    EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER   Header;\r
     EFI_ACPI_5_0_GIC_STRUCTURE                            GicInterfaces[FixedPcdGet32 (PcdCoreCount)];\r
     EFI_ACPI_5_0_GIC_DISTRIBUTOR_STRUCTURE                GicDistributor;\r
-  } EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE;\r
+  } EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE;\r
 \r
   #pragma pack ()\r
 \r
-  EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {\r
+  EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {\r
     {\r
       ARM_ACPI_HEADER (\r
-        EFI_ACPI_1_0_APIC_SIGNATURE,\r
-        EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE,\r
-        EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION\r
+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE,\r
+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE,\r
+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION\r
       ),\r
       //\r
       // MADT specific fields\r
@@ -68,20 +68,20 @@
   #pragma pack (1)\r
 \r
   typedef struct {\r
-    EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER   Header;\r
+    EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER   Header;\r
     EFI_ACPI_5_1_GIC_STRUCTURE                            GicInterfaces[FixedPcdGet32 (PcdCoreCount)];\r
     EFI_ACPI_5_0_GIC_DISTRIBUTOR_STRUCTURE                GicDistributor;\r
     EFI_ACPI_6_0_GIC_MSI_FRAME_STRUCTURE                  MsiFrame;\r
-  } EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE;\r
+  } EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE;\r
 \r
   #pragma pack ()\r
 \r
-  EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {\r
+  EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {\r
     {\r
       ARM_ACPI_HEADER (\r
-        EFI_ACPI_1_0_APIC_SIGNATURE,\r
-        EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE,\r
-        EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION\r
+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE,\r
+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE,\r
+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION\r
       ),\r
       //\r
       // MADT specific fields\r
@@ -123,14 +123,8 @@
   };\r
 #endif\r
 \r
-VOID*\r
-ReferenceAcpiTable (\r
-  VOID\r
-  )\r
-{\r
-  //\r
-  // Reference the table being generated to prevent the optimizer from removing the\r
-  // data structure from the executable\r
-  //\r
-  return (VOID*)&Madt;\r
-}\r
+//\r
+// Reference the table being generated to prevent the optimizer from removing the\r
+// data structure from the executable\r
+//\r
+VOID* CONST ReferenceAcpiTable = &Madt;\r