]> git.proxmox.com Git - mirror_edk2.git/commitdiff
UEFI HII: Merge UEFI HII support changes from branch.
authorqwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524>
Mon, 21 Jan 2008 14:42:45 +0000 (14:42 +0000)
committerqwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524>
Mon, 21 Jan 2008 14:42:45 +0000 (14:42 +0000)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4601 6f19259b-4bc3-4df7-8a09-765794883524

31 files changed:
Nt32Pkg/CpuRuntimeDxe/Cpu.c
Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.msa
Nt32Pkg/Include/Common/WinNTInclude.h
Nt32Pkg/Include/Library/EdkGenericBdsLib.h
Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c [new file with mode: 0644]
Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.h [new file with mode: 0644]
Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf [new file with mode: 0644]
Nt32Pkg/Library/Nt32BdsLib/PlatformData.c [new file with mode: 0644]
Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.msa
Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
Nt32Pkg/Nt32Pkg.dsc
Nt32Pkg/Nt32Pkg.fdf
Nt32Pkg/Nt32UefiHii/Nt32UefiHii.dsc [new file with mode: 0644]
Nt32Pkg/Nt32UefiHii/Nt32UefiHii.fdf [new file with mode: 0644]
Nt32Pkg/PlatformBdsDxe/Generic/BdsString.h
Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BmLib.c
Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c
Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h
Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootOption.c
Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FileExplorer.c
Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/UpdatePage.c
Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Variable.c
Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c
Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.h
Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.c
Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.h
Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c
Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.h

index 2dff9024c97d4c3d4c202299055be3053f604984..48e12ecc1c058c01f2ec6e7329f9e11b9fcc14a7 100644 (file)
@@ -421,10 +421,7 @@ Returns:
   UINT32                      HeaderSize;\r
   UINT32                      TotalSize;\r
   EFI_DATA_HUB_PROTOCOL       *DataHub;\r
-  EFI_HII_PROTOCOL            *Hii;\r
-  EFI_HII_HANDLE              StringHandle;\r
-  EFI_HII_PACKAGES            *PackageList;\r
-\r
+  EFI_HII_HANDLE              HiiHandle;\r
 \r
   //\r
   // Locate DataHub protocol.\r
@@ -434,14 +431,6 @@ Returns:
     return;\r
   }\r
 \r
-  //\r
-  // Locate DataHub protocol.\r
-  //\r
-  Status = gBS->LocateProtocol (&gEfiHiiProtocolGuid, NULL, &Hii);\r
-  if (EFI_ERROR (Status)) {\r
-    return;\r
-  }\r
-\r
   //\r
   // Initialize data record header\r
   //\r
@@ -456,10 +445,8 @@ Returns:
   //\r
   // Initialize strings to HII database\r
   //\r
-  PackageList = PreparePackages (1, &gEfiProcessorProducerGuid, CpuStrings);\r
-  Status      = Hii->NewPack (Hii, PackageList, &StringHandle);\r
-  ASSERT (!EFI_ERROR (Status));\r
-  FreePool (PackageList);\r
+  HiiLibAddPackagesToHiiDatabase (1, &gEfiProcessorProducerGuid, NULL, &HiiHandle, CpuStrings);\r
+  \r
 \r
   CopyMem (RecordBuffer.Raw, &mCpuDataRecordHeader, HeaderSize);\r
 \r
index ee76efa60bd0601cf87532aa51e2ff3adbfe5e3b..837a3ae18e0caf36e1f7acd1c5f4294e8f5a808e 100644 (file)
@@ -48,7 +48,7 @@
   MemoryAllocationLib\r
   BaseMemoryLib\r
   UefiDriverEntryPoint\r
-  FrameworkHiiLib\r
+  HiiLib\r
   DebugLib\r
 \r
 [Guids]\r
 [Protocols]\r
   gEfiWinNtIoProtocolGuid                       # PROTOCOL_NOTIFY SOMETIMES_CONSUMED\r
   gEfiDataHubProtocolGuid                       # PROTOCOL SOMETIMES_CONSUMED\r
-  gEfiHiiProtocolGuid                           # PROTOCOL SOMETIMES_CONSUMED\r
   gEfiWinNtIoProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED\r
   gEfiCpuIoProtocolGuid                         # PROTOCOL ALWAYS_PRODUCED\r
   gEfiCpuArchProtocolGuid                       # PROTOCOL ALWAYS_PRODUCED\r
 \r
 [Depex]\r
-  gEfiDataHubProtocolGuid AND gEfiHiiProtocolGuid\r
+  gEfiDataHubProtocolGuid\r
index f0f22f9540cfa26e246794e0341a18ea94b5b6cd..4237a1e837fa79013aeb4c9a3eeaaf09f6ac651b 100644 (file)
@@ -62,9 +62,6 @@
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiWinNtIoProtocolGuid</ProtocolCName>\r
     </Protocol>\r
-    <Protocol Usage="SOMETIMES_CONSUMED">\r
-      <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
     <Protocol Usage="SOMETIMES_CONSUMED">\r
       <ProtocolCName>gEfiDataHubProtocolGuid</ProtocolCName>\r
     </Protocol>\r
index 3aa02e895e59f2c7c22f009220ee3253ae9d68b5..982488f29aaf53b27739506b47a2438b380c4493 100644 (file)
@@ -42,6 +42,11 @@ Abstract:
 #undef VOID\r
 #undef DEBUG_EVENT\r
 \r
+// WQBugBug: This typedef is to make "windows.h" buildable.\r
+//                   It should be removed after the root cause why\r
+//                   size_t is undefined when go into the line below is found.\r
+typedef UINT32 size_t ;\r
+\r
 #include "windows.h"\r
 \r
 #undef GUID\r
index 351e4cd74cc9172279690cb4c7b1ca0f9fb18d99..bc2066fc46b891665ed4a9d7e349ae2aa1559101 100644 (file)
@@ -390,7 +390,7 @@ EFI_STATUS
 BdsLibGetHiiHandles (\r
   IN     EFI_HII_PROTOCOL *Hii,\r
   IN OUT UINT16           *HandleBufferLength,\r
-  OUT    EFI_HII_HANDLE   **HiiHandles\r
+  OUT    FRAMEWORK_EFI_HII_HANDLE    **HiiHandles\r
   );\r
 \r
 #endif // _BDS_LIB_H_\r
