Update the industryStandard in MdePkg:

1) Acpi.h - It should be the ACPI definition supporting the latest ACPI specification.
2) These extended tables of ACPI should include the Acpi.h.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3353 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Include/IndustryStandard/Acpi.h b/MdePkg/Include/IndustryStandard/Acpi.h
index c7105fe1e3529bb237a30ab6b0187d944ad598f0..97ed38b175cbf58dd5027157e4bc3c1543827411 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi.h
+++ b/MdePkg/Include/IndustryStandard/Acpi.h
@@ -16,107 +16,6 @@
 #ifndef _ACPI_H_\r
 #define _ACPI_H_\r
 \r
-//\r
-// Common table header, this prefaces all ACPI tables, including FACS, but\r
-// excluding the RSD PTR structure\r
-//\r
-typedef struct {\r
-  UINT32  Signature;\r
-  UINT32  Length;\r
-} EFI_ACPI_COMMON_HEADER;\r
-\r
-//\r
-// Common ACPI description table header.  This structure prefaces most ACPI tables.\r
-//\r
-#pragma pack(1)\r
-\r
-typedef struct {\r
-  UINT32  Signature;\r
-  UINT32  Length;\r
-  UINT8   Revision;\r
-  UINT8   Checksum;\r
-  UINT8   OemId[6];\r
-  UINT64  OemTableId;\r
-  UINT32  OemRevision;\r
-  UINT32  CreatorId;\r
-  UINT32  CreatorRevision;\r
-} EFI_ACPI_DESCRIPTION_HEADER;\r
-\r
-#pragma pack()\r
-//\r
-// Define for Pci Host Bridge Resource Allocation\r
-//\r
-#define ACPI_ADDRESS_SPACE_DESCRIPTOR 0x8A\r
-#define ACPI_END_TAG_DESCRIPTOR       0x79\r
-\r
-#define ACPI_ADDRESS_SPACE_TYPE_MEM   0x00\r
-#define ACPI_ADDRESS_SPACE_TYPE_IO    0x01\r
-#define ACPI_ADDRESS_SPACE_TYPE_BUS   0x02\r
-\r
-//\r
-// Power Management Timer frequency is fixed at 3.579545MHz\r
-//\r
-#define ACPI_TIMER_FREQUENCY       3579545\r
-\r
-//\r
-// Make sure structures match spec\r
-//\r
-#pragma pack(1)\r
-\r
-typedef struct {\r
-  UINT8   Desc;\r
-  UINT16  Len;\r
-  UINT8   ResType;\r
-  UINT8   GenFlag;\r
-  UINT8   SpecificFlag;\r
-  UINT64  AddrSpaceGranularity;\r
-  UINT64  AddrRangeMin;\r
-  UINT64  AddrRangeMax;\r
-  UINT64  AddrTranslationOffset;\r
-  UINT64  AddrLen;\r
-} EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR;\r
-\r
-typedef struct {\r
-  UINT8 Desc;\r
-  UINT8 Checksum;\r
-} EFI_ACPI_END_TAG_DESCRIPTOR;\r
-\r
-//\r
-// General use definitions\r
-//\r
-#define EFI_ACPI_RESERVED_BYTE  0x00\r
-#define EFI_ACPI_RESERVED_WORD  0x0000\r
-#define EFI_ACPI_RESERVED_DWORD 0x00000000\r
-#define EFI_ACPI_RESERVED_QWORD 0x0000000000000000\r
-\r
-//\r
-// Resource Type Specific Flags\r
-// Ref ACPI specification 6.4.3.5.5\r
-//\r
-// Bit [0]    : Write Status, _RW\r
-//\r
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_READ_WRITE                (1 << 0)\r
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_READ_ONLY                 (0 << 0)\r
-//\r
-// Bit [2:1]  : Memory Attributes, _MEM\r
-//\r
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_NON_CACHEABLE             (0 << 1)\r
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE                 (1 << 1)\r
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_WRITE_COMBINING (2 << 1)\r
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_PREFETCHABLE    (3 << 1)\r
-//\r
-// Bit [4:3]  : Memory Attributes, _MTP\r
-//\r
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_MEMORY      (0 << 3)\r
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_RESERVED    (1 << 3)\r
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_ACPI        (2 << 3)\r
-#define EFI_APCI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_NVS         (3 << 3)\r
-//\r
-// Bit [5]    : Memory to I/O Translation, _TTP\r
-//\r
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_TYPE_TRANSLATION          (1 << 5)\r
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_TYPE_STATIC               (0 << 5)\r
-\r
-#pragma pack()\r
+#include <IndustryStandard/Acpi3_0.h>\r
 \r
 #endif\r

