rpms/xorg-x11-drv-wacom
7
0
Fork 0
Code Issues Pull Requests Releases Activity

wacom 0.23.99.1

Browse Source
This commit is contained in:
Peter Hutterer 2014-03-21 10:17:08 +10:00
parent cf9d345313
commit 218c931df5
20 changed files with 12 additions and 1975 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -29,3 +29,4 @@ xf86-input-wacom-20101119.tar.bz2
/xf86-input-wacom-0.21.99.1.tar.bz2
/xf86-input-wacom-0.22.0.tar.bz2
/xf86-input-wacom-0.23.0.tar.bz2
/xf86-input-wacom-0.23.99.1.tar.bz2

47
0001-conf-add-N-Trig-DuoSense-to-our-matched-devices.patch
View File

@ -1,47 +0,0 @@
From a0df8d1cddccde9368b075d19347632934bfdafc Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 20 Jan 2014 11:07:37 +1000
Subject: [PATCH] conf: add N-Trig DuoSense to our matched devices
That device has a pen and an eraser tool, as well as a touch device. Handle it
with the wacom driver by default, the evdev driver isn't quite up to scratch
here.
This also fixes a missing match in the .fdi file for the base N-Trig devices -
just in case.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
conf/50-wacom.conf | 2 +-
conf/wacom.fdi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/conf/50-wacom.conf b/conf/50-wacom.conf
index 567b900..21f75e6 100644
--- a/conf/50-wacom.conf
+++ b/conf/50-wacom.conf
@@ -29,7 +29,7 @@ EndSection
# N-Trig Duosense Electromagnetic Digitizer
Section "InputClass"
Identifier "Wacom N-Trig class"
- MatchProduct "HID 1b96:0001|N-Trig Pen"
+ MatchProduct "HID 1b96:0001|N-Trig Pen|N-trig DuoSense"
MatchDevicePath "/dev/input/event*"
Driver "wacom"
Option "Button2" "3"
diff --git a/conf/wacom.fdi b/conf/wacom.fdi
index 70304d2..dd623a4 100644
--- a/conf/wacom.fdi
+++ b/conf/wacom.fdi
@@ -15,7 +15,7 @@
</match>
</match>
<!-- N-Trig Duosense Electromagnetic Digitizer -->
- <match key="info.product" contains="HID 1b96:0001">
+ <match key="info.product" contains_outof="HID 1b96:0001;N-Trig Pen;N-trig DuoSense">
<match key="info.parent" contains="if0">
<merge key="input.x11_driver" type="string">wacom</merge>
</match>
--
1.8.4.2

34
0001-configure-both-clients-and-drivers-need-the-protocol.patch
View File

@ -1,34 +0,0 @@
From 5073552b9e20f06ccdd9620977874016fc414bdf Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 17 Mar 2014 08:52:33 +1000
Subject: [PATCH 01/14] configure: both clients and drivers need the protocol
headers
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
configure.ac | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4ba103c..be211f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,11 +49,13 @@ XORG_WITH_DOXYGEN(1.6.1)
# Checks for libraries.
AC_CHECK_LIB([m], [rint])
+XPROTOS="xproto xext kbproto inputproto randrproto"
+
# Obtain compiler/linker options from server and required extensions
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.7.0] xproto xext kbproto inputproto randrproto)
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.7.0] $XPROTOS)
# Obtain compiler/linker options for the xsetwacom tool
-PKG_CHECK_MODULES(X11, x11 xi xrandr xinerama)
+PKG_CHECK_MODULES(X11, x11 xi xrandr xinerama $XPROTOS)
# Obtain compiler/linker options for libudev used by ISDV4 code
PKG_CHECK_MODULES(UDEV, libudev)
--
1.8.5.3

28
0002-Include-stdint-from-isdv4.h.patch
View File

