HID: wacom: generic: add mode change touch key
Subsystems (2)
PATCH 2/3 HID: wacom: generic: add mode change touch key
From: Benjamin Tissoires <[email protected]>
Wacom Cintiq Pro added a touch key to switch the tablet between display and opaque mode. This patch informs the change by removing the old devices and creating new ones with proper properties.
Signed-off-by Benjamin Tissoires <[email protected]>
Signed-off-by Ping Cheng <[email protected]>
--- drivers/hid/wacom.h | 5 +++++ drivers/hid/wacom_sys.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ drivers/hid/wacom_wac.c | 17 ++++++++++++++++- drivers/hid/wacom_wac.h | 4 ++++ 4 files changed, 74 insertions(+), 1 deletion(-)
drivers/hid/wacom.h +5 -0
@@ -111,6 +111,7 @@ enum wacom_worker {WACOM_WORKER_WIRELESS ,WACOM_WORKER_BATTERY ,WACOM_WORKER_REMOTE , + WACOM_WORKER_MODE_CHANGE, };struct wacom ;
@@ -168,6 +169,7 @@ struct wacom {struct work_struct remote_work;struct delayed_work init_work;struct wacom_remote *remote; +struct work_struct mode_change_work;bool generic_has_leds;struct wacom_leds {struct wacom_group_leds *groups;
@@ -197,6 +199,9 @@ static inline void wacom_schedule_work(struct wacom_wac *wacom_wac,case WACOM_WORKER_REMOTE :schedule_work (&wacom->remote_work);break ; +case WACOM_WORKER_MODE_CHANGE : +schedule_work (&wacom->mode_change_work); +break ; } }
drivers/hid/wacom_sys.c +49 -0
73 lines not on this page · raw message
drivers/hid/wacom_wac.c +16 -1
@@ -1773,6 +1773,14 @@ static void wacom_wac_pad_usage_mapping(struct hid_device *hdev,wacom_map_usage (input, usage, field,EV_KEY ,KEY_CONTROLPANEL ,0 ); features->device_type |=WACOM_DEVICETYPE_PAD ;break ; +case WACOM_HID_WD_MODE_CHANGE : +/* do not overwrite previous data */ +if (!wacom_wac->has_mode_change) { + wacom_wac->has_mode_change = true; + wacom_wac->is_direct_mode = true; + } + features->device_type |=WACOM_DEVICETYPE_PAD ; +break ; }switch (equivalent_usage &0xfffffff0 ) {
@@ -1821,7 +1829,7 @@ static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *field* Avoid reporting this event and setting inrange_state if this usage * hasn't been mapped. */ -if (!usage->type) +if (!usage->type && equivalent_usage !=WACOM_HID_WD_MODE_CHANGE )return ;if (wacom_equivalent_usage (field->physical) ==HID_DG_TABLETFUNCTIONKEY ) {
@@ -1843,6 +1851,13 @@ static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *field }break ; +case WACOM_HID_WD_MODE_CHANGE : +if (wacom_wac->is_direct_mode != value) { + wacom_wac->is_direct_mode = value; +wacom_schedule_work (&wacom->wacom_wac,WACOM_WORKER_MODE_CHANGE ); + } +break ; +case WACOM_HID_WD_BUTTONCENTER :for (i =0 ; i < wacom->led.count; i++) wacom_update_led(wacom, features->numbered_buttons,
drivers/hid/wacom_wac.h +4 -0
@@ -120,6 +120,7 @@#define WACOM_HID_WD_BATTERY_LEVEL (WACOM_HID_UP_WACOMDIGITIZER | 0x043b)#define WACOM_HID_WD_EXPRESSKEY00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0910)#define WACOM_HID_WD_EXPRESSKEYCAP00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0950) +#define WACOM_HID_WD_MODE_CHANGE (WACOM_HID_UP_WACOMDIGITIZER | 0x0980)#define WACOM_HID_WD_CONTROLPANEL (WACOM_HID_UP_WACOMDIGITIZER | 0x0982)#define WACOM_HID_WD_ONSCREEN_KEYBOARD (WACOM_HID_UP_WACOMDIGITIZER | 0x0983)#define WACOM_HID_WD_BUTTONCONFIG (WACOM_HID_UP_WACOMDIGITIZER | 0x0986)
@@ -330,6 +331,9 @@ struct wacom_wac {int mode_value;struct hid_data hid_data;bool has_mute_touch_switch; +bool has_mode_change; + bool is_direct_mode; + };#endif
Signature · 1 line
1.8.3.1