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

diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.c b/DuetPkg/DataHubGenDxe/DataHubGen.c
index 8e59de1c3329b58c6edd28fd65e190d33d2e208b..5d38505e13f6ec0162bc245f11833717d751bf7a 100644 (file)
--- a/DuetPkg/DataHubGenDxe/DataHubGen.c
+++ b/DuetPkg/DataHubGenDxe/DataHubGen.c
@@ -55,20 +55,6 @@ GetSmbiosTablesFromHob (
   return NULL;\r
 }\r
 \r
-EFI_STATUS\r
-PrepareHiiPackage (\r
-  VOID\r
-  )\r
-{\r
-  EFI_HII_PACKAGES                  *PackageList;\r
-  EFI_STATUS                        Status;\r
-\r
-  PackageList   = PreparePackages (1, &gEfiMiscProducerGuid, DataHubGenDxeStrings);\r
-  Status        = gHii->NewPack (gHii, PackageList, &gStringHandle);\r
-\r
-  return Status;\r
-}\r
-\r
 EFI_SUBCLASS_TYPE1_HEADER mCpuDataRecordHeader = {\r
   EFI_PROCESSOR_SUBCLASS_VERSION,       // Version\r
   sizeof (EFI_SUBCLASS_TYPE1_HEADER),   // Header Size\r
@@ -126,8 +112,7 @@ InstallProcessorDataHub (
   ASSERT (UString != NULL);\r
   AsciiStrToUnicodeStr (AString, UString);\r
 \r
-  Token  = 0;\r
-  Status = gHii->NewString (gHii, NULL, gStringHandle, &Token, UString);\r
+  Status = HiiLibNewString (gStringHandle, &Token, UString);\r
 \r
   if (EFI_ERROR (Status)) {\r
     gBS->FreePool (UString);\r
@@ -256,8 +241,7 @@ InstallMiscDataHub (
   CopyMem (UString, FIRMWARE_BIOS_VERSIONE, sizeof(FIRMWARE_BIOS_VERSIONE));\r
   AsciiStrToUnicodeStr (AString, UString + sizeof(FIRMWARE_BIOS_VERSIONE) / sizeof(CHAR16) - 1);\r
 \r
-  Token  = 0;\r
-  Status = gHii->NewString (gHii, NULL, gStringHandle, &Token, UString);\r
+  Status = HiiLibNewString (gStringHandle, &Token, UString);\r
 \r
   if (EFI_ERROR (Status)) {\r
     gBS->FreePool (UString);\r
@@ -306,12 +290,8 @@ InstallMiscDataHub (
   CopyMem (UString, FIRMWARE_PRODUCT_NAME, sizeof(FIRMWARE_PRODUCT_NAME));\r
   AsciiStrToUnicodeStr (AString, UString + sizeof(FIRMWARE_PRODUCT_NAME) / sizeof(CHAR16) - 1);\r
 \r
-#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)\r
-  Status = IfrLibNewString (gStringHandle, &Token, UString);\r
-#else\r
-  Token  = 0;\r
-  Status = gHii->NewString (gHii, NULL, gStringHandle, &Token, UString);\r
-#endif\r
+  Status = HiiLibNewString (gStringHandle, &Token, UString);\r
+\r
   if (EFI_ERROR (Status)) {\r
     gBS->FreePool (UString);\r
     return ;\r
@@ -350,7 +330,6 @@ DataHubGenEntrypoint (
   EFI_STATUS              Status;\r
   VOID                    *Smbios;\r
 \r
-\r
   Smbios = GetSmbiosTablesFromHob ();\r
   if (Smbios == NULL) {\r
     return EFI_NOT_FOUND;\r
@@ -381,8 +360,8 @@ DataHubGenEntrypoint (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
-\r
-  PrepareHiiPackage ();\r
+  \r
+  HiiLibAddPackages (1, &gEfiMiscProducerGuid, NULL, &gStringHandle, DataHubGenDxeStrings);\r
 \r
   InstallProcessorDataHub (Smbios);\r
   InstallCacheDataHub     (Smbios);\r

diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.inf b/DuetPkg/DataHubGenDxe/DataHubGen.inf
index fde36e334ccd3c07568426820d960d72b00f60df..58ff185b395e9994603326efaddbe0440e9db6f8 100644 (file)
--- a/DuetPkg/DataHubGenDxe/DataHubGen.inf
+++ b/DuetPkg/DataHubGenDxe/DataHubGen.inf
@@ -42,7 +42,7 @@
   MemoryAllocationLib\r
   UefiDriverEntryPoint\r
   BaseLib\r
-  FrameworkHiiLib\r
+  HiiLib\r
   \r
 [Sources.common]\r
   DataHubGen.c\r
@@ -51,13 +51,13 @@
 \r
 [Guids.common]\r
   gEfiProcessorSubClassGuid\r
-  gEfiHiiProtocolGuid\r
   gEfiMiscSubClassGuid\r
   gEfiDataHubProtocolGuid\r
   gEfiSmbiosTableGuid\r
   gEfiMiscProducerGuid\r
   gEfiMemorySubClassGuid\r
   gEfiMemoryProducerGuid\r
+  gEfiHiiProtocolGuid\r
 \r
 [Depex]\r
   gEfiDataHubProtocolGuid AND gEfiHiiProtocolGuid
\ No newline at end of file

diff --git a/DuetPkg/DuetPkg.dsc b/DuetPkg/DuetPkg.dsc
index 07ae2e4cd0d1ce410e73f521f7bc1e746ac06b0a..3cd902fc830d60e8c5adda774fbc3f4f2aa087dd 100644 (file)
--- a/DuetPkg/DuetPkg.dsc
+++ b/DuetPkg/DuetPkg.dsc
@@ -23,7 +23,9 @@
   UefiLib|MdePkg/Library/UefiLib/UefiLib.inf\r
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf\r
-  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf\r
+  HiiLib|MdePkg/Library/HiiLib/HiiLib.inf\r
+  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf\r
+  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
 \r
 [LibraryClasses.common.DXE_DRIVER]\r
   MemoryAllocationLib|MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf\r

diff --git a/DuetPkg/DxeIpl/DxeIpl.inf b/DuetPkg/DxeIpl/DxeIpl.inf
index cfe109c86c206717dcd69e6bac7d46e876ef389b..0e6d1fb5855c8ed286673460502425d8faf9eb6d 100644 (file)
--- a/DuetPkg/DxeIpl/DxeIpl.inf
+++ b/DuetPkg/DxeIpl/DxeIpl.inf
@@ -20,7 +20,7 @@
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = DxeIpl\r
   FILE_GUID                      = 2119BBD7-9432-4f47-B5E2-5C4EA31B6BDC\r
-  MODULE_TYPE                    = PEIM\r
+  MODULE_TYPE                    = USER_DEFINED\r
   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
@@ -37,7 +37,6 @@
   BaseLib\r
   BaseMemoryLib\r
   PrintLib\r
-  PeimEntryPoint\r
   ReportStatusCodeLib\r
 \r
 [Sources.common]\r
@@ -66,4 +65,9 @@
   Ia32\Paging.c\r
   Ia32\VirtualMemory.h\r
 \r
-  \r
+[BuildOptions.common]\r
+  #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\r
+  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\r
+  MSFT:*_*_IA32_PP_FLAGS = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+  MSFT:*_*_IA32_ASM_FLAGS = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
+  MSFT:*_*_IA32_ASMLINK_FLAGS       = /link /nologo /tiny  \r