Re: [edk2-test][Patch 1/1] SctPkg/UEFI: Remove redefined macro

["Philippe Mathieu-Daudé" <philmd@redhat.com>]

On 4/2/19 5:16 PM, Eric Jin wrote:
> Remove the macros which are already defined in
> MdePkg/Include/Uefi/UefiInternalFormRepersentation.h
> 
> Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Eric Jin <eric.jin@intel.com>
> ---
>  uefi-sct/SctPkg/UEFI/Protocol/HiiDef.h | 44 +-------------------------------------------
>  1 file changed, 1 insertion(+), 43 deletions(-)
> 
> diff --git a/uefi-sct/SctPkg/UEFI/Protocol/HiiDef.h b/uefi-sct/SctPkg/UEFI/Protocol/HiiDef.h
> index 33340ae60d41..b20d2a1b4162 100644
> --- a/uefi-sct/SctPkg/UEFI/Protocol/HiiDef.h
> +++ b/uefi-sct/SctPkg/UEFI/Protocol/HiiDef.h
> @@ -1,7 +1,7 @@
>  /** @file
>  
>    Copyright 2006 - 2017 Unified EFI, Inc.<BR>
> -  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>
>    (C) Copyright 2017 Hewlett Packard Enterprise Development LP<BR>
>    Copyright (c) 2019, ARM Ltd. All rights reserved.<BR>
>  
> @@ -156,13 +156,6 @@ typedef struct _EFI_HII_DEVICE_PATH_PACKAGE {
>    EFI_DEVICE_PATH_PROTOCOL *DevicePath;
>  } EFI_HII_DEVICE_PATH_PACKAGE;
>  
> -//
> -// String Package
> -//
> -
> -#define UEFI_CONFIG_LANG       L"x-UEFI"
> -#define UEFI_CONFIG_LANG2      L"x-i-UEFI"     // BUGBUG, spec need to be updated.

This one is weirdly defined as UEFI_CONFIG_LANG_2 in
BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h.

> -
>  #define EFI_HII_SIBT_END                     0x00
>  #define EFI_HII_SIBT_STRING_SCSU             0x10
>  #define EFI_HII_SIBT_STRING_SCSU_FONT        0x11
> @@ -330,39 +323,4 @@ EFI_STATUS
>    IN EFI_HII_DATABASE_NOTIFY_TYPE    NotifyType
>  );
>  
> -#define EFI_NULL_MODIFIER                  0x0000
> -#define EFI_LEFT_CONTROL_MODIFIER          0x0001
> -#define EFI_RIGHT_CONTROL_MODIFIER         0x0002
> -#define EFI_LEFT_ALT_MODIFIER              0x0003
> -#define EFI_RIGHT_ALT_MODIFIER             0x0004
> -#define EFI_ALT_GR_MODIFIER                0x0005
> -#define EFI_INSERT_MODIFIER                0x0006
> -#define EFI_DELETE_MODIFIER                0x0007
> -#define EFI_PAGE_DOWN_MODIFIER             0x0008
> -#define EFI_PAGE_UP_MODIFIER               0x0009
> -#define EFI_HOME_MODIFIER                  0x000A
> -#define EFI_END_MODIFIER                   0x000B
> -#define EFI_LEFT_SHIFT_MODIFIER            0x000C
> -#define EFI_RIGHT_SHIFT_MODIFIER           0x000D
> -#define EFI_CAPS_LOCK_MODIFIER             0x000E
> -#define EFI_NUM_LOCK _MODIFIER             0x000F

Eh this one is definitively broken...

> -#define EFI_LEFT_ARROW_MODIFIER            0x0010
> -#define EFI_RIGHT_ARROW_MODIFIER           0x0011
> -#define EFI_DOWN_ARROW_MODIFIER            0x0012
> -#define EFI_UP_ARROW_MODIFIER              0X0013
> -#define EFI_NS_KEY_MODIFIER                0x0014
> -#define EFI_NS_KEY_DEPENDENCY_MODIFIER     0x0015
> -#define EFI_FUNCTION_KEY_ONE_MODIFIER      0x0016
> -#define EFI_FUNCTION_KEY_TWO_MODIFIER      0x0017
> -#define EFI_FUNCTION_KEY_THREE_MODIFIER    0x0018
> -#define EFI_FUNCTION_KEY_FOUR_MODIFIER     0x0019
> -#define EFI_FUNCTION_KEY_FIVE_MODIFIER     0x001A
> -#define EFI_FUNCTION_KEY_SIX_MODIFIER      0x001B
> -#define EFI_FUNCTION_KEY_SEVEN_MODIFIER    0x001C
> -#define EFI_FUNCTION_KEY_EIGHT_MODIFIER    0x001D
> -#define EFI_FUNCTION_KEY_NINE_MODIFIER     0x001E
> -#define EFI_FUNCTION_KEY_TEN_MODIFIER      0x001F
> -#define EFI_FUNCTION_KEY_ELEVEN_MODIFIER   0x0020
> -#define EFI_FUNCTION_KEY_TWELVE_MODIFIER   0x0021
> -
>  #endif
> 

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>