diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-09-22 21:11:10 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-09-22 21:11:10 +0100 |
| commit | 0fc0142828b5bc965790a1c5c6e241897d3387cb (patch) | |
| tree | 9c6c41e47a98f71747db2158eff63185b883db72 | |
| parent | edf6ea6fbe793b017a9765b493d7b1675a16a42f (diff) | |
| parent | 38b01a997e6678b4ba86ab12a78a39b7d94ee7d0 (diff) | |
| download | qemu-0fc0142828b5bc965790a1c5c6e241897d3387cb.zip qemu-0fc0142828b5bc965790a1c5c6e241897d3387cb.tar.gz qemu-0fc0142828b5bc965790a1c5c6e241897d3387cb.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/input-20200921-pull-request' into staging
input: tsc2xxx fix.
# gpg: Signature made Mon 21 Sep 2020 12:09:17 BST
# gpg: using RSA key 4CB6D8EED3E87138
# 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/input-20200921-pull-request:
hw/input/tsc2xxx: Reduce MouseTransformInfo structure exposure
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | include/hw/input/tsc2xxx.h | 8 | ||||
| -rw-r--r-- | include/ui/console.h | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/include/hw/input/tsc2xxx.h b/include/hw/input/tsc2xxx.h index 3cd8f1b..5b76ebc 100644 --- a/include/hw/input/tsc2xxx.h +++ b/include/hw/input/tsc2xxx.h @@ -11,7 +11,13 @@ #ifndef HW_INPUT_TSC2XXX_H #define HW_INPUT_TSC2XXX_H -#include "ui/console.h" +typedef struct MouseTransformInfo { + /* Touchscreen resolution */ + int x; + int y; + /* Calibration values as used/generated by tslib */ + int a[7]; +} MouseTransformInfo; typedef struct uWireSlave { uint16_t (*receive)(void *opaque); diff --git a/include/ui/console.h b/include/ui/console.h index d091c2e..79e301f 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -65,14 +65,6 @@ void qemu_remove_led_event_handler(QEMUPutLEDEntry *entry); void kbd_put_ledstate(int ledstate); -typedef struct MouseTransformInfo { - /* Touchscreen resolution */ - int x; - int y; - /* Calibration values as used/generated by tslib */ - int a[7]; -} MouseTransformInfo; - void hmp_mouse_set(Monitor *mon, const QDict *qdict); /* keysym is a unicode code except for special keys (see QEMU_KEY_xxx |