From 3b164a00a9fc0e8df88291a671bb3de37aa3340f Mon Sep 17 00:00:00 2001 From: Ping Cheng Date: Wed, 23 Sep 2015 09:59:10 -0700 Subject: HID: wacom: Cleanup unsupported device_type for BAMBOO_PT Not all Bamboo support both pen and touch. Make sure we deal with pen only and touch only devices properly. Signed-off-by: Ping Cheng Tested-By: Aaron Skomra Signed-off-by: Jiri Kosina --- drivers/hid/wacom_wac.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'drivers/hid/wacom_wac.h') diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h index 1e270d4..3f24520 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h @@ -117,7 +117,6 @@ enum { INTUOSPS, INTUOSPM, INTUOSPL, - INTUOSHT, WACOM_21UX2, WACOM_22HD, DTK, @@ -129,6 +128,9 @@ enum { WACOM_13HD, WACOM_MO, WIRELESS, + BAMBOO_PEN, + INTUOSHT, + BAMBOO_TOUCH, BAMBOO_PT, WACOM_24HDT, WACOM_27QHDT, -- cgit v1.1 From eda01dab53b1126a20da98b5d691f3e55d79f21d Mon Sep 17 00:00:00 2001 From: Ping Cheng Date: Wed, 23 Sep 2015 13:51:15 -0700 Subject: 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 Tested-By: Aaron Skomra Signed-off-by: Jiri Kosina --- drivers/hid/wacom_wac.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/hid/wacom_wac.h') diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h index 3f24520..1a30e44 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h @@ -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, -- cgit v1.1 From f7acb55cf1b414f8f515697f2a7bb324ba009062 Mon Sep 17 00:00:00 2001 From: Jason Gerecke Date: Tue, 13 Oct 2015 10:03:49 -0700 Subject: HID: wacom: Add support for Cintiq Companion 2 Adds support for the EMR (pen+pad) and touchscreen devices used by the Wacom Cintiq Companion 2. This applies both to using the device as a standalone system, as well as when operating in "Cintiq mode" (where the EMR/touchscreen are simply exposed as USB devices to the system its connected to). Signed-off-by: Jason Gerecke Signed-off-by: Clifford Jolly Signed-off-by: Jiri Kosina --- drivers/hid/wacom_wac.h | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/hid/wacom_wac.h') diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h index 1a30e44..95ee92b 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h @@ -124,6 +124,7 @@ enum { WACOM_24HD, WACOM_27QHD, CINTIQ_HYBRID, + CINTIQ_COMPANION_2, CINTIQ, WACOM_BEE, WACOM_13HD, -- cgit v1.1 From 7adb91bd78a5e00209c56068dc0ad53d4cf4348f Mon Sep 17 00:00:00 2001 From: Ping Cheng Date: Mon, 26 Oct 2015 14:29:12 -0700 Subject: HID: wacom: fix Intuos wireless report id issue Intuos Pen in wireless mode does not have the same report id (2) as when it is in USB mode (17). This patch also moves WIRELESS next to REMOTE in type enum so we can group devices with similar features easily. Reported-by: Dale Brewe Tested-by: Dale Brewe Signed-off-by: Ping Cheng Signed-off-by: Jiri Kosina --- drivers/hid/wacom_wac.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/hid/wacom_wac.h') diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h index 95ee92b..d9e9515 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h @@ -129,7 +129,6 @@ enum { WACOM_BEE, WACOM_13HD, WACOM_MO, - WIRELESS, BAMBOO_PEN, INTUOSHT, INTUOSHT2, @@ -138,6 +137,7 @@ enum { WACOM_24HDT, WACOM_27QHDT, BAMBOO_PAD, + WIRELESS, REMOTE, TABLETPC, /* add new TPC below */ TABLETPCE, -- cgit v1.1