retried GetGraphicsBitMapFromFV()and GetGraphicsBitMapFromFVEx(), instead using GetSe...

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

diff --git a/MdeModulePkg/Library/GraphicsLib/Graphics.c b/MdeModulePkg/Library/GraphicsLib/Graphics.c
index 63e0696cf4f553fb6873b8dbe28fa96816b70c5f..9907a896b1f6433f89fe0ce36177223d3e6bca16 100644 (file)
--- 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 <Library/DxeServicesLib.h>\r
 #include <Library/PcdLib.h>\r
 \r
-\r
-/**\r
-  Return the graphics image file named FileNameGuid into Image and return it's\r
-  size in ImageSize. All Firmware Volumes (FV) in the system are searched for the\r
-  file name.\r
-\r
-  @param  FileNameGuid          File Name of graphics file in the FV(s).\r
-  @param  Image                 Pointer to pointer to return graphics image.  If NULL, a \r
-                                buffer will be allocated.\r
-  @param  ImageSize             Size of the graphics Image in bytes. Zero if no image found.\r
-\r
-  @retval EFI_SUCCESS           Image and ImageSize are valid. \r
-  @retval EFI_BUFFER_TOO_SMALL  Image not big enough. ImageSize has required size\r
-  @retval EFI_NOT_FOUND         FileNameGuid not found\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-GetGraphicsBitMapFromFV (\r
-  IN  EFI_GUID      *FileNameGuid,\r
-  OUT VOID          **Image,\r
-  OUT UINTN         *ImageSize\r
-  )\r
-{\r
-  return GetGraphicsBitMapFromFVEx (NULL, FileNameGuid, Image, ImageSize);\r
-}\r
-\r
-/**\r
-  Return the graphics image file named FileNameGuid into Image and return it's\r
-  size in ImageSize. All Firmware Volumes (FV) in the system are searched for the\r
-  file name.\r
-\r
-  @param  ImageHandle           The driver image handle of the caller. The parameter is used to\r
-                                optimize the loading of the image file so that the FV from which\r
-                                the driver image is loaded will be tried first. \r
-  @param  FileNameGuid          File Name of graphics file in the FV(s).\r
-  @param  Image                 Pointer to pointer to return graphics image.  If NULL, a \r
-                                buffer will be allocated.\r
-  @param  ImageSize             Size of the graphics Image in bytes. Zero if no image found.\r
-\r
-  @retval EFI_SUCCESS           Image and ImageSize are valid. \r
-  @retval EFI_BUFFER_TOO_SMALL  Image not big enough. ImageSize has required size\r
-  @retval EFI_NOT_FOUND         FileNameGuid not found\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-GetGraphicsBitMapFromFVEx (\r
-  IN  EFI_HANDLE    ImageHandle,\r
-  IN  EFI_GUID      *FileNameGuid,\r
-  OUT VOID          **Image,\r
-  OUT UINTN         *ImageSize\r
-  )\r
-{\r
-  return GetSectionFromAnyFv  (\r
-           FileNameGuid,\r
-           EFI_SECTION_RAW,\r
-           0,\r
-           Image,\r
-           ImageSize\r
-           );\r
-}\r
-\r
 /**\r
   Convert a *.BMP graphics image to a GOP blt buffer. If a NULL Blt buffer\r
   is passed in a GopBlt buffer will be allocated by this routine. If a GopBlt\r
@@ -457,7 +394,7 @@ EnableQuietBootEx (
       //\r
       // Get the specified image from FV.\r
       //\r
-      Status = GetGraphicsBitMapFromFVEx (ImageHandle, LogoFile, (VOID **) &ImageData, &ImageSize);\r
+      Status = GetSectionFromAnyFv (LogoFile, EFI_SECTION_RAW, 0, (VOID **) &ImageData, &ImageSize);\r
       if (EFI_ERROR (Status)) {\r
         return EFI_UNSUPPORTED;\r
       }\r

diff --git a/MdePkg/Include/Library/GraphicsLib.h b/MdePkg/Include/Library/GraphicsLib.h
index c54dcf8041136c73168876b1aef9cc889a35a7e0..3f31d883dbb2763470d421e303bab1913fe09d95 100644 (file)
--- a/MdePkg/Include/Library/GraphicsLib.h
+++ b/MdePkg/Include/Library/GraphicsLib.h
@@ -17,62 +17,6 @@
 #ifndef __EFI_GRAPHICS_LIB_H__\r
 #define __EFI_GRAPHICS_LIB_H__\r
 \r
-/**\r
-  Return the graphics image file named FileNameGuid into Image and return it's\r
-  size in ImageSize. All Firmware Volumes (FV) in the system are searched for the\r
-  file name.\r
-\r
-  @param[in]  FileNameGuid  File Name of graphics file in the FV(s).\r
-  @param[out] Image         Pointer to pointer to return graphics image.  If NULL, a \r
-                            buffer will be allocated.\r
-  @param[out] ImageSize     Size of the graphics Image in bytes. Zero if no image found.\r
-\r
-  @retval  EFI_SUCCESS          The image is found and data and size is returned.\r
-  @retval  EFI_UNSUPPORTED      FvHandle does not support EFI_FIRMWARE_VOLUME2_PROTOCOL.\r
-  @retval  EFI_NOT_FOUND        The image specified by NameGuid and SectionType can't be found.\r
-  @retval  EFI_OUT_OF_RESOURCES There were not enough resources to allocate the output data buffer or complete the operations.\r
-  @retval  EFI_DEVICE_ERROR     A hardware error occurs during reading from the Firmware Volume.\r
-  @retval  EFI_ACCESS_DENIED    The firmware volume containing the searched Firmware File is configured to disallow reads.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-GetGraphicsBitMapFromFV (\r
-  IN  EFI_GUID      *FileNameGuid,\r
-  OUT VOID          **Image,\r
-  OUT UINTN         *ImageSize\r
-  );\r
-\r
-/**\r
-  Return the graphics image file named FileNameGuid into Image and return it's\r
-  size in ImageSize. All Firmware Volumes (FV) in the system are searched for the\r
-  file name.\r
-\r
-  @param[in]  ImageHandle   The driver image handle of the caller. The parameter is used to\r
-                            optimize the loading of the image file so that the FV from which\r
-                            the driver image is loaded will be tried first. \r
-  @param[in]  FileNameGuid  File Name of graphics file in the FV(s).\r
-  @param[out] Image         Pointer to pointer to return graphics image.  If NULL, a \r
-                            buffer will be allocated.\r
-  @param[out] ImageSize     Size of the graphics Image in bytes. Zero if no image found.\r
-\r
-  @retval  EFI_SUCCESS          The image is found and data and size is returned.\r
-  @retval  EFI_UNSUPPORTED      FvHandle does not support EFI_FIRMWARE_VOLUME2_PROTOCOL.\r
-  @retval  EFI_NOT_FOUND        The image specified by NameGuid and SectionType can't be found.\r
-  @retval  EFI_OUT_OF_RESOURCES There were not enough resources to allocate the output data buffer or complete the operations.\r
-  @retval  EFI_DEVICE_ERROR     A hardware error occurs during reading from the Firmware Volume.\r
-  @retval  EFI_ACCESS_DENIED    The firmware volume containing the searched Firmware File is configured to disallow reads.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-GetGraphicsBitMapFromFVEx (\r
-  IN  EFI_HANDLE    ImageHandle,\r
-  IN  EFI_GUID      *FileNameGuid,\r
-  OUT VOID          **Image,\r
-  OUT UINTN         *ImageSize\r
-  );\r
-\r
 \r
 /**\r
   Use Console Control to turn off UGA based Simple Text Out consoles from going\r