From nobody Mon Feb 9 02:28:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39726+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39726+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556504209; cv=none; d=zoho.com; s=zohoarc; b=dAspgg2afpnKZrrprcklhe1/OPovyJeMYuf4jie/3Ys1eaZK2cHUGl8H3sgjekdw8uN0xO+mOI3Ua0uSTPGmVr9t3liEVNpZOi36qX5DsCzvCINzd8172rLwu8cACRwV20XG4W8nPS3mhlncLpA5IrnQCv3vXcDgEI41Cm5QEGo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556504209; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=kQNcVp9Z4YoJbAParttuj/atPsA/uTEVoBUMycUQILA=; b=SrT1c5DaxrvkBAR16FgkdcVp1bRmyqDaQiXcC3FuEUxfVTNEpA9ssTvk2nx7wjkwVSS3Ogx9MNeipGmm6inn51EBKH84GZoo4PLYSm2A6egkcreASKSvP/1ucXCJivzVERNp0OauGsO1OhRnEdwF1CVbAL1GcVVYq+yIwon7vVU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39726+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 155650420957612.464551185393702; Sun, 28 Apr 2019 19:16:49 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Sun, 28 Apr 2019 19:16:43 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Apr 2019 19:16:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,408,1549958400"; d="scan'208";a="139631967" X-Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga006.jf.intel.com with ESMTP; 28 Apr 2019 19:16:42 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Liming Gao , Eric Dong Subject: [edk2-devel] [patch 06/11] MdeModulePkg/Setup: Remove PcdFrameworkCompatibilitySupport usage Date: Mon, 29 Apr 2019 10:16:02 +0800 Message-Id: <20190429021607.11304-7-dandan.bi@intel.com> In-Reply-To: <20190429021607.11304-1-dandan.bi@intel.com> References: <20190429021607.11304-1-dandan.bi@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,dandan.bi@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556504209; bh=AYVgtL9KgGmIUuHjLDd60yy91Mn8QdBIjrmTufCLoBg=; h=Cc:Date:From:Reply-To:Subject:To; b=MUvuRh7LUdJJH1YlwT/tV4N9g4sTEcslmTZaGN9GIUT4xj+KCXp1i1YBk2bFakqOQ0i 1y70lQHUVaeqFamViOUqPpItT41ZL2HQC9uz6Wpdap0ic4RmDeiNIQ3NXls3DPkgtu7N3 gt5zuMyV2bmGG1UVmZ2QQcuEOWEWhacO12Q= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1464 Currently Framework compatibility support is not needed and PcdFrameworkCompatibilitySupport will be removed from edk2. So remove the usage of this PCD firstly. Cc: Liming Gao Cc: Eric Dong Signed-off-by: Dandan Bi Reviewed-by: Eric Dong --- .../Universal/SetupBrowserDxe/IfrParse.c | 86 +------------------ .../SetupBrowserDxe/SetupBrowserDxe.inf | 6 +- 2 files changed, 2 insertions(+), 90 deletions(-) diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/MdeModuleP= kg/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 Pack= age. - 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 Unicode= 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.Var= Name, 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 + size= of (EFI_IFR_OP_HEADER)))) { - // - // Specific GUIDed opcodes to support IFR generated from Framework H= II VFR - // - if ((((EFI_IFR_GUID_VAREQNAME *) OpCodeData)->ExtendOpCode) =3D=3D E= FI_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 su= pport - // Framework Compatibility - // - if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) { - if ((*OpCodeData =3D=3D EFI_IFR_NUMERIC_OP) && IsNextOpCodeGuidedVarEq= Name (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/M= deModulePkg/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 specifica= tion. # # It also produces FormBrowserEx(2) protocol to let user register the diff= erent 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 --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39726): https://edk2.groups.io/g/devel/message/39726 Mute This Topic: https://groups.io/mt/31379001/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-