From: yasuoka <yasuoka@openbsd.org>
Date: Sat, 25 Aug 2018 00:12:14 +0000 (+0000)
Subject: Don't treat UnicodeChar == 0 as a keyboard input.  The same fix was
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=678d37b983c607e52a77354ed8b51fce2ee53303;p=openbsd

Don't treat UnicodeChar == 0 as a keyboard input.  The same fix was
done on amd64 already.  Original diff from Frank Groeneveld

ok tb patrick
---

diff --git a/sys/arch/arm64/stand/efiboot/efiboot.c b/sys/arch/arm64/stand/efiboot/efiboot.c
index 3f335f0e7ac..4dc9d7e32fa 100644
--- a/sys/arch/arm64/stand/efiboot/efiboot.c
+++ b/sys/arch/arm64/stand/efiboot/efiboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efiboot.c,v 1.20 2018/08/23 15:31:12 patrick Exp $	*/
+/*	$OpenBSD: efiboot.c,v 1.21 2018/08/25 00:12:14 yasuoka Exp $	*/
 
 /*
  * Copyright (c) 2015 YASUOKA Masahiko <yasuoka@yasuoka.net>
@@ -129,7 +129,7 @@ efi_cons_getc(dev_t dev)
 	}
 
 	status = conin->ReadKeyStroke(conin, &key);
-	while (status == EFI_NOT_READY) {
+	while (status == EFI_NOT_READY || key.UnicodeChar == 0) {
 		if (dev & 0x80)
 			return (0);
 		/*
diff --git a/sys/arch/armv7/stand/efiboot/efiboot.c b/sys/arch/armv7/stand/efiboot/efiboot.c
index 9d2768e196a..ebd8bbb7921 100644
--- a/sys/arch/armv7/stand/efiboot/efiboot.c
+++ b/sys/arch/armv7/stand/efiboot/efiboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efiboot.c,v 1.22 2018/08/23 15:31:12 patrick Exp $	*/
+/*	$OpenBSD: efiboot.c,v 1.23 2018/08/25 00:12:14 yasuoka Exp $	*/
 
 /*
  * Copyright (c) 2015 YASUOKA Masahiko <yasuoka@yasuoka.net>
@@ -126,7 +126,7 @@ efi_cons_getc(dev_t dev)
 	}
 
 	status = conin->ReadKeyStroke(conin, &key);
-	while (status == EFI_NOT_READY) {
+	while (status == EFI_NOT_READY || key.UnicodeChar == 0) {
 		if (dev & 0x80)
 			return (0);
 		/*