From 404c79588efdc16dbb17857dd1909030a2f1e15b Mon Sep 17 00:00:00 2001 From: vanjeff Date: Thu, 20 Nov 2008 07:19:01 +0000 Subject: retried GetGraphicsBitMapFromFV()and GetGraphicsBitMapFromFVEx(), instead using GetSectionFromAnyFv() in DxeServiceLib. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6649 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Library/GraphicsLib/Graphics.c | 65 +---------------------------- MdePkg/Include/Library/GraphicsLib.h | 56 ------------------------- 2 files changed, 1 insertion(+), 120 deletions(-) diff --git a/MdeModulePkg/Library/GraphicsLib/Graphics.c b/MdeModulePkg/Library/GraphicsLib/Graphics.c index 63e0696cf4..9907a896b1 100644 --- a/MdeModulePkg/Library/GraphicsLib/Graphics.c +++ b/MdeModulePkg/Library/GraphicsLib/Graphics.c @@ -38,69 +38,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include - -/** - Return the graphics image file named FileNameGuid into Image and return it's - size in ImageSize. All Firmware Volumes (FV) in the system are searched for the - file name. - - @param FileNameGuid File Name of graphics file in the FV(s). - @param Image Pointer to pointer to return graphics image. If NULL, a - buffer will be allocated. - @param ImageSize Size of the graphics Image in bytes. Zero if no image found. - - @retval EFI_SUCCESS Image and ImageSize are valid. - @retval EFI_BUFFER_TOO_SMALL Image not big enough. ImageSize has required size - @retval EFI_NOT_FOUND FileNameGuid not found - -**/ -EFI_STATUS -EFIAPI -GetGraphicsBitMapFromFV ( - IN EFI_GUID *FileNameGuid, - OUT VOID **Image, - OUT UINTN *ImageSize - ) -{ - return GetGraphicsBitMapFromFVEx (NULL, FileNameGuid, Image, ImageSize); -} - -/** - Return the graphics image file named FileNameGuid into Image and return it's - size in ImageSize. All Firmware Volumes (FV) in the system are searched for the - file name. - - @param ImageHandle The driver image handle of the caller. The parameter is used to - optimize the loading of the image file so that the FV from which - the driver image is loaded will be tried first. - @param FileNameGuid File Name of graphics file in the FV(s). - @param Image Pointer to pointer to return graphics image. If NULL, a - buffer will be allocated. - @param ImageSize Size of the graphics Image in bytes. Zero if no image found. - - @retval EFI_SUCCESS Image and ImageSize are valid. - @retval EFI_BUFFER_TOO_SMALL Image not big enough. ImageSize has required size - @retval EFI_NOT_FOUND FileNameGuid not found - -**/ -EFI_STATUS -EFIAPI -GetGraphicsBitMapFromFVEx ( - IN EFI_HANDLE ImageHandle, - IN EFI_GUID *FileNameGuid, - OUT VOID **Image, - OUT UINTN *ImageSize - ) -{ - return GetSectionFromAnyFv ( - FileNameGuid, - EFI_SECTION_RAW, - 0, - Image, - ImageSize - ); -} - /** Convert a *.BMP graphics image to a GOP blt buffer. If a NULL Blt buffer is passed in a GopBlt buffer will be allocated by this routine. If a GopBlt @@ -457,7 +394,7 @@ EnableQuietBootEx ( // // Get the specified image from FV. // - Status = GetGraphicsBitMapFromFVEx (ImageHandle, LogoFile, (VOID **) &ImageData, &ImageSize); + Status = GetSectionFromAnyFv (LogoFile, EFI_SECTION_RAW, 0, (VOID **) &ImageData, &ImageSize); if (EFI_ERROR (Status)) { return EFI_UNSUPPORTED; } diff --git a/MdePkg/Include/Library/GraphicsLib.h b/MdePkg/Include/Library/GraphicsLib.h index c54dcf8041..3f31d883db 100644 --- a/MdePkg/Include/Library/GraphicsLib.h +++ b/MdePkg/Include/Library/GraphicsLib.h @@ -17,62 +17,6 @@ #ifndef __EFI_GRAPHICS_LIB_H__ #define __EFI_GRAPHICS_LIB_H__ -/** - Return the graphics image file named FileNameGuid into Image and return it's - size in ImageSize. All Firmware Volumes (FV) in the system are searched for the - file name. - - @param[in] FileNameGuid File Name of graphics file in the FV(s). - @param[out] Image Pointer to pointer to return graphics image. If NULL, a - buffer will be allocated. - @param[out] ImageSize Size of the graphics Image in bytes. Zero if no image found. - - @retval EFI_SUCCESS The image is found and data and size is returned. - @retval EFI_UNSUPPORTED FvHandle does not support EFI_FIRMWARE_VOLUME2_PROTOCOL. - @retval EFI_NOT_FOUND The image specified by NameGuid and SectionType can't be found. - @retval EFI_OUT_OF_RESOURCES There were not enough resources to allocate the output data buffer or complete the operations. - @retval EFI_DEVICE_ERROR A hardware error occurs during reading from the Firmware Volume. - @retval EFI_ACCESS_DENIED The firmware volume containing the searched Firmware File is configured to disallow reads. - -**/ -EFI_STATUS -EFIAPI -GetGraphicsBitMapFromFV ( - IN EFI_GUID *FileNameGuid, - OUT VOID **Image, - OUT UINTN *ImageSize - ); - -/** - Return the graphics image file named FileNameGuid into Image and return it's - size in ImageSize. All Firmware Volumes (FV) in the system are searched for the - file name. - - @param[in] ImageHandle The driver image handle of the caller. The parameter is used to - optimize the loading of the image file so that the FV from which - the driver image is loaded will be tried first. - @param[in] FileNameGuid File Name of graphics file in the FV(s). - @param[out] Image Pointer to pointer to return graphics image. If NULL, a - buffer will be allocated. - @param[out] ImageSize Size of the graphics Image in bytes. Zero if no image found. - - @retval EFI_SUCCESS The image is found and data and size is returned. - @retval EFI_UNSUPPORTED FvHandle does not support EFI_FIRMWARE_VOLUME2_PROTOCOL. - @retval EFI_NOT_FOUND The image specified by NameGuid and SectionType can't be found. - @retval EFI_OUT_OF_RESOURCES There were not enough resources to allocate the output data buffer or complete the operations. - @retval EFI_DEVICE_ERROR A hardware error occurs during reading from the Firmware Volume. - @retval EFI_ACCESS_DENIED The firmware volume containing the searched Firmware File is configured to disallow reads. - -**/ -EFI_STATUS -EFIAPI -GetGraphicsBitMapFromFVEx ( - IN EFI_HANDLE ImageHandle, - IN EFI_GUID *FileNameGuid, - OUT VOID **Image, - OUT UINTN *ImageSize - ); - /** Use Console Control to turn off UGA based Simple Text Out consoles from going -- cgit v1.2.3