1. Rename following library instances according to MDE Library Spec:

1) SerialPortLibNull => BaseSerialPortLibNull
2) DxeMemoryLib => UefiMemoryLib
3) DxeMemoryAllocationLib => UefiMemoryAllocationLib
4) CpuLib => BaseCpuLib
5) HiiLib => UefiHiiLib
6) IfrSupportLib => UefiIfrSupportLib
7) PeiPalCallLib => PeiPalLib

2. Add library instances to MDE package
1) DxePalLib
2) FvbServiceLib
3) GraphicsLib


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

5 files changed, 0 insertions, 1616 deletions

diff --git a/MdePkg/Library/HiiLib/HiiLanguage.c b/MdePkg/Library/HiiLib/HiiLanguage.c
deleted file mode 100644
index 147e5a3942..0000000000
--- a/MdePkg/Library/HiiLib/HiiLanguage.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/** @file

-  Language related HII Library implementation.

-

-  Copyright (c) 2006 - 2008, Intel Corporation<BR>

-  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 "InternalHiiLib.h"

-

-/**

-  Get next language from language code list (with separator ';').

-

-  If LangCode is NULL, then ASSERT.

-  If Lang is NULL, then ASSERT.

-

-  @param  LangCode    On input: point to first language in the list. On

-                                 output: point to next language in the list, or

-                                 NULL if no more language in the list.

-  @param  Lang           The first language in the list.

-

-**/

-VOID

-EFIAPI

-HiiLibGetNextLanguage (

-  IN OUT CHAR8      **LangCode,

-  OUT CHAR8         *Lang

-  )

-{

-  UINTN  Index;

-  CHAR8  *StringPtr;

-

-  ASSERT (LangCode != NULL);

-  ASSERT (*LangCode != NULL);

-  ASSERT (Lang != NULL);

-

-  Index = 0;

-  StringPtr = *LangCode;

-  while (StringPtr[Index] != 0 && StringPtr[Index] != ';') {

-    Index++;

-  }

-

-  CopyMem (Lang, StringPtr, Index);

-  Lang[Index] = 0;

-

-  if (StringPtr[Index] == ';') {

-    Index++;

-  }

-  *LangCode = StringPtr + Index;

-}

-

-

-/**

-  This function returns the list of supported languages, in the format specified

-  in UEFI specification Appendix M.

-

-  If HiiHandle is not a valid Handle in the default HII database, then ASSERT.

-

-  @param  HiiHandle              The HII package list handle.

-

-  @retval   !NULL  The supported languages.

-  @retval   NULL    If Supported Languages can not be retrived.

-

-**/

-CHAR8 *

-EFIAPI

-HiiLibGetSupportedLanguages (

-  IN EFI_HII_HANDLE           HiiHandle

-  )

-{

-  EFI_STATUS  Status;

-  UINTN       BufferSize;

-  CHAR8       *LanguageString;

-

-  ASSERT (IsHiiHandleRegistered (HiiHandle));

-  //

-  // Collect current supported Languages for given HII handle

-  // First try allocate 4K buffer to store the current supported languages.

-  //

-  BufferSize = 0x1000;

-  LanguageString = AllocateZeroPool (BufferSize);

-  if (LanguageString == NULL) {

-    return NULL;

-  }

-

-  Status = mHiiStringProt->GetLanguages (mHiiStringProt, HiiHandle, LanguageString, &BufferSize);

-  

-  if (Status == EFI_BUFFER_TOO_SMALL) {

-    FreePool (LanguageString);

-    LanguageString = AllocateZeroPool (BufferSize);

-    if (LanguageString == NULL) {

-      return NULL;

-    }

-

-    Status = mHiiStringProt->GetLanguages (mHiiStringProt, HiiHandle, LanguageString, &BufferSize);

-  }

-

-  if (EFI_ERROR (Status)) {

-    LanguageString = NULL;

-  }

-

-  return LanguageString;

-}

-

-

-/**

-  This function returns the number of supported languages on HiiHandle.

-

-  If HiiHandle is not a valid Handle in the default HII database, then ASSERT.

-  If not enough resource to complete the operation, then ASSERT.

-

-  @param  HiiHandle              The HII package list handle.

-

-  @return The  number of supported languages.

-

-**/

-UINT16

-EFIAPI

-HiiLibGetSupportedLanguageNumber (

-  IN EFI_HII_HANDLE           HiiHandle

-  )

-{

-  CHAR8   *Languages;

-  CHAR8   *LanguageString;

-  UINT16  LangNumber;

-  CHAR8   Lang[RFC_3066_ENTRY_SIZE];

-

-  Languages = HiiLibGetSupportedLanguages (HiiHandle);

-  if (Languages == NULL) {

-    return 0;

-  }

-

-  LangNumber = 0;

-  LanguageString = Languages;

-  while (*LanguageString != 0) {

-    HiiLibGetNextLanguage (&LanguageString, Lang);

-    LangNumber++;

-  }

-  FreePool (Languages);

-

-  return LangNumber;

-}

-

-/**

-  This function returns the list of supported 2nd languages, in the format specified

-  in UEFI specification Appendix M.

-

-  If HiiHandle is not a valid Handle in the default HII database, then ASSERT.

-  If not enough resource to complete the operation, then ASSERT.

-

-  @param  HiiHandle              The HII package list handle.

-  @param  FirstLanguage          Pointer to language name buffer.

-  

-  @return The supported languages.

-

-**/

-CHAR8 *

-EFIAPI

-HiiLibGetSupportedSecondaryLanguages (

-  IN EFI_HII_HANDLE           HiiHandle,

-  IN CONST CHAR8              *FirstLanguage

-  )

-{

-  EFI_STATUS  Status;

-  UINTN       BufferSize;

-  CHAR8       *LanguageString;

-

-  ASSERT (HiiHandle != NULL);

-  ASSERT (IsHiiHandleRegistered (HiiHandle));

-  //

-  // Collect current supported 2nd Languages for given HII handle

-  // First try allocate 4K buffer to store the current supported 2nd languages.

-  //

-  BufferSize = 0x1000;

-  LanguageString = AllocateZeroPool (BufferSize);

-  if (LanguageString == NULL) {

-    return NULL;

-  }

-

-  Status = mHiiStringProt->GetSecondaryLanguages (mHiiStringProt, HiiHandle, FirstLanguage, LanguageString, &BufferSize);

-  

-  if (Status == EFI_BUFFER_TOO_SMALL) {

-    FreePool (LanguageString);

-    LanguageString = AllocateZeroPool (BufferSize);

-    if (LanguageString == NULL) {

-      return NULL;

-    }

-

-    Status = mHiiStringProt->GetSecondaryLanguages (mHiiStringProt, HiiHandle, FirstLanguage, LanguageString, &BufferSize);

-  }

-

-  if (EFI_ERROR (Status)) {

-    LanguageString = NULL;

-  }

-

-  return LanguageString;

-}

