diff options
| author | Jason Gerecke <killertofu@gmail.com> | 2015-06-15 18:01:45 -0700 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-06-18 10:42:40 +0200 |
| commit | 2a6cdbdd4cc0da0b0190b9a43648dff7b44adc0a (patch) | |
| tree | cd511d93cf8a2ecfb09f527a930376de7ab2743d /drivers/hid/wacom_wac.h | |
| parent | 2636a3f2d1421e3e629dfc96489c23727bab17d7 (diff) | |
HID: wacom: Introduce new 'touch_input' device
Instead of having a single 'input_dev' device that will take either pen
or touch data depending on the type of the device, create seperate devices
devices for each. By splitting things like this, we can support devices
(e.g. the I2C "AES" sensors in some newer tablet PCs) that send both pen
and touch reports from a single endpoint.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/wacom_wac.h')
| -rw-r--r-- | drivers/hid/wacom_wac.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h index c873c9f5b562..2978c303909d 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h @@ -196,7 +196,8 @@ struct hid_data { }; struct wacom_wac { - char name[WACOM_NAME_MAX]; + char pen_name[WACOM_NAME_MAX]; + char touch_name[WACOM_NAME_MAX]; char pad_name[WACOM_NAME_MAX]; char bat_name[WACOM_NAME_MAX]; char ac_name[WACOM_NAME_MAX]; @@ -207,9 +208,11 @@ struct wacom_wac { bool reporting_data; struct wacom_features features; struct wacom_shared *shared; - struct input_dev *input; + struct input_dev *pen_input; + struct input_dev *touch_input; struct input_dev *pad_input; - bool input_registered; + bool pen_registered; + bool touch_registered; bool pad_registered; int pid; int battery_capacity; |