changed the Esal call function ids all over the tree

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

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index ec783fe63a4c6eefd36c921ed55164a44d965e3f..00e7e5ccbde423795675d2c711593dad8c998287 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -866,6 +866,11 @@
       <GuidValue>403CD195-F233-48EC-8455-B2E52F1D9E02</GuidValue>\r
       <HelpText/>\r
     </Entry>\r
+    <Entry Name="ExtendedSalErrorEventInformation">\r
+      <C_Name>gEfiExtendedSalErrorEventInfoProtocolGuid</C_Name>\r
+      <GuidValue>D0D7913F-1114-4543-B568-C30C737AFF96</GuidValue>\r
+      <HelpText>error event information-produced by Mca Handler</HelpText>\r
+    </Entry>\r
   </ProtocolDeclarations>\r
   <PpiDeclarations>\r
     <Entry Name="PeiInMemory">\r
@@ -1279,12 +1284,12 @@
       <DatumType>UINT8</DatumType>\r
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
       <DefaultValue>0x0</DefaultValue>\r
-      <HelpText>The PCD masks for PCI incompatible devices support.\r
-        Acpi_Resource_Update_Support   :1;\r
-        Register_Read_Support          :1;\r
-        Register_Write_Support         :1;\r
-        Register_Update_Support        :1;\r
-        Register_Access_Width_Support  :1;\r
+      <HelpText>The PCD masks for PCI incompatible devices support.
+        Acpi_Resource_Update_Support   :1;
+        Register_Read_Support          :1;
+        Register_Write_Support         :1;
+        Register_Update_Support        :1;
+        Register_Access_Width_Support  :1;
         Reserved                       :3;</HelpText>\r
     </PcdEntry>\r
   </PcdDeclarations>\r

diff --git a/EdkModulePkg/Include/Guid/ExtendedSalGuid.h b/EdkModulePkg/Include/Guid/ExtendedSalGuid.h
index bed31175753f2f2589be98475b567cf613619a52..8f5ae15846f901b4c3e426f2c17263dd873edac6 100644 (file)
--- a/EdkModulePkg/Include/Guid/ExtendedSalGuid.h
+++ b/EdkModulePkg/Include/Guid/ExtendedSalGuid.h
@@ -168,6 +168,11 @@ Abstract:
   { 0x38802700, 0x868a, 0x4b4e, {0x81, 0xd4, 0x4f, 0x1b, 0xdc, 0xcf, 0xb4, 0x6f } }\r
 //  GUID_STRUCTURE(EFI_EXTENDED_SAL_SST_GUID_LO, EFI_EXTENDED_SAL_SST_GUID_HI)\r
 \r
+#define EFI_ERROR_EVENT_INFORMATION_PROTOCOL_GUID_LO 0x45431114D0D7913F\r
+#define EFI_ERROR_EVENT_INFORMATION_PROTOCOL_GUID_HI 0x96FF7A730CC368B5\r
+#define EFI_ERROR_EVENT_INFORMATION_PROTOCOL_GUID \\r
+  { 0xD0D7913F, 0x1114, 0x4543, {0xB5, 0x68, 0xC3, 0x0C, 0x73, 0x7A, 0xFF, 0x96 } }\r
+\r
 //\r
 // Extended Sal Proc Function IDs.\r
 //\r
@@ -179,21 +184,21 @@ Abstract:
 //\r
 \r
 typedef enum {\r
-  IoRead,\r
-  IoWrite,\r
-  MemRead,\r
-  MemWrite\r
+  IoReadFunctionId,\r
+  IoWriteFunctionId,\r
+  MemReadFunctionId,\r
+  MemWriteFunctionId\r
 } EFI_EXTENDED_SAL_BASE_IO_SERVICES_FUNC_ID;\r
 \r
 typedef enum {\r
-  Stall\r
+  StallFunctionId\r
 } EFI_EXTENDED_SAL_STALL_FUNC_ID;\r
 \r
 \r
 typedef enum {\r
-  InitializeLockService,\r
-  AcquireLockService,\r
-  ReleaseLockService,\r
+  InitializeLockServiceFunctionId,\r
+  AcquireLockServiceFunctionId,\r
+  ReleaseLockServiceFunctionId,\r
   MaxLockServiceFunctionId\r
 } EFI_EXTENDED_SAL_LOCK_SERVICES_FUNC_ID;\r
 \r
