diff options
| author | klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-03-20 09:07:41 +0000 |
|---|---|---|
| committer | klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-03-20 09:07:41 +0000 |
| commit | 91aac0e4668b80f99d4d8f1f92225a3745d83dbd (patch) | |
| tree | 60b951f15c0672980ea2c2e88a136147750f6e30 /DuetPkg/DataHubGenDxe | |
| parent | 6d87c34485a7491f557321361bb2be15ac197f83 (diff) | |
| download | edk2-platforms-91aac0e4668b80f99d4d8f1f92225a3745d83dbd.tar.xz | |
Rebase the duet module with new HII modifications.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4927 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'DuetPkg/DataHubGenDxe')
| -rw-r--r-- | DuetPkg/DataHubGenDxe/DataHubGen.c | 33 | ||||
| -rw-r--r-- | DuetPkg/DataHubGenDxe/DataHubGen.inf | 4 |
2 files changed, 8 insertions, 29 deletions
diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.c b/DuetPkg/DataHubGenDxe/DataHubGen.c index 8e59de1c33..5d38505e13 100644 --- a/DuetPkg/DataHubGenDxe/DataHubGen.c +++ b/DuetPkg/DataHubGenDxe/DataHubGen.c @@ -55,20 +55,6 @@ GetSmbiosTablesFromHob ( return NULL;
}
-EFI_STATUS
-PrepareHiiPackage (
- VOID
- )
-{
- EFI_HII_PACKAGES *PackageList;
- EFI_STATUS Status;
-
- PackageList = PreparePackages (1, &gEfiMiscProducerGuid, DataHubGenDxeStrings);
- Status = gHii->NewPack (gHii, PackageList, &gStringHandle);
-
- return Status;
-}
-
EFI_SUBCLASS_TYPE1_HEADER mCpuDataRecordHeader = {
EFI_PROCESSOR_SUBCLASS_VERSION, // Version
sizeof (EFI_SUBCLASS_TYPE1_HEADER), // Header Size
@@ -126,8 +112,7 @@ InstallProcessorDataHub ( ASSERT (UString != NULL);
AsciiStrToUnicodeStr (AString, UString);
- Token = 0;
- Status = gHii->NewString (gHii, NULL, gStringHandle, &Token, UString);
+ Status = HiiLibNewString (gStringHandle, &Token, UString);
if (EFI_ERROR (Status)) {
gBS->FreePool (UString);
@@ -256,8 +241,7 @@ InstallMiscDataHub ( CopyMem (UString, FIRMWARE_BIOS_VERSIONE, sizeof(FIRMWARE_BIOS_VERSIONE));
AsciiStrToUnicodeStr (AString, UString + sizeof(FIRMWARE_BIOS_VERSIONE) / sizeof(CHAR16) - 1);
- Token = 0;
- Status = gHii->NewString (gHii, NULL, gStringHandle, &Token, UString);
+ Status = HiiLibNewString (gStringHandle, &Token, UString);
if (EFI_ERROR (Status)) {
gBS->FreePool (UString);
@@ -306,12 +290,8 @@ InstallMiscDataHub ( CopyMem (UString, FIRMWARE_PRODUCT_NAME, sizeof(FIRMWARE_PRODUCT_NAME));
AsciiStrToUnicodeStr (AString, UString + sizeof(FIRMWARE_PRODUCT_NAME) / sizeof(CHAR16) - 1);
-#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)
- Status = IfrLibNewString (gStringHandle, &Token, UString);
-#else
- Token = 0;
- Status = gHii->NewString (gHii, NULL, gStringHandle, &Token, UString);
-#endif
+ Status = HiiLibNewString (gStringHandle, &Token, UString);
+
if (EFI_ERROR (Status)) {
gBS->FreePool (UString);
return ;
@@ -350,7 +330,6 @@ DataHubGenEntrypoint ( EFI_STATUS Status;
VOID *Smbios;
-
Smbios = GetSmbiosTablesFromHob ();
if (Smbios == NULL) {
return EFI_NOT_FOUND;
@@ -381,8 +360,8 @@ DataHubGenEntrypoint ( if (EFI_ERROR (Status)) {
return Status;
}
-
- PrepareHiiPackage ();
+
+ HiiLibAddPackages (1, &gEfiMiscProducerGuid, NULL, &gStringHandle, DataHubGenDxeStrings);
InstallProcessorDataHub (Smbios);
InstallCacheDataHub (Smbios);
diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.inf b/DuetPkg/DataHubGenDxe/DataHubGen.inf index fde36e334c..58ff185b39 100644 --- a/DuetPkg/DataHubGenDxe/DataHubGen.inf +++ b/DuetPkg/DataHubGenDxe/DataHubGen.inf @@ -42,7 +42,7 @@ MemoryAllocationLib
UefiDriverEntryPoint
BaseLib
- FrameworkHiiLib
+ HiiLib
[Sources.common]
DataHubGen.c
@@ -51,13 +51,13 @@ [Guids.common]
gEfiProcessorSubClassGuid
- gEfiHiiProtocolGuid
gEfiMiscSubClassGuid
gEfiDataHubProtocolGuid
gEfiSmbiosTableGuid
gEfiMiscProducerGuid
gEfiMemorySubClassGuid
gEfiMemoryProducerGuid
+ gEfiHiiProtocolGuid
[Depex]
gEfiDataHubProtocolGuid AND gEfiHiiProtocolGuid
\ No newline at end of file |