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>

6 files changed, 245 insertions, 245 deletions

diff --git a/MdePkg/Library/UefiLib/Console.c b/MdePkg/Library/UefiLib/Console.c
index ecaf425a0e..37fe84daa5 100644
--- a/MdePkg/Library/UefiLib/Console.c
+++ b/MdePkg/Library/UefiLib/Console.c
@@ -1,14 +1,14 @@
 /** @file

   This module provide help function for displaying unicode string.

 

-  Copyright (c) 2006 - 2015, 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         

-  which accompanies this distribution.  The full text of the license may be found at        

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

+  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

+  which 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.             

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

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

 

 **/

 

@@ -31,7 +31,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UNICODE_WIDTH_ENTRY mUnicodeWidthTable[] = {
   //

   {(CHAR16)0x1FFF,  1},

   /*

-   * Merge the blocks and replace them with the above entry as they fall to 

+   * Merge the blocks and replace them with the above entry as they fall to

    * the same category and they are all narrow glyph. This will reduce search

    * time and table size. The merge will omit the reserved code.

    *

@@ -78,7 +78,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UNICODE_WIDTH_ENTRY mUnicodeWidthTable[] = {
   //

   {(CHAR16)0x2FFF,  1},

   /*

-   * Merge the blocks and replace them with the above entry as they fall to 

+   * Merge the blocks and replace them with the above entry as they fall to

    * the same category and they are all narrow glyph. This will reduce search

    * time and table size. The merge will omit the reserved code.

    *

@@ -110,7 +110,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UNICODE_WIDTH_ENTRY mUnicodeWidthTable[] = {
   //

   {(CHAR16)0x33FF,  2},

   /*

-   * Merge the blocks and replace them with the above entry as they fall to 

+   * Merge the blocks and replace them with the above entry as they fall to

    * the same category and they are all wide glyph. This will reduce search

    * time and table size. The merge will omit the reserved code.

    *

@@ -133,13 +133,13 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UNICODE_WIDTH_ENTRY mUnicodeWidthTable[] = {
   //

   {(CHAR16)0x9FFF,  2},

   /*

-   * Merge the blocks and replace them with the above entry as they fall to 

+   * Merge the blocks and replace them with the above entry as they fall to

    * the same category and they are all wide glyph. This will reduce search

    * time and table size. The merge will omit the reserved code.

    *

    * Remove the above item if below is un-commented.

    *

-  {(CHAR16)0x4DFF,  0},       // Reserved. 0x3400-0x4DBF as CJK unified ideographs 

+  {(CHAR16)0x4DFF,  0},       // Reserved. 0x3400-0x4DBF as CJK unified ideographs

                       // extension A in ver3.0. 0x3400-0x4DFF

   {(CHAR16)0x9FFF,  2},       // CJK unified ideographs. 0x4E00-0x9FFF

   *

@@ -155,7 +155,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UNICODE_WIDTH_ENTRY mUnicodeWidthTable[] = {
   //

   {(CHAR16)0xD7FF,  2},

   /*

-   * Merge the blocks and replace them with the above entry as they fall to 

+   * Merge the blocks and replace them with the above entry as they fall to

    * the same category and they are all wide glyph. This will reduce search

    * time and table size. The merge will omit the reserved code.

    *

@@ -251,18 +251,18 @@ GetGlyphWidth (
 /**

   Computes the display length of a Null-terminated Unicode String.

 

-  This function computes and returns the display length of the Null-terminated 

-  Unicode string specified by String.  If String is NULL then 0 is returned. If 

-  any of the widths of the Unicode characters in String can not be determined, 

-  then 0 is returned. The display width of String can be computed by summing the 

-  display widths of each Unicode character in String.  Unicode characters that 

-  are narrow glyphs have a width of 1, and Unicode characters that are width glyphs 

+  This function computes and returns the display length of the Null-terminated

+  Unicode string specified by String.  If String is NULL then 0 is returned. If

+  any of the widths of the Unicode characters in String can not be determined,

+  then 0 is returned. The display width of String can be computed by summing the

+  display widths of each Unicode character in String.  Unicode characters that

+  are narrow glyphs have a width of 1, and Unicode characters that are width glyphs

   have a width of 2.  If String is not aligned on a 16-bit boundary, then ASSERT().

 

   @param  String      A pointer to a Null-terminated Unicode string.

 

   @return The display length of the Null-terminated Unicode string specified by String.

-  

+

 **/

 UINTN

 EFIAPI

@@ -292,7 +292,7 @@ UnicodeStringDisplayLength (
 }

 

 /**

-  Count the storage space of a Unicode string. 

+  Count the storage space of a Unicode string.

 

   This function handles the Unicode string with NARROW_CHAR

   and WIDE_CHAR control characters. NARROW_HCAR and WIDE_CHAR

@@ -303,7 +303,7 @@ UnicodeStringDisplayLength (
   @param String          The input string to be counted.

   @param LimitLen        Whether need to limit the string length.

   @param MaxWidth        The max length this function supported.

-  @param Offset          The max index of the string can be show out. 

+  @param Offset          The max index of the string can be show out.

 

   @return Storage space for the input string.

 

@@ -375,27 +375,27 @@ UefiLibGetStringWidth (
 }

 

 /**

-  Draws a dialog box to the console output device specified by 

+  Draws a dialog box to the console output device specified by

   ConOut defined in the EFI_SYSTEM_TABLE and waits for a keystroke

-  from the console input device specified by ConIn defined in the 

+  from the console input device specified by ConIn defined in the

   EFI_SYSTEM_TABLE.

 

   If there are no strings in the variable argument list, then ASSERT().

   If all the strings in the variable argument list are empty, then ASSERT().

 

   @param[in]   Attribute  Specifies the foreground and background color of the popup.

-  @param[out]  Key        A pointer to the EFI_KEY value of the key that was 

+  @param[out]  Key        A pointer to the EFI_KEY value of the key that was

                           pressed.  This is an optional parameter that may be NULL.

                           If it is NULL then no wait for a keypress will be performed.

   @param[in]  ...         The variable argument list that contains pointers to Null-

-                          terminated Unicode strings to display in the dialog box.  

+                          terminated Unicode strings to display in the dialog box.

                           The variable argument list is terminated by a NULL.

 

 **/

 VOID

 EFIAPI

 CreatePopUp (

-  IN  UINTN          Attribute,                

+  IN  UINTN          Attribute,

   OUT EFI_INPUT_KEY  *Key,      OPTIONAL

   ...

   )

@@ -417,7 +417,7 @@ CreatePopUp (
   CHAR16                           *TmpString;

 

   //

-  // Determine the length of the longest line in the popup and the the total 

+  // Determine the length of the longest line in the popup and the the total

   // number of lines in the popup

   //

   VA_START (Args, Key);

@@ -443,7 +443,7 @@ CreatePopUp (
   // Cache a pointer to the Simple Text Output Protocol in the EFI System Table

   //

   ConOut = gST->ConOut;

-  

+

   //

   // Save the current console cursor position and attributes

   //

@@ -483,7 +483,7 @@ CreatePopUp (
   ASSERT (Line != NULL);

 

   //

-  // Draw top of popup box   

+  // Draw top of popup box

   //

   SetMem16 (Line, (MaxLength + 2) * 2, BOXDRAW_HORIZONTAL);

   Line[0]             = BOXDRAW_DOWN_RIGHT;

diff --git a/MdePkg/Library/UefiLib/UefiDriverModel.c b/MdePkg/Library/UefiLib/UefiDriverModel.c
index fb6067eac2..69581aeae8 100644
--- a/MdePkg/Library/UefiLib/UefiDriverModel.c
+++ b/MdePkg/Library/UefiLib/UefiDriverModel.c
@@ -2,29 +2,29 @@
   Library functions that abstract driver model protocols

   installation.

 

-  Copyright (c) 2006 - 2013, 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

   which 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.

 

-**/ 

+**/

 

 

 #include "UefiLibInternal.h"

 

 /**

   Installs and completes the initialization of a Driver Binding Protocol instance.

-  

+

   Installs the Driver Binding Protocol specified by DriverBinding onto the handle

   specified by DriverBindingHandle. If DriverBindingHandle is NULL, then DriverBinding

   is installed onto a newly created handle. DriverBindingHandle is typically the same

   as the driver's ImageHandle, but it can be different if the driver produces multiple

-  Driver Binding Protocols. 

-  If DriverBinding is NULL, then ASSERT(). 

+  Driver Binding Protocols.

+  If DriverBinding is NULL, then ASSERT().

   If DriverBinding can not be installed onto a handle, then ASSERT().

 

   @param  ImageHandle          The image handle of the driver.

@@ -80,10 +80,10 @@ EfiLibInstallDriverBinding (
   Protocols onto the driver's DriverBindingHandle. If DriverBindingHandle is NULL,

   then the protocols are  installed onto a newly created handle. DriverBindingHandle

   is typically the same as the driver's ImageHandle, but it can be different if the

-  driver produces multiple Driver Binding Protocols. 

-  If DriverBinding is NULL, then ASSERT(). 

+  driver produces multiple Driver Binding Protocols.

+  If DriverBinding is NULL, then ASSERT().

   If the installation fails, then ASSERT().

-  

+

   @param  ImageHandle          The image handle of the driver.

   @param  SystemTable          The EFI System Table that was passed to the driver's entry point.

   @param  DriverBinding        A Driver Binding Protocol instance that this driver is producing.

@@ -118,7 +118,7 @@ EfiLibInstallAllDriverProtocols (
   //

   DriverBinding->ImageHandle         = ImageHandle;

   DriverBinding->DriverBindingHandle = DriverBindingHandle;

-  

+

   if (DriverDiagnostics == NULL || FeaturePcdGet(PcdDriverDiagnosticsDisable)) {

     if (DriverConfiguration == NULL) {

       if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {

@@ -210,8 +210,8 @@ EfiLibInstallAllDriverProtocols (
   optional Component Name and optional Component Name 2 protocols onto the driver's

   DriverBindingHandle.  If DriverBindingHandle is NULL, then the protocols are installed

   onto a newly created handle.  DriverBindingHandle is typically the same as the driver's

-  ImageHandle, but it can be different if the driver produces multiple Driver Binding Protocols. 

-  If DriverBinding is NULL, then ASSERT(). 

+  ImageHandle, but it can be different if the driver produces multiple Driver Binding Protocols.

+  If DriverBinding is NULL, then ASSERT().

   If the installation fails, then ASSERT().

 

   @param  ImageHandle          The image handle of the driver.

@@ -299,8 +299,8 @@ EfiLibInstallDriverBindingComponentName2 (
   Component Name, optional Component Name 2, optional Driver Configuration, optional Driver Configuration 2,

   optional Driver Diagnostic, and optional Driver Diagnostic 2 Protocols onto the driver's DriverBindingHandle.

   DriverBindingHandle is typically the same as the driver's ImageHandle, but it can be different if the driver

-  produces multiple Driver Binding Protocols. 

-  If DriverBinding is NULL, then ASSERT(). 

+  produces multiple Driver Binding Protocols.

+  If DriverBinding is NULL, then ASSERT().

   If the installation fails, then ASSERT().

 

 

@@ -337,14 +337,14 @@ EfiLibInstallAllDriverProtocols2 (
 {

   EFI_STATUS  Status;

 

-  ASSERT (DriverBinding != NULL); 

+  ASSERT (DriverBinding != NULL);

 

   //

   // Update the ImageHandle and DriverBindingHandle fields of the Driver Binding Protocol

   //

   DriverBinding->ImageHandle         = ImageHandle;

   DriverBinding->DriverBindingHandle = DriverBindingHandle;

-  

+

   if (DriverConfiguration2 == NULL) {

     if (DriverConfiguration == NULL) {

       if (DriverDiagnostics == NULL || FeaturePcdGet(PcdDriverDiagnosticsDisable)) {

diff --git a/MdePkg/Library/UefiLib/UefiLib.c b/MdePkg/Library/UefiLib/UefiLib.c
index 2260183cba..828a54ce7a 100644
--- a/MdePkg/Library/UefiLib/UefiLib.c
+++ b/MdePkg/Library/UefiLib/UefiLib.c
@@ -1,8 +1,8 @@
 /** @file

-  The UEFI Library provides functions and macros that simplify the development of 

-  UEFI Drivers and UEFI Applications.  These functions and macros help manage EFI 

-  events, build simple locks utilizing EFI Task Priority Levels (TPLs), install 

-  EFI Driver Model related protocols, manage Unicode string tables for UEFI Drivers, 

+  The UEFI Library provides functions and macros that simplify the development of

+  UEFI Drivers and UEFI Applications.  These functions and macros help manage EFI

+  events, build simple locks utilizing EFI Task Priority Levels (TPLs), install

+  EFI Driver Model related protocols, manage Unicode string tables for UEFI Drivers,

   and print messages on the console output and standard error devices.

 

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

@@ -20,14 +20,14 @@
 #include "UefiLibInternal.h"

 

 /**

-  Empty constructor function that is required to resolve dependencies between 

+  Empty constructor function that is required to resolve dependencies between

   libraries.

-  

+

     ** DO NOT REMOVE **

-  

+

   @param  ImageHandle   The firmware allocated handle for the EFI image.

   @param  SystemTable   A pointer to the EFI System Table.

-  

+

   @retval EFI_SUCCESS   The constructor executed correctly.

 

 **/

@@ -69,7 +69,7 @@ CompareIso639LanguageCode (
 /**

   Retrieves a pointer to the system configuration table from the EFI System Table

   based on a specified GUID.

-  

+

   This function searches the list of configuration tables stored in the EFI System Table

   for a table with a GUID that matches TableGuid.  If a match is found, then a pointer to

   the configuration table is returned in Table., and EFI_SUCCESS is returned. If a matching GUID

@@ -118,7 +118,7 @@ EfiGetSystemConfigurationTable (
   no instances of ProtocolGuid in the handle database at the time this function is invoked,

   then the notification function is still executed one time. In addition, every time a protocol

   of type ProtocolGuid instance is installed or reinstalled, the notification function is also

-  executed. This function returns the notification event that was created. 

+  executed. This function returns the notification event that was created.

   If ProtocolGuid is NULL, then ASSERT().

   If NotifyTpl is not a legal TPL value, then ASSERT().

   If NotifyFunction is NULL, then ASSERT().

@@ -131,7 +131,7 @@ EfiGetSystemConfigurationTable (
   @param  NotifyContext   The context parameter to pass to NotifyFunction.

   @param  Registration    A pointer to a memory location to receive the registration value.

                           This value is passed to LocateHandle() to obtain new handles that

-                          have been added that support the ProtocolGuid-specified protocol. 

+                          have been added that support the ProtocolGuid-specified protocol.

 

   @return The notification event that was created.

 

@@ -192,7 +192,7 @@ EfiCreateProtocolNotifyEvent(
 

   This function creates an event using NotifyTpl, NoifyFunction, and NotifyContext.

   This event is signaled with EfiNamedEventSignal(). This provides the ability for one or more

-  listeners on the same event named by the GUID specified by Name. 

+  listeners on the same event named by the GUID specified by Name.

   If Name is NULL, then ASSERT().

   If NotifyTpl is not a legal TPL value, then ASSERT().

   If NotifyFunction is NULL, then ASSERT().

@@ -200,7 +200,7 @@ EfiCreateProtocolNotifyEvent(
   @param  Name                  Supplies the GUID name of the event.

   @param  NotifyTpl             Supplies the task priority level of the event notifications.

   @param  NotifyFunction        Supplies the function to notify when the event is signaled.

-  @param  NotifyContext         The context parameter to pass to NotifyFunction. 

+  @param  NotifyContext         The context parameter to pass to NotifyFunction.

   @param  Registration          A pointer to a memory location to receive the registration value.

 

   @retval EFI_SUCCESS           A named event was created.

@@ -224,7 +224,7 @@ EfiNamedEventListen (
   ASSERT (Name != NULL);

   ASSERT (NotifyFunction != NULL);

   ASSERT (NotifyTpl <= TPL_HIGH_LEVEL);

-  

+

   //

   // Create event

   //

@@ -365,13 +365,13 @@ EfiEventEmptyFunction (
 {

 }

 

-/** 

+/**

   Returns the current TPL.

 

-  This function returns the current TPL.  There is no EFI service to directly 

-  retrieve the current TPL. Instead, the RaiseTPL() function is used to raise 

-  the TPL to TPL_HIGH_LEVEL.  This will return the current TPL.  The TPL level 

-  can then immediately be restored back to the current TPL level with a call 

+  This function returns the current TPL.  There is no EFI service to directly

+  retrieve the current TPL. Instead, the RaiseTPL() function is used to raise

+  the TPL to TPL_HIGH_LEVEL.  This will return the current TPL.  The TPL level

+  can then immediately be restored back to the current TPL level with a call

   to RestoreTPL().

 

   @return The current TPL.

@@ -395,8 +395,8 @@ EfiGetCurrentTpl (
 /**

   Initializes a basic mutual exclusion lock.

 

-  This function initializes a basic mutual exclusion lock to the released state 

-  and returns the lock.  Each lock provides mutual exclusion access at its task 

+  This function initializes a basic mutual exclusion lock to the released state

+  and returns the lock.  Each lock provides mutual exclusion access at its task

   priority level.  Since there is no preemption or multiprocessor support in EFI,

   acquiring the lock only consists of raising to the locks TPL.

   If Lock is NULL, then ASSERT().

@@ -427,8 +427,8 @@ EfiInitializeLock (
 /**

   Acquires ownership of a lock.

 

-  This function raises the system's current task priority level to the task 

-  priority level of the mutual exclusion lock.  Then, it places the lock in the 

+  This function raises the system's current task priority level to the task

+  priority level of the mutual exclusion lock.  Then, it places the lock in the

   acquired state.

   If Lock is NULL, then ASSERT().

   If Lock is not initialized, then ASSERT().

@@ -493,8 +493,8 @@ EfiAcquireLockOrFail (
 /**

   Releases ownership of a lock.

 

-  This function transitions a mutual exclusion lock from the acquired state to 

-  the released state, and restores the system's task priority level to its 

+  This function transitions a mutual exclusion lock from the acquired state to

+  the released state, and restores the system's task priority level to its

   previous level.

   If Lock is NULL, then ASSERT().

   If Lock is not initialized, then ASSERT().

@@ -528,7 +528,7 @@ EfiReleaseLock (
   currently managing the controller specified by ControllerHandle.  This test

   is performed by evaluating if the the protocol specified by ProtocolGuid is

   present on ControllerHandle and is was opened by DriverBindingHandle with an

-  attribute of EFI_OPEN_PROTOCOL_BY_DRIVER. 

+  attribute of EFI_OPEN_PROTOCOL_BY_DRIVER.

   If ProtocolGuid is NULL, then ASSERT().

 

   @param  ControllerHandle     A handle for a controller to test.

@@ -591,10 +591,10 @@ EfiTestManagedDevice (
   ChildHandle with an attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.

   If ProtocolGuid is NULL, then ASSERT().

 

-  @param  ControllerHandle     A handle for a (parent) controller to test. 

+  @param  ControllerHandle     A handle for a (parent) controller to test.

   @param  ChildHandle          A child handle to test.

   @param  ProtocolGuid         Supplies the protocol that the child controller

-                               opens on its parent controller. 

+                               opens on its parent controller.

 

   @retval EFI_SUCCESS          ChildHandle is a child of the ControllerHandle.

   @retval EFI_UNSUPPORTED      ChildHandle is not a child of the

@@ -653,26 +653,26 @@ EfiTestChildHandle (
   UnicodeStringTable that matches the language code specified by Language, then it

   is returned in UnicodeString.

 

-  @param  Language                A pointer to the ISO 639-2 language code for the 

+  @param  Language                A pointer to the ISO 639-2 language code for the

                                   Unicode string to look up and return.

-  @param  SupportedLanguages      A pointer to the set of ISO 639-2 language codes 

-                                  that the Unicode string table supports.  Language 

+  @param  SupportedLanguages      A pointer to the set of ISO 639-2 language codes

+                                  that the Unicode string table supports.  Language

                                   must be a member of this set.

   @param  UnicodeStringTable      A pointer to the table of Unicode strings.

   @param  UnicodeString           A pointer to the Unicode string from UnicodeStringTable

                                   that matches the language specified by Language.

 

-  @retval EFI_SUCCESS             The Unicode string that matches the language 

+  @retval EFI_SUCCESS             The Unicode string that matches the language

                                   specified by Language was found

-                                  in the table of Unicode strings UnicodeStringTable, 

+                                  in the table of Unicode strings UnicodeStringTable,

                                   and it was returned in UnicodeString.

   @retval EFI_INVALID_PARAMETER   Language is NULL.

   @retval EFI_INVALID_PARAMETER   UnicodeString is NULL.

   @retval EFI_UNSUPPORTED         SupportedLanguages is NULL.

   @retval EFI_UNSUPPORTED         UnicodeStringTable is NULL.

-  @retval EFI_UNSUPPORTED         The language specified by Language is not a 

+  @retval EFI_UNSUPPORTED         The language specified by Language is not a

                                   member of SupportedLanguages.

-  @retval EFI_UNSUPPORTED         The language specified by Language is not 

+  @retval EFI_UNSUPPORTED         The language specified by Language is not

                                   supported by UnicodeStringTable.

 

 **/

@@ -745,7 +745,7 @@ LookupUnicodeString (
                                return. If Iso639Language is TRUE, then this ASCII string is

                                not assumed to be Null-terminated, and only the first three

                                characters are used. If Iso639Language is FALSE, then this ASCII

-                               string must be Null-terminated. 

+                               string must be Null-terminated.

   @param  SupportedLanguages   A pointer to a Null-terminated ASCII string that contains a

                                set of ISO 639-2 or RFC 4646 language codes that the Unicode

                                string table supports.  Language must be a member of this set.

@@ -765,11 +765,11 @@ LookupUnicodeString (
   @retval  EFI_SUCCESS            The Unicode string that matches the language specified by Language

                                   was found in the table of Unicode strings UnicodeStringTable, and

                                   it was returned in UnicodeString.

-  @retval  EFI_INVALID_PARAMETER  Language is NULL.  

-  @retval  EFI_INVALID_PARAMETER  UnicodeString is NULL.  

-  @retval  EFI_UNSUPPORTED        SupportedLanguages is NULL.  

-  @retval  EFI_UNSUPPORTED        UnicodeStringTable is NULL.  

-  @retval  EFI_UNSUPPORTED        The language specified by Language is not a member of SupportedLanguages.  

+  @retval  EFI_INVALID_PARAMETER  Language is NULL.

+  @retval  EFI_INVALID_PARAMETER  UnicodeString is NULL.

+  @retval  EFI_UNSUPPORTED        SupportedLanguages is NULL.

+  @retval  EFI_UNSUPPORTED        UnicodeStringTable is NULL.

+  @retval  EFI_UNSUPPORTED        The language specified by Language is not a member of SupportedLanguages.

   @retval  EFI_UNSUPPORTED        The language specified by Language is not supported by UnicodeStringTable.

 

 **/

@@ -855,13 +855,13 @@ LookupUnicodeString2 (
 /**

   This function adds a Unicode string to UnicodeStringTable.

 

-  If Language is a member of SupportedLanguages then UnicodeString is added to 

-  UnicodeStringTable.  New buffers are allocated for both Language and 

-  UnicodeString.  The contents of Language and UnicodeString are copied into 

-  these new buffers.  These buffers are automatically freed when 

+  If Language is a member of SupportedLanguages then UnicodeString is added to

+  UnicodeStringTable.  New buffers are allocated for both Language and

+  UnicodeString.  The contents of Language and UnicodeString are copied into

+  these new buffers.  These buffers are automatically freed when

   FreeUnicodeStringTable() is called.

 

-  @param  Language                A pointer to the ISO 639-2 language code for the Unicode 

+  @param  Language                A pointer to the ISO 639-2 language code for the Unicode

                                   string to add.

   @param  SupportedLanguages      A pointer to the set of ISO 639-2 language codes

                                   that the Unicode string table supports.

@@ -869,19 +869,19 @@ LookupUnicodeString2 (
   @param  UnicodeStringTable      A pointer to the table of Unicode strings.

   @param  UnicodeString           A pointer to the Unicode string to add.

 

-  @retval EFI_SUCCESS             The Unicode string that matches the language 

-                                  specified by Language was found in the table of 

-                                  Unicode strings UnicodeStringTable, and it was 

+  @retval EFI_SUCCESS             The Unicode string that matches the language

+                                  specified by Language was found in the table of

+                                  Unicode strings UnicodeStringTable, and it was

                                   returned in UnicodeString.

   @retval EFI_INVALID_PARAMETER   Language is NULL.

   @retval EFI_INVALID_PARAMETER   UnicodeString is NULL.

   @retval EFI_INVALID_PARAMETER   UnicodeString is an empty string.

   @retval EFI_UNSUPPORTED         SupportedLanguages is NULL.

-  @retval EFI_ALREADY_STARTED     A Unicode string with language Language is 

+  @retval EFI_ALREADY_STARTED     A Unicode string with language Language is

                                   already present in UnicodeStringTable.

-  @retval EFI_OUT_OF_RESOURCES    There is not enough memory to add another 

+  @retval EFI_OUT_OF_RESOURCES    There is not enough memory to add another

                                   Unicode string to UnicodeStringTable.

-  @retval EFI_UNSUPPORTED         The language specified by Language is not a 

+  @retval EFI_UNSUPPORTED         The language specified by Language is not a

                                   member of SupportedLanguages.

 

 **/

@@ -1044,21 +1044,21 @@ AddUnicodeString (
                               RFC 4646 language codes separated by ';'.

   @param  UnicodeStringTable  A pointer to the table of Unicode strings. Type EFI_UNICODE_STRING_TABLE

                               is defined in "Related Definitions".

-  @param  UnicodeString       A pointer to the Unicode string to add.  

+  @param  UnicodeString       A pointer to the Unicode string to add.

   @param  Iso639Language      Specifies the supported language code format. If it is TRUE,

                               then Language and SupportedLanguages follow ISO 639-2 language code format.

                               Otherwise, they follow RFC 4646 language code format.

 

   @retval EFI_SUCCESS            The Unicode string that matches the language specified by

                                  Language was found in the table of Unicode strings UnicodeStringTable,

-                                 and it was returned in UnicodeString.  

-  @retval EFI_INVALID_PARAMETER  Language is NULL.  

-  @retval EFI_INVALID_PARAMETER  UnicodeString is NULL.  

-  @retval EFI_INVALID_PARAMETER  UnicodeString is an empty string.  

-  @retval EFI_UNSUPPORTED        SupportedLanguages is NULL.  

+                                 and it was returned in UnicodeString.

+  @retval EFI_INVALID_PARAMETER  Language is NULL.

+  @retval EFI_INVALID_PARAMETER  UnicodeString is NULL.

+  @retval EFI_INVALID_PARAMETER  UnicodeString is an empty string.

+  @retval EFI_UNSUPPORTED        SupportedLanguages is NULL.

   @retval EFI_ALREADY_STARTED    A Unicode string with language Language is already present in

-                                 UnicodeStringTable.  

-  @retval EFI_OUT_OF_RESOURCES   There is not enough memory to add another Unicode string UnicodeStringTable.  

+                                 UnicodeStringTable.

+  @retval EFI_OUT_OF_RESOURCES   There is not enough memory to add another Unicode string UnicodeStringTable.

   @retval EFI_UNSUPPORTED        The language specified by Language is not a member of SupportedLanguages.

 

 **/

@@ -1142,7 +1142,7 @@ AddUnicodeString2 (
       while (*LanguageString != 0) {

         for (Index = 0; LanguageString[Index] != 0 && LanguageString[Index] != ';'; Index++);

 

-        if (AsciiStrnCmp (Language, LanguageString, Index) == 0) { 

+        if (AsciiStrnCmp (Language, LanguageString, Index) == 0) {

           return EFI_ALREADY_STARTED;

         }

         LanguageString += Index;

@@ -1224,7 +1224,7 @@ AddUnicodeString2 (
   This function frees the table of Unicode strings in UnicodeStringTable.

 

   If UnicodeStringTable is NULL, then EFI_SUCCESS is returned.

-  Otherwise, each language code, and each Unicode string in the Unicode string 

+  Otherwise, each language code, and each Unicode string in the Unicode string

   table are freed, and EFI_SUCCESS is returned.

 

   @param  UnicodeStringTable  A pointer to the table of Unicode strings.

@@ -1278,8 +1278,8 @@ FreeUnicodeStringTable (
 /**

   [ATTENTION] This function will be deprecated for security reason.

 

-  Returns a pointer to an allocated buffer that contains the contents of a 

-  variable retrieved through the UEFI Runtime Service GetVariable().  The 

+  Returns a pointer to an allocated buffer that contains the contents of a

+  variable retrieved through the UEFI Runtime Service GetVariable().  The

   returned buffer is allocated using AllocatePool().  The caller is responsible

   for freeing this buffer with FreePool().

 

@@ -1341,10 +1341,10 @@ GetVariable (
 /**

   [ATTENTION] This function will be deprecated for security reason.

 

-  Returns a pointer to an allocated buffer that contains the contents of a 

-  variable retrieved through the UEFI Runtime Service GetVariable().  This 

+  Returns a pointer to an allocated buffer that contains the contents of a

+  variable retrieved through the UEFI Runtime Service GetVariable().  This

   function always uses the EFI_GLOBAL_VARIABLE GUID to retrieve variables.

-  The returned buffer is allocated using AllocatePool().  The caller is 

+  The returned buffer is allocated using AllocatePool().  The caller is

   responsible for freeing this buffer with FreePool().

 

   If Name is NULL, then ASSERT().

@@ -1367,8 +1367,8 @@ GetEfiGlobalVariable (
 #endif

 

 /**

-  Returns the status whether get the variable success. The function retrieves 

-  variable  through the UEFI Runtime Service GetVariable().  The 

+  Returns the status whether get the variable success. The function retrieves

+  variable  through the UEFI Runtime Service GetVariable().  The

   returned buffer is allocated using AllocatePool().  The caller is responsible

   for freeing this buffer with FreePool().

 

@@ -1408,7 +1408,7 @@ GetVariable2 (
   if (Size != NULL) {

     *Size  = 0;

   }

-  

+

   Status = gRT->GetVariable ((CHAR16 *) Name, (EFI_GUID *) Guid, NULL, &BufferSize, *Value);

   if (Status != EFI_BUFFER_TOO_SMALL) {

     return Status;

@@ -1440,10 +1440,10 @@ GetVariable2 (
 }

 

 /**

-  Returns a pointer to an allocated buffer that contains the contents of a 

-  variable retrieved through the UEFI Runtime Service GetVariable().  This 

+  Returns a pointer to an allocated buffer that contains the contents of a

+  variable retrieved through the UEFI Runtime Service GetVariable().  This

   function always uses the EFI_GLOBAL_VARIABLE GUID to retrieve variables.

-  The returned buffer is allocated using AllocatePool().  The caller is 

+  The returned buffer is allocated using AllocatePool().  The caller is

   responsible for freeing this buffer with FreePool().

 

   If Name is NULL, then ASSERT().

@@ -1470,50 +1470,50 @@ GetEfiGlobalVariable2 (
 }

 

 /**

-  Returns a pointer to an allocated buffer that contains the best matching language 

-  from a set of supported languages.  

-  

-  This function supports both ISO 639-2 and RFC 4646 language codes, but language 

-  code types may not be mixed in a single call to this function.  The language 

-  code returned is allocated using AllocatePool().  The caller is responsible for 

+  Returns a pointer to an allocated buffer that contains the best matching language

+  from a set of supported languages.

+

+  This function supports both ISO 639-2 and RFC 4646 language codes, but language

+  code types may not be mixed in a single call to this function.  The language

+  code returned is allocated using AllocatePool().  The caller is responsible for

   freeing the allocated buffer using FreePool().  This function supports a variable

-  argument list that allows the caller to pass in a prioritized list of language 

-  codes to test against all the language codes in SupportedLanguages. 

+  argument list that allows the caller to pass in a prioritized list of language

+  codes to test against all the language codes in SupportedLanguages.

 

   If SupportedLanguages is NULL, then ASSERT().

 

   @param[in]  SupportedLanguages  A pointer to a Null-terminated ASCII string that

-                                  contains a set of language codes in the format 

+                                  contains a set of language codes in the format

                                   specified by Iso639Language.

   @param[in]  Iso639Language      If not zero, then all language codes are assumed to be

                                   in ISO 639-2 format.  If zero, then all language

                                   codes are assumed to be in RFC 4646 language format

-  @param[in]  ...                 A variable argument list that contains pointers to 

+  @param[in]  ...                 A variable argument list that contains pointers to

                                   Null-terminated ASCII strings that contain one or more

                                   language codes in the format specified by Iso639Language.

                                   The first language code from each of these language

                                   code lists is used to determine if it is an exact or

-                                  close match to any of the language codes in 

+                                  close match to any of the language codes in

                                   SupportedLanguages.  Close matches only apply to RFC 4646

                                   language codes, and the matching algorithm from RFC 4647

-                                  is used to determine if a close match is present.  If 

+                                  is used to determine if a close match is present.  If

                                   an exact or close match is found, then the matching

                                   language code from SupportedLanguages is returned.  If

                                   no matches are found, then the next variable argument

-                                  parameter is evaluated.  The variable argument list 

+                                  parameter is evaluated.  The variable argument list

                                   is terminated by a NULL.

 

   @retval NULL   The best matching language could not be found in SupportedLanguages.

-  @retval NULL   There are not enough resources available to return the best matching 

+  @retval NULL   There are not enough resources available to return the best matching

                  language.

-  @retval Other  A pointer to a Null-terminated ASCII string that is the best matching 

+  @retval Other  A pointer to a Null-terminated ASCII string that is the best matching

                  language in SupportedLanguages.

 

 **/

 CHAR8 *

 EFIAPI

 GetBestLanguage (

-  IN CONST CHAR8  *SupportedLanguages, 

+  IN CONST CHAR8  *SupportedLanguages,

   IN UINTN        Iso639Language,

   ...

   )

@@ -1592,7 +1592,7 @@ GetBestLanguage (
         LanguageLength = 0;

       } else {

         //

-        // If RFC 4646 mode, then trim Language from the right to the next '-' character 

+        // If RFC 4646 mode, then trim Language from the right to the next '-' character

         //

         for (LanguageLength--; LanguageLength > 0 && Language[LanguageLength] != '-'; LanguageLength--);

       }

@@ -1601,7 +1601,7 @@ GetBestLanguage (
   VA_END (Args);

 

   //

-  // No matches were found 

+  // No matches were found

   //

   return NULL;

 }

diff --git a/MdePkg/Library/UefiLib/UefiLib.inf b/MdePkg/Library/UefiLib/UefiLib.inf
index 8284dc58af..f69f0a43b5 100644
--- a/MdePkg/Library/UefiLib/UefiLib.inf
+++ b/MdePkg/Library/UefiLib/UefiLib.inf
@@ -1,13 +1,13 @@
 ## @file

 # Instance of UEFI Library.

 #

-# The UEFI Library provides functions and macros that simplify the development of 

-#  UEFI Drivers and UEFI Applications.  These functions and macros help manage EFI 

-#  events, build simple locks utilizing EFI Task Priority Levels (TPLs), install 

-#  EFI Driver Model related protocols, manage Unicode string tables for UEFI Drivers, 

+# The UEFI Library provides functions and macros that simplify the development of

+#  UEFI Drivers and UEFI Applications.  These functions and macros help manage EFI

+#  events, build simple locks utilizing EFI Task Priority Levels (TPLs), install

+#  EFI Driver Model related protocols, manage Unicode string tables for UEFI Drivers,

 #  and print messages on the console output and standard error devices.

 #

-# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2007 - 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

@@ -57,7 +57,7 @@
   UefiBootServicesTableLib

   DevicePathLib

   UefiRuntimeServicesTableLib

-  

+

 [Guids]

   gEfiEventReadyToBootGuid                      ## SOMETIMES_CONSUMES  ## Event

   gEfiEventLegacyBootGuid                       ## SOMETIMES_CONSUMES  ## Event

diff --git a/MdePkg/Library/UefiLib/UefiLibPrint.c b/MdePkg/Library/UefiLib/UefiLibPrint.c
index 5527f8e7a8..b7c546b215 100644
--- a/MdePkg/Library/UefiLib/UefiLibPrint.c
+++ b/MdePkg/Library/UefiLib/UefiLibPrint.c
@@ -2,7 +2,7 @@
   Mde UEFI library API implementation.

   Print to StdErr or ConOut defined in EFI_SYSTEM_TABLE

 

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

+  Copyright (c) 2007 - 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

   which accompanies this distribution.  The full text of the license may be found at

@@ -90,23 +90,23 @@ InternalPrint (
   return Return;

 }

 

-/** 

-  Prints a formatted Unicode string to the console output device specified by 

+/**

+  Prints a formatted Unicode string to the console output device specified by

   ConOut defined in the EFI_SYSTEM_TABLE.

 

-  This function prints a formatted Unicode string to the console output device 

-  specified by ConOut in EFI_SYSTEM_TABLE and returns the number of Unicode 

-  characters that printed to ConOut.  If the length of the formatted Unicode 

-  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first 

+  This function prints a formatted Unicode string to the console output device

+  specified by ConOut in EFI_SYSTEM_TABLE and returns the number of Unicode

+  characters that printed to ConOut.  If the length of the formatted Unicode

+  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first

   PcdUefiLibMaxPrintBufferSize characters are sent to ConOut.

   If Format is NULL, then ASSERT().

   If Format is not aligned on a 16-bit boundary, then ASSERT().

   If gST->ConOut is NULL, then ASSERT().

 

   @param Format   A Null-terminated Unicode format string.

-  @param ...      A Variable argument list whose contents are accessed based 

+  @param ...      A Variable argument list whose contents are accessed based

                   on the format string specified by Format.

-  

+

   @return The number of Unicode characters printed to ConOut.

 

 **/

@@ -129,23 +129,23 @@ Print (
   return Return;

 }

 

-/** 

-  Prints a formatted Unicode string to the console output device specified by 

+/**

+  Prints a formatted Unicode string to the console output device specified by

   StdErr defined in the EFI_SYSTEM_TABLE.

 

-  This function prints a formatted Unicode string to the console output device 

-  specified by StdErr in EFI_SYSTEM_TABLE and returns the number of Unicode 

-  characters that printed to StdErr.  If the length of the formatted Unicode 

-  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first 

+  This function prints a formatted Unicode string to the console output device

+  specified by StdErr in EFI_SYSTEM_TABLE and returns the number of Unicode

+  characters that printed to StdErr.  If the length of the formatted Unicode

+  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first

   PcdUefiLibMaxPrintBufferSize characters are sent to StdErr.

   If Format is NULL, then ASSERT().

   If Format is not aligned on a 16-bit boundary, then ASSERT().

   If gST->StdErr is NULL, then ASSERT().

 

   @param Format   A Null-terminated Unicode format string.

-  @param ...      Variable argument list whose contents are accessed based 

+  @param ...      Variable argument list whose contents are accessed based

                   on the format string specified by Format.

-  

+

   @return The number of Unicode characters printed to StdErr.

 

 **/

@@ -225,22 +225,22 @@ AsciiInternalPrint (
   return Return;

 }

 

-/** 

-  Prints a formatted ASCII string to the console output device specified by 

+/**

+  Prints a formatted ASCII string to the console output device specified by

   ConOut defined in the EFI_SYSTEM_TABLE.

 

-  This function prints a formatted ASCII string to the console output device 

-  specified by ConOut in EFI_SYSTEM_TABLE and returns the number of ASCII 

-  characters that printed to ConOut.  If the length of the formatted ASCII 

-  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first 

+  This function prints a formatted ASCII string to the console output device

+  specified by ConOut in EFI_SYSTEM_TABLE and returns the number of ASCII

+  characters that printed to ConOut.  If the length of the formatted ASCII

+  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first

   PcdUefiLibMaxPrintBufferSize characters are sent to ConOut.

   If Format is NULL, then ASSERT().

   If gST->ConOut is NULL, then ASSERT().

 

   @param Format   A Null-terminated ASCII format string.

-  @param ...      Variable argument list whose contents are accessed based 

+  @param ...      Variable argument list whose contents are accessed based

                   on the format string specified by Format.

-  

+

   @return The number of ASCII characters printed to ConOut.

 

 **/

@@ -264,22 +264,22 @@ AsciiPrint (
   return Return;

 }

 

-/** 

-  Prints a formatted ASCII string to the console output device specified by 

+/**

+  Prints a formatted ASCII string to the console output device specified by

   StdErr defined in the EFI_SYSTEM_TABLE.

 

-  This function prints a formatted ASCII string to the console output device 

-  specified by StdErr in EFI_SYSTEM_TABLE and returns the number of ASCII 

-  characters that printed to StdErr.  If the length of the formatted ASCII 

-  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first 

+  This function prints a formatted ASCII string to the console output device

+  specified by StdErr in EFI_SYSTEM_TABLE and returns the number of ASCII

+  characters that printed to StdErr.  If the length of the formatted ASCII

+  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first

   PcdUefiLibMaxPrintBufferSize characters are sent to StdErr.

   If Format is NULL, then ASSERT().

   If gST->StdErr is NULL, then ASSERT().

 

   @param Format   A Null-terminated ASCII format string.

-  @param ...      Variable argument list whose contents are accessed based 

+  @param ...      Variable argument list whose contents are accessed based

                   on the format string specified by Format.

-  

+

   @return The number of ASCII characters printed to ConErr.

 

 **/

@@ -371,7 +371,7 @@ InternalPrintGraphic (
   RowInfoArray          = NULL;

 

   ConsoleHandle = gST->ConsoleOutHandle;

-  

+

   ASSERT( ConsoleHandle != NULL);

 

   Status = gBS->HandleProtocol (

@@ -560,24 +560,24 @@ Error:
 }

 

 /**

-  Prints a formatted Unicode string to a graphics console device specified by 

+  Prints a formatted Unicode string to a graphics console device specified by

   ConsoleOutputHandle defined in the EFI_SYSTEM_TABLE at the given (X,Y) coordinates.

 

-  This function prints a formatted Unicode string to the graphics console device 

-  specified by ConsoleOutputHandle in EFI_SYSTEM_TABLE and returns the number of 

-  Unicode characters displayed, not including partial characters that may be clipped 

+  This function prints a formatted Unicode string to the graphics console device

+  specified by ConsoleOutputHandle in EFI_SYSTEM_TABLE and returns the number of

+  Unicode characters displayed, not including partial characters that may be clipped

   by the right edge of the display.  If the length of the formatted Unicode string is

-  greater than PcdUefiLibMaxPrintBufferSize, then at most the first 

+  greater than PcdUefiLibMaxPrintBufferSize, then at most the first

   PcdUefiLibMaxPrintBufferSize characters are printed.The EFI_HII_FONT_PROTOCOL

-  StringToImage() service is used to convert the string to a bitmap using the glyphs 

-  registered with the HII database. No wrapping is performed, so any portions of the 

-  string the fall outside the active display region will not be displayed. Please see 

+  StringToImage() service is used to convert the string to a bitmap using the glyphs

+  registered with the HII database. No wrapping is performed, so any portions of the

+  string the fall outside the active display region will not be displayed. Please see

   Section 27.2.6 of the UEFI Specification for a description of the supported string

   format including the set of control codes supported by the StringToImage() service.

 

-  If a graphics console device is not associated with the ConsoleOutputHandle 

+  If a graphics console device is not associated with the ConsoleOutputHandle

   defined in the EFI_SYSTEM_TABLE then no string is printed, and 0 is returned.

-  If the EFI_HII_FONT_PROTOCOL is not present in the handle database, then no 

+  If the EFI_HII_FONT_PROTOCOL is not present in the handle database, then no

   string is printed, and 0 is returned.

   If Format is NULL, then ASSERT().

   If Format is not aligned on a 16-bit boundary, then ASSERT().

@@ -590,13 +590,13 @@ Error:
                        then the foreground color of the current ConOut device

                        in the EFI_SYSTEM_TABLE is used.

   @param  BackGround   The background color of the string being printed.  This is

-                       an optional parameter that may be NULL.  If it is NULL, 

+                       an optional parameter that may be NULL.  If it is NULL,

                        then the background color of the current ConOut device

                        in the EFI_SYSTEM_TABLE is used.

-  @param  Format       A Null-terminated Unicode format string.  See Print Library 

+  @param  Format       A Null-terminated Unicode format string.  See Print Library

                        for the supported format string syntax.

-  @param  ...          A Variable argument list whose contents are accessed based on 

-                       the format string specified by Format.         

+  @param  ...          A Variable argument list whose contents are accessed based on

+                       the format string specified by Format.

 

   @return  The number of Unicode characters printed.

 

@@ -640,24 +640,24 @@ PrintXY (
 }

 

 /**

-  Prints a formatted ASCII string to a graphics console device specified by 

+  Prints a formatted ASCII string to a graphics console device specified by

   ConsoleOutputHandle defined in the EFI_SYSTEM_TABLE at the given (X,Y) coordinates.

 

-  This function prints a formatted ASCII string to the graphics console device 

-  specified by ConsoleOutputHandle in EFI_SYSTEM_TABLE and returns the number of 

-  ASCII characters displayed, not including partial characters that may be clipped 

+  This function prints a formatted ASCII string to the graphics console device

+  specified by ConsoleOutputHandle in EFI_SYSTEM_TABLE and returns the number of

+  ASCII characters displayed, not including partial characters that may be clipped

   by the right edge of the display.  If the length of the formatted ASCII string is

-  greater than PcdUefiLibMaxPrintBufferSize, then at most the first 

+  greater than PcdUefiLibMaxPrintBufferSize, then at most the first

   PcdUefiLibMaxPrintBufferSize characters are printed.The EFI_HII_FONT_PROTOCOL

-  StringToImage() service is used to convert the string to a bitmap using the glyphs 

-  registered with the HII database. No wrapping is performed, so any portions of the 

-  string the fall outside the active display region will not be displayed. Please see 

+  StringToImage() service is used to convert the string to a bitmap using the glyphs

+  registered with the HII database. No wrapping is performed, so any portions of the

+  string the fall outside the active display region will not be displayed. Please see

   Section 27.2.6 of the UEFI Specification for a description of the supported string

   format including the set of control codes supported by the StringToImage() service.

 

-  If a graphics console device is not associated with the ConsoleOutputHandle 

+  If a graphics console device is not associated with the ConsoleOutputHandle

   defined in the EFI_SYSTEM_TABLE then no string is printed, and 0 is returned.

-  If the EFI_HII_FONT_PROTOCOL is not present in the handle database, then no 

+  If the EFI_HII_FONT_PROTOCOL is not present in the handle database, then no

   string is printed, and 0 is returned.

   If Format is NULL, then ASSERT().

   If gST->ConsoleOutputHandle is NULL, then ASSERT().

@@ -669,13 +669,13 @@ PrintXY (
                        then the foreground color of the current ConOut device

                        in the EFI_SYSTEM_TABLE is used.

   @param  BackGround   The background color of the string being printed.  This is

-                       an optional parameter that may be NULL.  If it is NULL, 

+                       an optional parameter that may be NULL.  If it is NULL,

                        then the background color of the current ConOut device

                        in the EFI_SYSTEM_TABLE is used.

-  @param  Format       A Null-terminated ASCII format string.  See Print Library 

+  @param  Format       A Null-terminated ASCII format string.  See Print Library

                        for the supported format string syntax.

-  @param  ...          Variable argument list whose contents are accessed based on 

-                       the format string specified by Format.         

+  @param  ...          Variable argument list whose contents are accessed based on

+                       the format string specified by Format.

 

   @return  The number of ASCII characters printed.

 

@@ -717,25 +717,25 @@ AsciiPrintXY (
   return ReturnNum;

 }

 

-/** 

+/**

   Appends a formatted Unicode string to a Null-terminated Unicode string

- 

-  This function appends a formatted Unicode string to the Null-terminated 

+

+  This function appends a formatted Unicode string to the Null-terminated

   Unicode string specified by String.   String is optional and may be NULL.

-  Storage for the formatted Unicode string returned is allocated using 

+  Storage for the formatted Unicode string returned is allocated using

   AllocatePool().  The pointer to the appended string is returned.  The caller

   is responsible for freeing the returned string.

- 

+

   If String is not NULL and not aligned on a 16-bit boundary, then ASSERT().

   If FormatString is NULL, then ASSERT().

   If FormatString is not aligned on a 16-bit boundary, then ASSERT().

- 

+

   @param[in] String         A Null-terminated Unicode string.

   @param[in] FormatString   A Null-terminated Unicode format string.

   @param[in]  Marker        VA_LIST marker for the variable argument list.

 

   @retval NULL    There was not enough available memory.

-  @return         Null-terminated Unicode string is that is the formatted 

+  @return         Null-terminated Unicode string is that is the formatted

                   string appended to String.

 **/

 CHAR16*

@@ -780,27 +780,27 @@ CatVSPrint (
   return (BufferToReturn);

 }

 

-/** 

+/**

   Appends a formatted Unicode string to a Null-terminated Unicode string

- 

-  This function appends a formatted Unicode string to the Null-terminated 

+

+  This function appends a formatted Unicode string to the Null-terminated

   Unicode string specified by String.   String is optional and may be NULL.

-  Storage for the formatted Unicode string returned is allocated using 

+  Storage for the formatted Unicode string returned is allocated using

   AllocatePool().  The pointer to the appended string is returned.  The caller

   is responsible for freeing the returned string.

- 

+

   If String is not NULL and not aligned on a 16-bit boundary, then ASSERT().

   If FormatString is NULL, then ASSERT().

   If FormatString is not aligned on a 16-bit boundary, then ASSERT().

- 

+

   @param[in] String         A Null-terminated Unicode string.

   @param[in] FormatString   A Null-terminated Unicode format string.

-  @param[in] ...            The variable argument list whose contents are 

-                            accessed based on the format string specified by 

+  @param[in] ...            The variable argument list whose contents are

+                            accessed based on the format string specified by

                             FormatString.

 

   @retval NULL    There was not enough available memory.

-  @return         Null-terminated Unicode string is that is the formatted 

+  @return         Null-terminated Unicode string is that is the formatted

                   string appended to String.

 **/

 CHAR16 *

diff --git a/MdePkg/Library/UefiLib/UefiNotTiano.c b/MdePkg/Library/UefiLib/UefiNotTiano.c
index fc3a6ea74a..6bbd7c137f 100644
--- a/MdePkg/Library/UefiLib/UefiNotTiano.c
+++ b/MdePkg/Library/UefiLib/UefiNotTiano.c
@@ -6,7 +6,7 @@
   (EDK/EFI 1.10) and new (EDK II/UEFI 2.0) way. This module is a DXE driver as

   it contains DXE enum extensions for EFI event services.

 

-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

 which accompanies this distribution.  The full text of the license may be found at

@@ -54,8 +54,8 @@ EfiCreateEventLegacyBoot (
 

 /**

   Create an EFI event in the Legacy Boot Event Group and allows

-  the caller to specify a notification function.  

-  

+  the caller to specify a notification function.

+

   This function abstracts the creation of the Legacy Boot Event.

   The Framework moved from a proprietary to UEFI 2.0 based mechanism.

   This library abstracts the caller from how this event is created to prevent

@@ -120,10 +120,10 @@ EfiCreateEventLegacyBootEx (
   Create an EFI event in the Ready To Boot Event Group.

 

   Prior to UEFI 2.0 this was done via a non-standard UEFI extension, and this library

-  abstracts the implementation mechanism of this event from the caller.   

-  This function abstracts the creation of the Ready to Boot Event.  The Framework 

-  moved from a proprietary to UEFI 2.0-based mechanism.  This library abstracts 

-  the caller from how this event is created to prevent the code form having to 

+  abstracts the implementation mechanism of this event from the caller.

+  This function abstracts the creation of the Ready to Boot Event.  The Framework

+  moved from a proprietary to UEFI 2.0-based mechanism.  This library abstracts

+  the caller from how this event is created to prevent the code form having to

   change with the version of the specification supported.

   If ReadyToBootEvent is NULL, then ASSERT().

 

@@ -149,8 +149,8 @@ EfiCreateEventReadyToBoot (
 

 /**

   Create an EFI event in the Ready To Boot Event Group and allows

-  the caller to specify a notification function.  

-  

+  the caller to specify a notification function.

+

   This function abstracts the creation of the Ready to Boot Event.

   The Framework moved from a proprietary to UEFI 2.0 based mechanism.

   This library abstracts the caller from how this event is created to prevent

@@ -214,7 +214,7 @@ EfiCreateEventReadyToBootEx (
 

 /**

   Create, Signal, and Close the Ready to Boot event using EfiSignalEventReadyToBoot().

-  

+

   This function abstracts the signaling of the Ready to Boot Event. The Framework moved

   from a proprietary to UEFI 2.0 based mechanism. This library abstracts the caller

   from how this event is created to prevent to code form having to change with the

@@ -264,14 +264,14 @@ EfiSignalEventLegacyBoot (
 

 

 /**

-  Check to see if the Firmware Volume (FV) Media Device Path is valid 

-  

-  The Framework FwVol Device Path changed to conform to the UEFI 2.0 specification.  

+  Check to see if the Firmware Volume (FV) Media Device Path is valid

+

+  The Framework FwVol Device Path changed to conform to the UEFI 2.0 specification.

   This library function abstracts validating a device path node.

-  Check the MEDIA_FW_VOL_FILEPATH_DEVICE_PATH data structure to see if it's valid.  

-  If it is valid, then return the GUID file name from the device path node.  Otherwise, 

-  return NULL.  This device path changed in the DXE CIS version 0.92 in a non back ward 

-  compatible way to not conflict with the UEFI 2.0 specification.  This function abstracts 

+  Check the MEDIA_FW_VOL_FILEPATH_DEVICE_PATH data structure to see if it's valid.

+  If it is valid, then return the GUID file name from the device path node.  Otherwise,

+  return NULL.  This device path changed in the DXE CIS version 0.92 in a non back ward

+  compatible way to not conflict with the UEFI 2.0 specification.  This function abstracts

   the differences from the caller.

   If FvDevicePathNode is NULL, then ASSERT().

 

@@ -300,16 +300,16 @@ EfiGetNameGuidFromFwVolDevicePathNode (
 

 /**

   Initialize a Firmware Volume (FV) Media Device Path node.

-  

-  The Framework FwVol Device Path changed to conform to the UEFI 2.0 specification.  

-  This library function abstracts initializing a device path node.  

-  Initialize the MEDIA_FW_VOL_FILEPATH_DEVICE_PATH data structure.  This device 

-  path changed in the DXE CIS version 0.92 in a non back ward compatible way to 

-  not conflict with the UEFI 2.0 specification.  This function abstracts the 

+

+  The Framework FwVol Device Path changed to conform to the UEFI 2.0 specification.

+  This library function abstracts initializing a device path node.

+  Initialize the MEDIA_FW_VOL_FILEPATH_DEVICE_PATH data structure.  This device

+  path changed in the DXE CIS version 0.92 in a non back ward compatible way to

+  not conflict with the UEFI 2.0 specification.  This function abstracts the

   differences from the caller.

   If FvDevicePathNode is NULL, then ASSERT().

   If NameGuid is NULL, then ASSERT().

-  

+

   @param  FvDevicePathNode  The pointer to a FV device path node to initialize

   @param  NameGuid          FV file name to use in FvDevicePathNode