diff options
| author | Henrik Rydberg <rydberg@euromail.se> | 2012-08-11 16:07:55 -0400 |
|---|---|---|
| committer | Henrik Rydberg <rydberg@euromail.se> | 2012-09-19 13:50:18 -0400 |
| commit | b4adbbefc2099476a4f1020041c99f52cf3cd67d (patch) | |
| tree | ba9ca0069c7375a99fa0a9f2728b445f3ae5a096 /include/linux/input | |
| parent | a274ac15ed069bae4118e3251359240379b6801b (diff) | |
Input: MT - Add flags to input_mt_init_slots()
Preparing to move more repeated code into the mt core, add a flags
argument to the input_mt_slots_init() function.
Reviewed-and-tested-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
Tested-by: Ping Cheng <pingc@wacom.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Diffstat (limited to 'include/linux/input')
| -rw-r--r-- | include/linux/input/mt.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/input/mt.h b/include/linux/input/mt.h index 63458bced77d..53f5bf168ff9 100644 --- a/include/linux/input/mt.h +++ b/include/linux/input/mt.h | |||
| @@ -28,12 +28,14 @@ struct input_mt_slot { | |||
| 28 | * @trkid: stores MT tracking ID for the next contact | 28 | * @trkid: stores MT tracking ID for the next contact |
| 29 | * @num_slots: number of MT slots the device uses | 29 | * @num_slots: number of MT slots the device uses |
| 30 | * @slot: MT slot currently being transmitted | 30 | * @slot: MT slot currently being transmitted |
| 31 | * @flags: input_mt operation flags | ||
| 31 | * @slots: array of slots holding current values of tracked contacts | 32 | * @slots: array of slots holding current values of tracked contacts |
| 32 | */ | 33 | */ |
| 33 | struct input_mt { | 34 | struct input_mt { |
| 34 | int trkid; | 35 | int trkid; |
| 35 | int num_slots; | 36 | int num_slots; |
| 36 | int slot; | 37 | int slot; |
| 38 | unsigned int flags; | ||
| 37 | struct input_mt_slot slots[]; | 39 | struct input_mt_slot slots[]; |
| 38 | }; | 40 | }; |
| 39 | 41 | ||
| @@ -49,7 +51,8 @@ static inline int input_mt_get_value(const struct input_mt_slot *slot, | |||
| 49 | return slot->abs[code - ABS_MT_FIRST]; | 51 | return slot->abs[code - ABS_MT_FIRST]; |
| 50 | } | 52 | } |
| 51 | 53 | ||
| 52 | int input_mt_init_slots(struct input_dev *dev, unsigned int num_slots); | 54 | int input_mt_init_slots(struct input_dev *dev, unsigned int num_slots, |
| 55 | unsigned int flags); | ||
| 53 | void input_mt_destroy_slots(struct input_dev *dev); | 56 | void input_mt_destroy_slots(struct input_dev *dev); |
| 54 | 57 | ||
| 55 | static inline int input_mt_new_trkid(struct input_mt *mt) | 58 | static inline int input_mt_new_trkid(struct input_mt *mt) |
