Module clean up.

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

3 files changed, 54 insertions, 80 deletions

diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/CommonHeader.h b/IntelFrameworkModulePkg/Library/GraphicsLib/CommonHeader.h
deleted file mode 100644
index 10dc49ea7f..0000000000
--- a/IntelFrameworkModulePkg/Library/GraphicsLib/CommonHeader.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**@file

-  Common header file shared by all source files.

-

-  This file includes package header files, library classes and protocol, PPI & GUID definitions.

-

-  Copyright (c) 2006 - 2007, 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.

-**/

-

-#ifndef __COMMON_HEADER_H_

-#define __COMMON_HEADER_H_

-

-

-

-#include <PiDxe.h>

-

-#include <Protocol/SimpleTextOut.h>

-#include <Protocol/OEMBadging.h>

-#include <Protocol/ConsoleControl.h>

-#include <Protocol/GraphicsOutput.h>

-#include <Protocol/FirmwareVolume2.h>

-#include <Protocol/UgaDraw.h>

-#include <Protocol/HiiFramework.h>

-

-#include <Guid/Bmp.h>

-

-#include <Library/GraphicsLib.h>

-#include <Library/PrintLib.h>

-#include <Library/BaseLib.h>

-#include <Library/MemoryAllocationLib.h>

-#include <Library/UefiBootServicesTableLib.h>

-

-

-#endif

diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c b/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
index 605a240bf2..6e1c3f82a8 100644
--- a/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
+++ b/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
@@ -5,21 +5,36 @@
           when Tiano graphics format is supported.

 

 

-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.

 

 **/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

+

+#include <PiDxe.h>

+

+#include <Protocol/SimpleTextOut.h>

+#include <Protocol/OEMBadging.h>

+#include <Protocol/ConsoleControl.h>

+#include <Protocol/GraphicsOutput.h>

+#include <Protocol/FirmwareVolume2.h>

+#include <Protocol/UgaDraw.h>

+#include <Protocol/HiiFramework.h>

+

+#include <Guid/Bmp.h>

+

+#include <Library/GraphicsLib.h>

+#include <Library/PrintLib.h>

+#include <Library/BaseLib.h>

+#include <Library/MemoryAllocationLib.h>

+#include <Library/UefiBootServicesTableLib.h>

