From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=209.85.128.47; helo=mail-wm1-f47.google.com; envelope-from=philmd@redhat.com; receiver=edk2-devel@lists.01.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 06B91211F1E19 for ; Tue, 2 Apr 2019 08:47:02 -0700 (PDT) Received: by mail-wm1-f47.google.com with SMTP id n25so4348376wmk.4 for ; Tue, 02 Apr 2019 08:47:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:openpgp:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Si9C3wDglkDFqSx+JvtvKPAzjCPJxEKR0jhTdE/sxGo=; b=SQNkxknLrQ9fh210JUvl9DucqU8v3td8ArMHYIEQG0HP8sJlfRL7KQu5OdEfrEkXz8 GJp6EEcFxnFudw1oHS6E7dvLFjsoGowZO+2l+fSepjbwEPUAh526KIFWmI8RsAoEWGib UcLK/vuCqwHj1/RkPcR/ysInYL+EURNpHLHuv8y4slDNE/YuYXN8C/9+kp4rNAzUIeCL 0LklyaNHj1qyxnErn5oia0v2BWf+HvCI51k8z+YjuY09HqJSIQNvKo+0kMzk13UQyClI OogsTkdTf+rXahcV5OGhuz8ahq2EtVsQ7U79jdkYfbXcn5KopkfR2Z5FULBgdMMe5Jn+ cMdw== X-Gm-Message-State: APjAAAWIyjN3up0ynqR3e5rNsZUpFtIadpVvssrKPFfyC7XpjiZyDPO9 SqNg80SJhcphz0aCj3eDTXRhWIR1znI= X-Google-Smtp-Source: APXvYqxwY6my5L8qaqx6Afab94aedxaHgdtQCreNoyAyey1Xznj6jiay2p9mXwdjV4XW5BiIJjtUNQ== X-Received: by 2002:a7b:cd93:: with SMTP id y19mr4343706wmj.113.1554220020848; Tue, 02 Apr 2019 08:47:00 -0700 (PDT) Received: from [192.168.1.33] (193.red-88-21-103.staticip.rima-tde.net. [88.21.103.193]) by smtp.gmail.com with ESMTPSA id w11sm39355019wre.15.2019.04.02.08.47.00 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 08:47:00 -0700 (PDT) To: Eric Jin , edk2-devel@lists.01.org References: <20190402151653.19204-1-eric.jin@intel.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Openpgp: id=89C1E78F601EE86C867495CBA2A3FD6EDEADC0DE; url=http://pgp.mit.edu/pks/lookup?op=get&search=0xA2A3FD6EDEADC0DE Message-ID: <408b2028-e844-80ab-cb76-7dca0769d71b@redhat.com> Date: Tue, 2 Apr 2019 17:46:59 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190402151653.19204-1-eric.jin@intel.com> Subject: Re: [edk2-test][Patch 1/1] SctPkg/UEFI: Remove redefined macro X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Apr 2019 15:47:03 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit 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 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Eric Jin > --- > 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.
> - Copyright (c) 2010, Intel Corporation. All rights reserved.
> + Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
> (C) Copyright 2017 Hewlett Packard Enterprise Development LP
> Copyright (c) 2019, ARM Ltd. All rights reserved.
> > @@ -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