-

-

diff --git a/MdePkg/Library/HiiLib/HiiLib.c b/MdePkg/Library/HiiLib/HiiLib.c
deleted file mode 100644
index 975a064a39..0000000000
--- a/MdePkg/Library/HiiLib/HiiLib.c
+++ /dev/null
@@ -1,698 +0,0 @@
-/** @file

-  HII Library implementation that uses DXE protocols and services.

-

-  Copyright (c) 2006 - 2008, Intel Corporation<BR>

-  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 "InternalHiiLib.h"

-

-CONST EFI_HII_DATABASE_PROTOCOL   *mHiiDatabaseProt = NULL;

-CONST EFI_HII_STRING_PROTOCOL     *mHiiStringProt = NULL;

-

-/**

-  This function locate Hii relative protocols for later usage.

-    

-  The constructor function caches the protocol pointer of HII Database Protocol

-  and Hii String Protocol.

-  

-  It will ASSERT() if either of the protocol can't be located.

-

-  @param  ImageHandle   The firmware allocated handle for the EFI image.

-  @param  SystemTable   A pointer to the EFI System Table.

-

-  @retval EFI_SUCCESS   The constructor always returns EFI_SUCCESS.

-

-**/

-EFI_STATUS

-EFIAPI

-HiiLibConstructor (

-  IN EFI_HANDLE        ImageHandle,

-  IN EFI_SYSTEM_TABLE  *SystemTable

-  )

-{

-  EFI_STATUS  Status;

-

-  Status = gBS->LocateProtocol (&gEfiHiiDatabaseProtocolGuid, NULL, (VOID **) &mHiiDatabaseProt);

-  ASSERT_EFI_ERROR (Status);

-

-  Status = gBS->LocateProtocol (&gEfiHiiStringProtocolGuid, NULL, (VOID **) &mHiiStringProt);

-  ASSERT_EFI_ERROR (Status);

-

-  return EFI_SUCCESS;

-}

-

-

-

-/**

-  This funciton build the package list based on the package number,

-  the GUID of the package list and the list of pointer which point to

-  package header that defined by UEFI VFR compiler and StringGather

-  tool.

-

-  #pragma pack (push, 1)

-  typedef struct {

-    UINT32                  BinaryLength;

-    EFI_HII_PACKAGE_HEADER  PackageHeader;

-  } EDKII_AUTOGEN_PACKAGES_HEADER;

-  #pragma pack (pop)

-

-  If there is not enough resource for the new package list,

-  the function will ASSERT.

-

-  @param NumberOfPackages The number of packages be 

-  @param GuidId          The GUID for the package list to be generated.

-  @param Marker          The variable argument list. Each entry represent a specific package header that is

-                         generated by VFR compiler and StrGather tool. The first 4 bytes is a UINT32 value

-                         that indicate the overall length of the package.

-

-  @return The pointer to the package list header.

-

-**/

-EFI_HII_PACKAGE_LIST_HEADER *

-InternalHiiLibPreparePackages (

-  IN UINTN           NumberOfPackages,

-  IN CONST EFI_GUID  *GuidId,

-  IN VA_LIST         Marker

-  )

-{

-  EFI_HII_PACKAGE_LIST_HEADER *PackageListHeader;

-  UINT8                       *PackageListData;

-  UINT32                      PackageListLength;

-  UINT32                      PackageLength;

-  EFI_HII_PACKAGE_HEADER      PackageHeader;

-  UINT8                       *PackageArray;

-  UINTN                       Index;

-  VA_LIST                     MarkerBackup;

-

-  PackageListLength = sizeof (EFI_HII_PACKAGE_LIST_HEADER);

-

-  MarkerBackup = Marker;

-

-  //

-  // Count the lenth of the final package list.

-  //

-  for (Index = 0; Index < NumberOfPackages; Index++) {

-    CopyMem (&PackageLength, VA_ARG (Marker, VOID *), sizeof (UINT32));

-    //

-    // Do not count the BinaryLength field.

-    //

-    PackageListLength += (PackageLength - sizeof (UINT32));

-  }

-

-  //

-  // Include the lenght of EFI_HII_PACKAGE_END

-  //

-  PackageListLength += sizeof (EFI_HII_PACKAGE_HEADER);

-  PackageListHeader = AllocateZeroPool (PackageListLength);

-  ASSERT (PackageListHeader != NULL);

-  

-  CopyGuid (&PackageListHeader->PackageListGuid, GuidId);

-  PackageListHeader->PackageLength = PackageListLength;

-

-  PackageListData = ((UINT8 *) PackageListHeader) + sizeof (EFI_HII_PACKAGE_LIST_HEADER);

-

-  Marker = MarkerBackup;

-  //

-  // Prepare the final package list.

-  //

-  for (Index = 0; Index < NumberOfPackages; Index++) {

-    PackageArray = (UINT8 *) VA_ARG (Marker, VOID *);

-    //

-    // CopyMem is used for UINT32 to cover the unaligned address access.

-    //

-    CopyMem (&PackageLength, PackageArray, sizeof (UINT32));

-    PackageLength  -= sizeof (UINT32);

-    PackageArray += sizeof (UINT32);

-    CopyMem (PackageListData, PackageArray, PackageLength);

-    PackageListData += PackageLength;

-  }

-

-  //

-  // Append EFI_HII_PACKAGE_END

-  //

-  PackageHeader.Type = EFI_HII_PACKAGE_END;

-  PackageHeader.Length = sizeof (EFI_HII_PACKAGE_HEADER);

-  CopyMem (PackageListData, &PackageHeader, PackageHeader.Length);

-

-  return PackageListHeader;

-}

-

-/**

-  Assemble EFI_HII_PACKAGE_LIST according to the passed in packages.

-

-  If GuidId is NULL, then ASSERT.

-  If not enough resource to complete the operation, then ASSERT.

-

-  @param  NumberOfPackages       Number of packages.

-  @param  GuidId                 Package GUID.

-  @param  ...                    Variable argument list for packages to be assembled.

-

-  @return Pointer of EFI_HII_PACKAGE_LIST_HEADER.

-

-**/

-EFI_HII_PACKAGE_LIST_HEADER *

-EFIAPI

-HiiLibPreparePackageList (

-  IN UINTN                    NumberOfPackages,

-  IN CONST EFI_GUID           *GuidId,

-  ...

-  )