+

 

 EFI_STATUS

 GetGraphicsBitMapFromFV (

@@ -39,15 +54,15 @@ Arguments:
 

   FileNameGuid  - File Name of graphics file in the FV(s).

 

-  Image         - Pointer to pointer to return graphics image.  If NULL, a 

+  Image         - Pointer to pointer to return graphics image.  If NULL, a

                   buffer will be allocated.

 

   ImageSize     - Size of the graphics Image in bytes. Zero if no image found.

 

 

-Returns: 

+Returns:

 

-  EFI_SUCCESS          - Image and ImageSize are valid. 

+  EFI_SUCCESS          - Image and ImageSize are valid.

   EFI_BUFFER_TOO_SMALL - Image not big enough. ImageSize has required size

   EFI_NOT_FOUND        - FileNameGuid not found

 

@@ -137,9 +152,9 @@ Arguments:
   PixelWidth    - Width of UgaBlt/BmpImage in pixels

 

 

-Returns: 

+Returns:

 

-  EFI_SUCCESS           - UgaBlt and UgaBltSize are returned. 

+  EFI_SUCCESS           - UgaBlt and UgaBltSize are returned.

   EFI_UNSUPPORTED       - BmpImage is not a valid *.BMP image

   EFI_BUFFER_TOO_SMALL  - The passed in UgaBlt buffer is not big enough.

                           UgaBltSize will contain the required size.

@@ -159,7 +174,7 @@ Returns:
   UINTN             Width;

   UINTN             ImageIndex;

   BOOLEAN           IsAllocated;

-  

+

   BmpHeader = (BMP_IMAGE_HEADER *) BmpImage;

   if (BmpHeader->CharB != 'B' || BmpHeader->CharM != 'M') {

     return EFI_UNSUPPORTED;

@@ -223,7 +238,7 @@ Returns:
         Blt --;

         Width --;

         break;

-      

+

       case 4:

         //

         // Convert BMP Palette to 24-bit color

@@ -288,7 +303,7 @@ LockKeyboards (
 /*++

 

 Routine Description:

-  Use Console Control Protocol to lock the Console In Spliter virtual handle. 

+  Use Console Control Protocol to lock the Console In Spliter virtual handle.

   This is the ConInHandle and ConIn handle in the EFI system table. All key

   presses will be ignored until the Password is typed in. The only way to

   disable the password is to type it in to a ConIn device.

@@ -297,7 +312,7 @@ Arguments:
   Password - Password used to lock ConIn device

 

 

-Returns: 

+Returns:

 

   EFI_SUCCESS     - ConsoleControl has been flipped to graphics and logo

                           displayed.

@@ -334,7 +349,7 @@ Arguments:
   LogoFile - File name of logo to display on the center of the screen.

 

 

-Returns: 

+Returns:

 

   EFI_SUCCESS           - ConsoleControl has been flipped to graphics and logo

                           displayed.

@@ -374,7 +389,7 @@ Returns:
   //

   // Try to open GOP first

   //

-  Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiGraphicsOutputProtocolGuid, (VOID **) &GraphicsOutput); 

+  Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiGraphicsOutputProtocolGuid, (VOID **) &GraphicsOutput);

   if (EFI_ERROR(Status)) {

     GraphicsOutput = NULL;

     //

@@ -560,14 +575,14 @@ DisableQuietBoot (
 

 Routine Description:

 

-  Use Console Control to turn on UGA based Simple Text Out consoles. The UGA 

+  Use Console Control to turn on UGA based Simple Text Out consoles. The UGA

   Simple Text Out screens will now be synced up with all non UGA output devices

 

 Arguments:

 

   NONE

 

-Returns: 

+Returns:

 

   EFI_SUCCESS           - UGA devices are back in text mode and synced up.

   EFI_UNSUPPORTED       - Logo not found

@@ -626,24 +641,24 @@ Routine Description:
 Arguments:

 

   GraphicsOutput  - Graphics output protocol interface

-  

+

   UgaDraw         - UGA draw protocol interface

-  

+

   Sto             - Simple text out protocol interface

-  

+

   X               - X coordinate to start printing

-  

+

   Y               - Y coordinate to start printing

-  

+

   Foreground      - Foreground color

-  

+

   Background      - Background color

-  

+

   fmt             - Format string

-  

+

   args            - Print arguments

 

-Returns: 

+Returns:

 

   EFI_SUCCESS             -  success

   EFI_OUT_OF_RESOURCES    -  out of resources

@@ -675,7 +690,7 @@ Returns:
   if (Buffer == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

-  

+

   if (GraphicsOutput != NULL) {

     HorizontalResolution = GraphicsOutput->Mode->Info->HorizontalResolution;

     VerticalResolution   = GraphicsOutput->Mode->Info->VerticalResolution;

@@ -798,11 +813,11 @@ Routine Description:
 Arguments:

 

     X           - X coordinate to start printing

-    

+

     Y           - Y coordinate to start printing

-    

+

     ForeGround  - Foreground color

-    

+

     BackGround  - Background color

 

     Fmt         - Format string

diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf b/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf
index dc82000bbf..ad7a5d81d7 100644
--- a/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf
+++ b/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf
@@ -20,7 +20,7 @@
   FILE_GUID                      = 08c1a0e4-1208-47f8-a2c5-f42eabee653a

   MODULE_TYPE                    = DXE_DRIVER

   VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = GraphicsLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER 

+  LIBRARY_CLASS                  = GraphicsLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER

   EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

 

@@ -33,8 +33,6 @@
 

 [Sources.common]

   Graphics.c

-  CommonHeader.h

-

 

 [Packages]

   MdePkg/MdePkg.dec