summaryrefslogtreecommitdiff
path: root/include/linux/input/touchscreen.h
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2016-08-15 10:41:47 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-08-15 10:41:47 +0200
commitcc9263874b42bf98209dce0afe698b550648e770 (patch)
treef0eafd344c501e420de06c2e0f29f2ae0e6a9a1b /include/linux/input/touchscreen.h
parent02bef8f98d26e9774b49c78a42b29b168e8876fc (diff)
parentfc93ff608b15ae32cde3006b7af860b59cac20ec (diff)
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge because too many conflicts, and also we need to get at the latest struct fence patches from Gustavo. Requested by Chris Wilson. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/linux/input/touchscreen.h')
-rw-r--r--include/linux/input/touchscreen.h21
1 files changed, 20 insertions, 1 deletions
diff --git a/include/linux/input/touchscreen.h b/include/linux/input/touchscreen.h
index c91e1376132b..09d22ccb9e41 100644
--- a/include/linux/input/touchscreen.h
+++ b/include/linux/input/touchscreen.h
@@ -10,7 +10,26 @@
#define _TOUCHSCREEN_H
struct input_dev;
+struct input_mt_pos;
-void touchscreen_parse_properties(struct input_dev *dev, bool multitouch);
+struct touchscreen_properties {
+ unsigned int max_x;
+ unsigned int max_y;
+ bool invert_x;
+ bool invert_y;
+ bool swap_x_y;
+};
+
+void touchscreen_parse_properties(struct input_dev *input, bool multitouch,
+ struct touchscreen_properties *prop);
+
+void touchscreen_set_mt_pos(struct input_mt_pos *pos,
+ const struct touchscreen_properties *prop,
+ unsigned int x, unsigned int y);
+
+void touchscreen_report_pos(struct input_dev *input,
+ const struct touchscreen_properties *prop,
+ unsigned int x, unsigned int y,
+ bool multitouch);
#endif