aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPing Cheng <pinglinux@gmail.com>2015-03-25 20:08:13 -0400
committerJiri Kosina <jkosina@suse.cz>2015-04-02 08:57:54 -0400
commitb4bf2120d40b96552326a6606d5fb90e2ab04841 (patch)
tree12ae50c723ee7ab44e126713aed82024317490fe
parent0149931e6d2fa995fbcee590bb6cf9007a8839fc (diff)
HID: wacom: Add support for Cintiq 13HD Touch
Cintiq 13HD Touch is a new display tablet with pen and 10 finger touches. Signed-off-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/wacom_wac.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 4d559c1e7779..69c7df78281d 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -2892,6 +2892,15 @@ static const struct wacom_features wacom_features_0x304 =
2892 { "Wacom Cintiq 13HD", 59152, 33448, 1023, 63, 2892 { "Wacom Cintiq 13HD", 59152, 33448, 1023, 63,
2893 WACOM_13HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 2893 WACOM_13HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
2894 WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET }; 2894 WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
2895static const struct wacom_features wacom_features_0x333 =
2896 { "Wacom Cintiq 13HD touch", 59152, 33448, 2047, 63,
2897 WACOM_13HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
2898 WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
2899 .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x335 };
2900static const struct wacom_features wacom_features_0x335 =
2901 { "Wacom Cintiq 13HD touch", .type = WACOM_24HDT, /* Touch */
2902 .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x333, .touch_max = 10,
2903 .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
2895static const struct wacom_features wacom_features_0xC7 = 2904static const struct wacom_features wacom_features_0xC7 =
2896 { "Wacom DTU1931", 37832, 30305, 511, 0, 2905 { "Wacom DTU1931", 37832, 30305, 511, 0,
2897 PL, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; 2906 PL, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
@@ -3261,6 +3270,8 @@ const struct hid_device_id wacom_ids[] = {
3261 { USB_DEVICE_WACOM(0x32B) }, 3270 { USB_DEVICE_WACOM(0x32B) },
3262 { USB_DEVICE_WACOM(0x32C) }, 3271 { USB_DEVICE_WACOM(0x32C) },
3263 { USB_DEVICE_WACOM(0x32F) }, 3272 { USB_DEVICE_WACOM(0x32F) },
3273 { USB_DEVICE_WACOM(0x333) },
3274 { USB_DEVICE_WACOM(0x335) },
3264 { USB_DEVICE_WACOM(0x4001) }, 3275 { USB_DEVICE_WACOM(0x4001) },
3265 { USB_DEVICE_WACOM(0x4004) }, 3276 { USB_DEVICE_WACOM(0x4004) },
3266 { USB_DEVICE_WACOM(0x5000) }, 3277 { USB_DEVICE_WACOM(0x5000) },