diff options
| author | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-01-21 14:42:45 +0000 |
|---|---|---|
| committer | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-01-21 14:42:45 +0000 |
| commit | 5fd5fcd321e3d778aa51f1a47732c8d886c1ff4c (patch) | |
| tree | dd2cadee0d7de823326d1e584f110d0e75d0a453 /Nt32Pkg/CpuRuntimeDxe | |
| parent | 7d582d6b499ed30268da033cc17fbde6e7b02a9d (diff) | |
| download | edk2-5fd5fcd321e3d778aa51f1a47732c8d886c1ff4c.tar.gz edk2-5fd5fcd321e3d778aa51f1a47732c8d886c1ff4c.tar.bz2 edk2-5fd5fcd321e3d778aa51f1a47732c8d886c1ff4c.zip | |
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
Diffstat (limited to 'Nt32Pkg/CpuRuntimeDxe')
| -rw-r--r-- | Nt32Pkg/CpuRuntimeDxe/Cpu.c | 19 | ||||
| -rw-r--r-- | Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf | 5 | ||||
| -rw-r--r-- | Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.msa | 3 |
3 files changed, 5 insertions, 22 deletions
diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.c b/Nt32Pkg/CpuRuntimeDxe/Cpu.c index 2dff9024c9..48e12ecc1c 100644 --- a/Nt32Pkg/CpuRuntimeDxe/Cpu.c +++ b/Nt32Pkg/CpuRuntimeDxe/Cpu.c @@ -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.
@@ -435,14 +432,6 @@ Returns: }
//
- // Locate DataHub protocol.
- //
- Status = gBS->LocateProtocol (&gEfiHiiProtocolGuid, NULL, &Hii);
- if (EFI_ERROR (Status)) {
- return;
- }
-
- //
// Initialize data record header
//
mCpuDataRecordHeader.Instance = 1;
@@ -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);
diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf index ee76efa60b..837a3ae18e 100644 --- a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf +++ b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf @@ -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
diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.msa b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.msa index f0f22f9540..4237a1e837 100644 --- a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.msa +++ b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.msa @@ -63,9 +63,6 @@ <ProtocolCName>gEfiWinNtIoProtocolGuid</ProtocolCName>
</Protocol>
<Protocol Usage="SOMETIMES_CONSUMED">
- <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
- </Protocol>
- <Protocol Usage="SOMETIMES_CONSUMED">
<ProtocolCName>gEfiDataHubProtocolGuid</ProtocolCName>
</Protocol>
<ProtocolNotify Usage="SOMETIMES_CONSUMED">
|