diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-02-20 13:38:34 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-02-20 13:38:34 +0000 |
| commit | 6753e4ed150ca1f94651aad06c031680a0be6cac (patch) | |
| tree | 32b143279ec3db819f40d33e1b539ffdde699a5b /include | |
| parent | 5d42ff913bb294c661aed8dfcd386fed9e185148 (diff) | |
| parent | 378af96155d62d90c876ee5e7648803247f1d864 (diff) | |
| download | qemu-6753e4ed150ca1f94651aad06c031680a0be6cac.tar.gz | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20170220-1' into staging
input: add wctablet, ps2 fix
# gpg: Signature made Mon 20 Feb 2017 11:42:12 GMT
# 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/pull-input-20170220-1:
Add wctablet device
ps2: fix mouse mappings for right/middle button
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/input/ps2.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/hw/input/ps2.h b/include/hw/input/ps2.h index 0fec91cdb0..7f0a80af9d 100644 --- a/include/hw/input/ps2.h +++ b/include/hw/input/ps2.h @@ -26,8 +26,8 @@ #define HW_PS2_H #define PS2_MOUSE_BUTTON_LEFT 0x01 -#define PS2_MOUSE_BUTTON_MIDDLE 0x02 -#define PS2_MOUSE_BUTTON_RIGHT 0x04 +#define PS2_MOUSE_BUTTON_RIGHT 0x02 +#define PS2_MOUSE_BUTTON_MIDDLE 0x04 #define PS2_MOUSE_BUTTON_SIDE 0x08 #define PS2_MOUSE_BUTTON_EXTRA 0x10 |