Fix bug which define different PCD with same token number in EdkModulePkg.spd.

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

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 218156b58d090ba8b057b40814ca2a9e86343f45..6d8b4cd2bfaff6eeac0a168e58d40adf321be450 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -967,7 +967,7 @@
     </PcdEntry>\r
     <PcdEntry>\r
       <C_Name>PcdStatusCodeReplayInOEM</C_Name>\r
     </PcdEntry>\r
     <PcdEntry>\r
       <C_Name>PcdStatusCodeReplayInOEM</C_Name>\r

-      <Token>0x0001002c</Token>\r
+      <Token>0x0001002d</Token>\r

       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>BOOLEAN</DatumType>\r
       <ValidUsage>FEATURE_FLAG</ValidUsage>\r
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>BOOLEAN</DatumType>\r
       <ValidUsage>FEATURE_FLAG</ValidUsage>\r


@@ -976,7 +976,7 @@
     </PcdEntry>\r
     <PcdEntry>\r
       <C_Name>PcdStatusCodeRuntimeMemorySize</C_Name>\r
     </PcdEntry>\r
     <PcdEntry>\r
       <C_Name>PcdStatusCodeRuntimeMemorySize</C_Name>\r

-      <Token>0x0001002d</Token>\r
+      <Token>0x0001002e</Token>\r

       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT16</DatumType>\r
       <ValidUsage>DYNAMIC</ValidUsage>\r
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT16</DatumType>\r
       <ValidUsage>DYNAMIC</ValidUsage>\r

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c b/EdkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c
index 9f1f922269883b02f8781966acd162fb2c325f53..e65294f370f9f58e053f5877c491e473cdd72617 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c
@@ -170,7 +170,7 @@ SerialStatusCodeReportWorker (
     //\r
     // Callout to SerialPort Lib function to do print.\r
     //\r
     //\r
     // Callout to SerialPort Lib function to do print.\r
     //\r

-    SerialPortWrite (Buffer, CharCount);\r
+    SerialPortWrite ((UINT8 *) Buffer, CharCount);\r

   }\r
   if (FeaturePcdGet (PcdStatusCodeUseEfiSerial)) {\r
     SerialIoProtocol->Write (\r
   }\r
   if (FeaturePcdGet (PcdStatusCodeUseEfiSerial)) {\r
     SerialIoProtocol->Write (\r

diff --git a/EdkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c b/EdkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c
index fc22b624eceeaeee5cc859004714b306fccad85e..049e4ef778e33001c7f64262494a2c3e40cf5294 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c
+++ b/EdkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c
@@ -141,7 +141,7 @@ SerialStatusCodeReportWorker (
   //\r
   // Callout to SerialPort Lib function to do print.\r
   //\r
   //\r
   // Callout to SerialPort Lib function to do print.\r
   //\r

-  SerialPortWrite (Buffer, CharCount);\r
+  SerialPortWrite ((UINT8 *) Buffer, CharCount);\r

 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r