Base on PI spec, GetPeiServicesTablePointer is updated to return CONST EFI_PEI_SERVIC...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6129 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c b/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c
index ab3395547cec7abcb2f2583a8f81c3371daa4d0e..74491b466c881499cb4ef8f1212f5eb6576bf16e 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c
@@ -1,7 +1,7 @@
 /**@file\r
   Recovery Library. This library class defines a set of methods related do recovery.\r
 \r
 /**@file\r
   Recovery Library. This library class defines a set of methods related do recovery.\r
 \r

-Copyright (c) 2006 - 2007 Intel Corporation\r
+Copyright (c) 2006 - 2008 Intel Corporation\r

 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -41,6 +41,6 @@ PeiRecoverFirmware (
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r

-  return PeiRecovery->LoadRecoveryCapsule (GetPeiServicesTablePointer(), PeiRecovery);\r
+  return PeiRecovery->LoadRecoveryCapsule ((EFI_PEI_SERVICES  **) GetPeiServicesTablePointer(), PeiRecovery);\r

 }\r
 \r
 }\r
 \r

diff --git a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
index 44f733e7b393874f6eee10281d9477365ae845aa..f67adf9d3ac50ca56974f988bb27cfec97a9acf6 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Report Status Code Library for PEI Phase.\r
 \r
 /** @file\r
   Report Status Code Library for PEI Phase.\r
 \r

-  Copyright (c) 2006, Intel Corporation<BR>\r
+  Copyright (c) 2006 - 2008, Intel Corporation<BR>\r

   All rights reserved. This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   All rights reserved. This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -68,7 +68,7 @@ InternalReportStatusCode (
   CONST EFI_PEI_SERVICES  **PeiServices;\r
   EFI_STATUS              Status;\r
 \r
   CONST EFI_PEI_SERVICES  **PeiServices;\r
   EFI_STATUS              Status;\r
 \r

-  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r

   Status =  (*PeiServices)->ReportStatusCode (\r
                              PeiServices,\r
                              Type,\r
   Status =  (*PeiServices)->ReportStatusCode (\r
                              PeiServices,\r
                              Type,\r

diff --git a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c
index 44a870a6870d1b78ec9df6e64ae0a185130e32b1..1d7907ef7f780a02ad616af7bc786fde27a1843a 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c
+++ b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c
@@ -1,7 +1,7 @@
 /**@file\r
   S3 Library. This library class defines a set of methods related do S3 mode\r
 \r
 /**@file\r
   S3 Library. This library class defines a set of methods related do S3 mode\r
 \r

-Copyright (c) 2006 - 2007 Intel Corporation\r
+Copyright (c) 2006 - 2008 Intel Corporation\r

 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -41,6 +41,6 @@ AcpiS3ResumeOs (
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r

-  return S3Resume->S3RestoreConfig (GetPeiServicesTablePointer()); \r
+  return S3Resume->S3RestoreConfig ((EFI_PEI_SERVICES  **) GetPeiServicesTablePointer()); \r

 }\r
 \r
 }\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
index 746e16979df6945223042ce8ba74a37ad64e088d..7d9eaf199dfa8d512a3690d3bb55aa6db501e225 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
+++ b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
@@ -355,7 +355,7 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 FindVariable (\r
 EFI_STATUS\r
 EFIAPI\r
 FindVariable (\r

-  IN EFI_PEI_SERVICES         **PeiServices,\r
+  IN        EFI_PEI_SERVICES   **PeiServices,\r

   IN CONST  CHAR16            *VariableName,\r
   IN CONST  EFI_GUID          *VendorGuid,\r
   OUT VARIABLE_POINTER_TRACK  *PtrTrack\r
   IN CONST  CHAR16            *VariableName,\r
   IN CONST  EFI_GUID          *VendorGuid,\r
   OUT VARIABLE_POINTER_TRACK  *PtrTrack\r


@@ -581,7 +581,7 @@ PeiGetVariable2 (
 \r
 {\r
   return PeiGetVariable (\r
 \r
 {\r
   return PeiGetVariable (\r

-           GetPeiServicesTablePointer (),\r
+           (EFI_PEI_SERVICES **) GetPeiServicesTablePointer (),\r

            (CHAR16*)VariableName,\r
            (EFI_GUID*)VariableGuid,\r
            Attributes,\r
            (CHAR16*)VariableName,\r
            (EFI_GUID*)VariableGuid,\r
            Attributes,\r


@@ -703,7 +703,7 @@ PeiGetNextVariableName2 (
 \r
 {\r
   return PeiGetNextVariableName (\r
 \r
 {\r
   return PeiGetNextVariableName (\r

-           GetPeiServicesTablePointer (),\r
+           (EFI_PEI_SERVICES **) GetPeiServicesTablePointer (),\r

            VariableNameSize,\r
            VariableName,\r
            VariableGuid\r
            VariableNameSize,\r
            VariableName,\r
            VariableGuid\r