[Linuxwacom-devel] [PATCH xf86-input-wacom] Update README to reflect the move to Github.
Signed-off-by: Aaron Armstrong Skomra --- README| 47 --- README.md | 20 2 files changed, 20 insertions(+), 47 deletions(-) delete mode 100644 README create mode 100644 README.md diff --git a/README b/README deleted file mode 100644 index ec7f5e3c7dcd.. --- a/README +++ /dev/null @@ -1,47 +0,0 @@ -This package provides the X.Org X11 driver for Wacom and Wacom-like tablets. -It obsoletes the linuxwacom driver and supports X server versions 1.7 and -higher. Server versions lower than 1.7 may be supported by this driver, but -users are encouraged to use the old linuxwacom driver instead. - -Information about building this driver, configuration and general use is -available on http://linuxwacom.sourceforge.net - -Since this driver is an X11 driver only, a kernel driver is required to get -hardware support. If the kernel driver is older than this driver, some -features may not be available. - -== - -BUILDING FROM GIT: -$ ./autogen.sh --prefix=/usr -$ make - -Adjust the prefix according to your local setup, in most cases, a prefix of -/usr is correct. - -BUILDING FROM TARBALL: - -$ ./configure --prefix=/usr -$ make - -Adjust the prefix according to your local setup, in most cases, a prefix of -/usr is correct. - -== - -Please surf the HOWTO pages at -http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Category:HOWTO -to find the proper options if the default building environment doesn't work -for you. - -== - -Developers, please surf the DeveloperPages at -http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Category:DeveloperPages -to find more information on how to contribute to this driver. - -== - - -WEBSITE: http://linuxwacom.sourceforge.net - diff --git a/README.md b/README.md new file mode 100644 index ..455c91055e8a --- /dev/null +++ b/README.md @@ -0,0 +1,20 @@ +What is xf86-input-wacom? +- + +The Linux Wacom Project manages the drivers, libraries, and documentation for +configuring and running Wacom tablets under the Linux operating system. The +project consist of the Wacom Kernel driver ([input-wacom](https://github.com/linuxwacom/input-wacom)), +this X driver (xf86-input-wacom) and +[libwacom](https://github.com/linuxwacom/libwacom). Our drivers are +included in most major Linux distributions and provide out-of-the box support +for a wide variety of Wacom tablets and component devices. + +Given this, you will only need this driver if you have a newer Wacom device, +are running an older operating system, or need a bugfix. If one of these situations applies to you, +[install xf86-input-wacom from source](https://github.com/linuxwacom/xf86-input-wacom/wiki/Building-The-Driver) by following the instructions in our wiki. + +Developers: +--- +For developers and others needing additional information please see the +[wiki](https://github.com/linuxwacom/xf86-input-wacom/wiki). + -- 2.7.4 -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
[Linuxwacom-devel] [PATCH input-wacom 03/10] 2.6.30: Correct resolution of ISDv4 0x5000 tablet
When backporting support for the 0x5000 tablet to the 2.6.30 tree, the
maximum pressure value was incorrectly copied.
Fixes: ecff90f818 ("Input: wacom: Add support for three new ISDv4 sensors")
Signed-off-by: Jason Gerecke
---
2.6.30/wacom_wac.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index db19227..e1758e1 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -2787,7 +2787,7 @@ static const struct wacom_features wacom_features_0x4004 =
{ "Wacom ISDv4 4004", WACOM_PKGLEN_MTTPC, 11060, 6220, 255, 0,
MTTPC_B };
static const struct wacom_features wacom_features_0x5000 =
- { "Wacom ISDv4 5000", WACOM_PKGLEN_MTTPC, 27848, 15752, 255, 0,
+ { "Wacom ISDv4 5000", WACOM_PKGLEN_MTTPC, 27848, 15752, 1023,
0,
MTTPC_B };
static const struct wacom_features wacom_features_0x5002 =
{ "Wacom ISDv4 5002", WACOM_PKGLEN_MTTPC, 29576, 16724, 1023,
0,
--
2.16.2
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
[Linuxwacom-devel] [PATCH input-wacom 05/10] 2.6.30: Clean up wacom_features structures
The 2.6.30 tree has a few of its wacom_features structures in a different
order than the other trees, or having a different number of spaces between
fields. This makes comparing the 2.6.30 tree more difficult than necessary.
This commit moves things to be in the same spot as 2.6.38.
Signed-off-by: Jason Gerecke
---
2.6.30/wacom_wac.c | 63 --
1 file changed, 37 insertions(+), 26 deletions(-)
diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index 281fb80..bf40164 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -2696,12 +2696,7 @@ static const struct wacom_features wacom_features_0x32F =
WACOM_DTU_OFFSET, WACOM_DTU_OFFSET,
WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };
static const struct wacom_features wacom_features_0x336 =
- { "Wacom DTU1141", WACOM_PKGLEN_DTUS, 23672, 13403, 1023,
0,
- DTUS, 4,
- WACOM_DTU_OFFSET, WACOM_DTU_OFFSET,
- WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };
-static const struct wacom_features wacom_features_0x343 =
- { "Wacom DTK1651", WACOM_PKGLEN_DTUS, 34816, 19759, 1023, 0,
+ { "Wacom DTU1141",WACOM_PKGLEN_DTUS, 23672, 13403, 1023, 0,
DTUS, 4,
WACOM_DTU_OFFSET, WACOM_DTU_OFFSET,
WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };
@@ -2810,23 +2805,23 @@ static const struct wacom_features
wacom_features_0x5090 =
static const struct wacom_features wacom_features_0x47 =
{ "Wacom Intuos2 6x8",WACOM_PKGLEN_INTUOS,20320, 16240, 1023,
31,
INTUOS };
-static const struct wacom_features wacom_features_0xD1 =
- { "Wacom BambooFun 2FG 4x5", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 31,
+static const struct wacom_features wacom_features_0xD0 =
+ { "Wacom Bamboo 2FG", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 31,
BAMBOO_PT };
-static const struct wacom_features wacom_features_0xD4 =
- { "Wacom Bamboo Pen 4x5", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023,
31,
+static const struct wacom_features wacom_features_0xD1 =
+ { "Wacom BambooFun 2FG 4x5", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023,
31,
BAMBOO_PT };
static const struct wacom_features wacom_features_0xD2 =
{ "Wacom Bamboo Craft", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 31,
BAMBOO_PT };
static const struct wacom_features wacom_features_0xD3 =
- { "Wacom BambooFun 2FG 6x8", WACOM_PKGLEN_BBFUN, 21648, 13700, 1023,
31,
+ { "Wacom BambooFun 2FG 6x8", WACOM_PKGLEN_BBFUN, 21648, 13700,
1023, 31,
BAMBOO_PT };
-static const struct wacom_features wacom_features_0xD0 =
- { "Wacom Bamboo 2FG", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 31,
+static const struct wacom_features wacom_features_0xD4 =
+ { "Wacom Bamboo Pen 4x5", WACOM_PKGLEN_BBFUN, 14720, 9200,
1023, 31,
BAMBOO_PT };
static const struct wacom_features wacom_features_0xD5 =
- { "Wacom Bamboo Pen 6x8", WACOM_PKGLEN_BBFUN, 21648, 13700, 1023, 31,
+ { "Wacom Bamboo Pen 6x8", WACOM_PKGLEN_BBFUN, 21648, 13700, 1023,
31,
BAMBOO_PT };
static const struct wacom_features wacom_features_0xD6 =
{ "Wacom BambooPT 2FG 4x5", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 31,
@@ -2885,6 +2880,11 @@ static const struct wacom_features wacom_features_0x33D =
static const struct wacom_features wacom_features_0x33E =
{ "Wacom Intuos PT M 2", WACOM_PKGLEN_INTUOS, 21600, 13500, 2047, 63,
INTUOSHT2, .touch_max = 16 };
+static const struct wacom_features wacom_features_0x343 =
+ { "Wacom DTK1651", WACOM_PKGLEN_DTUS, 34816, 19759, 1023, 0,
+ DTUS, 4,
+ WACOM_DTU_OFFSET, WACOM_DTU_OFFSET,
+ WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };
static const struct wacom_features wacom_features_0x34A =
{ "Wacom MobileStudio Pro 13 Touch", WACOM_PKGLEN_MSPROT, .type =
WACOM_MSPROT, /* Touch */
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x34D };
@@ -2917,11 +2917,15 @@ static const struct wacom_features wacom_features_0x350
=
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x354 };
static const struct wacom_features wacom_features_0x351 =
{ "Wacom Cintiq Pro 24", WACOM_PKGLEN_MSPRO, 105286, 59574, 8191, 63,
/* Pen & Touch */
- WACOM_MSPRO, 0, WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
+ WACOM_MSPRO, 0,
+ WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
+ WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x355 };
static const struct wacom_features wacom_features_0x352 =
{ "Wacom Cintiq Pro 32", WACOM_PKGLEN_MSPRO, 140384, 79316, 8191, 63,
- WACOM_MSPRO, 0, WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
+ WACOM_MSPRO, 0,
+ WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
+ WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
.oVi
[Linuxwacom-devel] [PATCH input-wacom 01/10] 2.6.30: Add missing oVid/oPid data to pen side of split devices
When oVid/oPid data was added for several "split" devices in afb48f975b,
the data was only added to the touch half. This means that the current
logic to link the two halves together will only work when the pen half
is detected first. This would cause arbitration issues if the probe
order is reversed and touch is detected first. By adding the oVid/oPid
data to the pen side as well, the logic will link the devices regardless
of probe order.
Fixes: afb48f975b ("Add support for WACOM_24HDT and WACOM_27QHDT touch sensors
to 2.6.30 / 2.6.36")
Signed-off-by: Jason Gerecke
---
2.6.30/wacom_wac.c | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index 82412d0..c47ea66 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -2634,7 +2634,8 @@ static const struct wacom_features wacom_features_0xF8 =
{ "Wacom Cintiq 24HD touch", WACOM_PKGLEN_INTUOS, 104480, 65600,
2047, 63, /* Pen */
WACOM_24HD, 16,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
- WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
+ WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0xf6 };
static const struct wacom_features wacom_features_0xF6 =
{ "Wacom Cintiq 24HD touch", .type = WACOM_24HDT, /* Touch */
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0xf8, .touch_max = 10 };
@@ -2647,7 +2648,8 @@ static const struct wacom_features wacom_features_0x32B =
{ "Wacom Cintiq 27QHD touch", WACOM_PKGLEN_INTUOS, 120140, 67920, 2047,
63,
WACOM_27QHD, 0,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
- WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
+ WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x32C };
static const struct wacom_features wacom_features_0x32C =
{ "Wacom Cintiq 27QHD touch", .type = WACOM_27QHDT,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x32B, .touch_max = 10 };
@@ -2669,7 +2671,8 @@ static const struct wacom_features wacom_features_0x333 =
{ "Wacom Cintiq 13HD touch", WACOM_PKGLEN_INTUOS, 59552, 33848, 2047,
63,
WACOM_13HD, 9,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
- WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
+ WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x335 };
static const struct wacom_features wacom_features_0x335 =
{ "Wacom Cintiq 13HD touch", .type = WACOM_24HDT, /* Touch */
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x333, .touch_max = 10 };
@@ -2711,7 +2714,8 @@ static const struct wacom_features wacom_features_0x59 =
/* Pen */
{ "Wacom DTH2242",WACOM_PKGLEN_INTUOS,95840, 54260, 2047,
63,
DTK, 6,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
- WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
+ WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x5D };
static const struct wacom_features wacom_features_0x5D = /* Touch */
{ "Wacom DTH2242", .type = WACOM_24HDT,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x59, .touch_max = 10 };
@@ -2729,7 +2733,8 @@ static const struct wacom_features wacom_features_0x5B =
{ "Wacom Cintiq 22HDT", WACOM_PKGLEN_INTUOS, 95840, 54260, 2047,
63,
WACOM_22HD, 18,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
- WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
+ WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x5e };
static const struct wacom_features wacom_features_0x5E =
{ "Wacom Cintiq 22HDT", .type = WACOM_24HDT,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x5b, .touch_max = 10 };
--
2.16.2
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
[Linuxwacom-devel] [PATCH input-wacom 08/10] 2.6.30: Backport missing TABLETPC ISDv4 devices
The 2.6.30 tree is missing the three following ISDv4 devices which use
the vanilla TABLETPC type: 0xEC 0xEF and 0x10E. Backporting support is
trivial since only the definitions are missing.
Signed-off-by: Jason Gerecke
---
2.6.30/wacom_wac.c | 12
1 file changed, 12 insertions(+)
diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index 0932725..42efedc 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -2765,6 +2765,12 @@ static const struct wacom_features wacom_features_0xE3 =
static const struct wacom_features wacom_features_0xE6 =
{ "Wacom ISDv4 E6", WACOM_PKGLEN_TPC2FG,27760, 15694, 255, 0,
TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 2 };
+static const struct wacom_features wacom_features_0xEC =
+ { "Wacom ISDv4 EC", WACOM_PKGLEN_GRAPHIRE, 25710, 14500, 255, 0,
+ TABLETPC,WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+static const struct wacom_features wacom_features_0xEF =
+ { "Wacom ISDv4 EF", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, 0,
+ TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
static const struct wacom_features wacom_features_0x100 =
{ "Wacom ISDv4 100", WACOM_PKGLEN_MTTPC, 26202, 16325, 255, 0,
MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
@@ -2774,6 +2780,9 @@ static const struct wacom_features wacom_features_0x101 =
static const struct wacom_features wacom_features_0x10D =
{ "Wacom ISDv4 10D", WACOM_PKGLEN_MTTPC, 26202, 16325, 255, 0,
MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+static const struct wacom_features wacom_features_0x10E =
+ { "Wacom ISDv4 10E", WACOM_PKGLEN_MTTPC, 27760, 15694, 255, 0,
+ MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
static const struct wacom_features wacom_features_0x10F =
{ "Wacom ISDv4 10F", WACOM_PKGLEN_MTTPC, 27760, 15694, 255, 0,
MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
@@ -3114,6 +3123,8 @@ const struct usb_device_id wacom_ids[] = {
{ USB_DEVICE_WACOM(0xE2) },
{ USB_DEVICE_WACOM(0xE3) },
{ USB_DEVICE_WACOM(0xE6) },
+ { USB_DEVICE_WACOM(0xEC) },
+ { USB_DEVICE_WACOM(0xEF) },
{ USB_DEVICE_WACOM(0xF0) },
{ USB_DEVICE_WACOM(0xF4) },
{ USB_DEVICE_DETAILED(0xF6, USB_CLASS_HID, 0, 0) },
@@ -3123,6 +3134,7 @@ const struct usb_device_id wacom_ids[] = {
{ USB_DEVICE_WACOM(0x100) },
{ USB_DEVICE_WACOM(0x101) },
{ USB_DEVICE_WACOM(0x10D) },
+ { USB_DEVICE_WACOM(0x10E) },
{ USB_DEVICE_WACOM(0x10F) },
{ USB_DEVICE_WACOM(0x116) },
{ USB_DEVICE_WACOM(0x12C) },
--
2.16.2
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
[Linuxwacom-devel] [PATCH input-wacom 04/10] 2.6.30: Fix maximum distance for Bamboo tablets
Way back when, the driver used to report the distance data from Bamboo
tablets unmodified. The unmodified data *increases* as you get closer
to the tablet, however, which is the opposite of what is expected. Chris
Bagwell changed this behavior in 2011 with upstream commit c18c2cec31.
At the same time, he changed the maximum distance from 63 to 31. Although
Chris eventually backported the former change here to the 2.6.30 tree as
part of commit e9ddd7f10b, the latter change was never made. The 2.6.38
and higher trees already have this change.
Fixes: e9ddd7f10b ("Bamboo 2nd and 3rd gen support for 2.6.30+ kernels")
Signed-off-by: Jason Gerecke
---
2.6.30/wacom_wac.c | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index e1758e1..281fb80 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -2811,37 +2811,37 @@ static const struct wacom_features wacom_features_0x47 =
{ "Wacom Intuos2 6x8",WACOM_PKGLEN_INTUOS,20320, 16240, 1023,
31,
INTUOS };
static const struct wacom_features wacom_features_0xD1 =
- { "Wacom BambooFun 2FG 4x5", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 63,
+ { "Wacom BambooFun 2FG 4x5", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 31,
BAMBOO_PT };
static const struct wacom_features wacom_features_0xD4 =
- { "Wacom Bamboo Pen 4x5", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023,
63,
+ { "Wacom Bamboo Pen 4x5", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023,
31,
BAMBOO_PT };
static const struct wacom_features wacom_features_0xD2 =
- { "Wacom Bamboo Craft", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 63,
+ { "Wacom Bamboo Craft", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 31,
BAMBOO_PT };
static const struct wacom_features wacom_features_0xD3 =
- { "Wacom BambooFun 2FG 6x8", WACOM_PKGLEN_BBFUN, 21648, 13700, 1023,
63,
+ { "Wacom BambooFun 2FG 6x8", WACOM_PKGLEN_BBFUN, 21648, 13700, 1023,
31,
BAMBOO_PT };
static const struct wacom_features wacom_features_0xD0 =
- { "Wacom Bamboo 2FG", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 63,
+ { "Wacom Bamboo 2FG", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 31,
BAMBOO_PT };
static const struct wacom_features wacom_features_0xD5 =
- { "Wacom Bamboo Pen 6x8", WACOM_PKGLEN_BBFUN, 21648, 13700, 1023, 63,
+ { "Wacom Bamboo Pen 6x8", WACOM_PKGLEN_BBFUN, 21648, 13700, 1023, 31,
BAMBOO_PT };
static const struct wacom_features wacom_features_0xD6 =
- { "Wacom BambooPT 2FG 4x5", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 63,
+ { "Wacom BambooPT 2FG 4x5", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 31,
BAMBOO_PT };
static const struct wacom_features wacom_features_0xD7 =
- { "Wacom BambooPT 2FG Small", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 63,
+ { "Wacom BambooPT 2FG Small", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 31,
BAMBOO_PT };
static const struct wacom_features wacom_features_0xD8 =
- { "Wacom Bamboo Comic 2FG", WACOM_PKGLEN_BBFUN, 21648, 13700, 1023,
63,
+ { "Wacom Bamboo Comic 2FG", WACOM_PKGLEN_BBFUN, 21648, 13700, 1023,
31,
BAMBOO_PT };
static const struct wacom_features wacom_features_0xDA =
- { "Wacom Bamboo 2FG 4x5 SE", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 63,
+ { "Wacom Bamboo 2FG 4x5 SE", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 31,
BAMBOO_PT };
static const struct wacom_features wacom_features_0xDB =
- { "Wacom Bamboo 2FG 6x8 SE", WACOM_PKGLEN_BBFUN, 21648, 13700, 1023,
63,
+ { "Wacom Bamboo 2FG 6x8 SE", WACOM_PKGLEN_BBFUN, 21648, 13700, 1023,
31,
BAMBOO_PT };
static const struct wacom_features wacom_features_0xDD =
{ "Wacom Bamboo Connect", WACOM_PKGLEN_BBPEN, 14720, 9200, 1023,
31,
--
2.16.2
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
[Linuxwacom-devel] [PATCH input-wacom 10/10] 2.6.30: Backport MTSCREEN ISDv4 devices
The 2.6.38 and later trees contain a single "MTSCREEN" device that should
be backported to the 2.6.30 kernel.
Signed-off-by: Jason Gerecke
---
2.6.30/wacom_sys.c | 8 ++--
2.6.30/wacom_wac.c | 6 ++
2.6.30/wacom_wac.h | 3 ++-
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/2.6.30/wacom_sys.c b/2.6.30/wacom_sys.c
index bdb1eb8..5ad14e0 100644
--- a/2.6.30/wacom_sys.c
+++ b/2.6.30/wacom_sys.c
@@ -263,6 +263,7 @@ static int wacom_parse_hid(struct usb_interface *intf,
struct hid_descriptor *hi
features->type ==
MTTPC ||
features->type ==
MTTPC_B ||
features->type ==
MTTPC_C ||
+features->type ==
MTSCREEN ||
features->type ==
WACOM_24HDT ||
features->type ==
WACOM_MSPROT ||
features->type ==
DTH1152T ||
@@ -274,7 +275,8 @@ static int wacom_parse_hid(struct usb_interface *intf,
struct hid_descriptor *hi
features->type == MTTPC_B ||
features->type == MTTPC_C)
features->pktlen =
WACOM_PKGLEN_MTTPC;
- else if (features->type ==
WACOM_24HDT)
+ else if (features->type ==
WACOM_24HDT ||
+features->type ==
MTSCREEN)
features->pktlen =
WACOM_PKGLEN_MTOUCH;
else if (features->type ==
WACOM_MSPROT ||
features->type ==
DTH2452T)
@@ -349,7 +351,8 @@ static int wacom_parse_hid(struct usb_interface *intf,
struct hid_descriptor *hi
} else if (pen) {
/* penabled only accepts exact bytes of
data */
if (features->type == TABLETPC2FG ||
- features->type == MTTPC)
+ features->type == MTTPC ||
+ features->type == MTSCREEN)
features->pktlen =
WACOM_PKGLEN_GRAPHIRE;
if (features->type == BAMBOO_PT)
features->pktlen =
WACOM_PKGLEN_BBFUN;
@@ -363,6 +366,7 @@ static int wacom_parse_hid(struct usb_interface *intf,
struct hid_descriptor *hi
if (finger) {
switch (features->type) {
case TABLETPC2FG:
+ case MTSCREEN:
case MTTPC:
features->y_max =
get_unaligned_le16(&report[i + 3]);
diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index 575187b..3b65a8d 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -1955,6 +1955,7 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t
len)
case TABLETPC:
case TABLETPCE:
case TABLETPC2FG:
+ case MTSCREEN:
case MTTPC:
case MTTPC_B:
case MTTPC_C:
@@ -2320,6 +2321,7 @@ void wacom_setup_input_capabilities(struct input_dev
*input_dev,
/* fall through */
case WACOM_MSPROT:
+ case MTSCREEN:
case MTTPC:
case MTTPC_B:
case MTTPC_C:
@@ -2764,6 +2766,9 @@ static const struct wacom_features wacom_features_0xE2 =
static const struct wacom_features wacom_features_0xE3 =
{ "Wacom ISDv4 E3", WACOM_PKGLEN_TPC2FG,26202, 16325, 255, 0,
TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 2 };
+static const struct wacom_features wacom_features_0xE5 =
+ { "Wacom ISDv4 E5", WACOM_PKGLEN_MTOUCH,26202, 16325, 255, 0,
+ MTSCREEN, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
static const struct wacom_features wacom_features_0xE6 =
{ "Wacom ISDv4 E6", WACOM_PKGLEN_TPC2FG,27760, 15694, 255, 0,
TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 2 };
@@ -3127,6 +3132,7 @@ const struct usb_device_id wacom_ids[] = {
{ USB_DEVICE_WACOM(0xDF) },
{ USB_DEVICE_WACOM(0xE2) },
{ USB_DEVICE_WACOM(0xE3) },
+ { USB_DEVICE_WACOM(0xE5) },
{ USB_DEVICE_WACOM(0xE6) },
{ USB_DEVICE_WACOM(0xEC) },
{ USB_DEVICE_WACO
[Linuxwacom-devel] [PATCH input-wacom 06/10] 2.6.30: Backport resolution data (but not implementation)
To bring the 2.6.30 wacom_features structure into closer alignment with
the other trees, this commit backports the resolution data. Note that
the 2.6.30 kernel does *not* support reporting resolution, so this is
purely cosmetic: userspace will still need to have its own independent
table of resolutions.
Signed-off-by: Jason Gerecke
---
2.6.30/wacom_wac.c | 310 +++--
2.6.30/wacom_wac.h | 2 +
2 files changed, 161 insertions(+), 151 deletions(-)
diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index bf40164..db39fd8 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -32,6 +32,14 @@
#define KEY_CONTROLPANEL 0x243
#endif
+/* resolution for penabled devices */
+#define WACOM_PL_RES 20
+#define WACOM_PENPRTN_RES 40
+#define WACOM_VOLITO_RES 50
+#define WACOM_GRAPHIRE_RES 80
+#define WACOM_INTUOS_RES 100
+#define WACOM_INTUOS3_RES 200
+
/* Newer Cintiq and DTU have an offset between tablet and screen areas */
#define WACOM_DTU_OFFSET 200
#define WACOM_CINTIQ_OFFSET400
@@ -2438,201 +2446,201 @@ void wacom_setup_input_capabilities(struct input_dev
*input_dev,
static const struct wacom_features wacom_features_0x00 =
{ "Wacom Penpartner", WACOM_PKGLEN_PENPRTN,5040, 3780, 255, 0,
- PENPARTNER };
+ PENPARTNER, WACOM_PENPRTN_RES, WACOM_PENPRTN_RES };
static const struct wacom_features wacom_features_0x10 =
{ "Wacom Graphire", WACOM_PKGLEN_GRAPHIRE, 10206, 7422, 511, 63,
- GRAPHIRE };
+ GRAPHIRE, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
static const struct wacom_features wacom_features_0x11 =
{ "Wacom Graphire2 4x5", WACOM_PKGLEN_GRAPHIRE, 10206, 7422, 511, 63,
- GRAPHIRE };
+ GRAPHIRE, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
static const struct wacom_features wacom_features_0x12 =
{ "Wacom Graphire2 5x7", WACOM_PKGLEN_GRAPHIRE, 13918, 10206, 511, 63,
- GRAPHIRE };
+ GRAPHIRE, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
static const struct wacom_features wacom_features_0x13 =
{ "Wacom Graphire3", WACOM_PKGLEN_GRAPHIRE, 10208, 7424, 511, 63,
- GRAPHIRE };
+ GRAPHIRE, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
static const struct wacom_features wacom_features_0x14 =
{ "Wacom Graphire3 6x8", WACOM_PKGLEN_GRAPHIRE, 16704, 12064, 511, 63,
- GRAPHIRE };
+ GRAPHIRE, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
static const struct wacom_features wacom_features_0x15 =
{ "Wacom Graphire4 4x5", WACOM_PKGLEN_GRAPHIRE, 10208, 7424, 511, 63,
- WACOM_G4 };
+ WACOM_G4, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
static const struct wacom_features wacom_features_0x16 =
{ "Wacom Graphire4 6x8", WACOM_PKGLEN_GRAPHIRE, 16704, 12064, 511, 63,
- WACOM_G4 };
+ WACOM_G4, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
static const struct wacom_features wacom_features_0x17 =
{ "Wacom BambooFun 4x5", WACOM_PKGLEN_BBFUN, 14760, 9225, 511, 63,
- WACOM_MO };
+ WACOM_MO, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
static const struct wacom_features wacom_features_0x18 =
{ "Wacom BambooFun 6x8", WACOM_PKGLEN_BBFUN, 21648, 13530, 511, 63,
- WACOM_MO };
+ WACOM_MO, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
static const struct wacom_features wacom_features_0x19 =
{ "Wacom Bamboo1 Medium", WACOM_PKGLEN_GRAPHIRE, 16704, 12064, 511, 63,
- GRAPHIRE };
+ GRAPHIRE, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
static const struct wacom_features wacom_features_0x60 =
{ "Wacom Volito", WACOM_PKGLEN_GRAPHIRE, 5104, 3712, 511, 63,
- GRAPHIRE };
+ GRAPHIRE, WACOM_VOLITO_RES, WACOM_VOLITO_RES };
static const struct wacom_features wacom_features_0x61 =
{ "Wacom PenStation2",WACOM_PKGLEN_GRAPHIRE, 3250, 2320, 255, 63,
- GRAPHIRE };
+ GRAPHIRE, WACOM_VOLITO_RES, WACOM_VOLITO_RES };
static const struct wacom_features wacom_features_0x62 =
{ "Wacom Volito2 4x5",WACOM_PKGLEN_GRAPHIRE, 5104, 3712, 511, 63,
- GRAPHIRE };
+ GRAPHIRE, WACOM_VOLITO_RES, WACOM_VOLITO_RES };
static const struct wacom_features wacom_features_0x63 =
{ "Wacom Volito2 2x3",WACOM_PKGLEN_GRAPHIRE, 3248, 2320, 511, 63,
- GRAPHIRE };
+ GRAPHIRE, WACOM_VOLITO_RES, WACOM_VOLITO_RES };
static const struct wacom_features wacom_features_0x64 =
{ "Wacom PenPartner2",WACOM_PKGLEN_GRAPHIRE, 3250, 2320, 511, 63,
- GRAPHIRE };
+ GRAPHIRE, WACOM_VOLITO_RES, WACOM_VOLITO_RES };
static const struct wacom_features wacom_features_0x65 =
{ "Wacom Bamboo", WACOM_PKGLEN_BBFUN, 14760, 9225, 511, 63,
- WACOM_MO };
+ WACOM_MO, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
static const struct wacom_features wacom_feat
[Linuxwacom-devel] [PATCH input-wacom 00/10] 2.6.30: Synchronize wacom_features structures
We eventually want to move away from having to store a duplicate copy of tablet resolution in the xf86-input-wacom driver. We can't do this *quite* yet since we'd have to change the minimum kernel requirement to 2.6.32, but we can prepare for the change by porting the resolution data from later kernels into the wacom_features structures and leaving it unused. While we're there, fix several bugs and backport support for a few tablets that are simple enough to add. Jason Gerecke (10): 2.6.30: Add missing oVid/oPid data to pen side of split devices 2.6.30: Correct number of buttons for DTU-1141 2.6.30: Correct resolution of ISDv4 0x5000 tablet 2.6.30: Fix maximum distance for Bamboo tablets 2.6.30: Clean up wacom_features structures 2.6.30: Backport resolution data (but not implementation) 2.6.30: Backport touch_max data 2.6.30: Backport missing TABLETPC ISDv4 devices 2.6.30: Backport TABLETPCE ISDv4 devices 2.6.30: Backport MTSCREEN ISDv4 devices 2.6.30/wacom_sys.c | 8 +- 2.6.30/wacom_wac.c | 402 ++--- 2.6.30/wacom_wac.h | 8 +- 3 files changed, 237 insertions(+), 181 deletions(-) -- 2.16.2 -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
[Linuxwacom-devel] [PATCH input-wacom 02/10] 2.6.30: Correct number of buttons for DTU-1141
The DTU-1141 only has 4 ExpressKeys. This value was incorrectly copied
while backporting.
Fixes: ee0d2bd259 ("backport: HID: wacom: Set button bits based on a new
numbered_buttons")
Signed-off-by: Jason Gerecke
---
2.6.30/wacom_wac.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index c47ea66..db19227 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -2697,7 +2697,7 @@ static const struct wacom_features wacom_features_0x32F =
WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };
static const struct wacom_features wacom_features_0x336 =
{ "Wacom DTU1141", WACOM_PKGLEN_DTUS, 23672, 13403, 1023,
0,
- DTUS, 6,
+ DTUS, 4,
WACOM_DTU_OFFSET, WACOM_DTU_OFFSET,
WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };
static const struct wacom_features wacom_features_0x343 =
--
2.16.2
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
[Linuxwacom-devel] [PATCH input-wacom 07/10] 2.6.30: Backport touch_max data
The touch_max field indicates the maximum number of simultaneous touches
supported by the hardware. Within the 2.6.30 kernel, its presence is
really only used as a way of identifying touch-capable tablets since
the tree does not have significant multitouch support. Backporting the
touch_max data causes the ABS_MT_POSITION_{X,Y} axes to be declared but
otherwise has no effect (touch_max is already set on several tablets,
and the existence of unused ABS_MT_POSITION_{X,Y} axes doesn't seem to
cause them any issue).
Signed-off-by: Jason Gerecke
---
2.6.30/wacom_wac.c | 40
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index db39fd8..0932725 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -2611,13 +2611,13 @@ static const struct wacom_features wacom_features_0xBC =
INTUOS4, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 9 };
static const struct wacom_features wacom_features_0x26 =
{ "Wacom Intuos5 touch S", WACOM_PKGLEN_INTUOS, 31496, 19685, 2047, 63,
- INTUOS5S, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 7 };
+ INTUOS5S, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 7, .touch_max = 16 };
static const struct wacom_features wacom_features_0x27 =
{ "Wacom Intuos5 touch M", WACOM_PKGLEN_INTUOS, 44704, 27940, 2047, 63,
- INTUOS5, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 9 };
+ INTUOS5, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 9, .touch_max = 16 };
static const struct wacom_features wacom_features_0x28 =
{ "Wacom Intuos5 touch L", WACOM_PKGLEN_INTUOS, 65024, 40640, 2047, 63,
- INTUOS5L, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 9 };
+ INTUOS5L, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 9, .touch_max = 16 };
static const struct wacom_features wacom_features_0x29 =
{ "Wacom Intuos5 S", WACOM_PKGLEN_INTUOS, 31496, 19685, 2047, 63,
INTUOS5S, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 7 };
@@ -2626,13 +2626,13 @@ static const struct wacom_features wacom_features_0x2A =
INTUOS5, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 9 };
static const struct wacom_features wacom_features_0x314 =
{ "Wacom Intuos Pro S", WACOM_PKGLEN_INTUOS, 31496, 19685, 2047, 63,
- INTUOSPS, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 7 };
+ INTUOSPS, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 7, .touch_max = 16 };
static const struct wacom_features wacom_features_0x315 =
{ "Wacom Intuos Pro M", WACOM_PKGLEN_INTUOS, 44704, 27940, 2047, 63,
- INTUOSPM, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 9 };
+ INTUOSPM, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 9, .touch_max = 16 };
static const struct wacom_features wacom_features_0x317 =
{ "Wacom Intuos Pro L", WACOM_PKGLEN_INTUOS, 65024, 40640, 2047, 63,
- INTUOSPL, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 9 };
+ INTUOSPL, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 9, .touch_max = 16 };
static const struct wacom_features wacom_features_0xF4 =
{ "Wacom Cintiq 24HD", WACOM_PKGLEN_INTUOS, 104480, 65600,
2047, 63,
WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 16,
@@ -2758,13 +2758,13 @@ static const struct wacom_features wacom_features_0x9F =
TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
static const struct wacom_features wacom_features_0xE2 =
{ "Wacom ISDv4 E2", WACOM_PKGLEN_TPC2FG,26202, 16325, 255, 0,
- TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+ TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 2 };
static const struct wacom_features wacom_features_0xE3 =
{ "Wacom ISDv4 E3", WACOM_PKGLEN_TPC2FG,26202, 16325, 255, 0,
- TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+ TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 2 };
static const struct wacom_features wacom_features_0xE6 =
{ "Wacom ISDv4 E6", WACOM_PKGLEN_TPC2FG,27760, 15694, 255, 0,
- TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+ TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 2 };
static const struct wacom_features wacom_features_0x100 =
{ "Wacom ISDv4 100", WACOM_PKGLEN_MTTPC, 26202, 16325, 255, 0,
MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
@@ -2815,16 +2815,16 @@ static const struct wacom_features wacom_features_0x47 =
INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
static const struct wacom_features wacom_features_0xD0 =
{ "Wacom Bamboo 2FG", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 31,
- BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+ BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 2 };
static const struct wacom_features wacom_features_0xD1 =
{ "Wacom BambooFun 2FG 4x5", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023,
31,
- BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+ BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTU
[Linuxwacom-devel] [PATCH input-wacom 09/10] 2.6.30: Backport TABLETPCE ISDv4 devices
The pen interface of TABLETPCE devices is supposedly identical to the
classic TABLETPC interface (see: dabcba4226), with just the touch
interface modified to be Win8-compatible. Supporting these devices
(and updating those that are marked TABLETPC) is fairly straightforward.
Signed-off-by: Jason Gerecke
---
2.6.30/wacom_wac.c | 10 --
2.6.30/wacom_wac.h | 3 ++-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index 42efedc..575187b 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -1953,6 +1953,7 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t
len)
break;
case TABLETPC:
+ case TABLETPCE:
case TABLETPC2FG:
case MTTPC:
case MTTPC_B:
@@ -2339,6 +2340,7 @@ void wacom_setup_input_capabilities(struct input_dev
*input_dev,
/* fall through */
case TABLETPC:
+ case TABLETPCE:
if (features->device_type == BTN_TOOL_DOUBLETAP ||
features->device_type == BTN_TOOL_TRIPLETAP) {
input_set_abs_params(input_dev, ABS_RX, 0,
features->x_phy, 0, 0);
@@ -2768,6 +2770,9 @@ static const struct wacom_features wacom_features_0xE6 =
static const struct wacom_features wacom_features_0xEC =
{ "Wacom ISDv4 EC", WACOM_PKGLEN_GRAPHIRE, 25710, 14500, 255, 0,
TABLETPC,WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+static const struct wacom_features wacom_features_0xED =
+ { "Wacom ISDv4 ED", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, 0,
+ TABLETPCE, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
static const struct wacom_features wacom_features_0xEF =
{ "Wacom ISDv4 EF", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, 0,
TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
@@ -2788,10 +2793,10 @@ static const struct wacom_features wacom_features_0x10F
=
MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
static const struct wacom_features wacom_features_0x116 =
{ "Wacom ISDv4 116", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, 0,
- TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+ TABLETPCE, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
static const struct wacom_features wacom_features_0x12C =
{ "Wacom ISDv4 12C", WACOM_PKGLEN_GRAPHIRE, 27848, 15752, 2047, 0,
- TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+ TABLETPCE, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
static const struct wacom_features wacom_features_0x4001 =
{ "Wacom ISDv4 4001", WACOM_PKGLEN_MTTPC, 26202, 16325, 255, 0,
MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
@@ -3124,6 +3129,7 @@ const struct usb_device_id wacom_ids[] = {
{ USB_DEVICE_WACOM(0xE3) },
{ USB_DEVICE_WACOM(0xE6) },
{ USB_DEVICE_WACOM(0xEC) },
+ { USB_DEVICE_WACOM(0xED) },
{ USB_DEVICE_WACOM(0xEF) },
{ USB_DEVICE_WACOM(0xF0) },
{ USB_DEVICE_WACOM(0xF4) },
diff --git a/2.6.30/wacom_wac.h b/2.6.30/wacom_wac.h
index 3625a51..a0ca458 100755
--- a/2.6.30/wacom_wac.h
+++ b/2.6.30/wacom_wac.h
@@ -128,7 +128,8 @@ enum {
DTH1152T,
INTUOSP2,
INTUOSHT3,
- TABLETPC,
+ TABLETPC, /* add new TPC below */
+ TABLETPCE,
TABLETPC2FG,
DTH2452T,
MTTPC,
--
2.16.2
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
[Linuxwacom-devel] [PATCH xf86-input-wacom] Fail the Coverity build if their script cannot be downloaded
If curl encounters an error trying to download the Coverity build script (as seems to be happening at the moment due to SSL issues), we will not be notified since the pipe swallows the error code. This is not ideal, so this commit updates the Travis build steps to use a slightly more contrived construction which will get and then execute the script as independent steps. Also, to ensure curl returns an error code even in less-severe cases (e.g. a basic 404 "Not Found") we add the '-f' option. Signed-off-by: Jason Gerecke --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 385c012..bc3f492 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,5 +38,5 @@ before_script: script: - if [[ x"$TRAVIS_EVENT_TYPE" = "xcron" ]]; then export DO_COVERITY="YES"; fi - - if [[ x"$BUILDTYPE" = "xcoverity" && x"$DO_COVERITY" = "xYES" ]]; then curl -s "$COVERITY_URL" | bash; fi + - if [[ x"$BUILDTYPE" = "xcoverity" && x"$DO_COVERITY" = "xYES" ]]; then COVERITY_SCRIPT=$(curl -fs "$COVERITY_URL") && echo "$COVERITY_SCRIPT" | bash; fi - if [[ x"$BUILDTYPE" != "xcoverity" ]]; then make CFLAGS="$CFLAGS" && make check; fi -- 2.16.2 -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
