> Date: Wed, 19 Jul 2023 16:12:59 +0900 (JST)
> From: YASUOKA Masahiko
>
> Hi,
>
> I noticed that the keyboard doesn't work for RAMDISK kernel on HP DL20
> Gen10. The kernel assigns wsdisplay0 for VGA and wsdisplay1 for
> efifb. But actually the glass console is efieb but it doesn't have
> any keyboard assigned because the keyboard is assigned to wsdisplay0.
>
> GENERIC kernel doesn't have the same problem because it was fixed at
>
> sys/arch/amd64/conf/GENERIC 1.347
> sys/arch/i386/conf/GENERIC 1.753
> (https://github.com/openbsd/src/commit/ea71d02a7c89)
>
> So the diff does the same thing, make sure wsdisplay0 is always
> assigned for the console.
>
>
> ok?
ok kettenis@
> Assign wsdisplay0 to the glass console always. The same change is
> done for GENERIC already.
>
> Index: sys/arch/amd64/conf/RAMDISK
> ===
> RCS file: /var/cvs/openbsd/src/sys/arch/amd64/conf/RAMDISK,v
> retrieving revision 1.85
> diff -u -p -r1.85 RAMDISK
> --- sys/arch/amd64/conf/RAMDISK 26 Dec 2021 13:55:36 - 1.85
> +++ sys/arch/amd64/conf/RAMDISK 19 Jul 2023 07:08:36 -
> @@ -74,7 +74,7 @@ pckbd* at pckbc? # PC keyboard
> wskbd* at pckbd? mux 1
> vga0 at isa?
> vga* at pci?
> -wsdisplay* at vga?
> +wsdisplay0 at vga? console 1
>
> com0 at isa? port 0x3f8 irq 4# standard PC serial ports
> com1 at isa? port 0x2f8 irq 3
> Index: sys/arch/amd64/conf/RAMDISK_CD
> ===
> RCS file: /var/cvs/openbsd/src/sys/arch/amd64/conf/RAMDISK_CD,v
> retrieving revision 1.201
> diff -u -p -r1.201 RAMDISK_CD
> --- sys/arch/amd64/conf/RAMDISK_CD2 Apr 2023 03:40:54 - 1.201
> +++ sys/arch/amd64/conf/RAMDISK_CD19 Jul 2023 07:08:36 -
> @@ -149,7 +149,7 @@ pckbd*at pckbc? # PC keyboard
> wskbd* at pckbd? mux 1
> vga0 at isa?
> vga* at pci?
> -wsdisplay* at vga?
> +wsdisplay0 at vga? console 1
>
> efifb0 at mainbus? # EFI Framebuffer
> wsdisplay0 at efifb? console 1
> Index: sys/arch/i386/conf/RAMDISK
> ===
> RCS file: /var/cvs/openbsd/src/sys/arch/i386/conf/RAMDISK,v
> retrieving revision 1.201
> diff -u -p -r1.201 RAMDISK
> --- sys/arch/i386/conf/RAMDISK16 Feb 2021 00:03:54 - 1.201
> +++ sys/arch/i386/conf/RAMDISK19 Jul 2023 07:08:36 -
> @@ -81,8 +81,8 @@ wskbd* at pckbd? mux 1
> vga0 at isa?
> vga* at pci?
> pcdisplay0 at isa? # CGA, MDA, EGA, HGA
> -wsdisplay* at vga?
> -wsdisplay* at pcdisplay?
> +wsdisplay0 at vga? console 1
> +wsdisplay0 at pcdisplay? console 1
>
> com0 at isa? port 0x3f8 irq 4# standard PC serial ports
> com1 at isa? port 0x2f8 irq 3
> Index: sys/arch/i386/conf/RAMDISK_CD
> ===
> RCS file: /var/cvs/openbsd/src/sys/arch/i386/conf/RAMDISK_CD,v
> retrieving revision 1.252
> diff -u -p -r1.252 RAMDISK_CD
> --- sys/arch/i386/conf/RAMDISK_CD 26 Jun 2022 20:05:06 - 1.252
> +++ sys/arch/i386/conf/RAMDISK_CD 19 Jul 2023 07:08:36 -
> @@ -121,8 +121,8 @@ wskbd*at pckbd? mux 1
> vga0 at isa?
> vga* at pci?
> pcdisplay0 at isa? # CGA, MDA, EGA, HGA
> -wsdisplay* at vga?
> -wsdisplay* at pcdisplay?
> +wsdisplay0 at vga? console 1
> +wsdisplay0 at pcdisplay? console 1
>
> com0 at isa? port 0x3f8 irq 4# standard PC serial ports
> com1 at isa? port 0x2f8 irq 3
>
>
