ARM Packages: Removed trailing spaces

Trailing spaces create issue/warning when generating/applying patches.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
Reviewed-By: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15833 6f19259b-4bc3-4df7-8a09-765794883524

13 files changed, 121 insertions, 121 deletions

diff --git a/ArmPkg/Include/AsmMacroIoLib.h b/ArmPkg/Include/AsmMacroIoLib.h
index dac2e150cc..408b2ca280 100644
--- a/ArmPkg/Include/AsmMacroIoLib.h
+++ b/ArmPkg/Include/AsmMacroIoLib.h
@@ -159,7 +159,7 @@ _InitializePrimaryStackEnd:
   ldr  r1, =Address ;              \

   ldr  r0, =Data    ;              \

   str  r0, [r1]

-    

+

 #define MmioOr32(Address, OrData) \

   ldr  r1, =Address ;             \

   ldr  r2, =OrData  ;             \

@@ -181,7 +181,7 @@ _InitializePrimaryStackEnd:
   and  r0, r0, r2   ;                             \

   ldr  r2, =OrData  ;                             \

   orr  r0, r0, r2   ;                             \

-  str  r0, [r1]         

+  str  r0, [r1]

 

 #define MmioWriteFromReg32(Address, Reg) \

   ldr  r1, =Address ;                    \

@@ -235,7 +235,7 @@ _InitializePrimaryStackEnd:
 #else

 

 //

-// Use ARM assembly macros, form armasam 

+// Use ARM assembly macros, form armasam

 //

 //  Less magic in the macros if ldr reg, =expr works

 //

@@ -251,7 +251,7 @@ _InitializePrimaryStackEnd:
 

 // returns Data in R0 and Address in R1, and OrData in r2

 #define MmioOr32(Address, OrData) MmioOr32Macro Address, OrData

-  

+

 

 // returns _Data in R0 and _Address in R1, and _OrData in r2

 

diff --git a/ArmPkg/Include/AsmMacroIoLib.inc b/ArmPkg/Include/AsmMacroIoLib.inc
index 54c32d4c34..87e497b31a 100644
--- a/ArmPkg/Include/AsmMacroIoLib.inc
+++ b/ArmPkg/Include/AsmMacroIoLib.inc
@@ -5,81 +5,81 @@
 ;  Copyright (c) 2009, Apple Inc. All rights reserved.<BR>

 ;  Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR>

 ;

-;  This program and the accompanying materials                          

-;  are licensed and made available under the terms and conditions of the BSD License         

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

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

 ;

 ;**/

 

 

-  MACRO 

-  MmioWrite32Macro $Address, $Data 

-  ldr  r1, = ($Address)                

-  ldr  r0, = ($Data)                 

-  str  r0, [r1]  

+  MACRO

+  MmioWrite32Macro $Address, $Data

+  ldr  r1, = ($Address)

+  ldr  r0, = ($Data)

+  str  r0, [r1]

   MEND

-    

-  MACRO 

-  MmioOr32Macro $Address, $OrData 

-  ldr  r1, =($Address)               

-  ldr  r2, =($OrData)                

-  ldr  r0, [r1]                      

-  orr  r0, r0, r2                    

-  str  r0, [r1] 

+

+  MACRO

+  MmioOr32Macro $Address, $OrData

+  ldr  r1, =($Address)

+  ldr  r2, =($OrData)

+  ldr  r0, [r1]

+  orr  r0, r0, r2

+  str  r0, [r1]

   MEND

 

-  MACRO 

-  MmioAnd32Macro $Address, $AndData 

-  ldr  r1, =($Address)                 

-  ldr  r2, =($AndData)                 

-  ldr  r0, [r1]                        

-  and  r0, r0, r2                      

-  str  r0, [r1] 

+  MACRO

+  MmioAnd32Macro $Address, $AndData

+  ldr  r1, =($Address)

+  ldr  r2, =($AndData)

+  ldr  r0, [r1]

+  and  r0, r0, r2

+  str  r0, [r1]

   MEND

 

-  MACRO 

-  MmioAndThenOr32Macro $Address, $AndData, $OrData 

-  ldr  r1, =($Address)                         

-  ldr  r0, [r1]                                        

-  ldr  r2, =($AndData)                                 

-  and  r0, r0, r2                                      

-  ldr  r2, =($OrData)                                  

-  orr  r0, r0, r2                                      

-  str  r0, [r1]          

+  MACRO

+  MmioAndThenOr32Macro $Address, $AndData, $OrData

+  ldr  r1, =($Address)

+  ldr  r0, [r1]

+  ldr  r2, =($AndData)

+  and  r0, r0, r2

+  ldr  r2, =($OrData)

+  orr  r0, r0, r2

+  str  r0, [r1]

   MEND

 

-  MACRO 

