From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: Laszlo Ersek <lersek@redhat.com>
Cc: "edk2-devel@lists.01.org" <edk2-devel@lists.01.org>,
Jordan Justen <jordan.l.justen@intel.com>
Subject: Re: [PATCH] OvmfPkg/PlatformBootManagerLib: add USB keyboard to ConIn
Date: Mon, 16 Apr 2018 07:41:15 +0200 [thread overview]
Message-ID: <CAKv+Gu-TR51TZ-=hS1wJiMBbBX==2nBiE7Wn+5tDysd3ooD9bg@mail.gmail.com> (raw)
In-Reply-To: <20180415211523.10635-1-lersek@redhat.com>
On 15 April 2018 at 23:15, Laszlo Ersek <lersek@redhat.com> wrote:
> PlatformInitializeConsole() (called by PlatformBootManagerBeforeConsole())
> adds elements of "gPlatformConsole" to ConIn / ConOut / ErrOut (as
> requested per element) if at boot at least one of ConIn and ConOut doesn't
> exist. This typically applies to new VMs, and VMs with freshly recreated
> varstores.
>
> Add a USB keyboard wildcard to ConIn via "gPlatformConsole", so that we
> not only bind the PS/2 keyboard. (The PS/2 keyboard is added in
> PrepareLpcBridgeDevicePath()). Explicitly connecting the USB keyboard is
> necessary after commit 245c643cc8b7.
>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
>
> Notes:
> Repo: https://github.com/lersek/edk2.git
> Branch: ovmf_usb_kbd_con
>
> OvmfPkg/Library/PlatformBootManagerLib/PlatformData.c | 32 ++++++++++++++++++++
> 1 file changed, 32 insertions(+)
>
> diff --git a/OvmfPkg/Library/PlatformBootManagerLib/PlatformData.c b/OvmfPkg/Library/PlatformBootManagerLib/PlatformData.c
> index 82f294577ecf..a50cd7bcaf90 100644
> --- a/OvmfPkg/Library/PlatformBootManagerLib/PlatformData.c
> +++ b/OvmfPkg/Library/PlatformBootManagerLib/PlatformData.c
> @@ -27,6 +27,16 @@ typedef struct {
> } VENDOR_UART_DEVICE_PATH;
> #pragma pack()
>
> +//
> +// USB Keyboard Device Path structure
> +//
> +#pragma pack (1)
> +typedef struct {
> + USB_CLASS_DEVICE_PATH Keyboard;
> + EFI_DEVICE_PATH_PROTOCOL End;
> +} USB_KEYBOARD_DEVICE_PATH;
> +#pragma pack ()
> +
> ACPI_HID_DEVICE_PATH gPnpPs2KeyboardDeviceNode = gPnpPs2Keyboard;
> ACPI_HID_DEVICE_PATH gPnp16550ComPortDeviceNode = gPnp16550ComPort;
> UART_DEVICE_PATH gUartDeviceNode = gUart;
> @@ -71,6 +81,24 @@ VENDOR_UART_DEVICE_PATH gDebugAgentUartDevicePath = {
> gEndEntire
> };
>
> +STATIC USB_KEYBOARD_DEVICE_PATH gUsbKeyboardDevicePath = {
> + {
> + {
> + MESSAGING_DEVICE_PATH,
> + MSG_USB_CLASS_DP,
> + {
> + (UINT8)sizeof (USB_CLASS_DEVICE_PATH),
> + (UINT8)(sizeof (USB_CLASS_DEVICE_PATH) >> 8)
> + }
> + },
> + 0xFFFF, // VendorId: any
> + 0xFFFF, // ProductId: any
> + 3, // DeviceClass: HID
> + 1, // DeviceSubClass: boot
> + 1 // DeviceProtocol: keyboard
> + },
> + gEndEntire
> +};
>
> //
> // Predefined platform default console device path
> @@ -80,6 +108,10 @@ PLATFORM_CONSOLE_CONNECT_ENTRY gPlatformConsole[] = {
> (EFI_DEVICE_PATH_PROTOCOL *) &gDebugAgentUartDevicePath,
> (CONSOLE_OUT | CONSOLE_IN | STD_ERROR)
> },
> + {
> + (EFI_DEVICE_PATH_PROTOCOL *)&gUsbKeyboardDevicePath,
> + CONSOLE_IN
> + },
> {
> NULL,
> 0
> --
> 2.14.1.3.gb7cf6e02401b
>
next prev parent reply other threads:[~2018-04-16 5:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-15 21:15 [PATCH] OvmfPkg/PlatformBootManagerLib: add USB keyboard to ConIn Laszlo Ersek
2018-04-16 5:41 ` Ard Biesheuvel [this message]
2018-04-16 19:48 ` Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAKv+Gu-TR51TZ-=hS1wJiMBbBX==2nBiE7Wn+5tDysd3ooD9bg@mail.gmail.com' \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox