10th and following entries can be selected using letters.
Signed-off-by: Gerd Hoffmann <[email protected]>
---
src/boot.c | 56 +++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 39 insertions(+), 17 deletions(-)
diff --git a/src/boot.c b/src/boot.c
index 47b039fbad09..e87a0fe6351b 100644
--- a/src/boot.c
+++ b/src/boot.c
@@ -467,6 +467,14 @@ get_keystroke(int msec, u8 *ascii)
#define DEFAULT_BOOTMENU_WAIT 2500
+static const char menuchars[] = {
+ '1', '2', '3', '4', '5', '6', '7', '8', '9',
+ 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
+ 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r',
+ 's', /* skip t (tpm menu) */
+ 'u', 'v', 'w', 'x', 'y', 'z'
+};
+
// Show IPL option menu.
void
interactive_bootmenu(void)
@@ -499,12 +507,15 @@ interactive_bootmenu(void)
// Show menu items
int maxmenu = 0;
- struct bootentry_s *pos;
+ struct bootentry_s *pos, *boot = NULL;
hlist_for_each_entry(pos, &BootList, node) {
char desc[77];
- maxmenu++;
- printf("%d. %s\n", maxmenu
+ if (maxmenu >= ARRAY_SIZE(menuchars)) {
+ break;
+ }
+ printf("%c. %s\n", menuchars[maxmenu]
, strtcpy(desc, pos->description, ARRAY_SIZE(desc)));
+ maxmenu++;
}
if (tpm_can_show_menu()) {
printf("\nt. TPM Configuration\n");
@@ -514,32 +525,43 @@ interactive_bootmenu(void)
// 1.5 seconds have passed. Otherwise users (trained by years of
// repeatedly hitting keys to enter the BIOS) will end up hitting ESC
// multiple times and immediately booting the primary boot device.
+ u8 key_ascii;
int esc_accepted_time = irqtimer_calc(menukey == 1 ? 1500 : 0);
for (;;) {
- scan_code = get_keystroke(1000, NULL);
+ scan_code = get_keystroke(1000, &key_ascii);
if (scan_code == 1 && !irqtimer_check(esc_accepted_time))
continue;
- if (tpm_can_show_menu() && scan_code == 20 /* t */) {
+ if (scan_code < 0) // timeout
+ continue;
+ if (tpm_can_show_menu() && key_ascii == 't') {
printf("\n");
tpm_menu();
}
- if (scan_code >= 1 && scan_code <= maxmenu+1)
+ if (scan_code == 1) {
+ // ESC
+ printf("\n");
+ return;
+ }
+
+ maxmenu = 0;
+ hlist_for_each_entry(pos, &BootList, node) {
+ if (maxmenu >= ARRAY_SIZE(menuchars))
+ break;
+ if (key_ascii == menuchars[maxmenu]) {
+ boot = pos;
+ break;
+ }
+ maxmenu++;
+ }
+ if (boot)
break;
}
printf("\n");
- if (scan_code == 0x01)
- // ESC
- return;
// Find entry and make top priority.
- int choice = scan_code - 1;
- hlist_for_each_entry(pos, &BootList, node) {
- if (! --choice)
- break;
- }
- hlist_del(&pos->node);
- pos->priority = 0;
- hlist_add_head(&pos->node, &BootList);
+ hlist_del(&boot->node);
+ boot->priority = 0;
+ hlist_add_head(&boot->node, &BootList);
}
// BEV (Boot Execution Vector) list
--
2.18.1
_______________________________________________
SeaBIOS mailing list -- [email protected]
To unsubscribe send an email to [email protected]
