AppPkg: Update email and URL.

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

diff --git a/ArmPlatformPkg/Bds/BdsHelper.c b/ArmPlatformPkg/Bds/BdsHelper.c
index 693bc7d12a1494ae2e87c9581857e88699da6662..732292cdb94a0011b701f09c6e6d8f227f05d7aa 100644 (file)
--- a/ArmPlatformPkg/Bds/BdsHelper.c
+++ b/ArmPlatformPkg/Bds/BdsHelper.c
@@ -1,14 +1,14 @@
 /** @file\r
 *\r
 *  Copyright (c) 2011 - 2014, ARM Limited. All rights reserved.\r
-*  \r
-*  This program and the accompanying materials                          \r
-*  are licensed and made available under the terms and conditions of the BSD License         \r
-*  which accompanies this distribution.  The full text of the license may be found at        \r
-*  http://opensource.org/licenses/bsd-license.php                                            \r
 *\r
-*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+*  This program and the accompanying materials\r
+*  are licensed and made available under the terms and conditions of the BSD License\r
+*  which accompanies this distribution.  The full text of the license may be found at\r
+*  http://opensource.org/licenses/bsd-license.php\r
+*\r
+*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 *\r
 **/\r
 \r
@@ -36,7 +36,7 @@ EditHIInputStr (
   Print (CmdLine);\r
 \r
   // To prevent a buffer overflow, we only allow to enter (MaxCmdLine-1) characters\r
-  for (CmdLineIndex = StrLen (CmdLine); CmdLineIndex < MaxCmdLine; ) {
+  for (CmdLineIndex = StrLen (CmdLine); CmdLineIndex < MaxCmdLine; ) {\r
     Status = gBS->WaitForEvent (1, &gST->ConIn->WaitForKey, &WaitIndex);\r
     ASSERT_EFI_ERROR (Status);\r
 \r
@@ -63,7 +63,7 @@ EditHIInputStr (
       }\r
     } else if ((Key.ScanCode == SCAN_ESC) || (Char == 0x1B) || (Char == 0x0)) {\r
       return EFI_INVALID_PARAMETER;\r
-    } else if (CmdLineIndex < (MaxCmdLine-1)) {
+    } else if (CmdLineIndex < (MaxCmdLine-1)) {\r
       CmdLine[CmdLineIndex++] = Key.UnicodeChar;\r
       Print (L"%c", Key.UnicodeChar);\r
     }\r
@@ -151,7 +151,7 @@ GetHIInputInteger (
   @param[out]  EFI_IP_ADDRESS  OutIpAddr  Returned IPv4 address. Valid if\r
                                           and only if the returned value\r
                                           is equal to EFI_SUCCESS\r
-
+\r
   @retval  EFI_SUCCESS            Input completed\r
   @retval  EFI_ABORTED            Editing aborted by the user\r
   @retval  EFI_OUT_OF_RESOURCES   Fail to perform the operation due to\r
@@ -196,7 +196,7 @@ GetHIInputIP (
   @param[out]  EFI_IP_ADDRESS  OutIpAddr  Returned IPv4 address. Valid if\r
                                           and only if the returned value\r
                                           is equal to EFI_SUCCESS\r
-
+\r
   @retval  EFI_SUCCESS            Update completed\r
   @retval  EFI_ABORTED            Editing aborted by the user\r
   @retval  EFI_INVALID_PARAMETER  The string returned by the user is\r
@@ -243,7 +243,7 @@ GetHIInputBoolean (
 \r
   while(1) {\r
     Print (L"[y/n] ");\r
-    Status = GetHIInputStr (CmdBoolean, 2);
+    Status = GetHIInputStr (CmdBoolean, 2);\r
     if (EFI_ERROR(Status)) {\r
       return Status;\r
     } else if ((CmdBoolean[0] == L'y') || (CmdBoolean[0] == L'Y')) {\r
@@ -256,15 +256,6 @@ GetHIInputBoolean (
   }\r
 }\r
 \r
-BOOLEAN\r
-HasFilePathEfiExtension (\r
-  IN CHAR16* FilePath\r
-  )\r
-{\r
-  return (StrCmp (FilePath + (StrSize (FilePath) / sizeof (CHAR16)) - 5, L".EFI") == 0) ||\r
-         (StrCmp (FilePath + (StrSize (FilePath) / sizeof (CHAR16)) - 5, L".efi") == 0);\r
-}\r
-\r
 // Return the last non end-type Device Path Node from a Device Path\r
 EFI_DEVICE_PATH*\r
 GetLastDevicePathNode (\r
@@ -404,7 +395,9 @@ IsUnicodeString (
  * Some limitations:\r
  *   - it only supports unicode string that use ASCII character (< 0x100)\r
  *   - single character ASCII strings are interpreted as Unicode string\r
- *   - string cannot be longer than 2 x BOOT_DEVICE_OPTION_MAX (600 bytes)\r
+ *   - string cannot be longer than BOOT_DEVICE_OPTION_MAX characters and\r
+ *     thus (BOOT_DEVICE_OPTION_MAX*2) bytes for an Unicode string and\r
+ *     BOOT_DEVICE_OPTION_MAX bytes for an ASCII string.\r
  *\r
  * @param String    Buffer that might contain a Unicode or Ascii string\r
  * @param IsUnicode If not NULL this boolean value returns if the string is an\r
@@ -446,7 +439,7 @@ IsPrintableString (
   }\r
 \r
   IsPrintable = FALSE;\r
-  for (Index = 0; Index < BOOT_DEVICE_OPTION_MAX * 2; Index++) {\r
+  for (Index = 0; Index < BOOT_DEVICE_OPTION_MAX; Index++) {\r
     if (UnicodeDetected) {\r
       Character = ((CHAR16*)String)[Index];\r
     } else {\r