-{

-  EFI_HII_PACKAGE_LIST_HEADER *PackageListHeader;

-  VA_LIST                     Marker;

-

-  ASSERT (GuidId != NULL);

-

-  VA_START (Marker, GuidId);

-  PackageListHeader = InternalHiiLibPreparePackages (NumberOfPackages, GuidId, Marker);

-  VA_END (Marker);

-

-  return PackageListHeader;

-}

-

-

-/**

-  This function allocates pool for an EFI_HII_PACKAGE_LIST structure

-  with additional space that is big enough to host all packages described by the variable 

-  argument list of package pointers.  The allocated structure is initialized using NumberOfPackages, 

-  GuidId,  and the variable length argument list of package pointers.

-

-  Then, EFI_HII_PACKAGE_LIST will be register to the default System HII Database. The

-  Handle to the newly registered Package List is returned throught HiiHandle.

-

-  If HiiHandle is NULL, then ASSERT.

-

-  @param  NumberOfPackages    The number of HII packages to register.

-  @param  GuidId              Package List GUID ID.

-  @param  DriverHandle        Optional. If not NULL, the DriverHandle on which an instance of DEVICE_PATH_PROTOCOL is installed.

-                              This DriverHandle uniquely defines the device that the added packages are associated with.

-  @param  HiiHandle           On output, the HiiHandle is update with the handle which can be used to retrieve the Package 

-                              List later. If the functions failed to add the package to the default HII database, this value will

-                              be set to NULL.

-  @param  ...                 The variable argument list describing all HII Package.

-

-  @return  EFI_SUCCESS         If the packages are successfully added to the default HII database.

-  @return  EFI_OUT_OF_RESOURCE Not enough resource to complete the operation.

-

-**/

-EFI_STATUS

-EFIAPI

-HiiLibAddPackages (

-  IN       UINTN               NumberOfPackages,

-  IN CONST EFI_GUID            *GuidId,

-  IN       EFI_HANDLE          DriverHandle, OPTIONAL

-  OUT      EFI_HII_HANDLE      *HiiHandle,

-  ...

-  )

-{

-  VA_LIST                   Args;

-  EFI_HII_PACKAGE_LIST_HEADER *PackageListHeader;

-  EFI_STATUS                Status;

-

-  ASSERT (HiiHandle != NULL);

-

-  VA_START (Args, HiiHandle);

-  PackageListHeader = InternalHiiLibPreparePackages (NumberOfPackages, GuidId, Args);

-

-  Status      = mHiiDatabaseProt->NewPackageList (mHiiDatabaseProt, PackageListHeader, DriverHandle, HiiHandle);

-  if (HiiHandle != NULL) {

-    if (EFI_ERROR (Status)) {

-      *HiiHandle = NULL;

-    }

-  }

-

-  FreePool (PackageListHeader);

-  VA_END (Args);

-  

-  return Status;

-}

-

-/**

-  Removes a package list from the default HII database.

-

-  If HiiHandle is NULL, then ASSERT.

-  If HiiHandle is not a valid EFI_HII_HANDLE in the default HII database, then ASSERT.

-

-  @param  HiiHandle                The handle that was previously registered to the data base that is requested for removal.

-                                             List later.

-

-**/

-VOID

-EFIAPI

-HiiLibRemovePackages (

-  IN      EFI_HII_HANDLE      HiiHandle

-  )

-{

-  EFI_STATUS Status;

-  ASSERT (IsHiiHandleRegistered (HiiHandle));

-

-  Status = mHiiDatabaseProt->RemovePackageList (mHiiDatabaseProt, HiiHandle);

-  ASSERT_EFI_ERROR (Status);

-}

-

-

-/**

-  Determines the handles that are currently active in the database.

-  It's the caller's responsibility to free handle buffer.

-

-  If HandleBufferLength is NULL, then ASSERT.

-  If HiiHandleBuffer is NULL, then ASSERT.

-

-  @param  HandleBufferLength     On input, a pointer to the length of the handle

-                                 buffer. On output, the length of the handle buffer

-                                 that is required for the handles found.

-  @param  HiiHandleBuffer        Pointer to an array of Hii Handles returned.

-

-  @retval EFI_SUCCESS            Get an array of Hii Handles successfully.

-

-**/

-EFI_STATUS

-EFIAPI

-HiiLibGetHiiHandles (

-  IN OUT UINTN                     *HandleBufferLength,

-  OUT    EFI_HII_HANDLE            **HiiHandleBuffer

-  )

-{

-  UINTN       BufferLength;

-  EFI_STATUS  Status;

-

-  ASSERT (HandleBufferLength != NULL);

-  ASSERT (HiiHandleBuffer != NULL);

-

-  BufferLength = 0;

-

-  //

-  // Try to find the actual buffer size for HiiHandle Buffer.

-  //

-  Status = mHiiDatabaseProt->ListPackageLists (

-                                 mHiiDatabaseProt,

-                                 EFI_HII_PACKAGE_TYPE_ALL,

-                                 NULL,

-                                 &BufferLength,

-                                 *HiiHandleBuffer

-                                 );

-

-  if (Status == EFI_BUFFER_TOO_SMALL) {

-      *HiiHandleBuffer = AllocateZeroPool (BufferLength);

-      ASSERT (*HiiHandleBuffer != NULL);

-      Status = mHiiDatabaseProt->ListPackageLists (

-                                     mHiiDatabaseProt,

-                                     EFI_HII_PACKAGE_TYPE_ALL,

-                                     NULL,

-                                     &BufferLength,

-                                     *HiiHandleBuffer

-                                     );

-      //

-      // we should not fail here.

-      //

-      ASSERT_EFI_ERROR (Status);

-  }

-

-  *HandleBufferLength = BufferLength;

-

-  return Status;

-}

-

-/**

-  Extract Hii package list GUID for given HII handle.

-

-  If HiiHandle could not be found in the default HII database, then ASSERT.

-  If Guid is NULL, then ASSERT.

-

-  @param  Handle              Hii handle

-  @param  Guid                Package list GUID

-

-  @retval EFI_SUCCESS            Successfully extract GUID from Hii database.

-

-**/

-EFI_STATUS

-EFIAPI

-HiiLibExtractGuidFromHiiHandle (

-  IN      EFI_HII_HANDLE      Handle,

-  OUT     EFI_GUID            *Guid

-  )