-  MmioWriteFromReg32Macro $Address, $Reg 

-  ldr  r1, =($Address)   

-  str  $Reg, [r1]        

+  MACRO

+  MmioWriteFromReg32Macro $Address, $Reg

+  ldr  r1, =($Address)

+  str  $Reg, [r1]

   MEND

 

-  MACRO 

-  MmioRead32Macro $Address   

-  ldr  r1, =($Address)         

-  ldr  r0, [r1]   

+  MACRO

+  MmioRead32Macro $Address

+  ldr  r1, =($Address)

+  ldr  r0, [r1]

+  MEND

+

+  MACRO

+  MmioReadToReg32Macro $Address, $Reg

+  ldr  r1, =($Address)

+  ldr  $Reg, [r1]

   MEND

 

-  MACRO 

-  MmioReadToReg32Macro $Address, $Reg 

-  ldr  r1, =($Address)                   

-  ldr  $Reg, [r1]        

+  MACRO

+  LoadConstantMacro $Data

+  ldr  r0, =($Data)

   MEND

 

-  MACRO 

-  LoadConstantMacro $Data 

-  ldr  r0, =($Data) 

+  MACRO

+  LoadConstantToRegMacro $Data, $Reg

+  ldr  $Reg, =($Data)

   MEND

 

-  MACRO 

-  LoadConstantToRegMacro $Data, $Reg 

-  ldr  $Reg, =($Data) 

-  MEND 

-  

   ; The reserved place must be 8-bytes aligned for pushing 64-bit variable on the stack

   ; Note: Global Size will be modified

   MACRO

diff --git a/ArmPkg/Include/Chipset/ARM926EJ-S.h b/ArmPkg/Include/Chipset/ARM926EJ-S.h
index 8e1b6e1462..4ef110358f 100644
--- a/ArmPkg/Include/Chipset/ARM926EJ-S.h
+++ b/ArmPkg/Include/Chipset/ARM926EJ-S.h
@@ -58,7 +58,7 @@
 #define TT_DESCRIPTOR_SECTION_WRITE_BACK          (TT_DESCRIPTOR_SECTION_ACCESS_PERMISSION_READ_WRITE | \

                                                    TT_DESCRIPTOR_SECTION_DOMAIN(0)                    | \

                                                    TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_BACK      | \

-                                                   TT_DESCRIPTOR_TYPE_SECTION)                                                   

+                                                   TT_DESCRIPTOR_TYPE_SECTION)

 #define TT_DESCRIPTOR_SECTION_WRITE_THROUGH       (TT_DESCRIPTOR_SECTION_ACCESS_PERMISSION_READ_WRITE | \

                                                    TT_DESCRIPTOR_SECTION_DOMAIN(0)                    | \

                                                    TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_THROUGH   | \

diff --git a/ArmPkg/Include/Chipset/ArmArchTimer.h b/ArmPkg/Include/Chipset/ArmArchTimer.h
index fcc03ca921..1caad3d336 100644
--- a/ArmPkg/Include/Chipset/ArmArchTimer.h
+++ b/ArmPkg/Include/Chipset/ArmArchTimer.h
@@ -1,14 +1,14 @@
 /** @file

 *

 *  Copyright (c) 2011-2013, ARM Limited. All rights reserved.

-*  

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

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

 *

 **/

 

diff --git a/ArmPkg/Include/Chipset/ArmV7.h b/ArmPkg/Include/Chipset/ArmV7.h
index 839a192516..ceb32170ed 100644
--- a/ArmPkg/Include/Chipset/ArmV7.h
+++ b/ArmPkg/Include/Chipset/ArmV7.h
@@ -94,7 +94,7 @@ ArmEnableSWPInstruction (
   VOID

   );

 

-UINTN 

