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

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 = HiiLibNewString (gStringHandle, &Token, UString);
-  Status = gHii->NewString (gHii, NULL, 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 = HiiLibNewString (gStringHandle, &Token, UString);
-  Status = gHii->NewString (gHii, NULL, 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 = HiiLibNewString (gStringHandle, &Token, UString);
-  Status = IfrLibNewString (gStringHandle, &Token, UString);
+
-#else
-  Token  = 0;
-  Status = gHii->NewString (gHii, NULL, gStringHandle, &Token, UString);
-#endif
   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);

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

DuetPkg/DuetPkg.dsc

@@ -23,7 +23,9 @@
   UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
-  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf
+  HiiLib|MdePkg/Library/HiiLib/HiiLib.inf
+  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
+  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
 
 [LibraryClasses.common.DXE_DRIVER]
   MemoryAllocationLib|MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf

DuetPkg/DxeIpl/DxeIpl.inf

@@ -20,7 +20,7 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = DxeIpl
   FILE_GUID                      = 2119BBD7-9432-4f47-B5E2-5C4EA31B6BDC
-  MODULE_TYPE                    = PEIM
+  MODULE_TYPE                    = USER_DEFINED
   VERSION_STRING                 = 1.0
   EDK_RELEASE_VERSION            = 0x00020000
   EFI_SPECIFICATION_VERSION      = 0x00020000
@@ -37,7 +37,6 @@
   BaseLib
   BaseMemoryLib
   PrintLib
-  PeimEntryPoint
   ReportStatusCodeLib
 
 [Sources.common]
@@ -66,4 +65,9 @@
   Ia32\Paging.c
   Ia32\VirtualMemory.h
 
-  
+[BuildOptions.common]
+  #MSFT:*_*_IA32_DLINK_FLAGS = /out:"$(BIN_DIR)\SecMain.exe" /base:0x10000000 /pdb:"$(BIN_DIR)\SecMain.pdb" /LIBPATH:"$(VCINSTALLDIR)\Lib" /LIBPATH:"$(VCINSTALLDIR)\PlatformSdk\Lib" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib
+  MSFT:*_*_IA32_CC_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE
+  MSFT:*_*_IA32_PP_FLAGS = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h
+  MSFT:*_*_IA32_ASM_FLAGS = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi
+  MSFT:*_*_IA32_ASMLINK_FLAGS       = /link /nologo /tiny