-{

-  EFI_STATUS                   Status;

-  UINTN                        BufferSize;

-  EFI_HII_PACKAGE_LIST_HEADER  *HiiPackageList;

-

-  ASSERT (Guid != NULL);

-  ASSERT (IsHiiHandleRegistered (Handle));

-

-  //

-  // Get HII PackageList

-  //

-  BufferSize = 0;

-  HiiPackageList = NULL;

-

-  Status = mHiiDatabaseProt->ExportPackageLists (mHiiDatabaseProt, Handle, &BufferSize, HiiPackageList);

-  ASSERT (Status != EFI_NOT_FOUND);

-  

-  if (Status == EFI_BUFFER_TOO_SMALL) {

-    HiiPackageList = AllocatePool (BufferSize);

-    ASSERT (HiiPackageList != NULL);

-

-    Status = mHiiDatabaseProt->ExportPackageLists (mHiiDatabaseProt, Handle, &BufferSize, HiiPackageList);

-  }

-  if (EFI_ERROR (Status)) {

-    FreePool (HiiPackageList);

-    return Status;

-  }

-

-  //

-  // Extract GUID

-  //

-  CopyGuid (Guid, &HiiPackageList->PackageListGuid);

-

-  FreePool (HiiPackageList);

-

-  return EFI_SUCCESS;

-}

-

-/**

-  Find HII Handle in the default HII database associated with given Device Path.

-

-  If DevicePath is NULL, then ASSERT.

-

-  @param  DevicePath             Device Path associated with the HII package list

-                                 handle.

-

-  @retval Handle                 HII package list Handle associated with the Device

-                                        Path.

-  @retval NULL                   Hii Package list handle is not found.

-

-**/

-EFI_HII_HANDLE

-EFIAPI

-HiiLibDevicePathToHiiHandle (

-  IN EFI_DEVICE_PATH_PROTOCOL   *DevicePath

-  )

-{

-  EFI_STATUS                  Status;

-  EFI_DEVICE_PATH_PROTOCOL    *TmpDevicePath;

-  UINTN                       BufferSize;

-  UINTN                       HandleCount;

-  UINTN                       Index;

-  EFI_HANDLE                  *Handles;

-  EFI_HANDLE                  Handle;

-  UINTN                       Size;

-  EFI_HANDLE                  DriverHandle;

-  EFI_HII_HANDLE              *HiiHandles;

-  EFI_HII_HANDLE              HiiHandle;

-

-  ASSERT (DevicePath != NULL);

-

-  //

-  // Locate Device Path Protocol handle buffer

-  //

-  Status = gBS->LocateHandleBuffer (

-                  ByProtocol,

-                  &gEfiDevicePathProtocolGuid,

-                  NULL,

-                  &HandleCount,

-                  &Handles

-                  );

-  if (EFI_ERROR (Status)) {

-    return NULL;

-  }

-

-  //

-  // Search Driver Handle by Device Path

-  //

-  DriverHandle = NULL;

-  BufferSize = GetDevicePathSize (DevicePath);

-  for(Index = 0; Index < HandleCount; Index++) {

-    Handle = Handles[Index];

-    gBS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, (VOID **) &TmpDevicePath);

-

-    //

-    // Check whether DevicePath match

-    //

-    Size = GetDevicePathSize (TmpDevicePath);

-    if ((Size == BufferSize) && CompareMem (DevicePath, TmpDevicePath, Size) == 0) {

-      DriverHandle = Handle;

-      break;

-    }

-  }

-  FreePool (Handles);

-

-  if (DriverHandle == NULL) {

-    return NULL;

-  }

-

-  //

-  // Retrieve all Hii Handles from HII database

-  //

-  BufferSize = 0x1000;

-  HiiHandles = AllocatePool (BufferSize);

-  ASSERT (HiiHandles != NULL);

-  Status = mHiiDatabaseProt->ListPackageLists (

-                          mHiiDatabaseProt,

-                          EFI_HII_PACKAGE_TYPE_ALL,

-                          NULL,

-                          &BufferSize,

-                          HiiHandles

-                          );

-  if (Status == EFI_BUFFER_TOO_SMALL) {

-    FreePool (HiiHandles);

-    HiiHandles = AllocatePool (BufferSize);

-    ASSERT (HiiHandles != NULL);

-

-    Status = mHiiDatabaseProt->ListPackageLists (

-                            mHiiDatabaseProt,

-                            EFI_HII_PACKAGE_TYPE_ALL,

-                            NULL,

-                            &BufferSize,

-                            HiiHandles

-                            );

-  }

-

-  if (EFI_ERROR (Status)) {

-    FreePool (HiiHandles);

-    return NULL;

-  }

-

-  //

-  // Search Hii Handle by Driver Handle

-  //

-  HiiHandle = NULL;

-  HandleCount = BufferSize / sizeof (EFI_HII_HANDLE);

-  for (Index = 0; Index < HandleCount; Index++) {

-    Status = mHiiDatabaseProt->GetPackageListHandle (

-                            mHiiDatabaseProt,

-                            HiiHandles[Index],

-                            &Handle

-                            );

-    if (!EFI_ERROR (Status) && (Handle == DriverHandle)) {

-      HiiHandle = HiiHandles[Index];

-      break;

-    }

-  }

-

-  FreePool (HiiHandles);

-  return HiiHandle;

-}

-

-/**

-  Exports the contents of one or all package lists in the HII database into a buffer.

-

-  If Handle is not NULL and not a valid EFI_HII_HANDLE registered in the database, 

-  then ASSERT.

-  If PackageListHeader is NULL, then ASSERT.

-  If PackageListSize is NULL, then ASSERT.

-

-  @param  Handle                 The HII Handle.

-  @param  PackageListHeader      A pointer to a buffer that will contain the results of 

-                                 the export function.

-  @param  PackageListSize        On output, the length of the buffer that is required for the exported data.

-

-  @retval EFI_SUCCESS            Package exported.

-

-  @retval EFI_OUT_OF_RESOURCES   Not enought memory to complete the operations.

-

-**/

-EFI_STATUS 

-EFIAPI

-HiiLibExportPackageLists (

-  IN EFI_HII_HANDLE                    Handle,

-  OUT EFI_HII_PACKAGE_LIST_HEADER      **PackageListHeader,

-  OUT UINTN                            *PackageListSize

-  )

