From 507b36ca9e70189579385431190d887f802f511a Mon Sep 17 00:00:00 2001
From: qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 4 Sep 2007 06:09:28 +0000
Subject: First round of PI enabling work: 1) PiPeiCis changes (CONST,
 EFI_PEI_FILE_HANDLE.. etc) 2) Make use of FirmwareVolume 2 protocol. 3)
 Verified for LakeportX64Pkg (S3) and Nt32Pkg

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3769 6f19259b-4bc3-4df7-8a09-765794883524
---
 IntelFrameworkModulePkg/Library/GraphicsLib/CommonHeader.h          | 2 +-
 IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c              | 6 +++---
 IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf         | 2 +-
 .../Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c            | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'IntelFrameworkModulePkg/Library')

diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/CommonHeader.h b/IntelFrameworkModulePkg/Library/GraphicsLib/CommonHeader.h
index f2bf0e1c9b..10dc49ea7f 100644
--- a/IntelFrameworkModulePkg/Library/GraphicsLib/CommonHeader.h
+++ b/IntelFrameworkModulePkg/Library/GraphicsLib/CommonHeader.h
@@ -23,7 +23,7 @@
 #include <Protocol/OEMBadging.h>
 #include <Protocol/ConsoleControl.h>
 #include <Protocol/GraphicsOutput.h>
-#include <Protocol/FirmwareVolume.h>
+#include <Protocol/FirmwareVolume2.h>
 #include <Protocol/UgaDraw.h>
 #include <Protocol/HiiFramework.h>
 
diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c b/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
index 0881c3d965..605a240bf2 100644
--- a/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
+++ b/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
@@ -56,14 +56,14 @@ Returns:
   EFI_STATUS                    Status;
   UINTN                         FvProtocolCount;
   EFI_HANDLE                    *FvHandles;
-  EFI_FIRMWARE_VOLUME_PROTOCOL  *Fv;
+  EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv;
   UINTN                         Index;
   UINT32                        AuthenticationStatus;
 
 
   Status = gBS->LocateHandleBuffer (
                   ByProtocol,
-                  &gEfiFirmwareVolumeProtocolGuid,
+                  &gEfiFirmwareVolume2ProtocolGuid,
                   NULL,
                   &FvProtocolCount,
                   &FvHandles
@@ -75,7 +75,7 @@ Returns:
   for (Index = 0; Index < FvProtocolCount; Index++) {
     Status = gBS->HandleProtocol (
                     FvHandles[Index],
-                    &gEfiFirmwareVolumeProtocolGuid,
+                    &gEfiFirmwareVolume2ProtocolGuid,
                     (VOID **) &Fv
                     );
 
diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf b/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf
index 9674d5f601..dc82000bbf 100644
--- a/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf
+++ b/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf
@@ -55,6 +55,6 @@
   gEfiGraphicsOutputProtocolGuid                # PROTOCOL ALWAYS_CONSUMED
   gEfiUgaDrawProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED
   gEfiConsoleControlProtocolGuid                # PROTOCOL ALWAYS_CONSUMED
-  gEfiFirmwareVolumeProtocolGuid                # PROTOCOL ALWAYS_CONSUMED
+  gEfiFirmwareVolume2ProtocolGuid                # PROTOCOL ALWAYS_CONSUMED
   gEfiOEMBadgingProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED
 
diff --git a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
index cb77d5fe0d..2d08ccdeb4 100644
--- a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
@@ -64,9 +64,9 @@ InternalReportStatusCode (
   IN EFI_STATUS_CODE_DATA     *Data     OPTIONAL
   )
 {
-  EFI_PEI_SERVICES  **PeiServices;
+  CONST EFI_PEI_SERVICES  **PeiServices;
 
-  PeiServices = GetPeiServicesTablePointer ();
+  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();
   return (*PeiServices)->ReportStatusCode (
                            PeiServices,
                            Type,
-- 
cgit v1.2.3