Skip to content

Commit 6be94eb

Browse files
author
pingc
committed
Updated wacomcpl
1 parent 4076f5b commit 6be94eb

18 files changed

+145
-157
lines changed

‎ChangeLog

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2009-04-23 Ping Cheng <pingc@wacom.com>
2+
* Updated README
3+
* Updated GPL to version 2
4+
* Updated wacom_wac.c
5+
* Brought configure.in and inlcude files in-sync with Fedora 10/11
6+
* Fixed a few button and in-prox/out-prox issues
7+
* Label 0.8.3-3
8+
19
2009-04-03 Ping Cheng <pingc@wacom.com>
210
* Support kernels 2.6.28 and 2.6.29
311
* Added 10-linuxwacom.fdi from Peter Hutterer

‎GPL

+1-61
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Version 2, June 1991
33

44
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
5-
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
5+
675 Mass Ave, Cambridge, MA 02139, USA
66
Everyone is permitted to copy and distribute verbatim copies
77
of this license document, but changing it is not allowed.
88

@@ -278,63 +278,3 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
278278
POSSIBILITY OF SUCH DAMAGES.
279279

280280
END OF TERMS AND CONDITIONS
281-
282-
How to Apply These Terms to Your New Programs
283-
284-
If you develop a new program, and you want it to be of the greatest
285-
possible use to the public, the best way to achieve this is to make it
286-
free software which everyone can redistribute and change under these terms.
287-
288-
To do so, attach the following notices to the program. It is safest
289-
to attach them to the start of each source file to most effectively
290-
convey the exclusion of warranty; and each file should have at least
291-
the "copyright" line and a pointer to where the full notice is found.
292-
293-
<one line to give the program's name and a brief idea of what it does.>
294-
Copyright (C) <year> <name of author>
295-
296-
This program is free software; you can redistribute it and/or modify
297-
it under the terms of the GNU General Public License as published by
298-
the Free Software Foundation; either version 2 of the License, or
299-
(at your option) any later version.
300-
301-
This program is distributed in the hope that it will be useful,
302-
but WITHOUT ANY WARRANTY; without even the implied warranty of
303-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
304-
GNU General Public License for more details.
305-
306-
You should have received a copy of the GNU General Public License
307-
along with this program; if not, write to the Free Software
308-
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
309-
310-
311-
Also add information on how to contact you by electronic and paper mail.
312-
313-
If the program is interactive, make it output a short notice like this
314-
when it starts in an interactive mode:
315-
316-
Gnomovision version 69, Copyright (C) year name of author
317-
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
318-
This is free software, and you are welcome to redistribute it
319-
under certain conditions; type `show c' for details.
320-
321-
The hypothetical commands `show w' and `show c' should show the appropriate
322-
parts of the General Public License. Of course, the commands you use may
323-
be called something other than `show w' and `show c'; they could even be
324-
mouse-clicks or menu items--whatever suits your program.
325-
326-
You should also get your employer (if you work as a programmer) or your
327-
school, if any, to sign a "copyright disclaimer" for the program, if
328-
necessary. Here is a sample; alter the names:
329-
330-
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
331-
`Gnomovision' (which makes passes at compilers) written by James Hacker.
332-
333-
<signature of Ty Coon>, 1 April 1989
334-
Ty Coon, President of Vice
335-
336-
This General Public License does not permit incorporating your program into
337-
proprietary programs. If your program is a subroutine library, you may
338-
consider it more useful to permit linking proprietary applications with the
339-
library. If this is what you want to do, use the GNU Library General
340-
Public License instead of this License.

‎README

+14-7
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
11
README
2-
April 03, 2009
2+
April 23, 2009
33

44
==============================================================================
5-
Most end users would probably only need to update the Wacom X driver and the
6-
/etc/X11/xorg.conf file to use the rich features that Wacom tablets offer.
7-
The steps could be as simple as:
5+
Most end users would probably only need to update the /etc/X11/xorg.conf file
6+
and sometime probably the Wacom X driver as well to use the rich features that
7+
Wacom tablets offer. The steps could be as simple as:
8+
9+
$ su
10+
# cp /etc/X11/xorg.conf /etc/X11/xorg.conf.bak
11+
# gedit /etc/X11/xorg.conf
12+
13+
then follow the step listed at http://linuxwacom.sourceforge.net/index.php/howto/x11
14+
or "man wacom" if you don't have network access to add sections for Wacom device.
15+
16+
If by some reason your distribution doesn't have include Wacom driver or you want to
17+
to use the newer release, you can download the package then
818

9-
download the package then
1019
$ bunzip2 linuxwacom.tar.bz2
1120
$ tar xvf linuxwacom.tar
1221
$ cd linuxwacom/prebuilt
1322
$ su
1423
# yum remove linuxwacom
1524
# ./uninstall
1625
# ./install
17-
# cp /etc/X11/xorg.conf /etc/X11/xorg.conf.bak
18-
# gedit /etc/X11/xorg.conf
1926
# reboot
2027

2128
==============================================================================

‎configure.in

+5
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,11 @@ if test -f $WCM_XLIB_DIR/libxf86config.a -o -f $WCM_XLIB_DIR/libxf86config.so; t
577577
fi
578578
fi
579579

580+
if test "$WCM_ENV_XFREE86" != yes; then
581+
PKG_CHECK_MODULES(XORG, [xorg-server])
582+
AC_SUBST([XORG_CFLAGS])
583+
fi
584+
580585
# Define X_CFLAGS, X_LIBS, X_EXTRA_LIBS and X_PRELIBS as required if X
581586
# is found, else defines X_DISPLAY_MISSING. We need at least X_CFLAGS.
582587
AC_PATH_XTRA

‎src/2.6.10/wacom.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -635,6 +635,8 @@ static int wacom_intuos_inout(struct urb *urb)
635635
input_report_abs(dev, ABS_X, 0);
636636
input_report_abs(dev, ABS_Y, 0);
637637
input_report_abs(dev, ABS_DISTANCE, 0);
638+
input_report_abs(dev, ABS_TILT_X, 0);
639+
input_report_abs(dev, ABS_TILT_Y, 0);
638640
if (wacom->tool[idx] >= BTN_TOOL_MOUSE) {
639641
input_report_key(dev, BTN_LEFT, 0);
640642
input_report_key(dev, BTN_MIDDLE, 0);
@@ -645,8 +647,6 @@ static int wacom_intuos_inout(struct urb *urb)
645647
input_report_abs(dev, ABS_RZ, 0);
646648
} else {
647649
input_report_abs(dev, ABS_PRESSURE, 0);
648-
input_report_abs(dev, ABS_TILT_X, 0);
649-
input_report_abs(dev, ABS_TILT_Y, 0);
650650
input_report_key(dev, BTN_STYLUS, 0);
651651
input_report_key(dev, BTN_STYLUS2, 0);
652652
input_report_key(dev, BTN_TOUCH, 0);

‎src/2.6.16/wacom_wac.c

+6-2
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,9 @@ static int wacom_intuos_inout(struct wacom_wac *wacom, void *wcombo)
363363

364364
/* Exit report */
365365
if ((data[1] & 0xfe) == 0x80) {
366+
/* reset all states otherwise we lose the initial states
367+
* when in-prox next time
368+
*/
366369
wacom_report_abs(wcombo, ABS_X, 0);
367370
wacom_report_abs(wcombo, ABS_Y, 0);
368371
wacom_report_abs(wcombo, ABS_DISTANCE, 0);
@@ -377,13 +380,13 @@ static int wacom_intuos_inout(struct wacom_wac *wacom, void *wcombo)
377380
} else {
378381
wacom_report_abs(wcombo, ABS_PRESSURE, 0);
379382
wacom_report_key(wcombo, BTN_TOUCH, 0);
380-
wacom_report_abs(wcombo, ABS_TILT_X, 0);
381-
wacom_report_abs(wcombo, ABS_TILT_Y, 0);
382383
wacom_report_key(wcombo, BTN_STYLUS, 0);
383384
wacom_report_key(wcombo, BTN_STYLUS2, 0);
384385
wacom_report_abs(wcombo, ABS_WHEEL, 0);
385386
wacom_report_abs(wcombo, ABS_Z, 0);
386387
}
388+
wacom_report_abs(wcombo, ABS_TILT_X, 0);
389+
wacom_report_abs(wcombo, ABS_TILT_Y, 0);
387390
wacom_report_key(wcombo, wacom->tool[idx], 0);
388391
wacom_report_abs(wcombo, ABS_MISC, 0); /* reset tool id */
389392
wacom_input_event(wcombo, EV_MSC, MSC_SERIAL, wacom->serial[idx]);
@@ -646,6 +649,7 @@ int wacom_tpc_irq (struct wacom_wac *wacom, void *wcombo)
646649
}
647650
} else if (touchOut || !prox) { /* force touch out-prox */
648651
wacom_report_abs(wcombo, ABS_MISC, TOUCH_DEVICE_ID);
652+
wacom_report_key(wcombo, wacom->tool[1], 0);
649653
wacom_report_key(wcombo, BTN_TOUCH, 0);
650654
touchOut = 0;
651655
touchInProx = 1;

‎src/2.6.19/wacom_wac.c

+64-61
Original file line numberDiff line numberDiff line change
@@ -370,13 +370,13 @@ static int wacom_intuos_inout(struct wacom_wac *wacom, void *wcombo)
370370
} else {
371371
wacom_report_abs(wcombo, ABS_PRESSURE, 0);
372372
wacom_report_key(wcombo, BTN_TOUCH, 0);
373-
wacom_report_abs(wcombo, ABS_TILT_X, 0);
374-
wacom_report_abs(wcombo, ABS_TILT_Y, 0);
375373
wacom_report_key(wcombo, BTN_STYLUS, 0);
376374
wacom_report_key(wcombo, BTN_STYLUS2, 0);
377375
wacom_report_abs(wcombo, ABS_WHEEL, 0);
378376
wacom_report_abs(wcombo, ABS_Z, 0);
379377
}
378+
wacom_report_abs(wcombo, ABS_TILT_X, 0);
379+
wacom_report_abs(wcombo, ABS_TILT_Y, 0);
380380
wacom_report_key(wcombo, wacom->tool[idx], 0);
381381
wacom_report_abs(wcombo, ABS_MISC, 0); /* reset tool id */
382382
wacom_input_event(wcombo, EV_MSC, MSC_SERIAL, wacom->serial[idx]);
@@ -638,6 +638,7 @@ int wacom_tpc_irq(struct wacom_wac *wacom, void *wcombo)
638638
}
639639
} else if (touchOut || !prox) { /* force touch out-prox */
640640
wacom_report_abs(wcombo, ABS_MISC, TOUCH_DEVICE_ID);
641+
wacom_report_key(wcombo, wacom->tool[1], 0);
641642
wacom_report_key(wcombo, BTN_TOUCH, 0);
642643
touchOut = 0;
643644
touchInProx = 1;
@@ -787,65 +788,66 @@ void wacom_init_input_dev(struct input_dev *input_dev, struct wacom_wac *wacom_w
787788
}
788789

789790
static struct wacom_features wacom_features[] = {
790-
{ "Wacom Penpartner", 7, 5040, 3780, 255, 0, PENPARTNER },
791-
{ "Wacom Graphire", 8, 10206, 7422, 511, 63, GRAPHIRE },
792-
{ "Wacom Graphire2 4x5", 8, 10206, 7422, 511, 63, GRAPHIRE },
793-
{ "Wacom Graphire2 5x7", 8, 13918, 10206, 511, 63, GRAPHIRE },
794-
{ "Wacom Graphire3", 8, 10208, 7424, 511, 63, GRAPHIRE },
795-
{ "Wacom Graphire3 6x8", 8, 16704, 12064, 511, 63, GRAPHIRE },
796-
{ "Wacom Graphire4 4x5", 8, 10208, 7424, 511, 63, WACOM_G4 },
797-
{ "Wacom Graphire4 6x8", 8, 16704, 12064, 511, 63, WACOM_G4 },
798-
{ "Wacom BambooFun 4x5", 9, 14760, 9225, 511, 63, WACOM_MO },
799-
{ "Wacom BambooFun 6x8", 9, 21648, 13530, 511, 63, WACOM_MO },
800-
{ "Wacom Bamboo1 Medium",8, 16704, 12064, 511, 63, GRAPHIRE },
801-
{ "Wacom Volito", 8, 5104, 3712, 511, 63, GRAPHIRE },
802-
{ "Wacom PenStation2", 8, 3250, 2320, 255, 63, GRAPHIRE },
803-
{ "Wacom Volito2 4x5", 8, 5104, 3712, 511, 63, GRAPHIRE },
804-
{ "Wacom Volito2 2x3", 8, 3248, 2320, 511, 63, GRAPHIRE },
805-
{ "Wacom PenPartner2", 8, 3250, 2320, 511, 63, GRAPHIRE },
806-
{ "Wacom Bamboo", 9, 14760, 9225, 511, 63, WACOM_MO },
807-
{ "Wacom Bamboo1", 8, 5104, 3712, 511, 63, GRAPHIRE },
808-
{ "Wacom Intuos 4x5", 10, 12700, 10600, 1023, 31, INTUOS },
809-
{ "Wacom Intuos 6x8", 10, 20320, 16240, 1023, 31, INTUOS },
810-
{ "Wacom Intuos 9x12", 10, 30480, 24060, 1023, 31, INTUOS },
811-
{ "Wacom Intuos 12x12", 10, 30480, 31680, 1023, 31, INTUOS },
812-
{ "Wacom Intuos 12x18", 10, 45720, 31680, 1023, 31, INTUOS },
813-
{ "Wacom PL400", 8, 5408, 4056, 255, 0, PL },
814-
{ "Wacom PL500", 8, 6144, 4608, 255, 0, PL },
815-
{ "Wacom PL600", 8, 6126, 4604, 255, 0, PL },
816-
{ "Wacom PL600SX", 8, 6260, 5016, 255, 0, PL },
817-
{ "Wacom PL550", 8, 6144, 4608, 511, 0, PL },
818-
{ "Wacom PL800", 8, 7220, 5780, 511, 0, PL },
819-
{ "Wacom PL700", 8, 6758, 5406, 511, 0, PL },
820-
{ "Wacom PL510", 8, 6282, 4762, 511, 0, PL },
821-
{ "Wacom DTU710", 8, 34080, 27660, 511, 0, PL },
822-
{ "Wacom DTF521", 8, 6282, 4762, 511, 0, PL },
823-
{ "Wacom DTF720", 8, 6858, 5506, 511, 0, PL },
824-
{ "Wacom DTU1931", 8, 37832, 30305, 511, 0, PL },
825-
{ "Wacom Cintiq Partner",8, 20480, 15360, 511, 0, PTU },
826-
{ "Wacom Intuos2 4x5", 10, 12700, 10600, 1023, 31, INTUOS },
827-
{ "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 31, INTUOS },
828-
{ "Wacom Intuos2 9x12", 10, 30480, 24060, 1023, 31, INTUOS },
829-
{ "Wacom Intuos2 12x12", 10, 30480, 31680, 1023, 31, INTUOS },
830-
{ "Wacom Intuos2 12x18", 10, 45720, 31680, 1023, 31, INTUOS },
831-
{ "Wacom Intuos3 4x5", 10, 25400, 20320, 1023, 63, INTUOS3S },
832-
{ "Wacom Intuos3 6x8", 10, 40640, 30480, 1023, 63, INTUOS3 },
833-
{ "Wacom Intuos3 9x12", 10, 60960, 45720, 1023, 63, INTUOS3 },
834-
{ "Wacom Intuos3 12x12", 10, 60960, 60960, 1023, 63, INTUOS3L },
835-
{ "Wacom Intuos3 12x19", 10, 97536, 60960, 1023, 63, INTUOS3L },
836-
{ "Wacom Intuos3 6x11", 10, 54204, 31750, 1023, 63, INTUOS3 },
837-
{ "Wacom Intuos3 4x6", 10, 31496, 19685, 1023, 63, INTUOS3S },
838-
{ "Wacom Intuos4 4x6", 10, 31496, 19685, 2047, 63, INTUOS4S },
839-
{ "Wacom Intuos4 6x9", 10, 44704, 27940, 2047, 63, INTUOS4 },
840-
{ "Wacom Intuos4 8x13", 10, 65024, 40640, 2047, 63, INTUOS4L },
841-
{ "Wacom Intuos4 12x19", 10, 97536, 60960, 2047, 63, INTUOS4L },
842-
{ "Wacom Cintiq 21UX", 10, 87200, 65600, 1023, 63, CINTIQ },
843-
{ "Wacom Cintiq 20WSX", 10, 86680, 54180, 1023, 63, WACOM_BEE },
844-
{ "Wacom Cintiq 12WX", 10, 53020, 33440, 1023, 63, WACOM_BEE },
845-
{ "Wacom ISDv4 90", 8, 26202, 16325, 255, 0, TABLETPC },
846-
{ "Wacom ISDv4 93", 8, 26202, 16325, 255, 0, TABLETPC },
847-
{ "Wacom ISDv4 9A", 8, 26202, 16325, 255, 0, TABLETPC },
848-
{ "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 31, INTUOS },
791+
{ "Wacom Penpartner", 7, 5040, 3780, 255, 0, PENPARTNER },
792+
{ "Wacom Graphire", 8, 10206, 7422, 511, 63, GRAPHIRE },
793+
{ "Wacom Graphire2 4x5", 8, 10206, 7422, 511, 63, GRAPHIRE },
794+
{ "Wacom Graphire2 5x7", 8, 13918, 10206, 511, 63, GRAPHIRE },
795+
{ "Wacom Graphire3", 8, 10208, 7424, 511, 63, GRAPHIRE },
796+
{ "Wacom Graphire3 6x8", 8, 16704, 12064, 511, 63, GRAPHIRE },
797+
{ "Wacom Graphire4 4x5", 8, 10208, 7424, 511, 63, WACOM_G4 },
798+
{ "Wacom Graphire4 6x8", 8, 16704, 12064, 511, 63, WACOM_G4 },
799+
{ "Wacom BambooFun 4x5", 9, 14760, 9225, 511, 63, WACOM_MO },
800+
{ "Wacom BambooFun 6x8", 9, 21648, 13530, 511, 63, WACOM_MO },
801+
{ "Wacom Bamboo1 Medium", 8, 16704, 12064, 511, 63, GRAPHIRE },
802+
{ "Wacom Volito", 8, 5104, 3712, 511, 63, GRAPHIRE },
803+
{ "Wacom PenStation2", 8, 3250, 2320, 255, 63, GRAPHIRE },
804+
{ "Wacom Volito2 4x5", 8, 5104, 3712, 511, 63, GRAPHIRE },
805+
{ "Wacom Volito2 2x3", 8, 3248, 2320, 511, 63, GRAPHIRE },
806+
{ "Wacom PenPartner2", 8, 3250, 2320, 511, 63, GRAPHIRE },
807+
{ "Wacom Bamboo", 9, 14760, 9225, 511, 63, WACOM_MO },
808+
{ "Wacom Bamboo1", 8, 5104, 3712, 511, 63, GRAPHIRE },
809+
{ "Wacom Intuos 4x5", 10, 12700, 10600, 1023, 31, INTUOS },
810+
{ "Wacom Intuos 6x8", 10, 20320, 16240, 1023, 31, INTUOS },
811+
{ "Wacom Intuos 9x12", 10, 30480, 24060, 1023, 31, INTUOS },
812+
{ "Wacom Intuos 12x12", 10, 30480, 31680, 1023, 31, INTUOS },
813+
{ "Wacom Intuos 12x18", 10, 45720, 31680, 1023, 31, INTUOS },
814+
{ "Wacom PL400", 8, 5408, 4056, 255, 0, PL },
815+
{ "Wacom PL500", 8, 6144, 4608, 255, 0, PL },
816+
{ "Wacom PL600", 8, 6126, 4604, 255, 0, PL },
817+
{ "Wacom PL600SX", 8, 6260, 5016, 255, 0, PL },
818+
{ "Wacom PL550", 8, 6144, 4608, 511, 0, PL },
819+
{ "Wacom PL800", 8, 7220, 5780, 511, 0, PL },
820+
{ "Wacom PL700", 8, 6758, 5406, 511, 0, PL },
821+
{ "Wacom PL510", 8, 6282, 4762, 511, 0, PL },
822+
{ "Wacom DTU710", 8, 34080, 27660, 511, 0, PL },
823+
{ "Wacom DTF521", 8, 6282, 4762, 511, 0, PL },
824+
{ "Wacom DTF720", 8, 6858, 5506, 511, 0, PL },
825+
{ "Wacom DTU1931", 8, 37832, 30305, 511, 0, PL },
826+
{ "Wacom Cintiq Partner", 8, 20480, 15360, 511, 0, PTU },
827+
{ "Wacom Intuos2 4x5", 10, 12700, 10600, 1023, 31, INTUOS },
828+
{ "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 31, INTUOS },
829+
{ "Wacom Intuos2 9x12", 10, 30480, 24060, 1023, 31, INTUOS },
830+
{ "Wacom Intuos2 12x12", 10, 30480, 31680, 1023, 31, INTUOS },
831+
{ "Wacom Intuos2 12x18", 10, 45720, 31680, 1023, 31, INTUOS },
832+
{ "Wacom Intuos3 4x5", 10, 25400, 20320, 1023, 63, INTUOS3S },
833+
{ "Wacom Intuos3 6x8", 10, 40640, 30480, 1023, 63, INTUOS3 },
834+
{ "Wacom Intuos3 9x12", 10, 60960, 45720, 1023, 63, INTUOS3 },
835+
{ "Wacom Intuos3 12x12", 10, 60960, 60960, 1023, 63, INTUOS3L },
836+
{ "Wacom Intuos3 12x19", 10, 97536, 60960, 1023, 63, INTUOS3L },
837+
{ "Wacom Intuos3 6x11", 10, 54204, 31750, 1023, 63, INTUOS3 },
838+
{ "Wacom Intuos3 4x6", 10, 31496, 19685, 1023, 63, INTUOS3S },
839+
{ "Wacom Intuos4 4x6", 10, 31496, 19685, 2047, 63, INTUOS4S },
840+
{ "Wacom Intuos4 6x9", 10, 44704, 27940, 2047, 63, INTUOS4 },
841+
{ "Wacom Intuos4 8x13", 10, 65024, 40640, 2047, 63, INTUOS4L },
842+
{ "Wacom Intuos4 12x19", 10, 97536, 60960, 2047, 63, INTUOS4L },
843+
{ "Wacom Cintiq 21UX", 10, 87200, 65600, 1023, 63, CINTIQ },
844+
{ "Wacom Cintiq 20WSX", 10, 86680, 54180, 1023, 63, WACOM_BEE },
845+
{ "Wacom Cintiq 12WX", 10, 53020, 33440, 1023, 63, WACOM_BEE },
846+
{ "Wacom Graphire Bluetooth", 8, 10208, 7424, 511, 63, WACOM_G4 },
847+
{ "Wacom ISDv4 90", 8, 26202, 16325, 255, 0, TABLETPC },
848+
{ "Wacom ISDv4 93", 8, 26202, 16325, 255, 0, TABLETPC },
849+
{ "Wacom ISDv4 9A", 8, 26202, 16325, 255, 0, TABLETPC },
850+
{ "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 31, INTUOS },
849851
{ }
850852
};
851853

@@ -905,6 +907,7 @@ static struct usb_device_id wacom_ids[] = {
905907
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F) },
906908
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC5) },
907909
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC6) },
910+
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x81) },
908911
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x90) },
909912
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x93) },
910913
{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x9A) },

‎src/2.6.28/Makefile.in

-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ export WCM_OPTION_WACOM
2424
all:
2525
# Copy Wacom specific code which is common to all kernel releases
2626
ifeq ($(WCM_OPTION_WACOM),yes)
27-
cp -f ../2.6.19/wacom_wac.c .
28-
cp -f ../2.6.22/wacom_wac.h .
2927
cp -f ../2.6.27/wacom.h .
3028
endif
3129
@echo ' Building linuxwacom drivers for 2.6 kernel.'

‎src/2.6.28/wacom_sys.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
491491
* Ask the tablet to report tablet data if it is not a Tablet PC.
492492
* Repeat until it succeeds
493493
*/
494-
if (wacom_wac->features->type != TABLETPC) {
494+
if ((wacom_wac->features->type != TABLETPC) && (wacom_wac->features->type != WACOM_GB)) {
495495
do {
496496
rep_data[0] = 2;
497497
rep_data[1] = 2;

‎src/2.6.9/wacom.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -644,14 +644,14 @@ static int wacom_intuos_inout(struct urb *urb)
644644
input_report_abs(dev, ABS_RZ, 0);
645645
} else {
646646
input_report_abs(dev, ABS_PRESSURE, 0);
647-
input_report_abs(dev, ABS_TILT_X, 0);
648-
input_report_abs(dev, ABS_TILT_Y, 0);
649647
input_report_key(dev, BTN_STYLUS, 0);
650648
input_report_key(dev, BTN_STYLUS2, 0);
651649
input_report_key(dev, BTN_TOUCH, 0);
652650
input_report_abs(dev, ABS_WHEEL, 0);
653651
input_report_abs(dev, ABS_Z, 0);
654652
}
653+
input_report_abs(dev, ABS_TILT_X, 0);
654+
input_report_abs(dev, ABS_TILT_Y, 0);
655655
input_report_key(dev, wacom->tool[idx], 0);
656656
input_report_abs(dev, ABS_MISC, 0); /* reset tool id */
657657
input_event(dev, EV_MSC, MSC_SERIAL, wacom->serial[idx]);

‎src/include/Xwacom.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@
9696
#define XWACOM_PARAM_TVRESOLUTION1 208
9797
#define XWACOM_PARAM_COREEVENT 209
9898
#define XWACOM_PARAM_THRESHOLD 210
99+
#define XWACOM_PARAM_TOOLSERIAL 211
99100

100101
#define XWACOM_PARAM_GETONLYPARAM 320
101102
#define XWACOM_PARAM_TID 321
102103
#define XWACOM_PARAM_TOOLID 322
103-
#define XWACOM_PARAM_TOOLSERIAL 323
104104
#define XWACOM_PARAM_NUMSCREEN 350
105105
#define XWACOM_PARAM_STOPX0 351
106106
#define XWACOM_PARAM_STOPY0 352

0 commit comments

Comments
 (0)