SourceLevelDebugPkg: 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>
Reviewed-by: Hao Wu <hao.a.wu@intel.com>

25 files changed, 220 insertions, 220 deletions

diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c
index 0a021307dc..0db33e66aa 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c
@@ -383,9 +383,9 @@ DebugAgentReadBuffer (
   UINT32                   TimerRound;

   UINT32                   TimerFrequency;

   UINT32                   TimerCycle;

-  

+

   Begin         = 0;

-  TimeoutTicker = 0;  

+  TimeoutTicker = 0;

   TimerRound    = 0;

   TimerFrequency = GetMailboxPointer()->DebugTimerFrequency;

   TimerCycle = GetApicTimerInitCount ();

@@ -405,7 +405,7 @@ DebugAgentReadBuffer (
   while (Index < NumberOfBytes) {

     if (DebugPortPollBuffer (Handle)) {

       DebugPortReadBuffer (Handle, Buffer + Index, 1, 0);

-      Index ++; 

+      Index ++;

       continue;

     }

     if (Timeout != 0) {

@@ -652,7 +652,7 @@ ReadRemainingBreakPacket (
   if (IS_REQUEST (DebugHeader)) {

     if (DebugHeader->SequenceNo == (UINT8) (Mailbox->HostSequenceNo + 1)) {

       //

-      // Only updagte HostSequenceNo for new command packet 

+      // Only updagte HostSequenceNo for new command packet

       //

       UpdateMailboxContent (Mailbox, DEBUG_MAILBOX_HOST_SEQUENCE_NO_INDEX, DebugHeader->SequenceNo);

       return EFI_SUCCESS;

@@ -1476,7 +1476,7 @@ CompressData (
         if (Send) {

           DebugPortWriteBuffer (Handle, &LastChar, 1);

         }

-        

+

       } else if (LastCharCount >= 2) {

         CompressedIndex += 3;

         LastCharCount -= 2;

diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.h b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.h
index e09ead9cf0..8b207445b0 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.h
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.h
@@ -1,7 +1,7 @@
 /** @file

   Command header of for Debug Agent library instance.

 

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

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

@@ -126,7 +126,7 @@ typedef union {
     //

     UINT32  BreakOnNextSmi    : 1;   // 1: Break on next SMI

     UINT32  PrintErrorLevel   : 4;   // Bitmask of print error level for debug message

-    UINT32  BreakOnBootScript : 1;   // 1: Break before executing boot script 

+    UINT32  BreakOnBootScript : 1;   // 1: Break before executing boot script

     UINT32  Reserved2         : 26;

   } Bits;

   UINT64  Uint64;

@@ -285,7 +285,7 @@ DebugReadBreakSymbol (
 

   @param[in] ErrorLevel  The error level of the debug message.

   @param[in] Format      Format string for the debug message to print.

-  @param[in] ...         Variable argument list whose contents are accessed 

+  @param[in] ...         Variable argument list whose contents are accessed

                          based on the format string specified by Format.

 

 **/

@@ -322,13 +322,13 @@ MultiProcessorDebugSupport (
 

 /**

   Find and report module image info to HOST.

-  

+

   @param[in] AlignSize      Image aligned size.

-  

+

 **/

-VOID 

+VOID

 FindAndReportModuleImageInfo (

-  IN UINTN          AlignSize                   

+  IN UINTN          AlignSize

   );

 

 /**

@@ -338,7 +338,7 @@ FindAndReportModuleImageInfo (
   @retval  FALSE    IDT entries were not setup by Debug Agent.

 

 **/

-BOOLEAN 

+BOOLEAN

 IsDebugAgentInitialzed (

   VOID

   );

@@ -362,7 +362,7 @@ UpdateMailboxChecksum (
   @param[in]  Mailbox  Debug Agent Mailbox pointer.

 

 **/

-VOID 

+VOID

 VerifyMailboxChecksum (

   IN DEBUG_AGENT_MAILBOX    *Mailbox

   );

@@ -374,17 +374,17 @@ VerifyMailboxChecksum (
   @param[in]  FlagValue     Debug flag value.

 

 **/

-VOID 

+VOID

 SetDebugFlag (

   IN UINT64                 FlagMask,

-  IN UINT32                 FlagValue                          

+  IN UINT32                 FlagValue

   );

 

 /**

   Get debug flag in mailbox.

 

   @param[in]  FlagMask      Debug flag mask value.

-  

+

   @return Debug flag value.

 

 **/

@@ -399,10 +399,10 @@ GetDebugFlag (
   @param[in]  Mailbox  Debug Agent Mailbox pointer.

   @param[in]  Index    Mailbox content index.

   @param[in]  Value    Value to be set into mail box.

-  

+

 **/

 VOID

-UpdateMailboxContent ( 

+UpdateMailboxContent (

   IN DEBUG_AGENT_MAILBOX    *Mailbox,

   IN UINTN                  Index,

   IN UINT64                 Value

@@ -412,7 +412,7 @@ UpdateMailboxContent (
   Retrieve exception handler from IDT table by ExceptionNum.

 

   @param[in]  ExceptionNum    Exception number

- 

+

   @return Exception handler

 

 **/

@@ -425,7 +425,7 @@ GetExceptionHandlerInIdtEntry (
   Set exception handler in IDT table by ExceptionNum.

 

   @param[in]  ExceptionNum      Exception number

-  @param[in]  ExceptionHandler  Exception Handler to be set 

+  @param[in]  ExceptionHandler  Exception Handler to be set

 

 **/

 VOID

@@ -437,15 +437,15 @@ SetExceptionHandlerInIdtEntry (
 /**

   Prints a debug message to the debug output device if the specified error level is enabled.

 

-  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function 

-  GetDebugPrintErrorLevel (), then print the message specified by Format and the 

+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function

+  GetDebugPrintErrorLevel (), then print the message specified by Format and the

   associated variable argument list to the debug output device.

 

   If Format is NULL, then ASSERT().

 

   @param[in] ErrorLevel  The error level of the debug message.

   @param[in] IsSend      Flag of debug message to declare that the data is being sent or being received.

-  @param[in] Data        Variable argument list whose contents are accessed 

+  @param[in] Data        Variable argument list whose contents are accessed

   @param[in] Length      based on the format string specified by Format.

 

 **/

@@ -455,7 +455,7 @@ DebugAgentDataMsgPrint (
   IN UINT8             ErrorLevel,

   IN BOOLEAN           IsSend,

   IN UINT8             *Data,

-  IN UINT8             Length  

+  IN UINT8             Length

   );

 

 /**

diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.c b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.c
index e3ed08db49..9d048d89c9 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.c
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.c
@@ -142,10 +142,10 @@ DebugAgentIsBsp (
   )

 {

   MSR_IA32_APIC_BASE_REGISTER  MsrApicBase;

-  

+

   //

   // If there are less than 2 CPUs detected, then the currently executing CPU

-  // must be the BSP.  This avoids an access to an MSR that may not be supported 

+  // must be the BSP.  This avoids an access to an MSR that may not be supported

   // on single core CPUs.

   //

   if (mDebugCpuData.CpuCount < 2) {

diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.h b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.h
index f0cb3f6c1d..d8afefe56e 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.h
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.h
@@ -189,7 +189,7 @@ UINT32
 FindNextPendingBreakCpu (

   VOID

   );

-  

+

 /**

   Check if all processors are in running status.

 

@@ -205,18 +205,18 @@ IsAllCpuRunning (
 /**

   Check if the current processor is the first breaking processor.

 

-  If yes, halt other processors.  

-  

+  If yes, halt other processors.

+

   @param[in] ProcessorIndex   Processor index value.

-  

+

   @return TRUE       This processor is the first breaking processor.

   @return FALSE      This processor is not the first breaking processor.

-                            

+

 **/

 BOOLEAN

 IsFirstBreakProcessor (

   IN UINT32              ProcessorIndex

   );

-  

+

 #endif

 

diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/Ia32/ArchDebugSupport.c b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/Ia32/ArchDebugSupport.c
index 1aef63f206..1ecde2d4cc 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/Ia32/ArchDebugSupport.c
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/Ia32/ArchDebugSupport.c
@@ -1,7 +1,7 @@
 /** @file

   Supporting functions for IA32 architecture.

 

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

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

@@ -58,9 +58,9 @@ InitializeDebugIdt (
   IdtEntry[DEBUG_TIMER_VECTOR].Bits.OffsetHigh = (UINT16)((UINTN)InterruptHandler >> 16);

   IdtEntry[DEBUG_TIMER_VECTOR].Bits.Selector   = CodeSegment;

   IdtEntry[DEBUG_TIMER_VECTOR].Bits.GateType   = IA32_IDT_GATE_TYPE_INTERRUPT_32;

-  

+

   //

-  // If the CPU supports Debug Extensions(CPUID:01 EDX:BIT2), then 

+  // If the CPU supports Debug Extensions(CPUID:01 EDX:BIT2), then

   // Set DE flag in CR4 to enable IO breakpoint

   //

   AsmCpuid (1, NULL, NULL, NULL, &RegEdx);

@@ -73,7 +73,7 @@ InitializeDebugIdt (
   Retrieve exception handler from IDT table by ExceptionNum.

 

   @param[in]  ExceptionNum    Exception number

- 

+

   @return Exception handler

 

 **/

@@ -90,13 +90,13 @@ GetExceptionHandlerInIdtEntry (
 

   return (VOID *) (((UINTN)IdtEntry[ExceptionNum].Bits.OffsetLow) |

                   (((UINTN)IdtEntry[ExceptionNum].Bits.OffsetHigh) << 16));

-} 

+}

 

 /**

   Set exception handler in IDT table by ExceptionNum.

 

   @param[in]  ExceptionNum      Exception number

-  @param[in]  ExceptionHandler  Exception Handler to be set 

+  @param[in]  ExceptionHandler  Exception Handler to be set

 

 **/

 VOID

diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/Ia32/AsmFuncs.S b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/Ia32/AsmFuncs.S
index a6a3da6a6b..30d279e80d 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/Ia32/AsmFuncs.S
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/Ia32/AsmFuncs.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------

 #

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

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

@@ -235,21 +235,21 @@ NoExtrPush:
 ## insure FXSAVE/FXRSTOR is enabled in CR4...

 ## ... while we're at it, make sure DE is also enabled...

   mov     $1, %eax

-  pushl   %ebx                         # temporarily save value of ebx on stack 

-  cpuid                                # use CPUID to determine if FXSAVE/FXRESTOR 

+  pushl   %ebx                         # temporarily save value of ebx on stack

+  cpuid                                # use CPUID to determine if FXSAVE/FXRESTOR

                                        # and DE are supported

   popl    %ebx                         # retore value of ebx that was overwritten

-                                       # by CPUID 

+                                       # by CPUID

   movl    %cr4, %eax

   pushl   %eax                         # push cr4 firstly

   testl   $BIT24, %edx                 # Test for FXSAVE/FXRESTOR support

   jz      L1

   orl     $BIT9, %eax                  # Set CR4.OSFXSR

-L1:    

+L1:

   testl   $BIT2, %edx                  # Test for Debugging Extensions support

   jz      L2

   orl     $BIT3, %eax                  # Set CR4.DE

-L2:    

+L2:

   movl    %eax, %cr4

   movl    %cr3, %eax

   pushl   %eax

@@ -322,14 +322,14 @@ L2:
                            # edx still contains result from CPUID above

   jz      L3

   .byte 0x0f, 0xae, 0x07   # fxsave [edi]

-L3:  

+L3:

 

 ## save the exception data

   pushl   8(%esp)

 

 ## Clear Direction Flag

   cld

-	

+

 ## Prepare parameter and call C function

   pushl   %esp

   pushl   %ebx

@@ -347,7 +347,7 @@ L3:
   testl   $BIT24, %edx     # Test for FXSAVE/FXRESTOR support

   jz      L4

   .byte 0x0f, 0xae, 0x0e   # fxrstor [esi]

-L4:  

+L4:

   addl    $512,%esp

 

 ## UINT32  Dr0, Dr1, Dr2, Dr3, Dr6, Dr7;

@@ -412,4 +412,4 @@ L4:
   popl    %ebp

   addl    $8,%esp   # skip eax

   iretl

-  

+

diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/X64/ArchDebugSupport.c b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/X64/ArchDebugSupport.c
index 08cef0154f..a0e56481a5 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/X64/ArchDebugSupport.c
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/X64/ArchDebugSupport.c
@@ -1,7 +1,7 @@
 /** @file

   Supporting functions for X64 architecture.

 

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

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

@@ -62,7 +62,7 @@ InitializeDebugIdt (
   IdtEntry[DEBUG_TIMER_VECTOR].Bits.GateType        = IA32_IDT_GATE_TYPE_INTERRUPT_32;

 

   //

-  // If the CPU supports Debug Extensions(CPUID:01 EDX:BIT2), then 

+  // If the CPU supports Debug Extensions(CPUID:01 EDX:BIT2), then

   // Set DE flag in CR4 to enable IO breakpoint

   //

   AsmCpuid (1, NULL, NULL, NULL, &RegEdx);

@@ -75,7 +75,7 @@ InitializeDebugIdt (
   Retrieve exception handler from IDT table by ExceptionNum.

 

   @param[in]  ExceptionNum    Exception number

- 

+

   @return Exception handler

 

 **/

@@ -93,13 +93,13 @@ GetExceptionHandlerInIdtEntry (
   return (VOID *) (IdtEntry[ExceptionNum].Bits.OffsetLow |

                   (((UINTN)IdtEntry[ExceptionNum].Bits.OffsetHigh) << 16) |

                   (((UINTN)IdtEntry[ExceptionNum].Bits.OffsetUpper) << 32));

-} 

+}

 

 /**

   Set exception handler in IDT table by ExceptionNum.

 

   @param[in]  ExceptionNum      Exception number

-  @param[in]  ExceptionHandler  Exception Handler to be set 

+  @param[in]  ExceptionHandler  Exception Handler to be set

 

 **/

 VOID

diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgent/DxeDebugAgentLib.c b/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgent/DxeDebugAgentLib.c
index c74a1f6be3..2a8ae8aec5 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgent/DxeDebugAgentLib.c
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgent/DxeDebugAgentLib.c
@@ -1,7 +1,7 @@
 /** @file

   Debug Agent library implementition for Dxe Core and Dxr modules.

 

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

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

@@ -237,7 +237,7 @@ GetDebugPortHandle (
 /**

   Worker function to set up Debug Agent environment.

 

-  This function will set up IDT table and initialize the IDT entries and 

+  This function will set up IDT table and initialize the IDT entries and

   initialize CPU LOCAL APIC timer.

   It also tries to connect HOST if Debug Agent was not initialized before.

 

diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgent/DxeDebugAgentLib.h b/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgent/DxeDebugAgentLib.h
index 536fb71dc5..caef603442 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgent/DxeDebugAgentLib.h
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgent/DxeDebugAgentLib.h
@@ -1,7 +1,7 @@
 /** @file

   Header file for Dxe Core Debug Agent Library instance.

 

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

+  Copyright (c) 2010 - 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,12 +29,12 @@
 #include "DebugAgent.h"

 

 /**

-  Install EFI Serial IO protocol based on Debug Communication Library. 

+  Install EFI Serial IO protocol based on Debug Communication Library.

 

 **/

 VOID

 InstallSerialIo (

   VOID

   );

-  

+

 #endif

diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgent/SerialIo.c b/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgent/SerialIo.c
index cb3b623038..32ff007a9a 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgent/SerialIo.c
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgent/SerialIo.c
@@ -1,7 +1,7 @@
 /** @file

   Install Serial IO Protocol that layers on top of a Debug Communication Library instance.

 

-  Copyright (c) 2012 - 2015, Intel Corporation. All rights reserved.<BR>

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

@@ -31,7 +31,7 @@ EFIAPI
 SerialReset (

   IN EFI_SERIAL_IO_PROTOCOL  *This

   );

-  

+

 /**

   Set new attributes to a serial device.

 

@@ -246,7 +246,7 @@ DEBUG_SERIAL_FIFO            mSerialFifoForDebug    = {0, 0, DEBGU_SERIAL_IO_FIF
 

 /**

   Detect whether specific FIFO is empty or not.

- 

+

   @param[in]  Fifo    A pointer to the Data Structure DEBUG_SERIAL_FIFO.

 

   @return whether specific FIFO is empty or not.

@@ -357,7 +357,7 @@ DebugTerminalFifoRemove (
 }

 

 /**

-  Install EFI Serial IO protocol based on Debug Communication Library. 

+  Install EFI Serial IO protocol based on Debug Communication Library.

 

 **/

 VOID

@@ -431,12 +431,12 @@ SerialSetAttributes (
   //

   // The Debug Communication Library CAN NOT change communications parameters (if it has)

   // actually. Because it also has no any idea on what parameters are based on, we cannot

-  // check the input parameters (like BaudRate, Parity, DataBits and StopBits). 

+  // check the input parameters (like BaudRate, Parity, DataBits and StopBits).

   //

-  

+

   //

   // Update the Timeout value in the mode structure based on the request.

-  // The Debug Communication Library can not support a timeout on writes, but the timeout on 

+  // The Debug Communication Library can not support a timeout on writes, but the timeout on

   // reads can be provided by this module.

   //

   if (Timeout == 0) {

@@ -444,11 +444,11 @@ SerialSetAttributes (
   } else {

     mSerialIoMode.Timeout = Timeout;

   }

-  

+

   //

   // Update the ReceiveFifoDepth value in the mode structure based on the request.

-  // This module assumes that the Debug Communication Library uses a FIFO depth of 

-  // SERIAL_PORT_DEFAULT_RECEIVE_FIFO_DEPTH.  The Debug Communication Library may actually be 

+  // This module assumes that the Debug Communication Library uses a FIFO depth of

+  // SERIAL_PORT_DEFAULT_RECEIVE_FIFO_DEPTH.  The Debug Communication Library may actually be

   // using a larger FIFO, but there is no way to tell.

   //

   if (ReceiveFifoDepth == 0 || ReceiveFifoDepth >= SERIAL_PORT_DEFAULT_RECEIVE_FIFO_DEPTH) {

@@ -512,21 +512,21 @@ SerialGetControl (
   // Raise TPL to prevent recursion from EFI timer interrupts

   //

   Tpl = gBS->RaiseTPL (TPL_NOTIFY);

-  

+

   //

   // Save and disable Debug Timer interrupt to avoid it to access Debug Port

   //

   DebugTimerInterruptState = SaveAndSetDebugTimerInterrupt (FALSE);

   Handle = GetDebugPortHandle ();

-  

+

   //

   // Always assume the output buffer is empty and the Debug Communication Library can process

   // more write requests.

   //

   *Control = mSerialIoMode.ControlMask | EFI_SERIAL_OUTPUT_BUFFER_EMPTY;

-  

+

   //

-  // Check to see if the Terminal FIFO is empty and 

+  // Check to see if the Terminal FIFO is empty and

   // check to see if the input buffer in the Debug Communication Library is empty

   //

   if (!IsDebugTermianlFifoEmpty (&mSerialFifoForTerminal) || DebugPortPollBuffer (Handle)) {

@@ -535,14 +535,14 @@ SerialGetControl (
 

   //

   // Restore Debug Timer interrupt

-  //  

+  //

   SaveAndSetDebugTimerInterrupt (DebugTimerInterruptState);

-  

+

   //

   // Restore to original TPL

   //

   gBS->RestoreTPL (Tpl);

-  

+

   return EFI_SUCCESS;

 }

 

@@ -575,13 +575,13 @@ SerialWrite (
   // Raise TPL to prevent recursion from EFI timer interrupts

   //

   Tpl = gBS->RaiseTPL (TPL_NOTIFY);

-  

+

   //

   // Save and disable Debug Timer interrupt to avoid it to access Debug Port

   //

   DebugTimerInterruptState = SaveAndSetDebugTimerInterrupt (FALSE);

   Handle = GetDebugPortHandle ();

-  

+

   if ((mSerialIoMode.ControlMask & EFI_SERIAL_SOFTWARE_LOOPBACK_ENABLE) != 0)  {

     if (*BufferSize == 0) {

       return EFI_SUCCESS;

@@ -598,14 +598,14 @@ SerialWrite (
 

   //

   // Restore Debug Timer interrupt

-  //  

+  //

   SaveAndSetDebugTimerInterrupt (DebugTimerInterruptState);

-  

+

   //

   // Restore to original TPL

   //

   gBS->RestoreTPL (Tpl);

-  

+

   return EFI_SUCCESS;

 }

 

@@ -643,13 +643,13 @@ SerialRead (
   // Raise TPL to prevent recursion from EFI timer interrupts

   //

   Tpl = gBS->RaiseTPL (TPL_NOTIFY);

-  

+

   //

   // Save and disable Debug Timer interrupt to avoid it to access Debug Port

   //

   DebugTimerInterruptState = SaveAndSetDebugTimerInterrupt (FALSE);

   Handle = GetDebugPortHandle ();

- 

+

   Data8 = (UINT8 *) &DebugHeader;

   Uint8Buffer = (UINT8 *)Buffer;

   if ((mSerialIoMode.ControlMask & EFI_SERIAL_SOFTWARE_LOOPBACK_ENABLE) != 0)  {

@@ -671,7 +671,7 @@ SerialRead (
         continue;

       }

       //

-      // Read the input character from Debug Port 

+      // Read the input character from Debug Port

       //

       if (!DebugPortPollBuffer (Handle)) {

         break;

@@ -703,14 +703,14 @@ SerialRead (
 

   //

   // Restore Debug Timer interrupt

-  //  

+  //

   SaveAndSetDebugTimerInterrupt (DebugTimerInterruptState);

-  

+

   //

   // Restore to original TPL

   //

   gBS->RestoreTPL (Tpl);

-  

+

   return EFI_SUCCESS;

 }

 

@@ -757,7 +757,7 @@ DebugReadBreakFromDebugPort (
       DebugAgentMsgPrint (DEBUG_AGENT_INFO, "Debug Timer attach symbol received %x", *Data8);

       *BreakSymbol = *Data8;

       return EFI_SUCCESS;

-    } 

+    }

     if (*Data8 == DEBUG_STARTING_SYMBOL_NORMAL) {

       Status = ReadRemainingBreakPacket (Handle, &DebugHeader);

       if (Status == EFI_SUCCESS) {

@@ -775,7 +775,7 @@ DebugReadBreakFromDebugPort (
       DebugTerminalFifoAdd (&mSerialFifoForTerminal, *Data8);

     }

   }

-  

+

   return EFI_NOT_FOUND;

 }

 

diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf b/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
index 86c03a5fe3..38bd18d0fe 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
@@ -93,7 +93,7 @@
 

 [Protocols]

   gEfiSerialIoProtocolGuid                      ## SOMETIMES_PRODUCES

-  gEfiDevicePathProtocolGuid                    ## SOMETIMES_PRODUCES 

+  gEfiDevicePathProtocolGuid                    ## SOMETIMES_PRODUCES

 

 [Pcd]

   gEfiMdePkgTokenSpaceGuid.PcdFSBClock                                  ## SOMETIMES_CONSUMES

diff --git a/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c b/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c
index 6be8c54425..03a88e6251 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c
+++ b/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c
@@ -1,7 +1,7 @@
 /** @file

   Debug Agent library implementition.

 

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

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

@@ -77,7 +77,7 @@ GetMailboxFromHob (
   )

 {

   EFI_HOB_GUID_TYPE        *GuidHob;

-  UINT64                   *MailboxLocation;  

+  UINT64                   *MailboxLocation;

   DEBUG_AGENT_MAILBOX      *Mailbox;

 

   GuidHob = GetFirstGuidHob (&gEfiDebugAgentGuid);

@@ -87,7 +87,7 @@ GetMailboxFromHob (
   MailboxLocation = (UINT64 *) (GET_GUID_HOB_DATA(GuidHob));

   Mailbox = (DEBUG_AGENT_MAILBOX *)(UINTN)(*MailboxLocation);

   VerifyMailboxChecksum (Mailbox);

-  

+

   return Mailbox;

 }

 

@@ -224,7 +224,7 @@ InitializeDebugAgent (
     //

     // Check if Debug Agent initialized in SEC/PEI phase

     //

-    Mailbox = GetMailboxFromHob (); 

+    Mailbox = GetMailboxFromHob ();

     if (Mailbox != NULL) {

       mMailboxPointer = Mailbox;

       break;

@@ -237,7 +237,7 @@ InitializeDebugAgent (
     //

     // Save original IDT entries

     //

-    AsmReadIdtr (&IdtDescriptor);      

+    AsmReadIdtr (&IdtDescriptor);

     CopyMem (&IdtEntry, (VOID *)IdtDescriptor.Base, 33 * sizeof(IA32_IDT_GATE_DESCRIPTOR));

     //

     // Initialized Debug Agent

@@ -269,11 +269,11 @@ InitializeDebugAgent (
     }

     //

     // Find and report PE/COFF image info to HOST

-    //  

+    //

     FindAndReportModuleImageInfo (SIZE_4KB);

     //

     // Restore saved IDT entries

-    //     

+    //

     CopyMem ((VOID *)IdtDescriptor.Base, &IdtEntry, 33 * sizeof(IA32_IDT_GATE_DESCRIPTOR));

 

     break;

@@ -381,12 +381,12 @@ InitializeDebugAgent (
 

   default:

     //

-    // Only DEBUG_AGENT_INIT_PREMEM_SEC and DEBUG_AGENT_INIT_POSTMEM_SEC are allowed for this 

+    // Only DEBUG_AGENT_INIT_PREMEM_SEC and DEBUG_AGENT_INIT_POSTMEM_SEC are allowed for this

     // Debug Agent library instance.

     //

     DEBUG ((EFI_D_ERROR, "Debug Agent: The InitFlag value is not allowed!\n"));

     CpuDeadLoop ();

-    break;    

+    break;

   }

 }

 

diff --git a/SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.c b/SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.c
index 6a854ff2a2..6a6394f8c2 100644
--- a/SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.c
+++ b/SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.c
@@ -1,7 +1,7 @@
 /** @file

   Debug Port Library implementation based on serial port.

 

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

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

@@ -65,7 +65,7 @@ DebugPortInitialize (
 

   Status = SerialPortInitialize ();

   if (RETURN_ERROR(Status)) {

-    DEBUG ((EFI_D_ERROR, "Debug Serial Port: Initialization failed!\n")); 

+    DEBUG ((EFI_D_ERROR, "Debug Serial Port: Initialization failed!\n"));

   }

 

   if (Function != NULL) {

diff --git a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb/DebugCommunicationLibUsb.c b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb/DebugCommunicationLibUsb.c
index 1836c05526..6b800b327f 100644
--- a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb/DebugCommunicationLibUsb.c
+++ b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb/DebugCommunicationLibUsb.c
@@ -1,7 +1,7 @@
 /** @file

   Debug Port Library implementation based on usb debug port.

 

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

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

@@ -191,7 +191,7 @@ CalculateUsbDebugPortBar (
 

   VendorId = PciRead16 (PcdGet32(PcdUsbEhciPciAddress) + PCI_VENDOR_ID_OFFSET);

   DeviceId = PciRead16 (PcdGet32(PcdUsbEhciPciAddress) + PCI_DEVICE_ID_OFFSET);

-  

+

   if ((VendorId == 0xFFFF) || (DeviceId == 0xFFFF)) {

     return RETURN_UNSUPPORTED;

   }

@@ -199,7 +199,7 @@ CalculateUsbDebugPortBar (
   ProgInterface = PciRead8 (PcdGet32(PcdUsbEhciPciAddress) + PCI_CLASSCODE_OFFSET);

   SubClassCode  = PciRead8 (PcdGet32(PcdUsbEhciPciAddress) + PCI_CLASSCODE_OFFSET + 1);

   BaseCode      = PciRead8 (PcdGet32(PcdUsbEhciPciAddress) + PCI_CLASSCODE_OFFSET + 2);

-  

+

   if ((ProgInterface != PCI_IF_EHCI) || (SubClassCode != PCI_CLASS_SERIAL_USB) || (BaseCode != PCI_CLASS_SERIAL)) {

     return RETURN_UNSUPPORTED;

   }

@@ -312,7 +312,7 @@ UsbDebugPortIn (
       return RETURN_DEVICE_ERROR;

     }

   }

-  

+

   //

   // Clearing DONE bit by writing 1

   //

@@ -413,7 +413,7 @@ UsbDebugPortOut (
       return RETURN_DEVICE_ERROR;

     }

   }

-  

+

   //

   // Clearing DONE bit by writing 1

   //

@@ -747,7 +747,7 @@ InitializeUsbDebugHardware (
       Handle->Initialized = USBDBG_NO_DBG_CAB;

       return Status;

     }

-  

+

     Handle->Initialized = USBDBG_DBG_CAB;

   }

 

@@ -1053,7 +1053,7 @@ DebugPortInitialize (
   USB_DEBUG_PORT_HANDLE     Handle;

 

   //

-  // Validate the PCD PcdDebugPortHandleBufferSize value 

+  // Validate the PCD PcdDebugPortHandleBufferSize value

   //

   ASSERT (PcdGet16 (PcdDebugPortHandleBufferSize) == sizeof (USB_DEBUG_PORT_HANDLE));

 

diff --git a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Common.c b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Common.c
index 86ecc2f9db..924dbfd9d5 100644
--- a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Common.c
+++ b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Common.c
@@ -46,7 +46,7 @@ UINT16   mSerialNumberStrDesc[] = {
 **/

 VOID

 XhcSetR32Bit(

-  IN OUT  UINTN  Register, 

+  IN OUT  UINTN  Register,

   IN      UINT32 BitMask

   )

 {

@@ -65,7 +65,7 @@ XhcSetR32Bit(
 **/

 VOID

 XhcClearR32Bit(

-  IN OUT  UINTN  Register, 

+  IN OUT  UINTN  Register,

   IN      UINT32 BitMask

   )

 {

@@ -92,10 +92,10 @@ XhcWriteDebugReg (
   )

 {

   EFI_PHYSICAL_ADDRESS  DebugCapabilityBase;

-  

+

   DebugCapabilityBase = Handle->DebugCapabilityBase;

   MmioWrite32 ((UINTN)(DebugCapabilityBase + Offset), Data);

-  

+

   return;

 }

 

@@ -116,7 +116,7 @@ XhcReadDebugReg (
 {

   UINT32                  Data;

   EFI_PHYSICAL_ADDRESS    DebugCapabilityBase;

-  

+

   DebugCapabilityBase = Handle->DebugCapabilityBase;

   Data = MmioRead32 ((UINTN)(DebugCapabilityBase + Offset));

 

@@ -182,7 +182,7 @@ ProgramXhciBaseAddress (
   UINT32                      Low;

   UINT32                      High;

   EFI_PHYSICAL_ADDRESS        XhciMmioBase;

-  

+

   Low = PciRead32 (PcdGet32(PcdUsbXhciPciAddress) + PCI_BASE_ADDRESSREG_OFFSET);

   High = PciRead32 (PcdGet32(PcdUsbXhciPciAddress) + PCI_BASE_ADDRESSREG_OFFSET + 4);

   XhciMmioBase = (EFI_PHYSICAL_ADDRESS) (LShiftU64 ((UINT64) High, 32) | Low);

@@ -263,7 +263,7 @@ CalculateUsbDebugPortMmioBase (
 

   VendorId = PciRead16 (PcdGet32(PcdUsbXhciPciAddress) + PCI_VENDOR_ID_OFFSET);

   DeviceId = PciRead16 (PcdGet32(PcdUsbXhciPciAddress) + PCI_DEVICE_ID_OFFSET);

-  

+

   if ((VendorId == 0xFFFF) || (DeviceId == 0xFFFF)) {

     goto Done;

   }

@@ -271,7 +271,7 @@ CalculateUsbDebugPortMmioBase (
   ProgInterface = PciRead8 (PcdGet32(PcdUsbXhciPciAddress) + PCI_CLASSCODE_OFFSET);

   SubClassCode  = PciRead8 (PcdGet32(PcdUsbXhciPciAddress) + PCI_CLASSCODE_OFFSET + 1);

   BaseCode      = PciRead8 (PcdGet32(PcdUsbXhciPciAddress) + PCI_CLASSCODE_OFFSET + 2);

-  

+

   if ((ProgInterface != PCI_IF_XHCI) || (SubClassCode != PCI_CLASS_SERIAL_USB) || (BaseCode != PCI_CLASS_SERIAL)) {

     goto Done;

   }

@@ -282,7 +282,7 @@ CalculateUsbDebugPortMmioBase (
   // Get capability pointer from HCCPARAMS at offset 0x10

   //

   CapabilityPointer = Handle->XhciMmioBase + (MmioRead32 ((UINTN)(Handle->XhciMmioBase + XHC_HCCPARAMS_OFFSET)) >> 16) * 4;

- 

+

   //

   // Search XHCI debug capability

   //

@@ -377,7 +377,7 @@ CreateEventRing (
   EVENT_RING_SEG_TABLE_ENTRY  *ERSTBase;

 

   ASSERT (EventRing != NULL);

-  

+

   //

   // Allocate Event Ring

   //

@@ -390,7 +390,7 @@ CreateEventRing (
   EventRing->TrbNumber        = EVENT_RING_TRB_NUMBER;

   EventRing->EventRingDequeue = (EFI_PHYSICAL_ADDRESS)(UINTN) EventRing->EventRingSeg0;

   EventRing->EventRingEnqueue = (EFI_PHYSICAL_ADDRESS)(UINTN) EventRing->EventRingSeg0;

-  

+

   //

   // Software maintains an Event Ring Consumer Cycle State (CCS) bit, initializing it to '1'

   // and toggling it every time the Event Ring Dequeue Pointer wraps back to the beginning of the Event Ring.

@@ -473,7 +473,7 @@ CreateTransferRing (
 {

   VOID                  *Buf;

   LINK_TRB              *EndTrb;

- 

+

   Buf = AllocateAlignBuffer (sizeof (TRB_TEMPLATE) * TrbNum);

   ASSERT (Buf != NULL);

   ASSERT (((UINTN) Buf & 0xF) == 0);

@@ -523,7 +523,7 @@ CreateDebugCapabilityContext (
   UINT8                       *ManufacturerStrDesc;

   UINT8                       *ProductStrDesc;

   UINT8                       *SerialNumberStrDesc;

-  

+

   //

   // Allocate debug device context

   //

@@ -531,10 +531,10 @@ CreateDebugCapabilityContext (
   ASSERT (Buf != NULL);

   ASSERT (((UINTN) Buf & 0xF) == 0);

   ZeroMem (Buf, sizeof (XHC_DC_CONTEXT));

-  

+

   DebugCapabilityContext = (XHC_DC_CONTEXT *)(UINTN) Buf;

   Handle->DebugCapabilityContext = (EFI_PHYSICAL_ADDRESS)(UINTN) DebugCapabilityContext;

-  

+

   //

   // Initialize DbcInfoContext.

   //

@@ -550,7 +550,7 @@ CreateDebugCapabilityContext (
   DebugCapabilityContext->EpOutContext.EPType           = ED_BULK_OUT;

   DebugCapabilityContext->EpOutContext.MaxPacketSize    = XHCI_DEBUG_DEVICE_MAX_PACKET_SIZE;

   DebugCapabilityContext->EpOutContext.AverageTRBLength = 0x1000;

-  

+

   //

   // Initialize EpInContext.

   //

@@ -558,7 +558,7 @@ CreateDebugCapabilityContext (
   DebugCapabilityContext->EpInContext.EPType           = ED_BULK_IN;

   DebugCapabilityContext->EpInContext.MaxPacketSize    = XHCI_DEBUG_DEVICE_MAX_PACKET_SIZE;

   DebugCapabilityContext->EpInContext.AverageTRBLength = 0x1000;

-  

+

   //

   // Update string descriptor address

   //

@@ -567,19 +567,19 @@ CreateDebugCapabilityContext (
   ZeroMem (String0Desc, STRING0_DESC_LEN + MANU_DESC_LEN + PRODUCT_DESC_LEN + SERIAL_DESC_LEN);

   CopyMem (String0Desc, mString0Desc, STRING0_DESC_LEN);

   DebugCapabilityContext->DbcInfoContext.String0DescAddress = (UINT64)(UINTN)String0Desc;

-  

+

   ManufacturerStrDesc = String0Desc + STRING0_DESC_LEN;

   CopyMem (ManufacturerStrDesc, mManufacturerStrDesc, MANU_DESC_LEN);

   DebugCapabilityContext->DbcInfoContext.ManufacturerStrDescAddress = (UINT64)(UINTN)ManufacturerStrDesc;

-  

+

   ProductStrDesc = ManufacturerStrDesc + MANU_DESC_LEN;

   CopyMem (ProductStrDesc, mProductStrDesc, PRODUCT_DESC_LEN);

   DebugCapabilityContext->DbcInfoContext.ProductStrDescAddress = (UINT64)(UINTN)ProductStrDesc;

-  

+

   SerialNumberStrDesc = ProductStrDesc + PRODUCT_DESC_LEN;

   CopyMem (SerialNumberStrDesc, mSerialNumberStrDesc, SERIAL_DESC_LEN);

   DebugCapabilityContext->DbcInfoContext.SerialNumberStrDescAddress = (UINT64)(UINTN)SerialNumberStrDesc;

-  

+

   //

   // Allocate and initialize the Transfer Ring for the Input Endpoint Context.

   //

@@ -687,7 +687,7 @@ InitializeUsbDebugHardware (
       return EFI_DEVICE_ERROR;

     }

     //

-    // If XHCI supports debug capability, hardware resource has been allocated, 

+    // If XHCI supports debug capability, hardware resource has been allocated,

     // but it has not been enabled, try to enable again.

     //

     goto Enable;

@@ -708,7 +708,7 @@ InitializeUsbDebugHardware (
 

   //

   // Reset port to get debug device discovered

-  //  

+  //

   for (Index = 0; Index < TotalUsb3Port; Index++) {

     XhcSetR32Bit ((UINTN)XhciOpRegister + XHC_PORTSC_OFFSET + Index * 0x10, BIT4);

     MicroSecondDelay (10 * 1000);

@@ -727,20 +727,20 @@ InitializeUsbDebugHardware (
   Handle->UrbIn.Data  = (EFI_PHYSICAL_ADDRESS)(UINTN) Buffer;

   Handle->Data        = (EFI_PHYSICAL_ADDRESS)(UINTN) Buffer + XHCI_DEBUG_DEVICE_MAX_PACKET_SIZE;

   Handle->UrbOut.Data = Handle->UrbIn.Data + XHCI_DEBUG_DEVICE_MAX_PACKET_SIZE * 2;

-   

+

   //

   // Initialize event ring

   //

   ZeroMem (&Handle->EventRing, sizeof (EVENT_RING));

   Status = CreateEventRing (Handle, &Handle->EventRing);

   ASSERT_EFI_ERROR (Status);

-  

+

   //

   // Init IN and OUT endpoint context

   //

   Status = CreateDebugCapabilityContext (Handle);

   ASSERT_EFI_ERROR (Status);

-  

+

   //

   // Init DCDDI1 and DCDDI2

   //

@@ -748,7 +748,7 @@ InitializeUsbDebugHardware (
    Handle,

    XHC_DC_DCDDI1,

    (UINT32)((XHCI_DEBUG_DEVICE_VENDOR_ID << 16) | XHCI_DEBUG_DEVICE_PROTOCOL)

-   ); 

+   );

 

   XhcWriteDebugReg (

    Handle,

@@ -759,7 +759,7 @@ InitializeUsbDebugHardware (
 Enable:

   if ((Handle->Initialized == USB3DBG_NOT_ENABLED) && (!Handle->ChangePortPower)) {

     //

-    // If the first time detection is failed, turn port power off and on in order to 

+    // If the first time detection is failed, turn port power off and on in order to

     // reset port status this time, then try to check if debug device is ready again.

     //

     for (Index = 0; Index < TotalUsb3Port; Index++) {

@@ -775,9 +775,9 @@ Enable:
   // Set DCE bit and LSE bit to "1" in DCCTRL in first initialization

   //

   XhcSetDebugRegBit (Handle, XHC_DC_DCCTRL, BIT1|BIT31);

-  

+

   XhcDetectDebugCapabilityReady (Handle);

-  

+

   Status = RETURN_SUCCESS;

   if (!Handle->Ready) {

     Handle->Initialized = USB3DBG_NOT_ENABLED;

@@ -823,7 +823,7 @@ DiscoverInitializeUsbDebugPort (
 

   @param[in] Instance           Debug port instance.

 

-**/  

+**/

 VOID

 SetUsb3DebugPortInstance (

   IN USB3_DEBUG_PORT_HANDLE     *Instance

@@ -839,7 +839,7 @@ SetUsb3DebugPortInstance (
 /**

   Return USB3 debug instance address.

 

-**/  

+**/

 USB3_DEBUG_PORT_HANDLE *

 GetUsb3DebugPortInstance (

   VOID

@@ -1010,7 +1010,7 @@ DebugPortWriteBuffer (
     XhcDataTransfer (UsbDebugPortHandle, EfiUsbDataOut, Buffer + Total, &Sent, DATA_TRANSFER_WRITE_TIMEOUT);

     Total += Sent;

   }

-  

+

   return Total;

 }

 

@@ -1123,7 +1123,7 @@ DebugPortInitialize (
   USB3_DEBUG_PORT_HANDLE    *UsbDebugPortHandle;

 

   //

-  // Validate the PCD PcdDebugPortHandleBufferSize value 

+  // Validate the PCD PcdDebugPortHandleBufferSize value

   //

   ASSERT (PcdGet16 (PcdDebugPortHandleBufferSize) == sizeof (USB3_DEBUG_PORT_HANDLE));

 

diff --git a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.c b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.c
index 0955aa6f0e..af9cc8f281 100644
--- a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.c
+++ b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.c
@@ -280,7 +280,7 @@ Usb3PciIoNotify (
                   );

   if (!EFI_ERROR (Status) &&

       (PciIoHandleBuffer != NULL) &&

-      (PciIoHandleCount != 0)) { 

+      (PciIoHandleCount != 0)) {

     for (Index = 0; Index < PciIoHandleCount; Index++) {

       Status = gBS->HandleProtocol (

                       PciIoHandleBuffer[Index],

@@ -327,7 +327,7 @@ Usb3PciIoNotify (
 /**

   Return USB3 debug instance address pointer.

 

-**/  

+**/

 EFI_PHYSICAL_ADDRESS *

 GetUsb3DebugPortInstanceAddrPtr (

   VOID

@@ -391,7 +391,7 @@ Usb3AllocateDmaBuffer (
   Allocate aligned memory for XHC's usage.

 

   @param  BufferSize      The size, in bytes, of the Buffer.

-  

+

   @return A pointer to the allocated buffer or NULL if allocation fails.

 

 **/

@@ -403,9 +403,9 @@ AllocateAlignBuffer (
   EFI_PHYSICAL_ADDRESS    TmpAddr;

   EFI_STATUS              Status;

   VOID                    *Buf;

-  

+

   Buf = NULL;

-  

+

   if (gBS != NULL) {

     if (mUsb3PciIo != NULL) {

       Usb3AllocateDmaBuffer (

diff --git a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf
index 683d9572e9..ce5902b919 100644
--- a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf
+++ b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf
@@ -50,7 +50,7 @@
   # The format of pci address please refer to SourceLevelDebugPkg.dec

   gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdUsbXhciPciAddress               ## CONSUMES

 

-  # Per XHCI spec, software shall impose a timeout between the detection of the Debug Host 

+  # Per XHCI spec, software shall impose a timeout between the detection of the Debug Host

   # connection and the DbC Run transition to 1. This PCD specifies the timeout value in microsecond.

   gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdUsbXhciDebugDetectTimeout       ## SOMETIMES_CONSUMES

 

diff --git a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Internal.h b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Internal.h
index 8673dad6c5..f5a0279ac1 100644
--- a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Internal.h
+++ b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Internal.h
@@ -248,12 +248,12 @@ typedef struct _ENDPOINT_CONTEXT_64 {
   UINT32                  RsvdZ5;             // Reserved

   UINT32                  RsvdZ6;

   UINT32                  RsvdZ7;

-  

+

   UINT32                  RsvdZ8;

   UINT32                  RsvdZ9;

   UINT32                  RsvdZ10;

   UINT32                  RsvdZ11;

-  

+

   UINT32                  RsvdZ12;

   UINT32                  RsvdZ13;

   UINT32                  RsvdZ14;

@@ -396,7 +396,7 @@ typedef struct _DBC_INFO_CONTEXT {
   UINT64        RsvdZ1:32;

   UINT64        RsvdZ2;

   UINT64        RsvdZ3;

-  UINT64        RsvdZ4;  

+  UINT64        RsvdZ4;

 } DBC_INFO_CONTEXT;

 

 //

@@ -460,7 +460,7 @@ typedef struct _USB3_DEBUG_PORT_INSTANCE {
   // The flag indicates debug capability is supported

   //

   BOOLEAN                                 DebugSupport;

-  

+

   //

   // The flag indicates debug device is ready

   //

@@ -483,7 +483,7 @@ typedef struct _USB3_DEBUG_PORT_INSTANCE {
 

   //

   // The flag indicates if USB 3.0 ports has been turn off/on power

-  //  

+  //

   BOOLEAN                                 ChangePortPower;

 

   //

@@ -493,24 +493,24 @@ typedef struct _USB3_DEBUG_PORT_INSTANCE {
 

   //

   // XHCI OP RegisterBase address

-  //  

+  //

   EFI_PHYSICAL_ADDRESS                    XhciOpRegister;

-  

+

   //

   // XHCI Debug Register Base Address

   //

   EFI_PHYSICAL_ADDRESS                    DebugCapabilityBase;

-  

+

   //

   // XHCI Debug Capability offset

   //

-  UINT64                                  DebugCapabilityOffset;  

-  

+  UINT64                                  DebugCapabilityOffset;

+

   //

   // XHCI Debug Context Address

   //

   EFI_PHYSICAL_ADDRESS                    DebugCapabilityContext;

-  

+

   //

   // Transfer Ring

   //

@@ -521,7 +521,7 @@ typedef struct _USB3_DEBUG_PORT_INSTANCE {
   // EventRing

   //

   EVENT_RING                              EventRing;

-  

+

   //

   // URB - Read

   //

@@ -573,7 +573,7 @@ XhcSetDebugRegBit (
   IN UINT32                  Offset,

   IN UINT32                  Bit

   );

-  

+

 /**

   Write the data to the debug register.

 

@@ -581,7 +581,7 @@ XhcSetDebugRegBit (
   @param  Offset       The offset of the debug register.

   @param  Data         The data to write.

 

-**/  

+**/

 VOID

 XhcWriteDebugReg (

   IN USB3_DEBUG_PORT_HANDLE     *Handle,

@@ -596,12 +596,12 @@ XhcWriteDebugReg (
   @param[in]      BitMask     32-bit mask

 

   @return  BOOLEAN  - TRUE  if all bits specified by the mask are enabled.

-                    - FALSE even if one of the bits specified by the mask 

+                    - FALSE even if one of the bits specified by the mask

                             is not enabled.

 **/

 BOOLEAN

 XhcIsBitSet(

-  UINTN   Register, 

+  UINTN   Register,

   UINT32  BitMask

   );

 

@@ -613,7 +613,7 @@ XhcIsBitSet(
 **/

 VOID

 XhcSetR32Bit(

-  UINTN   Register, 

+  UINTN   Register,

   UINT32  BitMask

   );

 

@@ -625,13 +625,13 @@ XhcSetR32Bit(
 **/

 VOID

 XhcClearR32Bit(

-  IN OUT  UINTN  Register, 

+  IN OUT  UINTN  Register,

   IN      UINT32 BitMask

   );

 

 /**

   Initialize USB3 debug port.

-  

+

   This method invokes various internal functions to facilitate

   detection and initialization of USB3 debug port.

 

@@ -656,7 +656,7 @@ GetXhciPciCommand (
   Allocate aligned memory for XHC's usage.

 

   @param  BufferSize      The size, in bytes, of the Buffer.

-  

+

   @return A pointer to the allocated buffer or NULL if allocation fails.

 

 **/

@@ -667,7 +667,7 @@ AllocateAlignBuffer (
 

 /**

   The real function to initialize USB3 debug port.

-  

+

   This method invokes various internal functions to facilitate

   detection and initialization of USB3 debug port.

 

@@ -725,7 +725,7 @@ InitializeUsbDebugHardware (
 /**

   Return USB3 debug instance address pointer.

 

-**/  

+**/

 EFI_PHYSICAL_ADDRESS *

 GetUsb3DebugPortInstanceAddrPtr (

   VOID

@@ -734,7 +734,7 @@ GetUsb3DebugPortInstanceAddrPtr (
 /**

   Return USB3 debug instance address.

 

-**/  

+**/

 USB3_DEBUG_PORT_HANDLE *

 GetUsb3DebugPortInstance (

   VOID

diff --git a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.c b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.c
index dfdbfb0b7c..f59128e47e 100644
--- a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.c
+++ b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.c
@@ -179,7 +179,7 @@ Usb3GetIoMmu (
 /**

   Return USB3 debug instance address pointer.

 

-**/  

+**/

 EFI_PHYSICAL_ADDRESS *

 GetUsb3DebugPortInstanceAddrPtr (

   VOID

@@ -221,7 +221,7 @@ GetUsb3DebugPortInstanceAddrPtr (
   Allocate aligned memory for XHC's usage.

 

   @param BufferSize     The size, in bytes, of the Buffer.

-  

+

   @return A pointer to the allocated buffer or NULL if allocation fails.

 

 **/

diff --git a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.inf b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.inf
index 12257bce7d..24a120322c 100644
--- a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.inf
+++ b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.inf
@@ -52,7 +52,7 @@
   # The format of pci address please refer to SourceLevelDebugPkg.dec

   gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdUsbXhciPciAddress               ## CONSUMES

 

-  # Per XHCI spec, software shall impose a timeout between the detection of the Debug Host 

+  # Per XHCI spec, software shall impose a timeout between the detection of the Debug Host

   # connection and the DbC Run transition to 1. This PCD specifies the timeout value in microsecond.

   gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdUsbXhciDebugDetectTimeout       ## SOMETIMES_CONSUMES

 

diff --git a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Transfer.c b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Transfer.c
index 1b6645bd1c..fb48010a9a 100644
--- a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Transfer.c
+++ b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Transfer.c
@@ -41,7 +41,7 @@ XhcSyncTrsRing (
   TrsTrb = (TRB_TEMPLATE *)(UINTN) TrsRing->RingEnqueue;

 

   ASSERT (TrsTrb != NULL);

-  

+

   for (Index = 0; Index < TrsRing->TrbNumber; Index++) {

     if (TrsTrb->CycleBit != (TrsRing->RingPCS & BIT0)) {

       break;

@@ -185,9 +185,9 @@ IsTrbInTrsRing (
 {

   TRB_TEMPLATE  *CheckedTrb;

   UINTN         Index;

-  

+

   CheckedTrb = (TRB_TEMPLATE *)(UINTN) Ring->RingSeg0;

-  

+

   ASSERT (Ring->TrbNumber == TR_RING_TRB_NUMBER);

 

   for (Index = 0; Index < Ring->TrbNumber; Index++) {

@@ -222,7 +222,7 @@ XhcCheckUrbResult (
   UINT64                  XhcDequeue;

   UINT32                  High;

   UINT32                  Low;

-  

+

   ASSERT ((Handle != NULL) && (Urb != NULL));

 

   if (Urb->Finished) {

@@ -230,12 +230,12 @@ XhcCheckUrbResult (
   }

 

   EvtTrb = NULL;

-  

+

   //

   // Traverse the event ring to find out all new events from the previous check.

   //

   XhcSyncEventRing (Handle, &Handle->EventRing);

-  

+

   for (Index = 0; Index < Handle->EventRing.TrbNumber; Index++) {

 

     Status = XhcCheckNewEvent (Handle, &Handle->EventRing, ((TRB_TEMPLATE **)&EvtTrb));

@@ -245,13 +245,13 @@ XhcCheckUrbResult (
       //

       goto EXIT;

     }

-    

+

     if ((EvtTrb->Type != TRB_TYPE_COMMAND_COMPLT_EVENT) && (EvtTrb->Type != TRB_TYPE_TRANS_EVENT)) {

       continue;

     }

-    

+

     TRBPtr = (TRB_TEMPLATE *)(UINTN)(EvtTrb->TRBPtrLo | LShiftU64 ((UINT64) EvtTrb->TRBPtrHi, 32));

-    

+

     if (IsTrbInTrsRing ((TRANSFER_RING *)(UINTN)(Urb->Ring), TRBPtr)) {

       CheckedUrb = Urb;

     } else if (IsTrbInTrsRing ((TRANSFER_RING *)(UINTN)(Handle->UrbIn.Ring), TRBPtr)) {

@@ -269,7 +269,7 @@ XhcCheckUrbResult (
     } else {

       continue;

     }

-    

+

     if ((EvtTrb->Completecode == TRB_COMPLETION_SHORT_PACKET) ||

         (EvtTrb->Completecode == TRB_COMPLETION_SUCCESS)) {

       //

@@ -326,9 +326,9 @@ XhcRingDoorBell (
 

   //

   // 7.6.8.2 DCDB Register

-  //  

+  //

   Dcdb = (Urb->Direction == EfiUsbDataIn) ? 0x100 : 0x0;

-  

+

   XhcWriteDebugReg (

     Handle,

     XHC_DC_DCDB,

@@ -378,7 +378,7 @@ XhcExecTransfer (
     // If time out occurs.

     //

     Urb->Result |= EFI_USB_ERR_TIMEOUT;

-  } 

+  }

   //

   // If URB transfer is error, restore transfer ring to original value before URB transfer

   // This will make the current transfer TRB is always at the latest unused one in transfer ring.

@@ -425,7 +425,7 @@ XhcCreateTransferTrb (
   } else {

     EPRing = &Handle->TransferRingOut;

   }

-  

+

   Urb->Ring = (EFI_PHYSICAL_ADDRESS)(UINTN) EPRing;

   XhcSyncTrsRing (Handle, EPRing);

 

@@ -439,12 +439,12 @@ XhcCreateTransferTrb (
   Trb->TrbNormal.ISP       = 1;

   Trb->TrbNormal.IOC       = 1;

   Trb->TrbNormal.Type      = TRB_TYPE_NORMAL;

-  

+

   //

   // Update the cycle bit to indicate this TRB has been consumed.

   //

   Trb->TrbNormal.CycleBit = EPRing->RingPCS & BIT0;

-  

+

   return EFI_SUCCESS;

 }

 

@@ -470,7 +470,7 @@ XhcCreateUrb (
   EFI_STATUS                    Status;

   URB                           *Urb;

   EFI_PHYSICAL_ADDRESS          UrbData;

-  

+

   if (Direction == EfiUsbDataIn) {

     Urb = &Handle->UrbIn;

   } else {

@@ -478,17 +478,17 @@ XhcCreateUrb (
   }

 

   UrbData  = Urb->Data;

-  

+

   ZeroMem (Urb, sizeof (URB));

   Urb->Direction = Direction;

-  

+

   //

   // Allocate memory to move data from CAR or SMRAM to normal memory

   // to make XHCI DMA successfully

   // re-use the pre-allocate buffer in PEI to avoid DXE memory service or gBS are not ready

   //

   Urb->Data  = UrbData;

-  

+

   if (Direction == EfiUsbDataIn) {

     //

     // Do not break URB data in buffer as it may contain the data which were just put in via DMA by XHC

@@ -502,7 +502,7 @@ XhcCreateUrb (
     CopyMem ((VOID*)(UINTN) Urb->Data, Data, DataLen);

     Urb->DataLen  = (UINT32) DataLen;

   }

-  

+

   Status = XhcCreateTransferTrb (Handle, Urb);

   ASSERT_EFI_ERROR (Status);

 

@@ -539,7 +539,7 @@ XhcDataTransfer (
 {

   URB                     *Urb;

   EFI_STATUS              Status;

-  

+

   //

   // Validate the parameters

   //

@@ -562,7 +562,7 @@ XhcDataTransfer (
   if (Urb->Result == EFI_USB_NOERROR) {

     Status = EFI_SUCCESS;

   }

-  

+

   if (Direction == EfiUsbDataIn) {

     //

     // Move data from internal buffer to outside buffer (outside buffer may be in SMRAM...)

diff --git a/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/Ia32/IntHandlerFuncs.c b/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/Ia32/IntHandlerFuncs.c
index ccf3fb1842..85cab7c205 100644
--- a/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/Ia32/IntHandlerFuncs.c
+++ b/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/Ia32/IntHandlerFuncs.c
@@ -1,7 +1,7 @@
 /** @file

   Ia32 arch functions to access IDT vector.

 

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

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

@@ -24,7 +24,7 @@
   @retval  FALSE    IDT entries were not setuo by Debug Agent.

 

 **/

-BOOLEAN 

+BOOLEAN

 CheckDebugAgentHandler (

   IN  IA32_DESCRIPTOR            *IdtDescriptor,

   IN  UINTN                      InterruptType

@@ -48,7 +48,7 @@ CheckDebugAgentHandler (
 }

 

 /**

-  Save IDT entry for INT1 and update it. 

+  Save IDT entry for INT1 and update it.

 

   @param[in]  IdtDescriptor      Pointer to IDT Descriptor.

   @param[out] SavedIdtEntry      Original IDT entry returned.

@@ -63,7 +63,7 @@ SaveAndUpdateIdtEntry1 (
   IA32_IDT_GATE_DESCRIPTOR   *IdtEntry;

   UINT16                     CodeSegment;

   UINTN                      InterruptHandler;

-  

+

   IdtEntry = (IA32_IDT_GATE_DESCRIPTOR *) IdtDescriptor->Base;

   CopyMem (SavedIdtEntry, &IdtEntry[1], sizeof (IA32_IDT_GATE_DESCRIPTOR));

 

@@ -80,7 +80,7 @@ SaveAndUpdateIdtEntry1 (
 }

 

 /**

-  Restore IDT entry for INT1. 

+  Restore IDT entry for INT1.

 

   @param[in]  IdtDescriptor      Pointer to IDT Descriptor.

   @param[in]  RestoredIdtEntry   IDT entry to be restored.

@@ -93,7 +93,7 @@ RestoreIdtEntry1 (
   )

 {

   IA32_IDT_GATE_DESCRIPTOR   *IdtEntry;

-  

+

   IdtEntry = (IA32_IDT_GATE_DESCRIPTOR *) IdtDescriptor->Base;

   CopyMem (&IdtEntry[1], RestoredIdtEntry, sizeof (IA32_IDT_GATE_DESCRIPTOR));

 }

diff --git a/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLib.c b/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLib.c
index 87420709f6..feecf410c8 100644
--- a/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLib.c
+++ b/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLib.c
@@ -1,7 +1,7 @@
 /** @file

   PE/Coff Extra Action library instances.

 

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

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

@@ -16,7 +16,7 @@
 

 /**

   Check if the hardware breakpoint in Drx is enabled by checking the Lx and Gx bit in Dr7.

-  

+

   It assumes that DebugAgent will set both Lx and Gx bit when setting up the hardware breakpoint.

 

 

@@ -40,7 +40,7 @@ IsDrxEnabled (
   Common routine to report the PE/COFF image loading/relocating or unloading event.

 

   If ImageContext is NULL, then ASSERT().

-  

+

   @param  ImageContext  Pointer to the image context structure that describes the

                         PE/COFF image.

   @param  Signature     IMAGE_LOAD_SIGNATURE or IMAGE_UNLOAD_SIGNATURE.

@@ -83,7 +83,7 @@ PeCoffLoaderExtraActionCommon (
   if (LoadImageMethod == DEBUG_LOAD_IMAGE_METHOD_IO_HW_BREAKPOINT) {

     //

     // If the CPU does not support Debug Extensions(CPUID:01 EDX:BIT2)

-    // then force use of DEBUG_LOAD_IMAGE_METHOD_SOFT_INT3 

+    // then force use of DEBUG_LOAD_IMAGE_METHOD_SOFT_INT3

     //

     AsmCpuid (1, NULL, NULL, NULL, &RegEdx);

     if ((RegEdx & BIT2) == 0) {

@@ -107,7 +107,7 @@ PeCoffLoaderExtraActionCommon (
       IdtEntryHooked = TRUE;

     }

   }

-  

+

   //

   // Save Debug Register State

   //

@@ -152,7 +152,7 @@ PeCoffLoaderExtraActionCommon (
 

   //

   // Restore Debug Register State only when Host didn't change it inside exception handler.

-  // E.g.: User halts the target and sets the HW breakpoint while target is 

+  // E.g.: User halts the target and sets the HW breakpoint while target is

   //       in the above exception handler

   //

   NewDr7 = AsmReadDr7 () | BIT10; // H/w sets bit 10, some simulators don't

diff --git a/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLib.h b/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLib.h
index 3f919287e8..9216d9b0df 100644
--- a/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLib.h
+++ b/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLib.h
@@ -1,7 +1,7 @@
 /** @file

   PE/Coff Extra Action library instances, it will report image debug info.

 

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

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

@@ -43,14 +43,14 @@ extern UINTN  AsmInterruptHandle;
   @retval  FALSE    IDT entries were not setuo by Debug Agent.

 

 **/

-BOOLEAN 

+BOOLEAN

 CheckDebugAgentHandler (

   IN  IA32_DESCRIPTOR            *IdtDescriptor,

   IN  UINTN                      InterruptType

   );

 

 /**

-  Save IDT entry for INT1 and update it. 

+  Save IDT entry for INT1 and update it.

 

   @param[in]  IdtDescriptor      Pointer to IDT Descriptor.

   @param[out] SavedIdtEntry      Original IDT entry returned.

@@ -63,7 +63,7 @@ SaveAndUpdateIdtEntry1 (
   );

 

 /**

-  Restore IDT entry for INT1. 

+  Restore IDT entry for INT1.

 

   @param[in]  IdtDescriptor      Pointer to IDT Descriptor.

   @param[in]  RestoredIdtEntry   IDT entry to be restored.

diff --git a/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/X64/IntHandlerFuncs.c b/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/X64/IntHandlerFuncs.c
index 5431187d06..b95557b568 100644
--- a/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/X64/IntHandlerFuncs.c
+++ b/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/X64/IntHandlerFuncs.c
@@ -1,7 +1,7 @@
 /** @file

   X64 arch function to access IDT vector.

 

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

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

@@ -24,7 +24,7 @@
   @retval  FALSE    IDT entries were not setuo by Debug Agent.

 

 **/

-BOOLEAN 

+BOOLEAN

 CheckDebugAgentHandler (

   IN  IA32_DESCRIPTOR            *IdtDescriptor,

   IN  UINTN                      InterruptType

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

 

   InterruptHandler = IdtEntry[InterruptType].Bits.OffsetLow +

-                    (((UINTN)IdtEntry[InterruptType].Bits.OffsetHigh) << 16) + 

+                    (((UINTN)IdtEntry[InterruptType].Bits.OffsetHigh) << 16) +

                     (((UINTN)IdtEntry[InterruptType].Bits.OffsetUpper) << 32);

   if (InterruptHandler >= sizeof (UINT32) &&  *(UINT32 *)(InterruptHandler - sizeof (UINT32)) == AGENT_HANDLER_SIGNATURE) {

     return TRUE;

@@ -49,7 +49,7 @@ CheckDebugAgentHandler (
 }

 

 /**

-  Save IDT entry for INT1 and update it. 

+  Save IDT entry for INT1 and update it.

 

   @param[in]  IdtDescriptor      Pointer to IDT Descriptor.

   @param[out] SavedIdtEntry      Original IDT entry returned.

@@ -64,7 +64,7 @@ SaveAndUpdateIdtEntry1 (
   IA32_IDT_GATE_DESCRIPTOR   *IdtEntry;

   UINT16                     CodeSegment;

   UINTN                      InterruptHandler;

-  

+

   IdtEntry = (IA32_IDT_GATE_DESCRIPTOR *) IdtDescriptor->Base;

   CopyMem (SavedIdtEntry, &IdtEntry[1], sizeof (IA32_IDT_GATE_DESCRIPTOR));

 

@@ -82,7 +82,7 @@ SaveAndUpdateIdtEntry1 (
 }

 

 /**

-  Restore IDT entry for INT1. 

+  Restore IDT entry for INT1.

 

   @param[in]  IdtDescriptor      Pointer to IDT Descriptor.

   @param[in]  RestoredIdtEntry   IDT entry to be restored.

@@ -95,7 +95,7 @@ RestoreIdtEntry1 (
   )

 {

   IA32_IDT_GATE_DESCRIPTOR   *IdtEntry;

-  

+

   IdtEntry = (IA32_IDT_GATE_DESCRIPTOR *) IdtDescriptor->Base;

   CopyMem (&IdtEntry[1], RestoredIdtEntry, sizeof (IA32_IDT_GATE_DESCRIPTOR));

 }