MdePkg: Clean up source files

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

diff --git a/MdePkg/Include/Uefi/UefiMultiPhase.h b/MdePkg/Include/Uefi/UefiMultiPhase.h
index 9f1ef3ecb066311770fac271965540c3966c0677..037b65391873a7aae35f57b41f8ba1462ebb13ee 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 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, 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
@@ -83,7 +105,7 @@ typedef enum {
   ///\r
   EfiPalCode,\r
   ///\r
-  /// A memory region that operates as EfiConventionalMemory, \r
+  /// A memory region that operates as EfiConventionalMemory,\r
   /// however it happens to also support byte-addressable non-volatility.\r
   ///\r
   EfiPersistentMemory,\r
@@ -155,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
@@ -227,5 +230,6 @@ typedef struct {
   ///\r
   WIN_CERTIFICATE_UEFI_GUID   AuthInfo;\r
  } EFI_VARIABLE_AUTHENTICATION_2;\r
+#endif // VFRCOMPILE\r
 \r
 #endif\r