MdeModulePkg CdExpressPei: Use correct PeiServices pointer to call low level BlockIoP...

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

diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
index ee0b4e6869f4ff5d02cdf5070792f92419cf2fcc..dccb4605428ee37ac17c47ce7fa8693b258c387d 100644 (file)
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
+++ b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
@@ -1,7 +1,7 @@
 /** @file\r
   Source file for CD recovery PEIM\r
 \r
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2014, 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
@@ -259,7 +259,7 @@ FindRecoveryCapsules (
   while (TRUE) {\r
     SetMem (Buffer, BufferSize, 0);\r
     Status = BlockIoPpi->ReadBlocks (\r
-                          PrivateData->PeiServices,\r
+                          (EFI_PEI_SERVICES **) GetPeiServicesTablePointer (),\r
                           BlockIoPpi,\r
                           IndexBlockDevice,\r
                           Lba,\r
@@ -350,7 +350,7 @@ RetrieveCapsuleFileFromRoot (
   SetMem (Buffer, BufferSize, 0);\r
 \r
   Status = BlockIoPpi->ReadBlocks (\r
-                        PrivateData->PeiServices,\r
+                        (EFI_PEI_SERVICES **) GetPeiServicesTablePointer (),\r
                         BlockIoPpi,\r
                         IndexBlockDevice,\r
                         Lba,\r
@@ -566,7 +566,7 @@ LoadRecoveryCapsule (
   BlockIoPpi  = PrivateData->CapsuleData[CapsuleInstance - 1].BlockIo;\r
 \r
   Status = BlockIoPpi->ReadBlocks (\r
-                        PrivateData->PeiServices,\r
+                        PeiServices,\r
                         BlockIoPpi,\r
                         PrivateData->CapsuleData[CapsuleInstance - 1].IndexBlock,\r
                         PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleStartLBA,\r

diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h
index 99edd3d5a2b24727d458b7fd46dac62bb6ebb539..b452747e704c6a37e702737590f3cc6b0824a228 100644 (file)
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h
+++ b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h
@@ -1,7 +1,7 @@
 /** @file\r
   Header file for CD recovery PEIM\r
 \r
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2014, 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
@@ -74,7 +74,6 @@ typedef struct {
 typedef struct {\r
 \r
   UINTN                                 Signature;\r
-  EFI_PEI_SERVICES                      **PeiServices;\r
   EFI_PEI_DEVICE_RECOVERY_MODULE_PPI    DeviceRecoveryPpi;\r
   EFI_PEI_PPI_DESCRIPTOR                PpiDescriptor;\r
   EFI_PEI_NOTIFY_DESCRIPTOR             NotifyDescriptor;\r