From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: dandan.bi@intel.com) Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Sun, 28 Apr 2019 19:16:41 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False 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:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,408,1549958400"; d="scan'208";a="139631952" Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga006.jf.intel.com with ESMTP; 28 Apr 2019 19:16:40 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Hao Wu , Liming Gao Subject: [patch 05/11] MdeModulePkg/CdExpress: Remove PcdFrameworkCompatibilitySupport usage Date: Mon, 29 Apr 2019 10:16:01 +0800 Message-Id: <20190429021607.11304-6-dandan.bi@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20190429021607.11304-1-dandan.bi@intel.com> References: <20190429021607.11304-1-dandan.bi@intel.com> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464 Currently Framework compatibility is not needed and PcdFrameworkCompatibilitySupport will be removed from edk2. So remove the usage of this PCD firstly. Cc: Hao Wu Cc: Liming Gao Signed-off-by: Dandan Bi --- .../Universal/Disk/CdExpressPei/CdExpressPei.inf | 5 +---- .../Universal/Disk/CdExpressPei/PeiCdExpress.c | 10 +--------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf index 11ab49b33b..184036bfb9 100644 --- a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf +++ b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf @@ -3,11 +3,11 @@ # # This module reads data from CDROM device by all installed block IO ppi and # finds whether there is Recovery data in the device. If it finds recovery # data, it will install Device Recovery Module PPI. # -# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # ## @@ -56,13 +56,10 @@ ## NOTIFY ## CONSUMES gEfiPeiVirtualBlockIo2PpiGuid gEfiPeiDeviceRecoveryModulePpiGuid ## PRODUCES -[FeaturePcd] - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## CONSUMES - [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryFileName ## CONSUMES [Depex] gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c index b029c54729..fd34f07eec 100644 --- a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c +++ b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c @@ -1,9 +1,9 @@ /** @file Source file for CD recovery PEIM -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -585,14 +585,10 @@ GetRecoveryCapsuleInfo ( if (EFI_ERROR (Status)) { return Status; } - if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) { - CapsuleInstance = CapsuleInstance + 1; - } - if ((CapsuleInstance == 0) || (CapsuleInstance > NumberRecoveryCapsules)) { return EFI_NOT_FOUND; } PrivateData = PEI_CD_EXPRESS_PRIVATE_DATA_FROM_THIS (This); @@ -645,14 +641,10 @@ LoadRecoveryCapsule ( if (EFI_ERROR (Status)) { return Status; } - if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) { - CapsuleInstance = CapsuleInstance + 1; - } - if ((CapsuleInstance == 0) || (CapsuleInstance > NumberRecoveryCapsules)) { return EFI_NOT_FOUND; } PrivateData = PEI_CD_EXPRESS_PRIVATE_DATA_FROM_THIS (This); -- 2.18.0.windows.1