IntelFrameworkPkg: 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>

17 files changed, 318 insertions, 318 deletions

diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h
index c15bca8ee4..6265caa54c 100644
--- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h
+++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h
@@ -1,10 +1,10 @@
 /** @file

   Internal include file of DXE CPU IO Library.

   It includes all necessary protocol/library class's header file

-  for implementation of IoLib library instance. It is included 

+  for implementation of IoLib library instance. It is included

   all source code of this library instance.

-  

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

+

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

   Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>

 

   This program and the accompanying materials

@@ -163,7 +163,7 @@ MmioReadWorker (
                         The caller is responsible for aligning the Address if required.

   @param  Width         The width of the I/O operation.

   @param  Data          The value to write to the I/O port.

-  

+

   @return Data read from registers in the EFI system memory space.

 

 **/

diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c
index 1dbc362f09..eadc5e5681 100644
--- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c
+++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c
@@ -1,9 +1,9 @@
 /** @file

   I/O Library.

-  The implementation of I/O operation for this library instance 

+  The implementation of I/O operation for this library instance

   are based on EFI_CPU_IO_PROTOCOL.

-  

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

+

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

   Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>

 

   This program and the accompanying materials

@@ -217,7 +217,7 @@ MmioReadWorker (
                         The caller is responsible for aligning the Address if required.

   @param  Width         The width of the I/O operation.

   @param  Data          The value to write to the I/O port.

-  

+

   @return Data read from registers in the EFI system memory space.

 

 **/

