HID: wacom: Add four new Intuos devices
Subsystems (2)
PATCH 2/2 HID: wacom: Add four new Intuos devices
This series of devices supports both pen and touch. It reports touch data in Bamboo3 format and pen data in Intuos pro format.
Signed-off-by Ping Cheng <[email protected]>
Tested-by Aaron Skomra <[email protected]>
--- drivers/hid/wacom_sys.c | 11 ++++-- drivers/hid/wacom_wac.c | 97 +++++++++++++++++++++++++++++++++++++------------ drivers/hid/wacom_wac.h | 2 + 3 files changed, 82 insertions(+), 28 deletions(-)
drivers/hid/wacom_sys.c +7 -4
@@ -1569,7 +1569,8 @@ static void wacom_wireless_work(struct work_struct *work)/* Touch interface */ if (wacom_wac1->features.touch_max || - wacom_wac1->features.type ==INTUOSHT ) { + (wacom_wac1->features.type >=INTUOSHT && + wacom_wac1->features.type <=BAMBOO_PT )) { wacom_wac2->features = *((struct wacom_features *)id->driver_data); wacom_wac2->features.pktlen =WACOM_PKGLEN_BBTOUCH3 ;
@@ -1592,7 +1593,8 @@ static void wacom_wireless_work(struct work_struct *work)if (error) goto fail; -if (wacom_wac1->features.type ==INTUOSHT && +if ((wacom_wac1->features.type ==INTUOSHT || + wacom_wac1->features.type ==INTUOSHT2 ) && wacom_wac1->features.touch_max) wacom_wac->shared->touch_input = wacom_wac2->touch_input; }
@@ -1834,8 +1836,9 @@ static int wacom_probe(struct hid_device *hdev,if (features->device_type &WACOM_DEVICETYPE_WL_MONITOR ) error =hid_hw_open (hdev); -if (wacom_wac->features.type ==INTUOSHT && - wacom_wac->features.device_type &WACOM_DEVICETYPE_TOUCH ) { +if ((wacom_wac->features.type ==INTUOSHT || + wacom_wac->features.type ==INTUOSHT2 ) && + (wacom_wac->features.device_type &WACOM_DEVICETYPE_TOUCH )) { wacom_wac->shared->touch_input = wacom_wac->touch_input; }
drivers/hid/wacom_wac.c +73 -24
213 lines not on this page · raw message
drivers/hid/wacom_wac.h +2 -0
@@ -68,6 +68,7 @@#define WACOM_REPORT_BPAD_PEN 3#define WACOM_REPORT_BPAD_TOUCH 16#define WACOM_REPORT_DEVICE_LIST 16 +#define WACOM_REPORT_INTUOS_PEN 16#define WACOM_REPORT_REMOTE 17/* device quirks */
@@ -130,6 +131,7 @@ enum {WIRELESS ,BAMBOO_PEN ,INTUOSHT , +INTUOSHT2 ,BAMBOO_TOUCH ,BAMBOO_PT , WACOM_24HDT,
Signature · 1 line
1.9.1