]> git.proxmox.com Git - mirror_edk2.git/blobdiff - EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c
projects / mirror_edk2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
changed the guid assignment from constant array to hi and low UINT64s (Intel compiler...
[mirror_edk2.git] / EdkModulePkg / Library / EdkUefiRuntimeLib / Ipf / RuntimeService.c
diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c
index bc7a31841b029cc504ddd849b7c8ac5375f6bee0..0760bfa074e7aa26cbd60ac05fc46e3a324cf483 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
@@ -48,7 +45,10 @@ Returns:
 \r
 --*/\r
 {\r
-  EFI_GUID Guid = EFI_EXTENDED_SAL_RESET_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID Guid;\r
+\r
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_RESET_SERVICES_PROTOCOL_GUID_LO;\r
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_RESET_SERVICES_PROTOCOL_GUID_HI;\r
 \r
   EfiCallEsalService (\r
     &Guid,\r
@@ -69,6 +69,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,7 +84,7 @@ Routine Description:
 Arguments:\r
 \r
   Time          - A pointer to storage to receive a snapshot of the current time.\r
-  Capabilities  - An optional pointer to a buffer to receive the real time clock device¡¯s\r
+  Capabilities  - An optional pointer to a buffer to receive the real time clock device's\r
                   capabilities.\r
 \r
 Returns:\r
@@ -93,13 +94,17 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
-  EFI_GUID Guid = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID        Guid;\r
+\r
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_LO;\r
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_HI;\r
 \r
   ReturnReg = EfiCallEsalService (&Guid, GetTime, (UINT64) Time, (UINT64) Capabilities, 0, 0, 0, 0, 0);\r
   return ReturnReg.Status;\r
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiSetTime (\r
   IN EFI_TIME                   *Time\r
   )\r
@@ -120,14 +125,17 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
+  EFI_GUID        Guid;\r
 \r
-  EFI_GUID Guid = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID;\r
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_LO;\r
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_HI;\r
 \r
   ReturnReg = EfiCallEsalService (&Guid, SetTime, (UINT64) Time, 0, 0, 0, 0, 0, 0);\r
   return ReturnReg.Status;\r
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiGetWakeupTime (\r
   OUT BOOLEAN                     *Enabled,\r
   OUT BOOLEAN                     *Pending,\r
@@ -152,14 +160,17 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
+  EFI_GUID        Guid;\r
 \r
-  EFI_GUID Guid = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID;\r
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_LO;\r
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_HI;\r
 \r
   ReturnReg = EfiCallEsalService (&Guid, GetWakeupTime, (UINT64) Enabled, (UINT64) Pending, (UINT64) Time, 0, 0, 0, 0);\r
   return ReturnReg.Status;\r
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiSetWakeupTime (\r
   IN BOOLEAN                      Enable,\r
   IN EFI_TIME                     *Time\r
@@ -183,14 +194,17 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
+  EFI_GUID        Guid;\r
 \r
-  EFI_GUID Guid = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID;\r
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_LO;\r
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_HI;\r
 \r
   ReturnReg = EfiCallEsalService (&Guid, SetWakeupTime, (UINT64) Enable, (UINT64) Time, 0, 0, 0, 0, 0);\r
   return ReturnReg.Status;\r
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiGetVariable (\r
   IN CHAR16                       *VariableName,\r
   IN EFI_GUID                     * VendorGuid,\r
@@ -207,7 +221,7 @@ Routine Description:
 Arguments:\r
 \r
   VariableName  - A Null-terminated Unicode string that is the name of the\r
-                  vendor¡¯s variable.\r
+                  vendor's variable.\r
   VendorGuid    - A unique identifier for the vendor.\r
   Attributes    - If not NULL, a pointer to the memory location to return the\r
                   attributes bitmask for the variable.\r
@@ -222,7 +236,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
-  EFI_GUID Guid = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID        Guid;\r
+\r
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_LO;\r
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_HI;\r
 \r
   ReturnReg = EfiCallEsalService (\r
                 &Guid,\r
@@ -239,6 +256,7 @@ Returns:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiGetNextVariableName (\r
   IN OUT UINTN                    *VariableNameSize,\r
   IN OUT CHAR16                   *VariableName,\r
@@ -268,7 +286,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
-  EFI_GUID Guid = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID        Guid;\r
+\r
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_LO;\r
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_HI;\r
 \r
   ReturnReg = EfiCallEsalService (\r
                 &Guid,\r
@@ -285,6 +306,7 @@ Returns:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiSetVariable (\r
   IN CHAR16                       *VariableName,\r
   IN EFI_GUID                     *VendorGuid,\r
@@ -301,7 +323,7 @@ Routine Description:
 Arguments:\r
 \r
   VariableName  - A Null-terminated Unicode string that is the name of the\r
-                  vendor¡¯s variable.\r
+                  vendor's variable.\r
   VendorGuid    - A unique identifier for the vendor.\r
   Attributes    - Attributes bitmask to set for the variable.\r
   DataSize      - The size in bytes of the Data buffer.\r
@@ -314,7 +336,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
-  EFI_GUID Guid = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID        Guid;\r
+\r
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_LO;\r
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_HI;\r
 \r
   ReturnReg = EfiCallEsalService (\r
                 &Guid,\r
@@ -331,6 +356,7 @@ Returns:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiGetNextHighMonotonicCount (\r
   OUT UINT32                      *HighCount\r
   )\r
@@ -338,7 +364,7 @@ EfiGetNextHighMonotonicCount (
 \r
 Routine Description:\r
 \r
-  Returns the next high 32 bits of the platform¡¯s monotonic counter.\r
+  Returns the next high 32 bits of the platform's monotonic counter.\r
 \r
 Arguments:\r
 \r
@@ -351,17 +377,20 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
+  EFI_GUID        Guid;\r
 \r
-  EFI_GUID Guid = EFI_EXTENDED_SAL_MTC_SERVICES_PROTOCOL_GUID;\r
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_MTC_SERVICES_PROTOCOL_GUID_LO;\r
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_MTC_SERVICES_PROTOCOL_GUID_HI;\r
 \r
   ReturnReg = EfiCallEsalService (&Guid, GetNextHighMonotonicCount, (UINT64) HighCount, 0, 0, 0, 0, 0, 0);\r
   return (EFI_STATUS) ReturnReg.Status;\r
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiConvertPointer (\r
   IN UINTN                  DebugDisposition,\r
-  IN OUT VOID               *Address\r
+  IN OUT VOID               **Address\r
   )\r
 /*++\r
 \r
@@ -385,6 +414,7 @@ Returns:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiConvertList (\r
   IN UINTN                DebugDisposition,\r
   IN OUT LIST_ENTRY       *ListHead\r
@@ -464,7 +494,10 @@ EfiSetVirtualAddressMap (
   )\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
-  EFI_GUID        Guid = EFI_EXTENDED_SAL_VIRTUAL_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID        Guid;\r
+\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 = EfiCallEsalService (\r
                 &Guid,\r
@@ -483,21 +516,23 @@ EfiSetVirtualAddressMap (
 \r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiUpdateCapsule (\r
-  IN UEFI_CAPSULE_HEADER       **CapsuleHeaderArray,\r
-  IN UINTN                                 CapsuleCount,\r
-  IN EFI_PHYSICAL_ADDRESS      ScatterGatherList       OPTIONAL\r
+  IN UEFI_CAPSULE_HEADER  **CapsuleHeaderArray,\r
+  IN UINTN                CapsuleCount,\r
+  IN EFI_PHYSICAL_ADDRESS ScatterGatherList OPTIONAL\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiQueryCapsuleCapabilities (\r
-  IN UEFI_CAPSULE_HEADER       **CapsuleHeaderArray,\r
-  IN UINTN                                 CapsuleCount,\r
-  OUT  UINT64                      *MaximumCapsuleSize,\r
-  OUT EFI_RESET_TYPE           *ResetType\r
+  IN UEFI_CAPSULE_HEADER  **CapsuleHeaderArray,\r
+  IN UINTN                CapsuleCount,\r
+  OUT UINT64              *MaximumCapsuleSize,\r
+  OUT EFI_RESET_TYPE    *ResetType\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
@@ -505,11 +540,12 @@ EfiQueryCapsuleCapabilities (
 \r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EfiQueryVariableInfo (\r
-  IN UINT32                      Attributes,\r
-  OUT UINT64                   *MaximumVariableStorageSize,\r
-  OUT   UINT64                 *RemainingVariableStorageSize,\r
-  OUT UINT64                   *MaximumVariableSize\r
+  IN UINT32       Attributes,\r
+  OUT UINT64      *MaximumVariableStorageSize,\r
+  OUT  UINT64     *RemainingVariableStorageSize,\r
+  OUT UINT64      *MaximumVariableSize\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
EFI Development Kit II mirror for PVE