Update BDS boot option description string to use UNI file string in GenericBdsLib...

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / BdsDxe / BootMngr / BootManager.c

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
index 74649f49cea7ced18b4502f669f704f617e0cac9..a154b451f7a6b792b385e498a2fb7e8a28f52441 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
@@ -201,10 +201,6 @@ CallBootManager (
   VOID                        *EndOpCodeHandle;\r
   EFI_IFR_GUID_LABEL          *StartLabel;\r
   EFI_IFR_GUID_LABEL          *EndLabel;\r
-  CHAR16                      *HiiString;\r
-  CHAR16                      *BootStringNumber;\r
-  UINTN                       DevicePathType;\r
-  UINTN                       BufferSize;\r
 \r
   gOption = NULL;\r
   InitializeListHead (&BdsBootOptionList);\r
@@ -266,67 +262,7 @@ CallBootManager (
     if ((Option->Attribute & LOAD_OPTION_HIDDEN) != 0) {\r
       continue;\r
     }\r
-    \r
-    //\r
-    // Replace description string with UNI file string.\r
-    //\r
-    BootStringNumber = NULL;\r
-    \r
-    DevicePathType = BdsGetBootTypeFromDevicePath (Option->DevicePath);\r
-\r
-    //\r
-    // store number string of boot option temporary.\r
-    //\r
-    HiiString = NULL;\r
-    switch (DevicePathType) {\r
-    case BDS_EFI_ACPI_FLOPPY_BOOT:\r
-      HiiString = GetStringById (STRING_TOKEN (STR_DESCRIPTION_FLOPPY));\r
-      break;\r
-    case BDS_EFI_MEDIA_CDROM_BOOT:\r
-    case BDS_EFI_MESSAGE_SATA_BOOT:\r
-    case BDS_EFI_MESSAGE_ATAPI_BOOT:\r
-      HiiString = GetStringById (STRING_TOKEN (STR_DESCRIPTION_DVD));\r
-      break;\r
-    case BDS_EFI_MESSAGE_USB_DEVICE_BOOT:\r
-      HiiString = GetStringById (STRING_TOKEN (STR_DESCRIPTION_USB));\r
-      break;\r
-    case BDS_EFI_MESSAGE_SCSI_BOOT:\r
-      HiiString = GetStringById (STRING_TOKEN (STR_DESCRIPTION_SCSI));\r
-      break;\r
-    case BDS_EFI_MESSAGE_MISC_BOOT:\r
-      HiiString = GetStringById (STRING_TOKEN (STR_DESCRIPTION_MISC));\r
-      break;\r
-    case BDS_EFI_MESSAGE_MAC_BOOT:\r
-      HiiString = GetStringById (STRING_TOKEN (STR_DESCRIPTION_NETWORK));\r
-      break;\r
-    case BBS_DEVICE_PATH:\r
-      //\r
-      // Do nothing for legacy boot option.\r
-      //\r
-      break;\r
-    default:\r
-      DEBUG((EFI_D_INFO, "Can not find HiiString for given device path type 0x%x\n", DevicePathType));\r
-    }\r
-\r
-    //\r
-    // If found Hii description string then cat Hii string with original description.\r
-    //\r
-    if (HiiString != NULL) {\r
-      BootStringNumber = Option->Description;\r
-      BufferSize = StrSize(BootStringNumber);\r
-      BufferSize += StrSize(HiiString);\r
-      Option->Description = AllocateZeroPool(BufferSize);\r
-      ASSERT (Option->Description != NULL);\r
-      StrCpy (Option->Description, HiiString);\r
-      if (StrnCmp (BootStringNumber, L"0", 1) != 0) {\r
-        StrCat (Option->Description, L" ");\r
-        StrCat (Option->Description, BootStringNumber);\r
-      } \r
       \r
-      FreePool (HiiString);\r
-      FreePool (BootStringNumber);\r
-    }\r
-    \r
     ASSERT (Option->Description != NULL);\r
     \r
     Token = HiiSetString (HiiHandle, 0, Option->Description, NULL);\r