Fix VS2003 cast issue

[mirror_edk2.git] / DuetPkg / DxeIpl / SerialStatusCode.c

diff --git a/DuetPkg/DxeIpl/SerialStatusCode.c b/DuetPkg/DxeIpl/SerialStatusCode.c
index 1112273373a6cf95e8e1ec5c3c55ec960c1c18fb..5bab29a1aa6a14ee5dcf232da260c8842e17839e 100644 (file)
--- a/DuetPkg/DxeIpl/SerialStatusCode.c
+++ b/DuetPkg/DxeIpl/SerialStatusCode.c
@@ -542,21 +542,6 @@ STATUS_CODE_LOOKUP_TABLE mOperationToken[] = {
   };\r
 \r
 \r
-//\r
-// Private function declarations\r
-//\r
-UINT8\r
-CpuIoRead8 (\r
-  UINT16  Port \r
-  );\r
-\r
-VOID\r
-CpuIoWrite8 (\r
-  UINT16  Port,    \r
-  UINT32  Data   \r
-  );\r
-\r
-\r
 EFI_STATUS\r
 MatchString (\r
   IN  STATUS_CODE_LOOKUP_TABLE  *Table,\r
@@ -648,10 +633,10 @@ Returns:
   // Wait for the serail port to be ready.\r
   //\r
   do {\r
-    Data = CpuIoRead8 (gComBase + LSR_OFFSET);\r
+    Data = IoRead8 (gComBase + LSR_OFFSET);\r
   } while ((Data & LSR_TXRDY) == 0);\r
     \r
-  CpuIoWrite8 (gComBase, Character);\r
+  IoWrite8 (gComBase, Character);\r
 }\r
 \r
 VOID\r
@@ -674,10 +659,6 @@ Returns:
 \r
 --*/\r
 {\r
-  EFI_STATUS  Status;\r
-\r
-  Status = EFI_SUCCESS;\r
-\r
   for ( ; *OutputString != 0; OutputString++) {\r
     DebugSerialWrite (*OutputString);\r
   }\r
@@ -714,7 +695,7 @@ Returns:
   CHAR8                   *Filename;\r
   CHAR8                   *Description;\r
   CHAR8                   *Format;\r
-  VA_LIST                 Marker;\r
+  BASE_LIST               Marker;\r
   UINT32                  ErrorLevel;\r
   UINTN                   CharCount;\r
 \r
@@ -727,7 +708,7 @@ Returns:
     //\r
     AsciiSPrint (\r
       Buffer,\r
-      EFI_STATUS_CODE_DATA_MAX_SIZE,\r
+      sizeof (Buffer),\r
       "\nPEI_ASSERT!: %a (%d): %a\n",\r
       Filename,\r
       LineNumber,\r
@@ -739,23 +720,23 @@ Returns:
     //\r
     // Process PEI_DEBUG () macro to Serial\r
     //\r
-    AsciiVSPrint (Buffer, EFI_STATUS_CODE_DATA_MAX_SIZE, Format, Marker);\r
+    AsciiBSPrint (Buffer, sizeof (Buffer), Format, Marker);\r
 \r
   } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) { \r
     //\r
     // Process Errors\r
     //\r
-    CharCount = AsciiSPrint (Buffer, EFI_STATUS_CODE_DATA_MAX_SIZE, "ERROR: C%x:V%x I%x", CodeType, Value, Instance);\r
+    CharCount = AsciiSPrint (Buffer, sizeof (Buffer), "ERROR: C%x:V%x I%x", CodeType, Value, Instance);\r
     //\r
     // Make sure we don't try to print values that weren't intended to be printed, especially NULL GUID pointers.\r
     //\r
     if (CallerId) {\r
-      CharCount += AsciiSPrint (&Buffer[CharCount - 1], (EFI_STATUS_CODE_DATA_MAX_SIZE - (sizeof(Buffer[0]) * CharCount)), " %g", CallerId);\r
+      CharCount += AsciiSPrint (&Buffer[CharCount - 1], (sizeof (Buffer) - (sizeof(Buffer[0]) * CharCount)), " %g", CallerId);\r
     }\r
     if (Data) {\r
-      CharCount += AsciiSPrint (&Buffer[CharCount - 1], (EFI_STATUS_CODE_DATA_MAX_SIZE - (sizeof(Buffer[0]) * CharCount)), " %x", Data);\r
+      CharCount += AsciiSPrint (&Buffer[CharCount - 1], (sizeof (Buffer) - (sizeof(Buffer[0]) * CharCount)), " %x", Data);\r
     }\r
-    CharCount += AsciiSPrint (&Buffer[CharCount - 1], (EFI_STATUS_CODE_DATA_MAX_SIZE - (sizeof(Buffer[0]) * CharCount)), "\n");\r
+    CharCount += AsciiSPrint (&Buffer[CharCount - 1], (sizeof (Buffer) - (sizeof(Buffer[0]) * CharCount)), "\n");\r
 \r
   }\r
 \r
@@ -807,7 +788,7 @@ Returns:
         //\r
         AsciiSPrint (\r
           Buffer,\r
-          EFI_STATUS_CODE_DATA_MAX_SIZE,\r
+          sizeof (Buffer),\r
           "%a:%a:%a:%d\n",\r
           SeverityToken,\r
           SubClassToken,\r
@@ -869,19 +850,19 @@ Returns:
   // Set communications format\r
   //\r
   OutputData = (UINT8)((DLAB << 7) | ((gBreakSet << 6) | ((gParity << 3) | ((gStop << 2) | Data))));\r
-  CpuIoWrite8 (gComBase + LCR_OFFSET, OutputData);\r
+  IoWrite8 (gComBase + LCR_OFFSET, OutputData);\r
 \r
   //\r
   // Configure baud rate\r
   //\r
-  CpuIoWrite8 (gComBase + BAUD_HIGH_OFFSET, (UINT8)(Divisor >> 8));\r
-  CpuIoWrite8 (gComBase + BAUD_LOW_OFFSET, (UINT8)(Divisor & 0xff));\r
+  IoWrite8 (gComBase + BAUD_HIGH_OFFSET, (UINT8)(Divisor >> 8));\r
+  IoWrite8 (gComBase + BAUD_LOW_OFFSET, (UINT8)(Divisor & 0xff));\r
 \r
   //\r
   // Switch back to bank 0\r
   //\r
   OutputData = (UINT8)((~DLAB<<7)|((gBreakSet<<6)|((gParity<<3)|((gStop<<2)| Data))));\r
-  CpuIoWrite8 (gComBase + LCR_OFFSET, OutputData);\r
+  IoWrite8 (gComBase + LCR_OFFSET, OutputData);\r
 \r
   *ReportStatusCode = SerialReportStatusCode;\r
 }\r