Increase source portability by replace the use of EFI_STATUS_CODE_DATA_MAX_SIZE with...

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

diff --git a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
index fd77f7f904dbd0f63ca1e83a5e2a27aad858ef15..8000df7e7766be64ff2d85c2c7ead3a08fa40892 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
@@ -78,12 +78,12 @@ DebugPrint (
   //\r
   // If the TotalSize is larger than the maximum record size, then ASSERT()\r
   //\r
-  ASSERT (TotalSize <= EFI_STATUS_CODE_DATA_MAX_SIZE);\r
+  ASSERT (TotalSize <= sizeof (Buffer));\r
 \r
   //\r
   // If the TotalSize is larger than the maximum record size, then return\r
   //\r
-  if (TotalSize > EFI_STATUS_CODE_DATA_MAX_SIZE) {\r
+  if (TotalSize > sizeof (Buffer)) {\r
     return;\r
   }\r
 \r
@@ -259,7 +259,7 @@ DebugAssert (
   FileNameLength    = AsciiStrLen (FileName);\r
   DescriptionLength = AsciiStrLen (Description);\r
   TotalSize = sizeof (EFI_DEBUG_ASSERT_DATA) + FileNameLength + 1 + DescriptionLength + 1;\r
-  if (TotalSize <= EFI_STATUS_CODE_DATA_MAX_SIZE) {\r
+  if (TotalSize <= sizeof (Buffer)) {\r
     //\r
     // Fill in EFI_DEBUG_ASSERT_DATA\r
     //\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c
index 00aa41cb21f253f2c04d67035a91b7be58b021b6..1b409310cf230efbcf9874cefcbd92368440c573 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c
@@ -62,7 +62,7 @@ SerialStatusCodeReportWorker (
     //\r
     CharCount = AsciiSPrint (\r
                   Buffer,\r
-                  EFI_STATUS_CODE_DATA_MAX_SIZE,\r
+                  sizeof (Buffer),\r
                   "\n\rPEI_ASSERT!: %a (%d): %a\n\r",\r
                   Filename,\r
                   LineNumber,\r
@@ -75,7 +75,7 @@ SerialStatusCodeReportWorker (
     //\r
     CharCount = AsciiBSPrint (\r
                   Buffer,\r
-                  EFI_STATUS_CODE_DATA_MAX_SIZE,\r
+                  sizeof (Buffer),\r
                   Format,\r
                   Marker\r
                   );\r
@@ -85,7 +85,7 @@ SerialStatusCodeReportWorker (
     //\r
     CharCount = AsciiSPrint (\r
                   Buffer,\r
-                  EFI_STATUS_CODE_DATA_MAX_SIZE,\r
+                  sizeof (Buffer),\r
                   "ERROR: C%x:V%x I%x",\r
                   CodeType,\r
                   Value,\r
@@ -95,7 +95,7 @@ SerialStatusCodeReportWorker (
     if (CallerId != NULL) {\r
       CharCount += AsciiSPrint (\r
                      &Buffer[CharCount - 1],\r
-                     (EFI_STATUS_CODE_DATA_MAX_SIZE - (sizeof (Buffer[0]) * CharCount)),\r
+                     (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)),\r
                      " %g",\r
                      CallerId\r
                      );\r
@@ -104,7 +104,7 @@ SerialStatusCodeReportWorker (
     if (Data != NULL) {\r
       CharCount += AsciiSPrint (\r
                      &Buffer[CharCount - 1],\r
-                     (EFI_STATUS_CODE_DATA_MAX_SIZE - (sizeof (Buffer[0]) * CharCount)),\r
+                     (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)),\r
                      " %x",\r
                      Data\r
                      );\r
@@ -112,7 +112,7 @@ SerialStatusCodeReportWorker (
 \r
     CharCount += AsciiSPrint (\r
                    &Buffer[CharCount - 1],\r
-                   (EFI_STATUS_CODE_DATA_MAX_SIZE - (sizeof (Buffer[0]) * CharCount)),\r
+                   (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)),\r
                    "\n\r"\r
                    );\r
   } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) {\r
@@ -121,7 +121,7 @@ SerialStatusCodeReportWorker (
     //\r
     CharCount = AsciiSPrint (\r
                   Buffer,\r
-                  EFI_STATUS_CODE_DATA_MAX_SIZE,\r
+                  sizeof (Buffer),\r
                   "PROGRESS CODE: V%x I%x\n\r",\r
                   Value,\r
                   Instance\r
@@ -132,7 +132,7 @@ SerialStatusCodeReportWorker (
     //\r
     CharCount = AsciiSPrint (\r
                   Buffer,\r
-                  EFI_STATUS_CODE_DATA_MAX_SIZE,\r
+                  sizeof (Buffer),\r
                   "Undefined: C%x:V%x I%x\n\r",\r
                   CodeType,\r
                   Value,\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/SerialStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/SerialStatusCodeWorker.c
index cf5d48d66591d6b7a0fa829eff4ffcffbff24ab5..1d5f53e47910518ebfb140d2e369d81749da832b 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/SerialStatusCodeWorker.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/SerialStatusCodeWorker.c
@@ -96,7 +96,7 @@ SerialStatusCodeReportWorker (
     //\r
     CharCount = AsciiSPrint (\r
                   Buffer,\r
-                  EFI_STATUS_CODE_DATA_MAX_SIZE,\r
+                  sizeof (Buffer),\r
                   "\n\rDXE_ASSERT!: %a (%d): %a\n\r",\r
                   Filename,\r
                   LineNumber,\r
@@ -109,7 +109,7 @@ SerialStatusCodeReportWorker (
     //\r
     CharCount = AsciiBSPrint (\r
                   Buffer, \r
-                  EFI_STATUS_CODE_DATA_MAX_SIZE, \r
+                  sizeof (Buffer), \r
                   Format, \r
                   Marker\r
                   );\r
@@ -119,7 +119,7 @@ SerialStatusCodeReportWorker (
     //\r
     CharCount = AsciiSPrint (\r
                   Buffer, \r
-                  EFI_STATUS_CODE_DATA_MAX_SIZE, \r
+                  sizeof (Buffer), \r
                   "ERROR: C%x:V%x I%x", \r
                   CodeType, \r
                   Value, \r
@@ -129,7 +129,7 @@ SerialStatusCodeReportWorker (
     if (CallerId != NULL) {\r
       CharCount += AsciiSPrint (\r
                      &Buffer[CharCount - 1],\r
-                     (EFI_STATUS_CODE_DATA_MAX_SIZE - (sizeof (Buffer[0]) * CharCount)),\r
+                     (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)),\r
                      " %g",\r
                      CallerId\r
                      );\r
@@ -138,7 +138,7 @@ SerialStatusCodeReportWorker (
     if (Data != NULL) {\r
       CharCount += AsciiSPrint (\r
                      &Buffer[CharCount - 1],\r
-                     (EFI_STATUS_CODE_DATA_MAX_SIZE - (sizeof (Buffer[0]) * CharCount)),\r
+                     (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)),\r
                      " %x",\r
                      Data\r
                      );\r
@@ -146,7 +146,7 @@ SerialStatusCodeReportWorker (
 \r
     CharCount += AsciiSPrint (\r
                    &Buffer[CharCount - 1],\r
-                   (EFI_STATUS_CODE_DATA_MAX_SIZE - (sizeof (Buffer[0]) * CharCount)),\r
+                   (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)),\r
                    "\n\r"\r
                    );\r
   } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) {\r
@@ -155,7 +155,7 @@ SerialStatusCodeReportWorker (
     //\r
     CharCount = AsciiSPrint (\r
                   Buffer, \r
-                  EFI_STATUS_CODE_DATA_MAX_SIZE, \r
+                  sizeof (Buffer), \r
                   "PROGRESS CODE: V%x I%x\n\r", \r
                   Value, \r
                   Instance\r
@@ -166,7 +166,7 @@ SerialStatusCodeReportWorker (
     //\r
     CharCount = AsciiSPrint (\r
                   Buffer, \r
-                  EFI_STATUS_CODE_DATA_MAX_SIZE, \r
+                  sizeof (Buffer), \r
                   "Undefined: C%x:V%x I%x\n\r", \r
                   CodeType, \r
                   Value, \r