-{

-  EFI_STATUS                       Status;

-  UINTN                            Size;

-  EFI_HII_PACKAGE_LIST_HEADER      *PackageListHdr;

-

-  ASSERT (PackageListSize != NULL);

-  ASSERT (PackageListHeader != NULL);

-

-  if (Handle != NULL) {

-    ASSERT (IsHiiHandleRegistered (Handle));

-  }

-

-  Size = 0;

-  PackageListHdr = NULL;

-  Status = mHiiDatabaseProt->ExportPackageLists (

-                                      mHiiDatabaseProt,

-                                      Handle,

-                                      &Size,

-                                      PackageListHdr

-                                      );

-  ASSERT_EFI_ERROR (Status != EFI_BUFFER_TOO_SMALL);

-  

-  if (Status == EFI_BUFFER_TOO_SMALL) {

-    PackageListHdr = AllocateZeroPool (Size);

-    

-    if (PackageListHeader == NULL) {

-      return EFI_OUT_OF_RESOURCES;

-    } else {

-      Status = mHiiDatabaseProt->ExportPackageLists (

-                                          mHiiDatabaseProt,

-                                          Handle,

-                                          &Size,

-                                          PackageListHdr

-                                           );

-    }

-  }

-

-  if (!EFI_ERROR (Status)) {

-    *PackageListHeader = PackageListHdr;

-    *PackageListSize   = Size;

-  } else {

-    FreePool (PackageListHdr);

-  }

-

-  return Status;

-}

-

-/**

-  

-  This function returns a list of the package handles of the   

-  specified type that are currently active in the HII database. The   

-  pseudo-type EFI_HII_PACKAGE_TYPE_ALL will cause all package   

-  handles to be listed.

-

-  If HandleBufferLength is NULL, then ASSERT.

-  If HandleBuffer is NULL, the ASSERT.

-  If PackageType is EFI_HII_PACKAGE_TYPE_GUID and PackageGuid is

-  NULL, then ASSERT.

-  If PackageType is not EFI_HII_PACKAGE_TYPE_GUID and PackageGuid is not

-  NULL, then ASSERT.

-  

-  

-  @param PackageType          Specifies the package type of the packages

-                              to list or EFI_HII_PACKAGE_TYPE_ALL for

-                              all packages to be listed.

-  

-  @param PackageGuid          If PackageType is

-                              EFI_HII_PACKAGE_TYPE_GUID, then this is

-                              the pointer to the GUID which must match

-                              the Guid field of

-                              EFI_HII_PACKAGE_GUID_HEADER. Otherwise, it

-                              must be NULL.

-  

-  @param HandleBufferLength   On output, the length of the handle buffer

-                              that is required for the handles found.

-

-  @param HandleBuffer         On output, an array of EFI_HII_HANDLE  instances returned.

-                              The caller is responcible to free this pointer allocated.

-

-  @retval EFI_SUCCESS           The matching handles are outputed successfully.

-                                HandleBufferLength is updated with the actual length.

-  @retval EFI_OUT_OF_RESOURCES  Not enough resource to complete the operation.

-  @retval EFI_NOT_FOUND         No matching handle could not be found in database.

-**/

-EFI_STATUS

-EFIAPI

-HiiLibListPackageLists (

-  IN        UINT8                     PackageType,

-  IN CONST  EFI_GUID                  *PackageGuid,

-  IN OUT    UINTN                     *HandleBufferLength,

-  OUT       EFI_HII_HANDLE            **HandleBuffer

-  )

-{

-  EFI_STATUS          Status;

-  

-  ASSERT (HandleBufferLength != NULL);

-  ASSERT (HandleBuffer != NULL);

-  

-  *HandleBufferLength = 0;

-  *HandleBuffer       = NULL;

-

-  if (PackageType == EFI_HII_PACKAGE_TYPE_GUID) {

-    ASSERT (PackageGuid != NULL);

-  } else {

-    ASSERT (PackageGuid == NULL);

-  }

-

-  Status = mHiiDatabaseProt->ListPackageLists (

-                            mHiiDatabaseProt,

-                            PackageType,

-                            PackageGuid,

-                            HandleBufferLength,

-                            *HandleBuffer

-                            );

-  if (EFI_ERROR (Status) && (Status != EFI_BUFFER_TOO_SMALL)) {

-    //

-    // No packages is registered to UEFI HII Database, just return.

-    // 

-    //

-    return Status;

-  }

-

-  *HandleBuffer = AllocateZeroPool (*HandleBufferLength);

-  

-  if (*HandleBuffer == NULL) {

-    return EFI_OUT_OF_RESOURCES;

-  }

-  

-  return mHiiDatabaseProt->ListPackageLists (

-                            mHiiDatabaseProt,

-                            PackageType,

-                            PackageGuid,

-                            HandleBufferLength,

-                            *HandleBuffer

-                            );

-  

-}

-/**

-  This function check if the Hii Handle is a valid handle registered

-  in the HII database.

-

-  @param HiiHandle The HII Handle.

-

-  @retval TRUE If it is a valid HII handle.

-  @retval FALSE If it is a invalid HII handle.

-**/

-BOOLEAN

-IsHiiHandleRegistered (

-  EFI_HII_HANDLE    HiiHandle

-  )

-{

-  EFI_STATUS                   Status;

-  UINTN                        BufferSize;

-  EFI_HII_PACKAGE_LIST_HEADER  *HiiPackageList;

-

-  ASSERT (HiiHandle != NULL);

-

-  HiiPackageList = NULL;

-  BufferSize = 0;

-

-  Status = mHiiDatabaseProt->ExportPackageLists (

-             mHiiDatabaseProt,

-             HiiHandle,

-             &BufferSize,

-             HiiPackageList

-             );

-

-  return (BOOLEAN) (Status == EFI_BUFFER_TOO_SMALL);

-}

-

diff --git a/MdePkg/Library/HiiLib/HiiLib.inf b/MdePkg/Library/HiiLib/HiiLib.inf
deleted file mode 100644
index 422d67d1b3..0000000000
--- a/MdePkg/Library/HiiLib/HiiLib.inf
+++ /dev/null
@@ -1,59 +0,0 @@
-#/** @file

-# Library instance for HII common routines.

-#

-# This library instance implements the common HII routines.

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

-#

-#

-#**/

-

-[Defines]

-  INF_VERSION                    = 0x00010005

-  BASE_NAME                      = HiiLib

-  FILE_GUID                      = 3143687A-7C80-404e-B5FE-2D88980E1B1C

-  MODULE_TYPE                    = UEFI_DRIVER

-  VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = HiiLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER

-  EDK_RELEASE_VERSION            = 0x00020000

-  EFI_SPECIFICATION_VERSION      = 0x00020000

-

-  CONSTRUCTOR                    = HiiLibConstructor

-

-#

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

-#

-

-[Sources.common]

-  HiiLib.c

-  HiiString.c

-  HiiLanguage.c

-  InternalHiiLib.h

-

-[Packages]

-  MdePkg/MdePkg.dec

-

-[LibraryClasses]

-  MemoryAllocationLib

-  BaseMemoryLib

-  BaseLib

