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