@@ -202,140 +207,154 @@ typedef enum {
 // and move SalRegisterPhysicalAddress to SAL BASE Class\r
 //\r
 typedef enum {\r
-  SetVirtualAddress,\r
-  IsVirtual,\r
-  IsEfiRuntime,\r
-  SalRegisterPhysicalAddress\r
+  SetVirtualAddressFunctionId,\r
+  IsVirtualFunctionId,\r
+  IsEfiRuntimeFunctionId,\r
+  SalRegisterPhysicalAddressFunctionId\r
 } EFI_EXTENDED_SAL_VIRTUAL_SERVICES_FUNC_ID;\r
 \r
 typedef enum {\r
-  GetTime,\r
-  SetTime,\r
-  GetWakeupTime,\r
-  SetWakeupTime,\r
-  GetRtcFreq,\r
-  InitializeThreshold,\r
-  BumpThresholdCount,\r
-  GetThresholdCount\r
+  GetTimeFunctionId,\r
+  SetTimeFunctionId,\r
+  GetWakeupTimeFunctionId,\r
+  SetWakeupTimeFunctionId,\r
+  GetRtcFreqFunctionId,\r
+  InitializeThresholdFunctionId,\r
+  BumpThresholdCountFunctionId,\r
+  GetThresholdCountFunctionId\r
 } EFI_EXTENDED_SAL_RTC_SERVICES_FUNC_ID;\r
 \r
 typedef enum {\r
-  EsalGetVariable,\r
-  EsalGetNextVariableName,\r
-  EsalSetVariable\r
+  EsalGetVariableFunctionId,\r
+  EsalGetNextVariableNameFunctionId,\r
+  EsalSetVariableFunctionId\r
 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
   ,\r
-  EsalQueryVariableInfo\r
+  EsalQueryVariableInfoFunctionId\r
 #endif\r
 } EFI_EXTENDED_SAL_VARIABLE_SERVICES_FUNC_ID;\r
 \r
 typedef enum {\r
-  GetNextHighMonotonicCount\r
+  GetNextHighMonotonicCountFunctionId\r
 } EFI_EXTENDED_SAL_MTC_SERVICES_FUNC_ID;\r
 \r
 typedef enum {\r
-  ResetSystem\r
+  ResetSystemFunctionId\r
 } EFI_EXTENDED_SAL_RESET_SERVICES_FUNC_ID;\r
 \r
 typedef enum {\r
-  StatusCode\r
+  StatusCodeFunctionId\r
 } EFI_EXTENDED_SAL_STATUS_CODE_FUNC_ID;\r
 \r
 typedef enum {\r
-  ReportStatusCodeService\r
+  ReportStatusCodeServiceFunctionId\r
 } EFI_EXTENDED_SAL_STATUS_CODE_SERVICES_FUNC_ID;\r
 \r
 typedef enum {\r
-  Read,\r
-  Write,\r
-  EraseBlock,\r
-  GetVolumeAttributes,\r
-  SetVolumeAttributes,\r
-  GetPhysicalAddress,\r
-  GetBlockSize,\r
-  EraseCustomBlockRange,\r
+  ReadFunctionId,\r
+  WriteFunctionId,\r
+  EraseBlockFunctionId,\r
+  GetVolumeAttributesFunctionId,\r
+  SetVolumeAttributesFunctionId,\r
+  GetPhysicalAddressFunctionId,\r
+  GetBlockSizeFunctionId,\r
+  EraseCustomBlockRangeFunctionId\r
 } EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_FUNC_ID;\r
 \r
 typedef enum {\r
-  AddCpuData,\r
-  RemoveCpuData,\r
-  ModifyCpuData,\r
-  GetCpuDataByID,\r
-  GetCpuDataByIndex,\r
-  SendIpi,\r
-  CurrentProcInfo,\r
-  NumProcessors,\r
-  SetMinState,\r
-  GetMinState,\r
-  EsalPhysicalIdInfo\r
+  AddCpuDataFunctionId,\r
+  RemoveCpuDataFunctionId,\r
+  ModifyCpuDataFunctionId,\r
+  GetCpuDataByIDFunctionId,\r
+  GetCpuDataByIndexFunctionId,\r
+  SendIpiFunctionId,\r
+  CurrentProcInfoFunctionId,\r
+  NumProcessorsFunctionId,\r
+  SetMinStateFunctionId,\r
+  GetMinStateFunctionId,\r
+  EsalPhysicalIdInfoFunctionId\r
 } EFI_EXTENDED_SAL_MP_SERVICES_FUNC_ID;\r
 \r
 typedef enum {\r
-  PalProc,\r
-  SetNewPalEntry,\r
-  GetNewPalEntry,\r
-  EsalUpdatePal\r
+  PalProcFunctionId,\r
+  SetNewPalEntryFunctionId,\r
+  GetNewPalEntryFunctionId,\r
+  EsalUpdatePalFunctionId\r
 } EFI_EXTENDED_SAL_PAL_SERVICES_FUNC_ID;\r
 \r
 typedef enum {\r
-  SalSetVectors,\r
-  SalMcRendez,\r
-  SalMcSetParams,\r
-  EsalGetVectors,\r
-  EsalMcGetParams,\r
-  EsalMcGetMcParams,\r
-  EsalGetMcCheckinFlags,\r
-  EsalGetPlatformBaseFreq,\r
+  McaVector,\r
+  BspInitVector,\r
+  BootRendezVector,\r
+  ApInitVector\r
+} ESAL_GET_VECTOR_TYPE;\r
+\r
+typedef enum {\r
+  SalSetVectorsFunctionId,\r
+  SalMcRendezFunctionId,\r
+  SalMcSetParamsFunctionId,\r
+  EsalGetVectorsFunctionId,\r
+  EsalMcGetParamsFunctionId,\r
+  EsalMcGetMcParamsFunctionId,\r
+  EsalGetMcCheckinFlagsFunctionId,\r
+  EsalGetPlatformBaseFreqFunctionId,\r
   EsalRegisterPhysicalAddrFunctionId\r
 } EFI_EXTENDED_SAL_BASE_SERVICES_FUNC_ID;\r
 \r
 typedef enum {\r
-  McaGetStateInfo,\r
-  McaRegisterCpu\r
+  McaGetStateInfoFunctionId,\r
+  McaRegisterCpuFunctionId\r
 } EFI_EXTENDED_SAL_MCA_SERVICES_FUNC_ID;\r
 \r
 typedef enum {\r
-  SalPciConfigRead,\r
-  SalPciConfigWrite\r
+  SalPciConfigReadFunctionId,\r
+  SalPciConfigWriteFunctionId\r
 } EFI_EXTENDED_SAL_PCI_SERVICES_FUNC_ID;\r
 \r
 typedef enum {\r
-  SalCacheInit,\r
-  SalCacheFlush\r
+  SalCacheInitFunctionId,\r
+  SalCacheFlushFunctionId\r
 } EFI_EXTENDED_SAL_CACHE_SERVICES_FUNC_ID;\r
 \r
 typedef enum {\r
-  SalGetStateInfo,\r
-  SalGetStateInfoSize,\r
-  SalClearStateInfo,\r
-  EsalGetStateBuffer,\r
-  EsalSaveStateBuffer\r
+  SalGetStateInfoFunctionId,\r
+  SalGetStateInfoSizeFunctionId,\r
+  SalClearStateInfoFunctionId,\r
+  EsalGetStateBufferFunctionId,\r
+  EsalSaveStateBufferFunctionId\r
 } EFI_EXTENDED_SAL_MCA_LOG_SERVICES_FUNC_ID;\r
 \r
 typedef enum {\r
-  SalSetEventLogData,\r
-  SalGetEventLogData,\r
-  SalEraseEventLogData,\r
-  SalActivateEventLogData\r
+  SalSetEventLogDataFunctionId,\r
+  SalGetEventLogDataFunctionId,\r
+  SalEraseEventLogDataFunctionId,\r
+  SalActivateEventLogDataFunctionId\r
 } EFI_EXTENDED_SAL_ELOG_SERVICES_FUNC_ID;\r
 \r
 typedef enum {\r
-  EsalGetComControllerInfo,\r
-  EsalSendComData,\r
-  EsalReceiveComData \r
+  EsalGetComControllerInfoFunctionId,\r
+  EsalSendComDataFunctionId,\r
+  EsalReceiveComDataFunctionId \r
 } EFI_EXTENDED_SAL_SM_COM_LAYER_SERVICES_FUNC_ID;\r
 \r
 typedef enum {\r
-  SalUpdatePal\r
+  SalUpdatePalFunctionId\r
 } EFI_EXTENDED_SAL_UPDATE_PAL_SERVICES_FUNC_ID;\r
 \r
 typedef enum {\r
-  EsalReadSensorInfo,   \r
-  EsalReadSensorStatus,\r
-  EsalRearmSensor,\r
-  EsalReadSensorData  \r
+  EsalReadSensorInfoFunctionId,   \r
+  EsalReadSensorStatusFunctionId,\r
+  EsalRearmSensorFunctionId,\r
+  EsalReadSensorDataFunctionId\r
 } EFI_EXTENDED_SAL_SENSOR_SERVICES_FUNC_ID;\r
 \r
+typedef enum {\r
+  EsalGetProcessorErrorEventInfoFunctionId,\r
+  EsalGetPlatformErrorEventInfoFunctionId,\r
+  EsalClearProcessorErrorEventInfoFunctionId,\r
+  EsalClearPlatformErrorEventInfoFunctionId\r
+} EFI_EXTENDED_SAL_ERROR_EVENT_INFO_FUNC_ID;\r
+\r
 typedef struct {\r
   UINT64      ProtoData;       \r
 } ESAL_GUID_DUMMY_PROTOCOL;\r
@@ -361,6 +380,7 @@ extern EFI_GUID gEfiExtendedSalElogServicesProtocolGuid;
 extern EFI_GUID gEfiExtendedSalSensorServicesProtocolGuid;\r
 extern EFI_GUID gEfiExtendedSalSmComLayerServicesProtocolGuid;\r
 extern EFI_GUID gEfiExtendedSalSstGuid;\r
+extern EFI_GUID gEfiExtendedSalErrorEventInfoProtocolGuid;\r
 \r
 \r
 #endif\r

diff --git a/EdkModulePkg/Include/Library/ExtendedSalLib.h b/EdkModulePkg/Include/Library/ExtendedSalLib.h
index 63ba2c981b228d13e12261868f5a533442860b68..577172b681e97ce36bd242874d95942dcce7d531 100644 (file)
--- a/EdkModulePkg/Include/Library/ExtendedSalLib.h
+++ b/EdkModulePkg/Include/Library/ExtendedSalLib.h
@@ -146,7 +146,7 @@ EsalGetNewPalEntry (
 **/\r
 SAL_RETURN_REGS\r
 EFIAPI\r
-EsalGetStateBufferLeon (\r
+EsalGetStateBuffer (\r
   IN  UINT64  McaType,\r
   OUT UINT8   **McaBuffer,\r
   OUT UINTN   *BufferSize\r
@@ -164,7 +164,7 @@ EsalGetStateBufferLeon (
 **/\r
 SAL_RETURN_REGS\r
 EFIAPI\r
-EsalSaveStateBufferLeon (\r
+EsalSaveStateBuffer (\r
   IN  UINT64  McaType\r
   )\r
 ;\r
@@ -181,7 +181,7 @@ EsalSaveStateBufferLeon (
 **/\r
 SAL_RETURN_REGS\r
 EFIAPI\r
-EsalGetVectorsLeon (\r
+EsalGetVectors (\r
   IN  UINT64  VectorType\r
   )\r
 ;\r
@@ -200,7 +200,7 @@ EsalGetVectorsLeon (
 **/\r
 SAL_RETURN_REGS\r
 EFIAPI\r
-EsalMcGetParamsLeon (\r
+EsalMcGetParams (\r
   IN  UINT64  ParamInfoType\r
   )\r
 ;\r
@@ -214,7 +214,7 @@ EsalMcGetParamsLeon (
 **/\r
 SAL_RETURN_REGS\r
 EFIAPI\r
-EsalMcGetMcParamsLeon (\r
+EsalMcGetMcParams (\r
   VOID\r
   )\r
 ;\r
@@ -230,7 +230,7 @@ EsalMcGetMcParamsLeon (
 **/\r
 SAL_RETURN_REGS\r
 EFIAPI\r
-EsalGetMcCheckinFlagsLeon (\r
+EsalGetMcCheckinFlags (\r
   IN  UINT64  CpuIndex\r
   )\r
 ;\r

diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/Ipf/Fvb.c b/EdkModulePkg/Library/EdkFvbServiceLib/Ipf/Fvb.c
index 38a215b763965904bcb140765be7b26d625d6616..fd455deca245a6fc0402cc4afefe476b19bf8561 100644 (file)
--- a/EdkModulePkg/Library/EdkFvbServiceLib/Ipf/Fvb.c
+++ b/EdkModulePkg/Library/EdkFvbServiceLib/Ipf/Fvb.c
@@ -87,7 +87,7 @@ Returns:
   *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_LO;\r
   *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_HI;\r
 \r
-  return EsalCall (&Guid, Read, Instance, Lba, Offset, (UINT64) NumBytes, (UINT64) Buffer, 0, 0).Status;\r
+  return EsalCall (&Guid, ReadFunctionId, Instance, Lba, Offset, (UINT64) NumBytes, (UINT64) Buffer, 0, 0).Status;\r
 }\r
 \r
 EFI_STATUS\r
@@ -123,7 +123,7 @@ Returns:
   *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_LO;\r
   *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_HI;\r
 \r
-  return EsalCall (&Guid, Write, Instance, Lba, Offset, (UINT64) NumBytes, (UINT64) Buffer, 0, 0).Status;\r
+  return EsalCall (&Guid, WriteFunctionId, Instance, Lba, Offset, (UINT64) NumBytes, (UINT64) Buffer, 0, 0).Status;\r
 }\r
 \r
 EFI_STATUS\r
@@ -150,7 +150,7 @@ Returns:
   *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_LO;\r
   *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_HI;\r
 \r
-  return EsalCall (&Guid, EraseBlock, Instance, Lba, 0, 0, 0, 0, 0).Status;\r
+  return EsalCall (&Guid, EraseBlockFunctionId, Instance, Lba, 0, 0, 0, 0, 0).Status;\r
 }\r
 \r
 EFI_STATUS\r
@@ -179,7 +179,7 @@ Returns:
   *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_LO;\r
   *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_HI;\r
 \r
-  return EsalCall (&Guid, SetVolumeAttributes, Instance, (UINT64) Attributes, 0, 0, 0, 0, 0).Status;\r
+  return EsalCall (&Guid, SetVolumeAttributesFunctionId, Instance, (UINT64) Attributes, 0, 0, 0, 0, 0).Status;\r
 }\r
 \r
 EFI_STATUS\r
@@ -211,7 +211,7 @@ Returns:
   *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_LO;\r
   *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_HI;\r
 \r
-  return EsalCall (&Guid, SetVolumeAttributes, Instance, (UINT64) Attributes, 0, 0, 0, 0, 0).Status;\r
+  return EsalCall (&Guid, SetVolumeAttributesFunctionId, Instance, (UINT64) Attributes, 0, 0, 0, 0, 0).Status;\r
 }\r
 \r
 EFI_STATUS\r
@@ -241,7 +241,7 @@ Returns:
   *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_LO;\r
   *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_HI;\r
 \r
-  return EsalCall (&Guid, GetPhysicalAddress, Instance, (UINT64) BaseAddress, 0, 0, 0, 0, 0).Status;\r
+  return EsalCall (&Guid, GetPhysicalAddressFunctionId, Instance, (UINT64) BaseAddress, 0, 0, 0, 0, 0).Status;\r
 }\r
 \r
 EFI_STATUS\r
@@ -280,7 +280,7 @@ Returns:
 \r
   return EsalCall (\r
           &Guid,\r
-          GetBlockSize,\r
+          GetBlockSizeFunctionId,\r
           Instance,\r
           Lba,\r
           (UINT64) BlockSize,\r
@@ -324,7 +324,7 @@ Returns:
 \r
   return EsalCall (\r
           &Guid,\r
-          EraseCustomBlockRange,\r
+          EraseCustomBlockRangeFunctionId,\r
           Instance,\r
           StartLba,\r
           OffsetStartLba,\r

diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c
index 65ec0a418b6ed2b13f8b1909ebd32c26def24112..2382d4a1d5781388d868ac46a1155d57d4948b3e 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c
@@ -202,7 +202,7 @@ Returns:
   *((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
+  ReturnReg = EsalCall (&Guid, IsEfiRuntimeFunctionId, 0, 0, 0, 0, 0, 0, 0);\r
 \r
   return (BOOLEAN) (ReturnReg.r9 == 1);\r
 }\r
@@ -231,7 +231,7 @@ Returns:
   *((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
+  ReturnReg = EsalCall (&Guid, IsVirtualFunctionId, 0, 0, 0, 0, 0, 0, 0);\r
 \r
   return (BOOLEAN) (ReturnReg.r9 == 1);\r
 }\r

diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c
index ba8cacd44c4b19410e30da6ad11ccc9c239ab520..c6ea0b1d10f183b25d64a5b46bbb18db62a3e599 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c
@@ -52,7 +52,7 @@ Returns:
 \r
   EsalCall (\r
     &Guid,\r
-    ResetSystem,\r
+    ResetSystemFunctionId,\r
     (UINT64) ResetType,\r
     (UINT64) ResetStatus,\r
     (UINT64) DataSize,\r
@@ -99,7 +99,7 @@ Returns:
   *((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 = EsalCall (&Guid, GetTime, (UINT64) Time, (UINT64) Capabilities, 0, 0, 0, 0, 0);\r
+  ReturnReg = EsalCall (&Guid, GetTimeFunctionId, (UINT64) Time, (UINT64) Capabilities, 0, 0, 0, 0, 0);\r
   return ReturnReg.Status;\r
 }\r
 \r
@@ -130,7 +130,7 @@ Returns:
   *((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 = EsalCall (&Guid, SetTime, (UINT64) Time, 0, 0, 0, 0, 0, 0);\r
+  ReturnReg = EsalCall (&Guid, SetTimeFunctionId, (UINT64) Time, 0, 0, 0, 0, 0, 0);\r
   return ReturnReg.Status;\r
 }\r
 \r
@@ -165,7 +165,7 @@ Returns:
   *((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 = EsalCall (&Guid, GetWakeupTime, (UINT64) Enabled, (UINT64) Pending, (UINT64) Time, 0, 0, 0, 0);\r
+  ReturnReg = EsalCall (&Guid, GetWakeupTimeFunctionId, (UINT64) Enabled, (UINT64) Pending, (UINT64) Time, 0, 0, 0, 0);\r
   return ReturnReg.Status;\r
 }\r
 \r
@@ -199,7 +199,7 @@ Returns:
   *((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 = EsalCall (&Guid, SetWakeupTime, (UINT64) Enable, (UINT64) Time, 0, 0, 0, 0, 0);\r
+  ReturnReg = EsalCall (&Guid, SetWakeupTimeFunctionId, (UINT64) Enable, (UINT64) Time, 0, 0, 0, 0, 0);\r
   return ReturnReg.Status;\r
 }\r
 \r
@@ -243,7 +243,7 @@ Returns:
 \r
   ReturnReg = EsalCall (\r
                 &Guid,\r
-                EsalGetVariable,\r
+                EsalGetVariableFunctionId,\r
                 (UINT64) VariableName,\r
                 (UINT64) VendorGuid,\r
                 (UINT64) Attributes,\r
@@ -293,7 +293,7 @@ Returns:
 \r
   ReturnReg = EsalCall (\r
                 &Guid,\r
-                EsalGetNextVariableName,\r
+                EsalGetNextVariableNameFunctionId,\r
                 (UINT64) VariableNameSize,\r
                 (UINT64) VariableName,\r
                 (UINT64) VendorGuid,\r
@@ -343,7 +343,7 @@ Returns:
 \r
   ReturnReg = EsalCall (\r
                 &Guid,\r
-                EsalSetVariable,\r
+                EsalSetVariableFunctionId,\r
                 (UINT64) VariableName,\r
                 (UINT64) VendorGuid,\r
                 (UINT64) Attributes,\r
@@ -382,7 +382,7 @@ Returns:
   *((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 = EsalCall (&Guid, GetNextHighMonotonicCount, (UINT64) HighCount, 0, 0, 0, 0, 0, 0);\r
+  ReturnReg = EsalCall (&Guid, GetNextHighMonotonicCountFunctionId, (UINT64) HighCount, 0, 0, 0, 0, 0, 0);\r
   return (EFI_STATUS) ReturnReg.Status;\r
 }\r
 \r
@@ -501,7 +501,7 @@ EfiSetVirtualAddressMap (
 \r
   ReturnReg = EsalCall (\r
                 &Guid,\r
-                SetVirtualAddress,\r
+                SetVirtualAddressFunctionId,\r
                 (UINT64) MemoryMapSize,\r
                 (UINT64) DescriptorSize,\r
                 (UINT64) DescriptorVersion,\r

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
index a7cb5f68c9e6589cd3a0ff9b503be04932cf1514..0ad67d53bbe8c91dd0d9bc67b343c5046d447a16 100644 (file)
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
@@ -53,7 +53,7 @@ Returns:
   SAL_RETURN_REGS ReturnVal;\r
 \r
   switch (FunctionId) {\r
-  case EsalGetVariable:\r
+  case EsalGetVariableFunctionId:\r
     ReturnVal.Status = GetVariable (\r
                         (CHAR16 *) Arg2,\r
                         (EFI_GUID *) Arg3,\r
@@ -65,7 +65,7 @@ Returns:
                         );\r
     return ReturnVal;\r
 \r
-  case EsalGetNextVariableName:\r
+  case EsalGetNextVariableNameFunctionId:\r
     ReturnVal.Status = GetNextVariableName (\r
                         (UINTN *) Arg2,\r
                         (CHAR16 *) Arg3,\r
@@ -75,7 +75,7 @@ Returns:
                         );\r
     return ReturnVal;\r
 \r
-  case EsalSetVariable:\r
+  case EsalSetVariableFunctionId:\r
     ReturnVal.Status = SetVariable (\r
                         (CHAR16 *) Arg2,\r
                         (EFI_GUID *) Arg3,\r
@@ -89,7 +89,7 @@ Returns:
                         );\r
     return ReturnVal;\r
 \r
-  case EsalQueryVariableInfo:\r
+  case EsalQueryVariableInfoFunctionId:\r
     ReturnVal.Status = QueryVariableInfo (\r
                         (UINT32) Arg2,\r
                         (UINT64 *) Arg3,\r
@@ -166,13 +166,13 @@ Returns:
     &gEfiExtendedSalVariableServicesProtocolGuid,\r
     mVariableModuleGlobal,\r
     EsalVariableCommonEntry,\r
-    EsalGetVariable,\r
+    EsalGetVariableFunctionId,\r
     EsalVariableCommonEntry,\r
-    EsalGetNextVariableName,\r
+    EsalGetNextVariableNameFunctionId,\r
     EsalVariableCommonEntry,\r
-    EsalSetVariable,\r
+    EsalSetVariableFunctionId,\r
     EsalVariableCommonEntry,\r
-    EsalQueryVariableInfo,\r
+    EsalQueryVariableInfoFunctionId,\r
     NULL\r
     );\r
 \r

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c b/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c
index cbd7a61b1c5152d36c5297589a3b8876df2adf67..4163121d960bc089ce580d40a00386591034e11b 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c
@@ -206,7 +206,7 @@ ReportEsalServiceEntry (
 \r
   switch (FunctionId) {\r
 \r
-  case ReportStatusCodeService:\r
+  case ReportStatusCodeServiceFunctionId:\r
 \r
     DxeStatusCode = (DXE_STATUS_CODE_CONTROLLER *) Global;\r
 \r
@@ -315,7 +315,7 @@ DxeStatusCodeDriverEntry (
              &gEfiExtendedSalStatusCodeServicesProtocolGuid,\r
             &gDxeStatusCode,\r
              ReportEsalServiceEntry,\r
-             StatusCode,\r
+             StatusCodeFunctionId,\r
              NULL\r
              );\r
   ASSERT_EFI_ERROR (Status);\r

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Ipf/InitVariable.c b/EdkModulePkg/Universal/Variable/RuntimeDxe/Ipf/InitVariable.c
index a7cb5f68c9e6589cd3a0ff9b503be04932cf1514..0ad67d53bbe8c91dd0d9bc67b343c5046d447a16 100644 (file)
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Ipf/InitVariable.c
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Ipf/InitVariable.c
@@ -53,7 +53,7 @@ Returns:
   SAL_RETURN_REGS ReturnVal;\r
 \r
   switch (FunctionId) {\r
-  case EsalGetVariable:\r
+  case EsalGetVariableFunctionId:\r
     ReturnVal.Status = GetVariable (\r
                         (CHAR16 *) Arg2,\r
                         (EFI_GUID *) Arg3,\r
@@ -65,7 +65,7 @@ Returns:
                         );\r
     return ReturnVal;\r
 \r
-  case EsalGetNextVariableName:\r
+  case EsalGetNextVariableNameFunctionId:\r
     ReturnVal.Status = GetNextVariableName (\r
                         (UINTN *) Arg2,\r
                         (CHAR16 *) Arg3,\r
@@ -75,7 +75,7 @@ Returns:
                         );\r
     return ReturnVal;\r
 \r
-  case EsalSetVariable:\r
+  case EsalSetVariableFunctionId:\r
     ReturnVal.Status = SetVariable (\r
                         (CHAR16 *) Arg2,\r
                         (EFI_GUID *) Arg3,\r
@@ -89,7 +89,7 @@ Returns:
                         );\r
     return ReturnVal;\r
 \r
-  case EsalQueryVariableInfo:\r
+  case EsalQueryVariableInfoFunctionId:\r
     ReturnVal.Status = QueryVariableInfo (\r
                         (UINT32) Arg2,\r
                         (UINT64 *) Arg3,\r
@@ -166,13 +166,13 @@ Returns:
     &gEfiExtendedSalVariableServicesProtocolGuid,\r
     mVariableModuleGlobal,\r
     EsalVariableCommonEntry,\r
-    EsalGetVariable,\r
+    EsalGetVariableFunctionId,\r
     EsalVariableCommonEntry,\r
-    EsalGetNextVariableName,\r
+    EsalGetNextVariableNameFunctionId,\r
     EsalVariableCommonEntry,\r
-    EsalSetVariable,\r
+    EsalSetVariableFunctionId,\r
     EsalVariableCommonEntry,\r
-    EsalQueryVariableInfo,\r
+    EsalQueryVariableInfoFunctionId,\r
     NULL\r
     );\r
 \r