From 9aa7ba01aa6d3526f99a145415a91798b00d339a Mon Sep 17 00:00:00 2001 From: gikidy Date: Wed, 27 Jan 2010 07:18:36 +0000 Subject: Update BDS boot option description string to use UNI file string in GenericBdsLib for localization. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9836 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Universal/BdsDxe/BootMaint/BootOption.c | 56 ++---------------- .../Universal/BdsDxe/BootMngr/BootManager.c | 64 --------------------- .../Universal/BdsDxe/Strings.uni | Bin 9310 -> 7446 bytes 3 files changed, 4 insertions(+), 116 deletions(-) (limited to 'IntelFrameworkModulePkg/Universal/BdsDxe') diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c index 3d902e1eb3..d564f5c7d2 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c @@ -876,8 +876,6 @@ BOpt_GetBootOptions ( EFI_DEVICE_PATH_PROTOCOL *DevicePath; UINTN MenuCount; UINT8 *Ptr; - UINTN DevicePathType; - CHAR16 *HiiString; MenuCount = 0; BootOrderListSize = 0; @@ -1015,56 +1013,10 @@ BOpt_GetBootOptions ( LoadOptionPtr += sizeof (UINT16); StringSize = StrSize((UINT16*)LoadOptionPtr); - // - // Get Hii description string according to device path type - // - HiiString = NULL; - DevicePathType = BdsGetBootTypeFromDevicePath (DevicePath); - switch (DevicePathType) { - case BDS_EFI_ACPI_FLOPPY_BOOT: - HiiString = GetStringById (STRING_TOKEN (STR_DESCRIPTION_FLOPPY)); - break; - case BDS_EFI_MESSAGE_SATA_BOOT: - case BDS_EFI_MESSAGE_ATAPI_BOOT: - case BDS_EFI_MEDIA_CDROM_BOOT: - HiiString = GetStringById (STRING_TOKEN (STR_DESCRIPTION_DVD)); - break; - case BDS_EFI_MESSAGE_USB_DEVICE_BOOT: - HiiString = GetStringById (STRING_TOKEN (STR_DESCRIPTION_USB)); - break; - case BDS_EFI_MESSAGE_SCSI_BOOT: - HiiString = GetStringById (STRING_TOKEN (STR_DESCRIPTION_SCSI)); - break; - case BDS_EFI_MESSAGE_MISC_BOOT: - HiiString = GetStringById (STRING_TOKEN (STR_DESCRIPTION_MISC)); - break; - case BDS_EFI_MESSAGE_MAC_BOOT: - HiiString = GetStringById (STRING_TOKEN (STR_DESCRIPTION_NETWORK)); - break; - case BBS_DEVICE_PATH: - // - // Do nothing for legacy boot option. - // - break; - default: - DEBUG((EFI_D_INFO, "Can not find HiiString for given device path type 0x%x\n", DevicePathType)); - } - - if (HiiString != NULL) { - NewLoadContext->Description = AllocateZeroPool(StringSize + StrSize(HiiString)); - ASSERT (NewLoadContext->Description != NULL); - StrCpy (NewLoadContext->Description, HiiString); - if (StrnCmp ((UINT16*)LoadOptionPtr, L"0", 1) != 0) { - StrCat (NewLoadContext->Description, L" "); - StrCat (NewLoadContext->Description, (UINT16*)LoadOptionPtr); - } - - FreePool (HiiString); - } else { - NewLoadContext->Description = AllocateZeroPool (StrSize((UINT16*)LoadOptionPtr)); - ASSERT (NewLoadContext->Description != NULL); - StrCpy (NewLoadContext->Description, (UINT16*)LoadOptionPtr); - } + + NewLoadContext->Description = AllocateZeroPool (StrSize((UINT16*)LoadOptionPtr)); + ASSERT (NewLoadContext->Description != NULL); + StrCpy (NewLoadContext->Description, (UINT16*)LoadOptionPtr); ASSERT (NewLoadContext->Description != NULL); NewMenuEntry->DisplayString = NewLoadContext->Description; diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c index 74649f49ce..a154b451f7 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c @@ -201,10 +201,6 @@ CallBootManager ( VOID *EndOpCodeHandle; EFI_IFR_GUID_LABEL *StartLabel; EFI_IFR_GUID_LABEL *EndLabel; - CHAR16 *HiiString; - CHAR16 *BootStringNumber; - UINTN DevicePathType; - UINTN BufferSize; gOption = NULL; InitializeListHead (&BdsBootOptionList); @@ -266,67 +262,7 @@ CallBootManager ( if ((Option->Attribute & LOAD_OPTION_HIDDEN) != 0) { continue; } - - // - // Replace description string with UNI file string. - // - BootStringNumber = NULL; - - DevicePathType = BdsGetBootTypeFromDevicePath (Option->DevicePath); - - // - // store number string of boot option temporary. - // - HiiString = NULL; - switch (DevicePathType) { - case BDS_EFI_ACPI_FLOPPY_BOOT: - HiiString = GetStringById (STRING_TOKEN (STR_DESCRIPTION_FLOPPY)); - break; - case BDS_EFI_MEDIA_CDROM_BOOT: - case BDS_EFI_MESSAGE_SATA_BOOT: - case BDS_EFI_MESSAGE_ATAPI_BOOT: - HiiString = GetStringById (STRING_TOKEN (STR_DESCRIPTION_DVD)); - break; - case BDS_EFI_MESSAGE_USB_DEVICE_BOOT: - HiiString = GetStringById (STRING_TOKEN (STR_DESCRIPTION_USB)); - break; - case BDS_EFI_MESSAGE_SCSI_BOOT: - HiiString = GetStringById (STRING_TOKEN (STR_DESCRIPTION_SCSI)); - break; - case BDS_EFI_MESSAGE_MISC_BOOT: - HiiString = GetStringById (STRING_TOKEN (STR_DESCRIPTION_MISC)); - break; - case BDS_EFI_MESSAGE_MAC_BOOT: - HiiString = GetStringById (STRING_TOKEN (STR_DESCRIPTION_NETWORK)); - break; - case BBS_DEVICE_PATH: - // - // Do nothing for legacy boot option. - // - break; - default: - DEBUG((EFI_D_INFO, "Can not find HiiString for given device path type 0x%x\n", DevicePathType)); - } - - // - // If found Hii description string then cat Hii string with original description. - // - if (HiiString != NULL) { - BootStringNumber = Option->Description; - BufferSize = StrSize(BootStringNumber); - BufferSize += StrSize(HiiString); - Option->Description = AllocateZeroPool(BufferSize); - ASSERT (Option->Description != NULL); - StrCpy (Option->Description, HiiString); - if (StrnCmp (BootStringNumber, L"0", 1) != 0) { - StrCat (Option->Description, L" "); - StrCat (Option->Description, BootStringNumber); - } - FreePool (HiiString); - FreePool (BootStringNumber); - } - ASSERT (Option->Description != NULL); Token = HiiSetString (HiiHandle, 0, Option->Description, NULL); diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Strings.uni b/IntelFrameworkModulePkg/Universal/BdsDxe/Strings.uni index fac0a0a639..4dc1269319 100644 Binary files a/IntelFrameworkModulePkg/Universal/BdsDxe/Strings.uni and b/IntelFrameworkModulePkg/Universal/BdsDxe/Strings.uni differ -- cgit v1.2.3