BaseTools: refactor and remove out of date use of .keys()

[mirror_edk2.git] / MdePkg / Include / Uefi / UefiMultiPhase.h

diff --git a/MdePkg/Include/Uefi/UefiMultiPhase.h b/MdePkg/Include/Uefi/UefiMultiPhase.h
index a7a7dcf88c1de860363502be205a86302fd59b7e..67ecc4c27cc51b2797530f79dce822ecf51b6068 100644 (file)
--- a/MdePkg/Include/Uefi/UefiMultiPhase.h
+++ b/MdePkg/Include/Uefi/UefiMultiPhase.h
@@ -1,7 +1,7 @@
 /** @file\r
   This includes some definitions introduced in UEFI that will be used in both PEI and DXE phases.\r
 \r
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials are licensed and made available under\r
 the terms and conditions of the BSD License that accompanies this distribution.\r
 The full text of the license may be found at\r
@@ -15,6 +15,28 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef __UEFI_MULTIPHASE_H__\r
 #define __UEFI_MULTIPHASE_H__\r
 \r
+///\r
+/// Attributes of variable.\r
+///\r
+#define EFI_VARIABLE_NON_VOLATILE                            0x00000001\r
+#define EFI_VARIABLE_BOOTSERVICE_ACCESS                      0x00000002\r
+#define EFI_VARIABLE_RUNTIME_ACCESS                          0x00000004\r
+///\r
+/// This attribute is identified by the mnemonic 'HR'\r
+/// elsewhere in this specification.\r
+///\r
+#define EFI_VARIABLE_HARDWARE_ERROR_RECORD                   0x00000008\r
+///\r
+/// Attributes of Authenticated Variable\r
+///\r
+#define EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS   0x00000020\r
+#define EFI_VARIABLE_APPEND_WRITE                            0x00000040\r
+///\r
+/// NOTE: EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS is deprecated and should be considered reserved.\r
+///\r
+#define EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS              0x00000010\r
+\r
+#ifndef VFRCOMPILE\r
 #include <Guid/WinCertificate.h>\r
 ///\r
 /// Enumeration of memory types introduced in UEFI.\r
@@ -82,9 +104,47 @@ typedef enum {
   /// Address space reserved by the firmware for code that is part of the processor.\r
   ///\r
   EfiPalCode,\r
+  ///\r
+  /// A memory region that operates as EfiConventionalMemory, \r
+  /// however it happens to also support byte-addressable non-volatility.\r
+  ///\r
+  EfiPersistentMemory,\r
   EfiMaxMemoryType\r
 } EFI_MEMORY_TYPE;\r
 \r
+///\r
+/// Enumeration of reset types.\r
+///\r
+typedef enum {\r
+  ///\r
+  /// Used to induce a system-wide reset. This sets all circuitry within the\r
+  /// system to its initial state.  This type of reset is asynchronous to system\r
+  /// operation and operates withgout regard to cycle boundaries.  EfiColdReset\r
+  /// is tantamount to a system power cycle.\r
+  ///\r
+  EfiResetCold,\r
+  ///\r
+  /// Used to induce a system-wide initialization. The processors are set to their\r
+  /// initial state, and pending cycles are not corrupted.  If the system does\r
+  /// not support this reset type, then an EfiResetCold must be performed.\r
+  ///\r
+  EfiResetWarm,\r
+  ///\r
+  /// Used to induce an entry into a power state equivalent to the ACPI G2/S5 or G3\r
+  /// state.  If the system does not support this reset type, then when the system\r
+  /// is rebooted, it should exhibit the EfiResetCold attributes.\r
+  ///\r
+  EfiResetShutdown,\r
+  ///\r
+  /// Used to induce a system-wide reset. The exact type of the reset is defined by\r
+  /// the EFI_GUID that follows the Null-terminated Unicode string passed into\r
+  /// ResetData. If the platform does not recognize the EFI_GUID in ResetData the\r
+  /// platform must pick a supported reset type to perform. The platform may\r
+  /// optionally log the parameters from any non-normal reset that occurs.\r
+  ///\r
+  EfiResetPlatformSpecific\r
+} EFI_RESET_TYPE;\r
+\r
 ///\r
 /// Data structure that precedes all of the standard EFI table types.\r
 ///\r
@@ -117,25 +177,6 @@ typedef struct {
   UINT32  Reserved;\r
 } EFI_TABLE_HEADER;\r
 \r
-///\r
-/// Attributes of variable.\r
-///\r
-#define EFI_VARIABLE_NON_VOLATILE                            0x00000001\r
-#define EFI_VARIABLE_BOOTSERVICE_ACCESS                      0x00000002\r
-#define EFI_VARIABLE_RUNTIME_ACCESS                          0x00000004\r
-///\r
-/// This attribute is identified by the mnemonic 'HR'\r
-/// elsewhere in this specification.\r
-///\r
-#define EFI_VARIABLE_HARDWARE_ERROR_RECORD                   0x00000008\r
-///\r
-/// Attributes of Authenticated Variable\r
-///\r
-#define EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS              0x00000010\r
-#define EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS   0x00000020\r
-#define EFI_VARIABLE_APPEND_WRITE                            0x00000040\r
-\r
-\r
 ///\r
 /// AuthInfo is a WIN_CERTIFICATE using the wCertificateType\r
 /// WIN_CERTIFICATE_UEFI_GUID and the CertType\r
@@ -189,5 +230,6 @@ typedef struct {
   ///\r
   WIN_CERTIFICATE_UEFI_GUID   AuthInfo;\r
  } EFI_VARIABLE_AUTHENTICATION_2;\r
+#endif // VFRCOMPILE\r
 \r
 #endif\r