D6781.id54425.diff
No OneTemporary
Actions

Size

904 B

Referenced Files

None

Subscribers

None

D6781.id54425.diff
View Options

	Index: head/sys/boot/efi/libefi/efi_console.c
	===================================================================
	--- head/sys/boot/efi/libefi/efi_console.c
	+++ head/sys/boot/efi/libefi/efi_console.c
	@@ -438,8 +438,10 @@

	/* 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 @@
	int
	efi_cons_poll()
	{
	+
	+ if (conin->WaitForKey == NULL)
	+ return (1);
	/* This can clear the signaled state. */
	return (BS->CheckEvent(conin->WaitForKey) == EFI_SUCCESS);
	}