MdeModulePkg AcpiTableDxe: Don't uninstall Acpi Sdt Protocol at ReadyToLock

[mirror_edk2.git] / MdeModulePkg / Universal / Acpi / AcpiTableDxe / AcpiTable.h

diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h
index d9e6428cba6b358eac9a6ff32ed59c44cd5f0562..d6d81ae04d4fd95e1859788a9659b367ce8144ab 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h
@@ -1,7 +1,7 @@
 /** @file\r
   ACPI Table Protocol Driver\r
 \r
-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
   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
@@ -21,7 +21,6 @@
 #include <Protocol/AcpiTable.h>\r
 #include <Guid/Acpi.h>\r
 #include <Protocol/AcpiSystemDescriptionTable.h>\r
-#include <Protocol/DxeSmmReadyToLock.h>\r
 \r
 #include <Library/BaseLib.h>\r
 #include <Library/DebugLib.h>\r
@@ -40,32 +39,12 @@
 #include "AcpiSdt.h"\r
 \r
 //\r
-// From Protocol/AcpiSupport.h\r
+// Great than or equal to 2.0.\r
 //\r
-\r
-//\r
-// ACPI Version bitmap definition:\r
-//\r
-// EFI_ACPI_TABLE_VERSION_1_0B - ACPI Version 1.0b\r
-// EFI_ACPI_TABLE_VERSION_2_0 - ACPI Version 2.0\r
-// EFI_ACPI_TABLE_VERSION_3_0 - ACPI Version 3.0\r
-// EFI_ACPI_TABLE_VERSION_NONE - No ACPI Versions.  This might be used\r
-//  to create memory-based operation regions or other information\r
-//  that is not part of the ACPI "tree" but must still be found\r
-//  in ACPI memory space and/or managed by the core ACPI driver.\r
-//\r
-// Note that EFI provides discrete GUIDs for each version of ACPI\r
-// that is supported.  It is expected that each EFI GUIDed\r
-// version of ACPI will also have a corresponding bitmap\r
-// definition.  This allows maintenance of separate ACPI trees\r
-// for each distinctly different version of ACPI.\r
-//\r
-#define EFI_ACPI_TABLE_VERSION      UINT32\r
-\r
-#define EFI_ACPI_TABLE_VERSION_NONE (1 << 0)\r
-#define EFI_ACPI_TABLE_VERSION_1_0B (1 << 1)\r
-#define EFI_ACPI_TABLE_VERSION_2_0  (1 << 2)\r
-#define EFI_ACPI_TABLE_VERSION_3_0  (1 << 3)\r
+#define ACPI_TABLE_VERSION_GTE_2_0 (EFI_ACPI_TABLE_VERSION_2_0  | \\r
+                                    EFI_ACPI_TABLE_VERSION_3_0  | \\r
+                                    EFI_ACPI_TABLE_VERSION_4_0  | \\r
+                                    EFI_ACPI_TABLE_VERSION_5_0)\r
 \r
 //\r
 // Private Driver Data\r
@@ -106,15 +85,6 @@ typedef struct {
 //\r
 #define EFI_ACPI_MAX_NUM_TABLES 20\r
 \r
-//\r
-// ACPI table information used to initialize tables.\r
-//\r
-#define EFI_ACPI_OEM_ID           "INTEL "\r
-#define EFI_ACPI_OEM_TABLE_ID     SIGNATURE_64('E', 'D', 'K', '2', ' ', ' ', ' ', ' ')\r
-#define EFI_ACPI_OEM_REVISION     0x00000002\r
-#define EFI_ACPI_CREATOR_ID       0x20202020\r
-#define EFI_ACPI_CREATOR_REVISION 0x01000013\r
-\r
 //\r
 // Protocol private structure definition\r
 //\r
@@ -143,8 +113,6 @@ typedef struct {
   UINTN                                         NumberOfTableEntries1;  // Number of ACPI 1.0 tables\r
   UINTN                                         NumberOfTableEntries3;  // Number of ACPI 3.0 tables\r
   UINTN                                         CurrentHandle;\r
-  BOOLEAN                                       TablesInstalled1;       // ACPI 1.0 tables published\r
-  BOOLEAN                                       TablesInstalled3;       // ACPI 3.0 tables published\r
   EFI_ACPI_TABLE_PROTOCOL                       AcpiTableProtocol;\r
   EFI_ACPI_SDT_PROTOCOL                         AcpiSdtProtocol;\r
   LIST_ENTRY                                    NotifyList;\r