From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: eric.dong@intel.com) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by groups.io with SMTP; Mon, 06 May 2019 23:13:05 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 May 2019 23:13:05 -0700 X-ExtLoop1: 1 Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga002.jf.intel.com with ESMTP; 06 May 2019 23:13:04 -0700 Received: from fmsmsx151.amr.corp.intel.com (10.18.125.4) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 6 May 2019 23:13:03 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by FMSMSX151.amr.corp.intel.com (10.18.125.4) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 6 May 2019 23:13:03 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.249]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.33]) with mapi id 14.03.0415.000; Tue, 7 May 2019 14:13:01 +0800 From: "Dong, Eric" To: "Bi, Dandan" , "devel@edk2.groups.io" CC: "Gao, Liming" Subject: Re: [patch 06/11] MdeModulePkg/Setup: Remove PcdFrameworkCompatibilitySupport usage Thread-Topic: [patch 06/11] MdeModulePkg/Setup: Remove PcdFrameworkCompatibilitySupport usage Thread-Index: AQHU/jGcV3pOtMnNv0KmQgMM+Ymqa6ZfO1pQ Date: Tue, 7 May 2019 06:13:01 +0000 Message-ID: References: <20190429021607.11304-1-dandan.bi@intel.com> <20190429021607.11304-7-dandan.bi@intel.com> In-Reply-To: <20190429021607.11304-7-dandan.bi@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiODA4NTVhOTMtYzZmMC00YzcyLTlhODYtM2UyZjI4OGMzMTc5IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiWVhGZnFmXC8zaTBFUW9XRWRnd0JEb0RMend3MVVcL1p6Wk1PNm5MNm9KTnlCMFBlZ3RQU1F1S3MybnRReEdHam5ZIn0= x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: eric.dong@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Eric Dong > -----Original Message----- > From: Bi, Dandan > Sent: Monday, April 29, 2019 10:16 AM > To: devel@edk2.groups.io > Cc: Gao, Liming ; Dong, Eric > Subject: [patch 06/11] MdeModulePkg/Setup: Remove > PcdFrameworkCompatibilitySupport usage >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1464 >=20 > Currently Framework compatibility support is not needed and > PcdFrameworkCompatibilitySupport will be removed from edk2. > So remove the usage of this PCD firstly. >=20 > Cc: Liming Gao > Cc: Eric Dong > Signed-off-by: Dandan Bi > --- > .../Universal/SetupBrowserDxe/IfrParse.c | 86 +------------------ > .../SetupBrowserDxe/SetupBrowserDxe.inf | 6 +- > 2 files changed, 2 insertions(+), 90 deletions(-) >=20 > diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c > b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c > index 034edb51a7..891b95cf9f 100644 > --- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c > +++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c > @@ -1,9 +1,9 @@ > /** @file > Parser for IFR binary encoding. >=20 > -Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
> +Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ >=20 > #include "Setup.h" > @@ -82,80 +82,10 @@ CreateStatement ( > InsertTailList (&Form->StatementListHead, &Statement->Link); > } > return Statement; > } >=20 > -/** > - Convert a numeric value to a Unicode String and insert it to String Pa= ckage. > - This string is used as the Unicode Name for the EFI Variable. This is = to support > - the deprecated vareqval opcode. > - > - @param FormSet The FormSet. > - @param Statement The numeric question whose VarStoreInfo.VarName = is > the > - numeric value which is used to produce the Unico= de Name > - for the EFI Variable. > - > - If the Statement is NULL, the ASSERT. > - If the opcode is not Numeric, then ASSERT. > - > - @retval EFI_SUCCESS The funtion always succeeds. > -**/ > -EFI_STATUS > -UpdateCheckBoxStringToken ( > - IN CONST FORM_BROWSER_FORMSET *FormSet, > - IN FORM_BROWSER_STATEMENT *Statement > - ) > -{ > - CHAR16 Str[MAXIMUM_VALUE_CHARACTERS]; > - EFI_STRING_ID Id; > - > - ASSERT (Statement !=3D NULL); > - ASSERT (Statement->Operand =3D=3D EFI_IFR_NUMERIC_OP); > - > - UnicodeValueToStringS (Str, sizeof (Str), 0, Statement->VarStoreInfo.V= arName, > MAXIMUM_VALUE_CHARACTERS - 1); > - > - Id =3D HiiSetString (FormSet->HiiHandle, 0, Str, NULL); > - if (Id =3D=3D 0) { > - return EFI_OUT_OF_RESOURCES; > - } > - > - Statement->VarStoreInfo.VarName =3D Id; > - > - return EFI_SUCCESS; > -} > - > -/** > - Check if the next opcode is the EFI_IFR_EXTEND_OP_VAREQNAME. > - > - @param OpCodeData The current opcode. > - > - @retval TRUE Yes. > - @retval FALSE No. > -**/ > -BOOLEAN > -IsNextOpCodeGuidedVarEqName ( > - IN UINT8 *OpCodeData > - ) > -{ > - // > - // Get next opcode > - // > - OpCodeData +=3D ((EFI_IFR_OP_HEADER *) OpCodeData)->Length; > - if (*OpCodeData =3D=3D EFI_IFR_GUID_OP) { > - if (CompareGuid (&gEfiIfrFrameworkGuid, (EFI_GUID *)(OpCodeData + si= zeof > (EFI_IFR_OP_HEADER)))) { > - // > - // Specific GUIDed opcodes to support IFR generated from Framework= HII > VFR > - // > - if ((((EFI_IFR_GUID_VAREQNAME *) OpCodeData)->ExtendOpCode) =3D=3D > EFI_IFR_EXTEND_OP_VAREQNAME) { > - return TRUE; > - } > - } > - } > - > - return FALSE; > -} > - > /** > Initialize Question's members. >=20 > @param OpCodeData Pointer of the raw OpCode data. > @param FormSet Pointer of the current FormSet. > @@ -174,11 +104,10 @@ CreateQuestion ( > FORM_BROWSER_STATEMENT *Statement; > EFI_IFR_QUESTION_HEADER *QuestionHdr; > LIST_ENTRY *Link; > FORMSET_STORAGE *Storage; > NAME_VALUE_NODE *NameValueNode; > - EFI_STATUS Status; > BOOLEAN Find; >=20 > Statement =3D CreateStatement (OpCodeData, FormSet, Form); > if (Statement =3D=3D NULL) { > return NULL; > @@ -196,23 +125,10 @@ CreateQuestion ( > // VarStoreId of zero indicates no variable storage > // > return Statement; > } >=20 > - // > - // Take a look at next OpCode to see whether it is a GUIDed opcode to > support > - // Framework Compatibility > - // > - if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) { > - if ((*OpCodeData =3D=3D EFI_IFR_NUMERIC_OP) && > IsNextOpCodeGuidedVarEqName (OpCodeData)) { > - Status =3D UpdateCheckBoxStringToken (FormSet, Statement); > - if (EFI_ERROR (Status)) { > - return NULL; > - } > - } > - } > - > // > // Find Storage for this Question > // > Link =3D GetFirstNode (&FormSet->StorageListHead); > while (!IsNull (&FormSet->StorageListHead, Link)) { diff --git > a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf > b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf > index a6b9402daa..82db7c1ef1 100644 > --- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf > +++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf > @@ -1,11 +1,11 @@ > ## @file > # The DXE driver produces FORM BROWSER2 protocol defined in UEFI > specification. > # > # It also produces FormBrowserEx(2) protocol to let user register the di= fferent > Hot key service. > # > -# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
> +# Copyright (c) 2007 - 2019, Intel Corporation. All rights > +reserved.
> # > # SPDX-License-Identifier: BSD-2-Clause-Patent # # ## @@ -50,11 +50,= 10 > @@ > DevicePathLib > PcdLib > UefiLib >=20 > [Guids] > - gEfiIfrFrameworkGuid ## SOMETIMES_CONSUMES #= # GUID > gEfiHiiPlatformSetupFormsetGuid ## SOMETIMES_CONSUMES #= # > GUID > gEfiHiiStandardFormGuid ## SOMETIMES_CONSUMES #= # GUID > gZeroGuid ## SOMETIMES_CONSUMES #= # GUID > gEdkiiIfrBitVarstoreGuid ## SOMETIMES_CONSUMES #= # GUID >=20 > @@ -71,13 +70,10 @@ > ## NOTIFY > gEdkiiFormDisplayEngineProtocolGuid > gEdkiiFormBrowserExProtocolGuid ## PRODUCES > gEfiRegularExpressionProtocolGuid ## SOMETIMES_CONSUMES >=20 > -[FeaturePcd] > - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport > ## CONSUMES > - > [Depex] > gEfiHiiDatabaseProtocolGuid AND gEfiHiiConfigRoutingProtocolGuid >=20 > [UserExtensions.TianoCore."ExtraFiles"] > SetupBrowserExtra.uni > -- > 2.18.0.windows.1