Signed-off-by: Ping Cheng <[email protected]>
From f10d6fbb7865c98976ce85009bc98467c1053c64 Mon Sep 17 00:00:00 2001
From: Ping Cheng <[email protected]>
Date: Mon, 29 Mar 2010 11:05:14 -0700
Subject: [PATCH] Support Fujitsu serial Tablet PC
Signed-off-by: Ping Cheng <[email protected]>
---
src/wcmISDV4.c | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/wcmISDV4.c b/src/wcmISDV4.c
index e6a24d0..e9d705f 100644
--- a/src/wcmISDV4.c
+++ b/src/wcmISDV4.c
@@ -703,7 +703,8 @@ int isdv4ProbeKeys(LocalDevicePtr local)
return 0;
/* check device name for ID first */
- if (sscanf(local->name, "WACf%x", &id) <= 1)
+ if ((sscanf(local->name, "WACf%x", &id) <= 1) &&
+ (sscanf(local->name, "FUJ0%x", &id) <= 1))
{
/* id in file sys/class/tty/%str/device/id */
FILE *file;
@@ -717,7 +718,8 @@ int isdv4ProbeKeys(LocalDevicePtr local)
if (file)
{
/* make sure we fall to default */
- if (fscanf(file, "WACf%x\n", &id) <= 0)
+ if ((fscanf(file, "WACf%x\n", &id) <= 0) &&
+ (fscanf(file, "FUJ0%x\n", &id) <= 0))
id = 0;
fclose(file);
@@ -731,9 +733,9 @@ int isdv4ProbeKeys(LocalDevicePtr local)
common->wcmKeys[LONG(BTN_TOOL_RUBBER)] |= BIT(BTN_TOOL_RUBBER);
/* id < 0x008 are only penabled */
- if (id > 0x007)
+ if ((id > 0x007) || (id == 0x2e9))
common->wcmKeys[LONG(BTN_TOOL_DOUBLETAP)] |= BIT(BTN_TOOL_DOUBLETAP);
- if (id > 0x0a)
+ if ((id > 0x0a) || (id == 0x2e7))
common->wcmKeys[LONG(BTN_TOOL_TRIPLETAP)] |= BIT(BTN_TOOL_TRIPLETAP);
/* no pen 2FGT */
@@ -748,11 +750,11 @@ int isdv4ProbeKeys(LocalDevicePtr local)
* at later stage and true knowledge of capacitive
* support will be delayed until that point.
*/
- if (id >= 0x0 && id <= 0x7)
+ if ((id >= 0x0 && id <= 0x7) || (id == 0x2e5))
tablet_id = 0x90;
- else if (id >= 0x8 && id <= 0xa)
+ else if ((id >= 0x8 && id <= 0xa) || (id == 0x2e9))
tablet_id = 0x93;
- else if (id >= 0xb && id <= 0xe)
+ else if ((id >= 0xb && id <= 0xe) || (id == 0x2e7))
tablet_id = 0xe3;
else if (id == 0x10)
tablet_id = 0xe2;
--
1.6.6.1
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
