Re: Using shift on external keyboards in softraid passphrases from efiboot

[YASUOKA Masahiko]

On Fri, 24 Aug 2018 10:55:52 +0200
Patrick Wildt <patr...@blueri.se> wrote:
> On Fri, Aug 24, 2018 at 10:47:27AM +0200, Theo Buehler wrote:
>> On Fri, Aug 24, 2018 at 11:50:51AM +0900, YASUOKA Masahiko wrote:
>> > Hi,
>> > 
>> > I think the diff should be brought to arm64 as well.  ok?
>> 
>> ok. But shouldn't armv7 also be kept in sync?
> 
> Exactly.

Thanks,

ok?

Index: sys/arch/arm64/stand/efiboot/efiboot.c
===================================================================
RCS file: /cvs/src/sys/arch/arm64/stand/efiboot/efiboot.c,v
retrieving revision 1.20
diff -u -p -r1.20 efiboot.c
--- sys/arch/arm64/stand/efiboot/efiboot.c      23 Aug 2018 15:31:12 -0000      
1.20
+++ sys/arch/arm64/stand/efiboot/efiboot.c      24 Aug 2018 22:51:21 -0000
@@ -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);
                /*
Index: sys/arch/armv7/stand/efiboot/efiboot.c
===================================================================
RCS file: /cvs/src/sys/arch/armv7/stand/efiboot/efiboot.c,v
retrieving revision 1.22
diff -u -p -r1.22 efiboot.c
--- sys/arch/armv7/stand/efiboot/efiboot.c      23 Aug 2018 15:31:12 -0000      
1.22
+++ sys/arch/armv7/stand/efiboot/efiboot.c      24 Aug 2018 22:51:21 -0000
@@ -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);
                /*