diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-10-24 16:55:56 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-10-24 16:55:56 +0100 |
| commit | 328f6f79e9916deb6e5649499f7439b0262f6f9e (patch) | |
| tree | 930ed413bf74b126079c64a400bce9d43938962e /hw/input/trace-events | |
| parent | 3d7196d43bfe12efe98568cb60057e273652b99b (diff) | |
| parent | 2182608f1ca00f4559486e9173a8e4242dd2d65d (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/input-20171023-pull-request' into staging
input: fixes for ui input code and ps/2 keyboard (mostly sysrq key)
# gpg: Signature made Mon 23 Oct 2017 10:19: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/input-20171023-pull-request:
ui: pull in latest keycodemapdb
ui: normalize the 'sysrq' key into the 'print' key
ps2: fix scancodes sent for Ctrl+Pause key combination
ps2: fix scancodess sent for Pause key in AT set 1
ps2: fix scancodes sent for Shift/Ctrl+Print key combination
ps2: fix scancodes sent for Alt-Print key combination (aka SysRq)
ui: use correct union field for key number
ui: fix crash with sendkey and raw key numbers
input: use hex in ps2 keycode trace events
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/input/trace-events')
| -rw-r--r-- | hw/input/trace-events | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/input/trace-events b/hw/input/trace-events index 6fcb3c063f..88150ef7a6 100644 --- a/hw/input/trace-events +++ b/hw/input/trace-events @@ -1,7 +1,8 @@ # See docs/devel/tracing.txt for syntax documentation. # hw/input/ps2.c -ps2_put_keycode(void *opaque, int keycode) "%p keycode %d" +ps2_put_keycode(void *opaque, int keycode) "%p keycode 0x%02x" +ps2_keyboard_event(void *opaque, int qcode, int down, unsigned int modifier, unsigned int modifiers) "%p qcode %d down %d modifier 0x%x modifiers 0x%x" ps2_read_data(void *opaque) "%p" ps2_set_ledstate(void *s, int ledstate) "%p ledstate %d" ps2_reset_keyboard(void *s) "%p" |