Clean UGA from Nt32Pkg.

[mirror_edk2.git] / Nt32Pkg / PlatformBdsDxe / Generic / MemoryTest.c

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c b/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c
index 8b1f7be24c856bf3b5e086b860a379c27686170b..e4cda86851fbf33883e32671d3f2462a4b2941fd 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c
@@ -19,14 +19,9 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "bds.h"\r
 #include "BdsPlatform.h"\r
-#include "String.h"\r
+#include "BdsString.h"\r
 \r
 //\r
 // BDS Platform Functions\r
@@ -60,59 +55,33 @@ Returns:
 \r
 --*/\r
 {\r
-  EFI_STATUS            Status;\r
+  EFI_STATUS                     Status;\r
   EFI_GRAPHICS_OUTPUT_PROTOCOL   *GraphicsOutput;\r
-  EFI_UGA_DRAW_PROTOCOL *UgaDraw;\r
-  UINT32                SizeOfX;\r
-  UINT32                SizeOfY;\r
-  UINT32                ColorDepth;\r
-  UINT32                RefreshRate;\r
+  UINT32                         SizeOfX;\r
+  UINT32                         SizeOfY;\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL  Color;\r
-  UINTN                 BlockHeight;\r
-  UINTN                 BlockWidth;\r
-  UINTN                 BlockNum;\r
-  UINTN                 PosX;\r
-  UINTN                 PosY;\r
-  UINTN                 Index;\r
+  UINTN                          BlockHeight;\r
+  UINTN                          BlockWidth;\r
+  UINTN                          BlockNum;\r
+  UINTN                          PosX;\r
+  UINTN                          PosY;\r
+  UINTN                          Index;\r
 \r
   if (Progress > 100) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  UgaDraw = NULL;\r
   Status = gBS->HandleProtocol (\r
                   gST->ConsoleOutHandle,\r
                   &gEfiGraphicsOutputProtocolGuid,\r
                   &GraphicsOutput\r
                   );\r
   if (EFI_ERROR (Status)) {\r
-    GraphicsOutput = NULL;\r
-\r
-    Status = gBS->HandleProtocol (\r
-                    gST->ConsoleOutHandle,\r
-                    &gEfiUgaDrawProtocolGuid,\r
-                    &UgaDraw\r
-                    );\r
-    if (EFI_ERROR (Status)) {\r
-      return EFI_UNSUPPORTED;\r
-    }\r
+    return EFI_UNSUPPORTED;\r
   }\r
 \r
-  if (GraphicsOutput != NULL) {\r
-    SizeOfX = GraphicsOutput->Mode->Info->HorizontalResolution;\r
-    SizeOfY = GraphicsOutput->Mode->Info->VerticalResolution;\r
-  } else {\r
-    Status = UgaDraw->GetMode (\r
-                        UgaDraw,\r
-                        &SizeOfX,\r
-                        &SizeOfY,\r
-                        &ColorDepth,\r
-                        &RefreshRate\r
-                        );\r
-    if (EFI_ERROR (Status)) {\r
-      return EFI_UNSUPPORTED;\r
-    }\r
-  }\r
+  SizeOfX = GraphicsOutput->Mode->Info->HorizontalResolution;\r
+  SizeOfY = GraphicsOutput->Mode->Info->VerticalResolution;\r
 \r
   BlockWidth  = SizeOfX / 100;\r
   BlockHeight = SizeOfY / 50;\r
@@ -128,8 +97,7 @@ Returns:
     //\r
     SetMem (&Color, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0x0);\r
 \r
-    if (GraphicsOutput != NULL) {\r
-      Status = GraphicsOutput->Blt (\r
+    Status = GraphicsOutput->Blt (\r
                           GraphicsOutput,\r
                           &Color,\r
                           EfiBltVideoFill,\r
@@ -141,28 +109,13 @@ Returns:
                           SizeOfY - (PosY - GLYPH_HEIGHT - 1),\r
                           SizeOfX * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)\r
                           );\r
-    } else {\r
-      Status = UgaDraw->Blt (\r
-                          UgaDraw,\r
-                          (EFI_UGA_PIXEL *) &Color,\r
-                          EfiUgaVideoFill,\r
-                          0,\r
-                          0,\r
-                          0,\r
-                          PosY - GLYPH_HEIGHT - 1,\r
-                          SizeOfX,\r
-                          SizeOfY - (PosY - GLYPH_HEIGHT - 1),\r
-                          SizeOfX * sizeof (EFI_UGA_PIXEL)\r
-                          );\r
-    }\r
   }\r
   //\r
   // Show progress by drawing blocks\r
   //\r
   for (Index = PreviousValue; Index < BlockNum; Index++) {\r
     PosX = Index * BlockWidth;\r
-    if (GraphicsOutput != NULL) {\r
-      Status = GraphicsOutput->Blt (\r
+    Status = GraphicsOutput->Blt (\r
                           GraphicsOutput,\r
                           &ProgressColor,\r
                           EfiBltVideoFill,\r
@@ -174,20 +127,6 @@ Returns:
                           BlockHeight,\r
                           (BlockWidth) * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)\r
                           );\r
-    } else {\r
-      Status = UgaDraw->Blt (\r
-                          UgaDraw,\r
-                          (EFI_UGA_PIXEL *) &ProgressColor,\r
-                          EfiUgaVideoFill,\r
-                          0,\r
-                          0,\r
-                          PosX,\r
-                          PosY,\r
-                          BlockWidth - 1,\r
-                          BlockHeight,\r
-                          (BlockWidth) * sizeof (EFI_UGA_PIXEL)\r
-                          );\r
-    }\r
   }\r
 \r
   PrintXY (\r