From 3402aac7d985bf8a9f9d3c639f3fe93609380513 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Tue, 19 Aug 2014 13:29:52 +0000 Subject: 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 Reviewed-By: Olivier Martin git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15833 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Library/BeagleBoardLib/BeagleBoard.c | 18 ++++++------ .../Library/BeagleBoardLib/BeagleBoardHelper.S | 14 +++++----- .../Library/BeagleBoardLib/BeagleBoardHelper.asm | 14 +++++----- .../Library/BeagleBoardLib/BeagleBoardLib.inf | 14 +++++----- .../Library/BeagleBoardLib/BeagleBoardMem.c | 14 +++++----- BeagleBoardPkg/Library/BeagleBoardLib/Clock.c | 2 +- .../Library/BeagleBoardLib/PadConfiguration.c | 2 +- BeagleBoardPkg/Library/EblCmdLib/EblCmdLib.c | 32 +++++++++++----------- BeagleBoardPkg/Library/EblCmdLib/EblCmdLib.inf | 6 ++-- BeagleBoardPkg/Library/GdbSerialLib/GdbSerialLib.c | 16 +++++------ .../Library/GdbSerialLib/GdbSerialLib.inf | 8 +++--- .../Library/ResetSystemLib/ResetSystemLib.c | 10 +++---- .../Library/ResetSystemLib/ResetSystemLib.inf | 2 +- 13 files changed, 76 insertions(+), 76 deletions(-) (limited to 'BeagleBoardPkg/Library') diff --git a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoard.c b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoard.c index 4e58f36042..dbbe68a7a0 100755 --- a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoard.c +++ b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoard.c @@ -1,14 +1,14 @@ /** @file * * Copyright (c) 2011-2012, 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. * **/ @@ -47,10 +47,10 @@ BeagleBoardGetRevision ( OldPinDir = MmioRead32 (GPIO6_BASE + GPIO_OE); MmioWrite32(GPIO6_BASE + GPIO_OE, (OldPinDir | BIT11 | BIT12 | BIT13)); Revision = MmioRead32 (GPIO6_BASE + GPIO_DATAIN); - + // Restore I/O settings MmioWrite32 (GPIO6_BASE + GPIO_OE, OldPinDir); - + return (BEAGLEBOARD_REVISION)((Revision >> 11) & 0x7); } diff --git a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.S b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.S index 0d50cbd45a..8e02088efc 100644 --- a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.S +++ b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.S @@ -1,13 +1,13 @@ # # Copyright (c) 2012-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 +# +# 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. # # @@ -44,4 +44,4 @@ ASM_PFX(ArmPlatformGetPrimaryCoreMpId): // always the MPIDR of the calling CPU. b ASM_PFX(ArmReadMpidr) -ASM_FUNCTION_REMOVE_IF_UNREFERENCED +ASM_FUNCTION_REMOVE_IF_UNREFERENCED diff --git a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.asm b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.asm index b850d9858e..39a2a536ad 100644 --- a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.asm +++ b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.asm @@ -1,13 +1,13 @@ // // Copyright (c) 2012-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/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf index f3242729b7..b1139a477d 100755 --- a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf +++ b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf @@ -1,13 +1,13 @@ #/* @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/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardMem.c b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardMem.c index 210e850c8d..b77b069930 100755 --- a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardMem.c +++ b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardMem.c @@ -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/BeagleBoardPkg/Library/BeagleBoardLib/Clock.c b/BeagleBoardPkg/Library/BeagleBoardLib/Clock.c index 1985a6bfb4..6ca48e0c9f 100755 --- a/BeagleBoardPkg/Library/BeagleBoardLib/Clock.c +++ b/BeagleBoardPkg/Library/BeagleBoardLib/Clock.c @@ -1,7 +1,7 @@ /** @file Copyright (c) 2008 - 2009, Apple Inc. 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 diff --git a/BeagleBoardPkg/Library/BeagleBoardLib/PadConfiguration.c b/BeagleBoardPkg/Library/BeagleBoardLib/PadConfiguration.c index 45438023d2..e6f7cc55ff 100755 --- a/BeagleBoardPkg/Library/BeagleBoardLib/PadConfiguration.c +++ b/BeagleBoardPkg/Library/BeagleBoardLib/PadConfiguration.c @@ -1,7 +1,7 @@ /** @file Copyright (c) 2008 - 2009, Apple Inc. 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 diff --git a/BeagleBoardPkg/Library/EblCmdLib/EblCmdLib.c b/BeagleBoardPkg/Library/EblCmdLib/EblCmdLib.c index 4f1a327cea..46204a4386 100644 --- a/BeagleBoardPkg/Library/EblCmdLib/EblCmdLib.c +++ b/BeagleBoardPkg/Library/EblCmdLib/EblCmdLib.c @@ -2,7 +2,7 @@ Add custom commands for BeagleBoard development. Copyright (c) 2008 - 2010, Apple Inc. 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 @@ -39,11 +39,11 @@ Simple arm disassembler via a library Argv[0] - symboltable - Argv[1] - Optional quoted format string + Argv[1] - Optional quoted format string Argv[2] - Optional flag @param Argc Number of command arguments in Argv - @param Argv Array of strings that represent the parsed command line. + @param Argv Array of strings that represent the parsed command line. Argv[0] is the command name @return EFI_SUCCESS @@ -64,7 +64,7 @@ EblSymbolTable ( UINT32 PeCoffSizeOfHeaders; UINT32 ImageBase; BOOLEAN Elf; - + // Need to add lots of error checking on the passed in string // Default string is for RealView debugger or gdb depending on toolchain used. if (Argc > 1) { @@ -74,17 +74,17 @@ EblSymbolTable ( // Assume gdb Format = "add-symbol-file %a 0x%x"; #else - // Default to RVCT + // Default to RVCT Format = "load /a /ni /np %a &0x%x"; #endif } Elf = (Argc > 2) ? FALSE : TRUE; - + Status = EfiGetSystemConfigurationTable (&gEfiDebugImageInfoTableGuid, (VOID **)&DebugImageTableHeader); if (EFI_ERROR (Status)) { return Status; } - + DebugTable = DebugImageTableHeader->EfiDebugImageInfoTable; if (DebugTable == NULL) { return EFI_SUCCESS; @@ -100,13 +100,13 @@ EblSymbolTable ( if (Elf) { // ELF and Mach-O images don't include the header so the linked address does not include header ImageBase += PeCoffSizeOfHeaders; - } + } AsciiPrint (Format, Pdb, ImageBase); AsciiPrint ("\n"); } else { } } - } + } } return EFI_SUCCESS; @@ -121,7 +121,7 @@ EblSymbolTable ( ARgv[2] - Number of instructions to disassembly (optional) @param Argc Number of command arguments in Argv - @param Argv Array of strings that represent the parsed command line. + @param Argv Array of strings that represent the parsed command line. Argv[0] is the command name @return EFI_SUCCESS @@ -138,22 +138,22 @@ EblDisassembler ( UINT32 Count; CHAR8 Buffer[80]; UINT32 ItBlock; - + if (Argc < 2) { return EFI_INVALID_PARAMETER; } - + Address = AsciiStrHexToUintn (Argv[1]); Count = (Argc > 2) ? (UINT32)AsciiStrHexToUintn (Argv[2]) : 20; - Ptr = (UINT8 *)(UINTN)Address; + Ptr = (UINT8 *)(UINTN)Address; ItBlock = 0; do { CurrentAddress = Ptr; DisassembleInstruction (&Ptr, TRUE, TRUE, &ItBlock, Buffer, sizeof (Buffer)); AsciiPrint ("0x%08x: %a\n", CurrentAddress, Buffer); } while (Count-- > 0); - + return EFI_SUCCESS; } @@ -203,7 +203,7 @@ CHAR8 *mTokenList[] = { ARgv[2] - Number of instructions to disassembly (optional) @param Argc Number of command arguments in Argv - @param Argv Array of strings that represent the parsed command line. + @param Argv Array of strings that represent the parsed command line. Argv[0] is the command name @return EFI_SUCCESS @@ -256,7 +256,7 @@ EblPerformance ( AsciiPrint ("%6a %6ld ms\n", Token, Milliseconds); break; } - } + } } } while (Key != 0); diff --git a/BeagleBoardPkg/Library/EblCmdLib/EblCmdLib.inf b/BeagleBoardPkg/Library/EblCmdLib/EblCmdLib.inf index 329df78bbe..a79448c0e9 100644 --- a/BeagleBoardPkg/Library/EblCmdLib/EblCmdLib.inf +++ b/BeagleBoardPkg/Library/EblCmdLib/EblCmdLib.inf @@ -20,7 +20,7 @@ FILE_GUID = ea62bdc3-1063-425f-8851-98cb47f213a8 MODULE_TYPE = UEFI_DRIVER VERSION_STRING = 1.0 - LIBRARY_CLASS = EblCmdLib|DXE_DRIVER UEFI_APPLICATION UEFI_DRIVER + LIBRARY_CLASS = EblCmdLib|DXE_DRIVER UEFI_APPLICATION UEFI_DRIVER # @@ -44,10 +44,10 @@ ArmDisassemblerLib PerformanceLib TimerLib - + [Protocols] gEfiDebugSupportProtocolGuid gEfiLoadedImageProtocolGuid - + [Guids] gEfiDebugImageInfoTableGuid diff --git a/BeagleBoardPkg/Library/GdbSerialLib/GdbSerialLib.c b/BeagleBoardPkg/Library/GdbSerialLib/GdbSerialLib.c index 7634ee174c..82a2957dc9 100644 --- a/BeagleBoardPkg/Library/GdbSerialLib/GdbSerialLib.c +++ b/BeagleBoardPkg/Library/GdbSerialLib/GdbSerialLib.c @@ -2,7 +2,7 @@ Basic serial IO abstaction for GDB Copyright (c) 2008 - 2009, Apple Inc. 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 @@ -34,10 +34,10 @@ GdbSerialLibConstructor ( RETURN_STATUS EFIAPI GdbSerialInit ( - IN UINT64 BaudRate, - IN UINT8 Parity, - IN UINT8 DataBits, - IN UINT8 StopBits + IN UINT64 BaudRate, + IN UINT8 Parity, + IN UINT8 DataBits, + IN UINT8 StopBits ) { return RETURN_SUCCESS; @@ -47,7 +47,7 @@ BOOLEAN EFIAPI GdbIsCharAvailable ( VOID - ) + ) { UINT32 LSR = UartBase(PcdGet32(PcdOmap35xxConsoleUart)) + UART_LSR_REG; @@ -67,7 +67,7 @@ GdbGetChar ( UINT32 LSR = UartBase(PcdGet32(PcdOmap35xxConsoleUart)) + UART_LSR_REG; UINT32 RBR = UartBase(PcdGet32(PcdOmap35xxConsoleUart)) + UART_RBR_REG; CHAR8 Char; - + while ((MmioRead8(LSR) & UART_LSR_RX_FIFO_E_MASK) == UART_LSR_RX_FIFO_E_EMPTY); Char = MmioRead8(RBR); @@ -82,7 +82,7 @@ GdbPutChar ( { UINT32 LSR = UartBase(PcdGet32(PcdOmap35xxConsoleUart)) + UART_LSR_REG; UINT32 THR = UartBase(PcdGet32(PcdOmap35xxConsoleUart)) + UART_THR_REG; - + while ((MmioRead8(LSR) & UART_LSR_TX_FIFO_E_MASK) == UART_LSR_TX_FIFO_E_NOT_EMPTY); MmioWrite8(THR, Char); } diff --git a/BeagleBoardPkg/Library/GdbSerialLib/GdbSerialLib.inf b/BeagleBoardPkg/Library/GdbSerialLib/GdbSerialLib.inf index df96e8b756..a06acf14fb 100644 --- a/BeagleBoardPkg/Library/GdbSerialLib/GdbSerialLib.inf +++ b/BeagleBoardPkg/Library/GdbSerialLib/GdbSerialLib.inf @@ -1,14 +1,14 @@ #/** @file -# +# # Copyright (c) 2008 - 2010, Apple Inc. 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. -# +# #**/ [Defines] @@ -34,7 +34,7 @@ [LibraryClasses] DebugLib IoLib - OmapLib + OmapLib [FixedPcd] gOmap35xxTokenSpaceGuid.PcdOmap35xxConsoleUart diff --git a/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.c b/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.c index 706a19b273..7b0949e043 100644 --- a/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.c +++ b/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.c @@ -1,8 +1,8 @@ /** @file Do a generic Cold Reset for OMAP3550 and BeagleBoard specific Warm reset - + Copyright (c) 2008 - 2010, Apple Inc. 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 @@ -54,7 +54,7 @@ ShutdownEfi ( Pages = EFI_SIZE_TO_PAGES (MemoryMapSize) + 1; MemoryMap = AllocatePages (Pages); - + // // Get System MemoryMap // @@ -141,7 +141,7 @@ LibResetSystem ( ASSERT (FALSE); return EFI_DEVICE_ERROR; } - + /** @@ -149,7 +149,7 @@ LibResetSystem ( @param ImageHandle The firmware allocated handle for the EFI image. @param SystemTable A pointer to the EFI System Table. - + @retval EFI_SUCCESS The constructor always returns EFI_SUCCESS. **/ diff --git a/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf b/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf index e198812554..64638cb62c 100644 --- a/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf +++ b/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf @@ -34,7 +34,7 @@ [Pcd.common] gArmTokenSpaceGuid.PcdCpuResetAddress gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress - + [LibraryClasses] DebugLib ArmLib -- cgit v1.2.3