removing the dependency on EDKDxeSalLib and EdxDxeRuntimeSalLib, instead using DxeExt...

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

diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa b/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
index 2aa7abb34dc53b8989cb3192b09482e112a03acc..b1d068882fb8fc841208592cfdd53d04648ac89e 100644 (file)
--- a/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
+++ b/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
@@ -43,8 +43,8 @@
     <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">\r
-      <Keyword>EdkDxeSalLib</Keyword>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>ExtendedSalLib</Keyword>\r
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r

diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/Ipf/Fvb.c b/EdkModulePkg/Library/EdkFvbServiceLib/Ipf/Fvb.c
index fe596e6a36b16f17c7f57dbc7679cf2b168c82fc..38a215b763965904bcb140765be7b26d625d6616 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 EfiCallEsalService (&Guid, Read, Instance, Lba, Offset, (UINT64) NumBytes, (UINT64) Buffer, 0, 0).Status;\r
+  return EsalCall (&Guid, Read, 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 EfiCallEsalService (&Guid, Write, Instance, Lba, Offset, (UINT64) NumBytes, (UINT64) Buffer, 0, 0).Status;\r
+  return EsalCall (&Guid, Write, 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 EfiCallEsalService (&Guid, EraseBlock, Instance, Lba, 0, 0, 0, 0, 0).Status;\r
+  return EsalCall (&Guid, EraseBlock, 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 EfiCallEsalService (&Guid, SetVolumeAttributes, Instance, (UINT64) Attributes, 0, 0, 0, 0, 0).Status;\r
+  return EsalCall (&Guid, SetVolumeAttributes, 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 EfiCallEsalService (&Guid, SetVolumeAttributes, Instance, (UINT64) Attributes, 0, 0, 0, 0, 0).Status;\r
+  return EsalCall (&Guid, SetVolumeAttributes, 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 EfiCallEsalService (&Guid, GetPhysicalAddress, Instance, (UINT64) BaseAddress, 0, 0, 0, 0, 0).Status;\r
+  return EsalCall (&Guid, GetPhysicalAddress, Instance, (UINT64) BaseAddress, 0, 0, 0, 0, 0).Status;\r
 }\r
 \r
 EFI_STATUS\r
@@ -278,7 +278,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 EfiCallEsalService (\r
+  return EsalCall (\r
           &Guid,\r
           GetBlockSize,\r
           Instance,\r
@@ -322,7 +322,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 EfiCallEsalService (\r
+  return EsalCall (\r
           &Guid,\r
           EraseCustomBlockRange,\r
           Instance,\r

diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa b/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
index 803a791a4a7c1fd6f8b97afe49a0c22e485c808e..d68ca030ad3e1cab2840a3ad8136c2e955448679 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
@@ -32,8 +32,8 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">\r
-      <Keyword>EdkDxeSalLib</Keyword>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>ExtendedSalLib</Keyword>\r
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r

diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c
index 71a7bf9b6c908c2a88bc3b76f755a0e38379e74d..65ec0a418b6ed2b13f8b1909ebd32c26def24112 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 = EfiCallEsalService (&Guid, IsEfiRuntime, 0, 0, 0, 0, 0, 0, 0);\r
+  ReturnReg = EsalCall (&Guid, IsEfiRuntime, 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 = EfiCallEsalService (&Guid, IsVirtual, 0, 0, 0, 0, 0, 0, 0);\r
+  ReturnReg = EsalCall (&Guid, IsVirtual, 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 0760bfa074e7aa26cbd60ac05fc46e3a324cf483..ba8cacd44c4b19410e30da6ad11ccc9c239ab520 100644 (file)
--- 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;\r
   *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_RESET_SERVICES_PROTOCOL_GUID_HI;\r
 \r
-  EfiCallEsalService (\r
+  EsalCall (\r
     &Guid,\r
     ResetSystem,\r
     (UINT64) ResetType,\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 = EfiCallEsalService (&Guid, GetTime, (UINT64) Time, (UINT64) Capabilities, 0, 0, 0, 0, 0);\r
+  ReturnReg = EsalCall (&Guid, GetTime, (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 = EfiCallEsalService (&Guid, SetTime, (UINT64) Time, 0, 0, 0, 0, 0, 0);\r
+  ReturnReg = EsalCall (&Guid, SetTime, (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 = EfiCallEsalService (&Guid, GetWakeupTime, (UINT64) Enabled, (UINT64) Pending, (UINT64) Time, 0, 0, 0, 0);\r
+  ReturnReg = EsalCall (&Guid, GetWakeupTime, (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 = EfiCallEsalService (&Guid, SetWakeupTime, (UINT64) Enable, (UINT64) Time, 0, 0, 0, 0, 0);\r
+  ReturnReg = EsalCall (&Guid, SetWakeupTime, (UINT64) Enable, (UINT64) Time, 0, 0, 0, 0, 0);\r
   return ReturnReg.Status;\r
 }\r
 \r
@@ -241,7 +241,7 @@ Returns:
   *((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
+  ReturnReg = EsalCall (\r
                 &Guid,\r
                 EsalGetVariable,\r
                 (UINT64) VariableName,\r
@@ -291,7 +291,7 @@ Returns:
   *((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
+  ReturnReg = EsalCall (\r
                 &Guid,\r
                 EsalGetNextVariableName,\r
                 (UINT64) VariableNameSize,\r
@@ -341,7 +341,7 @@ Returns:
   *((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
+  ReturnReg = EsalCall (\r
                 &Guid,\r
                 EsalSetVariable,\r
                 (UINT64) VariableName,\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 = EfiCallEsalService (&Guid, GetNextHighMonotonicCount, (UINT64) HighCount, 0, 0, 0, 0, 0, 0);\r
+  ReturnReg = EsalCall (&Guid, GetNextHighMonotonicCount, (UINT64) HighCount, 0, 0, 0, 0, 0, 0);\r
   return (EFI_STATUS) ReturnReg.Status;\r
 }\r
 \r
@@ -499,7 +499,7 @@ EfiSetVirtualAddressMap (
   *((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
+  ReturnReg = EsalCall (\r
                 &Guid,\r
                 SetVirtualAddress,\r
                 (UINT64) MemoryMapSize,\r

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa
index e0f66f981f27e5315ab88ff4835da7f6a8a83632..d4102d2b0642000b7877c3b0eb8e9cb6b7195649 100644 (file)
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa
@@ -37,9 +37,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>EdkDxeSalLib</Keyword>\r
-    </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r
@@ -49,6 +46,9 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseLib</Keyword>\r
     </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>ExtendedSalLib</Keyword>\r
+    </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>Variable.h</Filename>\r

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
index 5935bdd8f55687cf34519c056a5bcba741733499..2d0081795080f2ab73f80a412ec218a8027f49ab 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
@@ -6,17 +6,15 @@
     <GuidValue>FEDE0A1B-BCA2-4A9F-BB2B-D9FD7DEC2E9F</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>DXE status code driver.</Abstract>\r
-    <Description>\r
-      Status Code Architectural Protocol implementation as defined in Tiano\r
-      Architecture Specification. This driver has limited functionality \r
-      at runtime and will not log to Data Hub at runtime.\r
-    </Description>\r
+    <Description>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.</Description>\r
     <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
-    <License>All rights reserved. This program and the accompanying materials\r
-      are licensed and made available under the terms and conditions of the BSD License\r
-      which accompanies this distribution.  The full text of the license may be found at\r
-      http://opensource.org/licenses/bsd-license.php\r
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+    <License>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.</License>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
@@ -68,8 +66,8 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>OemHookStatusCodeLib</Keyword>\r
     </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">\r
-      <Keyword>EdkDxeSalLib</Keyword>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>ExtendedSalLib</Keyword>\r
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
@@ -105,7 +103,7 @@
       <ProtocolCName>gEfiStatusCodeRuntimeProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r
-  <Guids> \r
+  <Guids>\r
     <GuidCNames Usage="SOMETIMES_CONSUMED">\r
       <GuidCName>gMemoryStatusCodeRecordGuid</GuidCName>\r
     </GuidCNames>\r

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa
index 741689ff3329cdd5d88a4f5fbb6b96e3ebbc4aa3..73f2b0ddd61ac4537dfb434d452b7a8177f7221c 100644 (file)
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa
@@ -43,9 +43,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>EdkFvbServiceLib</Keyword>\r
     </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>EdkDxeSalLib</Keyword>\r
-    </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r
@@ -58,6 +55,9 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>MemoryAllocationLib</Keyword>\r
     </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>ExtendedSalLib</Keyword>\r
+    </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>Variable.h</Filename>\r