Input: wacom - add SW_MUTE_DEVICE to include/uapi/linux/input.h
Subsystems (2)
PATCH v4 1/1 Input: wacom - add SW_MUTE_DEVICE to include/uapi/linux/input.h
New Intuos series models added a hardware switch to turn touch data on/off. The state of the switch is reported periodically from the tablet. To report the state, SW_MUTE_DEVICE is added in include/uapi/linux/input.h.
Reviewed_by: Chris Bagwell <[email protected]>
---
v4: Changed SW_TOUCH to SW_MUTE_DEVICE as suggested by Dmitry.
--- drivers/input/tablet/wacom_sys.c | 12 ++++++++++++ drivers/input/tablet/wacom_wac.c | 30 +++++++++++++++++++++++++++--- drivers/input/tablet/wacom_wac.h | 5 +++++ include/uapi/linux/input.h | 1 + 4 files changed, 45 insertions(+), 3 deletions(-)
drivers/input/tablet/wacom_sys.c +12 -0
@@ -1193,6 +1193,8 @@ static void wacom_wireless_work(struct work_struct *work) wacom_wac1->features.device_type =BTN_TOOL_PEN ;snprintf (wacom_wac1->name,WACOM_NAME_MAX ,"%s (WL) Pen" , wacom_wac1->features.name); + wacom_wac1->shared->touch_max = wacom_wac1->features.touch_max; + wacom_wac1->shared->type = wacom_wac1->features.type; error =wacom_register_input (wacom1);if (error) goto fail;
@@ -1214,6 +1216,10 @@ static void wacom_wireless_work(struct work_struct *work) error =wacom_register_input (wacom2);if (error) goto fail; + +if (wacom_wac1->features.type ==INTUOSHT && + wacom_wac1->features.touch_max) + wacom_wac->shared->touch_input = wacom_wac2->input; } error =wacom_initialize_battery (wacom);
@@ -1392,6 +1398,12 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i goto fail5; } } + +if (wacom_wac->features.type ==INTUOSHT && wacom_wac->features.touch_max) { +if (wacom_wac->features.device_type ==BTN_TOOL_FINGER ) + wacom_wac->shared->touch_input = wacom_wac->input; + } +return 0 ; fail5:wacom_destroy_leds (wacom);
drivers/input/tablet/wacom_wac.c +27 -3
@@ -1219,13 +1219,23 @@ static int wacom_bpt3_touch(struct wacom_wac *wacom)static int wacom_bpt_pen (struct wacom_wac *wacom) { +struct wacom_features *features = &wacom->features;struct input_dev *input = wacom->input;unsigned char *data = wacom->data;int prox =0 , x =0 , y =0 , p =0 , d =0 , pen =0 , btn1 =0 , btn2 =0 ; -if (data[0 ] !=WACOM_REPORT_PENABLED ) +if (data[0 ] !=WACOM_REPORT_PENABLED && data[0 ] !=WACOM_REPORT_USB )return 0 ; +if (data[0 ] ==WACOM_REPORT_USB ) { +if ((features->type ==INTUOSHT ) && features->touch_max) { +input_report_switch (wacom->shared->touch_input, +SW_MUTE_DEVICE , data[8 ] &0x40 ); +input_sync (wacom->shared->touch_input); + } +return 0 ; + } + prox = (data[1 ] &0x20 ) ==0x20 ;/*
@@ -1258,8 +1268,8 @@ static int wacom_bpt_pen(struct wacom_wac *wacom)* touching and applying pressure; do not report negative * distance. */ -if (data[8 ] <= wacom->features.distance_max) - d = wacom->features.distance_max - data[8 ]; +if (data[8 ] <= features->distance_max) + d = features->distance_max - data[8 ]; pen = data[1 ] &0x01 ; btn1 = data[1 ] &0x02 ;
@@ -1310,6 +1320,13 @@ static int wacom_wireless_irq(struct wacom_wac *wacom, size_t len)if (connected) {int pid, battery; +if ((wacom->shared->type ==INTUOSHT ) && + wacom->shared->touch_max) { +input_report_switch (wacom->shared->touch_input, +SW_MUTE_DEVICE , data[5 ] &0x40 ); +input_sync (wacom->shared->touch_input); + } + pid =get_unaligned_be16 (&data[6 ]); battery = data[5 ] &0x3f ;if (wacom->pid != pid) {
@@ -1779,6 +1796,13 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,break ;case INTUOSHT : +if (features->touch_max && + (features->device_type ==BTN_TOOL_FINGER )) { + input_dev->evbit[0 ] |=BIT_MASK (EV_SW ); +__set_bit (SW_MUTE_DEVICE , input_dev->swbit); + } +/* fall through */ +case BAMBOO_PT :__clear_bit (ABS_MISC , input_dev->absbit);
drivers/input/tablet/wacom_wac.h +5 -0
@@ -55,6 +55,7 @@#define WACOM_REPORT_TPC1FGE 18#define WACOM_REPORT_24HDT 1#define WACOM_REPORT_WL 128 +#define WACOM_REPORT_USB 192/* device quirks */ #define WACOM_QUIRK_MULTI_INPUT 0x0001
@@ -131,6 +132,10 @@ struct wacom_features {struct wacom_shared {bool stylus_in_proximity;bool touch_down; +/* for wireless device to access USB interfaces */ +unsigned touch_max; +int type; +struct input_dev *touch_input; };struct wacom_wac {
include/uapi/linux/input.h +1 -0
@@ -856,6 +856,7 @@ struct input_keymap_entry {#define SW_FRONT_PROXIMITY 0x0b/* set = front proximity sensor active */ #define SW_ROTATE_LOCK 0x0c/* set = rotate locked/disabled */ #define SW_LINEIN_INSERT 0x0d/* set = inserted */ +#define SW_MUTE_DEVICE 0x0e/* set = device disabled */ #define SW_MAX 0x0f#define SW_CNT (SW_MAX+1)
Signature · 1 line
1.8.3.2
Dmitry Torokhov
maintainerHi Ping,
Quoted 11 lines · Ping Cheng
New Intuos series models added a hardware switch to turn touch data on/off. The state of the switch is reported periodically from the tablet. To report the state,
SW_MUTE_DEVICEis added ininclude/uapi/linux/input.h.
Reviewed_by: Chris Bagwell <[email protected]>Acked-by Peter Hutterer <[email protected]>Tested-by Jason Gerecke <[email protected]>Signed-off-by Ping Cheng <[email protected]>---
v4: ChangedSW_TOUCHtoSW_MUTE_DEVICEas suggested by Dmitry.
I split SW_MUTE_DEVICE addition into a separate patch (want to push it sooner rather than later) and applied both.
Thanks.
Signature · 1 line
Dmitry