-  DebugLib

-  UefiBootServicesTableLib

-  DevicePathLib

-  UefiLib

-

-[Protocols]

-  gEfiHiiDatabaseProtocolGuid  # ALWAYS_CONSUMED

-  gEfiHiiStringProtocolGuid    # ALWAYS_CONSUMED

-  gEfiDevicePathProtocolGuid  

-

-[Depex]

-  gEfiHiiDatabaseProtocolGuid AND

-  gEfiHiiStringProtocolGuid

-  

diff --git a/MdePkg/Library/HiiLib/HiiString.c b/MdePkg/Library/HiiLib/HiiString.c
deleted file mode 100644
index 2f44fabfd3..0000000000
--- a/MdePkg/Library/HiiLib/HiiString.c
+++ /dev/null
@@ -1,600 +0,0 @@
-/** @file

-  HII Library implementation that uses DXE protocols and services.

-

-  Copyright (c) 2006 - 2008, Intel Corporation<BR>

-  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 "InternalHiiLib.h"

-

-/**

-  This function adds the string into String Package of each language

-  supported by the package list.

-

-  If String is NULL, then ASSERT.

-  If StringId is NULL, the ASSERT.

-  If PackageList could not be found in the default HII database, then ASSERT.

-

-  @param  PackageList            Handle of the package list where this string will

-                                            be added.

-  @param  StringId               On return, contains the new strings id, which is

-                                          unique within PackageList.

-  @param  String                 Points to the new null-terminated string.

-

-  @retval EFI_SUCCESS             The new string was added successfully.

-  @retval EFI_OUT_OF_RESOURCES   Could not add the string due to lack of resources.

-

-**/

-EFI_STATUS

-EFIAPI

-HiiLibNewString (

-  IN  EFI_HII_HANDLE                  PackageList,

-  OUT EFI_STRING_ID                   *StringId,

-  IN  CONST EFI_STRING                String

-  )

-{

-  EFI_STATUS  Status;

-  CHAR8       *Languages;

-  CHAR8       *LangStrings;

-  CHAR8       Lang[RFC_3066_ENTRY_SIZE];

-

-  ASSERT (String != NULL);

-  ASSERT (StringId != NULL);

-

-  Status = EFI_SUCCESS;

-

-  Languages = HiiLibGetSupportedLanguages (PackageList);

-

-  LangStrings = Languages;

-  while (*LangStrings != 0) {

-    HiiLibGetNextLanguage (&LangStrings, Lang);

-

-    //

-    // For each language supported by the package,

-    // a string token is created.

-    //

-    Status = mHiiStringProt->NewString (

-                                 mHiiStringProt,

-                                 PackageList,

-                                 StringId,

-                                 Lang,

-                                 NULL,

-                                 String,

-                                 NULL

-                                 );

-    if (EFI_ERROR (Status)) {

-      break;

-    }

-  }

-

-  FreePool (Languages);

-

-  return Status;

-  

-}

-

-

-/**

-  This function update the specified string in String Package of each language

-  supported by the package list.

-

-  If String is NULL, then ASSERT.

-  If PackageList could not be found in the default HII database, then ASSERT.

-  If StringId is not found in PackageList, then ASSERT.

-

-  @param  PackageList            Handle of the package list where this string will

-                                            be added.

-  @param  StringId               Ths String Id to be updated.

-  @param  String                 Points to the new null-terminated string.

-

-  @retval EFI_SUCCESS            The new string was added successfully.

-  @retval EFI_OUT_OF_RESOURCES   Could not add the string due to lack of resources.

-

-**/

-EFI_STATUS

-EFIAPI

-HiiLibSetString (

-  IN  EFI_HII_HANDLE                  PackageList,

-  IN  EFI_STRING_ID                   StringId,

-  IN  CONST EFI_STRING                String

-  )

-{

-  EFI_STATUS  Status;

-  CHAR8       *Languages;

-  CHAR8       *LangStrings;

-  CHAR8       Lang[RFC_3066_ENTRY_SIZE];

-

-  ASSERT (IsHiiHandleRegistered (PackageList));

-

-  Status = EFI_SUCCESS;

-

-  Languages = HiiLibGetSupportedLanguages (PackageList);

-  ASSERT (Languages != NULL);

-

-  LangStrings = Languages;

-  while (*LangStrings != 0) {

-    HiiLibGetNextLanguage (&LangStrings, Lang);

-

-    //

-    // For each language supported by the package,

-    // the string is updated.

-    //

-    Status = mHiiStringProt->SetString (

-                                 mHiiStringProt,

-                                 PackageList,

-                                 StringId,

-                                 Lang,

-                                 String,

-                                 NULL

-                                 );

-    if (EFI_ERROR (Status)) {

-      break;

-    }

-  }

-

-  FreePool (Languages);

-

-  return Status;

-}

-

-

-/**

-  Get the string given the StringId and String package Producer's Guid. The caller

-  is responsible to free the *String.

-

-  If PackageList with the matching ProducerGuid is not found, then ASSERT.

-  If PackageList with the matching ProducerGuid is found but no String is

-  specified by StringId is found, then ASSERT.

-

-  @param  ProducerGuid           The Guid of String package list.

-  @param  StringId               The String ID.

-  @param  String                 The output string.

-

-  @retval EFI_SUCCESS            Operation is successful.

-  @retval EFI_OUT_OF_RESOURCES   There is not enought memory in the system.

-

-**/

-EFI_STATUS

-EFIAPI

-HiiLibGetStringFromToken (

-  IN  EFI_GUID                        *ProducerGuid,

-  IN  EFI_STRING_ID                   StringId,

-  OUT EFI_STRING                      *String

-  )

-{

-  EFI_STATUS      Status;

-  UINTN           Index;

-  UINTN           HandleBufferLen;

-  EFI_HII_HANDLE  *HiiHandleBuffer;

-  EFI_GUID        Guid;

-

-  Status = HiiLibGetHiiHandles (&HandleBufferLen, &HiiHandleBuffer);

-  if (EFI_ERROR(Status)) {

-    return Status;

-  }

-  for (Index = 0; Index < (HandleBufferLen / sizeof (EFI_HII_HANDLE)); Index++) {

-    Status = HiiLibExtractGuidFromHiiHandle (HiiHandleBuffer[Index], &Guid);

-    if (EFI_ERROR(Status)) {

-      return Status;

-    }

-    if (CompareGuid (&Guid, ProducerGuid)) {

-      break;

-    }

-  }

-

-  if (Index >= (HandleBufferLen / sizeof (EFI_HII_HANDLE))) {

-    //

-    // If PackageList with the matching ProducerGuid is not found, then ASSERT.

-    //

-    ASSERT (FALSE);

-    Status = EFI_NOT_FOUND;

-    goto Out;

-  }

-

-  Status = HiiLibGetStringFromHandle (HiiHandleBuffer[Index], StringId, String);

-

-Out:

-  if (HiiHandleBuffer != NULL) {

-    FreePool (HiiHandleBuffer);

-  }

-  return Status;

-}

