* [PATCH edk2-platforms v1 0/2] Fix Ecc reported errors from ArmPlatformPkg @ 2020-12-03 18:17 PierreGondois 2020-12-03 18:17 ` [PATCH edk2-platforms v1 1/2] Platform/ARM/VExpressPkg: Remove LcdPlatformLib.h PierreGondois 2020-12-03 18:17 ` [PATCH edk2-platforms v1 2/2] Platform/ARM: Fix Ecc error 8005 PierreGondois 0 siblings, 2 replies; 4+ messages in thread From: PierreGondois @ 2020-12-03 18:17 UTC (permalink / raw) To: leif, ard.biesheuvel, thomas.abraham, devel; +Cc: sami.mujawar From: Pierre Gondois <Pierre.Gondois@arm.com> The Ecc tools available in the BaseTools package checks for good practice coding standards. Some errors reported while running Ecc on edk2/ArmPlatformPkg require modifications in the edk2-platforms. This patch set has a dependency over a similar patch set named "Fix Ecc reported errors in ArmPlatformPkg" for edk2 and should not be merged independently. The changes can be seen at: https://github.com/PierreARM/edk2-platforms/tree/1537_Ecc_ArmPlatformPkg_v1 Pierre Gondois (2): Platform/ARM/VExpressPkg: Remove LcdPlatformLib.h Platform/ARM: Fix Ecc error 8005 .../Library/HdLcdArmJunoLib/HdLcdArmJuno.c | 6 +- .../Library/HdLcdArmSgiLib/HdLcdArmSgi.c | 6 +- .../Include/Library/LcdPlatformLib.h | 215 ------------------ .../Library/ArmMaliDpLib/ArmMaliDpLib.c | 8 +- .../HdLcdArmVExpressLib/HdLcdArmVExpress.c | 6 +- .../PL111LcdArmVExpress.c | 38 ++-- 6 files changed, 32 insertions(+), 247 deletions(-) delete mode 100644 Platform/ARM/VExpressPkg/Include/Library/LcdPlatformLib.h -- 2.17.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH edk2-platforms v1 1/2] Platform/ARM/VExpressPkg: Remove LcdPlatformLib.h 2020-12-03 18:17 [PATCH edk2-platforms v1 0/2] Fix Ecc reported errors from ArmPlatformPkg PierreGondois @ 2020-12-03 18:17 ` PierreGondois 2020-12-09 15:03 ` Ard Biesheuvel 2020-12-03 18:17 ` [PATCH edk2-platforms v1 2/2] Platform/ARM: Fix Ecc error 8005 PierreGondois 1 sibling, 1 reply; 4+ messages in thread From: PierreGondois @ 2020-12-03 18:17 UTC (permalink / raw) To: leif, ard.biesheuvel, thomas.abraham, devel; +Cc: sami.mujawar From: Pierre Gondois <Pierre.Gondois@arm.com> LcdPlatformLib.h was introduced by 8ad58788b5c3 as a duplicate of the edk2 original file at: edk2/ArmPlatformPkg/Include/Library/LcdPlatformLib.h The list of files in edk2-plarforms currently using LcdPlatformLib.h is the following: Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgi.c:11 Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.c Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJuno.c They are all using the SCAN_TIMINGS structure. However, this structure is only defined in the original file in the edk2 repository. Thus, the edk2-platforms is un-used and can be safely removed. The build system prefers the edk2 version of the file over its edk2-platforms copy due to the .dec files order in each .inf file where the the library is used. Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com> --- The changes can be seen at: https://github.com/PierreARM/edk2-platforms/tree/1537_Ecc_ArmPlatformPkg_v1 Platform/ARM/VExpressPkg/Include/Library/LcdPlatformLib.h | 215 -------------------- 1 file changed, 215 deletions(-) diff --git a/Platform/ARM/VExpressPkg/Include/Library/LcdPlatformLib.h b/Platform/ARM/VExpressPkg/Include/Library/LcdPlatformLib.h deleted file mode 100644 index 5591147313ac6720b260a08e7a0215a7f8fc82e9..0000000000000000000000000000000000000000 --- a/Platform/ARM/VExpressPkg/Include/Library/LcdPlatformLib.h +++ /dev/null @@ -1,215 +0,0 @@ -/** @file - - Copyright (c) 2011, ARM Ltd. All rights reserved.<BR> - SPDX-License-Identifier: BSD-2-Clause-Patent - - **/ - -#ifndef __LCDPLATFORMLIB_H -#define __LCDPLATFORMLIB_H - -#include <Protocol/GraphicsOutput.h> - -#define LCD_VRAM_SIZE SIZE_8MB - -// -// Modes definitions -// -#define VGA 0 -#define SVGA 1 -#define XGA 2 -#define SXGA 3 -#define WSXGA 4 -#define UXGA 5 -#define HD 6 - -// -// VGA Mode: 640 x 480 -// -#define VGA_H_RES_PIXELS 640 -#define VGA_V_RES_PIXELS 480 -#define VGA_OSC_FREQUENCY 23750000 /* 0x016A6570 */ - -#define VGA_H_SYNC ( 80 - 1) -#define VGA_H_FRONT_PORCH ( 16 - 1) -#define VGA_H_BACK_PORCH ( 64 - 1) - -#define VGA_V_SYNC ( 4 - 1) -#define VGA_V_FRONT_PORCH ( 3 - 1) -#define VGA_V_BACK_PORCH ( 13 - 1) - -// -// SVGA Mode: 800 x 600 -// -#define SVGA_H_RES_PIXELS 800 -#define SVGA_V_RES_PIXELS 600 -#define SVGA_OSC_FREQUENCY 38250000 /* 0x0247A610 */ - -#define SVGA_H_SYNC ( 80 - 1) -#define SVGA_H_FRONT_PORCH ( 32 - 1) -#define SVGA_H_BACK_PORCH (112 - 1) - -#define SVGA_V_SYNC ( 4 - 1) -#define SVGA_V_FRONT_PORCH ( 3 - 1) -#define SVGA_V_BACK_PORCH ( 17 - 1) - -// -// XGA Mode: 1024 x 768 -// -#define XGA_H_RES_PIXELS 1024 -#define XGA_V_RES_PIXELS 768 -#define XGA_OSC_FREQUENCY 63500000 /* 0x03C8EEE0 */ - -#define XGA_H_SYNC (104 - 1) -#define XGA_H_FRONT_PORCH ( 48 - 1) -#define XGA_H_BACK_PORCH (152 - 1) - -#define XGA_V_SYNC ( 4 - 1) -#define XGA_V_FRONT_PORCH ( 3 - 1) -#define XGA_V_BACK_PORCH ( 23 - 1) - -// -// SXGA Mode: 1280 x 1024 -// -#define SXGA_H_RES_PIXELS 1280 -#define SXGA_V_RES_PIXELS 1024 -#define SXGA_OSC_FREQUENCY 109000000 /* 0x067F3540 */ - -#define SXGA_H_SYNC (136 - 1) -#define SXGA_H_FRONT_PORCH ( 80 - 1) -#define SXGA_H_BACK_PORCH (216 - 1) - -#define SXGA_V_SYNC ( 7 - 1) -#define SXGA_V_FRONT_PORCH ( 3 - 1) -#define SXGA_V_BACK_PORCH ( 29 - 1) - -// -// WSXGA+ Mode: 1680 x 1050 -// -#define WSXGA_H_RES_PIXELS 1680 -#define WSXGA_V_RES_PIXELS 1050 -#define WSXGA_OSC_FREQUENCY 147000000 /* 0x08C30AC0 */ - -#define WSXGA_H_SYNC (170 - 1) -#define WSXGA_H_FRONT_PORCH (104 - 1) -#define WSXGA_H_BACK_PORCH (274 - 1) - -#define WSXGA_V_SYNC ( 5 - 1) -#define WSXGA_V_FRONT_PORCH ( 4 - 1) -#define WSXGA_V_BACK_PORCH ( 41 - 1) - -// -// UXGA Mode: 1600 x 1200 -// -#define UXGA_H_RES_PIXELS 1600 -#define UXGA_V_RES_PIXELS 1200 -#define UXGA_OSC_FREQUENCY 161000000 /* 0x0998AA40 */ - -#define UXGA_H_SYNC (168 - 1) -#define UXGA_H_FRONT_PORCH (112 - 1) -#define UXGA_H_BACK_PORCH (280 - 1) - -#define UXGA_V_SYNC ( 4 - 1) -#define UXGA_V_FRONT_PORCH ( 3 - 1) -#define UXGA_V_BACK_PORCH ( 38 - 1) - -// -// HD Mode: 1920 x 1080 -// -#define HD_H_RES_PIXELS 1920 -#define HD_V_RES_PIXELS 1080 -#define HD_OSC_FREQUENCY 165000000 /* 0x09D5B340 */ - -#define HD_H_SYNC ( 79 - 1) -#define HD_H_FRONT_PORCH (128 - 1) -#define HD_H_BACK_PORCH (328 - 1) - -#define HD_V_SYNC ( 5 - 1) -#define HD_V_FRONT_PORCH ( 3 - 1) -#define HD_V_BACK_PORCH ( 32 - 1) - -// -// Colour Masks -// - -#define LCD_24BPP_RED_MASK 0x00FF0000 -#define LCD_24BPP_GREEN_MASK 0x0000FF00 -#define LCD_24BPP_BLUE_MASK 0x000000FF -#define LCD_24BPP_RESERVED_MASK 0xFF000000 - -#define LCD_16BPP_555_RED_MASK 0x00007C00 -#define LCD_16BPP_555_GREEN_MASK 0x000003E0 -#define LCD_16BPP_555_BLUE_MASK 0x0000001F -#define LCD_16BPP_555_RESERVED_MASK 0x00000000 - -#define LCD_16BPP_565_RED_MASK 0x0000F800 -#define LCD_16BPP_565_GREEN_MASK 0x000007E0 -#define LCD_16BPP_565_BLUE_MASK 0x0000001F -#define LCD_16BPP_565_RESERVED_MASK 0x00008000 - -#define LCD_12BPP_444_RED_MASK 0x00000F00 -#define LCD_12BPP_444_GREEN_MASK 0x000000F0 -#define LCD_12BPP_444_BLUE_MASK 0x0000000F -#define LCD_12BPP_444_RESERVED_MASK 0x0000F000 - - -// The enumeration indexes maps the PL111 LcdBpp values used in the LCD Control Register -typedef enum { - LCD_BITS_PER_PIXEL_1 = 0, - LCD_BITS_PER_PIXEL_2, - LCD_BITS_PER_PIXEL_4, - LCD_BITS_PER_PIXEL_8, - LCD_BITS_PER_PIXEL_16_555, - LCD_BITS_PER_PIXEL_24, - LCD_BITS_PER_PIXEL_16_565, - LCD_BITS_PER_PIXEL_12_444 -} LCD_BPP; - - -EFI_STATUS -LcdPlatformInitializeDisplay ( - IN EFI_HANDLE Handle - ); - -EFI_STATUS -LcdPlatformGetVram ( - OUT EFI_PHYSICAL_ADDRESS* VramBaseAddress, - OUT UINTN* VramSize - ); - -UINT32 -LcdPlatformGetMaxMode ( - VOID - ); - -EFI_STATUS -LcdPlatformSetMode ( - IN UINT32 ModeNumber - ); - -EFI_STATUS -LcdPlatformQueryMode ( - IN UINT32 ModeNumber, - OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info - ); - -EFI_STATUS -LcdPlatformGetTimings ( - IN UINT32 ModeNumber, - OUT UINT32* HRes, - OUT UINT32* HSync, - OUT UINT32* HBackPorch, - OUT UINT32* HFrontPorch, - OUT UINT32* VRes, - OUT UINT32* VSync, - OUT UINT32* VBackPorch, - OUT UINT32* VFrontPorch - ); - -EFI_STATUS -LcdPlatformGetBpp ( - IN UINT32 ModeNumber, - OUT LCD_BPP* Bpp - ); - -#endif -- 2.17.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH edk2-platforms v1 1/2] Platform/ARM/VExpressPkg: Remove LcdPlatformLib.h 2020-12-03 18:17 ` [PATCH edk2-platforms v1 1/2] Platform/ARM/VExpressPkg: Remove LcdPlatformLib.h PierreGondois @ 2020-12-09 15:03 ` Ard Biesheuvel 0 siblings, 0 replies; 4+ messages in thread From: Ard Biesheuvel @ 2020-12-09 15:03 UTC (permalink / raw) To: Pierre.Gondois, leif, thomas.abraham, devel; +Cc: sami.mujawar On 12/3/20 7:17 PM, Pierre.Gondois@arm.com wrote: > From: Pierre Gondois <Pierre.Gondois@arm.com> > > LcdPlatformLib.h was introduced by 8ad58788b5c3 as a duplicate > of the edk2 original file at: > edk2/ArmPlatformPkg/Include/Library/LcdPlatformLib.h > > The list of files in edk2-plarforms currently using LcdPlatformLib.h > is the following: > Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgi.c:11 > Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c > Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c > Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.c > Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJuno.c > > They are all using the SCAN_TIMINGS structure. However, this structure > is only defined in the original file in the edk2 repository. Thus, > the edk2-platforms is un-used and can be safely removed. > > The build system prefers the edk2 version of the file over its > edk2-platforms copy due to the .dec files order in > each .inf file where the the library is used. > > Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com> Hello Pierre, Please remove the reference to this file from Platform/ARM/VExpressPkg/ArmVExpressPkg.dec as well. -- Ard. > --- > The changes can be seen at: https://github.com/PierreARM/edk2-platforms/tree/1537_Ecc_ArmPlatformPkg_v1 > > Platform/ARM/VExpressPkg/Include/Library/LcdPlatformLib.h | 215 -------------------- > 1 file changed, 215 deletions(-) > > diff --git a/Platform/ARM/VExpressPkg/Include/Library/LcdPlatformLib.h b/Platform/ARM/VExpressPkg/Include/Library/LcdPlatformLib.h > deleted file mode 100644 > index 5591147313ac6720b260a08e7a0215a7f8fc82e9..0000000000000000000000000000000000000000 > --- a/Platform/ARM/VExpressPkg/Include/Library/LcdPlatformLib.h > +++ /dev/null > @@ -1,215 +0,0 @@ > -/** @file > - > - Copyright (c) 2011, ARM Ltd. All rights reserved.<BR> > - SPDX-License-Identifier: BSD-2-Clause-Patent > - > - **/ > - > -#ifndef __LCDPLATFORMLIB_H > -#define __LCDPLATFORMLIB_H > - > -#include <Protocol/GraphicsOutput.h> > - > -#define LCD_VRAM_SIZE SIZE_8MB > - > -// > -// Modes definitions > -// > -#define VGA 0 > -#define SVGA 1 > -#define XGA 2 > -#define SXGA 3 > -#define WSXGA 4 > -#define UXGA 5 > -#define HD 6 > - > -// > -// VGA Mode: 640 x 480 > -// > -#define VGA_H_RES_PIXELS 640 > -#define VGA_V_RES_PIXELS 480 > -#define VGA_OSC_FREQUENCY 23750000 /* 0x016A6570 */ > - > -#define VGA_H_SYNC ( 80 - 1) > -#define VGA_H_FRONT_PORCH ( 16 - 1) > -#define VGA_H_BACK_PORCH ( 64 - 1) > - > -#define VGA_V_SYNC ( 4 - 1) > -#define VGA_V_FRONT_PORCH ( 3 - 1) > -#define VGA_V_BACK_PORCH ( 13 - 1) > - > -// > -// SVGA Mode: 800 x 600 > -// > -#define SVGA_H_RES_PIXELS 800 > -#define SVGA_V_RES_PIXELS 600 > -#define SVGA_OSC_FREQUENCY 38250000 /* 0x0247A610 */ > - > -#define SVGA_H_SYNC ( 80 - 1) > -#define SVGA_H_FRONT_PORCH ( 32 - 1) > -#define SVGA_H_BACK_PORCH (112 - 1) > - > -#define SVGA_V_SYNC ( 4 - 1) > -#define SVGA_V_FRONT_PORCH ( 3 - 1) > -#define SVGA_V_BACK_PORCH ( 17 - 1) > - > -// > -// XGA Mode: 1024 x 768 > -// > -#define XGA_H_RES_PIXELS 1024 > -#define XGA_V_RES_PIXELS 768 > -#define XGA_OSC_FREQUENCY 63500000 /* 0x03C8EEE0 */ > - > -#define XGA_H_SYNC (104 - 1) > -#define XGA_H_FRONT_PORCH ( 48 - 1) > -#define XGA_H_BACK_PORCH (152 - 1) > - > -#define XGA_V_SYNC ( 4 - 1) > -#define XGA_V_FRONT_PORCH ( 3 - 1) > -#define XGA_V_BACK_PORCH ( 23 - 1) > - > -// > -// SXGA Mode: 1280 x 1024 > -// > -#define SXGA_H_RES_PIXELS 1280 > -#define SXGA_V_RES_PIXELS 1024 > -#define SXGA_OSC_FREQUENCY 109000000 /* 0x067F3540 */ > - > -#define SXGA_H_SYNC (136 - 1) > -#define SXGA_H_FRONT_PORCH ( 80 - 1) > -#define SXGA_H_BACK_PORCH (216 - 1) > - > -#define SXGA_V_SYNC ( 7 - 1) > -#define SXGA_V_FRONT_PORCH ( 3 - 1) > -#define SXGA_V_BACK_PORCH ( 29 - 1) > - > -// > -// WSXGA+ Mode: 1680 x 1050 > -// > -#define WSXGA_H_RES_PIXELS 1680 > -#define WSXGA_V_RES_PIXELS 1050 > -#define WSXGA_OSC_FREQUENCY 147000000 /* 0x08C30AC0 */ > - > -#define WSXGA_H_SYNC (170 - 1) > -#define WSXGA_H_FRONT_PORCH (104 - 1) > -#define WSXGA_H_BACK_PORCH (274 - 1) > - > -#define WSXGA_V_SYNC ( 5 - 1) > -#define WSXGA_V_FRONT_PORCH ( 4 - 1) > -#define WSXGA_V_BACK_PORCH ( 41 - 1) > - > -// > -// UXGA Mode: 1600 x 1200 > -// > -#define UXGA_H_RES_PIXELS 1600 > -#define UXGA_V_RES_PIXELS 1200 > -#define UXGA_OSC_FREQUENCY 161000000 /* 0x0998AA40 */ > - > -#define UXGA_H_SYNC (168 - 1) > -#define UXGA_H_FRONT_PORCH (112 - 1) > -#define UXGA_H_BACK_PORCH (280 - 1) > - > -#define UXGA_V_SYNC ( 4 - 1) > -#define UXGA_V_FRONT_PORCH ( 3 - 1) > -#define UXGA_V_BACK_PORCH ( 38 - 1) > - > -// > -// HD Mode: 1920 x 1080 > -// > -#define HD_H_RES_PIXELS 1920 > -#define HD_V_RES_PIXELS 1080 > -#define HD_OSC_FREQUENCY 165000000 /* 0x09D5B340 */ > - > -#define HD_H_SYNC ( 79 - 1) > -#define HD_H_FRONT_PORCH (128 - 1) > -#define HD_H_BACK_PORCH (328 - 1) > - > -#define HD_V_SYNC ( 5 - 1) > -#define HD_V_FRONT_PORCH ( 3 - 1) > -#define HD_V_BACK_PORCH ( 32 - 1) > - > -// > -// Colour Masks > -// > - > -#define LCD_24BPP_RED_MASK 0x00FF0000 > -#define LCD_24BPP_GREEN_MASK 0x0000FF00 > -#define LCD_24BPP_BLUE_MASK 0x000000FF > -#define LCD_24BPP_RESERVED_MASK 0xFF000000 > - > -#define LCD_16BPP_555_RED_MASK 0x00007C00 > -#define LCD_16BPP_555_GREEN_MASK 0x000003E0 > -#define LCD_16BPP_555_BLUE_MASK 0x0000001F > -#define LCD_16BPP_555_RESERVED_MASK 0x00000000 > - > -#define LCD_16BPP_565_RED_MASK 0x0000F800 > -#define LCD_16BPP_565_GREEN_MASK 0x000007E0 > -#define LCD_16BPP_565_BLUE_MASK 0x0000001F > -#define LCD_16BPP_565_RESERVED_MASK 0x00008000 > - > -#define LCD_12BPP_444_RED_MASK 0x00000F00 > -#define LCD_12BPP_444_GREEN_MASK 0x000000F0 > -#define LCD_12BPP_444_BLUE_MASK 0x0000000F > -#define LCD_12BPP_444_RESERVED_MASK 0x0000F000 > - > - > -// The enumeration indexes maps the PL111 LcdBpp values used in the LCD Control Register > -typedef enum { > - LCD_BITS_PER_PIXEL_1 = 0, > - LCD_BITS_PER_PIXEL_2, > - LCD_BITS_PER_PIXEL_4, > - LCD_BITS_PER_PIXEL_8, > - LCD_BITS_PER_PIXEL_16_555, > - LCD_BITS_PER_PIXEL_24, > - LCD_BITS_PER_PIXEL_16_565, > - LCD_BITS_PER_PIXEL_12_444 > -} LCD_BPP; > - > - > -EFI_STATUS > -LcdPlatformInitializeDisplay ( > - IN EFI_HANDLE Handle > - ); > - > -EFI_STATUS > -LcdPlatformGetVram ( > - OUT EFI_PHYSICAL_ADDRESS* VramBaseAddress, > - OUT UINTN* VramSize > - ); > - > -UINT32 > -LcdPlatformGetMaxMode ( > - VOID > - ); > - > -EFI_STATUS > -LcdPlatformSetMode ( > - IN UINT32 ModeNumber > - ); > - > -EFI_STATUS > -LcdPlatformQueryMode ( > - IN UINT32 ModeNumber, > - OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info > - ); > - > -EFI_STATUS > -LcdPlatformGetTimings ( > - IN UINT32 ModeNumber, > - OUT UINT32* HRes, > - OUT UINT32* HSync, > - OUT UINT32* HBackPorch, > - OUT UINT32* HFrontPorch, > - OUT UINT32* VRes, > - OUT UINT32* VSync, > - OUT UINT32* VBackPorch, > - OUT UINT32* VFrontPorch > - ); > - > -EFI_STATUS > -LcdPlatformGetBpp ( > - IN UINT32 ModeNumber, > - OUT LCD_BPP* Bpp > - ); > - > -#endif > -- > 2.17.1 > ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH edk2-platforms v1 2/2] Platform/ARM: Fix Ecc error 8005 2020-12-03 18:17 [PATCH edk2-platforms v1 0/2] Fix Ecc reported errors from ArmPlatformPkg PierreGondois 2020-12-03 18:17 ` [PATCH edk2-platforms v1 1/2] Platform/ARM/VExpressPkg: Remove LcdPlatformLib.h PierreGondois @ 2020-12-03 18:17 ` PierreGondois 1 sibling, 0 replies; 4+ messages in thread From: PierreGondois @ 2020-12-03 18:17 UTC (permalink / raw) To: leif, ard.biesheuvel, thomas.abraham, devel; +Cc: sami.mujawar From: Pierre Gondois <Pierre.Gondois@arm.com> Following the Ecc reported error in the edk2 repository, an enum and its elements have been renamed in: ArmPlatformPkg/Include/Library/LcdPlatformLib.h The Ecc error reported in edk2 is: Variable name does not follow the rules: 1. First character should be upper case 2. Must contain lower case characters 3. No white space characters 4. Global variable name must start with a 'g' Indeed, according to the EDK II C Coding Standards Specification, s5.6.2.2 "Enumerated Types" and s4.3.4 Function and Data Names, elements of an enumerated type "shoud be a mixed upper- and lower-case text". Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com> --- The changes can be seen at: https://github.com/PierreARM/edk2-platforms/tree/1537_Ecc_ArmPlatformPkg_v1 Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJuno.c | 6 ++-- Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgi.c | 6 ++-- Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.c | 8 ++--- Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c | 6 ++-- Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c | 38 ++++++++++---------- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJuno.c b/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJuno.c index 4b961b7a9f7fa372861bd0e7ad5e9d7d0c3faaea..bc64b0af522953c3d18e44c80b47e23f794e900e 100644 --- a/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJuno.c +++ b/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJuno.c @@ -1,6 +1,6 @@ /** @file - Copyright (c) 2013-2018, ARM Ltd. All rights reserved. + Copyright (c) 2013 - 2020, Arm Limited. All rights reserved.<BR> SPDX-License-Identifier: BSD-2-Clause-Patent @@ -532,7 +532,7 @@ LcdPlatformGetTimings ( EFI_STATUS LcdPlatformGetBpp ( IN UINT32 ModeNumber, - OUT LCD_BPP * Bpp + OUT ELCD_BPP * Bpp ) { if (ModeNumber >= mMaxMode) { @@ -543,7 +543,7 @@ LcdPlatformGetBpp ( ASSERT (Bpp != NULL); - *Bpp = LCD_BITS_PER_PIXEL_24; + *Bpp = ELcdBitsPerPixel_24; return EFI_SUCCESS; } diff --git a/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgi.c b/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgi.c index 6f747d2545dbe4ec27bc7608815c81ef4d0d466f..33234e0f50343bc92e72ef502eedcab9d129df74 100644 --- a/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgi.c +++ b/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgi.c @@ -1,6 +1,6 @@ /** @file * -* Copyright (c) 2018, ARM Limited. All rights reserved. +* Copyright (c) 2018 - 2020, Arm Limited. All rights reserved.<BR> * * SPDX-License-Identifier: BSD-2-Clause-Patent * @@ -236,7 +236,7 @@ LcdPlatformGetTimings ( EFI_STATUS LcdPlatformGetBpp ( IN UINT32 ModeNumber, - OUT LCD_BPP *Bpp + OUT ELCD_BPP *Bpp ) { if (ModeNumber >= mMaxMode) { @@ -245,7 +245,7 @@ LcdPlatformGetBpp ( ASSERT (Bpp != NULL); - *Bpp = LCD_BITS_PER_PIXEL_24; + *Bpp = ELcdBitsPerPixel_24; return EFI_SUCCESS; } diff --git a/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.c b/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.c index aa55bc2e5beefd02af190b89f933f5ba5498a2ed..38b638a5a19288a40cd10f1ba710ca24a897f384 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.c +++ b/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.c @@ -2,7 +2,7 @@ The file contains Arm Mali DP platform specific implementation. - Copyright (c) 2017-2018, Arm Limited. All rights reserved. + Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.<BR> SPDX-License-Identifier: BSD-2-Clause-Patent @@ -364,8 +364,8 @@ LcdPlatformGetTimings ( **/ EFI_STATUS LcdPlatformGetBpp ( - IN UINT32 ModeNumber, - OUT LCD_BPP * Bpp + IN UINT32 ModeNumber, + OUT ELCD_BPP * Bpp ) { ASSERT (Bpp != NULL); @@ -375,7 +375,7 @@ LcdPlatformGetBpp ( return EFI_INVALID_PARAMETER; } - *Bpp = LCD_BITS_PER_PIXEL_24; + *Bpp = ELcdBitsPerPixel_24; return EFI_SUCCESS; } diff --git a/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c b/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c index c4b163d35f181a83569907460084b32772fd0271..f0f1e0cfd77ff87576b6f061eb3915e39c162717 100644 --- a/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c +++ b/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c @@ -1,6 +1,6 @@ /** @file - Copyright (c) 2012-2018, ARM Ltd. All rights reserved. + Copyright (c) 2012 - 2020, Arm Limited. All rights reserved.<BR> SPDX-License-Identifier: BSD-2-Clause-Patent @@ -353,7 +353,7 @@ LcdPlatformGetTimings ( EFI_STATUS LcdPlatformGetBpp ( IN UINT32 ModeNumber, - OUT LCD_BPP * Bpp + OUT ELCD_BPP * Bpp ) { if (ModeNumber >= LcdPlatformGetMaxMode ()) { @@ -361,7 +361,7 @@ LcdPlatformGetBpp ( return EFI_INVALID_PARAMETER; } - *Bpp = LCD_BITS_PER_PIXEL_24; + *Bpp = ELcdBitsPerPixel_24; return EFI_SUCCESS; } diff --git a/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c b/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c index b7396a87bd056b1d23729dcab556a38dbf4d3d1d..4bf9ba400987d8cfa9bcc8d25dfa070032f67c91 100644 --- a/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c +++ b/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c @@ -1,6 +1,6 @@ /** @file - Copyright (c) 2011-2018, ARM Ltd. All rights reserved.<BR> + Copyright (c) 2011 - 2020, Arm Limited. All rights reserved.<BR> SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -22,7 +22,7 @@ typedef struct { UINT32 Mode; - LCD_BPP Bpp; + ELCD_BPP Bpp; UINT32 OscFreq; SCAN_TIMINGS Horizontal; @@ -33,97 +33,97 @@ typedef struct { **/ STATIC DISPLAY_MODE mDisplayModes[] = { { // Mode 0 : VGA : 640 x 480 x 24 bpp - VGA, LCD_BITS_PER_PIXEL_24, + VGA, ELcdBitsPerPixel_24, VGA_OSC_FREQUENCY, {VGA_H_RES_PIXELS, VGA_H_SYNC, VGA_H_BACK_PORCH, VGA_H_FRONT_PORCH}, {VGA_V_RES_PIXELS, VGA_V_SYNC, VGA_V_BACK_PORCH, VGA_V_FRONT_PORCH} }, { // Mode 1 : SVGA : 800 x 600 x 24 bpp - SVGA, LCD_BITS_PER_PIXEL_24, + SVGA, ELcdBitsPerPixel_24, SVGA_OSC_FREQUENCY, {SVGA_H_RES_PIXELS, SVGA_H_SYNC, SVGA_H_BACK_PORCH, SVGA_H_FRONT_PORCH}, {SVGA_V_RES_PIXELS, SVGA_V_SYNC, SVGA_V_BACK_PORCH, SVGA_V_FRONT_PORCH} }, { // Mode 2 : XGA : 1024 x 768 x 24 bpp - XGA, LCD_BITS_PER_PIXEL_24, + XGA, ELcdBitsPerPixel_24, XGA_OSC_FREQUENCY, {XGA_H_RES_PIXELS, XGA_H_SYNC, XGA_H_BACK_PORCH, XGA_H_FRONT_PORCH}, {XGA_V_RES_PIXELS, XGA_V_SYNC, XGA_V_BACK_PORCH, XGA_V_FRONT_PORCH} }, { // Mode 3 : SXGA : 1280 x 1024 x 24 bpp - SXGA, LCD_BITS_PER_PIXEL_24, + SXGA, ELcdBitsPerPixel_24, (SXGA_OSC_FREQUENCY/2), {SXGA_H_RES_PIXELS, SXGA_H_SYNC, SXGA_H_BACK_PORCH, SXGA_H_FRONT_PORCH}, {SXGA_V_RES_PIXELS, SXGA_V_SYNC, SXGA_V_BACK_PORCH, SXGA_V_FRONT_PORCH} }, { // Mode 4 : UXGA : 1600 x 1200 x 24 bpp - UXGA, LCD_BITS_PER_PIXEL_24, + UXGA, ELcdBitsPerPixel_24, (UXGA_OSC_FREQUENCY/2), {UXGA_H_RES_PIXELS, UXGA_H_SYNC, UXGA_H_BACK_PORCH, UXGA_H_FRONT_PORCH}, {UXGA_V_RES_PIXELS, UXGA_V_SYNC, UXGA_V_BACK_PORCH, UXGA_V_FRONT_PORCH} }, { // Mode 5 : HD : 1920 x 1080 x 24 bpp - HD, LCD_BITS_PER_PIXEL_24, + HD, ELcdBitsPerPixel_24, (HD_OSC_FREQUENCY/2), {HD_H_RES_PIXELS, HD_H_SYNC, HD_H_BACK_PORCH, HD_H_FRONT_PORCH}, {HD_V_RES_PIXELS, HD_V_SYNC, HD_V_BACK_PORCH, HD_V_FRONT_PORCH} }, { // Mode 6 : VGA : 640 x 480 x 16 bpp (565 Mode) - VGA, LCD_BITS_PER_PIXEL_16_565, + VGA, ELcdBitsPerPixel_16_565, VGA_OSC_FREQUENCY, {VGA_H_RES_PIXELS, VGA_H_SYNC, VGA_H_BACK_PORCH, VGA_H_FRONT_PORCH}, {VGA_V_RES_PIXELS, VGA_V_SYNC, VGA_V_BACK_PORCH, VGA_V_FRONT_PORCH} }, { // Mode 7 : SVGA : 800 x 600 x 16 bpp (565 Mode) - SVGA, LCD_BITS_PER_PIXEL_16_565, + SVGA, ELcdBitsPerPixel_16_565, SVGA_OSC_FREQUENCY, {SVGA_H_RES_PIXELS, SVGA_H_SYNC, SVGA_H_BACK_PORCH, SVGA_H_FRONT_PORCH}, {SVGA_V_RES_PIXELS, SVGA_V_SYNC, SVGA_V_BACK_PORCH, SVGA_V_FRONT_PORCH} }, { // Mode 8 : XGA : 1024 x 768 x 16 bpp (565 Mode) - XGA, LCD_BITS_PER_PIXEL_16_565, + XGA, ELcdBitsPerPixel_16_565, XGA_OSC_FREQUENCY, {XGA_H_RES_PIXELS, XGA_H_SYNC, XGA_H_BACK_PORCH, XGA_H_FRONT_PORCH}, {XGA_V_RES_PIXELS, XGA_V_SYNC, XGA_V_BACK_PORCH, XGA_V_FRONT_PORCH} }, { // Mode 9 : VGA : 640 x 480 x 15 bpp - VGA, LCD_BITS_PER_PIXEL_16_555, + VGA, ELcdBitsPerPixel_16_555, VGA_OSC_FREQUENCY, {VGA_H_RES_PIXELS, VGA_H_SYNC, VGA_H_BACK_PORCH, VGA_H_FRONT_PORCH}, {VGA_V_RES_PIXELS, VGA_V_SYNC, VGA_V_BACK_PORCH, VGA_V_FRONT_PORCH} }, { // Mode 10 : SVGA : 800 x 600 x 15 bpp - SVGA, LCD_BITS_PER_PIXEL_16_555, + SVGA, ELcdBitsPerPixel_16_555, SVGA_OSC_FREQUENCY, {SVGA_H_RES_PIXELS, SVGA_H_SYNC, SVGA_H_BACK_PORCH, SVGA_H_FRONT_PORCH}, {SVGA_V_RES_PIXELS, SVGA_V_SYNC, SVGA_V_BACK_PORCH, SVGA_V_FRONT_PORCH} }, { // Mode 11 : XGA : 1024 x 768 x 15 bpp - XGA, LCD_BITS_PER_PIXEL_16_555, + XGA, ELcdBitsPerPixel_16_555, XGA_OSC_FREQUENCY, {XGA_H_RES_PIXELS, XGA_H_SYNC, XGA_H_BACK_PORCH, XGA_H_FRONT_PORCH}, {XGA_V_RES_PIXELS, XGA_V_SYNC, XGA_V_BACK_PORCH, XGA_V_FRONT_PORCH} }, { // Mode 12 : XGA : 1024 x 768 x 15 bpp - All the timing info is derived from Linux Kernel Driver Settings - XGA, LCD_BITS_PER_PIXEL_16_555, + XGA, ELcdBitsPerPixel_16_555, 63500000, {XGA_H_RES_PIXELS, XGA_H_SYNC, XGA_H_BACK_PORCH, XGA_H_FRONT_PORCH}, {XGA_V_RES_PIXELS, XGA_V_SYNC, XGA_V_BACK_PORCH, XGA_V_FRONT_PORCH} }, { // Mode 13 : VGA : 640 x 480 x 12 bpp (444 Mode) - VGA, LCD_BITS_PER_PIXEL_12_444, + VGA, ELcdBitsPerPixel_12_444, VGA_OSC_FREQUENCY, {VGA_H_RES_PIXELS, VGA_H_SYNC, VGA_H_BACK_PORCH, VGA_H_FRONT_PORCH}, {VGA_V_RES_PIXELS, VGA_V_SYNC, VGA_V_BACK_PORCH, VGA_V_FRONT_PORCH} }, { // Mode 14 : SVGA : 800 x 600 x 12 bpp (444 Mode) - SVGA, LCD_BITS_PER_PIXEL_12_444, + SVGA, ELcdBitsPerPixel_12_444, SVGA_OSC_FREQUENCY, {SVGA_H_RES_PIXELS, SVGA_H_SYNC, SVGA_H_BACK_PORCH, SVGA_H_FRONT_PORCH}, {SVGA_V_RES_PIXELS, SVGA_V_SYNC, SVGA_V_BACK_PORCH, SVGA_V_FRONT_PORCH} }, { // Mode 15 : XGA : 1024 x 768 x 12 bpp (444 Mode) - XGA, LCD_BITS_PER_PIXEL_12_444, + XGA, ELcdBitsPerPixel_12_444, XGA_OSC_FREQUENCY, {XGA_H_RES_PIXELS, XGA_H_SYNC, XGA_H_BACK_PORCH, XGA_H_FRONT_PORCH}, {XGA_V_RES_PIXELS, XGA_V_SYNC, XGA_V_BACK_PORCH, XGA_V_FRONT_PORCH} @@ -445,7 +445,7 @@ LcdPlatformGetTimings ( EFI_STATUS LcdPlatformGetBpp ( IN UINT32 ModeNumber, - OUT LCD_BPP * Bpp + OUT ELCD_BPP * Bpp ) { ASSERT (Bpp != NULL); -- 2.17.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-12-09 15:04 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-12-03 18:17 [PATCH edk2-platforms v1 0/2] Fix Ecc reported errors from ArmPlatformPkg PierreGondois 2020-12-03 18:17 ` [PATCH edk2-platforms v1 1/2] Platform/ARM/VExpressPkg: Remove LcdPlatformLib.h PierreGondois 2020-12-09 15:03 ` Ard Biesheuvel 2020-12-03 18:17 ` [PATCH edk2-platforms v1 2/2] Platform/ARM: Fix Ecc error 8005 PierreGondois
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox