Update RuntimeLib.

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

diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeLib.c b/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeLib.c
index d80a71cda204f40a1543ee759821d8d2604ee245..12f06e1324159e97301c19e83064962916cc108d 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeLib.c
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeLib.c
@@ -13,10 +13,6 @@ Module Name:
 \r
     RuntimeLib.c\r
 \r
-Abstract:\r
-\r
-  Light weight lib to support Tiano drivers.\r
-\r
 --*/\r
 \r
 #include <RuntimeLibInternal.h>\r
@@ -24,13 +20,15 @@ Abstract:
 //\r
 // Driver Lib Module Globals\r
 //\r
-STATIC EFI_EVENT            mRuntimeNotifyEvent;\r
-STATIC EFI_EVENT            mEfiVirtualNotifyEvent;\r
-STATIC BOOLEAN              mEfiGoneVirtual         = FALSE;\r
-STATIC BOOLEAN              mEfiAtRuntime           = FALSE;\r
 \r
-EFI_RUNTIME_SERVICES        *mRT                    = NULL;\r
+STATIC EFI_EVENT              mRuntimeNotifyEvent;\r
+STATIC EFI_EVENT              mEfiVirtualNotifyEvent;\r
+STATIC BOOLEAN                mEfiGoneVirtual         = FALSE;\r
+STATIC BOOLEAN                mEfiAtRuntime           = FALSE;\r
 \r
+EFI_RUNTIME_SERVICES          *mRT;\r
+\r
+STATIC\r
 VOID\r
 EFIAPI\r
 RuntimeDriverExitBootServices (\r
@@ -65,6 +63,11 @@ Returns:
     ChildNotifyEventHandler (Event, NULL);\r
   }\r
 \r
+  //\r
+  // Clear out BootService globals\r
+  //\r
+  gBS             = NULL;\r
+\r
   mEfiAtRuntime = TRUE;\r
 }\r
 \r
@@ -108,13 +111,8 @@ Returns:
   //\r
   // Update global for Runtime Services Table and IO\r
   //\r
-  EfiConvertInternalPointer ((VOID **) &mRT);\r
+  EfiConvertPointer (0, (VOID **) &mRT);\r
 \r
-  //\r
-  // Clear out BootService globals\r
-  //\r
-  gBS             = NULL;\r
-  gST             = NULL;\r
   mEfiGoneVirtual = TRUE;\r
 }\r
 \r
@@ -219,6 +217,7 @@ Returns:
 }\r
 \r
 BOOLEAN\r
+EFIAPI\r
 EfiAtRuntime (\r
   VOID\r
   )\r
@@ -239,6 +238,7 @@ Returns:
 }\r
 \r
 BOOLEAN\r
+EFIAPI\r
 EfiGoneVirtual (\r
   VOID\r
   )\r

diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeService.c b/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeService.c
index 971dcdbf894cc7d169ae33a0dc04c6f8d5eddc50..69c980b1592dfc50c3ff01a967813b569d786e39 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeService.c
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeService.c
@@ -13,15 +13,12 @@ Module Name:
 \r
     RuntimeService.c\r
 \r
-Abstract:\r
-\r
-  Light weight lib to support Tiano drivers.\r
-\r
 --*/\r
 \r
 #include <RuntimeLibInternal.h>\r
 \r
 VOID\r