-

-/**

-  This function try to retrieve string from String package of current language.

-  If fails, it try to retrieve string from String package of first language it support.

-

-  If StringSize is NULL, then ASSERT.

-  If String is NULL and *StringSize is not 0, then ASSERT.

-  If PackageList could not be found in the default HII database, then ASSERT.

-  If StringId is not found in PackageList, then ASSERT.

-

-  @param  PackageList     The package list in the HII database to search for

-                                     the specified string.

-  @param  StringId          The string's id, which is unique within

-                                      PackageList.

-  @param  String             Points to the new null-terminated string.

-  @param  StringSize       On entry, points to the size of the buffer pointed

-                                 to by String, in bytes. On return, points to the

-                                 length of the string, in bytes.

-

-  @retval EFI_SUCCESS            The string was returned successfully.

-  @retval EFI_NOT_FOUND          The string specified by StringId is not available.

-  @retval EFI_BUFFER_TOO_SMALL   The buffer specified by StringLength is too small

-                                 to hold the string.

-

-**/

-EFI_STATUS

-EFIAPI

-HiiLibGetString (

-  IN  EFI_HII_HANDLE                  PackageList,

-  IN  EFI_STRING_ID                   StringId,

-  OUT EFI_STRING                      String,

-  IN  OUT UINTN                       *StringSize

-  )

-{

-  EFI_STATUS  Status;

-  CHAR8       *Languages;

-  CHAR8       *LangStrings;

-  CHAR8       Lang[RFC_3066_ENTRY_SIZE];

-  CHAR8       CurrentLang[RFC_3066_ENTRY_SIZE];

-

-  ASSERT (StringSize != NULL);

-  ASSERT (!(*StringSize != 0 && String == NULL));

-  ASSERT (IsHiiHandleRegistered (PackageList));

-

-  GetCurrentLanguage (CurrentLang);

-

-  Status = mHiiStringProt->GetString (

-                               mHiiStringProt,

-                               CurrentLang,

-                               PackageList,

-                               StringId,

-                               String,

-                               StringSize,

-                               NULL

-                               );

-

-  if (EFI_ERROR (Status) && (Status != EFI_BUFFER_TOO_SMALL)) {

-    Languages = HiiLibGetSupportedLanguages (PackageList);

-    ASSERT (Languages != NULL);

-    

-    LangStrings = Languages;

-    HiiLibGetNextLanguage (&LangStrings, Lang);

-    FreePool (Languages);

-

-    Status = mHiiStringProt->GetString (

-                                 mHiiStringProt,

-                                 Lang,

-                                 PackageList,

-                                 StringId,

-                                 String,

-                                 StringSize,

-                                 NULL

-                                 );

-  }

-

-  return Status;

-}

-

-

-/**

-  Get string specified by StringId form the HiiHandle. The caller

-  is responsible to free the *String.

-

-  If String is NULL, then ASSERT.

-  If HiiHandle could not be found in the default HII database, then ASSERT.

-  If StringId is not found in PackageList, then ASSERT.

-

-  @param  HiiHandle              The HII handle of package list.

-  @param  StringId               The String ID.

-  @param  String                 The output string.

-

-  @retval EFI_NOT_FOUND          String is not found.

-  @retval EFI_SUCCESS            Operation is successful.

-  @retval EFI_OUT_OF_RESOURCES   There is not enought memory in the system.

-

-**/

-EFI_STATUS

-EFIAPI

-HiiLibGetStringFromHandle (

-  IN  EFI_HII_HANDLE                  HiiHandle,

-  IN  EFI_STRING_ID                   StringId,

-  OUT EFI_STRING                      *String

-  )

-{

-  EFI_STATUS                          Status;

-  UINTN                               StringSize;

-

-  ASSERT (String != NULL);

-

-  StringSize = HII_LIB_DEFAULT_STRING_SIZE;

-  *String    = AllocateZeroPool (StringSize);

-  if (*String == NULL) {

-    return EFI_OUT_OF_RESOURCES;

-  }

-

-  Status = HiiLibGetString (HiiHandle, StringId, *String, &StringSize);

-  if (Status == EFI_BUFFER_TOO_SMALL) {

-    FreePool (*String);

-    *String = AllocateZeroPool (StringSize);

-    if (*String == NULL) {

-      return EFI_OUT_OF_RESOURCES;

-    }

-    Status = HiiLibGetString (HiiHandle, StringId, *String, &StringSize);

-  }

-

-  return Status;

-}

-

-

-

-//

-// Lookup table of ISO639-2 3 character language codes to ISO 639-1 2 character language codes

-// Each entry is 5 CHAR8 values long.  The first 3 CHAR8 values are the ISO 639-2 code.

-// The last 2 CHAR8 values are the ISO 639-1 code.

-//

-GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 Iso639ToRfc3066ConversionTable[] =

-"\

-aaraa\

-abkab\

-afraf\

-amham\

-araar\

-asmas\

-aymay\

-azeaz\

-bakba\

-belbe\

-benbn\

-bihbh\

-bisbi\

-bodbo\

-brebr\

-bulbg\

-catca\

-cescs\

-corkw\

-cosco\

-cymcy\

-danda\

-deude\

-dzodz\

-ellel\

-engen\

-epoeo\

-estet\

-euseu\

-faofo\

-fasfa\

-fijfj\

-finfi\

-frafr\

-fryfy\

-gaiga\

-gdhgd\

-glggl\

-grngn\

-gujgu\

-hauha\

-hebhe\

-hinhi\

-hrvhr\

-hunhu\

-hyehy\

-ikuiu\

-ileie\

-inaia\

-indid\

-ipkik\

-islis\

-itait\

-jawjw\

-jpnja\

-kalkl\

-kankn\

-kasks\

-katka\

-kazkk\

-khmkm\

-kinrw\

-kirky\

-korko\

-kurku\

-laolo\

-latla\

-lavlv\

-linln\

-litlt\

-ltzlb\

-malml\

-marmr\

-mkdmk\

-mlgmg\

-mltmt\

-molmo\

-monmn\

-mrimi\

-msams\

-myamy\

-nauna\

-nepne\

-nldnl\

-norno\

-ocioc\

-ormom\

-panpa\