diff --git a/MdePkg/Include/IndustryStandard/Acpi1_0.h b/MdePkg/Include/IndustryStandard/Acpi1_0.h
index 7b5f14b8401e8de3344e4323e36ea73d339f3465..553a0b2b8bd7570eaa0e0c42860403d97489471f 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi1_0.h
+++ b/MdePkg/Include/IndustryStandard/Acpi1_0.h
@@ -15,7 +15,110 @@
 #ifndef _ACPI_1_0_H_\r
 #define _ACPI_1_0_H_\r
 \r
-#include "Acpi.h"\r
+//\r
+// Common table header, this prefaces all ACPI tables, including FACS, but\r
+// excluding the RSD PTR structure\r
+//\r
+typedef struct {\r
+  UINT32  Signature;\r
+  UINT32  Length;\r
+} EFI_ACPI_COMMON_HEADER;\r
+\r
+//\r
+// Common ACPI description table header.  This structure prefaces most ACPI tables.\r
+//\r
+#pragma pack(1)\r
+\r
+typedef struct {\r
+  UINT32  Signature;\r
+  UINT32  Length;\r
+  UINT8   Revision;\r
+  UINT8   Checksum;\r
+  UINT8   OemId[6];\r
+  UINT64  OemTableId;\r
+  UINT32  OemRevision;\r
+  UINT32  CreatorId;\r
+  UINT32  CreatorRevision;\r
+} EFI_ACPI_DESCRIPTION_HEADER;\r
+\r
+#pragma pack()\r
+//\r
+// Define for Pci Host Bridge Resource Allocation\r
+//\r
+#define ACPI_ADDRESS_SPACE_DESCRIPTOR 0x8A\r
+#define ACPI_END_TAG_DESCRIPTOR       0x79\r
+\r
+#define ACPI_ADDRESS_SPACE_TYPE_MEM   0x00\r
+#define ACPI_ADDRESS_SPACE_TYPE_IO    0x01\r
+#define ACPI_ADDRESS_SPACE_TYPE_BUS   0x02\r
+\r
+//\r
+// Power Management Timer frequency is fixed at 3.579545MHz\r
+//\r
+#define ACPI_TIMER_FREQUENCY       3579545\r
+\r
+//\r
+// Make sure structures match spec\r
+//\r
+#pragma pack(1)\r
+\r
+typedef struct {\r
+  UINT8   Desc;\r
+  UINT16  Len;\r
+  UINT8   ResType;\r
+  UINT8   GenFlag;\r
+  UINT8   SpecificFlag;\r
+  UINT64  AddrSpaceGranularity;\r
+  UINT64  AddrRangeMin;\r
+  UINT64  AddrRangeMax;\r
+  UINT64  AddrTranslationOffset;\r
+  UINT64  AddrLen;\r
+} EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR;\r
+\r
+typedef struct {\r
+  UINT8 Desc;\r
+  UINT8 Checksum;\r
+} EFI_ACPI_END_TAG_DESCRIPTOR;\r
+\r
+//\r
+// General use definitions\r
+//\r
+#define EFI_ACPI_RESERVED_BYTE  0x00\r
+#define EFI_ACPI_RESERVED_WORD  0x0000\r
+#define EFI_ACPI_RESERVED_DWORD 0x00000000\r
+#define EFI_ACPI_RESERVED_QWORD 0x0000000000000000\r
+\r
+//\r
+// Resource Type Specific Flags\r
+// Ref ACPI specification 6.4.3.5.5\r
+//\r
+// Bit [0]    : Write Status, _RW\r
+//\r
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_READ_WRITE                (1 << 0)\r
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_READ_ONLY                 (0 << 0)\r
+//\r
+// Bit [2:1]  : Memory Attributes, _MEM\r
+//\r
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_NON_CACHEABLE             (0 << 1)\r
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE                 (1 << 1)\r
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_WRITE_COMBINING (2 << 1)\r
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_PREFETCHABLE    (3 << 1)\r
+//\r
+// Bit [4:3]  : Memory Attributes, _MTP\r
+//\r
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_MEMORY      (0 << 3)\r
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_RESERVED    (1 << 3)\r
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_ACPI        (2 << 3)\r
+#define EFI_APCI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_NVS         (3 << 3)\r
+//\r
+// Bit [5]    : Memory to I/O Translation, _TTP\r
+//\r
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_TYPE_TRANSLATION          (1 << 5)\r
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_TYPE_STATIC               (0 << 5)\r
+\r
+#pragma pack()\r
+\r
+\r
 //\r
 // Ensure proper structure formats\r
 //\r

