UEFI HII: Merge UEFI HII support changes from branch.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4601 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -421,10 +421,7 @@ Returns:
|
||||
UINT32 HeaderSize;
|
||||
UINT32 TotalSize;
|
||||
EFI_DATA_HUB_PROTOCOL *DataHub;
|
||||
EFI_HII_PROTOCOL *Hii;
|
||||
EFI_HII_HANDLE StringHandle;
|
||||
EFI_HII_PACKAGES *PackageList;
|
||||
|
||||
EFI_HII_HANDLE HiiHandle;
|
||||
|
||||
//
|
||||
// Locate DataHub protocol.
|
||||
@@ -434,14 +431,6 @@ Returns:
|
||||
return;
|
||||
}
|
||||
|
||||
//
|
||||
// Locate DataHub protocol.
|
||||
//
|
||||
Status = gBS->LocateProtocol (&gEfiHiiProtocolGuid, NULL, &Hii);
|
||||
if (EFI_ERROR (Status)) {
|
||||
return;
|
||||
}
|
||||
|
||||
//
|
||||
// Initialize data record header
|
||||
//
|
||||
@@ -456,10 +445,8 @@ Returns:
|
||||
//
|
||||
// Initialize strings to HII database
|
||||
//
|
||||
PackageList = PreparePackages (1, &gEfiProcessorProducerGuid, CpuStrings);
|
||||
Status = Hii->NewPack (Hii, PackageList, &StringHandle);
|
||||
ASSERT (!EFI_ERROR (Status));
|
||||
FreePool (PackageList);
|
||||
HiiLibAddPackagesToHiiDatabase (1, &gEfiProcessorProducerGuid, NULL, &HiiHandle, CpuStrings);
|
||||
|
||||
|
||||
CopyMem (RecordBuffer.Raw, &mCpuDataRecordHeader, HeaderSize);
|
||||
|
||||
|
@@ -48,7 +48,7 @@
|
||||
MemoryAllocationLib
|
||||
BaseMemoryLib
|
||||
UefiDriverEntryPoint
|
||||
FrameworkHiiLib
|
||||
HiiLib
|
||||
DebugLib
|
||||
|
||||
[Guids]
|
||||
@@ -58,10 +58,9 @@
|
||||
[Protocols]
|
||||
gEfiWinNtIoProtocolGuid # PROTOCOL_NOTIFY SOMETIMES_CONSUMED
|
||||
gEfiDataHubProtocolGuid # PROTOCOL SOMETIMES_CONSUMED
|
||||
gEfiHiiProtocolGuid # PROTOCOL SOMETIMES_CONSUMED
|
||||
gEfiWinNtIoProtocolGuid # PROTOCOL ALWAYS_CONSUMED
|
||||
gEfiCpuIoProtocolGuid # PROTOCOL ALWAYS_PRODUCED
|
||||
gEfiCpuArchProtocolGuid # PROTOCOL ALWAYS_PRODUCED
|
||||
|
||||
[Depex]
|
||||
gEfiDataHubProtocolGuid AND gEfiHiiProtocolGuid
|
||||
gEfiDataHubProtocolGuid
|
||||
|
@@ -62,9 +62,6 @@
|
||||
<Protocol Usage="ALWAYS_CONSUMED">
|
||||
<ProtocolCName>gEfiWinNtIoProtocolGuid</ProtocolCName>
|
||||
</Protocol>
|
||||
<Protocol Usage="SOMETIMES_CONSUMED">
|
||||
<ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
|
||||
</Protocol>
|
||||
<Protocol Usage="SOMETIMES_CONSUMED">
|
||||
<ProtocolCName>gEfiDataHubProtocolGuid</ProtocolCName>
|
||||
</Protocol>
|
||||
|
Reference in New Issue
Block a user