MdeModulePkg: Update CapsulePei to consume PI1.4 CapsulePpi

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17374 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf b/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
index 2a0fa4b32244c95adba8a4ad21ad1e95ae0b33cf..d7aa37186f667af8dbd3ceba7fc5153765c23b88 100644 (file)
--- a/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
+++ b/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
@@ -6,7 +6,7 @@
 #  This external input must be validated carefully to avoid security issue like\r
 #  buffer overflow, integer overflow.\r
 #\r
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions\r
@@ -67,7 +67,7 @@
 \r
 [Ppis]\r
   gEfiPeiReadOnlyVariable2PpiGuid               ## CONSUMES\r
-  gPeiCapsulePpiGuid                            ## PRODUCES\r
+  gEfiPeiCapsulePpiGuid                         ## PRODUCES\r
   \r
 [Ppis.IA32]  \r
   gEfiPeiLoadFilePpiGuid                        ## SOMETIMES_CONSUMES\r

diff --git a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c b/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
index 23bf2026d461fa3b1a74165010e76c2389b5e811..6b934c9e3c91408b39b41d50eb8fecef2a6effd0 100644 (file)
--- a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
+++ b/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
@@ -1,7 +1,7 @@
 /** @file\r
   Capsule update PEIM for UEFI2.0\r
 \r
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
@@ -1053,7 +1053,7 @@ CreateState (
   return EFI_SUCCESS;\r
 }\r
 \r
-CONST PEI_CAPSULE_PPI        mCapsulePpi = {\r
+CONST EFI_PEI_CAPSULE_PPI        mCapsulePpi = {\r
   CapsuleCoalesce,\r
   CheckCapsuleUpdate,\r
   CreateState\r
@@ -1061,8 +1061,8 @@ CONST PEI_CAPSULE_PPI        mCapsulePpi = {
 \r
 CONST EFI_PEI_PPI_DESCRIPTOR mUefiPpiListCapsule = {\r
   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
-  &gPeiCapsulePpiGuid,\r
-  (PEI_CAPSULE_PPI *) &mCapsulePpi\r
+  &gEfiPeiCapsulePpiGuid,\r
+  (EFI_PEI_CAPSULE_PPI *) &mCapsulePpi\r
 };\r
 \r
 /**\r