ArmPlatformPkg/Bds: Get User inputs in Unicode

[mirror_edk2.git] / ArmPlatformPkg / Bds / BootMenu.c

diff --git a/ArmPlatformPkg/Bds/BootMenu.c b/ArmPlatformPkg/Bds/BootMenu.c
index b18a58bd8c77a3869b8e5b6fcf0a464cdc4fc7d1..591e7e683b8382759be6b92c3cda25686857d060 100644 (file)
--- a/ArmPlatformPkg/Bds/BootMenu.c
+++ b/ArmPlatformPkg/Bds/BootMenu.c
@@ -116,8 +116,7 @@ BootMenuAddBootOption (
   EFI_STATUS               Status;\r
   BDS_SUPPORTED_DEVICE*    SupportedBootDevice;\r
   BDS_LOADER_ARGUMENTS     BootArguments;\r
-  CHAR8                    AsciiBootDescription[BOOT_DEVICE_DESCRIPTION_MAX];\r
-  CHAR16                   *BootDescription;\r
+  CHAR16                    BootDescription[BOOT_DEVICE_DESCRIPTION_MAX];\r
   UINT32                   Attributes;\r
   BDS_LOADER_TYPE          BootType;\r
   BDS_LOAD_OPTION          *BdsLoadOption;\r
@@ -171,24 +170,18 @@ BootMenuAddBootOption (
   }\r
 \r
   Print(L"Description for this new Entry: ");\r
-  Status = GetHIInputAscii (AsciiBootDescription,BOOT_DEVICE_DESCRIPTION_MAX);\r
+  Status = GetHIInputStr (BootDescription, BOOT_DEVICE_DESCRIPTION_MAX);\r
   if (EFI_ERROR(Status)) {\r
     Status = EFI_ABORTED;\r
     goto FREE_DEVICE_PATH;\r
   }\r
 \r
-  // Convert Ascii into Unicode\r
-  BootDescription = (CHAR16*)AllocatePool(AsciiStrSize(AsciiBootDescription) * sizeof(CHAR16));\r
-  AsciiStrToUnicodeStr (AsciiBootDescription, BootDescription);\r
-\r
   // Create new entry\r
   Status = BootOptionCreate (Attributes, BootDescription, DevicePath, BootType, &BootArguments, &BdsLoadOption);\r
   if (!EFI_ERROR(Status)) {\r
     InsertTailList (BootOptionsList,&BdsLoadOption->Link);\r
   }\r
 \r
-  FreePool (BootDescription);\r
-\r
 FREE_DEVICE_PATH:\r
   FreePool (DevicePath);\r
 \r
@@ -303,8 +296,7 @@ BootMenuUpdateBootOption (
   BDS_LOAD_OPTION           *BootOption;\r
   BDS_LOAD_OPTION_SUPPORT   *DeviceSupport;\r
   BDS_LOADER_ARGUMENTS      BootArguments;\r
-  CHAR8                     AsciiBootDescription[BOOT_DEVICE_DESCRIPTION_MAX];\r
-  CHAR16                    *BootDescription;\r
+  CHAR16                        BootDescription[BOOT_DEVICE_DESCRIPTION_MAX];\r
   EFI_DEVICE_PATH*          DevicePath;\r
   BDS_LOADER_TYPE           BootType;\r
 \r
@@ -365,22 +357,15 @@ BootMenuUpdateBootOption (
   }\r
 \r
   Print(L"Description for this new Entry: ");\r
-  UnicodeStrToAsciiStr (BootOption->Description, AsciiBootDescription);\r
-  Status = EditHIInputAscii (AsciiBootDescription, BOOT_DEVICE_DESCRIPTION_MAX);\r
+  Status = EditHIInputStr (BootDescription, BOOT_DEVICE_DESCRIPTION_MAX);\r
   if (EFI_ERROR(Status)) {\r
     Status = EFI_ABORTED;\r
     goto FREE_DEVICE_PATH;\r
   }\r
 \r
-  // Convert Ascii into Unicode\r
-  BootDescription = (CHAR16*)AllocatePool(AsciiStrSize(AsciiBootDescription) * sizeof(CHAR16));\r
-  AsciiStrToUnicodeStr (AsciiBootDescription, BootDescription);\r
-\r
   // Update the entry\r
   Status = BootOptionUpdate (BootOption, BootOption->Attributes, BootDescription, DevicePath, BootType, &BootArguments);\r
 \r
-  FreePool (BootDescription);\r
-\r
 FREE_DEVICE_PATH:\r
   FreePool (DevicePath);\r
 \r