From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.861.1607019605851653893 for ; Thu, 03 Dec 2020 10:20:06 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: pierre.gondois@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9235A11D4; Thu, 3 Dec 2020 10:20:05 -0800 (PST) Received: from e120189.home (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 571233F575; Thu, 3 Dec 2020 10:20:04 -0800 (PST) From: "PierreGondois" To: leif@nuviainc.com, ard.biesheuvel@arm.com, thomas.abraham@arm.com, devel@edk2.groups.io Cc: sami.mujawar@arm.com Subject: [PATCH v1 04/16] ArmPlatformPkg: Fix Ecc error 5007 in LcdGraphicsOutputDxe Date: Thu, 3 Dec 2020 18:19:33 +0000 Message-Id: <20201203181945.10880-5-Pierre.Gondois@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201203181945.10880-1-Pierre.Gondois@arm.com> References: <20201203181945.10880-1-Pierre.Gondois@arm.com> From: Pierre Gondois This patch fixes the following Ecc reported error: There should be no initialization of a variable as part of its declaration Signed-off-by: Pierre Gondois --- The changes can be seen at: https://github.com/PierreARM/edk2-platforms/tree/1537_Ecc_ArmPlatformPkg_v1 ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c | 10 +++++++--- ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c | 10 +++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c b/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c index c865215ec68ecba1e809108cffec9354f042561e..07d2cb0d5dec0f85219fe5cdc438e18ae3a32a38 100644 --- a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c +++ b/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c @@ -1,6 +1,6 @@ /** @file - Copyright (c) 2011-2013, ARM Ltd. All rights reserved.
+ Copyright (c) 2011 - 2020, Arm Limited. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -36,7 +36,7 @@ VideoCopyNoHorizontalOverlap ( IN UINTN Height ) { - EFI_STATUS Status = EFI_SUCCESS; + EFI_STATUS Status; UINTN SourceLine; UINTN DestinationLine; UINTN WidthInBytes; @@ -45,6 +45,8 @@ VideoCopyNoHorizontalOverlap ( VOID *SourceAddr; VOID *DestinationAddr; + Status = EFI_SUCCESS; + if( DestinationY <= SourceY ) { // scrolling up (or horizontally but without overlap) SourceLine = SourceY; @@ -128,7 +130,7 @@ VideoCopyHorizontalOverlap ( IN UINTN Height ) { - EFI_STATUS Status = EFI_SUCCESS; + EFI_STATUS Status; UINT32 *PixelBuffer32bit; UINT32 *SourcePixel32bit; @@ -143,6 +145,8 @@ VideoCopyHorizontalOverlap ( UINTN SizeIn32Bits; UINTN SizeIn16Bits; + Status = EFI_SUCCESS; + switch (BitsPerPixel) { case LCD_BITS_PER_PIXEL_24: diff --git a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c b/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c index f1f104858d8ed456089180e6e82bcc54d4b46b62..bfd03d8f84258158e76690cc5a0d9333f11d67f0 100644 --- a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c +++ b/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c @@ -1,7 +1,7 @@ /** @file This file implements the Graphics Output protocol for Arm platforms - Copyright (c) 2011-2018, ARM Ltd. All rights reserved.
+ Copyright (c) 2011 - 2020, Arm Limited. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -102,7 +102,7 @@ InitializeDisplay ( IN LCD_INSTANCE* Instance ) { - EFI_STATUS Status = EFI_SUCCESS; + EFI_STATUS Status; EFI_PHYSICAL_ADDRESS VramBaseAddress; UINTN VramSize; @@ -148,7 +148,7 @@ LcdGraphicsOutputDxeInitialize ( IN EFI_SYSTEM_TABLE *SystemTable ) { - EFI_STATUS Status = EFI_SUCCESS; + EFI_STATUS Status; LCD_INSTANCE* Instance; Status = LcdIdentify (); @@ -246,7 +246,7 @@ LcdGraphicsQueryMode ( OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION **Info ) { - EFI_STATUS Status = EFI_SUCCESS; + EFI_STATUS Status; LCD_INSTANCE *Instance; Instance = LCD_INSTANCE_FROM_GOP_THIS (This); @@ -296,7 +296,7 @@ LcdGraphicsSetMode ( IN UINT32 ModeNumber ) { - EFI_STATUS Status = EFI_SUCCESS; + EFI_STATUS Status; EFI_GRAPHICS_OUTPUT_BLT_PIXEL FillColour; LCD_INSTANCE* Instance; LCD_BPP Bpp; -- 2.17.1