From b44b55a2dfc554015215919bf98f03d8fb386d34 Mon Sep 17 00:00:00 2001 From: Eric Dong Date: Fri, 31 Jul 2015 02:12:54 +0000 Subject: [PATCH] Remove the useless code to fix build failure caused by error depend on IntelFrameworkModulePkg. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Eric Dong Reviewed-by: Liming Gao git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18120 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Application/UiApp/BootMaint/BootOption.c | 58 ------------------- .../Application/UiApp/BootMaint/UpdatePage.c | 29 ---------- MdeModulePkg/Application/UiApp/Ui.h | 2 - MdeModulePkg/Application/UiApp/UiApp.inf | 4 -- 4 files changed, 93 deletions(-) diff --git a/MdeModulePkg/Application/UiApp/BootMaint/BootOption.c b/MdeModulePkg/Application/UiApp/BootMaint/BootOption.c index a5bd796194..1ad93bf6cf 100644 --- a/MdeModulePkg/Application/UiApp/BootMaint/BootOption.c +++ b/MdeModulePkg/Application/UiApp/BootMaint/BootOption.c @@ -238,13 +238,8 @@ BOpt_FindFileSystem ( UINT16 *TempStr; UINTN OptionNumber; VOID *Buffer; - EFI_LEGACY_BIOS_PROTOCOL *LegacyBios; - UINT16 DeviceType; - BBS_BBS_DEVICE_PATH BbsDevicePathNode; - EFI_DEVICE_PATH_PROTOCOL *DevicePath; BOOLEAN RemovableMedia; - NoSimpleFsHandles = 0; NoLoadFileHandles = 0; OptionNumber = 0; @@ -443,59 +438,6 @@ BOpt_FindFileSystem ( FreePool (LoadFileHandle); } - // - // Add Legacy Boot Option Support Here - // - Status = gBS->LocateProtocol ( - &gEfiLegacyBiosProtocolGuid, - NULL, - (VOID **) &LegacyBios - ); - if (!EFI_ERROR (Status)) { - - for (Index = BBS_TYPE_FLOPPY; Index <= BBS_TYPE_EMBEDDED_NETWORK; Index++) { - MenuEntry = BOpt_CreateMenuEntry (BM_FILE_CONTEXT_SELECT); - if (NULL == MenuEntry) { - return EFI_OUT_OF_RESOURCES; - } - - FileContext = (BM_FILE_CONTEXT *) MenuEntry->VariableContext; - - FileContext->IsRemovableMedia = FALSE; - FileContext->IsLoadFile = TRUE; - FileContext->IsBootLegacy = TRUE; - DeviceType = (UINT16) Index; - BbsDevicePathNode.Header.Type = BBS_DEVICE_PATH; - BbsDevicePathNode.Header.SubType = BBS_BBS_DP; - SetDevicePathNodeLength ( - &BbsDevicePathNode.Header, - sizeof (BBS_BBS_DEVICE_PATH) - ); - BbsDevicePathNode.DeviceType = DeviceType; - BbsDevicePathNode.StatusFlag = 0; - BbsDevicePathNode.String[0] = 0; - DevicePath = AppendDevicePathNode ( - EndDevicePath, - (EFI_DEVICE_PATH_PROTOCOL *) &BbsDevicePathNode - ); - - FileContext->DevicePath = DevicePath; - MenuEntry->HelpString = UiDevicePathToStr (FileContext->DevicePath); - - TempStr = MenuEntry->HelpString; - MenuEntry->DisplayString = AllocateZeroPool (MAX_CHAR); - ASSERT (MenuEntry->DisplayString != NULL); - UnicodeSPrint ( - MenuEntry->DisplayString, - MAX_CHAR, - L"Boot Legacy [%s]", - TempStr - ); - MenuEntry->OptionNumber = OptionNumber; - OptionNumber++; - InsertTailList (&FsOptionMenu.Head, &MenuEntry->Link); - } - } // // Remember how many file system options are here // diff --git a/MdeModulePkg/Application/UiApp/BootMaint/UpdatePage.c b/MdeModulePkg/Application/UiApp/BootMaint/UpdatePage.c index ea96d132e5..938912bfbe 100644 --- a/MdeModulePkg/Application/UiApp/BootMaint/UpdatePage.c +++ b/MdeModulePkg/Application/UiApp/BootMaint/UpdatePage.c @@ -232,35 +232,6 @@ UpdateConCOMPage ( UpdatePageEnd (CallbackData); } -/** - - IsShellNodeDevicePath checks for the Shell device path. - If it's the shell device path then return TRUE otherwise - return FALSE. - - @param DevicePath The DevicePath to check - - @retval TRUE DevicePath is Shell - @retval FALSE DevicePath is not Shell - -**/ -BOOLEAN -IsShellNodeDevicePath( - IN EFI_DEVICE_PATH_PROTOCOL *FilePath - ) -{ - - EFI_DEVICE_PATH_PROTOCOL *Node; - - for (Node = FilePath; !IsDevicePathEnd(Node); Node = NextDevicePathNode(Node)) - { - if ((DevicePathType (Node) == MEDIA_DEVICE_PATH) && (DevicePathSubType (Node) == MEDIA_PIWG_FW_FILE_DP)) { - if (!CompareMem(PcdGetPtr(PcdShellFile), &(((MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *)Node)->FvFileName), sizeof(EFI_GUID))) - return TRUE; - } - } - return FALSE; -} /** Create a list of boot option from global BootOptionMenu. It diff --git a/MdeModulePkg/Application/UiApp/Ui.h b/MdeModulePkg/Application/UiApp/Ui.h index 6075b642ff..7ce7d476e9 100644 --- a/MdeModulePkg/Application/UiApp/Ui.h +++ b/MdeModulePkg/Application/UiApp/Ui.h @@ -27,7 +27,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include -//#include #include #include @@ -44,7 +43,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include -#include #include #include #include diff --git a/MdeModulePkg/Application/UiApp/UiApp.inf b/MdeModulePkg/Application/UiApp/UiApp.inf index ba2b7b1edc..626f558097 100644 --- a/MdeModulePkg/Application/UiApp/UiApp.inf +++ b/MdeModulePkg/Application/UiApp/UiApp.inf @@ -63,8 +63,6 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec [LibraryClasses] DevicePathLib @@ -112,7 +110,6 @@ gEfiLoadFileProtocolGuid ## PROTOCOL CONSUMES gEfiSmbiosProtocolGuid ## PROTOCOL CONSUMES gEfiGenericMemTestProtocolGuid ## PROTOCOL CONSUMES - gEfiLegacyBiosProtocolGuid ## PROTOCOL CONSUMES gEfiUgaDrawProtocolGuid |PcdUgaConsumeSupport ## PROTOCOL SOMETIMES_CONSUMES gEfiBlockIoProtocolGuid ## PROTOCOL CONSUMES gEfiGraphicsOutputProtocolGuid ## PROTOCOL SOMETIMES_CONSUMES @@ -133,7 +130,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutColumn