MdePkg: Clean up source files

1. Do not use tab characters
2. No trailing white space in one line
3. All files must end with CRLF

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>

7 files changed, 178 insertions, 178 deletions

diff --git a/MdePkg/Include/Uefi/UefiAcpiDataTable.h b/MdePkg/Include/Uefi/UefiAcpiDataTable.h
index ae4942b..b02e811 100644
--- a/MdePkg/Include/Uefi/UefiAcpiDataTable.h
+++ b/MdePkg/Include/Uefi/UefiAcpiDataTable.h
@@ -1,13 +1,13 @@
 /** @file

   UEFI ACPI Data Table Definition.

 

-Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>

-This program and the accompanying materials are licensed and made available under 

-the terms and conditions of the BSD License that accompanies this distribution.  

+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>

+This program and the accompanying materials are licensed and made available under

+the terms and conditions of the BSD License that accompanies this distribution.

 The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php.                                          

-    

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+http://opensource.org/licenses/bsd-license.php.

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 **/

diff --git a/MdePkg/Include/Uefi/UefiBaseType.h b/MdePkg/Include/Uefi/UefiBaseType.h
index d9556cd..401db7f 100644
--- a/MdePkg/Include/Uefi/UefiBaseType.h
+++ b/MdePkg/Include/Uefi/UefiBaseType.h
@@ -1,15 +1,15 @@
 /** @file

   Defines data types and constants introduced in UEFI.

 

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

 Portions copyright (c) 2011 - 2016, ARM Ltd. All rights reserved.<BR>

 

-This program and the accompanying materials are licensed and made available under 

-the terms and conditions of the BSD License that accompanies this distribution.  

+This program and the accompanying materials are licensed and made available under

+the terms and conditions of the BSD License that accompanies this distribution.

 The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php.                                          

-    

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+http://opensource.org/licenses/bsd-license.php.

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 **/

