1) Fix bug in EdkUefiRuntimeLib.msa(EDKT155).

2) Update the Status code related drivers' source file list in.msa

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

diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa b/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
index abada2c5d02f4119d82e77df8a4843e1a663a646..ec98d5c0b5d78f267d22564677bfc506b6abf105 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
@@ -81,9 +81,5 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Constructor>RuntimeDriverLibConstruct</Constructor>\r
       <Destructor>RuntimeDriverLibDeconstruct</Destructor>\r
     </Extern>\r
       <Constructor>RuntimeDriverLibConstruct</Constructor>\r
       <Destructor>RuntimeDriverLibDeconstruct</Destructor>\r
     </Extern>\r

-    <Extern>\r
-      <Constructor>RuntimeDriverLibConstruct</Constructor>\r
-      <Destructor>RuntimeDriverLibDeconstruct</Destructor>\r
-    </Extern>\r

   </Externs>\r
 </ModuleSurfaceArea>
\ No newline at end of file
   </Externs>\r
 </ModuleSurfaceArea>
\ No newline at end of file

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/Common/DxeStatusCodeCommon.c b/EdkModulePkg/Universal/StatusCode/Dxe/Common/DxeStatusCodeCommon.c
index dd17b160441a19a8d6cbd4c416f69b497b60f76b..1249284d5dd454dcb77963b56a809bf2834de04c 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Dxe/Common/DxeStatusCodeCommon.c
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/Common/DxeStatusCodeCommon.c
@@ -79,7 +79,6 @@ DXE_STATUS_CODE_CONTROLLER gDxeStatusCode = {
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

-EFIAPI\r

 DxeStatusCodeDriverEntry (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r
 DxeStatusCodeDriverEntry (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
index bf45531568a993f22cb94c4efb6f1405d6b49178..7990138228d7c328fa1dcdd4fc42781a0f6570b0 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
@@ -83,6 +83,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r

+    <Filename>DxeStatusCode.h</Filename>\r

     <Filename>DxeStatusCode.c</Filename>\r
     <Filename>DataHubStatusCodeWorker.c</Filename>\r
     <Filename>RtMemoryStatusCodeWorker.c</Filename>\r
     <Filename>DxeStatusCode.c</Filename>\r
     <Filename>DataHubStatusCodeWorker.c</Filename>\r
     <Filename>RtMemoryStatusCodeWorker.c</Filename>\r


@@ -135,52 +136,52 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <PcdCoded>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeUseHardSerial</C_Name>\r
   <PcdCoded>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeUseHardSerial</C_Name>\r

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r

       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeUseEfiSerial</C_Name>\r
       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeUseEfiSerial</C_Name>\r

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r

       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeUseRuntimeMemory</C_Name>\r
       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeUseRuntimeMemory</C_Name>\r

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r

       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeUseDataHub</C_Name>\r
       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeUseDataHub</C_Name>\r

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r

       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeUseOEM</C_Name>\r
       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeUseOEM</C_Name>\r

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r

       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeReplayInSerial</C_Name>\r
       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeReplayInSerial</C_Name>\r

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r

       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeReplayInDataHub</C_Name>\r
       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeReplayInDataHub</C_Name>\r

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r

       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeReplayInRuntimeMemory</C_Name>\r
       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeReplayInRuntimeMemory</C_Name>\r

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r

       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeReplayInOEM</C_Name>\r
       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeReplayInOEM</C_Name>\r

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r

       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="DYNAMIC">\r
       <C_Name>PcdStatusCodeRuntimeMemory</C_Name>\r
       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="DYNAMIC">\r
       <C_Name>PcdStatusCodeRuntimeMemory</C_Name>\r

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r

       <HelpText/>\r
     </PcdEntry>\r
   </PcdCoded>\r
       <HelpText/>\r
     </PcdEntry>\r
   </PcdCoded>\r

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c b/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c
index 018cd4231bcb887460d9b2658667c7e7b68a25df..47442a97644dd17e31b9f3047bd17200dd3fbe61 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c
@@ -145,7 +145,6 @@ ReportEsalServiceEntry (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

-EFIAPI\r

 DxeStatusCodeDriverEntry (\r
   IN EFI_HANDLE        ImageHandle,\r
   IN EFI_SYSTEM_TABLE  *SystemTable\r
 DxeStatusCodeDriverEntry (\r
   IN EFI_HANDLE        ImageHandle,\r
   IN EFI_SYSTEM_TABLE  *SystemTable\r

diff --git a/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c b/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
index c1e449059499723739d23e78a6d112afac0a9f27..3de5f58cf395f51f5b23a403c85efff7d6edbaf9 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
+++ b/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
@@ -140,7 +140,6 @@ ReportDispatcher (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

-EFIAPI\r

 PeiStatusCodeDriverEntry (\r
   IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
   IN EFI_PEI_SERVICES          **PeiServices\r
 PeiStatusCodeDriverEntry (\r
   IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
   IN EFI_PEI_SERVICES          **PeiServices\r

diff --git a/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.msa b/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.msa
index c90e0a3a089b363541d5809821aea707d4ab4bfa..6d0133c91014020c729744e259a30d5fffb53e65 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.msa
+++ b/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.msa
@@ -64,10 +64,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r

+    <Filename>PeiStatusCode.h</Filename>\r

     <Filename>SerialStatusCodeWorker.c</Filename>\r
     <Filename>MemoryStausCodeWorker.c</Filename>\r
     <Filename>PeiStatusCode.c</Filename>\r
     <Filename>SerialStatusCodeWorker.c</Filename>\r
     <Filename>MemoryStausCodeWorker.c</Filename>\r
     <Filename>PeiStatusCode.c</Filename>\r

-    <Filename>PeiStatusCode.c</Filename>\r

   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r


@@ -93,22 +93,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <PcdCoded>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeUseSerial</C_Name>\r
   <PcdCoded>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeUseSerial</C_Name>\r

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r

       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeUseMemory</C_Name>\r
       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeUseMemory</C_Name>\r

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r

       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeUseOEM</C_Name>\r
       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="FEATURE_FLAG">\r
       <C_Name>PcdStatusCodeUseOEM</C_Name>\r

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r

       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="DYNAMIC">\r
       <C_Name>PcdStatusCodeMemorySize</C_Name>\r
       <HelpText/>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="DYNAMIC">\r
       <C_Name>PcdStatusCodeMemorySize</C_Name>\r

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r

       <HelpText/>\r
     </PcdEntry>\r
   </PcdCoded>\r
       <HelpText/>\r
     </PcdEntry>\r
   </PcdCoded>\r