Change EfiConvertPointer() and EfiSetVirtualAddressMap() to use gRT instead of mRT...

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

diff --git a/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c b/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
index 2b0155e6911ce3a01c5f4d460ec63069726931ba..39be3cb0cfe53000851d5a18bd002c1b46f48637 100644 (file)
--- a/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
+++ b/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
@@ -87,8 +87,7 @@ RuntimeDriverLibConstruct (
 {\r
   EFI_STATUS  Status;\r
 \r
-  ASSERT (SystemTable != NULL);\r
-  mRT = SystemTable->RuntimeServices;\r
+  mRT = gRT;\r
   ASSERT (mRT != NULL);\r
   \r
   //\r

diff --git a/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h b/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h
index e9b4c9d764a1ce69d938ba20ea6b1c81915423bb..66157feed783db7586fe6ab8c9a3d01524990580 100644 (file)
--- a/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h
+++ b/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h
@@ -19,6 +19,7 @@
 #include <Library/UefiRuntimeLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/UefiRuntimeServicesTableLib.h>\r
 \r
 extern EFI_RUNTIME_SERVICES   *mRT;\r
 \r

diff --git a/MdePkg/Library/UefiRuntimeLib/RuntimeService.c b/MdePkg/Library/UefiRuntimeLib/RuntimeService.c
index 48db6bdcc80e198e787f17eee29479d46679ced7..34e473810288dfb4489a094f43af304a09986f49 100644 (file)
--- a/MdePkg/Library/UefiRuntimeLib/RuntimeService.c
+++ b/MdePkg/Library/UefiRuntimeLib/RuntimeService.c
@@ -258,7 +258,7 @@ EfiConvertPointer (
   IN OUT VOID               **Address\r
   )\r
 {\r
-  return mRT->ConvertPointer (DebugDisposition, Address);\r
+  return gRT->ConvertPointer (DebugDisposition, Address);\r
 }\r
 \r
 \r
@@ -335,7 +335,7 @@ EfiSetVirtualAddressMap (
   IN CONST EFI_MEMORY_DESCRIPTOR    *VirtualMap\r
   )\r
 {\r
-  return mRT->SetVirtualAddressMap (\r
+  return gRT->SetVirtualAddressMap (\r
                 MemoryMapSize,\r
                 DescriptorSize,\r
                 DescriptorVersion,\r

diff --git a/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf b/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
index de4dd1235a5079215a30f888b5c6ebb6ce3e719e..ae464fa6932fa5e06f94697b5ac72d9d88646629 100644 (file)
--- a/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
+++ b/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
@@ -29,36 +29,21 @@
   DESTRUCTOR                     = RuntimeDriverLibDeconstruct\r
 \r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 \r
 \r
 [Sources.common]\r
   RuntimeLibInternal.h\r
-\r
-[Sources.Ia32]\r
-  RuntimeService.c\r
-  RuntimeLib.c\r
-\r
-[Sources.X64]\r
-  RuntimeService.c\r
-  RuntimeLib.c\r
-\r
-[Sources.EBC]\r
   RuntimeService.c\r
   RuntimeLib.c\r
 \r
-\r
-\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r
-[Packages.IPF]\r
-  MdePkg/MdePkg.dec\r
-\r
-\r
 [LibraryClasses]\r
   UefiBootServicesTableLib\r
+  UefiRuntimeServicesTableLib\r
   DebugLib\r
 \r
 \r