diff --git a/MdePkg/Include/IndustryStandard/Acpi2_0.h b/MdePkg/Include/IndustryStandard/Acpi2_0.h
index a4e52265a751b5eef78b9f03430b08561bd90ec8..946ed596d36d60846fdcc012bf95583ac2636281 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi2_0.h
+++ b/MdePkg/Include/IndustryStandard/Acpi2_0.h
@@ -15,7 +15,7 @@
 #ifndef _ACPI_2_0_H_\r
 #define _ACPI_2_0_H_\r
 \r
-#include "Acpi.h"\r
+#include <IndustryStandard/Acpi1_0.h>\r
 \r
 //\r
 // Ensure proper structure formats\r

diff --git a/MdePkg/Include/IndustryStandard/Acpi3_0.h b/MdePkg/Include/IndustryStandard/Acpi3_0.h
index 2f18641baa0bf369753c788ba7b9eb2720887030..0c7d3ddcead4561fb99c2d59c0299f8b2cc6ac75 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi3_0.h
+++ b/MdePkg/Include/IndustryStandard/Acpi3_0.h
@@ -15,7 +15,7 @@
 #ifndef _ACPI_3_0_H_\r
 #define _ACPI_3_0_H_\r
 \r
-#include "Acpi.h"\r
+#include <IndustryStandard/Acpi2_0.h>\r
 \r
 //\r
 // Ensure proper structure formats\r

diff --git a/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h b/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h
index 3500803d416c9a4d8dde7b6bf8f16232c08daf25..90cc10ca148fa61af2e492bb2f09f8b8e33e37d6 100644 (file)
--- a/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h
+++ b/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h
@@ -15,7 +15,7 @@
 #ifndef _ALERT_STANDARD_FORMAT_TABLE_H\r
 #define _ALERT_STANDARD_FORMAT_TABLE_H\r
 \r
-#include "Acpi2_0.h"\r
+#include <IndustryStandard/Acpi.h>\r
 \r
 //\r
 // Ensure proper structure formats\r

diff --git a/MdePkg/Include/IndustryStandard/HighPrecisionEventTimerTable.h b/MdePkg/Include/IndustryStandard/HighPrecisionEventTimerTable.h
index 95648396bac84c59db6d905f4e55f6f11f4e7424..af961c49a97315c5280806954b98151694c42aef 100644 (file)
--- a/MdePkg/Include/IndustryStandard/HighPrecisionEventTimerTable.h
+++ b/MdePkg/Include/IndustryStandard/HighPrecisionEventTimerTable.h
@@ -16,6 +16,8 @@
 #ifndef _HIGH_PRECISION_EVENT_TIMER_TABLE_H_\r
 #define _HIGH_PRECISION_EVENT_TIMER_TABLE_H_\r
 \r
+#include <IndustryStandard/Acpi.h>\r
+\r
 //\r
 // Ensure proper structure formats\r
 //\r

diff --git a/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h b/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
index 9162169f0c2c597974dbe24da4fe9f7c05bd56a6..6582a859b45fc69449ee6b2610c5ee1a87329114 100644 (file)
--- a/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
+++ b/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
@@ -15,10 +15,8 @@
 #ifndef _SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_H_\r
 #define _SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_H_\r
 \r
-//\r
-// Include files\r
-//\r
-#include "Acpi2_0.h"\r
+\r
+#include <IndustryStandard/Acpi.h>\r
 \r
 //\r
 // Ensure proper structure formats\r

diff --git a/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h b/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h
index 7570cf4a69e881bbf6f99805d078f82c91bccb35..8c83c9a1b82f64385ed75cc7f82acc5d428ccc6b 100644 (file)
--- a/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h
+++ b/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h
@@ -16,10 +16,7 @@
 #ifndef _WATCHDOG_RESOURCE_TABLE_H_\r
 #define _WATCHDOG_RESOURCE_TABLE_H_\r
 \r
-//\r
-// Include files\r
-//\r
-#include "Acpi2_0.h"\r
+#include <IndustryStandard/Acpi.h>\r
 \r
 //\r
 // Ensure proper structure formats\r