Signed-off-by: Ping Cheng <pi...@wacom.com>
---
udev/60-wacom.rules | 3 +++
udev/wdaemon_is_uinput.sh | 3 +++
wacom.c | 12 ++++++++++++
3 files changed, 18 insertions(+)
diff --git a/udev/60-wacom.rules b/udev/60-wacom.rules
index 7f536e3..0e62b35 100644
--- a/udev/60-wacom.rules
+++ b/udev/60-wacom.rules
@@ -76,6 +76,9 @@ ENV{ID_MODEL_ID}=="0027",
SYMLINK+="input/wacom-tablets/intuos5-t-m input/wacom-
ENV{ID_MODEL_ID}=="0028", SYMLINK+="input/wacom-tablets/intuos5-t-l
input/wacom-tablets/intuos5-t-l-%b"
ENV{ID_MODEL_ID}=="0029", SYMLINK+="input/wacom-tablets/intuos5-s
input/wacom-tablets/intuos5-s-%b"
ENV{ID_MODEL_ID}=="002a", SYMLINK+="input/wacom-tablets/intuos5-m
input/wacom-tablets/intuos5-m-%b"
+ENV{ID_MODEL_ID}=="0314", SYMLINK+="input/wacom-tablets/intuospro-s
input/wacom-tablets/intuospro-s-%b"
+ENV{ID_MODEL_ID}=="0315", SYMLINK+="input/wacom-tablets/intuospro-m
input/wacom-tablets/intuospro-m-%b"
+ENV{ID_MODEL_ID}=="0317", SYMLINK+="input/wacom-tablets/intuospro-l
input/wacom-tablets/intuospro-l-%b"
ENV{ID_MODEL_ID}=="00cc", SYMLINK+="input/wacom-tablets/cintiq-21ux2
input/wacom-tablets/cintiq-21ux2-%b"
LABEL="wacom_end"
diff --git a/udev/wdaemon_is_uinput.sh b/udev/wdaemon_is_uinput.sh
index d93f661..3c56c85 100755
--- a/udev/wdaemon_is_uinput.sh
+++ b/udev/wdaemon_is_uinput.sh
@@ -88,6 +88,9 @@ case "$vendor-$product" in
"056a-0028") echo "intuos5-t-l"; ;;
"056a-0029") echo "intuos5-s"; ;;
"056a-002a") echo "intuos5-m"; ;;
+ "056a-0314") echo "intuospro-s"; ;;
+ "056a-0315") echo "intuospro-m"; ;;
+ "056a-0317") echo "intuospro-l"; ;;
"056a-00CC") echo "cintiq-21ux2"; ;;
"056a-00F0") echo "dtu1631"; ;;
"056a-00CE") echo "dtu2231"; ;;
diff --git a/wacom.c b/wacom.c
index 3f5a725..99f0b3d 100644
--- a/wacom.c
+++ b/wacom.c
@@ -99,6 +99,9 @@ enum {
INTUOS5M,
INTUOS5L,
INTUOS5_FG,
+ INTUOSPS,
+ INTUOSPM,
+ INTUOSPL,
MAX_TYPE
};
@@ -181,6 +184,9 @@ static struct wacom_features {
{ "Wacom Intuos5 touch L Finger", 4096, 4096, 0, 0, INTUOS5_FG,
0x28},
{ "Wacom Intuos5 S Pen", 31496, 19685, 2047, 63, INTUOS5S,
0x29},
{ "Wacom Intuos5 M Pen", 44704, 27940, 2047, 63, INTUOS5M,
0x2A},
+ { "Wacom Intuos Pro S Pen", 31496, 19685, 2047, 63, INTUOSPS,
0x314},
+ { "Wacom Intuos Pro M Pen", 44704, 27940, 2047, 63, INTUOSPM,
0x315},
+ { "Wacom Intuos Pro L Pen", 65024, 40640, 2047, 63, INTUOSPL,
0x317},
};
#define WACOM_N_TABLETS (sizeof(wacom_features)/sizeof(wacom_features[0]))
int wacom_check_type(int x)
@@ -349,9 +355,12 @@ static int wacom_set_events(struct uinput_info *info,
struct uinput_user_dev *de
case INTUOS4L:
case INTUOS5M:
case INTUOS5L:
+ case INTUOSPM:
+ case INTUOSPL:
set_event(info, UI_SET_KEYBIT, BTN_7);
set_event(info, UI_SET_KEYBIT, BTN_8);
case INTUOS5S:
+ case INTUOSPS:
set_event(info, UI_SET_ABSBIT, ABS_Z);
/* fall through */
case INTUOS4S:
@@ -418,6 +427,9 @@ static int wacom_set_initial_values(struct uinput_info
*info,
case INTUOS5S:
case INTUOS5M:
case INTUOS5L:
+ case INTUOSPS:
+ case INTUOSPM:
+ case INTUOSPL:
dev->absmin[ABS_Z] = -900;
dev->absmax[ABS_Z] = 899;
/* fall through */
--
1.9.1
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
