From 188fe5e85d7c122cd59781ec6dff3da687b5ccca Mon Sep 17 00:00:00 2001 From: vprabhal Date: Mon, 2 Jul 2007 21:02:02 +0000 Subject: [PATCH 1/1] removing the dependency on EDKDxeSalLib and EdxDxeRuntimeSalLib, instead using DxeExtendedSalLib and DxeRuntimeExtendedSalLib git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2969 6f19259b-4bc3-4df7-8a09-765794883524 --- .../EdkFvbServiceLib/EdkFvbServiceLib.msa | 4 ++-- .../Library/EdkFvbServiceLib/Ipf/Fvb.c | 16 ++++++------- .../EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa | 4 ++-- .../EdkUefiRuntimeLib/Ipf/RuntimeLib.c | 4 ++-- .../EdkUefiRuntimeLib/Ipf/RuntimeService.c | 20 ++++++++-------- .../EmuVariable/RuntimeDxe/EmuVariableIpf.msa | 6 ++--- .../StatusCode/Dxe/DxeStatusCode.msa | 24 +++++++++---------- .../Variable/RuntimeDxe/VariableIpf.msa | 6 ++--- 8 files changed, 41 insertions(+), 43 deletions(-) diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa b/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa index 2aa7abb34d..b1d068882f 100644 --- a/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa +++ b/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa @@ -43,8 +43,8 @@ UefiBootServicesTableLib - - EdkDxeSalLib + + ExtendedSalLib diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/Ipf/Fvb.c b/EdkModulePkg/Library/EdkFvbServiceLib/Ipf/Fvb.c index fe596e6a36..38a215b763 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 EfiCallEsalService (&Guid, Read, Instance, Lba, Offset, (UINT64) NumBytes, (UINT64) Buffer, 0, 0).Status; + return EsalCall (&Guid, Read, 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 EfiCallEsalService (&Guid, Write, Instance, Lba, Offset, (UINT64) NumBytes, (UINT64) Buffer, 0, 0).Status; + return EsalCall (&Guid, Write, 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 EfiCallEsalService (&Guid, EraseBlock, Instance, Lba, 0, 0, 0, 0, 0).Status; + return EsalCall (&Guid, EraseBlock, 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 EfiCallEsalService (&Guid, SetVolumeAttributes, Instance, (UINT64) Attributes, 0, 0, 0, 0, 0).Status; + return EsalCall (&Guid, SetVolumeAttributes, 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 EfiCallEsalService (&Guid, SetVolumeAttributes, Instance, (UINT64) Attributes, 0, 0, 0, 0, 0).Status; + return EsalCall (&Guid, SetVolumeAttributes, 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 EfiCallEsalService (&Guid, GetPhysicalAddress, Instance, (UINT64) BaseAddress, 0, 0, 0, 0, 0).Status; + return EsalCall (&Guid, GetPhysicalAddress, Instance, (UINT64) BaseAddress, 0, 0, 0, 0, 0).Status; } EFI_STATUS @@ -278,7 +278,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 EfiCallEsalService ( + return EsalCall ( &Guid, GetBlockSize, Instance, @@ -322,7 +322,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 EfiCallEsalService ( + return EsalCall ( &Guid, EraseCustomBlockRange, Instance, diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa b/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa index 803a791a4a..d68ca030ad 100644 --- a/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa +++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa @@ -32,8 +32,8 @@ UefiBootServicesTableLib - - EdkDxeSalLib + + ExtendedSalLib diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c index 71a7bf9b6c..65ec0a418b 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 = EfiCallEsalService (&Guid, IsEfiRuntime, 0, 0, 0, 0, 0, 0, 0); + ReturnReg = EsalCall (&Guid, IsEfiRuntime, 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 = EfiCallEsalService (&Guid, IsVirtual, 0, 0, 0, 0, 0, 0, 0); + ReturnReg = EsalCall (&Guid, IsVirtual, 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 0760bfa074..ba8cacd44c 100644 --- a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c +++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c @@ -50,7 +50,7 @@ Returns: *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_RESET_SERVICES_PROTOCOL_GUID_LO; *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_RESET_SERVICES_PROTOCOL_GUID_HI; - EfiCallEsalService ( + EsalCall ( &Guid, ResetSystem, (UINT64) ResetType, @@ -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 = EfiCallEsalService (&Guid, GetTime, (UINT64) Time, (UINT64) Capabilities, 0, 0, 0, 0, 0); + ReturnReg = EsalCall (&Guid, GetTime, (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 = EfiCallEsalService (&Guid, SetTime, (UINT64) Time, 0, 0, 0, 0, 0, 0); + ReturnReg = EsalCall (&Guid, SetTime, (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 = EfiCallEsalService (&Guid, GetWakeupTime, (UINT64) Enabled, (UINT64) Pending, (UINT64) Time, 0, 0, 0, 0); + ReturnReg = EsalCall (&Guid, GetWakeupTime, (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 = EfiCallEsalService (&Guid, SetWakeupTime, (UINT64) Enable, (UINT64) Time, 0, 0, 0, 0, 0); + ReturnReg = EsalCall (&Guid, SetWakeupTime, (UINT64) Enable, (UINT64) Time, 0, 0, 0, 0, 0); return ReturnReg.Status; } @@ -241,7 +241,7 @@ Returns: *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_LO; *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_HI; - ReturnReg = EfiCallEsalService ( + ReturnReg = EsalCall ( &Guid, EsalGetVariable, (UINT64) VariableName, @@ -291,7 +291,7 @@ Returns: *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_LO; *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_HI; - ReturnReg = EfiCallEsalService ( + ReturnReg = EsalCall ( &Guid, EsalGetNextVariableName, (UINT64) VariableNameSize, @@ -341,7 +341,7 @@ Returns: *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_LO; *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_HI; - ReturnReg = EfiCallEsalService ( + ReturnReg = EsalCall ( &Guid, EsalSetVariable, (UINT64) VariableName, @@ -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 = EfiCallEsalService (&Guid, GetNextHighMonotonicCount, (UINT64) HighCount, 0, 0, 0, 0, 0, 0); + ReturnReg = EsalCall (&Guid, GetNextHighMonotonicCount, (UINT64) HighCount, 0, 0, 0, 0, 0, 0); return (EFI_STATUS) ReturnReg.Status; } @@ -499,7 +499,7 @@ EfiSetVirtualAddressMap ( *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_VIRTUAL_SERVICES_PROTOCOL_GUID_LO; *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_VIRTUAL_SERVICES_PROTOCOL_GUID_HI; - ReturnReg = EfiCallEsalService ( + ReturnReg = EsalCall ( &Guid, SetVirtualAddress, (UINT64) MemoryMapSize, diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa index e0f66f981f..d4102d2b06 100644 --- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa +++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa @@ -37,9 +37,6 @@ UefiDriverEntryPoint - - EdkDxeSalLib - UefiBootServicesTableLib @@ -49,6 +46,9 @@ BaseLib + + ExtendedSalLib + Variable.h diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa index 5935bdd8f5..2d00817950 100644 --- a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa +++ b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa @@ -6,17 +6,15 @@ FEDE0A1B-BCA2-4A9F-BB2B-D9FD7DEC2E9F 1.0 DXE status code driver. - - Status Code Architectural Protocol implementation as defined in Tiano - Architecture Specification. This driver has limited functionality - at runtime and will not log to Data Hub at runtime. - + Status Code Architectural Protocol implementation as defined in Tiano + Architecture Specification. This driver has limited functionality + at runtime and will not log to Data Hub at runtime. Copyright (c) 2006, Intel Corporation. - All rights reserved. This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + All rights reserved. This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052 @@ -68,8 +66,8 @@ OemHookStatusCodeLib - - EdkDxeSalLib + + ExtendedSalLib @@ -105,7 +103,7 @@ gEfiStatusCodeRuntimeProtocolGuid - + gMemoryStatusCodeRecordGuid diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa index 741689ff33..73f2b0ddd6 100644 --- a/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa +++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa @@ -43,9 +43,6 @@ EdkFvbServiceLib - - EdkDxeSalLib - UefiBootServicesTableLib @@ -58,6 +55,9 @@ MemoryAllocationLib + + ExtendedSalLib + Variable.h -- 2.39.2