Hi, Sami
Thank you for your reviewing, I have created a PR an here is the link.
https://github.com/tianocore/edk2/pull/2619
Regards
Wenyi
On 2022/3/14 18:13, Sami Mujawar wrote:
> Hi Wenyi,
>
> Thank you for this patch. These changes look good to me.
>
> Reviewed-by: Sami Mujawar <sami.muja...@arm.com>
>
> Regards,
>
> Sami Mujawar
>
> On 14/03/2022, 09:26, "devel@edk2.groups.io on behalf of wenyi,xie via
> groups.io" <devel@edk2.groups.io on behalf of xiewenyi2=huawei....@groups.io>
> wrote:
>
> Fix header files on #ifdef.
>
> Cc: Leif Lindholm <quic_llind...@quicinc.com>
> Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org>
>
> Signed-off-by: Wenyi Xie <xiewen...@huawei.com>
> ---
> ArmPlatformPkg/Drivers/NorFlashDxe/NorFlash.h | 6
> +++---
> ArmPlatformPkg/Drivers/PL061GpioDxe/PL061Gpio.h | 6
> +++---
> ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805Watchdog.h | 6
> +++---
> ArmPlatformPkg/Include/Library/ArmPlatformLib.h | 4
> ++--
> ArmPlatformPkg/Include/Library/NorFlashPlatformLib.h | 6
> +++---
> ArmPlatformPkg/Include/Library/PL011UartClockLib.h | 4
> ++--
> ArmPlatformPkg/Include/Library/PL011UartLib.h | 4
> ++--
> ArmPlatformPkg/Library/PL011UartLib/PL011Uart.h | 4
> ++--
> ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClock.h | 4
> ++--
> ArmPlatformPkg/Library/PL111Lcd/PL111Lcd.h | 6
> +++---
> ArmPlatformPkg/PrePeiCore/PrePeiCore.h | 4
> ++--
> ArmPlatformPkg/PrePi/PrePi.h | 6
> +++---
> 12 files changed, 30 insertions(+), 30 deletions(-)
>
> diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlash.h
> b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlash.h
> index c83032e87d9c..c8b567d0c413 100644
> --- a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlash.h
> +++ b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlash.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef __NOR_FLASH_H__
> -#define __NOR_FLASH_H__
> +#ifndef NOR_FLASH_H_
> +#define NOR_FLASH_H_
>
> #include <Base.h>
> #include <PiDxe.h>
> @@ -419,4 +419,4 @@ NorFlashVirtualNotifyEvent (
> IN VOID *Context
> );
>
> -#endif /* __NOR_FLASH_H__ */
> +#endif // NOR_FLASH_H_
> diff --git a/ArmPlatformPkg/Drivers/PL061GpioDxe/PL061Gpio.h
> b/ArmPlatformPkg/Drivers/PL061GpioDxe/PL061Gpio.h
> index 42d87a16a3dd..3117f0abe2b3 100644
> --- a/ArmPlatformPkg/Drivers/PL061GpioDxe/PL061Gpio.h
> +++ b/ArmPlatformPkg/Drivers/PL061GpioDxe/PL061Gpio.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef __PL061_GPIO_H__
> -#define __PL061_GPIO_H__
> +#ifndef PL061_GPIO_H_
> +#define PL061_GPIO_H_
>
> #include <Protocol/EmbeddedGpio.h>
>
> @@ -39,4 +39,4 @@
> // All bits low except one bit high, native bit length
> #define GPIO_PIN_MASK(Pin) (1UL << ((UINTN)(Pin)))
>
> -#endif // __PL061_GPIO_H__
> +#endif // PL061_GPIO_H_
> diff --git a/ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805Watchdog.h
> b/ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805Watchdog.h
> index 597d6911fa10..f6a332fda247 100644
> --- a/ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805Watchdog.h
> +++ b/ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805Watchdog.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef __SP805_WATCHDOG_H__
> -#define __SP805_WATCHDOG_H__
> +#ifndef SP805_WATCHDOG_H_
> +#define SP805_WATCHDOG_H_
>
> // SP805 Watchdog Registers
> #define SP805_WDOG_LOAD_REG ((UINT32)PcdGet32
> (PcdSP805WatchdogBase) + 0x000)
> @@ -38,4 +38,4 @@
> #define SP805_WDOG_LOCK_IS_LOCKED 0x00000001
> #define SP805_WDOG_SPECIAL_UNLOCK_CODE 0x1ACCE551
>
> -#endif // __SP805_WATCHDOG_H__
> +#endif // SP805_WATCHDOG_H_
> diff --git a/ArmPlatformPkg/Include/Library/ArmPlatformLib.h
> b/ArmPlatformPkg/Include/Library/ArmPlatformLib.h
> index cd87743eba52..cf056808fedf 100644
> --- a/ArmPlatformPkg/Include/Library/ArmPlatformLib.h
> +++ b/ArmPlatformPkg/Include/Library/ArmPlatformLib.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef _ARMPLATFORMLIB_H_
> -#define _ARMPLATFORMLIB_H_
> +#ifndef ARMPLATFORMLIB_H_
> +#define ARMPLATFORMLIB_H_
>
> //
> // The package level header files this module uses
> diff --git a/ArmPlatformPkg/Include/Library/NorFlashPlatformLib.h
> b/ArmPlatformPkg/Include/Library/NorFlashPlatformLib.h
> index 6ef5b70e9948..37c0a69a6d07 100644
> --- a/ArmPlatformPkg/Include/Library/NorFlashPlatformLib.h
> +++ b/ArmPlatformPkg/Include/Library/NorFlashPlatformLib.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef _NORFLASHPLATFORMLIB_H_
> -#define _NORFLASHPLATFORMLIB_H_
> +#ifndef NORFLASHPLATFORMLIB_H_
> +#define NORFLASHPLATFORMLIB_H_
>
> typedef struct {
> UINTN DeviceBaseAddress; // Start address of the Device Base
> Address (DBA)
> @@ -27,4 +27,4 @@ NorFlashPlatformGetDevices (
> OUT UINT32 *Count
> );
>
> -#endif /* _NORFLASHPLATFORMLIB_H_ */
> +#endif // NORFLASHPLATFORMLIB_H_
> diff --git a/ArmPlatformPkg/Include/Library/PL011UartClockLib.h
> b/ArmPlatformPkg/Include/Library/PL011UartClockLib.h
> index 5814d960a663..0e279dda62ce 100644
> --- a/ArmPlatformPkg/Include/Library/PL011UartClockLib.h
> +++ b/ArmPlatformPkg/Include/Library/PL011UartClockLib.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef __PL011UARTCLOCKLIB_H__
> -#define __PL011UARTCLOCKLIB_H__
> +#ifndef PL011UARTCLOCKLIB_H_
> +#define PL011UARTCLOCKLIB_H_
>
> /**
>
> diff --git a/ArmPlatformPkg/Include/Library/PL011UartLib.h
> b/ArmPlatformPkg/Include/Library/PL011UartLib.h
> index 964142ef64a3..18638ce9ef7d 100644
> --- a/ArmPlatformPkg/Include/Library/PL011UartLib.h
> +++ b/ArmPlatformPkg/Include/Library/PL011UartLib.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef __PL011_UART_LIB_H__
> -#define __PL011_UART_LIB_H__
> +#ifndef PL011_UART_LIB_H_
> +#define PL011_UART_LIB_H_
>
> #include <Uefi/UefiBaseType.h>
>
> diff --git a/ArmPlatformPkg/Library/PL011UartLib/PL011Uart.h
> b/ArmPlatformPkg/Library/PL011UartLib/PL011Uart.h
> index 8433a81aeac4..f5a5fa193df2 100644
> --- a/ArmPlatformPkg/Library/PL011UartLib/PL011Uart.h
> +++ b/ArmPlatformPkg/Library/PL011UartLib/PL011Uart.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef __PL011_UART_H__
> -#define __PL011_UART_H__
> +#ifndef PL011_UART_H_
> +#define PL011_UART_H_
>
> #define PL011_VARIANT_ZTE 1
>
> diff --git
> a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClock.h
> b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClock.h
> index 00b3fc99ac14..ebcb8a1e9906 100644
> --- a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClock.h
> +++ b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClock.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef __PL031_REAL_TIME_CLOCK_H__
> -#define __PL031_REAL_TIME_CLOCK_H__
> +#ifndef PL031_REAL_TIME_CLOCK_H_
> +#define PL031_REAL_TIME_CLOCK_H_
>
> // PL031 Registers
> #define PL031_RTC_DR_DATA_REGISTER 0x000
> diff --git a/ArmPlatformPkg/Library/PL111Lcd/PL111Lcd.h
> b/ArmPlatformPkg/Library/PL111Lcd/PL111Lcd.h
> index 0d4fe387c54c..d4f9dd82de83 100644
> --- a/ArmPlatformPkg/Library/PL111Lcd/PL111Lcd.h
> +++ b/ArmPlatformPkg/Library/PL111Lcd/PL111Lcd.h
> @@ -5,8 +5,8 @@
>
> **/
>
> -#ifndef _PL111LCD_H__
> -#define _PL111LCD_H__
> +#ifndef PL111LCD_H_
> +#define PL111LCD_H_
>
> /**********************************************************************
> *
> @@ -140,4 +140,4 @@
> #define PL111_BIT_MASK_LEE 0x00010000
> #define PL111_BIT_MASK_LED 0x0000007F
>
> -#endif /* _PL111LCD_H__ */
> +#endif // PL111LCD_H_
> diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h
> b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h
> index 0345dd7bdd2a..acc145696d28 100644
> --- a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h
> +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h
> @@ -7,8 +7,8 @@
>
> **/
>
> -#ifndef __PREPEICORE_H_
> -#define __PREPEICORE_H_
> +#ifndef PREPEICORE_H_
> +#define PREPEICORE_H_
>
> #include <Library/ArmLib.h>
> #include <Library/ArmPlatformLib.h>
> diff --git a/ArmPlatformPkg/PrePi/PrePi.h b/ArmPlatformPkg/PrePi/PrePi.h
> index 6074a22108d2..b27148cf5d03 100644
> --- a/ArmPlatformPkg/PrePi/PrePi.h
> +++ b/ArmPlatformPkg/PrePi/PrePi.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef _PREPI_H_
> -#define _PREPI_H_
> +#ifndef PREPI_H_
> +#define PREPI_H_
>
> #include <PiPei.h>
>
> @@ -85,4 +85,4 @@ ProcessLibraryConstructorList (
> VOID
> );
>
> -#endif /* _PREPI_H_ */
> +#endif // PREPI_H_
> --
> 2.20.1.windows.1
>
>
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#87655): https://edk2.groups.io/g/devel/message/87655
Mute This Topic: https://groups.io/mt/89769611/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
