changed the Esal call function ids all over the tree

[mirror_edk2.git] / EdkModulePkg / Include / Guid / ExtendedSalGuid.h

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