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

8 files changed, 113 insertions, 114 deletions

diff --git a/MdePkg/Include/IndustryStandard/Acpi.h b/MdePkg/Include/IndustryStandard/Acpi.h
index c7105fe..97ed38b 100644
--- a/MdePkg/Include/IndustryStandard/Acpi.h
+++ b/MdePkg/Include/IndustryStandard/Acpi.h
@@ -16,107 +16,6 @@
 #ifndef _ACPI_H_

 #define _ACPI_H_

 

-//

-// Common table header, this prefaces all ACPI tables, including FACS, but

-// excluding the RSD PTR structure

-//

-typedef struct {

-  UINT32  Signature;

-  UINT32  Length;

-} EFI_ACPI_COMMON_HEADER;

-

-//

-// Common ACPI description table header.  This structure prefaces most ACPI tables.

-//

-#pragma pack(1)

-

-typedef struct {

-  UINT32  Signature;

-  UINT32  Length;

-  UINT8   Revision;

-  UINT8   Checksum;

-  UINT8   OemId[6];

-  UINT64  OemTableId;

-  UINT32  OemRevision;

-  UINT32  CreatorId;

-  UINT32  CreatorRevision;

-} EFI_ACPI_DESCRIPTION_HEADER;

-

-#pragma pack()

-//

-// Define for Pci Host Bridge Resource Allocation

-//

-#define ACPI_ADDRESS_SPACE_DESCRIPTOR 0x8A

-#define ACPI_END_TAG_DESCRIPTOR       0x79

-

-#define ACPI_ADDRESS_SPACE_TYPE_MEM   0x00

-#define ACPI_ADDRESS_SPACE_TYPE_IO    0x01

-#define ACPI_ADDRESS_SPACE_TYPE_BUS   0x02

-

-//

-// Power Management Timer frequency is fixed at 3.579545MHz

-//

-#define ACPI_TIMER_FREQUENCY       3579545

-

-//

-// Make sure structures match spec

-//

-#pragma pack(1)

-

-typedef struct {

-  UINT8   Desc;

-  UINT16  Len;

-  UINT8   ResType;

-  UINT8   GenFlag;

-  UINT8   SpecificFlag;

-  UINT64  AddrSpaceGranularity;

-  UINT64  AddrRangeMin;

-  UINT64  AddrRangeMax;

-  UINT64  AddrTranslationOffset;

-  UINT64  AddrLen;

-} EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR;

-

-typedef struct {

-  UINT8 Desc;

-  UINT8 Checksum;

-} EFI_ACPI_END_TAG_DESCRIPTOR;

-

-//

-// General use definitions

-//

-#define EFI_ACPI_RESERVED_BYTE  0x00

-#define EFI_ACPI_RESERVED_WORD  0x0000

-#define EFI_ACPI_RESERVED_DWORD 0x00000000

-#define EFI_ACPI_RESERVED_QWORD 0x0000000000000000

-

-//

-// Resource Type Specific Flags

-// Ref ACPI specification 6.4.3.5.5

-//

-// Bit [0]    : Write Status, _RW

-//

-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_READ_WRITE                (1 << 0)

-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_READ_ONLY                 (0 << 0)

-//

-// Bit [2:1]  : Memory Attributes, _MEM

-//

-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_NON_CACHEABLE             (0 << 1)

-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE                 (1 << 1)

-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_WRITE_COMBINING (2 << 1)

-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_PREFETCHABLE    (3 << 1)

-//

-// Bit [4:3]  : Memory Attributes, _MTP

-//

-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_MEMORY      (0 << 3)

-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_RESERVED    (1 << 3)

-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_ACPI        (2 << 3)

-#define EFI_APCI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_NVS         (3 << 3)

-//

-// Bit [5]    : Memory to I/O Translation, _TTP

-//

-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_TYPE_TRANSLATION          (1 << 5)

-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_TYPE_STATIC               (0 << 5)

-

-#pragma pack()

+#include <IndustryStandard/Acpi3_0.h>

 

 #endif

diff --git a/MdePkg/Include/IndustryStandard/Acpi1_0.h b/MdePkg/Include/IndustryStandard/Acpi1_0.h
index 7b5f14b..553a0b2 100644
--- a/MdePkg/Include/IndustryStandard/Acpi1_0.h
+++ b/MdePkg/Include/IndustryStandard/Acpi1_0.h
@@ -15,7 +15,110 @@
 #ifndef _ACPI_1_0_H_

 #define _ACPI_1_0_H_

 

-#include "Acpi.h"

+//

+// Common table header, this prefaces all ACPI tables, including FACS, but

+// excluding the RSD PTR structure

+//

+typedef struct {

+  UINT32  Signature;

+  UINT32  Length;

+} EFI_ACPI_COMMON_HEADER;

+

+//

+// Common ACPI description table header.  This structure prefaces most ACPI tables.

+//

+#pragma pack(1)

+

+typedef struct {

+  UINT32  Signature;

+  UINT32  Length;

+  UINT8   Revision;

+  UINT8   Checksum;

+  UINT8   OemId[6];

+  UINT64  OemTableId;

+  UINT32  OemRevision;

+  UINT32  CreatorId;

+  UINT32  CreatorRevision;

+} EFI_ACPI_DESCRIPTION_HEADER;

+

+#pragma pack()

+//

+// Define for Pci Host Bridge Resource Allocation

+//

+#define ACPI_ADDRESS_SPACE_DESCRIPTOR 0x8A

+#define ACPI_END_TAG_DESCRIPTOR       0x79

+

+#define ACPI_ADDRESS_SPACE_TYPE_MEM   0x00

