diff options
9 files changed, 157 insertions, 132 deletions
diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd index ec783fe63a..00e7e5ccbd 100644 --- a/EdkModulePkg/EdkModulePkg.spd +++ b/EdkModulePkg/EdkModulePkg.spd @@ -866,6 +866,11 @@ <GuidValue>403CD195-F233-48EC-8455-B2E52F1D9E02</GuidValue>
<HelpText/>
</Entry>
+ <Entry Name="ExtendedSalErrorEventInformation">
+ <C_Name>gEfiExtendedSalErrorEventInfoProtocolGuid</C_Name>
+ <GuidValue>D0D7913F-1114-4543-B568-C30C737AFF96</GuidValue>
+ <HelpText>error event information-produced by Mca Handler</HelpText>
+ </Entry>
</ProtocolDeclarations>
<PpiDeclarations>
<Entry Name="PeiInMemory">
@@ -1279,12 +1284,12 @@ <DatumType>UINT8</DatumType>
<ValidUsage>FIXED_AT_BUILD</ValidUsage>
<DefaultValue>0x0</DefaultValue>
- <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;
+ <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>
</PcdEntry>
</PcdDeclarations>
diff --git a/EdkModulePkg/Include/Guid/ExtendedSalGuid.h b/EdkModulePkg/Include/Guid/ExtendedSalGuid.h index bed3117575..8f5ae15846 100644 --- 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 } }
// GUID_STRUCTURE(EFI_EXTENDED_SAL_SST_GUID_LO, EFI_EXTENDED_SAL_SST_GUID_HI)
+#define EFI_ERROR_EVENT_INFORMATION_PROTOCOL_GUID_LO 0x45431114D0D7913F
+#define EFI_ERROR_EVENT_INFORMATION_PROTOCOL_GUID_HI 0x96FF7A730CC368B5
+#define EFI_ERROR_EVENT_INFORMATION_PROTOCOL_GUID \
+ { 0xD0D7913F, 0x1114, 0x4543, {0xB5, 0x68, 0xC3, 0x0C, 0x73, 0x7A, 0xFF, 0x96 } }
+
//
// Extended Sal Proc Function IDs.
//
@@ -179,21 +184,21 @@ Abstract: //
typedef enum {
- IoRead,
- IoWrite,
- MemRead,
- MemWrite
+ IoReadFunctionId,
+ IoWriteFunctionId,
+ MemReadFunctionId,
+ MemWriteFunctionId
} EFI_EXTENDED_SAL_BASE_IO_SERVICES_FUNC_ID;
typedef enum {
- Stall
+ StallFunctionId
} EFI_EXTENDED_SAL_STALL_FUNC_ID;
typedef enum {
- InitializeLockService,
- AcquireLockService,
- ReleaseLockService,
+ InitializeLockServiceFunctionId,
+ AcquireLockServiceFunctionId,
+ ReleaseLockServiceFunctionId,
MaxLockServiceFunctionId
} EFI_EXTENDED_SAL_LOCK_SERVICES_FUNC_ID;
@@ -202,140 +207,154 @@ typedef enum { // and move SalRegisterPhysicalAddress to SAL BASE Class
//
typedef enum {
- SetVirtualAddress,
- IsVirtual,
- IsEfiRuntime,
- SalRegisterPhysicalAddress
+ SetVirtualAddressFunctionId,
+ IsVirtualFunctionId,
+ IsEfiRuntimeFunctionId,
+ SalRegisterPhysicalAddressFunctionId
} EFI_EXTENDED_SAL_VIRTUAL_SERVICES_FUNC_ID;
typedef enum {
- GetTime,
- SetTime,
- GetWakeupTime,
- SetWakeupTime,
- GetRtcFreq,
- InitializeThreshold,
- BumpThresholdCount,
- GetThresholdCount
+ GetTimeFunctionId,
+ SetTimeFunctionId,
+ GetWakeupTimeFunctionId,
+ SetWakeupTimeFunctionId,
+ GetRtcFreqFunctionId,
+ InitializeThresholdFunctionId,
+ BumpThresholdCountFunctionId,
+ GetThresholdCountFunctionId
} EFI_EXTENDED_SAL_RTC_SERVICES_FUNC_ID;
typedef enum {
- EsalGetVariable,
- EsalGetNextVariableName,
- EsalSetVariable
+ EsalGetVariableFunctionId,
+ EsalGetNextVariableNameFunctionId,
+ EsalSetVariableFunctionId
#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
,
- EsalQueryVariableInfo
+ EsalQueryVariableInfoFunctionId
#endif
} EFI_EXTENDED_SAL_VARIABLE_SERVICES_FUNC_ID;
typedef enum {
- GetNextHighMonotonicCount
+ GetNextHighMonotonicCountFunctionId
} EFI_EXTENDED_SAL_MTC_SERVICES_FUNC_ID;
typedef enum {
- ResetSystem
+ ResetSystemFunctionId
} EFI_EXTENDED_SAL_RESET_SERVICES_FUNC_ID;
typedef enum {
- StatusCode
+ StatusCodeFunctionId
} EFI_EXTENDED_SAL_STATUS_CODE_FUNC_ID;
typedef enum {
- ReportStatusCodeService
+ ReportStatusCodeServiceFunctionId
} EFI_EXTENDED_SAL_STATUS_CODE_SERVICES_FUNC_ID;
typedef enum {
- Read,
- Write,
- EraseBlock,
- GetVolumeAttributes,
- SetVolumeAttributes,
- GetPhysicalAddress,
- GetBlockSize,
- EraseCustomBlockRange,
+ ReadFunctionId,
+ WriteFunctionId,
+ EraseBlockFunctionId,
+ GetVolumeAttributesFunctionId,
+ SetVolumeAttributesFunctionId,
+ GetPhysicalAddressFunctionId,
+ GetBlockSizeFunctionId,
+ EraseCustomBlockRangeFunctionId
} EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_FUNC_ID;
typedef enum {
- AddCpuData,
- RemoveCpuData,
- ModifyCpuData,
- GetCpuDataByID,
- GetCpuDataByIndex,
- SendIpi,
- CurrentProcInfo,
- NumProcessors,
- SetMinState,
- GetMinState,
- EsalPhysicalIdInfo
+ AddCpuDataFunctionId,
+ RemoveCpuDataFunctionId,
+ ModifyCpuDataFunctionId,
+ GetCpuDataByIDFunctionId,
+ GetCpuDataByIndexFunctionId,
+ SendIpiFunctionId,
+ CurrentProcInfoFunctionId,
+ NumProcessorsFunctionId,
+ SetMinStateFunctionId,
+ GetMinStateFunctionId,
+ EsalPhysicalIdInfoFunctionId
} EFI_EXTENDED_SAL_MP_SERVICES_FUNC_ID;
typedef enum {
- PalProc,
- SetNewPalEntry,
- GetNewPalEntry,
- EsalUpdatePal
+ PalProcFunctionId,
+ SetNewPalEntryFunctionId,
+ GetNewPalEntryFunctionId,
+ EsalUpdatePalFunctionId
} EFI_EXTENDED_SAL_PAL_SERVICES_FUNC_ID;
typedef enum {
- SalSetVectors,
- SalMcRendez,
- SalMcSetParams,
- EsalGetVectors,
- EsalMcGetParams,
- EsalMcGetMcParams,
- EsalGetMcCheckinFlags,
- EsalGetPlatformBaseFreq,
+ McaVector,
+ BspInitVector,
+ BootRendezVector,
+ ApInitVector
+} ESAL_GET_VECTOR_TYPE;
+
+typedef enum {
+ SalSetVectorsFunctionId,
+ SalMcRendezFunctionId,
+ SalMcSetParamsFunctionId,
+ EsalGetVectorsFunctionId,
+ EsalMcGetParamsFunctionId,
+ EsalMcGetMcParamsFunctionId,
+ EsalGetMcCheckinFlagsFunctionId,
+ EsalGetPlatformBaseFreqFunctionId,
EsalRegisterPhysicalAddrFunctionId
} EFI_EXTENDED_SAL_BASE_SERVICES_FUNC_ID;
typedef enum {
- McaGetStateInfo,
- McaRegisterCpu
+ McaGetStateInfoFunctionId,
+ McaRegisterCpuFunctionId
} EFI_EXTENDED_SAL_MCA_SERVICES_FUNC_ID;
typedef enum {
- SalPciConfigRead,
- SalPciConfigWrite
+ SalPciConfigReadFunctionId,
+ SalPciConfigWriteFunctionId
} EFI_EXTENDED_SAL_PCI_SERVICES_FUNC_ID;
typedef enum {
- SalCacheInit,
- SalCacheFlush
+ SalCacheInitFunctionId,
+ SalCacheFlushFunctionId
} EFI_EXTENDED_SAL_CACHE_SERVICES_FUNC_ID;
typedef enum {
- SalGetStateInfo,
- SalGetStateInfoSize,
- SalClearStateInfo,
- EsalGetStateBuffer,
- EsalSaveStateBuffer
+ SalGetStateInfoFunctionId,
+ SalGetStateInfoSizeFunctionId,
+ SalClearStateInfoFunctionId,
+ EsalGetStateBufferFunctionId,
+ EsalSaveStateBufferFunctionId
} EFI_EXTENDED_SAL_MCA_LOG_SERVICES_FUNC_ID;
typedef enum {
- SalSetEventLogData,
- SalGetEventLogData,
- SalEraseEventLogData,
- SalActivateEventLogData
+ SalSetEventLogDataFunctionId,
+ SalGetEventLogDataFunctionId,
+ SalEraseEventLogDataFunctionId,
+ SalActivateEventLogDataFunctionId
} EFI_EXTENDED_SAL_ELOG_SERVICES_FUNC_ID;
typedef enum {
- EsalGetComControllerInfo,
- EsalSendComData,
- EsalReceiveComData
+ EsalGetComControllerInfoFunctionId,
+ EsalSendComDataFunctionId,
+ EsalReceiveComDataFunctionId
} EFI_EXTENDED_SAL_SM_COM_LAYER_SERVICES_FUNC_ID;
typedef enum {
- SalUpdatePal
+ SalUpdatePalFunctionId
} EFI_EXTENDED_SAL_UPDATE_PAL_SERVICES_FUNC_ID;
typedef enum {
- EsalReadSensorInfo,
- EsalReadSensorStatus,
- EsalRearmSensor,
- EsalReadSensorData
+ EsalReadSensorInfoFunctionId,
+ EsalReadSensorStatusFunctionId,
+ EsalRearmSensorFunctionId,
+ EsalReadSensorDataFunctionId
} EFI_EXTENDED_SAL_SENSOR_SERVICES_FUNC_ID;
+typedef enum {
+ EsalGetProcessorErrorEventInfoFunctionId,
+ EsalGetPlatformErrorEventInfoFunctionId,
+ EsalClearProcessorErrorEventInfoFunctionId,
+ EsalClearPlatformErrorEventInfoFunctionId
+} EFI_EXTENDED_SAL_ERROR_EVENT_INFO_FUNC_ID;
+
typedef struct {
UINT64 ProtoData;
} ESAL_GUID_DUMMY_PROTOCOL;
@@ -361,6 +380,7 @@ extern EFI_GUID gEfiExtendedSalElogServicesProtocolGuid; extern EFI_GUID gEfiExtendedSalSensorServicesProtocolGuid;
extern EFI_GUID gEfiExtendedSalSmComLayerServicesProtocolGuid;
extern EFI_GUID gEfiExtendedSalSstGuid;
+extern EFI_GUID gEfiExtendedSalErrorEventInfoProtocolGuid;
#endif
diff --git a/EdkModulePkg/Include/Library/ExtendedSalLib.h b/EdkModulePkg/Include/Library/ExtendedSalLib.h index 63ba2c981b..577172b681 100644 --- a/EdkModulePkg/Include/Library/ExtendedSalLib.h +++ b/EdkModulePkg/Include/Library/ExtendedSalLib.h @@ -146,7 +146,7 @@ EsalGetNewPalEntry ( **/
SAL_RETURN_REGS
EFIAPI
-EsalGetStateBufferLeon (
+EsalGetStateBuffer (
IN UINT64 McaType,
OUT UINT8 **McaBuffer,
OUT UINTN *BufferSize
@@ -164,7 +164,7 @@ EsalGetStateBufferLeon ( **/
SAL_RETURN_REGS
EFIAPI
-EsalSaveStateBufferLeon (
+EsalSaveStateBuffer (
IN UINT64 McaType
)
;
@@ -181,7 +181,7 @@ EsalSaveStateBufferLeon ( **/
SAL_RETURN_REGS
EFIAPI
-EsalGetVectorsLeon (
+EsalGetVectors (
IN UINT64 VectorType
)
;
@@ -200,7 +200,7 @@ EsalGetVectorsLeon ( **/
SAL_RETURN_REGS
EFIAPI
-EsalMcGetParamsLeon (
+EsalMcGetParams (
IN UINT64 ParamInfoType
)
;
@@ -214,7 +214,7 @@ EsalMcGetParamsLeon ( **/
SAL_RETURN_REGS
EFIAPI
-EsalMcGetMcParamsLeon (
+EsalMcGetMcParams (
VOID
)
;
@@ -230,7 +230,7 @@ EsalMcGetMcParamsLeon ( **/
SAL_RETURN_REGS
EFIAPI
-EsalGetMcCheckinFlagsLeon (
+EsalGetMcCheckinFlags (
IN UINT64 CpuIndex
)
;
diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/Ipf/Fvb.c b/EdkModulePkg/Library/EdkFvbServiceLib/Ipf/Fvb.c index 38a215b763..fd455deca2 100644 --- 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;
*(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_HI;
- return EsalCall (&Guid, Read, Instance, Lba, Offset, (UINT64) NumBytes, (UINT64) Buffer, 0, 0).Status;
+ return EsalCall (&Guid, ReadFunctionId, Instance, Lba, Offset, (UINT64) NumBytes, (UINT64) Buffer, 0, 0).Status;
}
EFI_STATUS
@@ -123,7 +123,7 @@ Returns: *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_LO;
*(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_HI;
- return EsalCall (&Guid, Write, Instance, Lba, Offset, (UINT64) NumBytes, (UINT64) Buffer, 0, 0).Status;
+ return EsalCall (&Guid, WriteFunctionId, Instance, Lba, Offset, (UINT64) NumBytes, (UINT64) Buffer, 0, 0).Status;
}
EFI_STATUS
@@ -150,7 +150,7 @@ Returns: *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_LO;
*(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_HI;
- return EsalCall (&Guid, EraseBlock, Instance, Lba, 0, 0, 0, 0, 0).Status;
+ return EsalCall (&Guid, EraseBlockFunctionId, Instance, Lba, 0, 0, 0, 0, 0).Status;
}
EFI_STATUS
@@ -179,7 +179,7 @@ Returns: *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_LO;
*(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_HI;
- return EsalCall (&Guid, SetVolumeAttributes, Instance, (UINT64) Attributes, 0, 0, 0, 0, 0).Status;
+ return EsalCall (&Guid, SetVolumeAttributesFunctionId, Instance, (UINT64) Attributes, 0, 0, 0, 0, 0).Status;
}
EFI_STATUS
@@ -211,7 +211,7 @@ Returns: *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_LO;
*(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_HI;
- return EsalCall (&Guid, SetVolumeAttributes, Instance, (UINT64) Attributes, 0, 0, 0, 0, 0).Status;
+ return EsalCall (&Guid, SetVolumeAttributesFunctionId, Instance, (UINT64) Attributes, 0, 0, 0, 0, 0).Status;
}
EFI_STATUS
@@ -241,7 +241,7 @@ Returns: *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_LO;
*(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_FV_BLOCK_SERVICES_PROTOCOL_GUID_HI;
- return EsalCall (&Guid, GetPhysicalAddress, Instance, (UINT64) BaseAddress, 0, 0, 0, 0, 0).Status;
+ return EsalCall (&Guid, GetPhysicalAddressFunctionId, Instance, (UINT64) BaseAddress, 0, 0, 0, 0, 0).Status;
}
EFI_STATUS
@@ -280,7 +280,7 @@ Returns: return EsalCall (
&Guid,
- GetBlockSize,
+ GetBlockSizeFunctionId,
Instance,
Lba,
(UINT64) BlockSize,
@@ -324,7 +324,7 @@ Returns: return EsalCall (
&Guid,
- EraseCustomBlockRange,
+ EraseCustomBlockRangeFunctionId,
Instance,
StartLba,
OffsetStartLba,
diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c index 65ec0a418b..2382d4a1d5 100644 --- 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;
*(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_VIRTUAL_SERVICES_PROTOCOL_GUID_HI;
- ReturnReg = EsalCall (&Guid, IsEfiRuntime, 0, 0, 0, 0, 0, 0, 0);
+ ReturnReg = EsalCall (&Guid, IsEfiRuntimeFunctionId, 0, 0, 0, 0, 0, 0, 0);
return (BOOLEAN) (ReturnReg.r9 == 1);
}
@@ -231,7 +231,7 @@ Returns: *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_VIRTUAL_SERVICES_PROTOCOL_GUID_LO;
*(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_VIRTUAL_SERVICES_PROTOCOL_GUID_HI;
- ReturnReg = EsalCall (&Guid, IsVirtual, 0, 0, 0, 0, 0, 0, 0);
+ ReturnReg = EsalCall (&Guid, IsVirtualFunctionId, 0, 0, 0, 0, 0, 0, 0);
return (BOOLEAN) (ReturnReg.r9 == 1);
}
diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c index ba8cacd44c..c6ea0b1d10 100644 --- a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c +++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c @@ -52,7 +52,7 @@ Returns: EsalCall (
&Guid,
- ResetSystem,
+ ResetSystemFunctionId,
(UINT64) ResetType,
(UINT64) ResetStatus,
(UINT64) DataSize,
@@ -99,7 +99,7 @@ Returns: *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_LO;
*(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_HI;
- ReturnReg = EsalCall (&Guid, GetTime, (UINT64) Time, (UINT64) Capabilities, 0, 0, 0, 0, 0);
+ ReturnReg = EsalCall (&Guid, GetTimeFunctionId, (UINT64) Time, (UINT64) Capabilities, 0, 0, 0, 0, 0);
return ReturnReg.Status;
}
@@ -130,7 +130,7 @@ Returns: *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_LO;
*(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_HI;
- ReturnReg = EsalCall (&Guid, SetTime, (UINT64) Time, 0, 0, 0, 0, 0, 0);
+ ReturnReg = EsalCall (&Guid, SetTimeFunctionId, (UINT64) Time, 0, 0, 0, 0, 0, 0);
return ReturnReg.Status;
}
@@ -165,7 +165,7 @@ Returns: *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_LO;
*(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_HI;
- ReturnReg = EsalCall (&Guid, GetWakeupTime, (UINT64) Enabled, (UINT64) Pending, (UINT64) Time, 0, 0, 0, 0);
+ ReturnReg = EsalCall (&Guid, GetWakeupTimeFunctionId, (UINT64) Enabled, (UINT64) Pending, (UINT64) Time, 0, 0, 0, 0);
return ReturnReg.Status;
}
@@ -199,7 +199,7 @@ Returns: *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_LO;
*(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_HI;
- ReturnReg = EsalCall (&Guid, SetWakeupTime, (UINT64) Enable, (UINT64) Time, 0, 0, 0, 0, 0);
+ ReturnReg = EsalCall (&Guid, SetWakeupTimeFunctionId, (UINT64) Enable, (UINT64) Time, 0, 0, 0, 0, 0);
return ReturnReg.Status;
}
@@ -243,7 +243,7 @@ Returns: ReturnReg = EsalCall (
&Guid,
- EsalGetVariable,
+ EsalGetVariableFunctionId,
(UINT64) VariableName,
(UINT64) VendorGuid,
(UINT64) Attributes,
@@ -293,7 +293,7 @@ Returns: ReturnReg = EsalCall (
&Guid,
- EsalGetNextVariableName,
+ EsalGetNextVariableNameFunctionId,
(UINT64) VariableNameSize,
(UINT64) VariableName,
(UINT64) VendorGuid,
@@ -343,7 +343,7 @@ Returns: ReturnReg = EsalCall (
&Guid,
- EsalSetVariable,
+ EsalSetVariableFunctionId,
(UINT64) VariableName,
(UINT64) VendorGuid,
(UINT64) Attributes,
@@ -382,7 +382,7 @@ Returns: *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_MTC_SERVICES_PROTOCOL_GUID_LO;
*(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_MTC_SERVICES_PROTOCOL_GUID_HI;
- ReturnReg = EsalCall (&Guid, GetNextHighMonotonicCount, (UINT64) HighCount, 0, 0, 0, 0, 0, 0);
+ ReturnReg = EsalCall (&Guid, GetNextHighMonotonicCountFunctionId, (UINT64) HighCount, 0, 0, 0, 0, 0, 0);
return (EFI_STATUS) ReturnReg.Status;
}
@@ -501,7 +501,7 @@ EfiSetVirtualAddressMap ( ReturnReg = EsalCall (
&Guid,
- SetVirtualAddress,
+ SetVirtualAddressFunctionId,
(UINT64) MemoryMapSize,
(UINT64) DescriptorSize,
(UINT64) DescriptorVersion,
diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c index a7cb5f68c9..0ad67d53bb 100644 --- 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;
switch (FunctionId) {
- case EsalGetVariable:
+ case EsalGetVariableFunctionId:
ReturnVal.Status = GetVariable (
(CHAR16 *) Arg2,
(EFI_GUID *) Arg3,
@@ -65,7 +65,7 @@ Returns: );
return ReturnVal;
- case EsalGetNextVariableName:
+ case EsalGetNextVariableNameFunctionId:
ReturnVal.Status = GetNextVariableName (
(UINTN *) Arg2,
(CHAR16 *) Arg3,
@@ -75,7 +75,7 @@ Returns: );
return ReturnVal;
- case EsalSetVariable:
+ case EsalSetVariableFunctionId:
ReturnVal.Status = SetVariable (
(CHAR16 *) Arg2,
(EFI_GUID *) Arg3,
@@ -89,7 +89,7 @@ Returns: );
return ReturnVal;
- case EsalQueryVariableInfo:
+ case EsalQueryVariableInfoFunctionId:
ReturnVal.Status = QueryVariableInfo (
(UINT32) Arg2,
(UINT64 *) Arg3,
@@ -166,13 +166,13 @@ Returns: &gEfiExtendedSalVariableServicesProtocolGuid,
mVariableModuleGlobal,
EsalVariableCommonEntry,
- EsalGetVariable,
+ EsalGetVariableFunctionId,
EsalVariableCommonEntry,
- EsalGetNextVariableName,
+ EsalGetNextVariableNameFunctionId,
EsalVariableCommonEntry,
- EsalSetVariable,
+ EsalSetVariableFunctionId,
EsalVariableCommonEntry,
- EsalQueryVariableInfo,
+ EsalQueryVariableInfoFunctionId,
NULL
);
diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c b/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c index cbd7a61b1c..4163121d96 100644 --- a/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c +++ b/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c @@ -206,7 +206,7 @@ ReportEsalServiceEntry ( switch (FunctionId) {
- case ReportStatusCodeService:
+ case ReportStatusCodeServiceFunctionId:
DxeStatusCode = (DXE_STATUS_CODE_CONTROLLER *) Global;
@@ -315,7 +315,7 @@ DxeStatusCodeDriverEntry ( &gEfiExtendedSalStatusCodeServicesProtocolGuid,
&gDxeStatusCode,
ReportEsalServiceEntry,
- StatusCode,
+ StatusCodeFunctionId,
NULL
);
ASSERT_EFI_ERROR (Status);
diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Ipf/InitVariable.c b/EdkModulePkg/Universal/Variable/RuntimeDxe/Ipf/InitVariable.c index a7cb5f68c9..0ad67d53bb 100644 --- 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;
switch (FunctionId) {
- case EsalGetVariable:
+ case EsalGetVariableFunctionId:
ReturnVal.Status = GetVariable (
(CHAR16 *) Arg2,
(EFI_GUID *) Arg3,
@@ -65,7 +65,7 @@ Returns: );
return ReturnVal;
- case EsalGetNextVariableName:
+ case EsalGetNextVariableNameFunctionId:
ReturnVal.Status = GetNextVariableName (
(UINTN *) Arg2,
(CHAR16 *) Arg3,
@@ -75,7 +75,7 @@ Returns: );
return ReturnVal;
- case EsalSetVariable:
+ case EsalSetVariableFunctionId:
ReturnVal.Status = SetVariable (
(CHAR16 *) Arg2,
(EFI_GUID *) Arg3,
@@ -89,7 +89,7 @@ Returns: );
return ReturnVal;
- case EsalQueryVariableInfo:
+ case EsalQueryVariableInfoFunctionId:
ReturnVal.Status = QueryVariableInfo (
(UINT32) Arg2,
(UINT64 *) Arg3,
@@ -166,13 +166,13 @@ Returns: &gEfiExtendedSalVariableServicesProtocolGuid,
mVariableModuleGlobal,
EsalVariableCommonEntry,
- EsalGetVariable,
+ EsalGetVariableFunctionId,
EsalVariableCommonEntry,
- EsalGetNextVariableName,
+ EsalGetNextVariableNameFunctionId,
EsalVariableCommonEntry,
- EsalSetVariable,
+ EsalSetVariableFunctionId,
EsalVariableCommonEntry,
- EsalQueryVariableInfo,
+ EsalQueryVariableInfoFunctionId,
NULL
);
|