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@6126 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Include/Library/PeiServicesTablePointerLib.h b/MdePkg/Include/Library/PeiServicesTablePointerLib.h
index 015d9723bee7653e14fb1e3f58b1dec6ff29c8ed..6fb87949f3093d4aa81ce741c4ec6a62753dabc1 100644 (file)
--- a/MdePkg/Include/Library/PeiServicesTablePointerLib.h
+++ b/MdePkg/Include/Library/PeiServicesTablePointerLib.h
@@ -1,7 +1,7 @@
 /** @file\r
   PEI Services Table Pointer Library services\r
 \r
-  Copyright (c) 2006, 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
@@ -24,7 +24,7 @@
   @retval  The pointer to PeiServices.\r
 \r
 **/\r
-EFI_PEI_SERVICES **\r
+CONST EFI_PEI_SERVICES **\r
 EFIAPI\r
 GetPeiServicesTablePointer (\r
   VOID\r

diff --git a/MdePkg/Library/PeiIoLibCpuIo/IoLib.c b/MdePkg/Library/PeiIoLibCpuIo/IoLib.c
index 066ceddbfb339b96c1476d4296bae87d4fa8bd08..5d94b56124a2dbc9c7bb3c7b9b30a7614b797a84 100644 (file)
--- a/MdePkg/Library/PeiIoLibCpuIo/IoLib.c
+++ b/MdePkg/Library/PeiIoLibCpuIo/IoLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   I/O Library. The implementations are based on EFI_PEI_SERVICE->CpuIo interface.\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
@@ -43,7 +43,7 @@ IoRead8 (
   CONST EFI_PEI_SERVICES            **PeiServices;\r
   EFI_PEI_CPU_IO_PPI                *CpuIo;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   CpuIo       = (*PeiServices)->CpuIo;\r
   ASSERT (CpuIo != NULL);\r
 \r
@@ -75,7 +75,7 @@ IoWrite8 (
   CONST EFI_PEI_SERVICES            **PeiServices;\r
   EFI_PEI_CPU_IO_PPI                *CpuIo;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   CpuIo       = (*PeiServices)->CpuIo;\r
   ASSERT (CpuIo != NULL);\r
 \r
@@ -106,7 +106,7 @@ IoRead16 (
   CONST EFI_PEI_SERVICES            **PeiServices;\r
   EFI_PEI_CPU_IO_PPI                *CpuIo;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   CpuIo       = (*PeiServices)->CpuIo;\r
   ASSERT (CpuIo != NULL);\r
   //\r
@@ -141,7 +141,7 @@ IoWrite16 (
   CONST EFI_PEI_SERVICES            **PeiServices;\r
   EFI_PEI_CPU_IO_PPI                *CpuIo;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   CpuIo       = (*PeiServices)->CpuIo;\r
   ASSERT (CpuIo != NULL);\r
   //\r
@@ -175,7 +175,7 @@ IoRead32 (
   CONST EFI_PEI_SERVICES            **PeiServices;\r
   EFI_PEI_CPU_IO_PPI                *CpuIo;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   CpuIo       = (*PeiServices)->CpuIo;\r
   ASSERT (CpuIo != NULL);\r
   //\r
@@ -210,7 +210,7 @@ IoWrite32 (
   CONST EFI_PEI_SERVICES            **PeiServices;\r
   EFI_PEI_CPU_IO_PPI                *CpuIo;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   CpuIo       = (*PeiServices)->CpuIo;\r
   ASSERT (CpuIo != NULL);\r
   //\r
@@ -244,7 +244,7 @@ IoRead64 (
   CONST EFI_PEI_SERVICES            **PeiServices;\r
   EFI_PEI_CPU_IO_PPI                *CpuIo;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   CpuIo       = (*PeiServices)->CpuIo;\r
   ASSERT (CpuIo != NULL);\r
   //\r
@@ -279,7 +279,7 @@ IoWrite64 (
   CONST EFI_PEI_SERVICES            **PeiServices;\r
   EFI_PEI_CPU_IO_PPI                *CpuIo;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   CpuIo       = (*PeiServices)->CpuIo;\r
   ASSERT (CpuIo != NULL);\r
   //\r
@@ -313,7 +313,7 @@ MmioRead8 (
   CONST EFI_PEI_SERVICES            **PeiServices;\r
   EFI_PEI_CPU_IO_PPI                *CpuIo;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   CpuIo       = (*PeiServices)->CpuIo;\r
   ASSERT (CpuIo != NULL);\r
 \r
@@ -344,7 +344,7 @@ MmioWrite8 (
   CONST EFI_PEI_SERVICES            **PeiServices;\r
   EFI_PEI_CPU_IO_PPI                *CpuIo;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   CpuIo       = (*PeiServices)->CpuIo;\r
   ASSERT (CpuIo != NULL);\r
 \r
@@ -375,7 +375,7 @@ MmioRead16 (
   CONST EFI_PEI_SERVICES            **PeiServices;\r
   EFI_PEI_CPU_IO_PPI                *CpuIo;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   CpuIo       = (*PeiServices)->CpuIo;\r
   ASSERT (CpuIo != NULL);\r
   //\r
@@ -411,7 +411,7 @@ MmioWrite16 (
   CONST EFI_PEI_SERVICES            **PeiServices;\r
   EFI_PEI_CPU_IO_PPI                *CpuIo;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   CpuIo       = (*PeiServices)->CpuIo;\r
   ASSERT (CpuIo != NULL);\r
   //\r
@@ -445,7 +445,7 @@ MmioRead32 (
   CONST EFI_PEI_SERVICES            **PeiServices;\r
   EFI_PEI_CPU_IO_PPI                *CpuIo;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   CpuIo       = (*PeiServices)->CpuIo;\r
   ASSERT (CpuIo != NULL);\r
   //\r
@@ -481,7 +481,7 @@ MmioWrite32 (
   CONST EFI_PEI_SERVICES            **PeiServices;\r
   EFI_PEI_CPU_IO_PPI                *CpuIo;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   CpuIo       = (*PeiServices)->CpuIo;\r
   ASSERT (CpuIo != NULL);\r
   //\r
@@ -515,7 +515,7 @@ MmioRead64 (
   CONST EFI_PEI_SERVICES            **PeiServices;\r
   EFI_PEI_CPU_IO_PPI                *CpuIo;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   CpuIo       = (*PeiServices)->CpuIo;\r
   ASSERT (CpuIo != NULL);\r
   //\r
@@ -550,7 +550,7 @@ MmioWrite64 (
   CONST EFI_PEI_SERVICES            **PeiServices;\r
   EFI_PEI_CPU_IO_PPI                *CpuIo;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   CpuIo       = (*PeiServices)->CpuIo;\r
   ASSERT (CpuIo != NULL);\r
   //\r

diff --git a/MdePkg/Library/PeiPalCallLib/PalCallLib.c b/MdePkg/Library/PeiPalCallLib/PalCallLib.c
index aa423c94bd73e0cc235f4979fb821d8fe50883a2..07f9f38ad0cd642abd0fa5884549fb4bbff0fe35 100644 (file)
--- a/MdePkg/Library/PeiPalCallLib/PalCallLib.c
+++ b/MdePkg/Library/PeiPalCallLib/PalCallLib.c
@@ -70,7 +70,7 @@ PalCall (
   //\r
   // Get PEI Service Table Pointer\r
   //\r
-  PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
 \r
   //\r
   // Locate SEC Platform Information PPI\r

diff --git a/MdePkg/Library/PeiServicesLib/PeiServicesLib.c b/MdePkg/Library/PeiServicesLib/PeiServicesLib.c
index 0d495601f14d735b5f270055c950bab0efd2352d..c525195877fe4470579100441dfe3a2ff970a517 100644 (file)
--- a/MdePkg/Library/PeiServicesLib/PeiServicesLib.c
+++ b/MdePkg/Library/PeiServicesLib/PeiServicesLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation for PEI Services Library.\r
 \r
-  Copyright (c) 2006 - 2007, 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
@@ -39,7 +39,7 @@ PeiServicesInstallPpi (
 {\r
   CONST EFI_PEI_SERVICES  **PeiServices;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   return (*PeiServices)->InstallPpi (PeiServices, PpiList);\r
 }\r
 \r
@@ -67,7 +67,7 @@ PeiServicesReInstallPpi (
 {\r
   CONST EFI_PEI_SERVICES **PeiServices;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   return (*PeiServices)->ReInstallPpi (PeiServices, OldPpi, NewPpi);\r
 }\r
 \r
@@ -95,7 +95,7 @@ PeiServicesLocatePpi (
 {\r
   CONST EFI_PEI_SERVICES **PeiServices;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   return (*PeiServices)->LocatePpi (PeiServices, Guid, Instance, PpiDescriptor, Ppi);\r
 }\r
 \r
@@ -121,7 +121,7 @@ PeiServicesNotifyPpi (
 {\r
   CONST EFI_PEI_SERVICES **PeiServices;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   return (*PeiServices)->NotifyPpi (PeiServices, NotifyList);\r
 }\r
 \r
@@ -142,7 +142,7 @@ PeiServicesGetBootMode (
 {\r
   CONST EFI_PEI_SERVICES **PeiServices;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   return (*PeiServices)->GetBootMode (PeiServices, BootMode);\r
 }\r
 \r
@@ -162,7 +162,7 @@ PeiServicesSetBootMode (
 {\r
   CONST EFI_PEI_SERVICES **PeiServices;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   return (*PeiServices)->SetBootMode (PeiServices, BootMode);\r
 }\r
 \r
@@ -183,7 +183,7 @@ PeiServicesGetHobList (
 {\r
   CONST EFI_PEI_SERVICES **PeiServices;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   return (*PeiServices)->GetHobList (PeiServices, HobList);\r
 }\r
 \r
@@ -208,7 +208,7 @@ PeiServicesCreateHob (
 {\r
   CONST EFI_PEI_SERVICES **PeiServices;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   return (*PeiServices)->CreateHob (PeiServices, Type, Length, Hob);\r
 }\r
 \r
@@ -233,7 +233,7 @@ PeiServicesFfsFindNextVolume (
 {\r
   CONST EFI_PEI_SERVICES **PeiServices;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   return (*PeiServices)->FfsFindNextVolume (PeiServices, Instance, VolumeHandle);\r
 }\r
 \r
@@ -260,7 +260,7 @@ PeiServicesFfsFindNextFile (
 {\r
   CONST EFI_PEI_SERVICES **PeiServices;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   return (*PeiServices)->FfsFindNextFile (PeiServices, SearchType, VolumeHandle, FileHandle);\r
 }\r
 \r
@@ -286,7 +286,7 @@ PeiServicesFfsFindSectionData (
 {\r
   CONST EFI_PEI_SERVICES **PeiServices;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   return (*PeiServices)->FfsFindSectionData (PeiServices, SectionType, FfsFileHeader, SectionData);\r
 }\r
 \r
@@ -311,7 +311,7 @@ PeiServicesInstallPeiMemory (
 {\r
   CONST EFI_PEI_SERVICES **PeiServices;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   return (*PeiServices)->InstallPeiMemory (PeiServices, MemoryBegin, MemoryLength);\r
 }\r
 \r
@@ -339,7 +339,7 @@ PeiServicesAllocatePages (
 {\r
   CONST EFI_PEI_SERVICES **PeiServices;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   return (*PeiServices)->AllocatePages (PeiServices, MemoryType, Pages, Memory);\r
 }\r
 \r
@@ -363,7 +363,7 @@ PeiServicesAllocatePool (
 {\r
   CONST EFI_PEI_SERVICES **PeiServices;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   return (*PeiServices)->AllocatePool (PeiServices, Size, Buffer);\r
 }\r
 \r
@@ -384,7 +384,7 @@ PeiServicesResetSystem (
 {\r
   CONST EFI_PEI_SERVICES **PeiServices;\r
 \r
-  PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
+  PeiServices = GetPeiServicesTablePointer ();\r
   return (*PeiServices)->ResetSystem (PeiServices);\r
 }\r
 \r
@@ -411,7 +411,7 @@ PeiServicesRegisterForShadow (
   IN  EFI_PEI_FILE_HANDLE FileHandle\r
   )\r
 {\r
-  EFI_PEI_SERVICES **PeiServices;\r
+  CONST EFI_PEI_SERVICES **PeiServices;\r
 \r
   PeiServices = GetPeiServicesTablePointer ();\r
   return (*PeiServices)->RegisterForShadow (FileHandle);\r
@@ -442,7 +442,7 @@ PeiServicesFfsGetFileInfo (
   OUT EFI_FV_FILE_INFO            *FileInfo\r
   )\r
 {\r
-  EFI_PEI_SERVICES **PeiServices;\r
+  CONST EFI_PEI_SERVICES **PeiServices;\r
 \r
   PeiServices = GetPeiServicesTablePointer ();\r
   return (*PeiServices)->FfsGetFileInfo (FileHandle, FileInfo);\r

diff --git a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
index b601545b8caa7c2f65e88f87f801925954359926..fd5bbe7192e2f9c81cb57cc627e5b25e7aa90974 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
+++ b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
@@ -4,7 +4,7 @@
   This library is used for PEIM which does executed from flash device directly but\r
   executed in memory.\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
@@ -44,13 +44,13 @@ SetPeiServicesTablePointer (
   @retval  The pointer to PeiServices.\r
 \r
 **/\r
-EFI_PEI_SERVICES **\r
+CONST EFI_PEI_SERVICES **\r
 GetPeiServicesTablePointer (\r
   VOID\r
   )\r
 {\r
   ASSERT (gPeiServices != NULL);\r
-  return gPeiServices;\r
+  return (CONST EFI_PEI_SERVICES **) gPeiServices;\r
 }\r
 \r
 \r

diff --git a/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointer.c
index ba2f9d6cad6aa9af7bb8f19e89f2e79909e6e305..bf331bc87edf40db907f26daf7f6d80320817f08 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointer.c
+++ b/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointer.c
@@ -34,17 +34,17 @@
   @return  The pointer to PeiServices.\r
 \r
 **/\r
-EFI_PEI_SERVICES **\r
+CONST EFI_PEI_SERVICES **\r
 EFIAPI\r
 GetPeiServicesTablePointer (\r
   VOID\r
   )\r
 {\r
-  EFI_PEI_SERVICES  **PeiServices;\r
+  CONST EFI_PEI_SERVICES  **PeiServices;\r
   IA32_DESCRIPTOR   Idtr;\r
   \r
   AsmReadIdtr (&Idtr);\r
-  PeiServices = (EFI_PEI_SERVICES **) (*(UINTN*)(Idtr.Base - sizeof (UINTN)));\r
+  PeiServices = (CONST EFI_PEI_SERVICES **) (*(UINTN*)(Idtr.Base - sizeof (UINTN)));\r
   ASSERT (PeiServices != NULL);\r
   return PeiServices;\r
 }\r

diff --git a/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointer.c
index 1939de8ce26686033ef8434c9df906d2849b48f3..8601c7326c1c0f45eb5e88035b34df08315df3a8 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointer.c
+++ b/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointer.c
@@ -26,15 +26,15 @@
   @return  The pointer to PeiServices.\r
 \r
 **/\r
-EFI_PEI_SERVICES **\r
+CONST EFI_PEI_SERVICES **\r
 EFIAPI\r
 GetPeiServicesTablePointer (\r
   VOID\r
   )\r
 {\r
-  EFI_PEI_SERVICES  **PeiServices;\r
+  CONST EFI_PEI_SERVICES  **PeiServices;\r
 \r
-  PeiServices = (EFI_PEI_SERVICES **)(UINTN)AsmReadKr7 ();\r
+  PeiServices = (CONST EFI_PEI_SERVICES **)(UINTN)AsmReadKr7 ();\r
   ASSERT (PeiServices != NULL);\r
   return PeiServices;\r
 }\r