This change makes some of the lines in WacomModelDesc a bit too
long. Since we plan to move the table to the kernel driver soon,
I updated the table without updating the table format. It is only
to keep the code consistent between wcmUSB and wcmISDV4 for now.
Once we move USB resolutions to the kernel, the defines can be
moved to wcmISDV4.c.
Signed-off-by: Ping Cheng <pingli...@gmail.com>
---
src/wcmISDV4.c | 6 +-
src/wcmUSB.c | 242 +++++++++++++++++++++++++-------------------------
src/xf86WacomDefs.h | 12 +++
3 files changed, 136 insertions(+), 124 deletions(-)
diff --git a/src/wcmISDV4.c b/src/wcmISDV4.c
index 7bab7d4..7c1a214 100644
--- a/src/wcmISDV4.c
+++ b/src/wcmISDV4.c
@@ -318,9 +318,9 @@ static void isdv4InitISDV4(WacomCommonPtr common, const
char* id, float version)
common->wcmPktLength = ISDV4_PKGLEN_TPCPEN;
/* digitizer X resolution in points/m */
- common->wcmResolX = 100000;
+ common->wcmResolX = RES_100000;
/* digitizer Y resolution in points/m */
- common->wcmResolY = 100000;
+ common->wcmResolY = RES_100000;
/* tilt disabled */
common->wcmFlags &= ~TILT_ENABLED_FLAG;
@@ -510,7 +510,7 @@ static int isdv4GetRanges(InputInfoPtr pInfo)
(1 << reply.panel_resolution);
if (reply.panel_resolution)
- common->wcmTouchResolX = common->wcmTouchResolY = 10000;
+ common->wcmTouchResolX = common->wcmTouchResolY =
RES_10000;
common->wcmVersion = reply.version;
ret = Success;
diff --git a/src/wcmUSB.c b/src/wcmUSB.c
index 8343032..8a3116c 100644
--- a/src/wcmUSB.c
+++ b/src/wcmUSB.c
@@ -178,135 +178,135 @@ static struct
WacomModelPtr model;
} WacomModelDesc [] =
{
- { WACOM_VENDOR_ID, 0x00, 39370, 39370, &usbPenPartner }, /*
PenPartner */
- { WACOM_VENDOR_ID, 0x10, 80000, 80000, &usbGraphire }, /* Graphire
*/
- { WACOM_VENDOR_ID, 0x11, 80000, 80000, &usbGraphire2 }, /* Graphire2
4x5 */
- { WACOM_VENDOR_ID, 0x12, 80000, 80000, &usbGraphire2 }, /* Graphire2
5x7 */
- { WACOM_VENDOR_ID, 0x13, 80000, 80000, &usbGraphire3 }, /* Graphire3
4x5 */
- { WACOM_VENDOR_ID, 0x14, 80000, 80000, &usbGraphire3 }, /* Graphire3
6x8 */
- { WACOM_VENDOR_ID, 0x15, 80000, 80000, &usbGraphire4 }, /* Graphire4
4x5 */
- { WACOM_VENDOR_ID, 0x16, 80000, 80000, &usbGraphire4 }, /* Graphire4
6x8 */
- { WACOM_VENDOR_ID, 0x17, 100000, 100000, &usbBambooFun }, /* BambooFun
4x5 */
- { WACOM_VENDOR_ID, 0x18, 100000, 100000, &usbBambooFun }, /* BambooFun
6x8 */
- { WACOM_VENDOR_ID, 0x19, 80000, 80000, &usbBamboo1 }, /* Bamboo1
Medium*/
- { WACOM_VENDOR_ID, 0x81, 80000, 80000, &usbGraphire4 }, /* Graphire4
6x8 BlueTooth */
-
- { WACOM_VENDOR_ID, 0xD1, 100000, 100000, &usbBamboo }, /* CTL-460 */
- { WACOM_VENDOR_ID, 0xD4, 100000, 100000, &usbBamboo }, /* CTH-461 */
- { WACOM_VENDOR_ID, 0xD3, 100000, 100000, &usbBamboo }, /* CTL-660 */
- { WACOM_VENDOR_ID, 0xD2, 100000, 100000, &usbBamboo }, /* CTL-461/S
*/
- { WACOM_VENDOR_ID, 0xD0, 100000, 100000, &usbBamboo }, /* Bamboo
Touch */
- { WACOM_VENDOR_ID, 0xD6, 100000, 100000, &usbBamboo }, /* CTH-460/K
*/
- { WACOM_VENDOR_ID, 0xD7, 100000, 100000, &usbBamboo }, /* CTH-461/S
*/
- { WACOM_VENDOR_ID, 0xD8, 100000, 100000, &usbBamboo }, /*
CTH-661/S1 */
- { WACOM_VENDOR_ID, 0xDA, 100000, 100000, &usbBamboo }, /* CTH-461/L
*/
- { WACOM_VENDOR_ID, 0xDB, 100000, 100000, &usbBamboo }, /* CTH-661 */
-
- { WACOM_VENDOR_ID, 0x20, 100000, 100000, &usbIntuos }, /* Intuos
4x5 */
- { WACOM_VENDOR_ID, 0x21, 100000, 100000, &usbIntuos }, /* Intuos
6x8 */
- { WACOM_VENDOR_ID, 0x22, 100000, 100000, &usbIntuos }, /* Intuos
9x12 */
- { WACOM_VENDOR_ID, 0x23, 100000, 100000, &usbIntuos }, /* Intuos
12x12 */
- { WACOM_VENDOR_ID, 0x24, 100000, 100000, &usbIntuos }, /* Intuos
12x18 */
-
- { WACOM_VENDOR_ID, 0x03, 20000, 20000, &usbCintiqPartner }, /* PTU600
*/
-
- { WACOM_VENDOR_ID, 0x30, 20000, 20000, &usbCintiq }, /* PL400 */
- { WACOM_VENDOR_ID, 0x31, 20000, 20000, &usbCintiq }, /* PL500 */
- { WACOM_VENDOR_ID, 0x32, 20000, 20000, &usbCintiq }, /* PL600 */
- { WACOM_VENDOR_ID, 0x33, 20000, 20000, &usbCintiq }, /* PL600SX */
- { WACOM_VENDOR_ID, 0x34, 20000, 20000, &usbCintiq }, /* PL550 */
- { WACOM_VENDOR_ID, 0x35, 20000, 20000, &usbCintiq }, /* PL800 */
- { WACOM_VENDOR_ID, 0x37, 20000, 20000, &usbCintiq }, /* PL700 */
- { WACOM_VENDOR_ID, 0x38, 20000, 20000, &usbCintiq }, /* PL510 */
- { WACOM_VENDOR_ID, 0x39, 20000, 20000, &usbCintiq }, /* PL710 */
- { WACOM_VENDOR_ID, 0xC0, 20000, 20000, &usbCintiq }, /* DTF720 */
- { WACOM_VENDOR_ID, 0xC2, 20000, 20000, &usbCintiq }, /* DTF720a */
- { WACOM_VENDOR_ID, 0xC4, 20000, 20000, &usbCintiq }, /* DTF521 */
- { WACOM_VENDOR_ID, 0xC7, 100000, 100000, &usbCintiq }, /* DTU1931 */
- { WACOM_VENDOR_ID, 0xCE, 100000, 100000, &usbCintiq }, /* DTU2231 */
- { WACOM_VENDOR_ID, 0xF0, 100000, 100000, &usbCintiq }, /* DTU1631 */
-
- { WACOM_VENDOR_ID, 0x41, 100000, 100000, &usbIntuos2 }, /* Intuos2
4x5 */
- { WACOM_VENDOR_ID, 0x42, 100000, 100000, &usbIntuos2 }, /* Intuos2
6x8 */
- { WACOM_VENDOR_ID, 0x43, 100000, 100000, &usbIntuos2 }, /* Intuos2
9x12 */
- { WACOM_VENDOR_ID, 0x44, 100000, 100000, &usbIntuos2 }, /* Intuos2
12x12 */
- { WACOM_VENDOR_ID, 0x45, 100000, 100000, &usbIntuos2 }, /* Intuos2
12x18 */
- { WACOM_VENDOR_ID, 0x47, 100000, 100000, &usbIntuos2 }, /* Intuos2
6x8 */
-
- { WACOM_VENDOR_ID, 0x60, 50000, 50000, &usbVolito }, /* Volito */
-
- { WACOM_VENDOR_ID, 0x61, 50000, 50000, &usbVolito2 }, /*
PenStation */
- { WACOM_VENDOR_ID, 0x62, 50000, 50000, &usbVolito2 }, /* Volito2
4x5 */
- { WACOM_VENDOR_ID, 0x63, 50000, 50000, &usbVolito2 }, /* Volito2
2x3 */
- { WACOM_VENDOR_ID, 0x64, 50000, 50000, &usbVolito2 }, /*
PenPartner2 */
-
- { WACOM_VENDOR_ID, 0x65, 100000, 100000, &usbBamboo }, /* Bamboo */
- { WACOM_VENDOR_ID, 0x69, 39842, 39842, &usbBamboo1 }, /* Bamboo1 */
-
- { WACOM_VENDOR_ID, 0xB0, 200000, 200000, &usbIntuos3 }, /* Intuos3
4x5 */
- { WACOM_VENDOR_ID, 0xB1, 200000, 200000, &usbIntuos3 }, /* Intuos3
6x8 */
- { WACOM_VENDOR_ID, 0xB2, 200000, 200000, &usbIntuos3 }, /* Intuos3
9x12 */
- { WACOM_VENDOR_ID, 0xB3, 200000, 200000, &usbIntuos3 }, /* Intuos3
12x12 */
- { WACOM_VENDOR_ID, 0xB4, 200000, 200000, &usbIntuos3 }, /* Intuos3
12x19 */
- { WACOM_VENDOR_ID, 0xB5, 200000, 200000, &usbIntuos3 }, /* Intuos3
6x11 */
- { WACOM_VENDOR_ID, 0xB7, 200000, 200000, &usbIntuos3 }, /* Intuos3
4x6 */
-
- { WACOM_VENDOR_ID, 0xB8, 200000, 200000, &usbIntuos4 }, /* Intuos4
4x6 */
- { WACOM_VENDOR_ID, 0xB9, 200000, 200000, &usbIntuos4 }, /* Intuos4
6x9 */
- { WACOM_VENDOR_ID, 0xBA, 200000, 200000, &usbIntuos4 }, /* Intuos4
8x13 */
- { WACOM_VENDOR_ID, 0xBB, 200000, 200000, &usbIntuos4 }, /* Intuos4
12x19*/
- { WACOM_VENDOR_ID, 0xBC, 200000, 200000, &usbIntuos4 }, /* Intuos4
WL USB Endpoint */
- { WACOM_VENDOR_ID, 0xBD, 200000, 200000, &usbIntuos4 }, /* Intuos4
WL Bluetooth Endpoint */
-
- { WACOM_VENDOR_ID, 0x3F, 200000, 200000, &usbCintiqV5 }, /* Cintiq
21UX */
- { WACOM_VENDOR_ID, 0xC5, 200000, 200000, &usbCintiqV5 }, /* Cintiq
20WSX */
- { WACOM_VENDOR_ID, 0xC6, 200000, 200000, &usbCintiqV5 }, /* Cintiq
12WX */
- { WACOM_VENDOR_ID, 0xCC, 200000, 200000, &usbCintiqV5 }, /* Cintiq
21UX2 */
-
- { WACOM_VENDOR_ID, 0x90, 100000, 100000, &usbTabletPC }, /* TabletPC
0x90 */
- { WACOM_VENDOR_ID, 0x93, 100000, 100000, &usbTabletPC }, /* TabletPC
0x93 */
- { WACOM_VENDOR_ID, 0x9A, 100000, 100000, &usbTabletPC }, /* TabletPC
0x9A */
- { WACOM_VENDOR_ID, 0x9F, 394, 394, &usbTabletPC }, /* CapPlus
0x9F */
- { WACOM_VENDOR_ID, 0xE2, 394, 394, &usbTabletPC }, /* TabletPC
0xE2 */
- { WACOM_VENDOR_ID, 0xE3, 100000, 100000, &usbTabletPC }, /* TabletPC
0xE3 */
+ { WACOM_VENDOR_ID, 0x00, RES_39370, RES_39370, &usbPenPartner }, /*
PenPartner */
+ { WACOM_VENDOR_ID, 0x10, RES_80000, RES_80000, &usbGraphire }, /*
Graphire */
+ { WACOM_VENDOR_ID, 0x11, RES_80000, RES_80000, &usbGraphire2 }, /*
Graphire2 4x5 */
+ { WACOM_VENDOR_ID, 0x12, RES_80000, RES_80000, &usbGraphire2 }, /*
Graphire2 5x7 */
+ { WACOM_VENDOR_ID, 0x13, RES_80000, RES_80000, &usbGraphire3 }, /*
Graphire3 4x5 */
+ { WACOM_VENDOR_ID, 0x14, RES_80000, RES_80000, &usbGraphire3 }, /*
Graphire3 6x8 */
+ { WACOM_VENDOR_ID, 0x15, RES_80000, RES_80000, &usbGraphire4 }, /*
Graphire4 4x5 */
+ { WACOM_VENDOR_ID, 0x16, RES_80000, RES_80000, &usbGraphire4 }, /*
Graphire4 6x8 */
+ { WACOM_VENDOR_ID, 0x17, RES_100000, RES_100000, &usbBambooFun }, /*
BambooFun 4x5 */
+ { WACOM_VENDOR_ID, 0x18, RES_100000, RES_100000, &usbBambooFun }, /*
BambooFun 6x8 */
+ { WACOM_VENDOR_ID, 0x19, RES_80000, RES_80000, &usbBamboo1 }, /*
Bamboo1 Medium*/
+ { WACOM_VENDOR_ID, 0x81, RES_80000, RES_80000, &usbGraphire4 }, /*
Graphire4 6x8 BlueTooth */
+
+ { WACOM_VENDOR_ID, 0xD1, RES_100000, RES_100000, &usbBamboo }, /*
CTL-460 */
+ { WACOM_VENDOR_ID, 0xD4, RES_100000, RES_100000, &usbBamboo }, /*
CTH-461 */
+ { WACOM_VENDOR_ID, 0xD3, RES_100000, RES_100000, &usbBamboo }, /*
CTL-660 */
+ { WACOM_VENDOR_ID, 0xD2, RES_100000, RES_100000, &usbBamboo }, /*
CTL-461/S */
+ { WACOM_VENDOR_ID, 0xD0, RES_100000, RES_100000, &usbBamboo }, /*
Bamboo Touch */
+ { WACOM_VENDOR_ID, 0xD6, RES_100000, RES_100000, &usbBamboo }, /*
CTH-460/K */
+ { WACOM_VENDOR_ID, 0xD7, RES_100000, RES_100000, &usbBamboo }, /*
CTH-461/S */
+ { WACOM_VENDOR_ID, 0xD8, RES_100000, RES_100000, &usbBamboo }, /*
CTH-661/S1 */
+ { WACOM_VENDOR_ID, 0xDA, RES_100000, RES_100000, &usbBamboo }, /*
CTH-461/L */
+ { WACOM_VENDOR_ID, 0xDB, RES_100000, RES_100000, &usbBamboo }, /*
CTH-661 */
+
+ { WACOM_VENDOR_ID, 0x20, RES_100000, RES_100000, &usbIntuos }, /*
Intuos 4x5 */
+ { WACOM_VENDOR_ID, 0x21, RES_100000, RES_100000, &usbIntuos }, /*
Intuos 6x8 */
+ { WACOM_VENDOR_ID, 0x22, RES_100000, RES_100000, &usbIntuos }, /*
Intuos 9x12 */
+ { WACOM_VENDOR_ID, 0x23, RES_100000, RES_100000, &usbIntuos }, /*
Intuos 12x12 */
+ { WACOM_VENDOR_ID, 0x24, RES_100000, RES_100000, &usbIntuos }, /*
Intuos 12x18 */
+
+ { WACOM_VENDOR_ID, 0x03, RES_20000, RES_20000, &usbCintiqPartner },
/* PTU600 */
+
+ { WACOM_VENDOR_ID, 0x30, RES_20000, RES_20000, &usbCintiq }, /*
PL400 */
+ { WACOM_VENDOR_ID, 0x31, RES_20000, RES_20000, &usbCintiq }, /*
PL500 */
+ { WACOM_VENDOR_ID, 0x32, RES_20000, RES_20000, &usbCintiq }, /*
PL600 */
+ { WACOM_VENDOR_ID, 0x33, RES_20000, RES_20000, &usbCintiq }, /*
PL600SX */
+ { WACOM_VENDOR_ID, 0x34, RES_20000, RES_20000, &usbCintiq }, /*
PL550 */
+ { WACOM_VENDOR_ID, 0x35, RES_20000, RES_20000, &usbCintiq }, /*
PL800 */
+ { WACOM_VENDOR_ID, 0x37, RES_20000, RES_20000, &usbCintiq }, /*
PL700 */
+ { WACOM_VENDOR_ID, 0x38, RES_20000, RES_20000, &usbCintiq }, /*
PL510 */
+ { WACOM_VENDOR_ID, 0x39, RES_20000, RES_20000, &usbCintiq }, /*
PL710 */
+ { WACOM_VENDOR_ID, 0xC0, RES_20000, RES_20000, &usbCintiq }, /*
DTF720 */
+ { WACOM_VENDOR_ID, 0xC2, RES_20000, RES_20000, &usbCintiq }, /*
DTF720a */
+ { WACOM_VENDOR_ID, 0xC4, RES_20000, RES_20000, &usbCintiq }, /*
DTF521 */
+ { WACOM_VENDOR_ID, 0xC7, RES_100000, RES_100000, &usbCintiq }, /*
DTU1931 */
+ { WACOM_VENDOR_ID, 0xCE, RES_100000, RES_100000, &usbCintiq }, /*
DTU2231 */
+ { WACOM_VENDOR_ID, 0xF0, RES_100000, RES_100000, &usbCintiq }, /*
DTU1631 */
+
+ { WACOM_VENDOR_ID, 0x41, RES_100000, RES_100000, &usbIntuos2 }, /*
Intuos2 4x5 */
+ { WACOM_VENDOR_ID, 0x42, RES_100000, RES_100000, &usbIntuos2 }, /*
Intuos2 6x8 */
+ { WACOM_VENDOR_ID, 0x43, RES_100000, RES_100000, &usbIntuos2 }, /*
Intuos2 9x12 */
+ { WACOM_VENDOR_ID, 0x44, RES_100000, RES_100000, &usbIntuos2 }, /*
Intuos2 12x12 */
+ { WACOM_VENDOR_ID, 0x45, RES_100000, RES_100000, &usbIntuos2 }, /*
Intuos2 12x18 */
+ { WACOM_VENDOR_ID, 0x47, RES_100000, RES_100000, &usbIntuos2 }, /*
Intuos2 6x8 */
+
+ { WACOM_VENDOR_ID, 0x60, RES_50000, RES_50000, &usbVolito }, /*
Volito */
+
+ { WACOM_VENDOR_ID, 0x61, RES_50000, RES_50000, &usbVolito2 }, /*
PenStation */
+ { WACOM_VENDOR_ID, 0x62, RES_50000, RES_50000, &usbVolito2 }, /*
Volito2 4x5 */
+ { WACOM_VENDOR_ID, 0x63, RES_50000, RES_50000, &usbVolito2 }, /*
Volito2 2x3 */
+ { WACOM_VENDOR_ID, 0x64, RES_50000, RES_50000, &usbVolito2 }, /*
PenPartner2 */
+
+ { WACOM_VENDOR_ID, 0x65, RES_100000, RES_100000, &usbBamboo }, /*
Bamboo */
+ { WACOM_VENDOR_ID, 0x69, RES_39842, RES_39842, &usbBamboo1 }, /*
Bamboo1 */
+
+ { WACOM_VENDOR_ID, 0xB0, RES_200000, RES_200000, &usbIntuos3 }, /*
Intuos3 4x5 */
+ { WACOM_VENDOR_ID, 0xB1, RES_200000, RES_200000, &usbIntuos3 }, /*
Intuos3 6x8 */
+ { WACOM_VENDOR_ID, 0xB2, RES_200000, RES_200000, &usbIntuos3 }, /*
Intuos3 9x12 */
+ { WACOM_VENDOR_ID, 0xB3, RES_200000, RES_200000, &usbIntuos3 }, /*
Intuos3 12x12 */
+ { WACOM_VENDOR_ID, 0xB4, RES_200000, RES_200000, &usbIntuos3 }, /*
Intuos3 12x19 */
+ { WACOM_VENDOR_ID, 0xB5, RES_200000, RES_200000, &usbIntuos3 }, /*
Intuos3 6x11 */
+ { WACOM_VENDOR_ID, 0xB7, RES_200000, RES_200000, &usbIntuos3 }, /*
Intuos3 4x6 */
+
+ { WACOM_VENDOR_ID, 0xB8, RES_200000, RES_200000, &usbIntuos4 }, /*
Intuos4 4x6 */
+ { WACOM_VENDOR_ID, 0xB9, RES_200000, RES_200000, &usbIntuos4 }, /*
Intuos4 6x9 */
+ { WACOM_VENDOR_ID, 0xBA, RES_200000, RES_200000, &usbIntuos4 }, /*
Intuos4 8x13 */
+ { WACOM_VENDOR_ID, 0xBB, RES_200000, RES_200000, &usbIntuos4 }, /*
Intuos4 12x19*/
+ { WACOM_VENDOR_ID, 0xBC, RES_200000, RES_200000, &usbIntuos4 }, /*
Intuos4 WL USB Endpoint */
+ { WACOM_VENDOR_ID, 0xBD, RES_200000, RES_200000, &usbIntuos4 }, /*
Intuos4 WL Bluetooth Endpoint */
+
+ { WACOM_VENDOR_ID, 0x3F, RES_200000, RES_200000, &usbCintiqV5 }, /*
Cintiq 21UX */
+ { WACOM_VENDOR_ID, 0xC5, RES_200000, RES_200000, &usbCintiqV5 }, /*
Cintiq 20WSX */
+ { WACOM_VENDOR_ID, 0xC6, RES_200000, RES_200000, &usbCintiqV5 }, /*
Cintiq 12WX */
+ { WACOM_VENDOR_ID, 0xCC, RES_200000, RES_200000, &usbCintiqV5 }, /*
Cintiq 21UX2 */
+
+ { WACOM_VENDOR_ID, 0x90, RES_100000, RES_100000, &usbTabletPC }, /*
TabletPC 0x90 */
+ { WACOM_VENDOR_ID, 0x93, RES_100000, RES_100000, &usbTabletPC }, /*
TabletPC 0x93 */
+ { WACOM_VENDOR_ID, 0x9A, RES_100000, RES_100000, &usbTabletPC }, /*
TabletPC 0x9A */
+ { WACOM_VENDOR_ID, 0x9F, RES_10000, RES_10000, &usbTabletPC }, /*
CapPlus 0x9F */
+ { WACOM_VENDOR_ID, 0xE2, RES_10000, RES_10000, &usbTabletPC }, /*
TabletPC 0xE2 */
+ { WACOM_VENDOR_ID, 0xE3, RES_100000, RES_100000, &usbTabletPC }, /*
TabletPC 0xE3 */
/* IDs from Waltop's driver, available
http://www.waltop.com.tw/download.asp?lv=0&id=2.
Accessed 8 Apr 2010, driver release date 2009/08/11, fork of
linuxwacom 0.8.4.
Some more info would be nice for the ID's below... */
- { WALTOP_VENDOR_ID, 0x24, 80000, 80000, &usbGraphire },
- { WALTOP_VENDOR_ID, 0x25, 80000, 80000, &usbGraphire2 },
- { WALTOP_VENDOR_ID, 0x26, 80000, 80000, &usbGraphire2 },
- { WALTOP_VENDOR_ID, 0x27, 80000, 80000, &usbGraphire3 },
- { WALTOP_VENDOR_ID, 0x28, 80000, 80000, &usbGraphire3 },
- { WALTOP_VENDOR_ID, 0x30, 80000, 80000, &usbGraphire4 },
- { WALTOP_VENDOR_ID, 0x31, 80000, 80000, &usbGraphire4 },
- { WALTOP_VENDOR_ID, 0x32, 100000, 100000, &usbBambooFun },
- { WALTOP_VENDOR_ID, 0x33, 100000, 100000, &usbBambooFun },
- { WALTOP_VENDOR_ID, 0x34, 80000, 80000, &usbBamboo1 },
- { WALTOP_VENDOR_ID, 0x35, 80000, 80000, &usbGraphire4 },
- { WALTOP_VENDOR_ID, 0x36, 80000, 80000, &usbGraphire4 },
- { WALTOP_VENDOR_ID, 0x37, 80000, 80000, &usbGraphire4 },
- { WALTOP_VENDOR_ID, 0x38, 100000, 100000, &usbBambooFun },
- { WALTOP_VENDOR_ID, 0x39, 100000, 100000, &usbBambooFun },
- { WALTOP_VENDOR_ID, 0x51, 100000, 100000, &usbBamboo },
- { WALTOP_VENDOR_ID, 0x52, 100000, 100000, &usbBamboo },
-
- { WALTOP_VENDOR_ID, 0x53, 100000, 100000, &usbBamboo },
- { WALTOP_VENDOR_ID, 0x54, 100000, 100000, &usbBamboo },
- { WALTOP_VENDOR_ID, 0x55, 100000, 100000, &usbBamboo },
- { WALTOP_VENDOR_ID, 0x56, 100000, 100000, &usbBamboo },
- { WALTOP_VENDOR_ID, 0x57, 100000, 100000, &usbBamboo },
- { WALTOP_VENDOR_ID, 0x58, 100000, 100000, &usbBamboo },
- { WALTOP_VENDOR_ID, 0x500, 100000, 100000, &usbBamboo },
- { WALTOP_VENDOR_ID, 0x501, 100000, 100000, &usbBamboo },
- { WALTOP_VENDOR_ID, 0x502, 200000, 200000, &usbIntuos4 },
- { WALTOP_VENDOR_ID, 0x503, 200000, 200000, &usbIntuos4 },
+ { WALTOP_VENDOR_ID, 0x24, RES_80000, RES_80000, &usbGraphire },
+ { WALTOP_VENDOR_ID, 0x25, RES_80000, RES_80000, &usbGraphire2 },
+ { WALTOP_VENDOR_ID, 0x26, RES_80000, RES_80000, &usbGraphire2 },
+ { WALTOP_VENDOR_ID, 0x27, RES_80000, RES_80000, &usbGraphire3 },
+ { WALTOP_VENDOR_ID, 0x28, RES_80000, RES_80000, &usbGraphire3 },
+ { WALTOP_VENDOR_ID, 0x30, RES_80000, RES_80000, &usbGraphire4 },
+ { WALTOP_VENDOR_ID, 0x31, RES_80000, RES_80000, &usbGraphire4 },
+ { WALTOP_VENDOR_ID, 0x32, RES_100000, RES_100000, &usbBambooFun },
+ { WALTOP_VENDOR_ID, 0x33, RES_100000, RES_100000, &usbBambooFun },
+ { WALTOP_VENDOR_ID, 0x34, RES_80000, RES_80000, &usbBamboo1 },
+ { WALTOP_VENDOR_ID, 0x35, RES_80000, RES_80000, &usbGraphire4 },
+ { WALTOP_VENDOR_ID, 0x36, RES_80000, RES_80000, &usbGraphire4 },
+ { WALTOP_VENDOR_ID, 0x37, RES_80000, RES_80000, &usbGraphire4 },
+ { WALTOP_VENDOR_ID, 0x38, RES_100000, RES_100000, &usbBambooFun },
+ { WALTOP_VENDOR_ID, 0x39, RES_100000, RES_100000, &usbBambooFun },
+ { WALTOP_VENDOR_ID, 0x51, RES_100000, RES_100000, &usbBamboo },
+ { WALTOP_VENDOR_ID, 0x52, RES_100000, RES_100000, &usbBamboo },
+
+ { WALTOP_VENDOR_ID, 0x53, RES_100000, RES_100000, &usbBamboo },
+ { WALTOP_VENDOR_ID, 0x54, RES_100000, RES_100000, &usbBamboo },
+ { WALTOP_VENDOR_ID, 0x55, RES_100000, RES_100000, &usbBamboo },
+ { WALTOP_VENDOR_ID, 0x56, RES_100000, RES_100000, &usbBamboo },
+ { WALTOP_VENDOR_ID, 0x57, RES_100000, RES_100000, &usbBamboo },
+ { WALTOP_VENDOR_ID, 0x58, RES_100000, RES_100000, &usbBamboo },
+ { WALTOP_VENDOR_ID, 0x500, RES_100000, RES_100000, &usbBamboo },
+ { WALTOP_VENDOR_ID, 0x501, RES_100000, RES_100000, &usbBamboo },
+ { WALTOP_VENDOR_ID, 0x502, RES_200000, RES_200000, &usbIntuos4 },
+ { WALTOP_VENDOR_ID, 0x503, RES_200000, RES_200000, &usbIntuos4 },
/* N-Trig devices */
- { NTRIG_VENDOR_ID, 0x01, 44173, 36772, &usbTabletPC },
+ { NTRIG_VENDOR_ID, 0x01, RES_44173, RES_36772, &usbTabletPC },
/* Add in Lenovo W700 Palmrest digitizer */
- { LENOVO_VENDOR_ID, 0x6004, 2540, 2540, &usbTabletPC } /* Pen-only */
+ { LENOVO_VENDOR_ID, 0x6004, RES_100000, RES_100000, &usbTabletPC } /*
Pen-only */
};
static Bool usbWcmInit(InputInfoPtr pInfo, char* id, float *version)
diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h
index 91adf72..7aa049d 100644
--- a/src/xf86WacomDefs.h
+++ b/src/xf86WacomDefs.h
@@ -45,6 +45,18 @@
#define MIN_PAD_RING 0 /* I4 absolute scroll ring min value */
#define MAX_PAD_RING 71 /* I4 absolute scroll ring max value */
+/* Supported default resolutions in points/m */
+#define RES_100000 100000
+#define RES_200000 200000
+#define RES_80000 80000
+#define RES_50000 50000
+#define RES_44173 44173
+#define RES_39842 39842
+#define RES_39370 39370
+#define RES_36772 36772
+#define RES_20000 20000
+#define RES_10000 10000
+
/* Default max distance to the tablet at which a proximity-out event is
generated for
* cursor device (e.g. mouse).
*/
--
1.7.3.5
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
