1) Update SetPeiServicesTablePointer's prototype add CONST modifier.

2) Move STRING_REF from MdePkg/Include/Uefi/UefiBaseType.h to IntelFramework/Include/Protocol/FrameworkHii.h.
3) Move RELOFST from MdePkg/Include/Uefi/UefiInternalFormRepresentation.h to IntelFramework/Include/Protocol/FrameworkHii.h.

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

diff --git a/MdePkg/Include/Library/PeiServicesTablePointerLib.h b/MdePkg/Include/Library/PeiServicesTablePointerLib.h
index 6fb87949f3093d4aa81ce741c4ec6a62753dabc1..1637e670d206072f3d5a6a2c01e05b7038e2dfb2 100644 (file)
--- a/MdePkg/Include/Library/PeiServicesTablePointerLib.h
+++ b/MdePkg/Include/Library/PeiServicesTablePointerLib.h
@@ -39,7 +39,7 @@ GetPeiServicesTablePointer (
 VOID\r
 EFIAPI\r
 SetPeiServicesTablePointer (\r
-  IN EFI_PEI_SERVICES ** PeiServicesTablePointer\r
+  IN CONST EFI_PEI_SERVICES ** PeiServicesTablePointer\r
   );\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Uefi/UefiBaseType.h b/MdePkg/Include/Uefi/UefiBaseType.h
index 0d681a3a4d954cfeba3200d76e2944c2a4fb703a..fff78a80e5eba3106942aa80be1fd40fc3aa8268 100644 (file)
--- a/MdePkg/Include/Uefi/UefiBaseType.h
+++ b/MdePkg/Include/Uefi/UefiBaseType.h
@@ -48,8 +48,6 @@ typedef UINT64                    EFI_LBA;
 typedef UINT64                    EFI_PHYSICAL_ADDRESS;\r
 typedef UINT64                    EFI_VIRTUAL_ADDRESS;\r
 \r
-typedef UINT16                    STRING_REF;\r
-\r
 ///\r
 /// EFI Time Abstraction:\r
 ///  Year:       1998 - 20XX\r

diff --git a/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h b/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h
index 2364d11422339b9285a2055117b12a80310353a3..9c0f2a2f7de81598be4b15381c661dc507be9d8b 100644 (file)
--- a/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h
+++ b/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h
@@ -23,8 +23,6 @@
 ///\r
 /// The following types are currently defined:\r
 ///\r
-typedef UINT32  RELOFST;\r
-\r
 typedef VOID*   EFI_HII_HANDLE;\r
 typedef CHAR16* EFI_STRING;\r
 typedef UINT16  EFI_IMAGE_ID;\r

diff --git a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
index 3dcbd2ae5a892fe791468401365a6e4ecd5438e0..fc045aeec04c1bb2eb87ea8f72fe1f0e6e27c30e 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
+++ b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
@@ -19,7 +19,7 @@
 #include <Library/PeiServicesTablePointerLib.h>\r
 #include <Library/DebugLib.h>\r
 \r
-STATIC EFI_PEI_SERVICES  **gPeiServices;\r
+STATIC CONST EFI_PEI_SERVICES  **gPeiServices;\r
 \r
 /**\r
   The function cache the pointer of PEI services to global variable.\r
@@ -29,7 +29,7 @@ STATIC EFI_PEI_SERVICES  **gPeiServices;
 VOID\r
 EFIAPI\r
 SetPeiServicesTablePointer (\r
-  IN EFI_PEI_SERVICES  ** PeiServicesTablePointer\r
+  IN CONST EFI_PEI_SERVICES  ** PeiServicesTablePointer\r
   )\r
 {\r
   gPeiServices = PeiServicesTablePointer;\r
@@ -51,7 +51,7 @@ GetPeiServicesTablePointer (
   )\r
 {\r
   ASSERT (gPeiServices != NULL);\r
-  return (CONST EFI_PEI_SERVICES **) gPeiServices;\r
+  return gPeiServices;\r
 }\r
 \r
 \r
@@ -70,8 +70,8 @@ GetPeiServicesTablePointer (
 EFI_STATUS\r
 EFIAPI\r
 PeiServicesTablePointerLibConstructor (\r
-  IN EFI_PEI_FILE_HANDLE  FileHandle,\r
-  IN EFI_PEI_SERVICES     **PeiServices\r
+  IN EFI_PEI_FILE_HANDLE        FileHandle,\r
+  IN CONST EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r
   gPeiServices = PeiServices;\r

diff --git a/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointer.c
index bf331bc87edf40db907f26daf7f6d80320817f08..11af09a040797d3bcf18bc5ca06b5cbc34e932c7 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointer.c
+++ b/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointer.c
@@ -65,7 +65,7 @@ GetPeiServicesTablePointer (
 VOID\r
 EFIAPI\r
 SetPeiServicesTablePointer (\r
-  IN EFI_PEI_SERVICES ** PeiServicesTablePointer\r
+  IN CONST EFI_PEI_SERVICES ** PeiServicesTablePointer\r
   )\r
 {\r
   IA32_DESCRIPTOR   Idtr;\r

diff --git a/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointer.c
index 1c21263735041f8312e4d67f1efd1790048bfd06..ebfec4be6c74f93c1ae503d78e3fffd298b742b2 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointer.c
+++ b/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointer.c
@@ -48,7 +48,7 @@ GetPeiServicesTablePointer (
 VOID\r
 EFIAPI\r
 SetPeiServicesTablePointer (\r
-  IN EFI_PEI_SERVICES ** PeiServicesTablePointer\r
+  IN CONST EFI_PEI_SERVICES ** PeiServicesTablePointer\r
   )\r
 {\r
   AsmWriteKr7 ((UINT64)(UINTN)PeiServicesTablePointer);\r