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: hao.a.wu@intel.com) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by groups.io with SMTP; Sun, 05 May 2019 18:05:48 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 May 2019 18:05:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,435,1549958400"; d="scan'208";a="140303999" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga008.jf.intel.com with ESMTP; 05 May 2019 18:05:47 -0700 Received: from FMSMSX110.amr.corp.intel.com (10.18.116.10) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sun, 5 May 2019 18:05:47 -0700 Received: from shsmsx154.ccr.corp.intel.com (10.239.6.54) by fmsmsx110.amr.corp.intel.com (10.18.116.10) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sun, 5 May 2019 18:05:47 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.33]) by SHSMSX154.ccr.corp.intel.com ([169.254.7.136]) with mapi id 14.03.0415.000; Mon, 6 May 2019 09:05:45 +0800 From: "Wu, Hao A" To: "Bi, Dandan" , "devel@edk2.groups.io" CC: "Gao, Liming" Subject: Re: [patch 05/11] MdeModulePkg/CdExpress: Remove PcdFrameworkCompatibilitySupport usage Thread-Topic: [patch 05/11] MdeModulePkg/CdExpress: Remove PcdFrameworkCompatibilitySupport usage Thread-Index: AQHU/jGbQ3uVZSiAfkWI9LtxNJBF16ZdUyrQ Date: Mon, 6 May 2019 01:05:44 +0000 Message-ID: References: <20190429021607.11304-1-dandan.bi@intel.com> <20190429021607.11304-6-dandan.bi@intel.com> In-Reply-To: <20190429021607.11304-6-dandan.bi@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: hao.a.wu@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Hao Wu Best Regards, Hao Wu > -----Original Message----- > From: Bi, Dandan > Sent: Monday, April 29, 2019 10:16 AM > To: devel@edk2.groups.io > Cc: Wu, Hao A; Gao, Liming > Subject: [patch 05/11] MdeModulePkg/CdExpress: Remove > PcdFrameworkCompatibilitySupport usage >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1464 >=20 > Currently Framework compatibility is not needed and > PcdFrameworkCompatibilitySupport will be removed from edk2. > So remove the usage of this PCD firstly. >=20 > 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(-) >=20 > 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 recove= ry > # 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 > # > ## >=20 > @@ -56,13 +56,10 @@ > ## NOTIFY > ## CONSUMES > gEfiPeiVirtualBlockIo2PpiGuid > gEfiPeiDeviceRecoveryModulePpiGuid ## PRODUCES >=20 > -[FeaturePcd] > - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## > CONSUMES > - > [Pcd] > gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryFileName ## > CONSUMES >=20 > [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 >=20 > -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
> +Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
>=20 > SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ >=20 > @@ -585,14 +585,10 @@ GetRecoveryCapsuleInfo ( >=20 > if (EFI_ERROR (Status)) { > return Status; > } >=20 > - if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) { > - CapsuleInstance =3D CapsuleInstance + 1; > - } > - > if ((CapsuleInstance =3D=3D 0) || (CapsuleInstance > NumberRecoveryCap= sules)) { > return EFI_NOT_FOUND; > } >=20 > PrivateData =3D PEI_CD_EXPRESS_PRIVATE_DATA_FROM_THIS (This); > @@ -645,14 +641,10 @@ LoadRecoveryCapsule ( >=20 > if (EFI_ERROR (Status)) { > return Status; > } >=20 > - if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) { > - CapsuleInstance =3D CapsuleInstance + 1; > - } > - > if ((CapsuleInstance =3D=3D 0) || (CapsuleInstance > NumberRecoveryCap= sules)) { > return EFI_NOT_FOUND; > } >=20 > PrivateData =3D PEI_CD_EXPRESS_PRIVATE_DATA_FROM_THIS (This); > -- > 2.18.0.windows.1