[Description]:

1) Remove HiiLibAddFontPackageToHiiDatabase as it is not properly defined API. It only cover Simplified Font. User is recomended to use Hii Font Protocol API to add various font into HII database.

[Impaction]:
All modules that may reference HiiLibAddFontPackageToHiiDatabase function.
[Reference Info]:
No.

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

diff --git a/MdePkg/Include/Library/HiiLib.h b/MdePkg/Include/Library/HiiLib.h
index de6267bcf1aba106783aad8dcec41d10505e62c2..806be1fb65665d5c5022a80a28c3a7c6e1cb4e4b 100644 (file)
--- a/MdePkg/Include/Library/HiiLib.h
+++ b/MdePkg/Include/Library/HiiLib.h
@@ -81,16 +81,6 @@ HiiLibAddPackages (
   )\r
 ;\r
 \r
-EFI_STATUS\r
-EFIAPI\r
-HiiLibAddFontPackageToHiiDatabase (\r
-  IN       UINTN               FontSize,\r
-  IN CONST UINT8               *FontBinary,\r
-  IN CONST EFI_GUID            *GuidId,\r
-  OUT      EFI_HII_HANDLE      *HiiHandle OPTIONAL\r
-  )\r
-;\r
-\r
 /**\r
   Removes a package list from the default HII database.\r
 \r

diff --git a/MdePkg/Library/HiiLib/HiiLib.c b/MdePkg/Library/HiiLib/HiiLib.c
index e2153f307d79f22762af2831f9d98abbbd8f105f..a1797c930f7d9f863fed9ee08e53fbde81494dcc 100644 (file)
--- a/MdePkg/Library/HiiLib/HiiLib.c
+++ b/MdePkg/Library/HiiLib/HiiLib.c
@@ -167,52 +167,6 @@ HiiLibAddPackages (
   return Status;\r
 }\r
 \r
-EFI_STATUS\r
-EFIAPI\r
-HiiLibAddFontPackageToHiiDatabase (\r
-  IN       UINTN               FontSize,\r
-  IN CONST UINT8               *FontBinary,\r
-  IN CONST EFI_GUID            *GuidId,\r
-  OUT      EFI_HII_HANDLE      *HiiHandle OPTIONAL\r
-  )\r
-{\r
-  EFI_STATUS                           Status;\r
-  UINT8                                *Location;\r
-  EFI_HII_SIMPLE_FONT_PACKAGE_HDR      *SimplifiedFont;\r
-  UINTN                                PackageLength;\r
-  EFI_HII_PACKAGE_LIST_HEADER          *PackageList;\r
-  UINT8                                *Package;\r
-\r
-  //\r
-  // Add 4 bytes to the header for entire length for HiiLibPreparePackageList use only.\r
-  // Looks ugly. Might be updated when font tool is ready.\r
-  //\r
-  PackageLength   = sizeof (EFI_HII_SIMPLE_FONT_PACKAGE_HDR) + FontSize + 4;\r
-  Package = AllocateZeroPool (PackageLength);\r
-  if (Package == NULL) {\r
-    return EFI_OUT_OF_RESOURCES;\r
-  }\r
-  CopyMem (Package, &PackageLength, 4);\r
-  SimplifiedFont = (EFI_HII_SIMPLE_FONT_PACKAGE_HDR*) (Package + 4);\r
-  SimplifiedFont->Header.Length        = (UINT32) (PackageLength - 4);\r
-  SimplifiedFont->Header.Type          = EFI_HII_PACKAGE_SIMPLE_FONTS;\r
-  SimplifiedFont->NumberOfNarrowGlyphs = (UINT16) (FontSize / sizeof (EFI_NARROW_GLYPH));\r
-  \r
-  Location = (UINT8 *) (&SimplifiedFont->NumberOfWideGlyphs + 1);\r
-  CopyMem (Location, FontBinary, FontSize);\r
-  \r
-  //\r
-  // Add this simplified font package to a package list then install it.\r
-  //\r
-  PackageList = HiiLibPreparePackageList (1, GuidId, Package);\r
-  Status = mHiiDatabaseProt->NewPackageList (mHiiDatabaseProt, PackageList, NULL, HiiHandle);\r
-  ASSERT_EFI_ERROR (Status);\r
-  SafeFreePool (PackageList);\r
-  SafeFreePool (Package);    \r
-\r
-  return EFI_SUCCESS;\r
-}\r
-\r
 VOID\r
 EFIAPI\r
 HiiLibRemovePackages (\r