diff options
| author | Jan Janssen <medhefgo@web.de> | 2016-07-18 21:19:32 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-07-18 15:19:32 -0400 |
| commit | 03e749af53bc6671270c300cdc5df4f2c5e0b9ae (patch) | |
| tree | 21287dfa9eb71503ef68958282b65f5e852cc6db | |
| parent | 14eb41b2a45f0ab56b06054c7bc40c3613b23e82 (diff) | |
sd-boot: Fix waiting for keyboard input (#3735)
WaitForKeyEx may never return on some UEFI systems depending
on firmware, hardware configuration and the phase of the moon.
Use ConIn->WaitForKey unconditionally instead.
Fixes #3632
| -rw-r--r-- | src/boot/efi/console.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/boot/efi/console.c b/src/boot/efi/console.c index c436f8b476..2b797c9a5f 100644 --- a/src/boot/efi/console.c +++ b/src/boot/efi/console.c @@ -93,12 +93,8 @@ EFI_STATUS console_key_read(UINT64 *key, BOOLEAN wait) { } /* wait until key is pressed */ - if (wait) { - if (TextInputEx) - uefi_call_wrapper(BS->WaitForEvent, 3, 1, &TextInputEx->WaitForKeyEx, &index); - else - uefi_call_wrapper(BS->WaitForEvent, 3, 1, &ST->ConIn->WaitForKey, &index); - } + if (wait) + uefi_call_wrapper(BS->WaitForEvent, 3, 1, &ST->ConIn->WaitForKey, &index); if (TextInputEx) { EFI_KEY_DATA keydata; |