+#define ACPI_ADDRESS_SPACE_TYPE_IO    0x01

+#define ACPI_ADDRESS_SPACE_TYPE_BUS   0x02

+

+//

+// Power Management Timer frequency is fixed at 3.579545MHz

+//

+#define ACPI_TIMER_FREQUENCY       3579545

+

+//

+// Make sure structures match spec

+//

+#pragma pack(1)

+

+typedef struct {

+  UINT8   Desc;

+  UINT16  Len;

+  UINT8   ResType;

+  UINT8   GenFlag;

+  UINT8   SpecificFlag;

+  UINT64  AddrSpaceGranularity;

+  UINT64  AddrRangeMin;

+  UINT64  AddrRangeMax;

+  UINT64  AddrTranslationOffset;

+  UINT64  AddrLen;

+} EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR;

+

+typedef struct {

+  UINT8 Desc;

+  UINT8 Checksum;

+} EFI_ACPI_END_TAG_DESCRIPTOR;

+

+//

+// General use definitions

+//

+#define EFI_ACPI_RESERVED_BYTE  0x00

+#define EFI_ACPI_RESERVED_WORD  0x0000

+#define EFI_ACPI_RESERVED_DWORD 0x00000000

+#define EFI_ACPI_RESERVED_QWORD 0x0000000000000000

+

+//

+// Resource Type Specific Flags

+// Ref ACPI specification 6.4.3.5.5

+//

+// Bit [0]    : Write Status, _RW

+//

+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_READ_WRITE                (1 << 0)

+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_READ_ONLY                 (0 << 0)

+//

+// Bit [2:1]  : Memory Attributes, _MEM

+//

+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_NON_CACHEABLE             (0 << 1)

+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE                 (1 << 1)

+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_WRITE_COMBINING (2 << 1)

+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_PREFETCHABLE    (3 << 1)

+//

+// Bit [4:3]  : Memory Attributes, _MTP

+//

+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_MEMORY      (0 << 3)

+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_RESERVED    (1 << 3)

+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_ACPI        (2 << 3)

+#define EFI_APCI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_NVS         (3 << 3)

+//

+// Bit [5]    : Memory to I/O Translation, _TTP

+//

+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_TYPE_TRANSLATION          (1 << 5)

+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_TYPE_STATIC               (0 << 5)

+

+#pragma pack()

+

+

 //

 // Ensure proper structure formats

 //

diff --git a/MdePkg/Include/IndustryStandard/Acpi2_0.h b/MdePkg/Include/IndustryStandard/Acpi2_0.h
index a4e5226..946ed59 100644
--- a/MdePkg/Include/IndustryStandard/Acpi2_0.h
+++ b/MdePkg/Include/IndustryStandard/Acpi2_0.h
@@ -15,7 +15,7 @@
 #ifndef _ACPI_2_0_H_

 #define _ACPI_2_0_H_

 

-#include "Acpi.h"

+#include <IndustryStandard/Acpi1_0.h>

 

 //

 // Ensure proper structure formats

diff --git a/MdePkg/Include/IndustryStandard/Acpi3_0.h b/MdePkg/Include/IndustryStandard/Acpi3_0.h
index 2f18641..0c7d3dd 100644
--- a/MdePkg/Include/IndustryStandard/Acpi3_0.h
+++ b/MdePkg/Include/IndustryStandard/Acpi3_0.h
@@ -15,7 +15,7 @@
 #ifndef _ACPI_3_0_H_

 #define _ACPI_3_0_H_

 

-#include "Acpi.h"

+#include <IndustryStandard/Acpi2_0.h>

 

 //

 // Ensure proper structure formats

diff --git a/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h b/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h
index 3500803..90cc10c 100644
--- a/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h
+++ b/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h
@@ -15,7 +15,7 @@
 #ifndef _ALERT_STANDARD_FORMAT_TABLE_H

 #define _ALERT_STANDARD_FORMAT_TABLE_H

 

-#include "Acpi2_0.h"

+#include <IndustryStandard/Acpi.h>

 

 //

 // Ensure proper structure formats

diff --git a/MdePkg/Include/IndustryStandard/HighPrecisionEventTimerTable.h b/MdePkg/Include/IndustryStandard/HighPrecisionEventTimerTable.h
index 9564839..af961c4 100644
--- a/MdePkg/Include/IndustryStandard/HighPrecisionEventTimerTable.h
+++ b/MdePkg/Include/IndustryStandard/HighPrecisionEventTimerTable.h
@@ -16,6 +16,8 @@
 #ifndef _HIGH_PRECISION_EVENT_TIMER_TABLE_H_

 #define _HIGH_PRECISION_EVENT_TIMER_TABLE_H_

 

+#include <IndustryStandard/Acpi.h>

+

 //

 // Ensure proper structure formats

 //

diff --git a/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h b/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
index 9162169..6582a85 100644
--- a/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
+++ b/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
@@ -15,10 +15,8 @@
 #ifndef _SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_H_

 #define _SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_H_

 

-//

-// Include files

-//

-#include "Acpi2_0.h"

+

+#include <IndustryStandard/Acpi.h>

 

 //

 // Ensure proper structure formats

diff --git a/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h b/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h
index 7570cf4..8c83c9a 100644
--- a/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h
+++ b/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h
@@ -16,10 +16,7 @@
 #ifndef _WATCHDOG_RESOURCE_TABLE_H_

 #define _WATCHDOG_RESOURCE_TABLE_H_

 

-//

-// Include files

-//

-#include "Acpi2_0.h"

+#include <IndustryStandard/Acpi.h>

 

 //

 // Ensure proper structure formats