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

5 files changed, 16 insertions, 18 deletions

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/Common/DxeStatusCodeCommon.c b/EdkModulePkg/Universal/StatusCode/Dxe/Common/DxeStatusCodeCommon.c
index dd17b16044..1249284d5d 100644
--- 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 = {
 

 **/

 EFI_STATUS

-EFIAPI

 DxeStatusCodeDriverEntry (

   IN EFI_HANDLE         ImageHandle,

   IN EFI_SYSTEM_TABLE   *SystemTable

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
index bf45531568..7990138228 100644
--- 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>

   </LibraryClassDefinitions>

   <SourceFiles>

+    <Filename>DxeStatusCode.h</Filename>

     <Filename>DxeStatusCode.c</Filename>

     <Filename>DataHubStatusCodeWorker.c</Filename>

     <Filename>RtMemoryStatusCodeWorker.c</Filename>

@@ -135,52 +136,52 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <PcdCoded>

     <PcdEntry PcdItemType="FEATURE_FLAG">

       <C_Name>PcdStatusCodeUseHardSerial</C_Name>

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText/>

     </PcdEntry>

     <PcdEntry PcdItemType="FEATURE_FLAG">

       <C_Name>PcdStatusCodeUseEfiSerial</C_Name>

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText/>

     </PcdEntry>

     <PcdEntry PcdItemType="FEATURE_FLAG">

       <C_Name>PcdStatusCodeUseRuntimeMemory</C_Name>

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText/>

     </PcdEntry>

     <PcdEntry PcdItemType="FEATURE_FLAG">

       <C_Name>PcdStatusCodeUseDataHub</C_Name>

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText/>

     </PcdEntry>

     <PcdEntry PcdItemType="FEATURE_FLAG">

       <C_Name>PcdStatusCodeUseOEM</C_Name>

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText/>

     </PcdEntry>

     <PcdEntry PcdItemType="FEATURE_FLAG">

       <C_Name>PcdStatusCodeReplayInSerial</C_Name>

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText/>

     </PcdEntry>

     <PcdEntry PcdItemType="FEATURE_FLAG">

       <C_Name>PcdStatusCodeReplayInDataHub</C_Name>

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText/>

     </PcdEntry>

     <PcdEntry PcdItemType="FEATURE_FLAG">

       <C_Name>PcdStatusCodeReplayInRuntimeMemory</C_Name>

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText/>

     </PcdEntry>

     <PcdEntry PcdItemType="FEATURE_FLAG">

       <C_Name>PcdStatusCodeReplayInOEM</C_Name>

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText/>

     </PcdEntry>

     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdStatusCodeRuntimeMemory</C_Name>

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText/>

     </PcdEntry>

   </PcdCoded>

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c b/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c
index 018cd4231b..47442a9764 100644
--- a/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c
@@ -145,7 +145,6 @@ ReportEsalServiceEntry (
 

 **/

 EFI_STATUS

-EFIAPI

 DxeStatusCodeDriverEntry (

   IN EFI_HANDLE        ImageHandle,

   IN EFI_SYSTEM_TABLE  *SystemTable

diff --git a/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c b/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
index c1e4490594..3de5f58cf3 100644
--- a/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
+++ b/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
@@ -140,7 +140,6 @@ ReportDispatcher (
 

 **/

 EFI_STATUS

-EFIAPI

 PeiStatusCodeDriverEntry (

   IN EFI_FFS_FILE_HEADER       *FfsHeader,

   IN EFI_PEI_SERVICES          **PeiServices

diff --git a/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.msa b/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.msa
index c90e0a3a08..6d0133c910 100644
--- 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>

   </LibraryClassDefinitions>

   <SourceFiles>

+    <Filename>PeiStatusCode.h</Filename>

     <Filename>SerialStatusCodeWorker.c</Filename>

     <Filename>MemoryStausCodeWorker.c</Filename>

     <Filename>PeiStatusCode.c</Filename>

-    <Filename>PeiStatusCode.c</Filename>

   </SourceFiles>

   <PackageDependencies>

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

@@ -93,22 +93,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <PcdCoded>

     <PcdEntry PcdItemType="FEATURE_FLAG">

       <C_Name>PcdStatusCodeUseSerial</C_Name>

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText/>

     </PcdEntry>

     <PcdEntry PcdItemType="FEATURE_FLAG">

       <C_Name>PcdStatusCodeUseMemory</C_Name>

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText/>

     </PcdEntry>

     <PcdEntry PcdItemType="FEATURE_FLAG">

       <C_Name>PcdStatusCodeUseOEM</C_Name>

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText/>

     </PcdEntry>

     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdStatusCodeMemorySize</C_Name>

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText/>

     </PcdEntry>

   </PcdCoded>