From 454e9f6593cd2d35c84e9cd445e68a2f68d6e201 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Thu, 18 Oct 2007 06:01:39 +0000 Subject: [PATCH] Clean UGA from Nt32Pkg. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4161 6f19259b-4bc3-4df7-8a09-765794883524 --- Nt32Pkg/PlatformBdsDxe/Generic/Bds.h | 17 ++--- Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c | 84 ++++----------------- Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf | 3 +- 3 files changed, 23 insertions(+), 81 deletions(-) diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/Bds.h b/Nt32Pkg/PlatformBdsDxe/Generic/Bds.h index dfb63d5c65..15f9c5f095 100644 --- a/Nt32Pkg/PlatformBdsDxe/Generic/Bds.h +++ b/Nt32Pkg/PlatformBdsDxe/Generic/Bds.h @@ -1,13 +1,13 @@ /*++ -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +Copyright (c) 2006, Intel Corporation +All rights reserved. This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Module Name: @@ -33,7 +33,6 @@ Revision History #include #include #include -#include #include #include #include diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c b/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c index 0ed4207cd8..e4cda86851 100644 --- a/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c +++ b/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c @@ -55,59 +55,33 @@ Returns: --*/ { - EFI_STATUS Status; + EFI_STATUS Status; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; - UINT32 SizeOfX; - UINT32 SizeOfY; - UINT32 ColorDepth; - UINT32 RefreshRate; + UINT32 SizeOfX; + UINT32 SizeOfY; EFI_GRAPHICS_OUTPUT_BLT_PIXEL Color; - UINTN BlockHeight; - UINTN BlockWidth; - UINTN BlockNum; - UINTN PosX; - UINTN PosY; - UINTN Index; + UINTN BlockHeight; + UINTN BlockWidth; + UINTN BlockNum; + UINTN PosX; + UINTN PosY; + UINTN Index; if (Progress > 100) { return EFI_INVALID_PARAMETER; } - UgaDraw = NULL; Status = gBS->HandleProtocol ( gST->ConsoleOutHandle, &gEfiGraphicsOutputProtocolGuid, &GraphicsOutput ); if (EFI_ERROR (Status)) { - GraphicsOutput = NULL; - - Status = gBS->HandleProtocol ( - gST->ConsoleOutHandle, - &gEfiUgaDrawProtocolGuid, - &UgaDraw - ); - if (EFI_ERROR (Status)) { - return EFI_UNSUPPORTED; - } + return EFI_UNSUPPORTED; } - if (GraphicsOutput != NULL) { - SizeOfX = GraphicsOutput->Mode->Info->HorizontalResolution; - SizeOfY = GraphicsOutput->Mode->Info->VerticalResolution; - } else { - Status = UgaDraw->GetMode ( - UgaDraw, - &SizeOfX, - &SizeOfY, - &ColorDepth, - &RefreshRate - ); - if (EFI_ERROR (Status)) { - return EFI_UNSUPPORTED; - } - } + SizeOfX = GraphicsOutput->Mode->Info->HorizontalResolution; + SizeOfY = GraphicsOutput->Mode->Info->VerticalResolution; BlockWidth = SizeOfX / 100; BlockHeight = SizeOfY / 50; @@ -123,8 +97,7 @@ Returns: // SetMem (&Color, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0x0); - if (GraphicsOutput != NULL) { - Status = GraphicsOutput->Blt ( + Status = GraphicsOutput->Blt ( GraphicsOutput, &Color, EfiBltVideoFill, @@ -136,28 +109,13 @@ Returns: SizeOfY - (PosY - GLYPH_HEIGHT - 1), SizeOfX * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) ); - } else { - Status = UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) &Color, - EfiUgaVideoFill, - 0, - 0, - 0, - PosY - GLYPH_HEIGHT - 1, - SizeOfX, - SizeOfY - (PosY - GLYPH_HEIGHT - 1), - SizeOfX * sizeof (EFI_UGA_PIXEL) - ); - } } // // Show progress by drawing blocks // for (Index = PreviousValue; Index < BlockNum; Index++) { PosX = Index * BlockWidth; - if (GraphicsOutput != NULL) { - Status = GraphicsOutput->Blt ( + Status = GraphicsOutput->Blt ( GraphicsOutput, &ProgressColor, EfiBltVideoFill, @@ -169,20 +127,6 @@ Returns: BlockHeight, (BlockWidth) * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) ); - } else { - Status = UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) &ProgressColor, - EfiUgaVideoFill, - 0, - 0, - PosX, - PosY, - BlockWidth - 1, - BlockHeight, - (BlockWidth) * sizeof (EFI_UGA_PIXEL) - ); - } } PrintXY ( diff --git a/Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf b/Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf index 45282a6c43..70e0559606 100644 --- a/Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf +++ b/Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf @@ -124,7 +124,6 @@ gEfiDevicePathProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiSimpleFileSystemProtocolGuid # PROTOCOL SOMETIMES_CONSUMED gEfiLoadFileProtocolGuid # PROTOCOL SOMETIMES_CONSUMED - gEfiUgaDrawProtocolGuid # PROTOCOL SOMETIMES_CONSUMED gEfiCpuIoProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiConsoleControlProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiFormBrowserProtocolGuid # PROTOCOL ALWAYS_CONSUMED @@ -145,4 +144,4 @@ [depex] gEfiHiiProtocolGuid - + -- 2.39.2