removing the dependency on EDKDxeSalLib and EdxDxeRuntimeSalLib, instead using DxeExt...

[mirror_edk2.git] / EdkModulePkg / Library / EdkUefiRuntimeLib / Ipf / RuntimeLib.c

diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c
index 7ef24d4938211f0bc7dfcfd339205b87b9d4844e..65ec0a418b6ed2b13f8b1909ebd32c26def24112 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c
@@ -1,13 +1,13 @@
 /*++\r
 \r
-Copyright (c) 2006, 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
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2006, 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
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 Module Name:\r
 \r
@@ -38,10 +38,10 @@ Routine Description:
 Arguments:\r
 \r
   Event   - The Event that is being processed\r
-  \r
+\r
   Context - Event Context\r
 \r
-Returns: \r
+Returns:\r
 \r
   None\r
 \r
@@ -52,6 +52,7 @@ Returns:
   }\r
 }\r
 \r
+STATIC\r
 VOID\r
 EFIAPI\r
 RuntimeLibVirtualNotifyEvent (\r
@@ -63,16 +64,16 @@ RuntimeLibVirtualNotifyEvent (
 Routine Description:\r
 \r
   Fixup internal data so that EFI can be call in virtual mode.\r
-  Call the passed in Child Notify event and convert any pointers in \r
+  Call the passed in Child Notify event and convert any pointers in\r
   lib to virtual mode.\r
 \r
 Arguments:\r
 \r
   Event   - The Event that is being processed\r
-  \r
+\r
   Context - Event Context\r
 \r
-Returns: \r
+Returns:\r
 \r
   None\r
 \r
@@ -102,12 +103,12 @@ RuntimeDriverLibConstruct (
 \r
 Routine Description:\r
 \r
-  Intialize runtime Driver Lib if it has not yet been initialized. \r
+  Intialize runtime Driver Lib if it has not yet been initialized.\r
 \r
 Arguments:\r
 \r
   ImageHandle     - The firmware allocated handle for the EFI image.\r
-  \r
+\r
   SystemTable     - A pointer to the EFI System Table.\r
 \r
   GoVirtualChildEvent - Caller can register a virtual notification event.\r
@@ -127,8 +128,8 @@ Returns:
   //\r
   if (_gDriverSetVirtualAddressMapEvent[0] != NULL) {\r
     Status = gBS->CreateEvent (\r
-                    EFI_EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,\r
-                    EFI_TPL_NOTIFY,\r
+                    EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,\r
+                    TPL_NOTIFY,\r
                     RuntimeLibVirtualNotifyEvent,\r
                     NULL,\r
                     &mEfiVirtualNotifyEvent\r
@@ -142,21 +143,22 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 RuntimeDriverLibDeconstruct (\r
-  VOID\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 /*++\r
 \r
 Routine Description:\r
 \r
   This routine will free some resources which have been allocated in\r
-  EfiInitializeRuntimeDriverLib(). If a runtime driver exits with an error, \r
+  EfiInitializeRuntimeDriverLib(). If a runtime driver exits with an error,\r
   it must call this routine to free the allocated resource before the exiting.\r
 \r
 Arguments:\r
 \r
   None\r
 \r
-Returns: \r
+Returns:\r
 \r
   EFI_SUCCESS     - Shotdown the Runtime Driver Lib successfully\r
   EFI_UNSUPPORTED - Runtime Driver lib was not initialized at all\r
@@ -189,15 +191,18 @@ Routine Description:
 Arguments:\r
   NONE\r
 \r
-Returns: \r
+Returns:\r
   TRUE - If ExitBootService () has been called\r
 \r
 --*/\r
 {\r
-  EFI_GUID Guid = EFI_EXTENDED_SAL_VIRTUAL_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID Guid;\r
   SAL_RETURN_REGS ReturnReg;\r
 \r
-  ReturnReg = EfiCallEsalService (&Guid, IsEfiRuntime, 0, 0, 0, 0, 0, 0, 0);\r
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_VIRTUAL_SERVICES_PROTOCOL_GUID_LO;\r
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_VIRTUAL_SERVICES_PROTOCOL_GUID_HI;\r
+\r
+  ReturnReg = EsalCall (&Guid, IsEfiRuntime, 0, 0, 0, 0, 0, 0, 0);\r
 \r
   return (BOOLEAN) (ReturnReg.r9 == 1);\r
 }\r
@@ -215,15 +220,18 @@ Routine Description:
 Arguments:\r
   NONE\r
 \r
-Returns: \r
+Returns:\r
   TRUE - If SetVirtualAddressMap () has been called\r
 \r
 --*/\r
 {\r
-  EFI_GUID Guid = EFI_EXTENDED_SAL_VIRTUAL_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID Guid;\r
   SAL_RETURN_REGS ReturnReg;\r
 \r
-  ReturnReg = EfiCallEsalService (&Guid, IsVirtual, 0, 0, 0, 0, 0, 0, 0);\r
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_VIRTUAL_SERVICES_PROTOCOL_GUID_LO;\r
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_VIRTUAL_SERVICES_PROTOCOL_GUID_HI;\r
+\r
+  ReturnReg = EsalCall (&Guid, IsVirtual, 0, 0, 0, 0, 0, 0, 0);\r
 \r
   return (BOOLEAN) (ReturnReg.r9 == 1);\r
 }\r