@ -1,28 +0,0 @@
From c5e721559b3d27b454837220ae232081cf2e0b1a Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 18 Mar 2014 09:45:04 +1000
Subject: [PATCH 02/14] Include stdint from isdv4.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
include/isdv4.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/include/isdv4.h b/include/isdv4.h
index 539f609..423d564 100644
--- a/include/isdv4.h
+++ b/include/isdv4.h
@@ -20,6 +20,10 @@
#ifndef ISDV4_H
#define ISDV4_H
+#include <stdint.h>
+#include <stddef.h>
+#include <string.h>
+
#define ISDV4_QUERY "*" /* ISDV4 query command */
#define ISDV4_RESET "&" /* ISDV4 touch panel reset command */
#define ISDV4_TOUCH_QUERY "%" /* ISDV4 touch query command */
--
1.8.5.3

63
0003-isdv4-inline-all-isdv4-parsing-functions.patch
View File

@ -1,63 +0,0 @@
From c64b9218b75b9ebdf1ad94bcf9a8ecc3946c01a2 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 18 Mar 2014 10:20:53 +1000
Subject: [PATCH 03/14] isdv4: inline all isdv4 parsing functions
Stops compiler warning if any of them aren't used.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
include/isdv4.h | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/isdv4.h b/include/isdv4.h
index 423d564..a7d0d4e 100644
--- a/include/isdv4.h
+++ b/include/isdv4.h
@@ -103,8 +103,8 @@ typedef struct {
uint8_t tilt_y;
} ISDV4CoordinateData;
-static int isdv4ParseQuery(const unsigned char *buffer, const size_t len,
- ISDV4QueryReply *reply)
+static inline int isdv4ParseQuery(const unsigned char *buffer, const size_t len,
+ ISDV4QueryReply *reply)
{
int header, control;
@@ -130,8 +130,8 @@ static int isdv4ParseQuery(const unsigned char *buffer, const size_t len,
return ISDV4_PKGLEN_TPCCTL;
}
-static int isdv4ParseTouchQuery(const unsigned char *buffer, const size_t len,
- ISDV4TouchQueryReply *reply)
+static inline int isdv4ParseTouchQuery(const unsigned char *buffer, const size_t len,
+ ISDV4TouchQueryReply *reply)
{
int header, control;
@@ -157,8 +157,8 @@ static int isdv4ParseTouchQuery(const unsigned char *buffer, const size_t len,
}
/* pktlen defines what touch type we parse */
-static int isdv4ParseTouchData(const unsigned char *buffer, const size_t buff_len,
- const size_t pktlen, ISDV4TouchData *touchdata)
+static inline int isdv4ParseTouchData(const unsigned char *buffer, const size_t buff_len,
+ const size_t pktlen, ISDV4TouchData *touchdata)
{
int header, touch;
@@ -191,8 +191,8 @@ static int isdv4ParseTouchData(const unsigned char *buffer, const size_t buff_le
return pktlen;
}
-static int isdv4ParseCoordinateData(const unsigned char *buffer, const size_t len,
- ISDV4CoordinateData *coord)
+static inline int isdv4ParseCoordinateData(const unsigned char *buffer, const size_t len,
+ ISDV4CoordinateData *coord)
{
int header, control;
--
1.8.5.3

121
0004-tools-rearrange-serial-settings.patch
View File

@ -1,121 +0,0 @@
From 7f188409d95bc98498d9770974b156c348da40d2 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 17 Mar 2014 09:46:21 +1000
Subject: [PATCH 04/14] tools: rearrange serial settings
If the device was't properly closed/reset after a crash, tcgetattr() will
fail. Ignore that error and apply the settings we want nonetheless, in most
cases the device will just come back normally.
And to do so, merge setting the baud rate together with the rest so we only
have one call. Otherwise we can't apply the baud rate settings without
potentially submitting garbage to the driver.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
tools/isdv4-serial-debugger.c | 49 +++++++++++++++----------------------------
1 file changed, 17 insertions(+), 32 deletions(-)
diff --git a/tools/isdv4-serial-debugger.c b/tools/isdv4-serial-debugger.c
index 8a64f43..47c6896 100644
--- a/tools/isdv4-serial-debugger.c
+++ b/tools/isdv4-serial-debugger.c
@@ -68,17 +68,16 @@ static void version(void)
PACKAGE_VERSION_PATCHLEVEL);
}
-static int open_device(char *path)
+int open_device(const char *path)
{
- int fd, rc;
+ int fd;
struct serial_struct ser;
- struct termios t;
TRACE("Opening device '%s'.\n", path);
fd = open(path, O_RDWR);
if (fd < 1)
- perror("Failed to open device file.");
+ perror("Failed to open device file");
if (ioctl(fd, TIOCGSERIAL, &ser) == -1)
{
@@ -88,14 +87,16 @@ static int open_device(char *path)
goto out;
}
- rc = tcgetattr(fd, &t);
- if (rc == -1)
- {
- perror("Failed to get serial attributes.");
- close(fd);
- fd = -1;
- goto out;
- }
+out:
+ return fd;
+}
+
+int set_serial_attr(int fd, unsigned int baud)
+{
+ struct termios t;
+
+ if (tcgetattr(fd, &t) == -1)
+ memset(&t, 0, sizeof(t));
/* defaults from xf86OpenSerial */
t.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
@@ -110,21 +111,9 @@ static int open_device(char *path)
t.c_cflag &= ~(CSIZE); /* databits 8 */
t.c_cflag |= (CS8); /* databits 8 */
t.c_cflag &= ~(PARENB); /* parity none */
- t.c_cc[VMIN] = 1; /* vmin 1 */
+ t.c_cc[VMIN] = 1; /* vmin 1 */
t.c_cc[VTIME] = 10; /* vtime 10 */
- t.c_iflag |= IXOFF; /* flow controll xoff */
-
-
- tcsetattr(fd, TCSANOW, &t);
-
-out:
- return fd;
-}
-
-static int set_baud_rate(int fd, int baud)
-{
- struct termios t;
- int rc;
+ t.c_iflag |= IXOFF; /* flow controll xoff */
TRACE("Baud rate is %d\n", baud);
@@ -137,15 +126,11 @@ static int set_baud_rate(int fd, int baud)
return -1;
}
- rc = tcgetattr(fd, &t);
-
- if (rc)
- return rc;
-
cfsetispeed(&t, baud);
cfsetospeed(&t, baud);
return tcsetattr(fd, TCSANOW, &t);
+
}
static int write_to_tablet(int fd, char *command)
@@ -567,7 +552,7 @@ int main (int argc, char **argv)
if (fd < 0)
return 1;
- rc = set_baud_rate(fd, baudrate);
+ rc = set_serial_attr(fd, baudrate);
if (rc < 0)
return 1;
--
1.8.5.3

29
0005-tools-open-serial-devices-with-O_NOCTTY.patch
View File

@ -1,29 +0,0 @@
From 394466f19aeaa9bc8c86c110585622c766dc2d8e Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 17 Mar 2014 08:00:45 +1000
Subject: [PATCH 05/14] tools: open serial devices with O_NOCTTY
Probably doesn't make much difference, but won't hurt if we ever send the
wrong path name.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
tools/isdv4-serial-debugger.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/isdv4-serial-debugger.c b/tools/isdv4-serial-debugger.c
index 47c6896..72b9b4f 100644
--- a/tools/isdv4-serial-debugger.c
+++ b/tools/isdv4-serial-debugger.c
@@ -74,7 +74,7 @@ int open_device(const char *path)
struct serial_struct ser;
TRACE("Opening device '%s'.\n", path);
- fd = open(path, O_RDWR);
+ fd = open(path, O_RDWR | O_NOCTTY);
if (fd < 1)
perror("Failed to open device file");
--
1.8.5.3

26
0006-tools-use-perror-instead-of-fprintf.patch
View File

@ -1,26 +0,0 @@
From 787f280726afb56afab872a53a414cf0e32328dd Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 17 Mar 2014 08:58:46 +1000
Subject: [PATCH 06/14] tools: use perror instead of fprintf
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
tools/isdv4-serial-debugger.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/isdv4-serial-debugger.c b/tools/isdv4-serial-debugger.c
index 72b9b4f..778b500 100644
--- a/tools/isdv4-serial-debugger.c
+++ b/tools/isdv4-serial-debugger.c
@@ -81,7 +81,7 @@ int open_device(const char *path)
if (ioctl(fd, TIOCGSERIAL, &ser) == -1)
{
- fprintf(stderr, "Not a serial device?");
+ perror("Not a serial device?");
close(fd);
fd = -1;
goto out;
--
1.8.5.3

27
0007-tools-drop-double-call-to-tcsetattr.patch
View File

@ -1,27 +0,0 @@
From 9368d95b18ba8f3c13ac4c42eb4ea1d98b107231 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 17 Mar 2014 09:38:45 +1000
Subject: [PATCH 07/14] tools: drop double-call to tcsetattr
We merely modify the flags, might as well just send one call
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
tools/isdv4-serial-debugger.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/tools/isdv4-serial-debugger.c b/tools/isdv4-serial-debugger.c
index 778b500..e89623a 100644
--- a/tools/isdv4-serial-debugger.c
+++ b/tools/isdv4-serial-debugger.c
@@ -104,7 +104,6 @@ int set_serial_attr(int fd, unsigned int baud)
t.c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
t.c_cflag &= ~(CSIZE|PARENB);
t.c_cflag |= CS8|CLOCAL;
- tcsetattr(fd, TCSANOW, &t);
/* wacom-specific */
t.c_cflag &= ~(CSTOPB); /* stopbits 1 */
--
1.8.5.3

35
0008-tools-drop-global-packagelen.patch
View File

@ -1,35 +0,0 @@
From a1067ff6e67b9cb5f0ffeff1c08f9e37f755a543 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 18 Mar 2014 10:27:53 +1000
Subject: [PATCH 08/14] tools: drop global packagelen
Not necesssary, we can have this locally in the event loop
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
tools/isdv4-serial-debugger.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/isdv4-serial-debugger.c b/tools/isdv4-serial-debugger.c
index e89623a..1a036ce 100644
--- a/tools/isdv4-serial-debugger.c
+++ b/tools/isdv4-serial-debugger.c
@@ -45,7 +45,6 @@
do { if (verbose) printf("... " __VA_ARGS__); } while(0)
static int verbose = 0;
-static int packetlength = ISDV4_PKGLEN_TPCPEN;
static ISDV4QueryReply reply;
static ISDV4TouchQueryReply touch;
@@ -423,6 +422,7 @@ int event_loop(int fd)
{
unsigned char buffer[256];
int dlen = 0;
+ int packetlength = ISDV4_PKGLEN_TPCPEN;
TRACE("Waiting for events\n");
--
1.8.5.3

91
0009-tools-drop-leftover-global-variables.patch
View File

@ -1,91 +0,0 @@
From 43b57e502c34b57ee91a14b90a6b7e53023ae50f Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 18 Mar 2014 10:30:24 +1000
Subject: [PATCH 09/14] tools: drop leftover global variables
Only one left is verbosity now.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
tools/isdv4-serial-debugger.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/tools/isdv4-serial-debugger.c b/tools/isdv4-serial-debugger.c
index 1a036ce..7c9700c 100644
--- a/tools/isdv4-serial-debugger.c
+++ b/tools/isdv4-serial-debugger.c
@@ -45,9 +45,6 @@
do { if (verbose) printf("... " __VA_ARGS__); } while(0)
static int verbose = 0;
-static ISDV4QueryReply reply;
-static ISDV4TouchQueryReply touch;
-
static void usage(void)
{
@@ -284,6 +281,9 @@ redo:
static int query_tablet(int fd)
{
+ ISDV4QueryReply reply;
+ ISDV4TouchQueryReply touch;
+
unsigned char buffer[ISDV4_PKGLEN_TPCCTL];
int len, rc;
@@ -342,7 +342,7 @@ static int query_tablet(int fd)
printf("TOUCH sensor id: %d\n", touch.sensor_id);
}
- return 0;
+ return touch.sensor_id;
out:
fprintf(stderr, "error during query.\n");
@@ -418,7 +418,7 @@ static int parse_touch_packet(unsigned char* buffer, int packetlength)
}
-int event_loop(int fd)
+int event_loop(int fd, int sensor_id)
{
unsigned char buffer[256];
int dlen = 0;
@@ -450,7 +450,7 @@ int event_loop(int fd)
{
packetlength = ISDV4_PKGLEN_TPCPEN;
if (buffer[0] & TOUCH_CONTROL_BIT)
- packetlength = ISDV4PacketLengths[touch.sensor_id];
+ packetlength = ISDV4PacketLengths[sensor_id];
} else {
int bytes = skip_garbage(buffer, dlen);
if (bytes > 0) {
@@ -508,6 +508,7 @@ int main (int argc, char **argv)
int baudrate = 38400;
int reset = 0;
int rc;
+ int sensor_id;
int c, optidx = 0;
struct option options[] = {
@@ -561,13 +562,13 @@ int main (int argc, char **argv)
return 1;
}
- rc = query_tablet(fd);
- if (rc < 0)
+ sensor_id = query_tablet(fd);
+ if (sensor_id < 0)
return 1;
start_tablet(fd);
- return event_loop(fd);
+ return event_loop(fd, sensor_id);
}
/* vim: set noexpandtab tabstop=8 shiftwidth=8: */
--
1.8.5.3

26
0010-tools-make-event_loop-static.patch
View File

@ -1,26 +0,0 @@
From 0822af20a0d556bc134fac396e1070373cc81568 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 18 Mar 2014 10:31:15 +1000
Subject: [PATCH 10/14] tools: make event_loop() static
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
tools/isdv4-serial-debugger.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/isdv4-serial-debugger.c b/tools/isdv4-serial-debugger.c
index 7c9700c..65bed85 100644
--- a/tools/isdv4-serial-debugger.c
+++ b/tools/isdv4-serial-debugger.c
@@ -418,7 +418,7 @@ static int parse_touch_packet(unsigned char* buffer, int packetlength)
}
-int event_loop(int fd, int sensor_id)
+static int event_loop(int fd, int sensor_id)
{
unsigned char buffer[256];
int dlen = 0;
--
1.8.5.3

1043
0011-tools-split-out-the-debugger-into-the-actual-debugge.patch
View File

File diff suppressed because it is too large Load Diff

41
0012-tools-re-enable-wait-for-tablet.patch
View File

@ -1,41 +0,0 @@
From 76ec64178f6cc8d6d737408ee23f36f5a0ed6c43 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 18 Mar 2014 10:56:57 +1000
Subject: [PATCH 12/14] tools: re-enable wait-for-tablet
We need this to actually time out, otherwise we can't tell whether we have the
wrong baud rate set. That's fine for a debugger where a human will terminate,
but not for the upcoming inputattach clone.fine for a debugger where a human
will terminate, but not for the upcoming inputattach clone.fine for a debugger
where a human will terminate, but not for the upcoming inputattach clone.fine
for a debugger where a human will terminate, but not for the upcoming
inputattach clone.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
tools/tools-shared.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/tools/tools-shared.c b/tools/tools-shared.c
index 4d22cdf..2537211 100644
--- a/tools/tools-shared.c
+++ b/tools/tools-shared.c
@@ -164,7 +164,6 @@ int start_tablet(int fd)
int wait_for_tablet(int fd)
{
-#if 0
struct pollfd pfd = { fd, POLLIN, 0 };
int rc;
@@ -179,7 +178,6 @@ int wait_for_tablet(int fd)
} else if (pfd.revents & POLLIN)
TRACE("data available.\n");
-#endif
return 0;
}
--
1.8.5.3

36
0013-tools-add-colon-after-TOUCH-output.patch
View File

@ -1,36 +0,0 @@
From 4600725950913539cccb0732ecb8d67faa26bf31 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 18 Mar 2014 10:58:20 +1000
Subject: [PATCH 13/14] tools: add colon after TOUCH output
For consistency with the TABLET output.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
tools/tools-shared.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/tools-shared.c b/tools/tools-shared.c
index 2537211..10d7008 100644
--- a/tools/tools-shared.c
+++ b/tools/tools-shared.c
@@ -317,11 +317,11 @@ int query_tablet(int fd)
fprintf(stderr, "touch parsing error code %d\n", rc);
/* failure to parse touch query is not fatal */
} else {
- printf("TOUCH version: %d\n", touch.version);
- printf("TOUCH x max: %d y max %d\n", touch.x_max, touch.y_max);
- printf("TOUCH panel resolution: %d\n", touch.panel_resolution);
- printf("TOUCH capacity resolution: %d\n", touch.capacity_resolution);
- printf("TOUCH sensor id: %d\n", touch.sensor_id);
+ printf("TOUCH: version: %d\n", touch.version);
+ printf("TOUCH: x max: %d y max %d\n", touch.x_max, touch.y_max);
+ printf("TOUCH: panel resolution: %d\n", touch.panel_resolution);
+ printf("TOUCH: capacity resolution: %d\n", touch.capacity_resolution);
+ printf("TOUCH: sensor id: %d\n", touch.sensor_id);
}
return touch.sensor_id;
--
1.8.5.3

264
0014-tools-add-an-inputattach-like-tool.patch
View File

@ -1,264 +0,0 @@
From d54ad59f636ddfffba251d3756a41ebe1ce9224c Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 18 Mar 2014 10:49:22 +1000
Subject: [PATCH 14/14] tools: add an inputattach-like tool
Does more or less the same thing as inputattach, but tries to be a bit smarter
about the baud rate depending on the tablet model. And re-tries if the baud
rate is wrong.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
tools/Makefile.am | 5 +-
tools/isdv4-serial-inputattach.c | 216 +++++++++++++++++++++++++++++++++++++++
2 files changed, 220 insertions(+), 1 deletion(-)
create mode 100644 tools/isdv4-serial-inputattach.c
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 5eba0a6..a49380b 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -18,7 +18,7 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-bin_PROGRAMS = xsetwacom isdv4-serial-debugger
+bin_PROGRAMS = xsetwacom isdv4-serial-debugger isdv4-serial-inputattach
AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CFLAGS = $(XORG_CFLAGS) $(X11_CFLAGS)
@@ -27,6 +27,9 @@ AM_LDFLAGS = $(X11_LIBS)
shared_sources = tools-shared.h tools-shared.c
isdv4_serial_debugger_SOURCES = isdv4-serial-debugger.c $(shared_sources)
+isdv4_serial_inputattach_SOURCES = isdv4-serial-inputattach.c $(shared_sources)
+isdv4_serial_inputattach_CFLAGS = $(UDEV_CFLAGS)
+isdv4_serial_inputattach_LDADD = $(UDEV_LIBS)
if UNITTESTS
diff --git a/tools/isdv4-serial-inputattach.c b/tools/isdv4-serial-inputattach.c
new file mode 100644
index 0000000..7ce1b44
--- /dev/null
+++ b/tools/isdv4-serial-inputattach.c
@@ -0,0 +1,216 @@
+/*
+ * Copyright 2014 by Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* inputattach clone for ISDV4 serial devices */
+
+#ifdef HAVE_CONFIG_H
+#define WACOM_TOOLS
+#include "config.h"
+#endif
+
+#include <linux/serio.h>
+#include <libudev.h>
+
+#include <getopt.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <poll.h>
+#include <sys/ioctl.h>
+#include <signal.h>
+
+#include "tools-shared.h"
+
+int verbose;
+
+static void usage(void)
+{
+ printf(
+ "Usage: %s [options] device\n"
+ "Options: \n"
+ "-h, --help - usage\n"
+ "--verbose - verbose output\n"
+ "--version - version info\n"
+ "--baudrate <19200|38400> - set baudrate\n",
+ program_invocation_short_name
+ );
+}
+
+static int set_line_discipline(int fd, int ldisc)
+{
+ int rc;
+
+ rc = ioctl(fd, TIOCSETD, &ldisc);
+ if (rc < 0)
+ perror("can't set line discipline");
+
+ return rc;
+}
+
+static int bind_kernel_driver(int fd)
+{
+ unsigned long devt;
+ unsigned int id = 0, extra = 0;
+
+ devt = SERIO_W8001 | (id << 8) | (extra << 16);
+ if (ioctl(fd, SPIOCSTYPE, &devt)) {
+ perror("Failed to set device type");
+ return -1;
+ }
+
+ return 0;
+}
+
+int get_baud_rate(int fd)
+{
+ struct stat st;
+ int baudrate = 19200;
+ int id;
+ struct udev *udev;
+ struct udev_device *device, *parent;
+ const char *attr_id;
+
+ fstat(fd, &st);
+
+ udev = udev_new();
+ device = udev_device_new_from_devnum(udev, 'c', st.st_rdev);
+ parent = device;
+
+ while (parent) {
+ attr_id = udev_device_get_sysattr_value(parent, "id");
+ if (attr_id &&
+ (strncmp(attr_id, "WACf", 4) == 0 || strncmp(attr_id, "FUJ", 3) == 0))
+ break;
+
+ parent = udev_device_get_parent(parent);
+ }
+
+ /* Devices up to WACf007 are 19200, newer devices are 38400. FUJ
+ devices are all 19200 */
+ if (attr_id && sscanf(attr_id, "WACf%x", &id) == 1 && id >= 0x8)
+ baudrate = 38400;
+
+ if (device)
+ udev_device_unref(device);
+ udev_unref(udev);
+
+ return baudrate;
+}
+
+void sighandler(int signum)
+{
+ /* We don't need to do anything here, triggering the signal is
+ * enough to trigger EINTR in read() and then reset the line
+ * discipline in main */
+}
+
+int main(int argc, char **argv)
+{
+ int sensor_id;
+ char *filename;
+ int fd, rc = 1;
+ int baudrate = -1;
+
+ int c, optidx = 0;
+ struct option options[] = {
+ {"help", 0, NULL, 'h'},
+ {"verbose", 0, NULL, 'v'},
+ {"version", 0, NULL, 'V'},
+ {"baudrate", 1, NULL, 'b'},
+ {NULL, 0, NULL, 0}
+ };
+
+ while ((c = getopt_long(argc, argv, "h", options, &optidx)) != -1) {
+ switch(c) {
+ case 'v':
+ verbose = 1;
+ break;
+ case 'V':
+ version();
+ return 0;
+ case 'b':
+ baudrate = atoi(optarg);
+ if (baudrate == 0) {
+ usage();
+ return 1;
+ }
+ break;
+ case 'h':
+ default:
+ usage();
+ return 0;
+ }
+ }
+
+ if (optind == argc) {
+ usage();
+ return 1;
+ }
+
+ filename = argv[optind];
+
+ fd = open_device(filename);
+ if (fd < 0)
+ goto out;
+
+ /* only guess if we didn't get a baud rate */
+ if (baudrate == -1 && (baudrate = get_baud_rate(fd)) < 0)
+ goto out;
+
+ set_serial_attr(fd, baudrate);
+
+ sensor_id = query_tablet(fd);
+ if (sensor_id < 0) {
+ /* query failed, maybe the wrong baud rate? */
+ baudrate = (baudrate == 19200) ? 38400 : 19200;
+
+ printf("Initial tablet query failed. Trying with baud rate %d.\n", baudrate);
+
+ set_serial_attr(fd, baudrate);
+ sensor_id = query_tablet(fd);
+ }
+
+ if (sensor_id < 0) {
+ fprintf(stderr, "Tablet query failed, cannot initialize.\n");
+ return 1;
+ }
+
+ /* some of the 19200 tablets can't set the line discipline */
+ set_line_discipline(fd, N_MOUSE);
+
+ if (bind_kernel_driver(fd) < 0) {
+ fprintf(stderr, "Failed to bind the kernel driver.\n");
+ goto out;
+ }
+
+ signal(SIGINT, sighandler);
+ signal(SIGHUP, sighandler);
+ read(fd, NULL, 0);
+
+ set_line_discipline(fd, 0);
+
+ rc = 0;
+out:
+ if (fd >= 0)
+ close(fd);
+ return rc;
+}
+
+/* vim: set noexpandtab tabstop=8 shiftwidth=8: */
--
1.8.5.3

15
70-wacom.rules
View File

@ -1,15 +0,0 @@
ACTION!="add|change", GOTO="wacom_end"
# Match all serial wacom tablets with a serial ID starting with WACf
# Notes: We assign NAME though we shouldn't, but currently the server requires it
# We assign the lot to subsystem pnp too because server reads NAME from
# the parent device. Once all that's fixed, as simple SUBSYSTEM="tty"
# will do and the ENV{NAME} can be removed.
SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
# inputattach
SUBSYSTEM=="tty|pnp", KERNEL=="ttyS[0-9]*", ATTRS{id}=="WACf*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="wacom-inputattach@%k.service"
LABEL="wacom_end"

2
sources
View File

@ -1 +1 @@
353642b8a3f2dde089e913be32955aae xf86-input-wacom-0.23.0.tar.bz2
420e7fc2a00126eced2561aeaf057b13 xf86-input-wacom-0.23.99.1.tar.bz2

7
wacom-inputattach@.service
View File

@ -1,7 +0,0 @@
[Unit]
Description=inputattach for Wacom ISDv4-compatible serial devices
[Service]
Type=simple
ExecStart=/usr/bin/isdv4-serial-inputattach /dev/%I
Restart=on-success

51
xorg-x11-drv-wacom.spec
View File

@ -8,8 +8,8 @@
Summary: Xorg X11 wacom input driver
Name: xorg-x11-drv-wacom
Version: 0.23.0
Release: 11%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
Version: 0.23.99.1
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
URL: http://www.x.org
License: GPLv2+
Group: User Interface/X Hardware Support
@ -21,24 +21,6 @@ Source2: commitid
%else
Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}.tar.bz2
%endif
Source3: 70-wacom.rules
Source4: wacom-inputattach@.service
Patch00: 0001-conf-add-N-Trig-DuoSense-to-our-matched-devices.patch
Patch01: 0001-configure-both-clients-and-drivers-need-the-protocol.patch
Patch02: 0002-Include-stdint-from-isdv4.h.patch
Patch03: 0003-isdv4-inline-all-isdv4-parsing-functions.patch
Patch04: 0004-tools-rearrange-serial-settings.patch
Patch05: 0005-tools-open-serial-devices-with-O_NOCTTY.patch
Patch06: 0006-tools-use-perror-instead-of-fprintf.patch
Patch07: 0007-tools-drop-double-call-to-tcsetattr.patch
Patch08: 0008-tools-drop-global-packagelen.patch
Patch09: 0009-tools-drop-leftover-global-variables.patch
Patch10: 0010-tools-make-event_loop-static.patch
Patch11: 0011-tools-split-out-the-debugger-into-the-actual-debugge.patch
Patch12: 0012-tools-re-enable-wait-for-tablet.patch
Patch13: 0013-tools-add-colon-after-TOUCH-output.patch
Patch14: 0014-tools-add-an-inputattach-like-tool.patch
ExcludeArch: s390 s390x
@ -59,25 +41,13 @@ X.Org X11 wacom input driver for Wacom tablets.
%prep
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
%patch00 -p1
%patch01 -p1
%patch02 -p1
%patch03 -p1
%patch04 -p1
%patch05 -p1
%patch06 -p1
%patch07 -p1
%patch08 -p1
%patch09 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%build
autoreconf --force -v --install || exit 1
%configure --disable-static --disable-silent-rules --enable-debug
%configure --disable-static --disable-silent-rules --enable-debug \
--with-systemd-unit-dir=%{_unitdir} \
--with-udev-rules-dir=%{_prefix}/lib/udev/rules.d/
make %{_smp_mflags}
%install
@ -88,11 +58,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
# FIXME: Remove all libtool archives (*.la) from modules directory. This
# should be fixed in upstream Makefile.am or whatever.
find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
install -d $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d
install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d/70-wacom.rules
install -d $RPM_BUILD_ROOT%{_unitdir}
install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/wacom-inputattach@.service
mv $RPM_BUILD_ROOT/%{_prefix}/lib/udev/rules.d/wacom.rules $RPM_BUILD_ROOT/%{_prefix}/lib/udev/rules.d/70-wacom.rules
%clean
rm -rf $RPM_BUILD_ROOT
@ -134,6 +100,9 @@ X.Org X11 wacom input driver development files.
%{_bindir}/isdv4-serial-debugger
%changelog
* Fri Mar 21 2014 Peter Hutterer <peter.hutterer@redhat.com> - 0.23.99.1-2
- wacom 0.23.99.1
* Wed Mar 19 2014 Peter Hutterer <peter.hutterer@redhat.com> 0.23.0-11
- Use custom wacom inputattach tool (#1046912)