+EFIAPI\r
 EfiResetSystem (\r
   IN EFI_RESET_TYPE               ResetType,\r
   IN EFI_STATUS                   ResetStatus,\r
@@ -56,6 +53,7 @@ Returns:
 // runtime service in the EFI system table.\r
 //\r
 EFI_STATUS\r
+EFIAPI\r
 EfiGetTime (\r
   OUT EFI_TIME                    *Time,\r
   OUT EFI_TIME_CAPABILITIES       *Capabilities\r
@@ -83,6 +81,7 @@ Returns:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiSetTime (\r
   IN EFI_TIME                   *Time\r
   )\r
@@ -106,6 +105,7 @@ Returns:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiGetWakeupTime (\r
   OUT BOOLEAN                     *Enabled,\r
   OUT BOOLEAN                     *Pending,\r
@@ -133,6 +133,7 @@ Returns:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiSetWakeupTime (\r
   IN BOOLEAN                      Enable,\r
   IN EFI_TIME                     *Time\r
@@ -162,6 +163,7 @@ Returns:
 \r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiGetVariable (\r
   IN CHAR16                       *VariableName,\r
   IN EFI_GUID                     * VendorGuid,\r
@@ -196,6 +198,7 @@ Returns:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiGetNextVariableName (\r
   IN OUT UINTN                    *VariableNameSize,\r
   IN OUT CHAR16                   *VariableName,\r
@@ -228,6 +231,7 @@ Returns:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiSetVariable (\r
   IN CHAR16                       *VariableName,\r
   IN EFI_GUID                     *VendorGuid,\r
@@ -260,6 +264,7 @@ Returns:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiGetNextHighMonotonicCount (\r
   OUT UINT32                      *HighCount\r
   )\r
@@ -283,6 +288,7 @@ Returns:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiConvertPointer (\r
   IN UINTN                  DebugDisposition,\r
   IN OUT VOID               *Address\r
@@ -309,30 +315,7 @@ Returns:
 }\r
 \r
 EFI_STATUS\r
-EfiConvertInternalPointer (\r
-  IN OUT VOID                  *Address\r
-  )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Call EfiConvertPointer() to convert internal pointer.\r
-\r
-Arguments:\r
-\r
-  Address - A pointer to a pointer that is to be fixed to be the value needed\r
-            for the new virtual address mappings being applied.\r
-\r
-Returns:\r
-\r
-  Status code\r
-\r
---*/\r
-{\r
-  return EfiConvertPointer (0x0, Address);\r
-}\r
-\r
-EFI_STATUS\r
+EFIAPI\r
 EfiConvertList (\r
   IN UINTN                DebugDisposition,\r
   IN OUT LIST_ENTRY       *ListHead\r
@@ -421,6 +404,7 @@ EfiSetVirtualAddressMap (
 \r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiUpdateCapsule (\r
   IN UEFI_CAPSULE_HEADER       **CapsuleHeaderArray,\r
   IN UINTN                                 CapsuleCount,\r
@@ -439,6 +423,7 @@ EfiUpdateCapsule (
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiQueryCapsuleCapabilities (\r
   IN UEFI_CAPSULE_HEADER       **CapsuleHeaderArray,\r
   IN UINTN                                 CapsuleCount,\r
@@ -460,6 +445,7 @@ EfiQueryCapsuleCapabilities (
 \r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiQueryVariableInfo (\r
   IN UINT32                      Attributes,\r
   OUT UINT64                   *MaximumVariableStorageSize,\r

diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c
index d0f0d6012bd0d9bf9e1e826cf965bd67206506d4..6399f67213223c2019b29696d99d95c0e4ee6b30 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c
@@ -13,10 +13,6 @@ Module Name:
 \r
     RuntimeLib.c\r
 \r
-Abstract:\r
-\r
-  Light weight lib to support Tiano drivers.\r
-\r
 --*/\r
 \r
 #include <SalApi.h>\r
@@ -26,13 +22,12 @@ Abstract:
 // Driver Lib Module Globals\r
 //\r
 \r
-STATIC EFI_EVENT            mRuntimeNotifyEvent;\r
-STATIC EFI_EVENT            mEfiVirtualNotifyEvent;\r
-\r
-STATIC EFI_PLABEL           mPlabel;\r
+STATIC EFI_EVENT                          mRuntimeNotifyEvent;\r
+STATIC EFI_EVENT                          mEfiVirtualNotifyEvent;\r
+STATIC EFI_PLABEL                         mPlabel;\r
 STATIC EXTENDED_SAL_BOOT_SERVICE_PROTOCOL *mEsalBootService;\r
 \r
-EFI_RUNTIME_SERVICES        *mRT                    = NULL;\r
+EFI_RUNTIME_SERVICES                      *mRT;\r
 \r
 STATIC\r
 VOID\r
@@ -66,6 +61,11 @@ Returns:
     ChildNotifyEventHandler = _gDriverExitBootServicesEvent[Index];\r
     ChildNotifyEventHandler (Event, NULL);\r
   }\r
+\r
+  //\r
+  // Clear out BootService globals\r
+  //\r
+  gBS             = NULL;\r
 }\r
 \r
 STATIC\r
@@ -107,13 +107,6 @@ Returns:
   mRT->ConvertPointer (EFI_IPF_GP_POINTER, (VOID **) &mPlabel.GP);\r
 \r
   SetEsalVirtualEntryPoint (mPlabel.EntryPoint, mPlabel.GP);\r
-\r
-  //\r
-  // Clear out BootService globals\r
-  //\r
-  gBS             = NULL;\r
-  gST             = NULL;\r
-  mRT             = NULL;\r
 }\r
 \r
 EFI_STATUS\r
@@ -236,6 +229,7 @@ Returns:
 }\r
 \r
 BOOLEAN\r
+EFIAPI\r
 EfiAtRuntime (\r
   VOID\r
   )\r
@@ -261,6 +255,7 @@ Returns:
 }\r
 \r
 BOOLEAN\r
+EFIAPI\r
 EfiGoneVirtual (\r
   VOID\r
   )\r
@@ -284,3 +279,4 @@ Returns:
 \r
   return (BOOLEAN) (ReturnReg.r9 == 1);\r
 }\r
+\r

diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c
index bc7a31841b029cc504ddd849b7c8ac5375f6bee0..2e8794068abb3b3b5fc4b555a36e72c544537e7d 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c
@@ -13,15 +13,12 @@ Module Name:
 \r
     RuntimeService.c\r
 \r
-Abstract:\r
-\r
-  Light weight lib to support Tiano drivers.\r
-\r
 --*/\r
 \r
 #include <RuntimeLibInternal.h>\r
 \r
 VOID\r
+EFIAPI\r
 EfiResetSystem (\r
   IN EFI_RESET_TYPE               ResetType,\r
   IN EFI_STATUS                   ResetStatus,\r
@@ -69,6 +66,7 @@ Returns:
 // runtime service in the EFI system table.\r
 //\r
 EFI_STATUS\r
+EFIAPI\r
 EfiGetTime (\r
   OUT EFI_TIME                    *Time,\r
   OUT EFI_TIME_CAPABILITIES       *Capabilities\r
@@ -100,6 +98,7 @@ Returns:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiSetTime (\r
   IN EFI_TIME                   *Time\r
   )\r
@@ -128,6 +127,7 @@ Returns:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiGetWakeupTime (\r
   OUT BOOLEAN                     *Enabled,\r
   OUT BOOLEAN                     *Pending,\r
@@ -160,6 +160,7 @@ Returns:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiSetWakeupTime (\r
   IN BOOLEAN                      Enable,\r
   IN EFI_TIME                     *Time\r
@@ -191,6 +192,7 @@ Returns:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiGetVariable (\r
   IN CHAR16                       *VariableName,\r
   IN EFI_GUID                     * VendorGuid,\r
@@ -239,6 +241,7 @@ Returns:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiGetNextVariableName (\r
   IN OUT UINTN                    *VariableNameSize,\r
   IN OUT CHAR16                   *VariableName,\r
@@ -285,6 +288,7 @@ Returns:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiSetVariable (\r
   IN CHAR16                       *VariableName,\r
   IN EFI_GUID                     *VendorGuid,\r
@@ -331,6 +335,7 @@ Returns:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiGetNextHighMonotonicCount (\r
   OUT UINT32                      *HighCount\r
   )\r
@@ -359,6 +364,7 @@ Returns:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiConvertPointer (\r
   IN UINTN                  DebugDisposition,\r
   IN OUT VOID               *Address\r
@@ -385,6 +391,7 @@ Returns:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiConvertList (\r
   IN UINTN                DebugDisposition,\r
   IN OUT LIST_ENTRY       *ListHead\r
@@ -483,6 +490,7 @@ EfiSetVirtualAddressMap (
 \r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiUpdateCapsule (\r
   IN UEFI_CAPSULE_HEADER       **CapsuleHeaderArray,\r
   IN UINTN                                 CapsuleCount,\r
@@ -493,6 +501,7 @@ EfiUpdateCapsule (
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiQueryCapsuleCapabilities (\r
   IN UEFI_CAPSULE_HEADER       **CapsuleHeaderArray,\r
   IN UINTN                                 CapsuleCount,\r
@@ -505,6 +514,7 @@ EfiQueryCapsuleCapabilities (
 \r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiQueryVariableInfo (\r
   IN UINT32                      Attributes,\r
   OUT UINT64                   *MaximumVariableStorageSize,\r

diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/RuntimeLibInternal.h b/EdkModulePkg/Library/EdkUefiRuntimeLib/RuntimeLibInternal.h
index 82494fd7a01525f459587ff4fb988dd28ac2858a..223ad40f9df0a5a93a47bedcfe1f4826a2c724f0 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/RuntimeLibInternal.h
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/RuntimeLibInternal.h
@@ -20,11 +20,6 @@ Abstract:
 #ifndef __RUNTIMELIBINTERNAL_H__\r
 #define __RUNTIMELIBINTERNAL_H__\r
 \r
-EFI_STATUS\r
-EfiConvertInternalPointer (\r
-  IN OUT VOID                  *Address\r
-  );\r
-\r
 extern EFI_RUNTIME_SERVICES   *mRT;\r
 \r
 #endif //__RUNTIMELIBINTERNAL_H__\r