From 56a9e699dd04da798417732265404b70fe879866 Mon Sep 17 00:00:00 2001
From: Star Zeng <star.zeng@intel.com>
Date: Mon, 6 Jan 2014 03:36:31 +0000
Subject: [PATCH] MdeModulePkg CdExpressPei: Use correct PeiServices pointer to
 call low level BlockIoPpi->ReadBlocks.

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
---
 MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c | 8 ++++----
 MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
index ee0b4e6869..dccb460542 100644
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
+++ b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
@@ -1,7 +1,7 @@
 /** @file
   Source file for CD recovery PEIM
 
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 
 This program and the accompanying materials
 are licensed and made available under the terms and conditions
@@ -259,7 +259,7 @@ FindRecoveryCapsules (
   while (TRUE) {
     SetMem (Buffer, BufferSize, 0);
     Status = BlockIoPpi->ReadBlocks (
-                          PrivateData->PeiServices,
+                          (EFI_PEI_SERVICES **) GetPeiServicesTablePointer (),
                           BlockIoPpi,
                           IndexBlockDevice,
                           Lba,
@@ -350,7 +350,7 @@ RetrieveCapsuleFileFromRoot (
   SetMem (Buffer, BufferSize, 0);
 
   Status = BlockIoPpi->ReadBlocks (
-                        PrivateData->PeiServices,
+                        (EFI_PEI_SERVICES **) GetPeiServicesTablePointer (),
                         BlockIoPpi,
                         IndexBlockDevice,
                         Lba,
@@ -566,7 +566,7 @@ LoadRecoveryCapsule (
   BlockIoPpi  = PrivateData->CapsuleData[CapsuleInstance - 1].BlockIo;
 
   Status = BlockIoPpi->ReadBlocks (
-                        PrivateData->PeiServices,
+                        PeiServices,
                         BlockIoPpi,
                         PrivateData->CapsuleData[CapsuleInstance - 1].IndexBlock,
                         PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleStartLBA,
diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h
index 99edd3d5a2..b452747e70 100644
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h
+++ b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h
@@ -1,7 +1,7 @@
 /** @file
   Header file for CD recovery PEIM
 
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 
 This program and the accompanying materials
 are licensed and made available under the terms and conditions
@@ -74,7 +74,6 @@ typedef struct {
 typedef struct {
 
   UINTN                                 Signature;
-  EFI_PEI_SERVICES                      **PeiServices;
   EFI_PEI_DEVICE_RECOVERY_MODULE_PPI    DeviceRecoveryPpi;
   EFI_PEI_PPI_DESCRIPTOR                PpiDescriptor;
   EFI_PEI_NOTIFY_DESCRIPTOR             NotifyDescriptor;
-- 
2.39.2