@@ -293,7 +293,7 @@ IoWrite8 (
   serialized.

 

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

- 

+

   If 16-bit I/O port operations are not supported, then ASSERT().

 

   @param  Port  The I/O port to read.

@@ -351,7 +351,7 @@ IoWrite16 (
   Reads the 32-bit I/O port specified by Port. The 32-bit read value is returned.

   This function must guarantee that all I/O read and write operations are

   serialized.

- 

+

   If Port is not aligned on a 32-bit boundary, then ASSERT().

 

   If 32-bit I/O port operations are not supported, then ASSERT().

@@ -442,7 +442,7 @@ IoRead64 (
   operations are serialized.

 

   If Port is not aligned on a 64-bit boundary, then ASSERT().

- 

+

   If 64-bit I/O port operations are not supported, then ASSERT().

 

   @param  Port  The I/O port to write.

@@ -703,7 +703,7 @@ MmioWrite8 (
   operations are serialized.

 

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

- 

+

   If 16-bit MMIO register operations are not supported, then ASSERT().

 

   @param  Address The MMIO register to read.

@@ -732,7 +732,7 @@ MmioRead16 (
   and write operations are serialized.

 

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

- 

+

   If 16-bit MMIO register operations are not supported, then ASSERT().

 

   @param  Address The MMIO register to write.

@@ -761,7 +761,7 @@ MmioWrite16 (
   operations are serialized.

 

   If Address is not aligned on a 32-bit boundary, then ASSERT().

-  

+

   If 32-bit MMIO register operations are not supported, then ASSERT().

 

   @param  Address The MMIO register to read.

@@ -790,7 +790,7 @@ MmioRead32 (
   and write operations are serialized.

 

   If Address is not aligned on a 32-bit boundary, then ASSERT().

- 

+

   If 32-bit MMIO register operations are not supported, then ASSERT().

 

   @param  Address The MMIO register to write.

@@ -819,7 +819,7 @@ MmioWrite32 (
   operations are serialized.

 

   If Address is not aligned on a 64-bit boundary, then ASSERT().

- 

+

   If 64-bit MMIO register operations are not supported, then ASSERT().

 

   @param  Address The MMIO register to read.

@@ -848,7 +848,7 @@ MmioRead64 (
   and write operations are serialized.

 

   If Address is not aligned on a 64-bit boundary, then ASSERT().

- 

+

   If 64-bit MMIO register operations are not supported, then ASSERT().

 

   @param  Address The MMIO register to write.

diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c
index b4b9ad5d2f..7bd641b6c6 100644
--- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c
+++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c
@@ -1,7 +1,7 @@
 /** @file

   I/O Library MMIO Buffer Functions.

 

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

@@ -70,7 +70,7 @@ MmioReadBuffer8 (
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().

 

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

-  

+

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

 

   @param  StartAddress    Starting address for the MMIO region to be copied from.

@@ -173,7 +173,7 @@ MmioReadBuffer32 (
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().

 

   If Length is not aligned on a 64-bit boundary, then ASSERT().

- 

+

   If Buffer is not aligned on a 64-bit boundary, then ASSERT().

 

   @param  StartAddress    Starting address for the MMIO region to be copied from.

diff --git a/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c b/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c
index e6892cbafe..d1491655fe 100644
--- a/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c
+++ b/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c
@@ -3,7 +3,7 @@
   EfiMain() is common driver entry point for all SMM driver who uses DxeSmmDriverEntryPoint

   library class.

 

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

@@ -136,9 +136,9 @@ _DriverUnloadHandler (
 {

   //

   // Call the unload handlers for all the modules.

-  // 

-  // Note: All libraries were constructed in SMM space, 

-  // therefore we can not destruct them in Unload 

+  //

+  // Note: All libraries were constructed in SMM space,

+  // therefore we can not destruct them in Unload

   // handler.

   //

   return ProcessModuleUnloadList (ImageHandle);

diff --git a/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf b/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf
index 9a5b523ea0..5b20355665 100644
--- a/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf
+++ b/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf
@@ -3,7 +3,7 @@
 #

 # Register driver in SMRAM and wrapper driver's library constructors and entry point.

 #

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

@@ -49,7 +49,7 @@
   gEfiLoadedImageProtocolGuid                   ## CONSUMES

   gEfiSmmBaseProtocolGuid                       ## CONSUMES

   gEfiDevicePathProtocolGuid                    ## CONSUMES

-  

+

 [Depex]

   gEfiSmmBaseProtocolGuid

 

diff --git a/IntelFrameworkPkg/Library/FrameworkUefiLib/Console.c b/IntelFrameworkPkg/Library/FrameworkUefiLib/Console.c
index 244e532f57..d32492f7cd 100644
--- a/IntelFrameworkPkg/Library/FrameworkUefiLib/Console.c
+++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/Console.c
@@ -1,14 +1,14 @@
 /** @file

   This module provide help function for displaying unicode string.

 

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

 

 **/

 

@@ -28,7 +28,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.

    *

@@ -75,7 +75,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.

    *

@@ -107,7 +107,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.

    *

@@ -130,13 +130,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

   *

@@ -152,7 +152,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.

    *

@@ -215,7 +215,7 @@ GetGlyphWidth (
   Item  = NULL;

   Low   = 0;

   High  = (sizeof (mUnicodeWidthTable)) / (sizeof (UNICODE_WIDTH_ENTRY)) - 1;

-  while (Low <= High) {    

+  while (Low <= High) {

     Index = (Low + High) >> 1;

     Item  = &(mUnicodeWidthTable[Index]);

     if (Index == 0) {

@@ -253,13 +253,13 @@ GetGlyphWidth (
   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. 

+  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

@@ -289,27 +289,27 @@ UnicodeStringDisplayLength (
 }

 

 /**

-  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

   ...

   )

@@ -330,7 +330,7 @@ CreatePopUp (
   UINTN                            EventIndex;

 

   //

-  // 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);

@@ -356,7 +356,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

   //

@@ -396,7 +396,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/IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.inf b/IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.inf
index 7057ef6e26..26bb79e9b4 100644
--- a/IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.inf
+++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.inf
@@ -1,11 +1,11 @@
 ## @file

 #  Library to abstract Framework extensions that conflict with UEFI 2.0 Specification.

 #

-#  This library is helpful to port Framework/Tinao code that has conflicts with UEFI 2.0. 

+#  This library is helpful to port Framework/Tinao code that has conflicts with UEFI 2.0.

 #  It hides the old conflicts with library functions and supporting implementations of

 #  the old (EDK/EFI 1.10) and new (EDK II/UEFI 2.0) way.

 #

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

@@ -51,7 +51,7 @@
   BaseLib

   UefiBootServicesTableLib

   DevicePathLib

-  

+

 [Guids]

   gEfiEventReadyToBootGuid                      ## SOMETIMES_CONSUMES  ## Event

   gEfiEventLegacyBootGuid                       ## SOMETIMES_CONSUMES  ## Event

diff --git a/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiDriverModel.c b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiDriverModel.c
index 9cd35fb3ca..83482dad1c 100644
--- a/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiDriverModel.c
+++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/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.

@@ -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/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLib.c b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLib.c
index a32b524ff8..0aa4506b8f 100644
--- a/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLib.c
+++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/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>

@@ -47,7 +47,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

@@ -96,7 +96,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().

@@ -109,7 +109,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.

 

@@ -170,7 +170,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().

@@ -178,7 +178,7 @@ EfiCreateProtocolNotifyEvent(
   @param  Name                  Supplies 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.

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

   ASSERT (NotifyFunction != NULL);

   ASSERT (NotifyTpl <= TPL_HIGH_LEVEL);

-  

+

   //

   // Create event

   //

@@ -343,13 +343,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.

@@ -373,8 +373,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().

@@ -405,8 +405,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().

@@ -471,8 +471,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().

@@ -506,7 +506,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.

@@ -569,10 +569,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

@@ -631,26 +631,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.

 

 **/

@@ -723,7 +723,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.

@@ -743,11 +743,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.

 

 **/

@@ -833,13 +833,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.

@@ -847,19 +847,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.

 

 **/

@@ -1022,21 +1022,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.

 

 **/

@@ -1120,7 +1120,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;

@@ -1202,7 +1202,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.

@@ -1252,8 +1252,8 @@ FreeUnicodeStringTable (
 }

 

 /**

-  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().

 

@@ -1314,10 +1314,10 @@ GetVariable (
 

 

 /**

-  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().

@@ -1442,50 +1442,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,

   ...

   )

@@ -1564,7 +1564,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--);

       }

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

 

   //

-  // No matches were found 

+  // No matches were found

   //

   return NULL;

 }

diff --git a/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibPrint.c b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibPrint.c
index 6f06efbe05..28b0817557 100644
--- a/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibPrint.c
+++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/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   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 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   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 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   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 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   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 Number of ASCII characters printed to ConErr.

 

 **/

@@ -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       Null-terminated Unicode format string.  See Print Library 

+  @param  Format       Null-terminated Unicode 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 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       Null-terminated ASCII format string.  See Print Library 

+  @param  Format       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/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiNotTiano.c b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiNotTiano.c
index e641aba647..b4937bab1f 100644
--- a/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiNotTiano.c
+++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/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 - 2007, 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

@@ -276,7 +276,7 @@ EfiGetNameGuidFromFwVolDevicePathNode (
   ASSERT (FvDevicePathNode != NULL);

 

   //

-  // EFI Specification extension on Media Device Path. MEDIA_FW_VOL_FILEPATH_DEVICE_PATH is adopted by UEFI later and added in UEFI2.10. 

+  // EFI Specification extension on Media Device Path. MEDIA_FW_VOL_FILEPATH_DEVICE_PATH is adopted by UEFI later and added in UEFI2.10.

   // In EdkCompatibility Package, we only support MEDIA_FW_VOL_FILEPATH_DEVICE_PATH that complies with

   // EFI 1.10 and UEFI 2.10.

   //

@@ -314,14 +314,14 @@ EfiInitializeFwVolDevicepathNode (
   ASSERT (NameGuid          != NULL);

 

   //

-  // EFI Specification extension on Media Device Path. MEDIA_FW_VOL_FILEPATH_DEVICE_PATH is adopted by UEFI later and added in UEFI2.10. 

+  // EFI Specification extension on Media Device Path. MEDIA_FW_VOL_FILEPATH_DEVICE_PATH is adopted by UEFI later and added in UEFI2.10.

   // In EdkCompatibility Package, we only support MEDIA_FW_VOL_FILEPATH_DEVICE_PATH that complies with

   // EFI 1.10 and UEFI 2.10.

   //

   FvDevicePathNode->Header.Type     = MEDIA_DEVICE_PATH;

   FvDevicePathNode->Header.SubType  = MEDIA_PIWG_FW_FILE_DP;

   SetDevicePathNodeLength (&FvDevicePathNode->Header, sizeof (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH));

-  

+

   CopyGuid (&FvDevicePathNode->FvFileName, NameGuid);

 }

 

diff --git a/IntelFrameworkPkg/Library/PeiHobLibFramework/HobLib.c b/IntelFrameworkPkg/Library/PeiHobLibFramework/HobLib.c
index eb89b4a535..6cc0816f9d 100644
--- a/IntelFrameworkPkg/Library/PeiHobLibFramework/HobLib.c
+++ b/IntelFrameworkPkg/Library/PeiHobLibFramework/HobLib.c
@@ -3,9 +3,9 @@
 

  HOB Library implementation that uses PEI Services to retrieve the HOB List.

  This library instance uses EFI_HOB_TYPE_CV defined in Intel framework HOB specification v0.9

- to implement HobLib BuildCvHob() API. 

+ to implement HobLib BuildCvHob() API.

 

-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

@@ -29,15 +29,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Returns the pointer to the HOB list.

 

   This function returns the pointer to first HOB in the list.

-  For PEI phase, the PEI service GetHobList() can be used to retrieve the pointer 

+  For PEI phase, the PEI service GetHobList() can be used to retrieve the pointer

   to the HOB list.  For the DXE phase, the HOB list pointer can be retrieved through

   the EFI System Table by looking up theHOB list GUID in the System Configuration Table.

-  Since the System Configuration Table does not exist that the time the DXE Core is 

-  launched, the DXE Core uses a global variable from the DXE Core Entry Point Library 

+  Since the System Configuration Table does not exist that the time the DXE Core is

+  launched, the DXE Core uses a global variable from the DXE Core Entry Point Library

   to manage the pointer to the HOB list.

-  

+

   If the pointer to the HOB list is NULL, then ASSERT().

-  

+

   @return The pointer to the HOB list.

 

 **/

@@ -60,12 +60,12 @@ GetHobList (
 /**

   Returns the next instance of a HOB type from the starting HOB.

 

-  This function searches the first instance of a HOB type from the starting HOB pointer. 

+  This function searches the first instance of a HOB type from the starting HOB pointer.

   If there does not exist such HOB type from the starting HOB pointer, it will return NULL.

   In contrast with macro GET_NEXT_HOB(), this function does not skip the starting HOB pointer

   unconditionally: it returns HobStart back if HobStart itself meets the requirement;

   caller is required to use GET_NEXT_HOB() if it wishes to skip current HobStart.

-  

+

   If HobStart is NULL, then ASSERT().

 

   @param  Type          The HOB type to return.

@@ -84,7 +84,7 @@ GetNextHob (
   EFI_PEI_HOB_POINTERS  Hob;

 

   ASSERT (HobStart != NULL);

-   

+

   Hob.Raw = (UINT8 *) HobStart;

   //

   // Parse the HOB list until end of list or matching type is found.

@@ -101,9 +101,9 @@ GetNextHob (
 /**

   Returns the first instance of a HOB type among the whole HOB list.

 

-  This function searches the first instance of a HOB type among the whole HOB list. 

-  If there does not exist such HOB type in the HOB list, it will return NULL. 

-  

+  This function searches the first instance of a HOB type among the whole HOB list.

+  If there does not exist such HOB type in the HOB list, it will return NULL.

+

   If the pointer to the HOB list is NULL, then ASSERT().

 

   @param  Type          The HOB type to return.

@@ -125,17 +125,17 @@ GetFirstHob (
 

 /**

   Returns the next instance of the matched GUID HOB from the starting HOB.

-  

-  This function searches the first instance of a HOB from the starting HOB pointer. 

-  Such HOB should satisfy two conditions: 

-  its HOB type is EFI_HOB_TYPE_GUID_EXTENSION and its GUID Name equals to the input Guid. 

-  If there does not exist such HOB from the starting HOB pointer, it will return NULL. 

+

+  This function searches the first instance of a HOB from the starting HOB pointer.

+  Such HOB should satisfy two conditions:

+  its HOB type is EFI_HOB_TYPE_GUID_EXTENSION and its GUID Name equals to the input Guid.

+  If there does not exist such HOB from the starting HOB pointer, it will return NULL.

   Caller is required to apply GET_GUID_HOB_DATA () and GET_GUID_HOB_DATA_SIZE ()

   to extract the data section and its size info respectively.

   In contrast with macro GET_NEXT_HOB(), this function does not skip the starting HOB pointer

   unconditionally: it returns HobStart back if HobStart itself meets the requirement;

   caller is required to use GET_NEXT_HOB() if it wishes to skip current HobStart.

-  

+

   If Guid is NULL, then ASSERT().

   If HobStart is NULL, then ASSERT().

 

@@ -166,14 +166,14 @@ GetNextGuidHob (
 

 /**

   Returns the first instance of the matched GUID HOB among the whole HOB list.

-  

-  This function searches the first instance of a HOB among the whole HOB list. 

+

+  This function searches the first instance of a HOB among the whole HOB list.

   Such HOB should satisfy two conditions:

   its HOB type is EFI_HOB_TYPE_GUID_EXTENSION and its GUID Name equals to the input Guid.

   If there does not exist such HOB from the starting HOB pointer, it will return NULL.

   Caller is required to apply GET_GUID_HOB_DATA () and GET_GUID_HOB_DATA_SIZE ()

   to extract the data section and its size info respectively.

-  

+

   If the pointer to the HOB list is NULL, then ASSERT().

   If Guid is NULL, then ASSERT().

 

@@ -197,11 +197,11 @@ GetFirstGuidHob (
 /**

   Get the system boot mode from the HOB list.

 

-  This function returns the system boot mode information from the 

+  This function returns the system boot mode information from the

   PHIT HOB in HOB list.

 

   If the pointer to the HOB list is NULL, then ASSERT().

-  

+

   @param  VOID

 

   @return The Boot Mode.

@@ -261,7 +261,7 @@ InternalPeiCreateHob (
   This function builds a HOB for a loaded PE32 module.

   It can only be invoked during PEI phase;

   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.

-  

+

   If ModuleName is NULL, then ASSERT().

   If there is no additional space for HOB creation, then ASSERT().

 

@@ -299,7 +299,7 @@ BuildModuleHob (
   // Zero the reserved space to match HOB spec

   //

   ZeroMem (Hob->MemoryAllocationHeader.Reserved, sizeof (Hob->MemoryAllocationHeader.Reserved));

-  

+

   CopyGuid (&Hob->ModuleName, ModuleName);

   Hob->EntryPoint = EntryPoint;

 }

@@ -310,7 +310,7 @@ BuildModuleHob (
   This function builds a HOB that describes a chunk of system memory.

   It can only be invoked during PEI phase;

   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.

-  

+

   If there is no additional space for HOB creation, then ASSERT().

 

   @param  ResourceType        The type of resource described by this HOB.

@@ -351,7 +351,7 @@ BuildResourceDescriptorWithOwnerHob (
   This function builds a HOB that describes a chunk of system memory.

   It can only be invoked during PEI phase;

   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.

-  

+

   If there is no additional space for HOB creation, then ASSERT().

 

   @param  ResourceType        The type of resource described by this HOB.

@@ -384,15 +384,15 @@ BuildResourceDescriptorHob (
 }

 

 /**

-  Builds a customized HOB tagged with a GUID for identification and returns 

+  Builds a customized HOB tagged with a GUID for identification and returns

   the start address of GUID HOB data.

 

-  This function builds a customized HOB tagged with a GUID for identification 

-  and returns the start address of GUID HOB data so that caller can fill the customized data. 

+  This function builds a customized HOB tagged with a GUID for identification

+  and returns the start address of GUID HOB data so that caller can fill the customized data.

   The HOB Header and Name field is already stripped.

   It can only be invoked during PEI phase;

   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.

-  

+

   If Guid is NULL, then ASSERT().

   If there is no additional space for HOB creation, then ASSERT().

   If DataLength >= (0x10000 - sizeof (EFI_HOB_GUID_TYPE)), then ASSERT().

@@ -417,7 +417,7 @@ BuildGuidHob (
   // Make sure Guid is valid

   //

   ASSERT (Guid != NULL);

-  

+

   //

   // Make sure that data length is not too long.

   //

@@ -432,16 +432,16 @@ BuildGuidHob (
 }

 

 /**

-  Builds a customized HOB tagged with a GUID for identification, copies the input data to the HOB 

+  Builds a customized HOB tagged with a GUID for identification, copies the input data to the HOB

   data field, and returns the start address of the GUID HOB data.

 

   This function builds a customized HOB tagged with a GUID for identification and copies the input

-  data to the HOB data field and returns the start address of the GUID HOB data.  It can only be 

-  invoked during PEI phase; for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.  

+  data to the HOB data field and returns the start address of the GUID HOB data.  It can only be

+  invoked during PEI phase; for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.

   The HOB Header and Name field is already stripped.

   It can only be invoked during PEI phase;

   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.

-  

+

   If Guid is NULL, then ASSERT().

   If Data is NULL and DataLength > 0, then ASSERT().

   If there is no additional space for HOB creation, then ASSERT().

@@ -537,7 +537,7 @@ InternalCheckFvAlignment (
   This function builds a Firmware Volume HOB.

   It can only be invoked during PEI phase;

   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.

-  

+

   If there is no additional space for HOB creation, then ASSERT().

   If the FvImage buffer is not at its required alignment, then ASSERT().

 

@@ -574,7 +574,7 @@ BuildFvHob (
   This function builds a EFI_HOB_TYPE_FV2 HOB.

   It can only be invoked during PEI phase;

   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.

-  

+

   If there is no additional space for HOB creation, then ASSERT().

   If the FvImage buffer is not at its required alignment, then ASSERT().

 

@@ -582,7 +582,7 @@ BuildFvHob (
   @param  Length        The size of the Firmware Volume in bytes.

   @param  FvName        The name of the Firmware Volume.

   @param  FileName      The name of the file.

-  

+

 **/

 VOID

 EFIAPI

@@ -671,7 +671,7 @@ BuildFv3Hob (
   This function builds a Capsule Volume HOB.

   It can only be invoked during PEI phase;

   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.

-  

+

   If the platform does not support Capsule Volume HOBs, then ASSERT().

   If there is no additional space for HOB creation, then ASSERT().

 

@@ -703,7 +703,7 @@ BuildCvHob (
   This function builds a HOB for the CPU.

   It can only be invoked during PEI phase;

   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.

-  

+

   If there is no additional space for HOB creation, then ASSERT().

 

   @param  SizeOfMemorySpace   The maximum physical memory addressability of the processor.

@@ -730,7 +730,7 @@ BuildCpuHob (
   //

   // Zero the reserved space to match HOB spec

   //

-  ZeroMem (Hob->Reserved, sizeof (Hob->Reserved)); 

+  ZeroMem (Hob->Reserved, sizeof (Hob->Reserved));

 }

 

 /**

@@ -739,7 +739,7 @@ BuildCpuHob (
   This function builds a HOB for the stack.

   It can only be invoked during PEI phase;

   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.

-  

+

   If there is no additional space for HOB creation, then ASSERT().

 

   @param  BaseAddress   The 64 bit physical address of the Stack.

@@ -780,7 +780,7 @@ BuildStackHob (
   This function builds a HOB for BSP store.

   It can only be invoked during PEI phase;

   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.

-  

+

   If there is no additional space for HOB creation, then ASSERT().

 

   @param  BaseAddress   The 64 bit physical address of the BSP.

@@ -823,7 +823,7 @@ BuildBspStoreHob (
   This function builds a HOB for the memory allocation.

   It can only be invoked during PEI phase;

   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.

-  

+

   If there is no additional space for HOB creation, then ASSERT().

 

   @param  BaseAddress   The 64 bit physical address of the memory.

@@ -843,12 +843,12 @@ BuildMemoryAllocationHob (
 

   ASSERT (((BaseAddress & (EFI_PAGE_SIZE - 1)) == 0) &&

           ((Length & (EFI_PAGE_SIZE - 1)) == 0));

-  

+

   Hob = InternalPeiCreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, (UINT16) sizeof (EFI_HOB_MEMORY_ALLOCATION));

   if (Hob == NULL) {

     return;

   }

-  

+

   ZeroMem (&(Hob->AllocDescriptor.Name), sizeof (EFI_GUID));

   Hob->AllocDescriptor.MemoryBaseAddress = BaseAddress;

   Hob->AllocDescriptor.MemoryLength      = Length;

diff --git a/IntelFrameworkPkg/Library/PeiHobLibFramework/PeiHobLibFramework.inf b/IntelFrameworkPkg/Library/PeiHobLibFramework/PeiHobLibFramework.inf
index b10be00685..bd9d4f9e90 100644
--- a/IntelFrameworkPkg/Library/PeiHobLibFramework/PeiHobLibFramework.inf
+++ b/IntelFrameworkPkg/Library/PeiHobLibFramework/PeiHobLibFramework.inf
@@ -3,9 +3,9 @@
 #

 # HOB Library implementation that uses PEI Services to retrieve the HOB List.

 # This library instance uses EFI_HOB_TYPE_CV defined in Intel framework HOB specification v0.9

-# to implement HobLib BuildCvHob() API. 

+# to implement HobLib BuildCvHob() API.

 #

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

@@ -54,5 +54,5 @@
 #   MEMORY_ALLOCATION     ## SOMETIMES_PRODUCES

 #   RESOURCE_DESCRIPTOR   ## SOMETIMES_PRODUCES

 #   FIRMWARE_VOLUME       ## SOMETIMES_PRODUCES

-#   

+#

 

diff --git a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/InternalSmbusLib.h b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/InternalSmbusLib.h
index c6ea2dabf7..e66f7b130b 100644
--- a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/InternalSmbusLib.h
+++ b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/InternalSmbusLib.h
@@ -1,14 +1,14 @@
 /** @file

   Internal header file for Smbus library.

 

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

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

 

 **/

 

@@ -46,7 +46,7 @@ InternalGetSmbusPpi (
   );

 

 /**

-  Executes an SMBus operation to an SMBus controller. 

+  Executes an SMBus operation to an SMBus controller.

 

   This function provides a standard way to execute Smbus script

   as defined in the SmBus Specification. The data can either be of

diff --git a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLib.c b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLib.c
index 33d9096833..ae5cbb26b4 100644
--- a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLib.c
+++ b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLib.c
@@ -1,14 +1,14 @@
 /** @file

   Implementation of SmBusLib class library for PEI phase.

 

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

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

 

 **/

 

@@ -19,14 +19,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

   This internal function retrieves Smbus PPI from PPI database.

   If gEfiPeiSmbusPpiGuid can not be located, then ASSERT()

-  

+

   @return The pointer to Smbus PPI.

 

 **/

 EFI_PEI_SMBUS_PPI *

 InternalGetSmbusPpi (

   VOID

-  ) 

+  )

 {

   EFI_STATUS            Status;

   EFI_PEI_SMBUS_PPI     *SmbusPpi;

@@ -39,7 +39,7 @@ InternalGetSmbusPpi (
 }

 

 /**

-  Executes an SMBus operation to an SMBus controller. 

+  Executes an SMBus operation to an SMBus controller.

 

   This function provides a standard way to execute Smbus script

   as defined in the SmBus Specification. The data can either be of

@@ -83,7 +83,7 @@ InternalSmBusExec (
                              SmbusDeviceAddress,

                              SMBUS_LIB_COMMAND (SmBusAddress),

                              SmbusOperation,

-                             SMBUS_LIB_PEC (SmBusAddress),  

+                             SMBUS_LIB_PEC (SmBusAddress),

                              &Length,

                              Buffer

                              );

diff --git a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLibSmbusPpi.inf b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLibSmbusPpi.inf
index d56d4d3fa9..643c2767f3 100644
--- a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLibSmbusPpi.inf
+++ b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLibSmbusPpi.inf
@@ -1,7 +1,7 @@
 ## @file

 # SMBUS library that layers on top of the SMBUS PPI.

 #

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

@@ -20,7 +20,7 @@
   FILE_GUID                      = 51C4C059-67F0-4e3c-9A55-FF42A8291C8C

   MODULE_TYPE                    = PEIM

   VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = SmbusLib|PEIM 

+  LIBRARY_CLASS                  = SmbusLib|PEIM

 

 

 #

diff --git a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/SmbusLib.c b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/SmbusLib.c
index 40b482e392..cf3b80a6cb 100644
--- a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/SmbusLib.c
+++ b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/SmbusLib.c
@@ -1,14 +1,14 @@
 /** @file

 Implementation of SmBusLib class library for PEI phase.

 

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

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

 

 

 Module Name: SmbusLib.c

@@ -189,7 +189,7 @@ SmBusReadDataByte (
   ASSERT (SMBUS_LIB_RESERVED (SmBusAddress) == 0);

 

   InternalSmBusExec (EfiSmbusReadByte, SmBusAddress, 1, &Byte, Status);

-  

+

   return Byte;

 }

 

@@ -228,7 +228,7 @@ SmBusWriteDataByte (
 

   Byte = Value;

   InternalSmBusExec (EfiSmbusWriteByte, SmBusAddress, 1, &Byte, Status);

-  

+

   return Value;

 }

 

@@ -241,7 +241,7 @@ SmBusWriteDataByte (
   If Status is not NULL, then the status of the executed command is returned in Status.

   If Length in SmBusAddress is not zero, then ASSERT().

   If any reserved bits of SmBusAddress are set, then ASSERT().

-  

+

   @param  SmBusAddress    Address that encodes the SMBUS Slave Address,

                           SMBUS Command, SMBUS Data Length, and PEC.

   @param  Status          Return status for the executed command.

@@ -263,7 +263,7 @@ SmBusReadDataWord (
   ASSERT (SMBUS_LIB_RESERVED (SmBusAddress) == 0);

 

   InternalSmBusExec (EfiSmbusReadWord, SmBusAddress, 2, &Word, Status);

-  

+

   return Word;

 }

 

@@ -338,7 +338,7 @@ SmBusProcessCall (
   ASSERT (SMBUS_LIB_RESERVED (SmBusAddress) == 0);

 

   InternalSmBusExec (EfiSmbusProcessCall, SmBusAddress, 2, &Value, Status);

-  

+

   return Value;

 }

 

@@ -387,7 +387,7 @@ SmBusReadBlock (
   The SMBUS slave address, SMBUS command, and SMBUS length fields of SmBusAddress are required.

   Bytes are written to the SMBUS from Buffer.

   The number of bytes written is returned, and will never return a value larger than 32-bytes.

-  If Status is not NULL, then the status of the executed command is returned in Status.  

+  If Status is not NULL, then the status of the executed command is returned in Status.

   If Length in SmBusAddress is zero or greater than 32, then ASSERT().

   If Buffer is NULL, then ASSERT().

   If any reserved bits of SmBusAddress are set, then ASSERT().