[edk2] [PATCH 6/9] ArmPlatformPkg/Bds: use letters for hard coded boot menu options

Subject: [edk2] [PATCH 6/9] ArmPlatformPkg/Bds: use letters for hard coded boot menu options

From: Ryan Harkin <ryan.harkin@linaro.org>

To: ryan.harkin@linaro.org, edk2-devel@lists.sourceforge.net, patches@linaro.org, boot-architecture@lists.linaro.org, olivier.martin@arm.com

Date: 2013-06-21 17:05:19

  • 2013-06-21 17:05:19  Ryan Harkin   [edk2] [PATCH 6/9] ArmPlatformPkg/Bds: use letters for hard coded boot menu options
The main menu in the Boot Manager numbers all the menu options.

As you add a new boot device, the hard coded menu option numbers increment.
This makes automated configuration of UEFI more complex.

This patch changes the hard coded menu options to use letters instead of
numbers.  For backwards compatibility, I've left the numbering support in.
However, I've re-ordered the Ebl and Boot Manager entries, so the default
number for the Boot Manager option is now 2, not 3.

Signed-off-by: Ryan Harkin 
---
 ArmPlatformPkg/Bds/BootMenu.c |   17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/ArmPlatformPkg/Bds/BootMenu.c b/ArmPlatformPkg/Bds/BootMenu.c
index 1b101d4..4094d41 100644
--- a/ArmPlatformPkg/Bds/BootMenu.c
+++ b/ArmPlatformPkg/Bds/BootMenu.c
@@ -618,8 +618,8 @@ struct BOOT_MAIN_ENTRY {
   CONST CHAR16* Description;
   EFI_STATUS (*Callback) (IN LIST_ENTRY *BootOptionsList);
 } BootMainEntries[] = {
-    { L"Shell", BootShell },
     { L"Boot Manager", BootMenuManager },
+    { L"Shell", BootShell },
 };
 
 
@@ -630,6 +630,7 @@ BootMenuMain (
 {
   LIST_ENTRY                    BootOptionsList;
   UINTN                         OptionCount;
+  UINTN                         HardCodedOptionCount;
   UINTN                         BootOptionCount;
   EFI_STATUS                    Status;
   LIST_ENTRY*                   Entry;
@@ -637,6 +638,7 @@ BootMenuMain (
   UINTN                         BootOptionSelected;
   UINTN                         Index;
   UINTN                         BootMainEntryCount;
+  CHAR8                         BootOptionSelectedStr[32];
 
   BootOption              = NULL;
   BootMainEntryCount = sizeof(BootMainEntries) / sizeof(struct BOOT_MAIN_ENTRY);
@@ -713,16 +715,25 @@ BootMenuMain (
     BootOptionCount = OptionCount-1;
 
     // Display the hardcoded Boot entries
+    Print(L"-----------------------\n");
     for (Index = 0; Index < BootMainEntryCount; Index++) {
-      Print(L"[%d] %s\n",OptionCount,BootMainEntries[Index]);
+      Print(L"[%c] %s\n", ('a'+Index), BootMainEntries[Index]);
       OptionCount++;
     }
+    HardCodedOptionCount=Index;
 
     // Request the boot entry from the user
     BootOptionSelected = 0;
     while (BootOptionSelected == 0) {
       Print(L"Start: ");
-      Status = GetHIInputInteger (&BootOptionSelected);
+      Status = GetHIInputAscii (BootOptionSelectedStr,8);
+
+      if (BootOptionSelectedStr[0]-'0' <= OptionCount) {
+        BootOptionSelected = BootOptionSelectedStr[0] - '0';
+      } else if (BootOptionSelectedStr[0]-'a' <= HardCodedOptionCount) {
+        BootOptionSelected = BootOptionCount + 1 + BootOptionSelectedStr[0] - 'a';
+      }
+
       if (EFI_ERROR(Status) || (BootOptionSelected == 0) || (BootOptionSelected > OptionCount)) {
         Print(L"Invalid input (max %d)\n",(OptionCount-1));
         BootOptionSelected = 0;
-- 
1.7.9.5


------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel