diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-06-23 12:00:21 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-06-23 12:00:21 +0100 |
| commit | 40b06f523070deb55f87f9bcee4fedb6c69942f9 (patch) | |
| tree | 11040c4594ad630ab23221570c5aad5aa01887b3 /include | |
| parent | 4c8c1cc544dbd5e2564868e61c5037258e393832 (diff) | |
| parent | 6e24ee0c1e4b6c0c9c748acab77ecd113c942a4d (diff) | |
| download | qemu-40b06f523070deb55f87f9bcee4fedb6c69942f9.zip qemu-40b06f523070deb55f87f9bcee4fedb6c69942f9.tar.gz qemu-40b06f523070deb55f87f9bcee4fedb6c69942f9.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-and-input-20170623-pull-request' into staging
# gpg: Signature made Fri 23 Jun 2017 11:39:22 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui-and-input-20170623-pull-request:
ps2: reset queue in ps2_reset_keyboard
ps2: add ps2_reset_queue
ps2: add and use PS2State typedef
sdl2: add assert to make coverity happy
hid: Reset kbd modifiers on reset
input: Decrement queue count on kbd delay
keymaps: add tracing
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/input/ps2.h | 4 | ||||
| -rw-r--r-- | include/qemu/typedefs.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/hw/input/ps2.h b/include/hw/input/ps2.h index 7f0a80a..94709b8 100644 --- a/include/hw/input/ps2.h +++ b/include/hw/input/ps2.h @@ -36,8 +36,8 @@ void *ps2_kbd_init(void (*update_irq)(void *, int), void *update_arg); void *ps2_mouse_init(void (*update_irq)(void *, int), void *update_arg); void ps2_write_mouse(void *, int val); void ps2_write_keyboard(void *, int val); -uint32_t ps2_read_data(void *); -void ps2_queue(void *, int b); +uint32_t ps2_read_data(PS2State *s); +void ps2_queue(PS2State *s, int b); void ps2_keyboard_set_translation(void *opaque, int mode); void ps2_mouse_fake_event(void *opaque); diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index f745d5f..2706aab 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -76,6 +76,7 @@ typedef struct PixelFormat PixelFormat; typedef struct PostcopyDiscardState PostcopyDiscardState; typedef struct Property Property; typedef struct PropertyInfo PropertyInfo; +typedef struct PS2State PS2State; typedef struct QEMUBH QEMUBH; typedef struct QemuConsole QemuConsole; typedef struct QEMUFile QEMUFile; |