diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-05-15 12:50:06 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-05-15 12:50:06 +0100 |
| commit | ad1b4ec39caa5b3f17cbd8160283a03a3dcfe2ae (patch) | |
| tree | 68a8371969475abbc9a246729f148c5db67db521 /include | |
| parent | c13547feeec97fb31a2283cd129549b3e8c78054 (diff) | |
| parent | 7abe7eb29494b4e4a11ec99ae5623083409a2f1e (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/input-20180515-pull-request' into staging
input: ps2 fixes.
# gpg: Signature made Tue 15 May 2018 10:43:20 BST
# gpg: using RSA key 4CB6D8EED3E87138
# 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/input-20180515-pull-request:
ps2: Fix mouse stream corruption due to lost data
ps2: Clear the PS/2 queue and obey disable
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/input/ps2.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/hw/input/ps2.h b/include/hw/input/ps2.h index 94709b8502..213aa16aa3 100644 --- a/include/hw/input/ps2.h +++ b/include/hw/input/ps2.h @@ -37,7 +37,12 @@ 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(PS2State *s); +void ps2_queue_noirq(PS2State *s, int b); +void ps2_raise_irq(PS2State *s); void ps2_queue(PS2State *s, int b); +void ps2_queue_2(PS2State *s, int b1, int b2); +void ps2_queue_3(PS2State *s, int b1, int b2, int b3); +void ps2_queue_4(PS2State *s, int b1, int b2, int b3, int b4); void ps2_keyboard_set_translation(void *opaque, int mode); void ps2_mouse_fake_event(void *opaque); |