diff options
author | Peter Maydell | 2021-05-30 21:10:30 +0200 |
---|---|---|
committer | Peter Maydell | 2021-05-30 21:10:30 +0200 |
commit | 52848929b70dcf92a68aedcfd90207be81ba3274 (patch) | |
tree | 731cb3a6253de7054afaefed4371128d116a8cac /hw/input/hid.c | |
parent | Merge remote-tracking branch 'remotes/kraxel/tags/vga-20210527-pull-request' ... (diff) | |
parent | hw/usb: hcd-xhci-pci: Fix spec violation of IP flag for MSI/MSI-X (diff) | |
download | qemu-52848929b70dcf92a68aedcfd90207be81ba3274.tar.gz qemu-52848929b70dcf92a68aedcfd90207be81ba3274.tar.xz qemu-52848929b70dcf92a68aedcfd90207be81ba3274.zip |
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20210528-pull-request' into staging
usb: bugfixes for hid and xhci.
# gpg: Signature made Fri 28 May 2021 15:21:51 BST
# gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/usb-20210528-pull-request:
hw/usb: hcd-xhci-pci: Fix spec violation of IP flag for MSI/MSI-X
hw/usb: hcd-xhci-pci: Raise MSI/MSI-X interrupts only when told to
hw/input/hid: Add support for keys of jp106 keyboard.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/input/hid.c')
-rw-r--r-- | hw/input/hid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/input/hid.c b/hw/input/hid.c index e1d2e46083..8aab0521f4 100644 --- a/hw/input/hid.c +++ b/hw/input/hid.c @@ -51,8 +51,8 @@ static const uint8_t hid_usage_keys[0x100] = { 0x45, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0xe8, 0xe9, 0x71, 0x72, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xe3, 0xe7, 0x65, + 0x88, 0x00, 0x00, 0x87, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x8a, 0x00, 0x8b, 0x00, 0x89, 0xe7, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |