MdePkg: Apply uncrustify changes

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

diff --git a/MdePkg/Include/Uefi/UefiMultiPhase.h b/MdePkg/Include/Uefi/UefiMultiPhase.h
index 0dcbb1b9eea7ad4c589959819978f89068bc26ad..22bae43e36e89f31305f0a6d5949596b699f9e8c 100644 (file)
--- a/MdePkg/Include/Uefi/UefiMultiPhase.h
+++ b/MdePkg/Include/Uefi/UefiMultiPhase.h
@@ -1,21 +1,37 @@
 /** @file\r
   This includes some definitions introduced in UEFI that will be used in both PEI and DXE phases.\r
 \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
-http://opensource.org/licenses/bsd-license.php.\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
 #ifndef __UEFI_MULTIPHASE_H__\r
 #define __UEFI_MULTIPHASE_H__\r
 \r
-#include <Guid/WinCertificate.h>\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
 ///\r
@@ -83,7 +99,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
@@ -132,50 +148,29 @@ typedef struct {
   /// Unique signatures have been generated for the EFI System Table,\r
   /// the EFI Boot Services Table, and the EFI Runtime Services Table.\r
   ///\r
-  UINT64  Signature;\r
+  UINT64    Signature;\r
   ///\r
   /// The revision of the EFI Specification to which this table\r
   /// conforms. The upper 16 bits of this field contain the major\r
   /// revision value, and the lower 16 bits contain the minor revision\r
   /// value. The minor revision values are limited to the range of 00..99.\r
   ///\r
-  UINT32  Revision;\r
+  UINT32    Revision;\r
   ///\r
   /// The size, in bytes, of the entire table including the EFI_TABLE_HEADER.\r
   ///\r
-  UINT32  HeaderSize;\r
+  UINT32    HeaderSize;\r
   ///\r
   /// The 32-bit CRC for the entire table. This value is computed by\r
   /// setting this field to 0, and computing the 32-bit CRC for HeaderSize bytes.\r
   ///\r
-  UINT32  CRC32;\r
+  UINT32    CRC32;\r
   ///\r
   /// Reserved field that must be set to 0.\r
   ///\r
-  UINT32  Reserved;\r
+  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_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
 ///\r
 /// AuthInfo is a WIN_CERTIFICATE using the wCertificateType\r
 /// WIN_CERTIFICATE_UEFI_GUID and the CertType\r
@@ -198,7 +193,7 @@ typedef struct {
   /// replay. Incremented during each\r
   /// "Write" access.\r
   ///\r
-  UINT64                      MonotonicCount;\r
+  UINT64    MonotonicCount;\r
   ///\r
   /// Provides the authorization for the variable\r
   /// access. It is a signature across the\r
@@ -207,7 +202,7 @@ typedef struct {
   /// associated with a public key that has been\r
   /// provisioned via the key exchange.\r
   ///\r
-  WIN_CERTIFICATE_UEFI_GUID   AuthInfo;\r
+  WIN_CERTIFICATE_UEFI_GUID    AuthInfo;\r
 } EFI_VARIABLE_AUTHENTICATION;\r
 \r
 ///\r
@@ -223,11 +218,12 @@ typedef struct {
   /// For the TimeStamp value, components Pad1, Nanosecond, TimeZone, Daylight and\r
   /// Pad2 shall be set to 0. This means that the time shall always be expressed in GMT.\r
   ///\r
-  EFI_TIME                    TimeStamp;\r
+  EFI_TIME                     TimeStamp;\r
   ///\r
   /// Only a CertType of  EFI_CERT_TYPE_PKCS7_GUID is accepted.\r
   ///\r
-  WIN_CERTIFICATE_UEFI_GUID   AuthInfo;\r
- } EFI_VARIABLE_AUTHENTICATION_2;\r
+  WIN_CERTIFICATE_UEFI_GUID    AuthInfo;\r
+} EFI_VARIABLE_AUTHENTICATION_2;\r
+#endif // VFRCOMPILE\r
 \r
 #endif\r