Re: [PATCH v3] HID: wacom: Add support for Cintiq Companion 2

[Jiri Kosina]

On Tue, 13 Oct 2015, Jason Gerecke wrote:

> 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 
> ---
> Changes from v2:
>  * The switch in wacom_setup_pen_input_capabilities now only contains the
>first CINTIQ_COMPANION_2 case. The second case has been moved to the
>switch in wacom_setup_pad_input_capabilities where it belongs.
> 
>  * The second CINTIQ_COMPANION_2 case mentioned above no longer explicitly
>sets up the pad buttons since wacom_setup_numbered_buttons is now
>(70ee06c) in charge of this initialization.

Applied to for-4.4/wacom.

-- 
Jiri Kosina
SUSE Labs

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v3] HID: wacom: Add support for Cintiq Companion 2

[Jason Gerecke]

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 
---
Changes from v2:
 * The switch in wacom_setup_pen_input_capabilities now only contains the
   first CINTIQ_COMPANION_2 case. The second case has been moved to the
   switch in wacom_setup_pad_input_capabilities where it belongs.

 * The second CINTIQ_COMPANION_2 case mentioned above no longer explicitly
   sets up the pad buttons since wacom_setup_numbered_buttons is now
   (70ee06c) in charge of this initialization.

 drivers/hid/wacom_sys.c |  2 +-
 drivers/hid/wacom_wac.c | 36 +++-
 drivers/hid/wacom_wac.h |  1 +
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 5f6e48e..2e7a1c7 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -420,7 +420,7 @@ static int wacom_query_tablet_data(struct hid_device *hdev,
/* MT Tablet PC touch */
return wacom_set_device_mode(hdev, 3, 4, 4);
}
-   else if (features->type == WACOM_24HDT || features->type == 
CINTIQ_HYBRID) {
+   else if (features->type == WACOM_24HDT || features->type == 
CINTIQ_HYBRID || features->type == CINTIQ_COMPANION_2) {
return wacom_set_device_mode(hdev, 18, 3, 2);
}
else if (features->type == WACOM_27QHDT) {
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 46bd02b..e0b9320 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -765,7 +765,7 @@ static void wacom_intuos_general(struct wacom_wac *wacom)
/* general pen packet */
if ((data[1] & 0xb8) == 0xa0) {
t = (data[6] << 2) | ((data[7] >> 6) & 3);
-   if (features->type >= INTUOS4S && features->type <= 
CINTIQ_HYBRID) {
+   if (features->type >= INTUOS4S && features->type <= 
CINTIQ_COMPANION_2) {
t = (t << 1) | (data[1] & 1);
}
input_report_abs(input, ABS_PRESSURE, t);
@@ -948,6 +948,27 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)
} else {
input_report_abs(input, ABS_MISC, 0);
}
+
+   } else if (features->type == CINTIQ_COMPANION_2) {
+   input_report_key(input, BTN_1, (data[1] & 0x02));
+   input_report_key(input, BTN_2, (data[2] & 0x01));
+   input_report_key(input, BTN_3, (data[2] & 0x02));
+   input_report_key(input, BTN_4, (data[2] & 0x04));
+   input_report_key(input, BTN_5, (data[2] & 0x08));
+   input_report_key(input, BTN_6, (data[1] & 0x04));
+
+   input_report_key(input, BTN_7, (data[2] & 0x10));  /* 
Right  */
+   input_report_key(input, BTN_8, (data[2] & 0x20));  /* 
Up */
+   input_report_key(input, BTN_9, (data[2] & 0x40));  /* 
Left   */
+   input_report_key(input, BTN_A, (data[2] & 0x80));  /* 
Down   */
+   input_report_key(input, BTN_0, (data[1] & 0x01));  /* 
Center */
+
+   if (data[4] | (data[3] & 0x01)) {
+   input_report_abs(input, ABS_MISC, 
PAD_DEVICE_ID);
+   } else {
+   input_report_abs(input, ABS_MISC, 0);
+   }
+
} else if (features->type >= INTUOS5S && features->type <= 
INTUOSPL) {
int i;
 
@@ -2290,6 +2311,7 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t 
len)
case WACOM_27QHD:
case DTK:
case CINTIQ_HYBRID:
+   case CINTIQ_COMPANION_2:
sync = wacom_intuos_irq(wacom_wac);
break;
 
@@ -2543,6 +2565,7 @@ int wacom_setup_pen_input_capabilities(struct input_dev 
*input_dev,
case CINTIQ:
case WACOM_13HD:
case CINTIQ_HYBRID:
+   case CINTIQ_COMPANION_2:
input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);
input_abs_set_res(input_dev, ABS_Z, 287);
__set_bit(INPUT_PROP_DIRECT, input_dev->propbit);
@@ -2775,6 +2798,7 @@ int wacom_setup_pad_input_capabilities(struct input_dev 
*input_dev,
switch (features->type) {
 
case CINTIQ_HYBRID:
+   case CINTIQ_COMPANION_2:
case DTK:
case DTUS:
case GRAPHIRE_BT:
@@ -3347,6 +3371,14 @@ static const struct wacom_features wacom_features_0x318 =
 static