Date: Sun, 4 Sep 2016 08:53:58 +0000 (UTC) From: Emmanuel Vadot <manu@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r305377 - stable/11/sys/boot/efi/libefi Message-ID: <201609040853.u848rwMX055086@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: manu Date: Sun Sep 4 08:53:58 2016 New Revision: 305377 URL: https://svnweb.freebsd.org/changeset/base/305377 Log: MFC 304222 Only use WaitForKeys event if it exists, this is not the case in u-boot efi implementation. Modified: stable/11/sys/boot/efi/libefi/efi_console.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/boot/efi/libefi/efi_console.c ============================================================================== --- stable/11/sys/boot/efi/libefi/efi_console.c Sun Sep 4 08:52:09 2016 (r305376) +++ stable/11/sys/boot/efi/libefi/efi_console.c Sun Sep 4 08:53:58 2016 (r305377) @@ -438,8 +438,10 @@ efi_cons_getchar() /* Try to read a key stroke. We wait for one if none is pending. */ status = conin->ReadKeyStroke(conin, &key); - if (status == EFI_NOT_READY) { - BS->WaitForEvent(1, &conin->WaitForKey, &junk); + while (status == EFI_NOT_READY) { + /* Some EFI implementation (u-boot for example) do not support WaitForKey */ + if (conin->WaitForKey != NULL) + BS->WaitForEvent(1, &conin->WaitForKey, &junk); status = conin->ReadKeyStroke(conin, &key); } switch (key.ScanCode) { @@ -454,6 +456,9 @@ efi_cons_getchar() int efi_cons_poll() { + + if (conin->WaitForKey == NULL) + return (1); /* This can clear the signaled state. */ return (BS->CheckEvent(conin->WaitForKey) == EFI_SUCCESS); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609040853.u848rwMX055086>