From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=40.107.2.73; helo=eur02-ve1-obe.outbound.protection.outlook.com; envelope-from=supreeth.venkatesh@arm.com; receiver=edk2-devel@lists.01.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20073.outbound.protection.outlook.com [40.107.2.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 06970211EB2A0 for ; Tue, 2 Apr 2019 09:34:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GiE8c4lpbzC/fRZm68gf7Ferr+b4zhaJIQc3CQBy5Vc=; b=MMER3RfIbMTNMRQMIjtYu8v2ESJf3Jlc4oQXb3su3jYM9oU4yQAWTeuYjdIMFSuMiR7oRgJnQVcz6a6O/jYw4NDZFCcfu1PDNwoGXYofvqGSGKnn1JyAzaBl4stXpD/OgLUHQAI1EVOFylIwNOf7oEG2Eb1HZIYRtg5VlWqbiIQ= Received: from AM4PR08MB2788.eurprd08.prod.outlook.com (10.170.126.27) by AM4PR08MB2851.eurprd08.prod.outlook.com (10.171.191.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1750.17; Tue, 2 Apr 2019 16:34:21 +0000 Received: from AM4PR08MB2788.eurprd08.prod.outlook.com ([fe80::cc1a:f5ec:27c6:4136]) by AM4PR08MB2788.eurprd08.prod.outlook.com ([fe80::cc1a:f5ec:27c6:4136%3]) with mapi id 15.20.1750.021; Tue, 2 Apr 2019 16:34:21 +0000 From: Supreeth Venkatesh To: Eric Jin , "edk2-devel@lists.01.org" Thread-Topic: [edk2-test][Patch 1/1] SctPkg/UEFI: Remove redefined macro Thread-Index: AQHU6WchF2pqTKYu10CfgPD2NQsvAqYpEM2A Date: Tue, 2 Apr 2019 16:34:21 +0000 Message-ID: References: <20190402151653.19204-1-eric.jin@intel.com> In-Reply-To: <20190402151653.19204-1-eric.jin@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Supreeth.Venkatesh@arm.com; x-originating-ip: [2600:1700:8c61:400:e957:a2c5:9c96:1db3] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 569be126-f505-4a92-9366-08d6b7890f6e x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600139)(711020)(4605104)(4618075)(2017052603328)(7193020); SRVR:AM4PR08MB2851; x-ms-traffictypediagnostic: AM4PR08MB2851: x-microsoft-antispam-prvs: x-forefront-prvs: 0995196AA2 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(346002)(39860400002)(366004)(376002)(136003)(13464003)(40434004)(189003)(199004)(316002)(97736004)(6246003)(74316002)(2501003)(106356001)(68736007)(53546011)(99286004)(55016002)(76176011)(7696005)(102836004)(86362001)(2906002)(53936002)(105586002)(478600001)(72206003)(186003)(9686003)(52536014)(256004)(14444005)(14454004)(6506007)(5024004)(446003)(81156014)(71200400001)(305945005)(46003)(110136005)(6436002)(81166006)(71190400001)(7736002)(6116002)(5660300002)(8676002)(229853002)(486006)(33656002)(25786009)(8936002)(476003)(11346002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR08MB2851; H:AM4PR08MB2788.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: bfJi/a4mLQiPoxdaxK8Ye2ZpeOZl0Nfi+/lgBDGmXrKx1szSenEsT90cjQp9RbCK5l3p4OeMleTzzOYYdOsTp0c6kuCLzFvqKewHZJ4ZAMF1Tfub0m44GhKeqRuOExScbrbN4nA7HVtnkRODirGUDPzo/H7jX7OQ1bSRjO44UBte0RAsfCIeKyVO7gz8emfExYU1590uB+NCygS5QiyqMVRaKVIHGrD2DdY6zVFmydcRUMMlwyzazaXfL5zz4xonL1LwwUR6lN2a5fDdRvXlfcK/zJ6GozhLeqlFgFcfBg5T9LXx+mFt5PHUr83Vy2WjUNMnzFqWI5d0E6J7q5IY3DB3itwNK40X/UOABGfMihxMAXtFNlQbXzA9bikVUSaEU/ZcoSEC+TyxktsaZazyJCRa2/iHz7jMGd4trModc6g= MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-Network-Message-Id: 569be126-f505-4a92-9366-08d6b7890f6e X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Apr 2019 16:34:21.5790 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR08MB2851 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 16:34:26 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Supreeth Venkatesh Thanks, Supreeth -----Original Message----- From: Eric Jin Sent: Tuesday, April 2, 2019 10:17 AM To: edk2-devel@lists.01.org Cc: Supreeth Venkatesh Subject: [edk2-test][Patch 1/1] SctPkg/UEFI: Remove redefined macro Remove the macros which are already defined in MdePkg/Include/Uefi/UefiInte= rnalFormRepersentation.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. - #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 -#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 -- 2.20.0.windows.1 IMPORTANT NOTICE: The contents of this email and any attachments are confid= ential and may also be privileged. If you are not the intended recipient, p= lease notify the sender immediately and do not disclose the contents to any= other person, use it for any purpose, or store or copy the information in = any medium. Thank you.