Clean up Acpi definitions according to Code Review results.

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

diff --git a/MdePkg/Include/IndustryStandard/Acpi.h b/MdePkg/Include/IndustryStandard/Acpi.h
index ead115089d7b2e2061b548167025e692bd486303..4ce19e247d68aac28845a5adf65a41597152328d 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi.h
+++ b/MdePkg/Include/IndustryStandard/Acpi.h
@@ -2,7 +2,7 @@
   This file contains the latest ACPI definitions that are\r
   consumed by drivers that do not care about ACPI versions.\r
 \r
-  Copyright (c) 2006, Intel Corporation\r
+  Copyright (c) 2006 - 2008, Intel Corporation\r
   All rights reserved. This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -16,6 +16,6 @@
 #ifndef _ACPI_H_\r
 #define _ACPI_H_\r
 \r
-#include <IndustryStandard/Acpi3_0.h>\r
+#include <IndustryStandard/Acpi30.h>\r
 \r
 #endif\r

diff --git a/MdePkg/Include/IndustryStandard/Acpi1_0.h b/MdePkg/Include/IndustryStandard/Acpi1_0.h
index c107da9bd4103a54778cff5479440d0a32a1b5e5..4fc05e6fce07ff17b79c8764cd72c87aa802986f 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi1_0.h
+++ b/MdePkg/Include/IndustryStandard/Acpi1_0.h
@@ -1,7 +1,7 @@
 /** @file   \r
        ACPI 1.0b definitions from the ACPI Specification, revision 1.0b\r
 \r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
+  Copyright (c) 2006 - 2008, Intel Corporation\r
   All rights reserved. This program and the accompanying materials                          \r
   are licensed and made available under the terms and conditions of the BSD License         \r
   which accompanies this distribution.  The full text of the license may be found at        \r
@@ -42,11 +42,14 @@ typedef struct {
 \r
 #pragma pack()\r
 //\r
-// Define for Pci Host Bridge Resource Allocation\r
+// Define for Desriptor\r
 //\r
 #define ACPI_ADDRESS_SPACE_DESCRIPTOR 0x8A\r
 #define ACPI_END_TAG_DESCRIPTOR       0x79\r
 \r
+//\r
+// Resource Type\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
@@ -56,11 +59,11 @@ typedef struct {
 ///\r
 #define ACPI_TIMER_FREQUENCY       3579545\r
 \r
+\r
 //\r
-// Make sure structures match spec\r
+// The commond definition of QWORD, DWORD, and WORD\r
+// Address Space Descriptors\r
 //\r
-#pragma pack(1)\r
-\r
 typedef struct {\r
   UINT8   Desc;\r
   UINT16  Len;\r
@@ -115,9 +118,6 @@ typedef struct {
 #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
@@ -139,8 +139,8 @@ typedef struct {
 \r
 //\r
 // Root System Description Table\r
-// No definition needed as it is a common description table header followed by a\r
-// variable number of UINT32 table pointers.\r
+// No definition needed as it is a common description table header, the same with \r
+// EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers.\r
 //\r
 \r
 ///\r
@@ -256,7 +256,7 @@ typedef struct {
 \r
 //\r
 // Multiple APIC Description Table APIC structure types\r
-// All other values between 0x09 an 0xFF are reserved and\r
+// All other values between 0x05 an 0xFF are reserved and\r
 // will be ignored by OSPM.\r
 //\r
 #define EFI_ACPI_1_0_PROCESSOR_LOCAL_APIC           0x00\r

diff --git a/MdePkg/Include/IndustryStandard/Acpi2_0.h b/MdePkg/Include/IndustryStandard/Acpi2_0.h
index 8462caab3f99cb984c31d38bfbba4588c7f705de..0ae652f31159c3e1fa092955b4251231b7597e1c 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi2_0.h
+++ b/MdePkg/Include/IndustryStandard/Acpi2_0.h
@@ -1,7 +1,7 @@
 /** @file   \r
        ACPI 2.0 definitions from the ACPI Specification, revision 2.0\r
 \r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
+  Copyright (c) 2006 - 2008, Intel Corporation\r
   All rights reserved. This program and the accompanying materials                          \r
   are licensed and made available under the terms and conditions of the BSD License         \r
   which accompanies this distribution.  The full text of the license may be found at        \r
@@ -20,10 +20,6 @@
 // Ensure proper structure formats\r
 //\r
 #pragma pack(1)\r
-//\r
-// ACPI Specification Revision\r
-//\r
-#define EFI_ACPI_2_0_REVISION 0x02\r
 \r
 ///\r
 /// ACPI 2.0 Generic Address Space definition\r
@@ -81,8 +77,8 @@ typedef struct {
 \r
 //\r
 // Root System Description Table\r
-// No definition needed as it is a common description table header followed by a\r
-// variable number of UINT32 table pointers.\r
+// No definition needed as it is a common description table header, the same with \r
+// EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers.\r
 //\r
 \r
 ///\r
@@ -92,8 +88,8 @@ typedef struct {
 \r
 //\r
 // Extended System Description Table\r
-// No definition needed as it is a common description table header followed by a\r
-// variable number of UINT64 table pointers.\r
+// No definition needed as it is a common description table header, the same with \r
+// EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers.\r
 //\r
 \r
 ///\r

diff --git a/MdePkg/Include/IndustryStandard/Acpi3_0.h b/MdePkg/Include/IndustryStandard/Acpi3_0.h
index cd7d0fbe243d130af860a4d610bc5182fea2433e..83296e23dde41325de04c7a3fbb428433997a09a 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi3_0.h
+++ b/MdePkg/Include/IndustryStandard/Acpi3_0.h
@@ -1,5 +1,5 @@
 /** @file   \r
-    ACPI 3.0 definitions from the ACPI Specification Revision 3.0 September 2, 2004\r
+  ACPI 3.0 definitions from the ACPI Specification Revision 3.0b October 10, 2006\r
 \r
   Copyright (c) 2006 - 2008, Intel Corporation\r
   All rights reserved. This program and the accompanying materials                          \r
@@ -21,11 +21,6 @@
 //\r
 #pragma pack(1)\r
 \r
-///\r
-/// ACPI Specification Revision\r
-///\r
-#define EFI_ACPI_3_0_REVISION 0x03\r
-\r
 ///\r
 /// ACPI 3.0 Generic Address Space definition\r
 ///\r
@@ -76,9 +71,9 @@ typedef struct {
 } EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER;\r
 \r
 ///\r
-/// RSD_PTR Revision (as defined in ACPI 3.0 spec.)\r
+/// RSD_PTR Revision (as defined in ACPI 3.0b spec.)\r
 ///\r
-#define EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION 0x02  // ACPISpec30 (Revision 3.0 September 2, 2004) says current value is 2\r
+#define EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION 0x02  ///< ACPISpec (Revision 3.0b) says current value is 2\r
 \r
 ///\r
 /// Common table header, this prefaces all ACPI tables, including FACS, but\r
@@ -91,8 +86,8 @@ typedef struct {
 \r
 //\r
 // Root System Description Table\r
-// No definition needed as it is a common description table header followed by a\r
-// variable number of UINT32 table pointers.\r
+// No definition needed as it is a common description table header, the same with \r
+// EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers.\r
 //\r
 \r
 ///\r
@@ -102,8 +97,8 @@ typedef struct {
 \r
 //\r
 // Extended System Description Table\r
-// No definition needed as it is a common description table header followed by a\r
-// variable number of UINT64 table pointers.\r
+// No definition needed as it is a common description table header, the same with \r
+// EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers.\r
 //\r
 \r
 ///\r
@@ -251,8 +246,8 @@ typedef struct {
 // Differentiated System Description Table,\r
 // Secondary System Description Table\r
 // and Persistent System Description Table,\r
-// no definition needed as they are common description table header followed by a\r
-// definition block.\r
+// no definition needed as they are common description table header, the same with\r
+// EFI_ACPI_DESCRIPTION_HEADER, followed by a definition block.\r
 //\r
 #define EFI_ACPI_3_0_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_REVISION   0x02\r
 #define EFI_ACPI_3_0_SECONDARY_SYSTEM_DESCRIPTION_TABLE_REVISION        0x02\r