diff options
author | Ping Cheng <pinglinux@gmail.com> | 2011-06-27 15:57:58 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-06-27 16:07:55 -0400 |
commit | 11d0cf8859451d6336959204b2d4cc173dd1aa4e (patch) | |
tree | 273f9ad189ce68eb60ec05b3c4cefb5b569f357c /drivers/input | |
parent | a001a8f3cedb0e3cb92ff3abdb3170df7da92d47 (diff) |
Input: wacom - add 3 new models - 6A, 6B, and 97
Tested-by: Alex Tervoort <alex.tervoort@gmail.com> for 6A
Signed-off-by: David Foley <favux.is@gmail.com>
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/tablet/wacom_wac.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 1cbb9a89bff4..0c302c925ecf 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c | |||
@@ -1299,6 +1299,12 @@ static const struct wacom_features wacom_features_0x65 = | |||
1299 | static const struct wacom_features wacom_features_0x69 = | 1299 | static const struct wacom_features wacom_features_0x69 = |
1300 | { "Wacom Bamboo1", WACOM_PKGLEN_GRAPHIRE, 5104, 3712, 511, | 1300 | { "Wacom Bamboo1", WACOM_PKGLEN_GRAPHIRE, 5104, 3712, 511, |
1301 | 63, GRAPHIRE, WACOM_PENPRTN_RES, WACOM_PENPRTN_RES }; | 1301 | 63, GRAPHIRE, WACOM_PENPRTN_RES, WACOM_PENPRTN_RES }; |
1302 | static const struct wacom_features wacom_features_0x6A = | ||
1303 | { "Wacom Bamboo1 4x6", WACOM_PKGLEN_GRAPHIRE, 14760, 9225, 1023, | ||
1304 | 63, GRAPHIRE, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; | ||
1305 | static const struct wacom_features wacom_features_0x6B = | ||
1306 | { "Wacom Bamboo1 5x8", WACOM_PKGLEN_GRAPHIRE, 21648, 13530, 1023, | ||
1307 | 63, GRAPHIRE, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; | ||
1302 | static const struct wacom_features wacom_features_0x20 = | 1308 | static const struct wacom_features wacom_features_0x20 = |
1303 | { "Wacom Intuos 4x5", WACOM_PKGLEN_INTUOS, 12700, 10600, 1023, | 1309 | { "Wacom Intuos 4x5", WACOM_PKGLEN_INTUOS, 12700, 10600, 1023, |
1304 | 31, INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; | 1310 | 31, INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; |
@@ -1431,6 +1437,9 @@ static const struct wacom_features wacom_features_0x90 = | |||
1431 | static const struct wacom_features wacom_features_0x93 = | 1437 | static const struct wacom_features wacom_features_0x93 = |
1432 | { "Wacom ISDv4 93", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, | 1438 | { "Wacom ISDv4 93", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, |
1433 | 0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; | 1439 | 0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; |
1440 | static const struct wacom_features wacom_features_0x97 = | ||
1441 | { "Wacom ISDv4 97", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 511, | ||
1442 | 0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; | ||
1434 | static const struct wacom_features wacom_features_0x9A = | 1443 | static const struct wacom_features wacom_features_0x9A = |
1435 | { "Wacom ISDv4 9A", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, | 1444 | { "Wacom ISDv4 9A", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, |
1436 | 0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; | 1445 | 0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; |
@@ -1515,6 +1524,8 @@ const struct usb_device_id wacom_ids[] = { | |||
1515 | { USB_DEVICE_WACOM(0x64) }, | 1524 | { USB_DEVICE_WACOM(0x64) }, |
1516 | { USB_DEVICE_WACOM(0x65) }, | 1525 | { USB_DEVICE_WACOM(0x65) }, |
1517 | { USB_DEVICE_WACOM(0x69) }, | 1526 | { USB_DEVICE_WACOM(0x69) }, |
1527 | { USB_DEVICE_WACOM(0x6A) }, | ||
1528 | { USB_DEVICE_WACOM(0x6B) }, | ||
1518 | { USB_DEVICE_WACOM(0x20) }, | 1529 | { USB_DEVICE_WACOM(0x20) }, |
1519 | { USB_DEVICE_WACOM(0x21) }, | 1530 | { USB_DEVICE_WACOM(0x21) }, |
1520 | { USB_DEVICE_WACOM(0x22) }, | 1531 | { USB_DEVICE_WACOM(0x22) }, |
@@ -1575,6 +1586,7 @@ const struct usb_device_id wacom_ids[] = { | |||
1575 | { USB_DEVICE_WACOM(0xCC) }, | 1586 | { USB_DEVICE_WACOM(0xCC) }, |
1576 | { USB_DEVICE_WACOM(0x90) }, | 1587 | { USB_DEVICE_WACOM(0x90) }, |
1577 | { USB_DEVICE_WACOM(0x93) }, | 1588 | { USB_DEVICE_WACOM(0x93) }, |
1589 | { USB_DEVICE_WACOM(0x97) }, | ||
1578 | { USB_DEVICE_WACOM(0x9A) }, | 1590 | { USB_DEVICE_WACOM(0x9A) }, |
1579 | { USB_DEVICE_WACOM(0x9F) }, | 1591 | { USB_DEVICE_WACOM(0x9F) }, |
1580 | { USB_DEVICE_WACOM(0xE2) }, | 1592 | { USB_DEVICE_WACOM(0xE2) }, |