-polpl\

-porpt\

-pusps\

-quequ\

-rohrm\

-ronro\

-runrn\

-rusru\

-sagsg\

-sansa\

-sinsi\

-slksk\

-slvsl\

-smise\

-smosm\

-snasn\

-sndsd\

-somso\

-sotst\

-spaes\

-sqisq\

-srpsr\

-sswss\

-sunsu\

-swasw\

-swesv\

-tamta\

-tattt\

-telte\

-tgktg\

-tgltl\

-thath\

-tsnts\

-tuktk\

-twitw\

-uigug\

-ukruk\

-urdur\

-uzbuz\

-vievi\

-volvo\

-wolwo\

-xhoxh\

-yidyi\

-zhaza\

-zhozh\

-zulzu\

-";

-

-

-/**

-  Convert language code from RFC3066 to ISO639-2.

-

-  @param  LanguageRfc3066        RFC3066 language code.

-  @param  LanguageIso639         ISO639-2 language code.

-

-  @retval EFI_SUCCESS            Language code converted.

-  @retval EFI_NOT_FOUND          Language code not found.

-

-**/

-EFI_STATUS

-EFIAPI

-ConvertRfc3066LanguageToIso639Language (

-  IN  CHAR8   *LanguageRfc3066,

-  OUT CHAR8   *LanguageIso639

-  )

-{

-  UINTN  Index;

-

-  if ((LanguageRfc3066[2] != '-') && (LanguageRfc3066[2] != 0)) {

-    CopyMem (LanguageIso639, LanguageRfc3066, 3);

-    return EFI_SUCCESS;

-  }

-

-  for (Index = 0; Iso639ToRfc3066ConversionTable[Index] != 0; Index += 5) {

-    if (CompareMem (LanguageRfc3066, &Iso639ToRfc3066ConversionTable[Index + 3], 2) == 0) {

-      CopyMem (LanguageIso639, &Iso639ToRfc3066ConversionTable[Index], 3);

-      return EFI_SUCCESS;

-    }

-  }

-

-  return EFI_NOT_FOUND;

-}

-

-

-/**

-  Convert language code from ISO639-2 to RFC3066.

-

-  LanguageIso639 contain a single ISO639-2 code such as

-  "eng" or "fra".

-

-  The LanguageRfc3066 must be a buffer large enough

-  for RFC_3066_ENTRY_SIZE characters.

-

-  If LanguageIso639 is NULL, then ASSERT.

-  If LanguageRfc3066 is NULL, then ASSERT.

-

-  @param  LanguageIso639         ISO639-2 language code.

-  @param  LanguageRfc3066        RFC3066 language code.

-

-  @retval EFI_SUCCESS            Language code converted.

-  @retval EFI_NOT_FOUND          Language code not found.

-

-**/

-EFI_STATUS

-EFIAPI

-ConvertIso639LanguageToRfc3066Language (

-  IN  CONST CHAR8   *LanguageIso639,

-  OUT CHAR8         *LanguageRfc3066

-  )

-{

-  UINTN Index;

-  

-  for (Index = 0; Iso639ToRfc3066ConversionTable[Index] != 0; Index += 5) {

-    if (CompareMem (LanguageIso639, &Iso639ToRfc3066ConversionTable[Index], 3) == 0) {

-      CopyMem (LanguageRfc3066, &Iso639ToRfc3066ConversionTable[Index + 3], 2);

-      return EFI_SUCCESS;

-    }

-  }

-

-  return EFI_NOT_FOUND;

-}

-

-/**

-  Convert language code list from RFC3066 to ISO639-2, e.g. "en-US;fr-FR" will

-  be converted to "engfra".

-

-  @param  SupportedLanguages     The RFC3066 language list.

-

-  @return The ISO639-2 language list.

-

-**/

-CHAR8 *

-EFIAPI

-Rfc3066ToIso639 (

-  CHAR8  *SupportedLanguages

-  )

-{

-  CHAR8       *Languages;

-  CHAR8       *ReturnValue;

-  CHAR8       *LangCodes;

-  CHAR8       LangRfc3066[RFC_3066_ENTRY_SIZE];

-  CHAR8       LangIso639[ISO_639_2_ENTRY_SIZE];

-  EFI_STATUS  Status;

-

-  ReturnValue = AllocateZeroPool (AsciiStrSize (SupportedLanguages));

-  if (ReturnValue == NULL) {

-    return ReturnValue;

-  }

-

-  Languages = ReturnValue;

-  LangCodes = SupportedLanguages;

-  while (*LangCodes != 0) {

-    HiiLibGetNextLanguage (&LangCodes, LangRfc3066);

-

-    Status = ConvertRfc3066LanguageToIso639Language (LangRfc3066, LangIso639);

-    if (!EFI_ERROR (Status)) {

-      CopyMem (Languages, LangIso639, 3);

-      Languages = Languages + 3;

-    }

-  }

-

-  return ReturnValue;

-}

-

-

diff --git a/MdePkg/Library/HiiLib/InternalHiiLib.h b/MdePkg/Library/HiiLib/InternalHiiLib.h
deleted file mode 100644
index 18d168ec70..0000000000
--- a/MdePkg/Library/HiiLib/InternalHiiLib.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/** @file

-  Internal include file for the HII Library instance.

-

-  Copyright (c) 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 __INTERNAL_HII_LIB_H__

-#define __INTERNAL_HII_LIB_H__

-

-#include <Uefi.h>

-

-#include <Protocol/HiiDatabase.h>

-#include <Protocol/HiiString.h>

-#include <Protocol/DevicePath.h>

-

-#include <Library/BaseLib.h>

-#include <Library/BaseMemoryLib.h>

-#include <Library/HiiLib.h>

-#include <Library/DebugLib.h>

-#include <Library/MemoryAllocationLib.h>

-#include <Library/UefiBootServicesTableLib.h>

-#include <Library/DevicePathLib.h>

-#include <Library/UefiLib.h>

-

-#define HII_LIB_DEFAULT_STRING_SIZE     0x200

-

-

-extern CONST EFI_HII_DATABASE_PROTOCOL         *mHiiDatabaseProt;

-extern CONST EFI_HII_STRING_PROTOCOL           *mHiiStringProt;

-

-/**

-  This function check if the Hii Handle is a valid handle registered

-  in the HII database.

-

-  @param HiiHandle The HII Handle.

-

-  @retval TRUE If it is a valid HII handle.

-  @retval FALSE If it is a invalid HII handle.

-**/

-BOOLEAN

-IsHiiHandleRegistered (

-  EFI_HII_HANDLE    HiiHandle

-  );

-

-#endif