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 --- .../LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c | 4 ++-- .../LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c | 18 +++++++++--------- .../LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.h | 2 +- .../LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) (limited to 'Omap35xxPkg/LcdGraphicsOutputDxe') diff --git a/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c b/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c index 9541e7e902..4e2e4de7db 100644 --- a/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c +++ b/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c @@ -334,7 +334,7 @@ BltBufferToVideo ( ); } } - + return Status; } @@ -416,7 +416,7 @@ LcdGraphicsBlt ( if (!mDisplayInitialized) { InitializeDisplay (Instance); } - + switch (BltOperation) { case EfiBltVideoFill: Status = BltVideoFill (This, BltBuffer, SourceX, SourceY, DestinationX, DestinationY, Width, Height, Delta); diff --git a/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c b/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c index f7d247865d..bfd9f3be43 100644 --- a/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c +++ b/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c @@ -142,14 +142,14 @@ DssSetMode ( ) { // Make sure the interface clock is running - MmioWrite32 (CM_ICLKEN_DSS, EN_DSS); + MmioWrite32 (CM_ICLKEN_DSS, EN_DSS); // Stop the functional clocks MmioAnd32 (CM_FCLKEN_DSS, ~(EN_DSS1 | EN_DSS2 | EN_TV)); // Program the DSS clock divisor MmioWrite32 (CM_CLKSEL_DSS, 0x1000 | (LcdModes[ModeNumber].DssDivisor)); - + // Start the functional clocks MmioOr32 (CM_FCLKEN_DSS, (EN_DSS1 | EN_DSS2 | EN_TV)); @@ -159,10 +159,10 @@ DssSetMode ( // Reset the subsystem MmioWrite32(DSS_SYSCONFIG, DSS_SOFTRESET); while (!(MmioRead32 (DSS_SYSSTATUS) & DSS_RESETDONE)); - + // Configure LCD parameters MmioWrite32 (DISPC_SIZE_LCD, - ((LcdModes[ModeNumber].HorizontalResolution - 1) + ((LcdModes[ModeNumber].HorizontalResolution - 1) | ((LcdModes[ModeNumber].VerticalResolution - 1) << 16)) ); MmioWrite32 (DISPC_TIMING_H, @@ -187,7 +187,7 @@ DssSetMode ( MmioWrite32 (DISPC_GFX_PRELD, 0x2D8); MmioWrite32 (DISPC_GFX_BA0, VramBaseAddress); MmioWrite32 (DISPC_GFX_SIZE, - ((LcdModes[ModeNumber].HorizontalResolution - 1) + ((LcdModes[ModeNumber].HorizontalResolution - 1) | ((LcdModes[ModeNumber].VerticalResolution - 1) << 16)) ); @@ -213,7 +213,7 @@ HwInitializeDisplay ( // Enable power lines used by TFP410 Status = gBS->LocateProtocol (&gEmbeddedExternalDeviceProtocolGuid, NULL, (VOID **)&gTPS65950); - ASSERT_EFI_ERROR (Status); + ASSERT_EFI_ERROR (Status); OldTpl = gBS->RaiseTPL(TPL_NOTIFY); Data = VAUX_DEV_GRP_P1; @@ -222,7 +222,7 @@ HwInitializeDisplay ( Data = VAUX_DEDICATED_18V; Status = gTPS65950->Write (gTPS65950, EXTERNAL_DEVICE_REGISTER(I2C_ADDR_GRP_ID4, VPLL2_DEDICATED), 1, &Data); - ASSERT_EFI_ERROR (Status); + ASSERT_EFI_ERROR (Status); // Power up TFP410 (set GPIO2 on TPS - for BeagleBoard-xM) Status = gTPS65950->Read (gTPS65950, EXTERNAL_DEVICE_REGISTER(I2C_ADDR_GRP_ID2, GPIODATADIR1), 1, &Data); @@ -239,7 +239,7 @@ HwInitializeDisplay ( // Power up TFP410 (set GPIO 170 - for older BeagleBoards) MmioAnd32 (GPIO6_BASE + GPIO_OE, ~BIT10); - MmioOr32 (GPIO6_BASE + GPIO_SETDATAOUT, BIT10); + MmioOr32 (GPIO6_BASE + GPIO_SETDATAOUT, BIT10); return EFI_SUCCESS; } @@ -249,7 +249,7 @@ InitializeDisplay ( IN LCD_INSTANCE* Instance ) { - EFI_STATUS Status; + EFI_STATUS Status; UINTN VramSize; EFI_PHYSICAL_ADDRESS VramBaseAddress; diff --git a/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.h b/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.h index 520e28e670..8b27f3d558 100644 --- a/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.h +++ b/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.h @@ -144,7 +144,7 @@ LcdGraphicsBlt ( #define LCDENABLE BIT0 #define ACTIVEMATRIX BIT3 #define GOLCD BIT5 -#define DATALINES24 (BIT8 | BIT9) +#define DATALINES24 (BIT8 | BIT9) #define LCDENABLESIGNAL BIT28 #define GFXENABLE BIT0 diff --git a/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf b/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf index ac026f4356..86fbef42c0 100644 --- a/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf +++ b/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf @@ -1,14 +1,14 @@ #/** @file -# +# # Copyright (c) 2011, ARM Ltd. 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] -- cgit v1.2.3