+UINTN

 EFIAPI

 ArmReadCbar (

   VOID

diff --git a/ArmPkg/Include/Chipset/ArmV7Mmu.h b/ArmPkg/Include/Chipset/ArmV7Mmu.h
index a3b3e35f10..24ab1755fa 100644
--- a/ArmPkg/Include/Chipset/ArmV7Mmu.h
+++ b/ArmPkg/Include/Chipset/ArmV7Mmu.h
@@ -1,14 +1,14 @@
 /** @file

 *

 *  Copyright (c) 2011-2013, ARM Limited. All rights reserved.

-*  

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

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

 *

 **/

 

diff --git a/ArmPkg/Include/Guid/ArmMpCoreInfo.h b/ArmPkg/Include/Guid/ArmMpCoreInfo.h
index dba2becca9..fe690e274b 100644
--- a/ArmPkg/Include/Guid/ArmMpCoreInfo.h
+++ b/ArmPkg/Include/Guid/ArmMpCoreInfo.h
@@ -1,14 +1,14 @@
 /** @file

 *

 *  Copyright (c) 2011, ARM Limited. All rights reserved.

-*  

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

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

 *

 **/

 

diff --git a/ArmPkg/Include/Library/ArmDisassemblerLib.h b/ArmPkg/Include/Library/ArmDisassemblerLib.h
index 757c95ec79..d6a493f2cb 100644
--- a/ArmPkg/Include/Library/ArmDisassemblerLib.h
+++ b/ArmPkg/Include/Library/ArmDisassemblerLib.h
@@ -16,19 +16,19 @@
 #define __ARM_DISASSEBLER_LIB_H__

 

 /**

-  Place a dissasembly of of **OpCodePtr into buffer, and update OpCodePtr to 

-  point to next instructin. 

-  

-  We cheat and only decode instructions that access 

+  Place a dissasembly of of **OpCodePtr into buffer, and update OpCodePtr to

+  point to next instructin.

+

+  We cheat and only decode instructions that access

   memory. If the instruction is not found we dump the instruction in hex.

-   

-  @param  OpCodePtrPtr  Pointer to pointer of ARM Thumb instruction to disassemble.  

+

+  @param  OpCodePtrPtr  Pointer to pointer of ARM Thumb instruction to disassemble.

   @param  Thumb         TRUE for Thumb(2), FALSE for ARM instruction stream

   @param  Extended      TRUE dump hex for instruction too.

   @param  ItBlock       Size of IT Block

   @param  Buf           Buffer to sprintf disassembly into.

-  @param  Size          Size of Buf in bytes. 

-  

+  @param  Size          Size of Buf in bytes.

+

 **/

 VOID

 DisassembleInstruction (

@@ -39,5 +39,5 @@ DisassembleInstruction (
   OUT CHAR8     *Buf,

   OUT UINTN     Size

   );

-  

-#endif 

+

+#endif

diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h
index bc3b89663c..0bb0d4a063 100644
--- a/ArmPkg/Include/Library/ArmLib.h
+++ b/ArmPkg/Include/Library/ArmLib.h
@@ -148,43 +148,43 @@ EFIAPI
 ArmDataCachePresent (

   VOID

   );

-  

+

 UINTN

 EFIAPI

 ArmDataCacheSize (

   VOID

   );

-  

+

 UINTN

 EFIAPI

 ArmDataCacheAssociativity (

   VOID

   );

-  

+

 UINTN

 EFIAPI

 ArmDataCacheLineLength (

   VOID

   );

-  

+

 BOOLEAN

 EFIAPI

 ArmInstructionCachePresent (

   VOID

   );

-  

+

 UINTN

 EFIAPI

 ArmInstructionCacheSize (

   VOID

   );

-  

+

 UINTN

 EFIAPI

 ArmInstructionCacheAssociativity (

   VOID

   );

-  

+

 UINTN

 EFIAPI

 ArmInstructionCacheLineLength (

@@ -311,7 +311,7 @@ EFIAPI
 ArmDisableInstructionCache (

   VOID

   );

-  

+

 VOID

 EFIAPI

 ArmEnableMmu (

@@ -395,7 +395,7 @@ EFIAPI
 ArmDisableFiq (

   VOID

   );

-  

+

 BOOLEAN

 EFIAPI

 ArmGetFiqState (

@@ -407,14 +407,14 @@ EFIAPI
 ArmInvalidateTlb (

   VOID

   );

-  

+

 VOID

 EFIAPI

 ArmUpdateTranslationTableEntry (

   IN  VOID     *TranslationTableEntry,

   IN  VOID     *Mva

   );

-  

+

 VOID

 EFIAPI

 ArmSetDomainAccessControl (

@@ -440,13 +440,13 @@ ArmConfigureMmu (
   OUT VOID                         **TranslationTableBase OPTIONAL,

   OUT UINTN                         *TranslationTableSize  OPTIONAL

   );

-  

+

 BOOLEAN

 EFIAPI

 ArmMmuEnabled (

   VOID

   );

-  

+

 VOID

 EFIAPI

 ArmEnableBranchPrediction (

@@ -482,13 +482,13 @@ EFIAPI
 ArmDataMemoryBarrier (

   VOID

   );

-  

+

 VOID

 EFIAPI

 ArmDataSyncronizationBarrier (

   VOID

   );

-  

+

 VOID

 EFIAPI

 ArmInstructionSynchronizationBarrier (

diff --git a/ArmPkg/Include/Library/DefaultExceptionHandlerLib.h b/ArmPkg/Include/Library/DefaultExceptionHandlerLib.h
index 7166dbb36e..5c7d7e2600 100644
--- a/ArmPkg/Include/Library/DefaultExceptionHandlerLib.h
+++ b/ArmPkg/Include/Library/DefaultExceptionHandlerLib.h
@@ -27,5 +27,5 @@ DefaultExceptionHandler (
   IN     EFI_EXCEPTION_TYPE           ExceptionType,

   IN OUT EFI_SYSTEM_CONTEXT           SystemContext

   );

-  

-#endif 

+

+#endif

diff --git a/ArmPkg/Include/Library/SemihostLib.h b/ArmPkg/Include/Library/SemihostLib.h
index 6256551771..4026f51736 100644
--- a/ArmPkg/Include/Library/SemihostLib.h
+++ b/ArmPkg/Include/Library/SemihostLib.h
@@ -22,7 +22,7 @@
  *  about the semihosting interface.

  *

  */

- 

+

 #define SEMIHOST_FILE_MODE_READ     (0 << 2)

 #define SEMIHOST_FILE_MODE_WRITE    (1 << 2)

 #define SEMIHOST_FILE_MODE_APPEND   (2 << 2)

@@ -92,10 +92,10 @@ VOID
 SemihostWriteString (

   IN CHAR8 *String

   );

-  

+

 UINT32

 SemihostSystem (

   IN CHAR8 *CommandLine

   );

-  

+

 #endif // __SEMIHOSTING_H__

diff --git a/ArmPkg/Include/Library/UncachedMemoryAllocationLib.h b/ArmPkg/Include/Library/UncachedMemoryAllocationLib.h
index 4161fc7c62..a49d8d3ac9 100644
--- a/ArmPkg/Include/Library/UncachedMemoryAllocationLib.h
+++ b/ArmPkg/Include/Library/UncachedMemoryAllocationLib.h
@@ -121,7 +121,7 @@ UncachedAllocateReservedPages (
   If Buffer was not allocated with a page allocation function in the Memory Allocation Library,

   then ASSERT().

   If Pages is zero, then ASSERT().

- 

+

   @param  Buffer                Pointer to the buffer of pages to free.

   @param  Pages                 The number of 4 KB pages to free.

 

@@ -212,7 +212,7 @@ UncachedAllocateAlignedReservedPages (
   If Buffer was not allocated with an aligned page allocation function in the Memory Allocation

   Library, then ASSERT().

   If Pages is zero, then ASSERT().

-  

+

   @param  Buffer                Pointer to the buffer of pages to free.

   @param  Pages                 The number of 4 KB pages to free.

 

@@ -343,7 +343,7 @@ UncachedAllocateReservedZeroPool (
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there

   is not enough memory remaining to satisfy the request, then NULL is returned.

   If Buffer is NULL, then ASSERT().

-  If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). 

+  If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT().

 

   @param  AllocationSize        The number of bytes to allocate and zero.

   @param  Buffer                The buffer to copy to the allocated buffer.

@@ -366,7 +366,7 @@ UncachedAllocateCopyPool (
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there

   is not enough memory remaining to satisfy the request, then NULL is returned.

   If Buffer is NULL, then ASSERT().

-  If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). 

+  If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT().

 

   @param  AllocationSize        The number of bytes to allocate and zero.

   @param  Buffer                The buffer to copy to the allocated buffer.

@@ -389,7 +389,7 @@ UncachedAllocateRuntimeCopyPool (
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there

   is not enough memory remaining to satisfy the request, then NULL is returned.

   If Buffer is NULL, then ASSERT().

-  If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). 

+  If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT().

 

   @param  AllocationSize        The number of bytes to allocate and zero.

   @param  Buffer                The buffer to copy to the allocated buffer.

@@ -639,7 +639,7 @@ UncachedAllocateAlignedReservedCopyPool (
   );

 

 /**

-  Frees a buffer that was previously allocated with one of the aligned pool allocation functions 

+  Frees a buffer that was previously allocated with one of the aligned pool allocation functions

   in the Memory Allocation Library.

 

   Frees the buffer specified by Buffer.  Buffer must have been allocated on a previous call to the

diff --git a/ArmPkg/Include/Protocol/VirtualUncachedPages.h b/ArmPkg/Include/Protocol/VirtualUncachedPages.h
index cf987b0438..0822184b89 100644
--- a/ArmPkg/Include/Protocol/VirtualUncachedPages.h
+++ b/ArmPkg/Include/Protocol/VirtualUncachedPages.h
@@ -37,7 +37,7 @@ EFI_STATUS
   IN  EFI_PHYSICAL_ADDRESS              VirtualMask,

   OUT UINT64                            *Attributes     OPTIONAL

   );

-  

+

 typedef

 EFI_STATUS

 (EFIAPI *FREE_CONVERTED_PAGES) (

@@ -57,4 +57,4 @@ struct _VIRTUAL_UNCACHED_PAGES_PROTOCOL {
 

 extern EFI_GUID gVirtualUncachedPagesProtocolGuid;

 

-#endif  

+#endif