@@ -114,44 +114,44 @@ typedef union {
 

 ///

 /// Enumeration of EFI_STATUS.

-///@{ 

-#define EFI_SUCCESS               RETURN_SUCCESS              

-#define EFI_LOAD_ERROR            RETURN_LOAD_ERROR           

-#define EFI_INVALID_PARAMETER     RETURN_INVALID_PARAMETER    

-#define EFI_UNSUPPORTED           RETURN_UNSUPPORTED          

-#define EFI_BAD_BUFFER_SIZE       RETURN_BAD_BUFFER_SIZE      

-#define EFI_BUFFER_TOO_SMALL      RETURN_BUFFER_TOO_SMALL     

-#define EFI_NOT_READY             RETURN_NOT_READY            

-#define EFI_DEVICE_ERROR          RETURN_DEVICE_ERROR         

-#define EFI_WRITE_PROTECTED       RETURN_WRITE_PROTECTED      

-#define EFI_OUT_OF_RESOURCES      RETURN_OUT_OF_RESOURCES     

-#define EFI_VOLUME_CORRUPTED      RETURN_VOLUME_CORRUPTED     

-#define EFI_VOLUME_FULL           RETURN_VOLUME_FULL          

-#define EFI_NO_MEDIA              RETURN_NO_MEDIA             

-#define EFI_MEDIA_CHANGED         RETURN_MEDIA_CHANGED        

-#define EFI_NOT_FOUND             RETURN_NOT_FOUND            

-#define EFI_ACCESS_DENIED         RETURN_ACCESS_DENIED        

-#define EFI_NO_RESPONSE           RETURN_NO_RESPONSE          

-#define EFI_NO_MAPPING            RETURN_NO_MAPPING           

-#define EFI_TIMEOUT               RETURN_TIMEOUT              

-#define EFI_NOT_STARTED           RETURN_NOT_STARTED          

-#define EFI_ALREADY_STARTED       RETURN_ALREADY_STARTED      

-#define EFI_ABORTED               RETURN_ABORTED              

-#define EFI_ICMP_ERROR            RETURN_ICMP_ERROR           

-#define EFI_TFTP_ERROR            RETURN_TFTP_ERROR           

-#define EFI_PROTOCOL_ERROR        RETURN_PROTOCOL_ERROR       

-#define EFI_INCOMPATIBLE_VERSION  RETURN_INCOMPATIBLE_VERSION 

-#define EFI_SECURITY_VIOLATION    RETURN_SECURITY_VIOLATION   

-#define EFI_CRC_ERROR             RETURN_CRC_ERROR   

+///@{

+#define EFI_SUCCESS               RETURN_SUCCESS

+#define EFI_LOAD_ERROR            RETURN_LOAD_ERROR

+#define EFI_INVALID_PARAMETER     RETURN_INVALID_PARAMETER

+#define EFI_UNSUPPORTED           RETURN_UNSUPPORTED

+#define EFI_BAD_BUFFER_SIZE       RETURN_BAD_BUFFER_SIZE

+#define EFI_BUFFER_TOO_SMALL      RETURN_BUFFER_TOO_SMALL

+#define EFI_NOT_READY             RETURN_NOT_READY

+#define EFI_DEVICE_ERROR          RETURN_DEVICE_ERROR

+#define EFI_WRITE_PROTECTED       RETURN_WRITE_PROTECTED

+#define EFI_OUT_OF_RESOURCES      RETURN_OUT_OF_RESOURCES

+#define EFI_VOLUME_CORRUPTED      RETURN_VOLUME_CORRUPTED

+#define EFI_VOLUME_FULL           RETURN_VOLUME_FULL

+#define EFI_NO_MEDIA              RETURN_NO_MEDIA

+#define EFI_MEDIA_CHANGED         RETURN_MEDIA_CHANGED

+#define EFI_NOT_FOUND             RETURN_NOT_FOUND

+#define EFI_ACCESS_DENIED         RETURN_ACCESS_DENIED

+#define EFI_NO_RESPONSE           RETURN_NO_RESPONSE

+#define EFI_NO_MAPPING            RETURN_NO_MAPPING

+#define EFI_TIMEOUT               RETURN_TIMEOUT

+#define EFI_NOT_STARTED           RETURN_NOT_STARTED

+#define EFI_ALREADY_STARTED       RETURN_ALREADY_STARTED

+#define EFI_ABORTED               RETURN_ABORTED

+#define EFI_ICMP_ERROR            RETURN_ICMP_ERROR

+#define EFI_TFTP_ERROR            RETURN_TFTP_ERROR

+#define EFI_PROTOCOL_ERROR        RETURN_PROTOCOL_ERROR

+#define EFI_INCOMPATIBLE_VERSION  RETURN_INCOMPATIBLE_VERSION

+#define EFI_SECURITY_VIOLATION    RETURN_SECURITY_VIOLATION

+#define EFI_CRC_ERROR             RETURN_CRC_ERROR

 #define EFI_END_OF_MEDIA          RETURN_END_OF_MEDIA

 #define EFI_END_OF_FILE           RETURN_END_OF_FILE

 #define EFI_INVALID_LANGUAGE      RETURN_INVALID_LANGUAGE

 #define EFI_COMPROMISED_DATA      RETURN_COMPROMISED_DATA

 #define EFI_HTTP_ERROR            RETURN_HTTP_ERROR

 

-#define EFI_WARN_UNKNOWN_GLYPH    RETURN_WARN_UNKNOWN_GLYPH   

-#define EFI_WARN_DELETE_FAILURE   RETURN_WARN_DELETE_FAILURE  

-#define EFI_WARN_WRITE_FAILURE    RETURN_WARN_WRITE_FAILURE   

+#define EFI_WARN_UNKNOWN_GLYPH    RETURN_WARN_UNKNOWN_GLYPH

+#define EFI_WARN_DELETE_FAILURE   RETURN_WARN_DELETE_FAILURE

+#define EFI_WARN_WRITE_FAILURE    RETURN_WARN_WRITE_FAILURE

 #define EFI_WARN_BUFFER_TOO_SMALL RETURN_WARN_BUFFER_TOO_SMALL

 #define EFI_WARN_STALE_DATA       RETURN_WARN_STALE_DATA

 #define EFI_WARN_FILE_SYSTEM      RETURN_WARN_FILE_SYSTEM

@@ -159,7 +159,7 @@ typedef union {
 

 ///

 /// Define macro to encode the status code.

-/// 

+///

 #define EFIERR(_a)                ENCODE_ERROR(_a)

 

 #define EFI_ERROR(A)              RETURN_ERROR(A)

@@ -168,7 +168,7 @@ typedef union {
 /// ICMP error definitions

 ///@{

 #define EFI_NETWORK_UNREACHABLE   EFIERR(100)

-#define EFI_HOST_UNREACHABLE      EFIERR(101) 

+#define EFI_HOST_UNREACHABLE      EFIERR(101)

 #define EFI_PROTOCOL_UNREACHABLE  EFIERR(102)

 #define EFI_PORT_UNREACHABLE      EFIERR(103)

 ///@}

@@ -193,8 +193,8 @@ typedef union {
 /**

   Macro that converts a size, in bytes, to a number of EFI_PAGESs.

 

-  @param  Size      A size in bytes.  This parameter is assumed to be type UINTN.  

-                    Passing in a parameter that is larger than UINTN may produce 

+  @param  Size      A size in bytes.  This parameter is assumed to be type UINTN.

+                    Passing in a parameter that is larger than UINTN may produce

                     unexpected results.

 

   @return  The number of EFI_PAGESs associated with the number of bytes specified

@@ -206,13 +206,13 @@ typedef union {
 /**

   Macro that converts a number of EFI_PAGEs to a size in bytes.

 

-  @param  Pages     The number of EFI_PAGES.  This parameter is assumed to be 

-                    type UINTN.  Passing in a parameter that is larger than 

+  @param  Pages     The number of EFI_PAGES.  This parameter is assumed to be

+                    type UINTN.  Passing in a parameter that is larger than

                     UINTN may produce unexpected results.

 

-  @return  The number of bytes associated with the number of EFI_PAGEs specified 

+  @return  The number of bytes associated with the number of EFI_PAGEs specified

            by Pages.

-  

+

 **/

 #define EFI_PAGES_TO_SIZE(Pages)  ((Pages) << EFI_PAGE_SHIFT)

 

@@ -252,21 +252,21 @@ typedef union {
 #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \

   (((Machine) == EFI_IMAGE_MACHINE_IA32) || ((Machine) == EFI_IMAGE_MACHINE_EBC))

 

-#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_X64) 

+#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_X64)

 

 #elif defined (MDE_CPU_IPF)

 

 #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \

   (((Machine) == EFI_IMAGE_MACHINE_IA64) || ((Machine) == EFI_IMAGE_MACHINE_EBC))

 

-#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE) 

+#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE)

 

 #elif defined (MDE_CPU_X64)

 

 #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \

   (((Machine) == EFI_IMAGE_MACHINE_X64) || ((Machine) == EFI_IMAGE_MACHINE_EBC))

 

-#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_IA32) 

+#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_IA32)

 

 #elif defined (MDE_CPU_ARM)

 

@@ -285,11 +285,11 @@ typedef union {
 

 ///

 /// This is just to make sure you can cross compile with the EBC compiler.

-/// It does not make sense to have a PE loader coded in EBC. 

+/// It does not make sense to have a PE loader coded in EBC.

 ///

 #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_EBC)

 

-#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE) 

+#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE)

 

 #else

 #error Unknown Processor Type

diff --git a/MdePkg/Include/Uefi/UefiGpt.h b/MdePkg/Include/Uefi/UefiGpt.h
index f2d0fa0..f635b05 100644
--- a/MdePkg/Include/Uefi/UefiGpt.h
+++ b/MdePkg/Include/Uefi/UefiGpt.h
@@ -1,13 +1,13 @@
 /** @file

   EFI Guid Partition Table Format Definition.

 

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

-This program and the accompanying materials are licensed and made available under 

-the terms and conditions of the BSD License that accompanies this distribution.  

+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

+This program and the accompanying materials are licensed and made available under

+the terms and conditions of the BSD License that accompanies this distribution.

 The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php.                                          

-    

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+http://opensource.org/licenses/bsd-license.php.

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 **/

@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define PRIMARY_PART_HEADER_LBA 1

 ///

 /// EFI Partition Table Signature: "EFI PART".

-/// 

+///

 #define EFI_PTAB_HEADER_ID      SIGNATURE_64 ('E','F','I',' ','P','A','R','T')

 

 #pragma pack(1)

@@ -119,7 +119,7 @@ typedef struct {
   ///             this partition. By not producing an EFI_BLOCK_IO_PROTOCOL partition, file system

   ///             mappings will not be created for this partition in UEFI.

   /// Bit 2:      This bit is set aside to let systems with traditional PC-AT BIOS firmware implementations

-  ///             inform certain limited, special-purpose software running on these systems that a GPT 

+  ///             inform certain limited, special-purpose software running on these systems that a GPT

   ///             partition may be bootable. The UEFI boot manager must ignore this bit when selecting

   ///             a UEFI-compliant application, e.g., an OS loader.

   /// Bits 3-47:  Undefined and must be zero. Reserved for expansion by future versions of the UEFI

diff --git a/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h b/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h
index ae5602f..b6fa4de 100644
--- a/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h
+++ b/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h
@@ -3,15 +3,15 @@
   IFR is primarily consumed by the EFI presentation engine, and produced by EFI

   internal application and drivers as well as all add-in card option-ROM drivers

 

-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>

-This program and the accompanying materials are licensed and made available under 

-the terms and conditions of the BSD License that accompanies this distribution.  

+This program and the accompanying materials are licensed and made available under

+the terms and conditions of the BSD License that accompanies this distribution.

 The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php.                                          

-    

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+http://opensource.org/licenses/bsd-license.php.

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

   @par Revision Reference:

   These definitions are from UEFI 2.1 and 2.2.

@@ -67,7 +67,7 @@ typedef struct {
 

 //

 // Value of HII package type

-// 

+//

 #define EFI_HII_PACKAGE_TYPE_ALL             0x00

 #define EFI_HII_PACKAGE_TYPE_GUID            0x01

 #define EFI_HII_PACKAGE_FORMS                0x02

@@ -100,7 +100,7 @@ typedef struct {
 ///

 typedef struct {

   ///

-  /// The Unicode representation of the glyph. The term weight is the 

+  /// The Unicode representation of the glyph. The term weight is the

   /// technical term for a character code.

   ///

   CHAR16                 UnicodeWeight;

@@ -109,7 +109,7 @@ typedef struct {
   ///

   UINT8                  Attributes;

   ///

-  /// The column major glyph representation of the character. Bits 

+  /// The column major glyph representation of the character. Bits

   /// with values of one indicate that the corresponding pixel is to be

   /// on when normally displayed; those with zero are off.

   ///

@@ -117,12 +117,12 @@ typedef struct {
 } EFI_NARROW_GLYPH;

 

 ///

-/// The EFI_WIDE_GLYPH has a preferred dimension (w x h) of 16 x 19 pixels, which is large enough 

+/// The EFI_WIDE_GLYPH has a preferred dimension (w x h) of 16 x 19 pixels, which is large enough

 /// to accommodate logographic characters.

 ///

 typedef struct {

   ///

-  /// The Unicode representation of the glyph. The term weight is the 

+  /// The Unicode representation of the glyph. The term weight is the

   /// technical term for a character code.

   ///

   CHAR16                 UnicodeWeight;

@@ -131,20 +131,20 @@ typedef struct {
   ///

   UINT8                  Attributes;

   ///

-  /// The column major glyph representation of the character. Bits 

-  /// with values of one indicate that the corresponding pixel is to be 

+  /// The column major glyph representation of the character. Bits

+  /// with values of one indicate that the corresponding pixel is to be

   /// on when normally displayed; those with zero are off.

   ///

   UINT8                  GlyphCol1[EFI_GLYPH_HEIGHT];

   ///

-  /// The column major glyph representation of the character. Bits 

-  /// with values of one indicate that the corresponding pixel is to be 

+  /// The column major glyph representation of the character. Bits

+  /// with values of one indicate that the corresponding pixel is to be

   /// on when normally displayed; those with zero are off.

   ///

   UINT8                  GlyphCol2[EFI_GLYPH_HEIGHT];

   ///

-  /// Ensures that sizeof (EFI_WIDE_GLYPH) is twice the 

-  /// sizeof (EFI_NARROW_GLYPH). The contents of Pad must 

+  /// Ensures that sizeof (EFI_WIDE_GLYPH) is twice the

+  /// sizeof (EFI_NARROW_GLYPH). The contents of Pad must

   /// be zero.

   ///

   UINT8                  Pad[3];

@@ -268,7 +268,7 @@ typedef struct _EFI_HII_GIBT_GLYPH_BLOCK {
 typedef struct _EFI_HII_GIBT_GLYPHS_BLOCK {

   EFI_HII_GLYPH_BLOCK    Header;

   EFI_HII_GLYPH_INFO     Cell;

-  UINT16                 Count;  

+  UINT16                 Count;

   UINT8                  BitmapData[1];

 } EFI_HII_GIBT_GLYPHS_BLOCK;

 

@@ -845,7 +845,7 @@ typedef struct _EFI_IFR_DEFAULTSTORE {
 } EFI_IFR_DEFAULTSTORE;

 

 //

-// Default Identifier of default store 

+// Default Identifier of default store

 //

 #define EFI_HII_DEFAULT_CLASS_STANDARD       0x0000

 #define EFI_HII_DEFAULT_CLASS_MANUFACTURING  0x0001

@@ -1498,12 +1498,12 @@ typedef struct _EFI_IFR_SECURITY {
 

 typedef struct _EFI_IFR_FORM_MAP_METHOD {

   ///

-  /// The string identifier which provides the human-readable name of 

+  /// The string identifier which provides the human-readable name of

   /// the configuration method for this standards map form.

   ///

   EFI_STRING_ID            MethodTitle;

   ///

-  /// Identifier which uniquely specifies the configuration methods 

+  /// Identifier which uniquely specifies the configuration methods

   /// associated with this standards map form.

   ///

   EFI_GUID                 MethodIdentifier;

@@ -1511,8 +1511,8 @@ typedef struct _EFI_IFR_FORM_MAP_METHOD {
 

 typedef struct _EFI_IFR_FORM_MAP {

   ///

-  /// The sequence that defines the type of opcode as well as the length 

-  /// of the opcode being defined. Header.OpCode = EFI_IFR_FORM_MAP_OP. 

+  /// The sequence that defines the type of opcode as well as the length

+  /// of the opcode being defined. Header.OpCode = EFI_IFR_FORM_MAP_OP.

   ///

   EFI_IFR_OP_HEADER        Header;

   ///

@@ -1527,13 +1527,13 @@ typedef struct _EFI_IFR_FORM_MAP {
 

 typedef struct _EFI_IFR_SET {

   ///

-  /// The sequence that defines the type of opcode as well as the length 

-  /// of the opcode being defined. Header.OpCode = EFI_IFR_SET_OP. 

+  /// The sequence that defines the type of opcode as well as the length

+  /// of the opcode being defined. Header.OpCode = EFI_IFR_SET_OP.

   ///

   EFI_IFR_OP_HEADER  Header;

   ///

-  /// Specifies the identifier of a previously declared variable store to 

-  /// use when storing the question's value. 

+  /// Specifies the identifier of a previously declared variable store to

+  /// use when storing the question's value.

   ///

   EFI_VARSTORE_ID    VarStoreId;

   union {

@@ -1547,20 +1547,20 @@ typedef struct _EFI_IFR_SET {
     UINT16           VarOffset;

   }                  VarStoreInfo;

   ///

-  /// Specifies the type used for storage. 

+  /// Specifies the type used for storage.

   ///

   UINT8              VarStoreType;

 } EFI_IFR_SET;

 

 typedef struct _EFI_IFR_GET {

   ///

-  /// The sequence that defines the type of opcode as well as the length 

-  /// of the opcode being defined. Header.OpCode = EFI_IFR_GET_OP. 

+  /// The sequence that defines the type of opcode as well as the length

+  /// of the opcode being defined. Header.OpCode = EFI_IFR_GET_OP.

   ///

   EFI_IFR_OP_HEADER  Header;

   ///

-  /// Specifies the identifier of a previously declared variable store to 

-  /// use when retrieving the value. 

+  /// Specifies the identifier of a previously declared variable store to

+  /// use when retrieving the value.

   ///

   EFI_VARSTORE_ID    VarStoreId;

   union {

@@ -1574,7 +1574,7 @@ typedef struct _EFI_IFR_GET {
     UINT16           VarOffset;

   }                  VarStoreInfo;

   ///

-  /// Specifies the type used for storage. 

+  /// Specifies the type used for storage.

   ///

   UINT8              VarStoreType;

 } EFI_IFR_GET;

@@ -1598,9 +1598,9 @@ typedef struct _EFI_IFR_MAP {
 ///

 /// Each enumeration values maps a physical key on a keyboard.

 ///

-typedef enum {    

+typedef enum {

   EfiKeyLCtrl,

-  EfiKeyA0, 

+  EfiKeyA0,

   EfiKeyLAlt,

   EfiKeySpaceBar,

   EfiKeyA2,

@@ -1728,8 +1728,8 @@ typedef struct {
   ///

   CHAR16                  ShiftedAltGrUnicode;

   ///

-  /// Modifier keys are defined to allow for special functionality that is not necessarily 

-  /// accomplished by a printable character. Many of these modifier keys are flags to toggle 

+  /// Modifier keys are defined to allow for special functionality that is not necessarily

+  /// accomplished by a printable character. Many of these modifier keys are flags to toggle

   /// certain state bits on and off inside of a keyboard driver.

   ///

   UINT16                  Modifier;

@@ -1737,7 +1737,7 @@ typedef struct {
 } EFI_KEY_DESCRIPTOR;

 

 ///

-/// A key which is affected by all the standard shift modifiers.  

+/// A key which is affected by all the standard shift modifiers.

 /// Most keys would be expected to have this bit active.

 ///

 #define EFI_AFFECTED_BY_STANDARD_SHIFT       0x0001

@@ -1830,7 +1830,7 @@ typedef struct {
 ///

 typedef struct _EFI_IFR_ANIMATION {

   ///

-  /// Standard opcode header, where Header.OpCode is 

+  /// Standard opcode header, where Header.OpCode is

   /// EFI_IFR_ANIMATION_OP.

   ///

   EFI_IFR_OP_HEADER        Header;

@@ -1849,7 +1849,7 @@ typedef struct _EFI_HII_ANIMATION_PACKAGE_HDR {
   ///

   EFI_HII_PACKAGE_HEADER  Header;

   ///

-  /// Offset, relative to this header, of the animation information. If 

+  /// Offset, relative to this header, of the animation information. If

   /// this is zero, then there are no animation sequences in the package.

   ///

   UINT32                  AnimationInfoOffset;

@@ -1933,23 +1933,23 @@ typedef struct _EFI_HII_AIBT_EXT4_BLOCK {
 

 typedef struct _EFI_HII_ANIMATION_CELL {

   ///

-  /// The X offset from the upper left hand corner of the logical 

+  /// The X offset from the upper left hand corner of the logical

   /// window to position the indexed image.

   ///

   UINT16                    OffsetX;

   ///

-  /// The Y offset from the upper left hand corner of the logical 

+  /// The Y offset from the upper left hand corner of the logical

   /// window to position the indexed image.

   ///

   UINT16                    OffsetY;

   ///

-  /// The image to display at the specified offset from the upper left 

+  /// The image to display at the specified offset from the upper left

   /// hand corner of the logical window.

   ///

   EFI_IMAGE_ID              ImageId;

   ///

-  /// The number of milliseconds to delay after displaying the indexed 

-  /// image and before continuing on to the next linked image.  If value 

+  /// The number of milliseconds to delay after displaying the indexed

+  /// image and before continuing on to the next linked image.  If value

   /// is zero, no delay.

   ///

   UINT16                    Delay;

@@ -1961,11 +1961,11 @@ typedef struct _EFI_HII_ANIMATION_CELL {
 ///

 typedef struct _EFI_HII_AIBT_OVERLAY_IMAGES_BLOCK {

   ///

-  /// This is image that is to be reference by the image protocols, if the 

-  /// animation function is not supported or disabled. This image can 

-  /// be one particular image from the animation sequence (if any one 

-  /// of the animation frames has a complete image) or an alternate 

-  /// image that can be displayed alone. If the value is zero, no image 

+  /// This is image that is to be reference by the image protocols, if the

+  /// animation function is not supported or disabled. This image can

+  /// be one particular image from the animation sequence (if any one

+  /// of the animation frames has a complete image) or an alternate

+  /// image that can be displayed alone. If the value is zero, no image

   /// is displayed.

   ///

   EFI_IMAGE_ID            DftImageId;

@@ -1978,7 +1978,7 @@ typedef struct _EFI_HII_AIBT_OVERLAY_IMAGES_BLOCK {
   ///

   UINT16                  Height;

   ///

-  /// The number of EFI_HII_ANIMATION_CELL contained in the 

+  /// The number of EFI_HII_ANIMATION_CELL contained in the

   /// animation sequence.

   ///

   UINT16                  CellCount;

@@ -1990,16 +1990,16 @@ typedef struct _EFI_HII_AIBT_OVERLAY_IMAGES_BLOCK {
 

 ///

 /// An animation block to describe an animation sequence that does not cycle,

-/// and where the logical window is cleared to the specified color before 

+/// and where the logical window is cleared to the specified color before

 /// the next image is displayed.

 ///

 typedef struct _EFI_HII_AIBT_CLEAR_IMAGES_BLOCK {

   ///

-  /// This is image that is to be reference by the image protocols, if the 

-  /// animation function is not supported or disabled. This image can 

-  /// be one particular image from the animation sequence (if any one 

-  /// of the animation frames has a complete image) or an alternate 

-  /// image that can be displayed alone. If the value is zero, no image 

+  /// This is image that is to be reference by the image protocols, if the

+  /// animation function is not supported or disabled. This image can

+  /// be one particular image from the animation sequence (if any one

+  /// of the animation frames has a complete image) or an alternate

+  /// image that can be displayed alone. If the value is zero, no image

   /// is displayed.

   ///

   EFI_IMAGE_ID       DftImageId;

@@ -2012,12 +2012,12 @@ typedef struct _EFI_HII_AIBT_CLEAR_IMAGES_BLOCK {
   ///

   UINT16             Height;

   ///

-  /// The number of EFI_HII_ANIMATION_CELL contained in the 

+  /// The number of EFI_HII_ANIMATION_CELL contained in the

   /// animation sequence.

   ///

   UINT16             CellCount;

   ///

-  /// The color to clear the logical window to before displaying the 

+  /// The color to clear the logical window to before displaying the

   /// indexed image.

   ///

   EFI_HII_RGB_PIXEL  BackgndColor;

@@ -2029,16 +2029,16 @@ typedef struct _EFI_HII_AIBT_CLEAR_IMAGES_BLOCK {
 

 ///

 /// An animation block to describe an animation sequence that does not cycle,

-/// and where the screen is restored to the original state before the next 

+/// and where the screen is restored to the original state before the next

 /// image is displayed.

 ///

 typedef struct _EFI_HII_AIBT_RESTORE_SCRN_BLOCK {

   ///

-  /// This is image that is to be reference by the image protocols, if the 

-  /// animation function is not supported or disabled. This image can 

-  /// be one particular image from the animation sequence (if any one 

-  /// of the animation frames has a complete image) or an alternate 

-  /// image that can be displayed alone. If the value is zero, no image 

+  /// This is image that is to be reference by the image protocols, if the

+  /// animation function is not supported or disabled. This image can

+  /// be one particular image from the animation sequence (if any one

+  /// of the animation frames has a complete image) or an alternate

+  /// image that can be displayed alone. If the value is zero, no image

   /// is displayed.

   ///

   EFI_IMAGE_ID            DftImageId;

@@ -2051,7 +2051,7 @@ typedef struct _EFI_HII_AIBT_RESTORE_SCRN_BLOCK {
   ///

   UINT16                  Height;

   ///

-  /// The number of EFI_HII_ANIMATION_CELL contained in the 

+  /// The number of EFI_HII_ANIMATION_CELL contained in the

   /// animation sequence.

   ///

   UINT16                  CellCount;

@@ -2069,14 +2069,14 @@ typedef EFI_HII_AIBT_OVERLAY_IMAGES_BLOCK  EFI_HII_AIBT_OVERLAY_IMAGES_LOOP_BLOC
 

 ///

 /// An animation block to describe an animation sequence that continuously cycles,

-/// and where the logical window is cleared to the specified color before 

+/// and where the logical window is cleared to the specified color before

 /// the next image is displayed.

 ///

 typedef EFI_HII_AIBT_CLEAR_IMAGES_BLOCK    EFI_HII_AIBT_CLEAR_IMAGES_LOOP_BLOCK;

 

 ///

 /// An animation block to describe an animation sequence that continuously cycles,

-/// and where the screen is restored to the original state before 

+/// and where the screen is restored to the original state before

 /// the next image is displayed.

 ///

 typedef EFI_HII_AIBT_RESTORE_SCRN_BLOCK    EFI_HII_AIBT_RESTORE_SCRN_LOOP_BLOCK;

@@ -2086,7 +2086,7 @@ typedef EFI_HII_AIBT_RESTORE_SCRN_BLOCK    EFI_HII_AIBT_RESTORE_SCRN_LOOP_BLOCK;
 ///

 typedef struct _EFI_HII_AIBT_DUPLICATE_BLOCK {

   ///

-  /// The previously defined animation ID with the exact same 

+  /// The previously defined animation ID with the exact same

   /// animation information.

   ///

   EFI_ANIMATION_ID  AnimationId;

@@ -2121,7 +2121,7 @@ typedef struct _EFI_HII_AIBT_SKIP2_BLOCK {
 /// token usages.

 ///

 ///

-/// STRING_TOKEN is not defined in UEFI specification. But it is placed 

+/// STRING_TOKEN is not defined in UEFI specification. But it is placed

 /// here for the easy access by C files and VFR source files.

 ///

 #define STRING_TOKEN(t) t

diff --git a/MdePkg/Include/Uefi/UefiMultiPhase.h b/MdePkg/Include/Uefi/UefiMultiPhase.h
index 67ecc4c..037b653 100644
--- a/MdePkg/Include/Uefi/UefiMultiPhase.h
+++ b/MdePkg/Include/Uefi/UefiMultiPhase.h
@@ -1,7 +1,7 @@
 /** @file

   This includes some definitions introduced in UEFI that will be used in both PEI and DXE phases.

 

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials are licensed and made available under

 the terms and conditions of the BSD License that accompanies this distribution.

 The full text of the license may be found at

@@ -105,7 +105,7 @@ typedef enum {
   ///

   EfiPalCode,

   ///

-  /// A memory region that operates as EfiConventionalMemory, 

+  /// A memory region that operates as EfiConventionalMemory,

   /// however it happens to also support byte-addressable non-volatility.

   ///

   EfiPersistentMemory,

diff --git a/MdePkg/Include/Uefi/UefiPxe.h b/MdePkg/Include/Uefi/UefiPxe.h
index 249a8c2..7fc3dc6 100644
--- a/MdePkg/Include/Uefi/UefiPxe.h
+++ b/MdePkg/Include/Uefi/UefiPxe.h
@@ -3,13 +3,13 @@
   structure prototypes, global variables and constants that

   are needed for porting PXE to EFI.

 

-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>

-This program and the accompanying materials are licensed and made available under 

-the terms and conditions of the BSD License that accompanies this distribution.  

+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

+This program and the accompanying materials are licensed and made available under

+the terms and conditions of the BSD License that accompanies this distribution.

 The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php.                                          

-    

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+http://opensource.org/licenses/bsd-license.php.

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

   @par Revision Reference:

diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h
index ee016b4..be1e7ec 100644
--- a/MdePkg/Include/Uefi/UefiSpec.h
+++ b/MdePkg/Include/Uefi/UefiSpec.h
@@ -5,13 +5,13 @@
   If a code construct is defined in the UEFI 2.7 specification it must be included

   by this include file.

 

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>

-This program and the accompanying materials are licensed and made available under 

-the terms and conditions of the BSD License that accompanies this distribution.  

+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

+This program and the accompanying materials are licensed and made available under

+the terms and conditions of the BSD License that accompanies this distribution.

 The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php.                                          

-    

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+http://opensource.org/licenses/bsd-license.php.

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 **/

@@ -35,7 +35,7 @@ typedef enum {
   ///

   AllocateAnyPages,

   ///

-  /// Allocate any available range of pages whose uppermost address is less than 

+  /// Allocate any available range of pages whose uppermost address is less than

   /// or equal to a specified maximum address.

   ///

   AllocateMaxAddress,

@@ -79,7 +79,7 @@ typedef enum {
 #define EFI_MEMORY_XP               0x0000000000004000ULL

 #define EFI_MEMORY_RO               0x0000000000020000ULL

 //

-// Physical memory persistence attribute. 

+// Physical memory persistence attribute.

 // The memory region supports byte-addressable non-volatility.

 //

 #define EFI_MEMORY_NV               0x0000000000008000ULL

@@ -129,7 +129,7 @@ typedef struct {
   UINT64                NumberOfPages;

   ///

   /// Attributes of the memory region that describe the bit mask of capabilities

-  /// for that memory region, and not necessarily the current settings for that 

+  /// for that memory region, and not necessarily the current settings for that

   /// memory region.

   ///

   UINT64                Attribute;

@@ -313,8 +313,8 @@ EFI_STATUS
   @retval EFI_NOT_FOUND         1) There are no EFI_DRIVER_BINDING_PROTOCOL instances

                                 present in the system.

                                 2) No drivers were connected to ControllerHandle.

-  @retval EFI_SECURITY_VIOLATION 

-                                The user has no permission to start UEFI device drivers on the device path 

+  @retval EFI_SECURITY_VIOLATION

+                                The user has no permission to start UEFI device drivers on the device path

                                 associated with the ControllerHandle or specified by the RemainingDevicePath.

 **/

 typedef

@@ -702,13 +702,13 @@ EFI_STATUS
   @param[in]  VendorGuid         A unique identifier for the vendor.

   @param[in]  Attributes         Attributes bitmask to set for the variable.

   @param[in]  DataSize           The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE or

-                                 EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero 

-                                 causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is 

-                                 set, then a SetVariable() call with a DataSize of zero will not cause any change to 

-                                 the variable value (the timestamp associated with the variable may be updated however 

-                                 even if no new data value is provided,see the description of the 

-                                 EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not 

-                                 be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated). 

+                                 EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero

+                                 causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is

+                                 set, then a SetVariable() call with a DataSize of zero will not cause any change to

+                                 the variable value (the timestamp associated with the variable may be updated however

+                                 even if no new data value is provided,see the description of the

+                                 EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not

+                                 be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated).

   @param[in]  Data               The contents for the variable.

 

   @retval EFI_SUCCESS            The firmware has successfully stored the variable and its data as

@@ -722,7 +722,7 @@ EFI_STATUS
   @retval EFI_WRITE_PROTECTED    The variable in question cannot be deleted.

   @retval EFI_SECURITY_VIOLATION The variable could not be written due to EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACESS being set,

                                  but the AuthInfo does NOT pass the validation check carried out by the firmware.

-  

+

   @retval EFI_NOT_FOUND          The variable trying to be updated or deleted was not found.

 

 **/

@@ -870,10 +870,10 @@ EFI_STATUS
   @retval EFI_LOAD_ERROR         Image was not loaded because the image format was corrupt or not

                                  understood.

   @retval EFI_DEVICE_ERROR       Image was not loaded because the device returned a read error.

-  @retval EFI_ACCESS_DENIED      Image was not loaded because the platform policy prohibits the 

+  @retval EFI_ACCESS_DENIED      Image was not loaded because the platform policy prohibits the

                                  image from being loaded. NULL is returned in *ImageHandle.

-  @retval EFI_SECURITY_VIOLATION Image was loaded and an ImageHandle was created with a 

-                                 valid EFI_LOADED_IMAGE_PROTOCOL. However, the current 

+  @retval EFI_SECURITY_VIOLATION Image was loaded and an ImageHandle was created with a

+                                 valid EFI_LOADED_IMAGE_PROTOCOL. However, the current

                                  platform policy specifies that the image should not be started.

 **/

 typedef

@@ -912,15 +912,15 @@ EFI_STATUS
 /**

   Terminates a loaded EFI image and returns control to boot services.

 

-  @param[in]  ImageHandle       Handle that identifies the image. This parameter is passed to the 

+  @param[in]  ImageHandle       Handle that identifies the image. This parameter is passed to the

                                 image on entry.

   @param[in]  ExitStatus        The image's exit code.

   @param[in]  ExitDataSize      The size, in bytes, of ExitData. Ignored if ExitStatus is EFI_SUCCESS.

   @param[in]  ExitData          The pointer to a data buffer that includes a Null-terminated string,

-                                optionally followed by additional binary data. The string is a 

-                                description that the caller may use to further indicate the reason 

-                                for the image's exit. ExitData is only valid if ExitStatus 

-                                is something other than EFI_SUCCESS. The ExitData buffer 

+                                optionally followed by additional binary data. The string is a

+                                description that the caller may use to further indicate the reason

+                                for the image's exit. ExitData is only valid if ExitStatus

+                                is something other than EFI_SUCCESS. The ExitData buffer

                                 must be allocated by calling AllocatePool().

 

   @retval EFI_SUCCESS           The image specified by ImageHandle was unloaded.

@@ -1454,7 +1454,7 @@ typedef enum {
   ///

   ByRegisterNotify,

   ///

-  /// Retrieve the set of handles from the handle database that support a 

+  /// Retrieve the set of handles from the handle database that support a

   /// specified protocol.

   ///

   ByProtocol

@@ -1683,10 +1683,10 @@ typedef struct {
   @retval EFI_INVALID_PARAMETER CapsuleCount is 0.

   @retval EFI_DEVICE_ERROR      The capsule update was started, but failed due to a device error.

   @retval EFI_UNSUPPORTED       The capsule type is not supported on this platform.

-  @retval EFI_OUT_OF_RESOURCES  When ExitBootServices() has been previously called this error indicates the capsule 

-                                is compatible with this platform but is not capable of being submitted or processed 

+  @retval EFI_OUT_OF_RESOURCES  When ExitBootServices() has been previously called this error indicates the capsule

+                                is compatible with this platform but is not capable of being submitted or processed

                                 in runtime. The caller may resubmit the capsule prior to ExitBootServices().

-  @retval EFI_OUT_OF_RESOURCES  When ExitBootServices() has not been previously called then this error indicates 

+  @retval EFI_OUT_OF_RESOURCES  When ExitBootServices() has not been previously called then this error indicates

                                 the capsule is compatible with this platform but there are insufficient resources to process.

 

 **/

@@ -1714,10 +1714,10 @@ EFI_STATUS
   @retval EFI_UNSUPPORTED       The capsule type is not supported on this platform, and

                                 MaximumCapsuleSize and ResetType are undefined.

   @retval EFI_INVALID_PARAMETER MaximumCapsuleSize is NULL.

-  @retval EFI_OUT_OF_RESOURCES  When ExitBootServices() has been previously called this error indicates the capsule 

-                                is compatible with this platform but is not capable of being submitted or processed 

+  @retval EFI_OUT_OF_RESOURCES  When ExitBootServices() has been previously called this error indicates the capsule

+                                is compatible with this platform but is not capable of being submitted or processed

                                 in runtime. The caller may resubmit the capsule prior to ExitBootServices().

-  @retval EFI_OUT_OF_RESOURCES  When ExitBootServices() has not been previously called then this error indicates 

+  @retval EFI_OUT_OF_RESOURCES  When ExitBootServices() has not been previously called then this error indicates

                                 the capsule is compatible with this platform but there are insufficient resources to process.

 

 **/