index 7eac6a012ee8782bf72316b9bfbbea5a999ead12..70d337e338d57b0975450acb91047ee1a316d7d8 100644 (file)
@@ -1047,7 +1047,7 @@ EFI_STATUS
 BdsLibGetHiiHandles (\r
   IN     EFI_HII_PROTOCOL *Hii,\r
   IN OUT UINT16           *HandleBufferLength,\r
-  OUT    EFI_HII_HANDLE   **HiiHandleBuffer\r
+  OUT    FRAMEWORK_EFI_HII_HANDLE   **HiiHandleBuffer\r
   )\r
 /*++\r
 \r
diff --git a/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c b/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c
new file mode 100644 (file)
index 0000000..d6ee955
--- /dev/null
@@ -0,0 +1,516 @@
+/*++\r
+\r
+Copyright (c) 2004 - 2006, Intel Corporation                                                         \r
+All rights reserved. This program and the accompanying materials                          \r
+are licensed and made available under the terms and conditions of the BSD License         \r
+which accompanies this distribution.  The full text of the license may be found at        \r
+http://opensource.org/licenses/bsd-license.php                                            \r
+                                                                                          \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+Module Name:\r
+\r
+  BdsPlatform.c\r
+\r
+Abstract:\r
+\r
+  This file include all platform action which can be customized\r
+  by IBV/OEM.\r
+\r
+--*/\r
+\r
+#include "BdsPlatform.h"\r
+\r
+CHAR16  mFirmwareVendor[] = L"TianoCore.org";\r
+\r
+//\r
+// BDS Platform Functions\r
+//\r
+VOID\r
+PlatformBdsInit (\r
+  IN EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Platform Bds init. Incude the platform firmware vendor, revision\r
+  and so crc check.\r
+\r
+Arguments:\r
+\r
+  PrivateData  - The EFI_BDS_ARCH_PROTOCOL_INSTANCE instance\r
+\r
+Returns:\r
+\r
+  None.\r
+\r
+--*/\r
+{\r
+  //\r
+  // set firmwarevendor, here can be IBV/OEM customize\r
+  //\r
+  gST->FirmwareVendor = AllocateRuntimeCopyPool (\r
+                          sizeof (mFirmwareVendor),\r
+                          &mFirmwareVendor\r
+                          );\r
+  ASSERT (gST->FirmwareVendor != NULL);\r
+\r
+  gST->FirmwareRevision = 0;\r
+\r
+  //\r
+  // Fixup Tasble CRC after we updated Firmware Vendor and Revision\r
+  //\r
+  gBS->CalculateCrc32 ((VOID *) gST, sizeof (EFI_SYSTEM_TABLE), &gST->Hdr.CRC32);\r
+\r
+}\r
+\r
+EFI_STATUS\r
+PlatformBdsConnectConsole (\r
+  IN BDS_CONSOLE_CONNECT_ENTRY   *PlatformConsole\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Connect the predefined platform default console device. Always try to find\r
+  and enable the vga device if have.\r
+\r
+Arguments:\r
+\r
+  PlatformConsole         - Predfined platform default console device array.\r
\r
+Returns:\r
+\r
+  EFI_SUCCESS             - Success connect at least one ConIn and ConOut \r
+                            device, there must have one ConOut device is \r
+                            active vga device.\r
+  \r
+  EFI_STATUS              - Return the status of \r
+                            BdsLibConnectAllDefaultConsoles ()\r
+\r
+--*/\r
+{\r
+  EFI_STATUS  Status;\r
+  UINTN       Index;\r
+\r
+  Index   = 0;\r
+  Status  = EFI_SUCCESS;\r
+\r
+  //\r
+  // Have chance to connect the platform default console,\r
+  // the platform default console is the minimue device group\r
+  // the platform should support\r
+  //\r
+  while (PlatformConsole[Index].DevicePath != NULL) {\r
+    //\r
+    // Update the console variable with the connect type\r
+    //\r
+    if ((PlatformConsole[Index].ConnectType & CONSOLE_IN) == CONSOLE_IN) {\r
+      BdsLibUpdateConsoleVariable (L"ConIn", PlatformConsole[Index].DevicePath, NULL);\r
+    }\r
+\r
+    if ((PlatformConsole[Index].ConnectType & CONSOLE_OUT) == CONSOLE_OUT) {\r
+      BdsLibUpdateConsoleVariable (L"ConOut", PlatformConsole[Index].DevicePath, NULL);\r
+    }\r
+\r
+    if ((PlatformConsole[Index].ConnectType & STD_ERROR) == STD_ERROR) {\r
+      BdsLibUpdateConsoleVariable (L"ErrOut", PlatformConsole[Index].DevicePath, NULL);\r
+    }\r
+\r
+    Index++;\r
+  }\r
+  //\r
+  // Connect the all the default console with current cosole variable\r
+  //\r
+  Status = BdsLibConnectAllDefaultConsoles ();\r
+  \r
+  return Status;\r
+}\r
+\r
+VOID\r
+PlatformBdsConnectSequence (\r
+  VOID\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Connect with predeined platform connect sequence, \r
+  the OEM/IBV can customize with their own connect sequence.\r
+  \r
+Arguments:\r
+\r
+  None.\r
\r
+Returns:\r
+\r
+  None.\r
+  \r
+--*/\r
+{\r
+  UINTN Index;\r
+\r
+  Index = 0;\r
+\r
+  //\r
+  // Here we can get the customized platform connect sequence\r
+  // Notes: we can connect with new variable which record the\r
+  // last time boots connect device path sequence\r
+  //\r
+  while (gPlatformConnectSequence[Index] != NULL) {\r
+    //\r
+    // Build the platform boot option\r
+    //\r
+    BdsLibConnectDevicePath (gPlatformConnectSequence[Index]);\r
+    Index++;\r
+  }\r
+\r
+  //\r
+  // Jst use the simple policy to connect all devices\r
+  //\r
+  BdsLibConnectAll ();\r
+}\r
+\r
+VOID\r
+PlatformBdsGetDriverOption (\r
+  IN OUT LIST_ENTRY              *BdsDriverLists\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Load the predefined driver option, OEM/IBV can customize this\r
+  to load their own drivers\r
+  \r
+Arguments:\r
+\r
+  BdsDriverLists  - The header of the driver option link list.\r
\r
+Returns:\r
+\r
+  None.\r
+  \r
+--*/\r
+{\r
+  UINTN Index;\r
+\r
+  Index = 0;\r
+\r
+  //\r
+  // Here we can get the customized platform driver option\r
+  //\r
+  while (gPlatformDriverOption[Index] != NULL) {\r
+    //\r
+    // Build the platform boot option\r
+    //\r
+    BdsLibRegisterNewOption (BdsDriverLists, gPlatformDriverOption[Index], NULL, L"DriverOrder");\r
+    Index++;\r
+  }\r
+\r
+}\r
+\r
+VOID\r
+PlatformBdsDiagnostics (\r
+  IN EXTENDMEM_COVERAGE_LEVEL    MemoryTestLevel,\r
+  IN BOOLEAN                     QuietBoot\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Perform the platform diagnostic, such like test memory. OEM/IBV also\r
+  can customize this fuction to support specific platform diagnostic.\r
+  \r
+Arguments:\r
+\r
+  MemoryTestLevel  - The memory test intensive level\r
+  \r
+  QuietBoot        - Indicate if need to enable the quiet boot\r
\r
+Returns:\r
+\r
+  None.\r
+  \r
+--*/\r
+{\r
+  EFI_STATUS  Status;\r
+\r
+  //\r
+  // Here we can decide if we need to show\r
+  // the diagnostics screen\r
+  // Notes: this quiet boot code should be remove\r
+  // from the graphic lib\r
+  //\r
+  if (QuietBoot) {\r
+    EnableQuietBootEx (&gEfiDefaultBmpLogoGuid, mBdsImageHandle);\r
+    //\r
+    // Perform system diagnostic\r
+    //\r
+    Status = BdsMemoryTest (MemoryTestLevel);\r
+    if (EFI_ERROR (Status)) {\r
+      DisableQuietBoot ();\r
+    }\r
+\r
+    return ;\r
+  }\r
+  //\r
+  // Perform system diagnostic\r
+  //\r
+  Status = BdsMemoryTest (MemoryTestLevel);\r
+}\r
+\r
+VOID\r
+PlatformBdsPolicyBehavior (\r
+  IN EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData,\r
+  IN OUT LIST_ENTRY                  *DriverOptionList,\r
+  IN OUT LIST_ENTRY                  *BootOptionList\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  The function will excute with as the platform policy, current policy\r
+  is driven by boot mode. IBV/OEM can customize this code for their specific\r
+  policy action.\r
+  \r
+Arguments:\r
+\r
+  PrivateData      - The EFI_BDS_ARCH_PROTOCOL_INSTANCE instance\r
+  \r
+  DriverOptionList - The header of the driver option link list\r
+  \r
+  BootOptionList   - The header of the boot option link list\r
\r
+Returns:\r
+\r
+  None.\r
+  \r
+--*/\r
+{\r
+  EFI_STATUS  Status;\r
+  UINT16      Timeout;\r
+\r
+  //\r
+  // Init the time out value\r
+  //\r
+  Timeout = BdsLibGetTimeout ();\r
+\r
+  //\r
+  // Load the driver option as the driver option list\r
+  //\r
+  PlatformBdsGetDriverOption (DriverOptionList);\r
+\r
+  //\r
+  // Get current Boot Mode\r
+  //\r
+  Status = BdsLibGetBootMode (&PrivateData->BootMode);\r
+\r
+  //\r
+  // Go the different platform policy with different boot mode\r
+  // Notes: this part code can be change with the table policy\r
+  //\r
+  switch (PrivateData->BootMode) {\r
+\r
+  case BOOT_ASSUMING_NO_CONFIGURATION_CHANGES:\r
+  case BOOT_WITH_MINIMAL_CONFIGURATION:\r
+    //\r
+    // In no-configuration boot mode, we can connect the\r
+    // console directly.\r
+    //\r
+    BdsLibConnectAllDefaultConsoles ();\r
+    PlatformBdsDiagnostics (IGNORE, TRUE);\r
+\r
+    //\r
+    // Perform some platform specific connect sequence\r
+    //\r
+    PlatformBdsConnectSequence ();\r
+\r
+    //\r
+    // Notes: current time out = 0 can not enter the\r
+    // front page\r
+    //\r
+    PlatformBdsEnterFrontPage (Timeout, FALSE);\r
+\r
+    //\r
+    // Check the boot option with the boot option list\r
+    //\r
+    BdsLibBuildOptionFromVar (BootOptionList, L"BootOrder");\r
+    break;\r
+\r
+  case BOOT_ON_FLASH_UPDATE:\r
+    //\r
+    // Boot with the specific configuration\r
+    //\r
+    PlatformBdsConnectConsole (gPlatformConsole);\r
+    PlatformBdsDiagnostics (EXTENSIVE, FALSE);\r
+    BdsLibConnectAll ();\r
+    ProcessCapsules (BOOT_ON_FLASH_UPDATE);\r
+    break;\r
+\r
+  case BOOT_IN_RECOVERY_MODE:\r
+    //\r
+    // In recovery mode, just connect platform console\r
+    // and show up the front page\r
+    //\r
+    PlatformBdsConnectConsole (gPlatformConsole);\r
+    PlatformBdsDiagnostics (EXTENSIVE, FALSE);\r
+\r
+    //\r
+    // In recovery boot mode, we still enter to the\r
+    // frong page now\r
+    //\r
+    PlatformBdsEnterFrontPage (Timeout, FALSE);\r
+    break;\r
+\r
+  case BOOT_WITH_FULL_CONFIGURATION:\r
+  case BOOT_WITH_FULL_CONFIGURATION_PLUS_DIAGNOSTICS:\r
+  case BOOT_WITH_DEFAULT_SETTINGS:\r
+  default:\r
+    //\r
+    // Connect platform console\r
+    //\r
+    Status = PlatformBdsConnectConsole (gPlatformConsole);\r
+    if (EFI_ERROR (Status)) {\r
+      //\r
+      // Here OEM/IBV can customize with defined action\r
+      //\r
+      PlatformBdsNoConsoleAction ();\r
+    }\r
+\r
+    PlatformBdsDiagnostics (IGNORE, TRUE);\r
+\r
+    //\r
+    // Perform some platform specific connect sequence\r
+    //\r
+    PlatformBdsConnectSequence ();\r
+\r
+    //\r
+    // Give one chance to enter the setup if we\r
+    // have the time out\r
+    //\r
+    PlatformBdsEnterFrontPage (Timeout, FALSE);\r
+\r
+    //\r
+    // Here we have enough time to do the enumeration of boot device\r
+    //\r
+    BdsLibEnumerateAllBootOption (BootOptionList);\r
+    break;\r
+  }\r
+\r
+  return ;\r
+\r
+}\r
+\r
+VOID\r
+PlatformBdsBootSuccess (\r
+  IN  BDS_COMMON_OPTION   *Option\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+  \r
+  Hook point after a boot attempt succeeds. We don't expect a boot option to\r
+  return, so the EFI 1.0 specification defines that you will default to an\r
+  interactive mode and stop processing the BootOrder list in this case. This\r
+  is alos a platform implementation and can be customized by IBV/OEM.\r
+\r
+Arguments:\r
+\r
+  Option - Pointer to Boot Option that succeeded to boot.\r
+\r
+Returns:\r
+  \r
+  None.\r
+\r
+--*/\r
+{\r
+  CHAR16  *TmpStr;\r
+\r
+  //\r
+  // If Boot returned with EFI_SUCCESS and there is not in the boot device\r
+  // select loop then we need to pop up a UI and wait for user input.\r
+  //\r
+  TmpStr = Option->StatusString;\r
+  if (TmpStr != NULL) {\r
+    BdsLibOutputStrings (gST->ConOut, TmpStr, Option->Description, L"\n\r", NULL);\r
+    FreePool (TmpStr);\r
+  }\r
+}\r
+\r
+VOID\r
+PlatformBdsBootFail (\r
+  IN  BDS_COMMON_OPTION  *Option,\r
+  IN  EFI_STATUS         Status,\r
+  IN  CHAR16             *ExitData,\r
+  IN  UINTN              ExitDataSize\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+  \r
+  Hook point after a boot attempt fails.\r
+\r
+Arguments:\r
+  \r
+  Option - Pointer to Boot Option that failed to boot.\r
+\r
+  Status - Status returned from failed boot.\r
+\r
+  ExitData - Exit data returned from failed boot.\r
+\r
+  ExitDataSize - Exit data size returned from failed boot.\r
+\r
+Returns:\r
+  \r
+  None.\r
+\r
+--*/\r
+{\r
+  CHAR16  *TmpStr;\r
+\r
+  //\r
+  // If Boot returned with failed status then we need to pop up a UI and wait\r
+  // for user input.\r
+  //\r
+  TmpStr = Option->StatusString;\r
+  if (TmpStr != NULL) {\r
+    BdsLibOutputStrings (gST->ConOut, TmpStr, Option->Description, L"\n\r", NULL);\r
+    FreePool (TmpStr);\r
+  }\r
+\r
+}\r
+\r
+EFI_STATUS\r
+PlatformBdsNoConsoleAction (\r
+  VOID\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+  \r
+  This function is remained for IBV/OEM to do some platform action,\r
+  if there no console device can be connected.\r
+\r
+Arguments:\r
+  \r
+  None.\r
+  \r
+Returns:\r
+  \r
+  EFI_SUCCESS      - Direct return success now.\r
+\r
+--*/\r
+{\r
+  return EFI_SUCCESS;\r
+}\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+PlatformBdsLockNonUpdatableFlash (\r
+  VOID\r
+  )\r
+{\r
+  return EFI_SUCCESS;\r
+}\r
diff --git a/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.h b/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.h
new file mode 100644 (file)
index 0000000..5dcce86
--- /dev/null
@@ -0,0 +1,124 @@
+/*++\r
+\r
+Copyright (c) 2004 - 2006, Intel Corporation                                                         \r
+All rights reserved. This program and the accompanying materials                          \r
+are licensed and made available under the terms and conditions of the BSD License         \r
+which accompanies this distribution.  The full text of the license may be found at        \r
+http://opensource.org/licenses/bsd-license.php                                            \r
+                                                                                          \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+Module Name: \r
+\r
+  BdsPlatform.h\r
+\r
+Abstract:\r
+\r
+  Head file for BDS Platform specific code\r
+\r
+--*/\r
+\r
+#ifndef _BDS_PLATFORM_H\r
+#define _BDS_PLATFORM_H\r
+\r
+#include <PiDxe.h>\r
+\r
+#include <Library/DebugLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/PcdLib.h>\r
+#include <Library/GenericBdsLib.h>\r
+#include <Library/PlatformBdsLib.h>\r
+#include <Library/GraphicsLib.h>\r
+\r
+#include <Protocol/WinNtThunk.h>\r
+#include <Protocol/WinNtIo.h>\r
+#include <Guid/Bmp.h>\r
+\r
+extern BDS_CONSOLE_CONNECT_ENTRY  gPlatformConsole[];\r
+extern EFI_DEVICE_PATH_PROTOCOL   *gPlatformConnectSequence[];\r
+extern EFI_DEVICE_PATH_PROTOCOL   *gPlatformDriverOption[];\r
+\r
+#define gEndEntire \\r
+  { \\r
+    END_DEVICE_PATH_TYPE,\\r
+    END_ENTIRE_DEVICE_PATH_SUBTYPE,\\r
+    END_DEVICE_PATH_LENGTH,\\r
+    0\\r
+  }\r
+\r
+typedef struct {\r
+  VENDOR_DEVICE_PATH  VendorDevicePath;\r
+  UINT32              Instance;\r
+} WIN_NT_VENDOR_DEVICE_PATH_NODE;\r
+\r
+//\r
+// Below is the platform console device path\r
+//\r
+typedef struct {\r
+  VENDOR_DEVICE_PATH              NtBus;\r
+  WIN_NT_VENDOR_DEVICE_PATH_NODE  SerialDevice;\r
+  UART_DEVICE_PATH                Uart;\r
+  VENDOR_DEVICE_PATH              TerminalType;\r
+  EFI_DEVICE_PATH_PROTOCOL        End;\r
+} NT_ISA_SERIAL_DEVICE_PATH;\r
+\r
+typedef struct {\r
+  VENDOR_DEVICE_PATH              NtBus;\r
+  WIN_NT_VENDOR_DEVICE_PATH_NODE  NtUgaDevice;\r
+  EFI_DEVICE_PATH_PROTOCOL        End;\r
+} NT_PLATFORM_UGA_DEVICE_PATH;\r
+\r
+typedef struct {\r
+  VENDOR_DEVICE_PATH              NtBus;\r
+  WIN_NT_VENDOR_DEVICE_PATH_NODE  NtGopDevice;\r
+  EFI_DEVICE_PATH_PROTOCOL        End;\r
+} NT_PLATFORM_GOP_DEVICE_PATH;\r
+\r
+VOID\r
+PlatformBdsGetDriverOption (\r
+  IN LIST_ENTRY                   *BdsDriverLists\r
+  )\r
+;\r
+\r
+EFI_STATUS\r
+BdsMemoryTest (\r
+  EXTENDMEM_COVERAGE_LEVEL Level\r
+  )\r
+;\r
+\r
+VOID\r
+PlatformBdsConnectSequence (\r
+  VOID\r
+  )\r
+;\r
+\r
+\r
+EFI_STATUS\r
+ProcessCapsules (\r
+  EFI_BOOT_MODE BootMode\r
+  )\r
+;\r
+\r
+EFI_STATUS\r
+PlatformBdsConnectConsole (\r
+  IN BDS_CONSOLE_CONNECT_ENTRY   *PlatformConsole\r
+  )\r
+;\r
+\r
+EFI_STATUS\r
+PlatformBdsNoConsoleAction (\r
+  VOID\r
+  )\r
+;\r
+\r
+VOID\r
+PlatformBdsEnterFrontPage (\r
+  IN UINT16                 TimeoutDefault,\r
+  IN BOOLEAN                ConnectAllHappened\r
+  );\r
+\r
+#endif // _BDS_PLATFORM_H\r
diff --git a/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf b/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf
new file mode 100644 (file)
index 0000000..f1fc9c8
--- /dev/null
@@ -0,0 +1,56 @@
+#/** @file\r
+# Component name for module GenericBdsLib\r
+#\r
+# FIX ME!\r
+# Copyright (c) 2007, Intel Corporation. All rights reserved.\r
+#\r
+#  All rights reserved. This program and the accompanying materials       \r
+#  are licensed and made available under the terms and conditions of the BSD License   \r
+#  which accompanies this distribution. The full text of the license may be found at  \r
+#  http://opensource.org/licenses/bsd-license.php           \r
+#  \r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,      \r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#\r
+#**/\r
+\r
+[Defines]\r
+  INF_VERSION                    = 0x00010005\r
+  BASE_NAME                      = PlatformBdsLib\r
+  FILE_GUID                      = D2E346C6-7AA5-4b25-947C-A6736F4221C7\r
+  MODULE_TYPE                    = DXE_DRIVER\r
+  VERSION_STRING                 = 1.0\r
+  LIBRARY_CLASS                  = PlatformBdsLib|DXE_DRIVER   \r
+  EDK_RELEASE_VERSION            = 0x00020000\r
+  EFI_SPECIFICATION_VERSION      = 0x0002000A\r
+\r
+\r
+#\r
+# The following information is for reference only and not required by the build tools.\r
+#\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#\r
+\r
+[Sources.common]\r
+  BdsPlatform.c\r
+  PlatformData.c\r
+  BdsPlatform.h\r
+\r
+[Packages]\r
+  MdePkg/MdePkg.dec\r
+  MdeModulePkg/MdeModulePkg.dec\r
+  Nt32Pkg/Nt32Pkg.dec\r
+\r
+[LibraryClasses]\r
+  BaseLib\r
+  MemoryAllocationLib\r
+  UefiBootServicesTableLib\r
+  BaseMemoryLib\r
+  DebugLib\r
+  PcdLib\r
+  GraphicsLib\r
+  GenericBdsLib\r
+\r
+[Guids]\r
+  gEfiDefaultBmpLogoGuid\r
diff --git a/Nt32Pkg/Library/Nt32BdsLib/PlatformData.c b/Nt32Pkg/Library/Nt32BdsLib/PlatformData.c
new file mode 100644 (file)
index 0000000..180f618
--- /dev/null
@@ -0,0 +1,227 @@
+/*++\r
+\r
+Copyright (c) 2004 - 2006, Intel Corporation                                                         \r
+All rights reserved. This program and the accompanying materials                          \r
+are licensed and made available under the terms and conditions of the BSD License         \r
+which accompanies this distribution.  The full text of the license may be found at        \r
+http://opensource.org/licenses/bsd-license.php                                            \r
+                                                                                          \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+Module Name: \r
+\r
+  PlatformData.c\r
+\r
+Abstract:\r
+  \r
+  Defined the platform specific device path which will be used by\r
+  platform Bbd to perform the platform policy connect.\r
+\r
+--*/\r
+\r
+#include "BdsPlatform.h"\r
+\r
+//\r
+// Predefined platform default time out value\r
+//\r
+UINT16                      gPlatformBootTimeOutDefault = 10;\r
+\r
+//\r
+// Platform specific keyboard device path\r
+//\r
+NT_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath0 = {\r
+  {\r
+    HARDWARE_DEVICE_PATH,\r
+    HW_VENDOR_DP,\r
+    (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
+    (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),\r
+    EFI_WIN_NT_THUNK_PROTOCOL_GUID\r
+  },\r
+  {\r
+    HARDWARE_DEVICE_PATH,\r
+    HW_VENDOR_DP,\r
+    (UINT8) (sizeof (WIN_NT_VENDOR_DEVICE_PATH_NODE)),\r
+    (UINT8) ((sizeof (WIN_NT_VENDOR_DEVICE_PATH_NODE)) >> 8),\r
+    EFI_WIN_NT_UGA_GUID,\r
+    0\r
+  },\r
+  gEndEntire\r
+};\r
+\r
+NT_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath1 = {\r
+  {\r
+    HARDWARE_DEVICE_PATH,\r
+    HW_VENDOR_DP,\r
+    (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
+    (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),\r
+    EFI_WIN_NT_THUNK_PROTOCOL_GUID\r
+  },\r
+  {\r
+    HARDWARE_DEVICE_PATH,\r
+    HW_VENDOR_DP,\r
+    (UINT8) (sizeof (WIN_NT_VENDOR_DEVICE_PATH_NODE)),\r
+    (UINT8) ((sizeof (WIN_NT_VENDOR_DEVICE_PATH_NODE)) >> 8),\r
+    EFI_WIN_NT_UGA_GUID,\r
+    1\r
+  },\r
+  gEndEntire\r
+};\r
+\r
+NT_PLATFORM_GOP_DEVICE_PATH gGopDevicePath0 = {\r
+  {\r
+    HARDWARE_DEVICE_PATH,\r
+    HW_VENDOR_DP,\r
+    (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
+    (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),\r
+    EFI_WIN_NT_THUNK_PROTOCOL_GUID\r
+  },\r
+  {\r
+    HARDWARE_DEVICE_PATH,\r
+    HW_VENDOR_DP,\r
+    (UINT8) (sizeof (WIN_NT_VENDOR_DEVICE_PATH_NODE)),\r
+    (UINT8) ((sizeof (WIN_NT_VENDOR_DEVICE_PATH_NODE)) >> 8),\r
+    EFI_WIN_NT_GOP_GUID,\r
+    0\r
+  },\r
+  gEndEntire\r
+};\r
+\r
+NT_PLATFORM_GOP_DEVICE_PATH gGopDevicePath1 = {\r
+  {\r
+    HARDWARE_DEVICE_PATH,\r
+    HW_VENDOR_DP,\r
+    (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
+    (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),\r
+    EFI_WIN_NT_THUNK_PROTOCOL_GUID\r
+  },\r
+  {\r
+    HARDWARE_DEVICE_PATH,\r
+    HW_VENDOR_DP,\r
+    (UINT8) (sizeof (WIN_NT_VENDOR_DEVICE_PATH_NODE)),\r
+    (UINT8) ((sizeof (WIN_NT_VENDOR_DEVICE_PATH_NODE)) >> 8),\r
+    EFI_WIN_NT_GOP_GUID,\r
+    1\r
+  },\r
+  gEndEntire\r
+};\r
+\r
+//\r
+// Platform specific serial device path\r
+//\r
+NT_ISA_SERIAL_DEVICE_PATH   gNtSerialDevicePath0 = {\r
+  {\r
+    HARDWARE_DEVICE_PATH,\r
+    HW_VENDOR_DP,\r
+    (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
+    (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),\r
+    EFI_WIN_NT_THUNK_PROTOCOL_GUID\r
+  },\r
+  {\r
+    HARDWARE_DEVICE_PATH,\r
+    HW_VENDOR_DP,\r
+    (UINT8) (sizeof (WIN_NT_VENDOR_DEVICE_PATH_NODE)),\r
+    (UINT8) ((sizeof (WIN_NT_VENDOR_DEVICE_PATH_NODE)) >> 8),\r
+    EFI_WIN_NT_SERIAL_PORT_GUID\r
+  },\r
+  {\r
+    MESSAGING_DEVICE_PATH,\r
+    MSG_UART_DP,\r
+    (UINT8) (sizeof (UART_DEVICE_PATH)),\r
+    (UINT8) ((sizeof (UART_DEVICE_PATH)) >> 8),\r
+    0,\r
+    115200,\r
+    8,\r
+    1,\r
+    1\r
+  },\r
+  {\r
+    MESSAGING_DEVICE_PATH,\r
+    MSG_VENDOR_DP,\r
+    (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
+    (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),\r
+    DEVICE_PATH_MESSAGING_PC_ANSI\r
+  },\r
+  gEndEntire\r
+};\r
+\r
+NT_ISA_SERIAL_DEVICE_PATH   gNtSerialDevicePath1 = {\r
+  {\r
+    HARDWARE_DEVICE_PATH,\r
+    HW_VENDOR_DP,\r
+    (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
+    (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),\r
+    EFI_WIN_NT_THUNK_PROTOCOL_GUID\r
+  },\r
+  {\r
+    HARDWARE_DEVICE_PATH,\r
+    HW_VENDOR_DP,\r
+    (UINT8) (sizeof (WIN_NT_VENDOR_DEVICE_PATH_NODE)),\r
+    (UINT8) ((sizeof (WIN_NT_VENDOR_DEVICE_PATH_NODE)) >> 8),\r
+    EFI_WIN_NT_SERIAL_PORT_GUID,\r
+    1\r
+  },\r
+  {\r
+    MESSAGING_DEVICE_PATH,\r
+    MSG_UART_DP,\r
+    (UINT8) (sizeof (UART_DEVICE_PATH)),\r
+    (UINT8) ((sizeof (UART_DEVICE_PATH)) >> 8),\r
+    0,\r
+    115200,\r
+    8,\r
+    1,\r
+    1\r
+  },\r
+  {\r
+    MESSAGING_DEVICE_PATH,\r
+    MSG_VENDOR_DP,\r
+    (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
+    (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),\r
+    DEVICE_PATH_MESSAGING_PC_ANSI\r
+  },\r
+  gEndEntire\r
+};\r
+\r
+//\r
+// Predefined platform default console device path\r
+//\r
+BDS_CONSOLE_CONNECT_ENTRY   gPlatformConsole[] = {\r
+  {\r
+    (EFI_DEVICE_PATH_PROTOCOL *) &gNtSerialDevicePath0,\r
+    (CONSOLE_OUT | CONSOLE_IN)\r
+  },\r
+  {\r
+    (EFI_DEVICE_PATH_PROTOCOL *) &gNtSerialDevicePath1,\r
+    (CONSOLE_OUT | CONSOLE_IN)\r
+  },\r
+  {\r
+    (EFI_DEVICE_PATH_PROTOCOL *) &gUgaDevicePath0,\r
+    (CONSOLE_OUT | CONSOLE_IN)\r
+  },\r
+  {\r
+    (EFI_DEVICE_PATH_PROTOCOL *) &gUgaDevicePath1,\r
+    (CONSOLE_OUT | CONSOLE_IN)\r
+  },\r
+  {\r
+    (EFI_DEVICE_PATH_PROTOCOL *) &gGopDevicePath0,\r
+    (CONSOLE_OUT | CONSOLE_IN)\r
+  },\r
+  {\r
+    (EFI_DEVICE_PATH_PROTOCOL *) &gGopDevicePath1,\r
+    (CONSOLE_OUT | CONSOLE_IN)\r
+  },\r
+  {\r
+    NULL,\r
+    0\r
+  }\r
+};\r
+\r
+//\r
+// Predefined platform specific driver option\r
+//\r
+EFI_DEVICE_PATH_PROTOCOL    *gPlatformDriverOption[] = { NULL };\r
+\r
+//\r
+// Predefined platform connect sequence\r
+//\r
+EFI_DEVICE_PATH_PROTOCOL    *gPlatformConnectSequence[] = { NULL };\r
index 92a2ea438151aa4b01915681cd2c31f5b90ce7e3..fc543f0e95a41a5f9d90429339251c950928ac31 100644 (file)
@@ -69,7 +69,7 @@
   BaseMemoryLib\r
   UefiDriverEntryPoint\r
   UefiLib\r
-  FrameworkHiiLib\r
+  HiiLib\r
   DebugLib\r
   BaseLib\r
   PcdLib\r
 \r
 [Protocols]\r
   gEfiWinNtIoProtocolGuid                       # PROTOCOL_NOTIFY SOMETIMES_CONSUMED\r
-  gEfiHiiProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED\r
   gEfiDataHubProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED\r
 \r
 [Pcd.common]\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize\r
 \r
 [Depex]\r
-  gEfiDataHubProtocolGuid AND gEfiHiiProtocolGuid\r
+  gEfiDataHubProtocolGuid\r
   
\ No newline at end of file
index 533ec7e1dabc2d7cf66fbdeaee1c7ebeb7c2259b..06f27b5bb6eb089040a35ca43dd3e8cda5dabad3 100644 (file)
@@ -94,9 +94,6 @@
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiDataHubProtocolGuid</ProtocolCName>\r
     </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
     <ProtocolNotify Usage="SOMETIMES_CONSUMED">\r
       <ProtocolNotifyCName>gEfiWinNtIoProtocolGuid</ProtocolNotifyCName>\r
     </ProtocolNotify>\r
index 138ed7f439acef4d72e7ab5dce1b9d2dea8f8077..a08b6ef683722541280ae2fa182f5cc33f6a695b 100644 (file)
@@ -148,8 +148,6 @@ Returns:
 {\r
   EFI_MISC_SUBCLASS_DRIVER_DATA     RecordData;\r
   EFI_DATA_HUB_PROTOCOL             *DataHub;\r
-  EFI_HII_PROTOCOL                  *Hii;\r
-  EFI_HII_PACKAGES                  *PackageList;\r
   EFI_HII_HANDLE                    HiiHandle;\r
   EFI_STATUS                        Status;\r
   UINTN                             Index;\r
@@ -180,23 +178,9 @@ Returns:
     return EFI_DEVICE_ERROR;\r
   }\r
   //\r
-  // Locate hii protocol.\r
-  //\r
-  Status = gBS->LocateProtocol (&gEfiHiiProtocolGuid, NULL, &Hii);\r
-\r
-  if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "Could not locate Hii protocol.  %r\n", Status));\r
-    return Status;\r
-  } else if (Hii == NULL) {\r
-    DEBUG ((EFI_D_ERROR, "LocateProtocol(Hii) returned NULL pointer!\n"));\r
-    return EFI_DEVICE_ERROR;\r
-  }\r
-  //\r
   // Add our default strings to the HII database. They will be modified later.\r
   //\r
-  PackageList = PreparePackages (1, &gEfiMiscSubClassGuid, MiscSubclassStrings);\r
-  Status   = Hii->NewPack (Hii, PackageList, &HiiHandle);\r
-  FreePool (PackageList);\r
+  HiiLibAddPackagesToHiiDatabase (1, &gEfiMiscSubClassGuid, NULL, &HiiHandle, MiscSubclassStrings);\r
 \r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((EFI_D_ERROR, "Could not log default strings to Hii.  %r\n", Status));\r
index 9178fa0c1c8ec46ee541fed439ff4ed2ac9176fc..884113b94263447a8aaa961fd0643a1fd834a12b 100644 (file)
@@ -1,10 +1,10 @@
 #/** @file\r
-# EFI/Framework Emulation Platform\r
+# EFI/Framework Emulation Platform with UEFI HII interface supported.\r
 #\r
 # The Emulation Platform can be used to debug individual modules, prior to creating\r
 #    a real platform. This also provides an example for how an DSC is created.\r
 #\r
-# Copyright (c) 2006 - 2007, Intel Corporation\r
+# Copyright (c) 2006 - 2008, Intel Corporation\r
 #\r
 #  All rights reserved. This program and the accompanying materials\r
 #    are licensed and made available under the terms and conditions of the BSD License\r
   PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf\r
   PciIncompatibleDeviceSupportLib|IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf\r
   CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf\r
-  FrameworkIfrSupportLib|IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.inf\r
-  GraphicsLib|IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf\r
+  GraphicsLib|MdeModulePkg/Library/GraphicsLib/GraphicsLib.inf\r
   FvbServiceLib|MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.inf\r
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
   UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf\r
-  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf\r
+  HiiLib|MdePkg/Library/HiiLib/HiiLib.inf\r
   S3Lib|MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf\r
   RecoveryLib|MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf\r
+  IfrSupportLib|MdeModulePkg/Library/IfrSupportLib/IfrSupportLib.inf\r
+  GenericBdsLib|MdeModulePkg/Library/GenericBdsLib/GenericBdsLib.inf\r
+  PlatformBdsLib|Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf\r
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf\r
+  DxePiLib|MdePkg/Library/DxePiLib/DxePiLib.inf\r
+  PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf\r
 \r
 [LibraryClasses.common.BASE]\r
   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
 [LibraryClasses.common.DXE_SMM_DRIVER]\r
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
   ScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
-  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf\r
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf\r
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf\r
   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf\r
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
-  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf\r
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf\r
   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf\r
   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf\r
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
-  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf\r
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
   ScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf\r
   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf\r
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
-  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf\r
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
   ScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
 [LibraryClasses.common.UEFI_APPLICATION]\r
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
   ScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
-  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf\r
   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf\r
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf\r
   gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleInputError|0x01040007   # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_INPUT_ERROR\r
   gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleOutputError|0x01040008  # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_OUTPUT_ERROR\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultTimeout|0x0008\r
-  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangCodes|"engfra"|VOID*|7\r
-  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLang|"eng"|VOID*|4\r
-  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLangCodes|"en;fr"|VOID*|6\r
-  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang|"en"|VOID*|3\r
   gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueEfiWatchDogTimerExpired|0x00011003\r
   gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMemoryTestStarted|0x00051006\r
   gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueSetVirtualAddressMap|0x03101004\r
   IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf\r
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
   MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
-  IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf\r
   Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf\r
   Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf\r
-  Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf\r
   MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.inf\r
   IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf\r
   Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf\r
   MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
   MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
-  IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf\r
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
   IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
   MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf     ##This driver follows UEFI specification definition\r
   Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf\r
   Nt32Pkg/WinNtGopDxe/WinNtGopDxe.inf\r
   Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystemDxe.inf\r
-  IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf\r
   MdeModulePkg/Application/HelloWorld/HelloWorld.inf\r
 \r
   #\r
   MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
   Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf\r
 \r
+  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf \r
+  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
+  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
+  MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf {\r
+    <LibraryClasses>\r
+      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
+  }\r
+  \r
 [BuildOptions]\r
   DEBUG_*_IA32_DLINK_FLAGS = /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /ALIGN:4096 /SUBSYSTEM:CONSOLE\r
   RELEASE_*_IA32_DLINK_FLAGS = /ALIGN:4096\r
index 175c71295cd8e97c14c24520d082d14255122774..5bbcd33ec5112771f2090434b83f075b3a847867 100644 (file)
@@ -1,4 +1,4 @@
-# This is NT32 FDF file\r
+# This is NT32 FDF file with UEFI HII features enabled\r
 #\r
 # Copyright (c) 2007, Intel Corporation\r
 #\r
@@ -161,10 +161,10 @@ INF  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
 INF  IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf\r
 INF  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
 INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
-INF  IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf\r
+INF  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
 INF  Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf\r
 INF  Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf\r
-INF  Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf\r
+INF  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
 INF  MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.inf\r
 INF  IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf\r
 INF  Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf\r
@@ -181,7 +181,7 @@ INF  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
 INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
 INF  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
 INF  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
-INF  IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf\r
+INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
 INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
 INF  IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
 INF  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf     ##This driver follows UEFI specification definition\r
@@ -192,7 +192,7 @@ INF  Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIoDxe.inf
 INF  Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf\r
 INF  Nt32Pkg/WinNtGopDxe/WinNtGopDxe.inf\r
 INF  Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystemDxe.inf\r
-INF  IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf\r
+INF  MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf\r
 INF  MdeModulePkg/Application/HelloWorld/HelloWorld.inf\r
 \r
 ################################################################################\r
diff --git a/Nt32Pkg/Nt32UefiHii/Nt32UefiHii.dsc b/Nt32Pkg/Nt32UefiHii/Nt32UefiHii.dsc
new file mode 100644 (file)
index 0000000..6f6907d
--- /dev/null
@@ -0,0 +1,497 @@
+#/** @file\r
+# EFI/Framework Emulation Platform with UEFI HII interface supported.\r
+#\r
+# The Emulation Platform can be used to debug individual modules, prior to creating\r
+#    a real platform. This also provides an example for how an DSC is created.\r
+#\r
+# Copyright (c) 2007, Intel Corporation\r
+#\r
+#  All rights reserved. This program and the accompanying materials\r
+#    are licensed and made available under the terms and conditions of the BSD License\r
+#    which accompanies this distribution. The full text of the license may be found at\r
+#    http://opensource.org/licenses/bsd-license.php\r
+#\r
+#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#**/\r
+\r
+################################################################################\r
+#\r
+# Defines Section - statements that will be processed to create a Makefile.\r
+#\r
+################################################################################\r
+[Defines]\r
+  PLATFORM_NAME                  = NT32UefiHii\r
+  PLATFORM_GUID                  = 3F196473-D86B-451d-A9E7-BA925824A8E8\r
+  PLATFORM_VERSION               = 0.3\r
+  DSC_SPECIFICATION              = 0x00010005\r
+  OUTPUT_DIRECTORY               = Build/NT32UefiHii\r
+  SUPPORTED_ARCHITECTURES        = IA32\r
+  BUILD_TARGETS                  = DEBUG\r
+  SKUID_IDENTIFIER               = DEFAULT\r
+  FLASH_DEFINITION               = Nt32Pkg/Nt32UefiHii/Nt32UefiHii.fdf\r
+\r
+\r
+################################################################################\r
+#\r
+# SKU Identification section - list of all SKU IDs supported by this\r
+#                              Platform.\r
+#\r
+################################################################################\r
+[SkuIds]\r
+  0|DEFAULT              # The entry: 0|DEFAULT is reserved and always required.\r
+\r
+################################################################################\r
+#\r
+# Library Class section - list of all Library Classes needed by this Platform.\r
+#\r
+################################################################################\r
+\r
+[LibraryClasses.common]\r
+  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
+  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
+  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf\r
+  SerialPortLib|MdePkg/Library/SerialPortLibNull/SerialPortLibNull.inf\r
+  BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf\r
+  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf\r
+  CpuLib|MdePkg/Library/CpuLib/CpuLib.inf\r
+  PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf\r
+  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf\r
+  PciIncompatibleDeviceSupportLib|IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf\r
+  CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf\r
+#  FrameworkIfrSupportLib|IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.inf\r
+#  GraphicsLib|IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf\r
+  GraphicsLib|MdeModulePkg/Library/GraphicsLib/GraphicsLib.inf\r
+  FvbServiceLib|MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.inf\r
+  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
+  UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf\r
+#  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf\r
+#  HiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf\r
+  HiiLib|MdePkg/Library/HiiLib/HiiLib.inf\r
+  S3Lib|MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf\r
+  RecoveryLib|MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf\r
+  IfrSupportLib|MdeModulePkg/Library/IfrSupportLib/IfrSupportLib.inf\r
+  GenericBdsLib|MdeModulePkg/Library/GenericBdsLib/GenericBdsLib.inf\r
+  PlatformBdsLib|Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf\r
+  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf\r
+  DxePiLib|MdePkg/Library/DxePiLib/DxePiLib.inf\r
+  PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf\r
+\r
+[LibraryClasses.common.BASE]\r
+  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
+  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/BaseReportStatusCodeLib/BaseReportStatusCodeLib.inf\r
+\r
+[LibraryClasses.common.USER_DEFINED]\r
+  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
+  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/BaseReportStatusCodeLib/BaseReportStatusCodeLib.inf\r
+\r
+[LibraryClasses.common.SEC]\r
+  BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf\r
+  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
+  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/BaseReportStatusCodeLib/BaseReportStatusCodeLib.inf\r
+  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf\r
+\r
+[LibraryClasses.common.DXE_CORE]\r
+  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
+  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
+  HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf\r
+  DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf\r
+  MemoryAllocationLib|MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf\r
+  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf\r
+  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf\r
+  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf\r
+  DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
+  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
+  PeCoffLib|Nt32Pkg/Library/DxeNT32PeCoffLib/DxeNT32PeCoffLib.inf\r
+  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf\r
+\r
+[LibraryClasses.common.DXE_SMM_DRIVER]\r
+  DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
+  ScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
+#  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf\r
+  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
+  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf\r
+  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
+  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
+  MemoryAllocationLib|MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf\r
+  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf\r
+  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf\r
+  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf\r
+  WinNtLib|Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf\r
+  OemHookStatusCodeLib|Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf\r
+  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
+  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
+\r
+[LibraryClasses.common.PEIM]\r
+  BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf\r
+  HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
+  PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
+  IoLib|MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf\r
+  PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf\r
+  PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf\r
+  MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf\r
+  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf\r
+  PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf\r
+  OemHookStatusCodeLib|Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf\r
+  PeCoffGetEntryPointLib|Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/Nt32PeiPeCoffGetEntryPointLib.inf\r
+  DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
+  PeCoffLib|Nt32Pkg/Library/PeiNT32PeCoffLib/PeiNT32PeCoffLib.inf\r
+  PeiPiLib|MdePkg/Library/PeiPiLib/PeiPiLib.inf\r
+  ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf\r
+\r
+[LibraryClasses.common.PEI_CORE]\r
+  BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf\r
+  HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
+  PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf\r
+  IoLib|MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf\r
+  PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf\r
+  MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf\r
+  PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf\r
+  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf\r
+  PeCoffGetEntryPointLib|Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/Nt32PeiPeCoffGetEntryPointLib.inf\r
+  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
+  DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
+  PeCoffLib|Nt32Pkg/Library/PeiCoreNT32PeCoffLib/PeiCoreNT32PeCoffLib.inf\r
+  PeiPiLib|MdePkg/Library/PeiPiLib/PeiPiLib.inf\r
+\r
+[LibraryClasses.common.DXE_RUNTIME_DRIVER]\r
+  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf\r
+  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf\r
+  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
+  MemoryAllocationLib|MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf\r
+  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf\r
+  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf\r
+  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf\r
+  DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
+#  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf\r
+  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
+  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
+  UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf\r
+  ScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
+  WinNtLib|Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf\r
+  OemHookStatusCodeLib|Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf\r
+  DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
+\r
+[LibraryClasses.common.UEFI_DRIVER]\r
+  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf\r
+  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf\r
+  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
+  MemoryAllocationLib|MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf\r
+  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf\r
+  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf\r
+  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf\r
+  DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
+#  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf\r
+  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
+  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
+  ScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
+  WinNtLib|Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf\r
+  OemHookStatusCodeLib|Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf\r
+  DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
+\r
+[LibraryClasses.common.DXE_DRIVER]\r
+  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf\r
+  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf\r
+  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
+  MemoryAllocationLib|MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf\r
+  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf\r
+  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf\r
+  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf\r
+  DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
+#  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf\r
+  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
+  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
+  ScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
+  WinNtLib|Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf\r
+  OemHookStatusCodeLib|Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf\r
+  EdkGenericBdsLib|Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf\r
+  DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
+  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf\r
+  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf\r
+  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf\r
+  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf\r
+\r
+[LibraryClasses.common.UEFI_APPLICATION]\r
+  DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
+  ScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
+#  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf\r
+  UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf\r
+  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
+  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf\r
+  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
+  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
+  MemoryAllocationLib|MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf\r
+  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf\r
+  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf\r
+  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf\r
+  WinNtLib|Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf\r
+  OemHookStatusCodeLib|Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf\r
+  DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
+  PrintLib|MdeModulePkg/Library/EdkDxePrintLib/EdkDxePrintLib.inf\r
+\r
+\r
+################################################################################\r
+#\r
+# Pcd Section - list of all EDK II PCD Entries defined by this Platform\r
+#\r
+################################################################################\r
+\r
+[PcdsFeatureFlag.common]\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText|FALSE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText|FALSE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportCustomDecompress|TRUE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplBuildShareCodeHobs|TRUE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportEfiDecompress|TRUE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportTianoDecompress|TRUE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportCustomDecompress|TRUE\r
+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangDepricate|FALSE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|FALSE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdUnicodeCollationSupport|TRUE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdUnicodeCollation2Support|TRUE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|TRUE\r
+\r
+[PcdsFixedAtBuild.IA32]\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeRuntimeMemorySize|128\r
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySizeForSecMain|L"64!64"|VOID*|12\r
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareVolume|L"..\\Fv\\Fv_Recovery.fd"|VOID*|52\r
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtBootMode|1\r
+  gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000\r
+  gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000\r
+  gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000\r
+  gEfiMdePkgTokenSpaceGuid.PcdSpinLockTimeout|10000000\r
+  gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000\r
+  gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000\r
+  gEfiMdePkgTokenSpaceGuid.PcdSpinLockTimeout|10000000\r
+  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x0f\r
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x1f\r
+  gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue|0xAF\r
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000040\r
+  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask|0\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry|0x08\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizeNonPopulateCapsule|0x0\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizePopulateCapsule|0x0\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciIncompatibleDeviceSupportMask|0\r
+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueUncorrectableMemoryError|0x0005100   # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_EC_UNCORRECTABLE3\r
+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleError|0x01040006        # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR\r
+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleReset|0x01040001        # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET\r
+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleInputError|0x01040007   # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_INPUT_ERROR\r
+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleOutputError|0x01040008  # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_OUTPUT_ERROR\r
+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultTimeout|0x0008\r
+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueEfiWatchDogTimerExpired|0x00011003\r
+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMemoryTestStarted|0x00051006\r
+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueSetVirtualAddressMap|0x03101004\r
+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueUncorrectableMemoryError|0x00051003\r
+  gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|320\r
+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200\r
+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8\r
+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1\r
+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|1\r
+  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|0\r
+\r
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize|0x2a0000\r
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareBlockSize|0x10000\r
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase|0x28c000\r
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogSize|0x2000\r
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase|0x0\r
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoverySize|0x280000\r
+\r
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageVariableBase|0x280000\r
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwSpareBase|0x290000\r
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwWorkingBase|0x28e000\r
+\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x10000\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize|0x2000\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x00c000\r
+  gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x10\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported|6\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeimPerFv|32\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x400\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize|0x8000\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x10000\r
+\r
+[PcdsFeatureFlag.IA32]\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseTraverseEnabled|TRUE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseCallbackOnSetEnabled|TRUE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseExEnabled|TRUE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseGetSizeEnabled|TRUE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseSetEnabled|TRUE\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM|TRUE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplEnableIdt|FALSE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportEfiDecompress|TRUE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportTianoDecompress|TRUE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportCustomDecompress|TRUE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplBuildShareCodeHobs|TRUE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxePcdDatabaseTraverseEnabled|TRUE\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseHardSerial|FALSE\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseEfiSerial|FALSE\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseRuntimeMemory|FALSE\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM|TRUE\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInSerial|FALSE\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInDataHub|FALSE\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInRuntimeMemory|FALSE\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInOEM|FALSE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleRest|FALSE\r
+  gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|FALSE\r
+  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable|FALSE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText|TRUE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText|TRUE\r
+  gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|FALSE\r
+  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|FALSE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleRest|FALSE\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciIsaEnable|FALSE\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciVgaEnable|FALSE\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciBusHotplugDeviceSupport|TRUE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst|FALSE\r
+\r
+\r
+################################################################################\r
+#\r
+# Pcd Dynamic Section - list of all EDK II PCD Entries defined by this Platform\r
+#\r
+################################################################################\r
+\r
+[PcdsDynamicDefault.common.DEFAULT]\r
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtSerialPort|L"COM1!COM2"|VOID*|18\r
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L".!..\\..\\..\\..\\EdkShellBinPkg\\bin\\ia32\\Apps"|VOID*|106\r
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtGop|L"UGA Window 1!UGA Window 2"|VOID*|50\r
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtConsole|L"Bus Driver Console Window"|VOID*|50\r
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtVirtualDisk|L"FW;40960;512"|VOID*|24\r
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize|L"64!64"|VOID*|10\r
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtPhysicalDisk|L"a:RW;2880;512!d:RO;307200;2048!j:RW;262144;512"|VOID*|100\r
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtUga|L"UGA Window 1!UGA Window 2"|VOID*|50\r
+\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0\r
+\r
+################################################################################\r
+#\r
+# Components Section - list of all EDK II Modules needed by this Platform\r
+#\r
+################################################################################\r
+\r
+[Components.IA32]\r
+  ##\r
+  #  SEC Phase modules\r
+  ##\r
+  Nt32Pkg/Sec/SecMain.inf\r
+\r
+  ##\r
+  #  PEI Phase modules\r
+  ##\r
+  MdeModulePkg/Core/Pei/PeiMain.inf\r
+  MdeModulePkg/Universal/PCD/Pei/Pcd.inf  {\r
+   <LibraryClasses>\r
+      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
+  }\r
+  IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf\r
+  Nt32Pkg/BootModePei/BootModePei.inf\r
+  Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf\r
+  MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf\r
+  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf\r
+  Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf\r
+  Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf\r
+  Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocolPei.inf\r
+  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
+  ##\r
+  #  DXE Phase modules\r
+  ##\r
+  MdeModulePkg/Core/Dxe/DxeMain.inf {\r
+    <LibraryClasses>\r
+      NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf\r
+  }\r
+  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf {\r
+    <LibraryClasses>\r
+      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
+  }\r
+  Nt32Pkg/MetronomeDxe/MetronomeDxe.inf\r
+  Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf\r
+  Nt32Pkg/ResetRuntimeDxe/ResetRuntimeDxe.inf\r
+  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
+  Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf\r
+  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
+  IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf\r
+  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
+  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
+#  IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf\r
+  Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf\r
+  Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf\r
+# Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf\r
+  MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.inf\r
+  IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf\r
+  Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf\r
+  Nt32Pkg/TimerDxe/TimerDxe.inf\r
+  IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf\r
+  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
+  MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.inf\r
+  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf\r
+  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf\r
+  MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf\r
+  MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf\r
+  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf\r
+  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
+  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
+  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
+  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
+#  IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf\r
+  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
+  IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
+  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf     ##This driver follows UEFI specification definition\r
+  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf    ##This driver follows UEFI specification definition\r
+  IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf\r
+  Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf\r
+  Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIoDxe.inf\r
+  Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf\r
+  Nt32Pkg/WinNtGopDxe/WinNtGopDxe.inf\r
+  Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystemDxe.inf\r
+#  IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf\r
+  MdeModulePkg/Application/HelloWorld/HelloWorld.inf\r
+\r
+  #\r
+  # Network stack drivers\r
+  # To test network drivers, need network Io driver(SnpNt32Io.dll), please refer to NETWORK-IO Subproject.\r
+  #\r
+  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
+  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
+  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
+  MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf\r
+  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
+  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
+  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
+  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
+  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
+  Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf\r
+\r
+  #Nt32Pkg/UefiPlatformBdsDxe/UefiPlatformBdsDxe.inf\r
+  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf \r
+  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
+  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
+  MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf {\r
+    <LibraryClasses>\r
+      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
+  }\r
+  \r
+[BuildOptions]\r
+  DEBUG_ICC_IA32_DLINK_FLAGS                  = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE\r
+  DEBUG_VS2003_IA32_DLINK_FLAGS               = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE\r
+  DEBUG_MYTOOLS_IA32_DLINK_FLAGS              = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE\r
+  DEBUG_WINDDK3790x1830_IA32_DLINK_FLAGS      = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE\r
+  DEBUG_VS2005PRO_IA32_DLINK_FLAGS            = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE\r
+  DEBUG_MIXED_IA32_DLINK_FLAGS                = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE\r
+  RELEASE_ICC_IA32_DLINK_FLAGS                = /ALIGN:4096\r
+  RELEASE_VS2003_IA32_DLINK_FLAGS             = /ALIGN:4096\r
+  RELEASE_MYTOOLS_IA32_DLINK_FLAGS            = /ALIGN:4096\r
+  RELEASE_WINDDK3790x1830_IA32_DLINK_FLAGS    = /ALIGN:4096\r
+  RELEASE_VS2005PRO_IA32_DLINK_FLAGS          = /ALIGN:4096\r
+  RELEASE_MIXED_IA32_DLINK_FLAGS              = /ALIGN:4096\r
+  MSFT:DEBUG_*_IA32_DLINK_FLAGS = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE\r
+  MSFT:RELEASE_*_IA32_DLINK_FLAGS = /ALIGN:4096\r
diff --git a/Nt32Pkg/Nt32UefiHii/Nt32UefiHii.fdf b/Nt32Pkg/Nt32UefiHii/Nt32UefiHii.fdf
new file mode 100644 (file)
index 0000000..5c130ce
--- /dev/null
@@ -0,0 +1,327 @@
+# This is NT32 FDF file with UEFI HII features enabled\r
+#\r
+# Copyright (c) 2007, Intel Corporation\r
+#\r
+#  All rights reserved. This program and the accompanying materials\r
+#    are licensed and made available under the terms and conditions of the BSD License\r
+#    which accompanies this distribution. The full text of the license may be found at\r
+#    http://opensource.org/licenses/bsd-license.php\r
+#\r
+#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+\r
+################################################################################\r
+#\r
+# FD Section\r
+# The [FD] Section is made up of the definition statements and a\r
+# description of what goes into  the Flash Device Image.  Each FD section\r
+# defines one flash "device" image.  A flash device image may be one of\r
+# the following: Removable media bootable image (like a boot floppy\r
+# image,) an Option ROM image (that would be "flashed" into an add-in\r
+# card,) a System "Flash"  image (that would be burned into a system's\r
+# flash) or an Update ("Capsule") image that will be used to update and\r
+# existing system flash.\r
+#\r
+################################################################################\r
+[FD.Fv_Recovery]\r
+BaseAddress   = 0x0|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFdBaseAddress  #The base address of the FLASH Device.\r
+Size          = 0x002a0000                                           #The size in bytes of the FLASH Device\r
+ErasePolarity = 1\r
+BlockSize     = 0x10000\r
+NumBlocks     = 0x2a\r
+\r
+################################################################################\r
+#\r
+# Following are lists of FD Region layout which correspond to the locations of different\r
+# images within the flash device.\r
+#\r
+# Regions must be defined in ascending order and may not overlap.\r
+#\r
+# A Layout Region start with a eight digit hex offset (leading "0x" required) followed by\r
+# the pipe "|" character, followed by the size of the region, also in hex with the leading\r
+# "0x" characters. Like:\r
+# Offset|Size\r
+# PcdOffsetCName|PcdSizeCName\r
+# RegionType <FV, DATA, or FILE>\r
+#\r
+################################################################################\r
+0x00000000|0x00280000\r
+gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoverySize\r
+FV = FvRecovery\r
+\r
+0x00280000|0x0000c000\r
+gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r
+DATA = {\r
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
+  0x8d, 0x2b, 0xf1, 0xff, 0x96, 0x76, 0x8b, 0x4c,\r
+  0xa9, 0x85, 0x27, 0x47, 0x07, 0x5b, 0x4f, 0x50,\r
+  0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,\r
+  0x5f, 0x46, 0x56, 0x48, 0xff, 0x8c, 0xff, 0xff,\r
+  0x48, 0x00, 0x3b, 0x7c, 0x00, 0x00, 0x00, 0x01,\r
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,\r
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
+  0x24, 0x56, 0x53, 0x53, 0xb8, 0xbf, 0x00, 0x00,\r
+  0x5a, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
+}\r
+\r
+0x0028c000|0x00002000\r
+gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogSize\r
+\r
+0x0028e000|0x00002000\r
+gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize\r
+DATA = {\r
+  0x8d, 0x2b, 0xf1, 0xff, 0x96, 0x76, 0x8b, 0x4c,\r
+  0xa9, 0x85, 0x27, 0x47, 0x07, 0x5b, 0x4f, 0x50,\r
+  0xd2, 0x5f, 0x05, 0x9e, 0xfe, 0xff, 0xff, 0xff,\r
+  0xff, 0xff, 0xff, 0xff, 0xe0, 0x1f, 0x00, 0x00\r
+}\r
+\r
+0x00290000|0x00010000\r
+gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize\r
+\r
+################################################################################\r
+#\r
+# FV Section\r
+#\r
+# [FV] section is used to define what components or modules are placed within a flash\r
+# device file.  This section also defines order the components and modules are positioned\r
+# within the image.  The [FV] section consists of define statements, set statements and\r
+# module statements.\r
+#\r
+################################################################################\r
+[FV.FvRecovery]\r
+FvAlignment        = 16         #FV alignment and FV attributes setting.\r
+ERASE_POLARITY     = 1\r
+MEMORY_MAPPED      = TRUE\r
+STICKY_WRITE       = TRUE\r
+LOCK_CAP           = TRUE\r
+LOCK_STATUS        = TRUE\r
+WRITE_DISABLED_CAP = TRUE\r
+WRITE_ENABLED_CAP  = TRUE\r
+WRITE_STATUS       = TRUE\r
+WRITE_LOCK_CAP     = TRUE\r
+WRITE_LOCK_STATUS  = TRUE\r
+READ_DISABLED_CAP  = TRUE\r
+READ_ENABLED_CAP   = TRUE\r
+READ_STATUS        = TRUE\r
+READ_LOCK_CAP      = TRUE\r
+READ_LOCK_STATUS   = TRUE\r
+\r
+################################################################################\r
+#\r
+# The INF statements point to EDK component and EDK II module INF files, which will be placed into this FV image.\r
+# Parsing tools will scan the INF file to determine the type of component or module.\r
+# The component or module type is used to reference the standard rules\r
+# defined elsewhere in the FDF file.\r
+#\r
+# The format for INF statements is:\r
+# INF $(PathAndInfFileName)\r
+#\r
+################################################################################\r
+  ##\r
+  #  PEI Phase modules\r
+  ##\r
+  ##\r
+  #  PEI Apriori file example, more PEIM module added later.\r
+  ##\r
+APRIORI PEI {\r
+  INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
+  INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf\r
+  }\r
+APRIORI DXE {\r
+  INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
+  INF  Nt32Pkg/MetronomeDxe/MetronomeDxe.inf\r
+  }\r
+\r
+INF  MdeModulePkg/Core/Pei/PeiMain.inf\r
+INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
+INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf\r
+INF  Nt32Pkg/BootModePei/BootModePei.inf\r
+INF  Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf\r
+INF  MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf\r
+INF  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf\r
+INF  Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf\r
+INF  Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf\r
+INF  Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocolPei.inf\r
+INF  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
+\r
+  ##\r
+  #  DXE Phase modules\r
+  ##\r
+INF  MdeModulePkg/Core/Dxe/DxeMain.inf\r
+INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
+INF  Nt32Pkg/MetronomeDxe/MetronomeDxe.inf\r
+INF  Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf\r
+INF  Nt32Pkg/ResetRuntimeDxe/ResetRuntimeDxe.inf\r
+INF  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
+INF  Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf\r
+INF  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
+INF  IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf\r
+INF  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
+INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
+INF  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
+INF  Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf\r
+INF  Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf\r
+#INF  Nt32Pkg/UefiPlatformBdsDxe/UefiPlatformBdsDxe.inf \r
+INF  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+INF  MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.inf\r
+INF  IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf\r
+INF  Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf\r
+INF  Nt32Pkg/TimerDxe/TimerDxe.inf\r
+INF  IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf\r
+INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
+INF  MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.inf\r
+INF  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf\r
+INF  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf\r
+INF  MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf\r
+INF  MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf\r
+INF  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf\r
+INF  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
+INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
+INF  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
+INF  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
+INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
+INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
+INF  IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
+INF  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf     ##This driver follows UEFI specification definition\r
+INF  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf    ##This driver follows UEFI specification definition\r
+INF  IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf\r
+INF  Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf\r
+INF  Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIoDxe.inf\r
+INF  Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf\r
+INF  Nt32Pkg/WinNtGopDxe/WinNtGopDxe.inf\r
+INF  Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystemDxe.inf\r
+INF  MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf\r
+INF  MdeModulePkg/Application/HelloWorld/HelloWorld.inf\r
+\r
+################################################################################\r
+#\r
+# FILE statements are provided so that a platform integrator can include\r
+# complete EFI FFS files, as well as a method for constructing FFS files\r
+# using curly "{}" brace scoping. The following three FILEs are\r
+# for binary shell, binary fat and logo module.\r
+#\r
+################################################################################\r
+FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 {\r
+    SECTION COMPRESS PI_STD {\r
+      SECTION GUIDED {\r
+        SECTION PE32 = EdkShellBinPkg/FullShell/ia32/Shell_Full.efi\r
+      }\r
+    }\r
+  }\r
+FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {\r
+    SECTION COMPRESS PI_STD {\r
+      SECTION GUIDED {\r
+        SECTION PE32 = FatBinPkg/EnhancedFatDxe/Ia32/Fat.efi\r
+      }\r
+    }\r
+  }\r
+FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {\r
+    SECTION COMPRESS PI_STD {\r
+      SECTION GUIDED {\r
+        SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
+      }\r
+    }\r
+  }\r
+\r
+\r
+################################################################################\r
+#\r
+# Rules are use with the [FV] section's module INF type to define\r
+# how an FFS file is created for a given INF file. The following Rule are the default\r
+# rules for the different module type. User can add the customized rules to define the\r
+# content of the FFS file.\r
+#\r
+################################################################################\r
+\r
+\r
+############################################################################\r
+# Example of a DXE_DRIVER FFS file with a Checksum encapsulation section   # \r
+############################################################################\r
+#\r
+#[Rule.Common.DXE_DRIVER]\r
+#  FILE DRIVER = $(NAMED_GUID) {\r
+#    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
+#    COMPRESS PI_STD {\r
+#      GUIDED {\r
+#        PE32     PE32                    |.efi\r
+#        UI       STRING="$(MODULE_NAME)" Optional\r
+#        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
+#      }\r
+#    }\r
+#  }\r
+#\r
+############################################################################\r
+\r
+[Rule.Common.PEI_CORE]\r
+  FILE PEI_CORE = $(NAMED_GUID) {\r
+    PE32     PE32           |.efi\r
+    UI       STRING ="$(MODULE_NAME)" Optional         \r
+    VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)    \r
+  }\r
+\r
+[Rule.Common.PEIM]\r
+  FILE PEIM = $(NAMED_GUID) {\r
+     PEI_DEPEX PEI_DEPEX Optional        |.depex\r
+     PE32      PE32                      |.efi\r
+     UI       STRING="$(MODULE_NAME)" Optional         \r
+     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)   \r
+  }\r
+\r
+[Rule.Common.DXE_CORE]\r
+  FILE DXE_CORE = $(NAMED_GUID) {\r
+    COMPRESS PI_STD {\r
+      PE32     PE32           |.efi\r
+      UI       STRING="$(MODULE_NAME)" Optional\r
+      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
+    }\r
+  }\r
+\r
+[Rule.Common.UEFI_DRIVER]\r
+  FILE DRIVER = $(NAMED_GUID) {\r
+    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
+    COMPRESS PI_STD {\r
+      GUIDED {\r
+        PE32     PE32                    |.efi\r
+        UI       STRING="$(MODULE_NAME)" Optional\r
+        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
+      }\r
+    }\r
+  }\r
+\r
+[Rule.Common.DXE_DRIVER]\r
+  FILE DRIVER = $(NAMED_GUID) {\r
+    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
+    COMPRESS PI_STD {\r
+      GUIDED {\r
+        PE32     PE32                    |.efi\r
+        UI       STRING="$(MODULE_NAME)" Optional\r
+        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
+      }\r
+    }\r
+  }\r
+\r
+[Rule.Common.DXE_RUNTIME_DRIVER]\r
+  FILE DRIVER = $(NAMED_GUID) {\r
+    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
+    COMPRESS PI_STD {\r
+      GUIDED {\r
+        PE32     PE32                    |.efi\r
+        UI       STRING="$(MODULE_NAME)" Optional\r
+        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
+      }\r
+    }\r
+  }\r
+\r
+[Rule.Common.UEFI_APPLICATION]\r
+  FILE APPLICATION = $(NAMED_GUID) {\r
+    COMPRESS PI_STD {\r
+      GUIDED {\r
+        PE32     PE32                    |.efi\r
+        UI       STRING="$(MODULE_NAME)" Optional\r
+        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
+      }\r
+    }\r
+  }\r
index 1e8066537c47e739f9a6e68bf5e789080da8e593..18a04650a0db7c8aa49e4946541906623764ef72 100644 (file)
@@ -32,7 +32,7 @@ Revision History
     0x7777E939, 0xD57E, 0x4DCB, {0xA0, 0x8E, 0x64, 0xD7, 0x98, 0x57, 0x1E, 0x0F } \\r
   }\r
 \r
-EFI_HII_HANDLE    gStringPackHandle;\r
+FRAMEWORK_EFI_HII_HANDLE    gStringPackHandle;\r
 EFI_HII_PROTOCOL  *gHii;\r
 \r
 CHAR16            *\r
index 8804b141aec17204894a55f261b9ade793442a05..7e572e605f3b92b5fe31539c5f99cdc323f012c9 100644 (file)
@@ -456,7 +456,7 @@ Returns:
 {\r
   EFI_STATUS        Status;\r
   UINT16            HandleBufferLength;\r
-  EFI_HII_HANDLE    *HiiHandleBuffer;\r
+  FRAMEWORK_EFI_HII_HANDLE    *HiiHandleBuffer;\r
   UINTN             StringBufferLength;\r
   UINTN             NumberOfHiiHandles;\r
   UINTN             Index;\r
@@ -488,7 +488,7 @@ Returns:
   //\r
   // Get the Hii Handle that matches the StructureNode->ProducerName\r
   //\r
-  NumberOfHiiHandles = HandleBufferLength / sizeof (EFI_HII_HANDLE);\r
+  NumberOfHiiHandles = HandleBufferLength / sizeof (FRAMEWORK_EFI_HII_HANDLE);\r
   for (Index = 0; Index < NumberOfHiiHandles; Index++) {\r
     Length = 0;\r
     Status = ExtractDataFromHiiHandle (\r
index 51570f20b9fdffc5f00bffcd69e127f637ed0337..1d7420f40ebce8c0fe0430f2a2fdf1429b1cef2e 100644 (file)
@@ -45,7 +45,7 @@ FreeAllMenu (
 EFI_STATUS\r
 CreateMenuStringToken (\r
   IN BMM_CALLBACK_DATA                *CallbackData,\r
-  IN EFI_HII_HANDLE                   HiiHandle,\r
+  IN FRAMEWORK_EFI_HII_HANDLE                   HiiHandle,\r
   IN BM_MENU_OPTION                   *MenuOption\r
   )\r
 /*++\r
@@ -101,7 +101,7 @@ EFIAPI
 DriverCallback (\r
   IN EFI_FORM_CALLBACK_PROTOCOL       *This,\r
   IN UINT16                           KeyValue,\r
-  IN EFI_IFR_DATA_ARRAY               *Data,\r
+  IN FRAMEWORK_EFI_IFR_DATA_ARRAY               *Data,\r
   OUT EFI_HII_CALLBACK_PACKET         **Packet\r
   )\r
 /*++\r
@@ -742,7 +742,7 @@ Returns:
   EFI_HII_PACKAGES          *PackageList;\r
   BMM_CALLBACK_DATA         *BmmCallbackInfo;\r
   EFI_HII_PROTOCOL          *Hii;\r
-  EFI_HII_HANDLE            HiiHandle;\r
+  FRAMEWORK_EFI_HII_HANDLE            HiiHandle;\r
   EFI_STATUS                Status;\r
   EFI_HANDLE                Handle;\r
   UINT8                     *Ptr;\r
@@ -905,51 +905,51 @@ Returns:
       FORM_SET_FD_ORDER_ID,\r
       STRING_TOKEN (STR_FORM_SET_FD_ORDER_TITLE),\r
       STRING_TOKEN (STR_FORM_SET_FD_ORDER_TITLE),\r
-      EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+      FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
       FORM_SET_FD_ORDER_ID,\r
       Location\r
       );\r
 \r
-    Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+    Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
 \r
     CreateGotoOpCode (\r
       FORM_SET_HD_ORDER_ID,\r
       STRING_TOKEN (STR_FORM_SET_HD_ORDER_TITLE),\r
       STRING_TOKEN (STR_FORM_SET_HD_ORDER_TITLE),\r
-      EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+      FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
       FORM_SET_HD_ORDER_ID,\r
       Location\r
       );\r
 \r
-    Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+    Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
 \r
     CreateGotoOpCode (\r
       FORM_SET_CD_ORDER_ID,\r
       STRING_TOKEN (STR_FORM_SET_CD_ORDER_TITLE),\r
       STRING_TOKEN (STR_FORM_SET_CD_ORDER_TITLE),\r
-      EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+      FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
       FORM_SET_CD_ORDER_ID,\r
       Location\r
       );\r
 \r
-    Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+    Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
 \r
     CreateGotoOpCode (\r
       FORM_SET_NET_ORDER_ID,\r
       STRING_TOKEN (STR_FORM_SET_NET_ORDER_TITLE),\r
       STRING_TOKEN (STR_FORM_SET_NET_ORDER_TITLE),\r
-      EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+      FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
       FORM_SET_NET_ORDER_ID,\r
       Location\r
       );\r
 \r
-    Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+    Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
 \r
     CreateGotoOpCode (\r
       FORM_SET_BEV_ORDER_ID,\r
       STRING_TOKEN (STR_FORM_SET_BEV_ORDER_TITLE),\r
       STRING_TOKEN (STR_FORM_SET_BEV_ORDER_TITLE),\r
-      EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+      FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
       FORM_SET_BEV_ORDER_ID,\r
       Location\r
       );\r
@@ -1313,5 +1313,5 @@ CreateCallbackPacket (
 \r
   (*Packet)->DataArray.EntryCount   = 1;\r
   (*Packet)->DataArray.NvRamMap     = NULL;\r
-  ((EFI_IFR_DATA_ENTRY *) (&((*Packet)->DataArray) + 1))->Flags  = Flags;\r
+  ((FRAMEWORK_EFI_IFR_DATA_ENTRY *) (&((*Packet)->DataArray) + 1))->Flags  = Flags;\r
 }\r
index c366a6657792fc1b6f27088d7c49c3ce93362178..d26d7f7f9471fdec379ee4cba925e4393ac17088 100644 (file)
@@ -523,7 +523,7 @@ typedef struct {
   //\r
   // BMM main formset callback data.\r
   //\r
-  EFI_HII_HANDLE                BmmHiiHandle;\r
+  FRAMEWORK_EFI_HII_HANDLE      BmmHiiHandle;\r
   EFI_HANDLE                    BmmCallbackHandle;\r
   EFI_FORM_CALLBACK_PROTOCOL    BmmDriverCallback;\r
   FORM_ID                       BmmCurrentPageId;\r
@@ -535,7 +535,7 @@ typedef struct {
   //\r
   // File explorer formset callback data.\r
   //\r
-  EFI_HII_HANDLE                FeHiiHandle;\r
+  FRAMEWORK_EFI_HII_HANDLE      FeHiiHandle;\r
   EFI_HANDLE                    FeCallbackHandle;\r
   EFI_FORM_CALLBACK_PROTOCOL    FeDriverCallback;\r
   FILE_EXPLORER_STATE           FeCurrentState;\r
@@ -758,7 +758,7 @@ Var_ChangeBootOrder ();
 EFI_STATUS\r
 Var_UpdateDriverOption (\r
   IN  BMM_CALLBACK_DATA         *CallbackData,\r
-  IN  EFI_HII_HANDLE            HiiHandle,\r
+  IN  FRAMEWORK_EFI_HII_HANDLE  HiiHandle,\r
   IN  UINT16                    *DescriptionData,\r
   IN  UINT16                    *OptionalData,\r
   IN  UINT8                     ForceReconnect\r
@@ -1017,7 +1017,7 @@ EfiDevicePathInstanceCount (
 EFI_STATUS\r
 CreateMenuStringToken (\r
   IN BMM_CALLBACK_DATA                *CallbackData,\r
-  IN EFI_HII_HANDLE                   HiiHandle,\r
+  IN FRAMEWORK_EFI_HII_HANDLE         HiiHandle,\r
   IN BM_MENU_OPTION                   *MenuOption\r
   );\r
 \r
@@ -1097,7 +1097,7 @@ EFIAPI
 FileExplorerCallback (\r
   IN EFI_FORM_CALLBACK_PROTOCOL       *This,\r
   IN UINT16                           KeyValue,\r
-  IN EFI_IFR_DATA_ARRAY               *Data,\r
+  IN FRAMEWORK_EFI_IFR_DATA_ARRAY               *Data,\r
   OUT EFI_HII_CALLBACK_PACKET         **Packet\r
   );\r
 \r
index b5afc7c7fea7359ae8d2bc94e7cb4802546f3c96..868574835208d58e4117ba4a95af652877eda316 100644 (file)
@@ -1662,24 +1662,3 @@ Returns:
 \r
 }\r
 \r
-VOID\r
-SafeFreePool (\r
-  IN VOID    *Buffer\r
-  )\r
-/*++\r
-\r
-Routine Description:\r
-  Wrap original FreePool gBS call\r
-  in order to decrease code length\r
-\r
-Arguments:\r
-\r
-Returns:\r
-\r
---*/\r
-{\r
-  if (Buffer != NULL) {\r
-    FreePool (Buffer);\r
-    Buffer = NULL;\r
-  }\r
-}\r
index db835cf534ca9d7829d6ffcdf3c8138ff9353eeb..0e1f165513c7f67e0d0a954f0f2a4b6cfdb7591a 100644 (file)
@@ -86,7 +86,7 @@ Returns:
         NewMenuEntry->DisplayStringToken,\r
         STR_NULL_STRING,\r
         STR_NULL_STRING,\r
-        EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+        FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
         (UINT16) (FILE_OPTION_OFFSET + Index),\r
         Location\r
         );\r
@@ -104,14 +104,14 @@ Returns:
         FormId,\r
         NewMenuEntry->DisplayStringToken,\r
         STRING_TOKEN (STR_NULL_STRING),\r
-        EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+        FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
         (UINT16) (FILE_OPTION_OFFSET + Index),\r
         Location\r
         );\r
     }\r
 \r
     UpdateData->DataCount++;\r
-    Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+    Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
   }\r
 \r
   CallbackData->Hii->UpdateForm (\r
@@ -261,7 +261,7 @@ EFIAPI
 FileExplorerCallback (\r
   IN EFI_FORM_CALLBACK_PROTOCOL       *This,\r
   IN UINT16                           KeyValue,\r
-  IN EFI_IFR_DATA_ARRAY               *Data,\r
+  IN FRAMEWORK_EFI_IFR_DATA_ARRAY               *Data,\r
   OUT EFI_HII_CALLBACK_PACKET         **Packet\r
   )\r
 /*++\r
index 435b0753d47c72b51858e5bf52df0e4e038828e8..56783e72edad13f36470308219964ca17f63726f 100644 (file)
@@ -71,14 +71,14 @@ UpdatePageStart (
       FORM_MAIN_ID,\r
       STRING_TOKEN (STR_FORM_GOTO_MAIN),\r
       STRING_TOKEN (STR_FORM_GOTO_MAIN),\r
-      EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+      FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
       FORM_MAIN_ID,\r
       *CurrentLocation\r
       );\r
 \r
     UpdateData->DataCount++;\r
 \r
-    *CurrentLocation = *CurrentLocation + ((EFI_IFR_OP_HEADER *) (*CurrentLocation))->Length;\r
+    *CurrentLocation = *CurrentLocation + ((FRAMEWORK_EFI_IFR_OP_HEADER *) (*CurrentLocation))->Length;\r
   }\r
 \r
 }\r
@@ -97,20 +97,20 @@ UpdatePageEnd (
       FORM_MAIN_ID,\r
       STRING_TOKEN (STR_SAVE_AND_EXIT),\r
       STRING_TOKEN (STR_NULL_STRING),\r
-      EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+      FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
       KEY_VALUE_SAVE_AND_EXIT,\r
       CurrentLocation\r
       );\r
 \r
     UpdateData->DataCount++;\r
 \r
-    CurrentLocation = CurrentLocation + ((EFI_IFR_OP_HEADER *) CurrentLocation)->Length;\r
+    CurrentLocation = CurrentLocation + ((FRAMEWORK_EFI_IFR_OP_HEADER *) CurrentLocation)->Length;\r
 \r
     CreateGotoOpCode (\r
       FORM_MAIN_ID,\r
       STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
       STRING_TOKEN (STR_NULL_STRING),\r
-      EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+      FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
       KEY_VALUE_NO_SAVE_AND_EXIT,\r
       CurrentLocation\r
       );\r
@@ -125,7 +125,7 @@ UpdatePageEnd (
       FORM_MAIN_ID,\r
       STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
       STRING_TOKEN (STR_NULL_STRING),\r
-      EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+      FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
       KEY_VALUE_NO_SAVE_AND_EXIT,\r
       CurrentLocation\r
       );\r
@@ -217,11 +217,11 @@ UpdateConCOMPage (
         FORM_CON_COM_SETUP_ID,\r
         NewMenuEntry->DisplayStringToken,\r
         STRING_TOKEN (STR_NULL_STRING),\r
-        EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+        FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
         (UINT16) (TERMINAL_OPTION_OFFSET + Index),\r
         Location\r
         );\r
-      Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+      Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
       UpdateData->DataCount++;\r
     }\r
   }\r
@@ -260,12 +260,12 @@ UpdateBootDelPage (
       (UINT8) 1,\r
       NewMenuEntry->DisplayStringToken,\r
       NewMenuEntry->HelpStringToken,\r
-      EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+      FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
       (UINT16) BOOT_OPTION_DEL_QUESTION_ID,\r
       Location\r
       );\r
 \r
-    Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+    Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
     UpdateData->DataCount++;\r
   }\r
 \r
@@ -293,12 +293,12 @@ UpdateDrvAddHandlePage (
       FORM_DRV_ADD_HANDLE_DESC_ID,\r
       NewMenuEntry->DisplayStringToken,\r
       STRING_TOKEN (STR_NULL_STRING),\r
-      EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+      FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
       (UINT16) (HANDLE_OPTION_OFFSET + Index),\r
       Location\r
       );\r
 \r
-    Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+    Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
     UpdateData->DataCount++;\r
   }\r
 \r
@@ -334,12 +334,12 @@ UpdateDrvDelPage (
       (UINT8) 1,\r
       NewMenuEntry->DisplayStringToken,\r
       NewMenuEntry->HelpStringToken,\r
-      EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+      FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
       (UINT16) DRIVER_OPTION_DEL_QUESTION_ID,\r
       Location\r
       );\r
 \r
-    Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+    Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
     UpdateData->DataCount++;\r
   }\r
 \r
@@ -369,7 +369,7 @@ UpdateDriverAddHandleDescPage (
     Location\r
     );\r
 \r
-  Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+  Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
 \r
   CreateStringOpCode (\r
     DRV_ADD_HANDLE_DESC_QUESTION_ID,\r
@@ -378,23 +378,23 @@ UpdateDriverAddHandleDescPage (
     STRING_TOKEN (STR_NULL_STRING),\r
     6,\r
     75,\r
-    EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+    FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
     KEY_VALUE_DRIVER_ADD_DESC_DATA,\r
     Location\r
     );\r
 \r
-  Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+  Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
 \r
   CreateCheckBoxOpCode (\r
     DRV_ADD_RECON_QUESTION_ID,\r
     (UINT8) 1,\r
     STRING_TOKEN (STR_LOAD_OPTION_FORCE_RECON),\r
     STRING_TOKEN (STR_LOAD_OPTION_FORCE_RECON),\r
-    EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+    FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
     DRV_ADD_RECON_QUESTION_ID,\r
     Location\r
     );\r
-  Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+  Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
 \r
   CreateStringOpCode (\r
     DRIVER_ADD_OPTION_QUESTION_ID,\r
@@ -403,12 +403,12 @@ UpdateDriverAddHandleDescPage (
     STRING_TOKEN (STR_NULL_STRING),\r
     6,\r
     75,\r
-    EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+    FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
     KEY_VALUE_DRIVER_ADD_OPT_DATA,\r
     Location\r
     );\r
 \r
-  Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+  Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
   UpdatePageEnd (CallbackData, Location);\r
 }\r
 \r
@@ -437,9 +437,9 @@ UpdateConsolePage (
   for (Index = 0; Index < ConsoleMenu->MenuNumber; Index++) {\r
     NewMenuEntry      = BOpt_GetMenuEntry (ConsoleMenu, Index);\r
     NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext;\r
-    CheckFlags        = EFI_IFR_FLAG_INTERACTIVE;\r
+    CheckFlags        = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE;\r
     if (NewConsoleContext->IsActive) {\r
-      CheckFlags |= EFI_IFR_FLAG_DEFAULT;\r
+      CheckFlags |= FRAMEWORK_EFI_IFR_FLAG_DEFAULT;\r
       CallbackData->BmmFakeNvData->ConsoleCheck[Index] = TRUE;\r
     } else {\r
       CallbackData->BmmFakeNvData->ConsoleCheck[Index] = FALSE;\r
@@ -454,14 +454,14 @@ UpdateConsolePage (
       (UINT16) (CONSOLE_OPTION_OFFSET + Index),\r
       Location\r
       );\r
-    Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+    Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
     UpdateData->DataCount++;\r
   }\r
 \r
   Status = EfiLibLocateProtocol (&gTerminalDriverGuid, &Interface);\r
   if (!EFI_ERROR (Status)) {\r
     for (Index2 = 0; Index2 < TerminalMenu.MenuNumber; Index2++) {\r
-      CheckFlags          = EFI_IFR_FLAG_INTERACTIVE;\r
+      CheckFlags          = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE;\r
       NewMenuEntry        = BOpt_GetMenuEntry (&TerminalMenu, Index2);\r
       NewTerminalContext  = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;\r
 \r
@@ -469,7 +469,7 @@ UpdateConsolePage (
           (NewTerminalContext->IsConOut && (UpdatePageId == FORM_CON_OUT_ID)) ||\r
           (NewTerminalContext->IsStdErr && (UpdatePageId == FORM_CON_ERR_ID))\r
           ) {\r
-        CheckFlags |= EFI_IFR_FLAG_DEFAULT;\r
+        CheckFlags |= FRAMEWORK_EFI_IFR_FLAG_DEFAULT;\r
         CallbackData->BmmFakeNvData->ConsoleCheck[Index] = TRUE;\r
       } else {\r
         CallbackData->BmmFakeNvData->ConsoleCheck[Index] = FALSE;\r
@@ -484,7 +484,7 @@ UpdateConsolePage (
         (UINT16) (CONSOLE_OPTION_OFFSET + Index),\r
         Location\r
         );\r
-      Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+      Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
       UpdateData->DataCount++;\r
       Index++;\r
     }\r
@@ -539,7 +539,7 @@ UpdateOrderPage (
       );\r
 \r
     for (Index = 0; Index < OptionMenu->MenuNumber + 2; Index++) {\r
-      Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+      Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
     }\r
 \r
     UpdateData->DataCount = (UINT16) (UpdateData->DataCount + OptionMenu->MenuNumber + 2);\r
@@ -588,10 +588,10 @@ UpdateBootNextPage (
       NewMenuEntry    = BOpt_GetMenuEntry (&BootOptionMenu, Index);\r
       NewLoadContext  = (BM_LOAD_CONTEXT *) NewMenuEntry->VariableContext;\r
       if (NewLoadContext->IsBootNext) {\r
-        IfrOptionList[Index].Flags            = EFI_IFR_FLAG_DEFAULT | EFI_IFR_FLAG_INTERACTIVE;\r
+        IfrOptionList[Index].Flags            = FRAMEWORK_EFI_IFR_FLAG_DEFAULT | FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE;\r
         CallbackData->BmmFakeNvData->BootNext = Index;\r
       } else {\r
-        IfrOptionList[Index].Flags = EFI_IFR_FLAG_INTERACTIVE;\r
+        IfrOptionList[Index].Flags = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE;\r
       }\r
 \r
       IfrOptionList[Index].Key          = (UINT16) KEY_VALUE_MAIN_BOOT_NEXT;\r
@@ -603,9 +603,9 @@ UpdateBootNextPage (
     IfrOptionList[Index].Key          = (UINT16) KEY_VALUE_MAIN_BOOT_NEXT;\r
     IfrOptionList[Index].Value        = Index;\r
     IfrOptionList[Index].StringToken  = STRING_TOKEN (STR_NONE);\r
-    IfrOptionList[Index].Flags        = EFI_IFR_FLAG_INTERACTIVE;\r
+    IfrOptionList[Index].Flags        = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE;\r
     if (CallbackData->BmmFakeNvData->BootNext == Index) {\r
-      IfrOptionList[Index].Flags |= EFI_IFR_FLAG_DEFAULT;\r
+      IfrOptionList[Index].Flags |= FRAMEWORK_EFI_IFR_FLAG_DEFAULT;\r
     }\r
 \r
     IfrOptionList[Index].OptionString = NULL;\r
@@ -619,8 +619,8 @@ UpdateBootNextPage (
       (UINTN) (NumberOfOptions + 1),\r
       Location\r
       );\r
-    Location  = Location + (NumberOfOptions + 2) * ((EFI_IFR_OP_HEADER *) Location)->Length;\r
-    Location  = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+    Location  = Location + (NumberOfOptions + 2) * ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
+    Location  = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
 \r
     UpdateData->DataCount += 3;\r
     SafeFreePool (IfrOptionList);\r
@@ -661,7 +661,7 @@ UpdateTimeOutPage (
 \r
   CallbackData->BmmFakeNvData->BootTimeOut = (UINT16) BootTimeOut;\r
   UpdateData->DataCount++;\r
-  Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+  Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
 \r
   UpdatePageEnd (CallbackData, Location);\r
 }\r
@@ -699,9 +699,9 @@ UpdateTerminalPage (
   }\r
 \r
   for (Index = 0; Index < 19; Index++) {\r
-    CheckFlags = EFI_IFR_FLAG_INTERACTIVE;\r
+    CheckFlags = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE;\r
     if (NewTerminalContext->BaudRate == (UINT64) (BaudRateList[Index].Value)) {\r
-      CheckFlags |= EFI_IFR_FLAG_DEFAULT;\r
+      CheckFlags |= FRAMEWORK_EFI_IFR_FLAG_DEFAULT;\r
       NewTerminalContext->BaudRateIndex         = (UINT8) Index;\r
       CallbackData->BmmFakeNvData->COMBaudRate  = NewTerminalContext->BaudRateIndex;\r
     }\r
@@ -722,8 +722,8 @@ UpdateTerminalPage (
     Location\r
     );\r
 \r
-  Location              = Location + (Index + 1) * ((EFI_IFR_OP_HEADER *) Location)->Length;\r
-  Location              = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+  Location              = Location + (Index + 1) * ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
+  Location              = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
   UpdateData->DataCount = (UINT8) (UpdateData->DataCount + Index);\r
   UpdateData->DataCount += 2;\r
 \r
@@ -735,12 +735,12 @@ UpdateTerminalPage (
   }\r
 \r
   for (Index = 0; Index < 4; Index++) {\r
-    CheckFlags = EFI_IFR_FLAG_INTERACTIVE;\r
+    CheckFlags = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE;\r
 \r
     if (NewTerminalContext->DataBits == DataBitsList[Index].Value) {\r
       NewTerminalContext->DataBitsIndex         = (UINT8) Index;\r
       CallbackData->BmmFakeNvData->COMDataRate  = NewTerminalContext->DataBitsIndex;\r
-      CheckFlags |= EFI_IFR_FLAG_DEFAULT;\r
+      CheckFlags |= FRAMEWORK_EFI_IFR_FLAG_DEFAULT;\r
     }\r
 \r
     IfrOptionList[Index].Flags        = CheckFlags;\r
@@ -759,8 +759,8 @@ UpdateTerminalPage (
     Location\r
     );\r
 \r
-  Location              = Location + (Index + 1) * ((EFI_IFR_OP_HEADER *) Location)->Length;\r
-  Location              = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+  Location              = Location + (Index + 1) * ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
+  Location              = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
   UpdateData->DataCount = (UINT8) (UpdateData->DataCount + Index);\r
   UpdateData->DataCount += 2;\r
 \r
@@ -772,9 +772,9 @@ UpdateTerminalPage (
   }\r
 \r
   for (Index = 0; Index < 5; Index++) {\r
-    CheckFlags = EFI_IFR_FLAG_INTERACTIVE;\r
+    CheckFlags = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE;\r
     if (NewTerminalContext->Parity == ParityList[Index].Value) {\r
-      CheckFlags |= EFI_IFR_FLAG_DEFAULT;\r
+      CheckFlags |= FRAMEWORK_EFI_IFR_FLAG_DEFAULT;\r
       NewTerminalContext->ParityIndex         = (UINT8) Index;\r
       CallbackData->BmmFakeNvData->COMParity  = NewTerminalContext->ParityIndex;\r
     }\r
@@ -795,8 +795,8 @@ UpdateTerminalPage (
     Location\r
     );\r
 \r
-  Location              = Location + (Index + 1) * ((EFI_IFR_OP_HEADER *) Location)->Length;\r
-  Location              = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+  Location              = Location + (Index + 1) * ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
+  Location              = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
   UpdateData->DataCount = (UINT8) (UpdateData->DataCount + Index);\r
   UpdateData->DataCount += 2;\r
 \r
@@ -808,9 +808,9 @@ UpdateTerminalPage (
   }\r
 \r
   for (Index = 0; Index < 3; Index++) {\r
-    CheckFlags = EFI_IFR_FLAG_INTERACTIVE;\r
+    CheckFlags = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE;\r
     if (NewTerminalContext->StopBits == StopBitsList[Index].Value) {\r
-      CheckFlags |= EFI_IFR_FLAG_DEFAULT;\r
+      CheckFlags |= FRAMEWORK_EFI_IFR_FLAG_DEFAULT;\r
       NewTerminalContext->StopBitsIndex         = (UINT8) Index;\r
       CallbackData->BmmFakeNvData->COMStopBits  = NewTerminalContext->StopBitsIndex;\r
     }\r
@@ -831,8 +831,8 @@ UpdateTerminalPage (
     Location\r
     );\r
 \r
-  Location              = Location + (Index + 1) * ((EFI_IFR_OP_HEADER *) Location)->Length;\r
-  Location              = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+  Location              = Location + (Index + 1) * ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
+  Location              = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
   UpdateData->DataCount = (UINT8) (UpdateData->DataCount + Index);\r
   UpdateData->DataCount += 2;\r
 \r
@@ -844,9 +844,9 @@ UpdateTerminalPage (
   }\r
 \r
   for (Index = 0; Index < 4; Index++) {\r
-    CheckFlags = EFI_IFR_FLAG_INTERACTIVE;\r
+    CheckFlags = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE;\r
     if (NewTerminalContext->TerminalType == Index) {\r
-      CheckFlags |= EFI_IFR_FLAG_DEFAULT;\r
+      CheckFlags |= FRAMEWORK_EFI_IFR_FLAG_DEFAULT;\r
       CallbackData->BmmFakeNvData->COMTerminalType = NewTerminalContext->TerminalType;\r
     }\r
 \r
@@ -866,8 +866,8 @@ UpdateTerminalPage (
     Location\r
     );\r
 \r
-  Location              = Location + (Index + 1) * ((EFI_IFR_OP_HEADER *) Location)->Length;\r
-  Location              = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+  Location              = Location + (Index + 1) * ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
+  Location              = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
   UpdateData->DataCount = (UINT8) (UpdateData->DataCount + Index);\r
   UpdateData->DataCount += 2;\r
 \r
@@ -877,19 +877,19 @@ UpdateTerminalPage (
     FORM_MAIN_ID,\r
     STRING_TOKEN (STR_SAVE_AND_EXIT),\r
     STRING_TOKEN (STR_NULL_STRING),\r
-    EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+    FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
     KEY_VALUE_SAVE_AND_EXIT,\r
     Location\r
     );\r
 \r
-  Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+  Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
   UpdateData->DataCount++;\r
 \r
   CreateGotoOpCode (\r
     FORM_MAIN_ID,\r
     STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
     STRING_TOKEN (STR_NULL_STRING),\r
-    EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+    FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
     KEY_VALUE_NO_SAVE_AND_EXIT,\r
     Location\r
     );\r
@@ -1129,9 +1129,9 @@ UpdateSetLegacyDeviceOrderPage (
 \r
   for (Index = 0; Index < OptionMenu->MenuNumber; Index++) {\r
     NewMenuEntry                = BOpt_GetMenuEntry (OptionMenu, Index);\r
-    IfrOptionList[Index].Flags  = EFI_IFR_FLAG_INTERACTIVE;\r
+    IfrOptionList[Index].Flags  = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE;\r
     if (0 == Index) {\r
-      IfrOptionList[Index].Flags |= EFI_IFR_FLAG_DEFAULT;\r
+      IfrOptionList[Index].Flags |= FRAMEWORK_EFI_IFR_FLAG_DEFAULT;\r
     }\r
 \r
     IfrOptionList[Index].Key          = Key;\r
@@ -1142,7 +1142,7 @@ UpdateSetLegacyDeviceOrderPage (
   //\r
   // for item "Disabled"\r
   //\r
-  IfrOptionList[Index].Flags        = EFI_IFR_FLAG_INTERACTIVE;\r
+  IfrOptionList[Index].Flags        = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE;\r
   IfrOptionList[Index].Key          = Key;\r
   IfrOptionList[Index].StringToken  = STRING_TOKEN (STR_DISABLE_LEGACY_DEVICE);\r
   IfrOptionList[Index].Value        = 0xFF;\r
@@ -1220,8 +1220,8 @@ UpdateSetLegacyDeviceOrderPage (
         LegacyOrder[Index] = (UINT8) (VarDevOrder & 0xFF);\r
       }\r
 \r
-      Location              = Location + (OptionMenu->MenuNumber + 2) * ((EFI_IFR_OP_HEADER *) Location)->Length;\r
-      Location              = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+      Location              = Location + (OptionMenu->MenuNumber + 2) * ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
+      Location              = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
       UpdateData->DataCount = (UINT16) (UpdateData->DataCount + (OptionMenu->MenuNumber + 3));\r
     }\r
   }\r
index cac68a16b061ab174477df80a0b1880ba77e4a1f..20d23975d1d4c58f1a33e10f5bcf540049b9dc01 100644 (file)
@@ -504,7 +504,7 @@ Var_UpdateErrorOutOption (
 EFI_STATUS\r
 Var_UpdateDriverOption (\r
   IN  BMM_CALLBACK_DATA         *CallbackData,\r
-  IN  EFI_HII_HANDLE            HiiHandle,\r
+  IN  FRAMEWORK_EFI_HII_HANDLE  HiiHandle,\r
   IN  UINT16                    *DescriptionData,\r
   IN  UINT16                    *OptionalData,\r
   IN  UINT8                     ForceReconnect\r
index 14209b87d54fc62f52e8a85f29ca6dffc9944169..d48db10944b5142d86618a56ed124afde53eaceb 100644 (file)
@@ -24,7 +24,7 @@ Abstract:
 UINT16                            mKeyInput;\r
 LIST_ENTRY                        *mBootOptionsList;\r
 BDS_COMMON_OPTION                 *gOption;\r
-EFI_HII_HANDLE                    gBootManagerHandle;\r
+FRAMEWORK_EFI_HII_HANDLE          gBootManagerHandle;\r
 EFI_HANDLE                        BootManagerCallbackHandle;\r
 EFI_FORM_CALLBACK_PROTOCOL        BootManagerCallback;\r
 EFI_GUID                          gBmGuid = BOOT_MANAGER_GUID;\r
@@ -38,7 +38,7 @@ EFIAPI
 BootManagerCallbackRoutine (\r
   IN EFI_FORM_CALLBACK_PROTOCOL       *This,\r
   IN UINT16                           KeyValue,\r
-  IN EFI_IFR_DATA_ARRAY               *DataArray,\r
+  IN FRAMEWORK_EFI_IFR_DATA_ARRAY               *DataArray,\r
   OUT EFI_HII_CALLBACK_PACKET         **Packet\r
   )\r
 /*++\r
@@ -97,7 +97,7 @@ Returns:
 \r
       DataPacket->DataArray.EntryCount  = 1;\r
       DataPacket->DataArray.NvRamMap    = NULL;\r
-      ((EFI_IFR_DATA_ENTRY *) (((EFI_IFR_DATA_ARRAY *)DataPacket) + 1))->Flags = EXIT_REQUIRED | NV_NOT_CHANGED;\r
+      ((FRAMEWORK_EFI_IFR_DATA_ENTRY *) (((FRAMEWORK_EFI_IFR_DATA_ARRAY *)DataPacket) + 1))->Flags = EXIT_REQUIRED | NV_NOT_CHANGED;\r
       return EFI_SUCCESS;\r
     } else {\r
       continue;\r
@@ -265,13 +265,13 @@ Returns:
               0x1000, // Form ID\r
               Token,  // Token Value for the string\r
               0,      // Help String (none)\r
-              EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,  // The Op-Code flags\r
+              FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,  // The Op-Code flags\r
               mKeyInput,                                          // The Key to get a callback on\r
               Location  // Buffer containing created op-code\r
               );\r
 \r
     UpdateData->DataCount++;\r
-    Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+    Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
 \r
   }\r
 \r
index fd9b5a1f34b8b3ebeec037e8f24c03df47eb9de0..8c734afb6d839b668a567a812af508fc7d3874df 100644 (file)
@@ -33,7 +33,7 @@ EFIAPI
 BootManagerCallbackRoutine (\r
   IN EFI_FORM_CALLBACK_PROTOCOL       *This,\r
   IN UINT16                           KeyValue,\r
-  IN EFI_IFR_DATA_ARRAY               *DataArray,\r
+  IN FRAMEWORK_EFI_IFR_DATA_ARRAY               *DataArray,\r
   OUT EFI_HII_CALLBACK_PACKET         **Packet\r
   );\r
 \r
index f990350781814224e4824f7346cd74e7ad97a2df..4c03d8dc83e70fd93d894f65e72d9a0f27d4316f 100644 (file)
@@ -42,7 +42,7 @@ EFIAPI
 DeviceManagerCallbackRoutine (\r
   IN EFI_FORM_CALLBACK_PROTOCOL       *This,\r
   IN UINT16                           KeyValue,\r
-  IN EFI_IFR_DATA_ARRAY               *DataArray,\r
+  IN FRAMEWORK_EFI_IFR_DATA_ARRAY               *DataArray,\r
   OUT EFI_HII_CALLBACK_PACKET         **Packet\r
   )\r
 /*++\r
@@ -73,7 +73,7 @@ Returns:
   CallbackInfo = EFI_FP_CALLBACK_DATA_FROM_THIS (This);\r
   switch (KeyValue) {\r
   case 0x2000:\r
-    CallbackInfo->Data.VideoBIOS = (UINT8) (UINTN) (((EFI_IFR_DATA_ENTRY *)(DataArray + 1))->Data);\r
+    CallbackInfo->Data.VideoBIOS = (UINT8) (UINTN) (((FRAMEWORK_EFI_IFR_DATA_ENTRY *)(DataArray + 1))->Data);\r
     gRT->SetVariable (\r
           L"VBIOS",\r
           &gEfiGenericPlatformVariableGuid,\r
@@ -184,9 +184,9 @@ Returns:
   EFI_STATUS          Status;\r
   UINTN               BufferSize;\r
   UINTN               Count;\r
-  EFI_HII_HANDLE      Index;\r
+  FRAMEWORK_EFI_HII_HANDLE       Index;\r
   UINT8               *Buffer;\r
-  EFI_IFR_FORM_SET    *FormSetData;\r
+  FRAMEWORK_EFI_IFR_FORM_SET    *FormSetData;\r
   CHAR16              *String;\r
   UINTN               StringLength;\r
   EFI_HII_UPDATE_DATA *UpdateData;\r
@@ -195,7 +195,7 @@ Returns:
   IFR_OPTION          *IfrOptionList;\r
   UINT8               *VideoOption;\r
   UINTN               VideoOptionSize;\r
-  EFI_HII_HANDLE      *HiiHandles;\r
+  FRAMEWORK_EFI_HII_HANDLE       *HiiHandles;\r
   UINT16              HandleBufferLength;\r
   BOOLEAN                BootDeviceMngrMenuResetRequired;\r
 \r
@@ -296,9 +296,9 @@ Returns:
       Status = gHii->GetForms (gHii, Index, 0, &BufferSize, Buffer);\r
 \r
       //\r
-      // Skip EFI_HII_PACK_HEADER, advance to EFI_IFR_FORM_SET data.\r
+      // Skip EFI_HII_PACK_HEADER, advance to FRAMEWORK_EFI_IFR_FORM_SET data.\r
       //\r
-      FormSetData = (EFI_IFR_FORM_SET *) (Buffer + sizeof (EFI_HII_PACK_HEADER));\r
+      FormSetData = (FRAMEWORK_EFI_IFR_FORM_SET *) (Buffer + sizeof (EFI_HII_PACK_HEADER));\r
 \r
       //\r
       // If this formset belongs in the device manager, add it to the menu\r
@@ -343,7 +343,7 @@ Returns:
           0x1000,     // Device Manager Page\r
           Token,      // Description String Token\r
           TokenHelp,  // Description Help String Token\r
-          EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,  // Flag designating callback is active\r
+          FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,  // Flag designating callback is active\r
           (UINT16) Index,                                     // Callback key value\r
           &UpdateData->Data                                   // Buffer to fill with op-code\r
           );\r
@@ -413,17 +413,17 @@ Returns:
 \r
   IfrOptionList = AllocatePool (2 * sizeof (IFR_OPTION));\r
   if (IfrOptionList != NULL) {\r
-    IfrOptionList[0].Flags        = EFI_IFR_FLAG_INTERACTIVE;\r
+    IfrOptionList[0].Flags        = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE;\r
     IfrOptionList[0].Key          = SET_VIDEO_BIOS_TYPE_QUESTION_ID + 0x2000;\r
     IfrOptionList[0].StringToken  = STRING_TOKEN (STR_ONE_OF_PCI);\r
     IfrOptionList[0].Value        = 0;\r
     IfrOptionList[0].OptionString = NULL;\r
-    IfrOptionList[1].Flags        = EFI_IFR_FLAG_INTERACTIVE;\r
+    IfrOptionList[1].Flags        = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE;\r
     IfrOptionList[1].Key          = SET_VIDEO_BIOS_TYPE_QUESTION_ID + 0x2000;\r
     IfrOptionList[1].StringToken  = STRING_TOKEN (STR_ONE_OF_AGP);\r
     IfrOptionList[1].Value        = 1;\r
     IfrOptionList[1].OptionString = NULL;\r
-    IfrOptionList[FPCallbackInfo.Data.VideoBIOS].Flags |= EFI_IFR_FLAG_DEFAULT;\r
+    IfrOptionList[FPCallbackInfo.Data.VideoBIOS].Flags |= FRAMEWORK_EFI_IFR_FLAG_DEFAULT;\r
 \r
     CreateOneOfOpCode (\r
       SET_VIDEO_BIOS_TYPE_QUESTION_ID,\r
@@ -468,7 +468,7 @@ Returns:
     Status = gBrowser->SendForm (\r
                         gBrowser,\r
                         TRUE,                             // Use the database\r
-                        (EFI_HII_HANDLE *) &gCallbackKey, // The HII Handle\r
+                        (FRAMEWORK_EFI_HII_HANDLE  *) &gCallbackKey, // The HII Handle\r
                         1,\r
                         NULL,\r
                         NULL,                             // This is the handle that the interface to the callback was installed on\r
index dd6d935e4554338e9cb234d865c8b0231c68ab7b..be6f92a808a192d6aabee06ad5e580a4b7629595 100644 (file)
@@ -39,7 +39,7 @@ EFIAPI
 DeviceManagerCallbackRoutine (\r
   IN EFI_FORM_CALLBACK_PROTOCOL       *This,\r
   IN UINT16                           KeyValue,\r
-  IN EFI_IFR_DATA_ARRAY               *DataArray,\r
+  IN FRAMEWORK_EFI_IFR_DATA_ARRAY               *DataArray,\r
   OUT EFI_HII_CALLBACK_PACKET         **Packet\r
   )\r
 ;\r
index 2ab8bb85971ad55eece599db4ac60a2f13a65f5e..05e9ca23bddf9a7b9b9da292527f7325bbfbbe20 100644 (file)
@@ -28,21 +28,21 @@ EFI_GUID                    mMemorySubClass     = EFI_MEMORY_SUBCLASS_GUID;
 EFI_GUID                    mMiscSubClass       = EFI_MISC_SUBCLASS_GUID;\r
 \r
 UINT16                      mLastSelection;\r
-EFI_HII_HANDLE              gFrontPageHandle;\r
+FRAMEWORK_EFI_HII_HANDLE    gFrontPageHandle;\r
 EFI_HANDLE                  FrontPageCallbackHandle;\r
 EFI_FORM_CALLBACK_PROTOCOL  FrontPageCallback;\r
 EFI_FORM_BROWSER_PROTOCOL   *gBrowser;\r
 UINTN                       gCallbackKey;\r
 BOOLEAN                     gConnectAllHappened = FALSE;\r
 \r
-extern EFI_HII_HANDLE       gFrontPageHandle;\r
+extern FRAMEWORK_EFI_HII_HANDLE        gFrontPageHandle;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FrontPageCallbackRoutine (\r
   IN EFI_FORM_CALLBACK_PROTOCOL       *This,\r
   IN UINT16                           KeyValue,\r
-  IN EFI_IFR_DATA_ARRAY               *DataArray,\r
+  IN FRAMEWORK_EFI_IFR_DATA_ARRAY               *DataArray,\r
   OUT EFI_HII_CALLBACK_PACKET         **Packet\r
   )\r
 /*++\r
@@ -105,7 +105,7 @@ Returns:
     // Based on the DataArray->Data->Data value, we can determine\r
     // which language was chosen by the user\r
     //\r
-    for (Index = 0; Count != (UINTN) (((EFI_IFR_DATA_ENTRY *) (DataArray + 1))->Data); Index += 3) {\r
+    for (Index = 0; Count != (UINTN) (((FRAMEWORK_EFI_IFR_DATA_ENTRY *) (DataArray + 1))->Data); Index += 3) {\r
       Count++;\r
     }\r
     //\r
@@ -174,7 +174,7 @@ Returns:
         Background,\r
         TmpStr,\r
         Color,\r
-        (UINTN) (((EFI_IFR_DATA_ENTRY *) (DataArray+1))->Data),\r
+        (UINTN) (((FRAMEWORK_EFI_IFR_DATA_ENTRY *) (DataArray+1))->Data),\r
         0\r
         );\r
       FreePool (TmpStr);\r
@@ -243,7 +243,7 @@ Returns:
   //\r
   TempBuffer    = (UINT8 *) FrontPageVfrBin;\r
   TempBuffer    = TempBuffer + sizeof (EFI_HII_PACK_HEADER);\r
-  TempBuffer    = (UINT8 *) &((EFI_IFR_FORM_SET *) TempBuffer)->NvDataSize;\r
+  TempBuffer    = (UINT8 *) &((FRAMEWORK_EFI_IFR_FORM_SET *) TempBuffer)->NvDataSize;\r
   *TempBuffer   = 1;\r
 \r
   gCallbackKey  = 0;\r
@@ -354,7 +354,7 @@ ReInitStrings:
     CopyMem (&OptionList[OptionCount].Value, &OptionCount, sizeof (UINT16));\r
     Key = 0x1234;\r
     CopyMem (&OptionList[OptionCount].Key, &Key, sizeof (UINT16));\r
-    OptionList[OptionCount].Flags = EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS;\r
+    OptionList[OptionCount].Flags = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS;\r
     OptionCount++;\r
   }\r
 \r
@@ -468,7 +468,7 @@ Returns:
 {\r
   EFI_STATUS      Status;\r
   UINT16          HandleBufferLength;\r
-  EFI_HII_HANDLE  *HiiHandleBuffer;\r
+  FRAMEWORK_EFI_HII_HANDLE   *HiiHandleBuffer;\r
   UINTN           StringBufferLength;\r
   UINTN           NumberOfHiiHandles;\r
   UINTN           Index;\r
@@ -490,7 +490,7 @@ Returns:
   //\r
   // Get the gHii Handle that matches the StructureNode->ProducerName\r
   //\r
-  NumberOfHiiHandles = HandleBufferLength / sizeof (EFI_HII_HANDLE);\r
+  NumberOfHiiHandles = HandleBufferLength / sizeof (FRAMEWORK_EFI_HII_HANDLE );\r
   for (Index = 0; Index < NumberOfHiiHandles; Index++) {\r
     Length = 0;\r
     Status = ExtractDataFromHiiHandle (\r
@@ -790,7 +790,7 @@ Returns:
   CreateBannerOpCode (\r
     STRING_TOKEN (STR_TIME_OUT_PROMPT),\r
     TimeoutDefault,\r
-    (UINT8) EFI_IFR_BANNER_TIMEOUT,\r
+    (UINT8) FRAMEWORK_EFI_IFR_BANNER_TIMEOUT,\r
     &UpdateData->Data\r
     );\r
 \r
index 0f673f09567595f8d944f07092c3b5aeaff8771b..b39d996a8ae1eceb863206e63c478fb90c34526c 100644 (file)
@@ -59,7 +59,7 @@ typedef struct {
 typedef struct {\r
   UINTN                       Signature;\r
   MyDevMgrIfrNVData           Data;\r
-  EFI_HII_HANDLE              DevMgrHiiHandle;\r
+  FRAMEWORK_EFI_HII_HANDLE    DevMgrHiiHandle;\r
   EFI_HANDLE                  CallbackHandle;\r
   EFI_FORM_CALLBACK_PROTOCOL  DevMgrCallback;\r
 } EFI_FRONTPAGE_CALLBACK_INFO;\r