diff options
Diffstat (limited to 'driver/xf86-input-elo2300')
| -rw-r--r-- | driver/xf86-input-elo2300/ChangeLog | 280 | ||||
| -rw-r--r-- | driver/xf86-input-elo2300/Makefile.am | 8 | ||||
| -rw-r--r-- | driver/xf86-input-elo2300/configure.ac | 2 | ||||
| -rw-r--r-- | driver/xf86-input-elo2300/man/Makefile.am | 1 | ||||
| -rw-r--r-- | driver/xf86-input-elo2300/src/elo.c | 14 |
5 files changed, 271 insertions, 34 deletions
diff --git a/driver/xf86-input-elo2300/ChangeLog b/driver/xf86-input-elo2300/ChangeLog index c36fca196..e6ab5f615 100644 --- a/driver/xf86-input-elo2300/ChangeLog +++ b/driver/xf86-input-elo2300/ChangeLog @@ -1,45 +1,269 @@ -2006-04-06 Adam Jackson <ajax@freedesktop.org> +commit 585245ac87ce421acd890f065dbcb187ed901c1a +Author: Adam Jackson <ajax@redhat.com> +Date: Wed May 21 14:54:57 2008 -0400 - * configure.ac: - * src/elo.c: - Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + elo2300 1.1.2 -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 2c8df6b6d097f93c5a8ccd085aa33f09dddde969 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Sat Apr 5 02:29:51 2008 -0300 - * configure.ac: - Update package version for X11R7 release. + Don't call xf86GetErrno(), instead use errno directly. + + Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au> -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit e807e5a88af379cad14331b787ed32a45553f8f3 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Wed Jan 30 17:03:05 2008 -0200 - * configure.ac: - Update package version number for final X11R7 release candidate. + Don't call xf86AddLocalDevice and xf86XInputSetSendCoreEvents. + + Only call those functions if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0. -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit b243a4a8eaadbd7d5115e0a14c494c242b79da80 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Mon Sep 10 18:38:03 2007 +0200 - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + Bumped version to 1.1.1. -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 07f187d8c882a853491e5810df9015d4a34ab5b4 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Mon Sep 10 18:37:32 2007 +0200 - * configure.ac: - Update package version number for X11R7 RC3 release. + Generate ChangeLog from git. -2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 7ce7f2cbe022222a73248a318e75d9c42ca8a5a7 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:52:06 2007 -0400 - * configure.ac: - Remove extraneous AC_MSG_RESULT. + Add *~ to .gitignore to skip patch/emacs droppings -2005-11-29 Adam Jackson <ajax@freedesktop.org> +commit c75cc4de22637732dac647f4cba852af376e09d3 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:25:24 2007 -0400 - * configure.ac: - Only build dlloader modules by default. + Rename .cvsignore to .gitignore -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 46c3fa9d4f62b6dae97ff598efc3a3a90f470501 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Aug 8 00:59:15 2007 +0300 - * configure.ac: - Update package version number for X11R7 RC2 release. + Convert from TSCalibrationCtl to AbsCalibCtl -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 0b7b6b4f17e9e258f546fbe3eb901fea16a4a62c +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Aug 8 00:58:54 2007 +0300 - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. + Remove useless debugging statement + +commit c80b29b22a6b30846fd43c6f3e43e70639071c3e +Author: Brice Goglin <bgoglin@debian.org> +Date: Mon Aug 6 22:34:31 2007 +0200 + + Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in VersionRec + +commit d99906117a5718a87959187a8d9d925fab87d4da +Author: Adam Jackson <ajax@nwnk.net> +Date: Fri Apr 7 17:18:35 2006 +0000 + + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + +commit 0d6876589f98d6ec2272af1bd6e574e0a1984ec2 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Dec 21 02:29:56 2005 +0000 + + Update package version for X11R7 release. + +commit bb7d4253fb69cf03a491b3978f59e8be0936f56a +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Dec 19 16:25:50 2005 +0000 + + Stub COPYING files + +commit 11b037940716176c23afb95eace5e8b58df19a9b +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:14 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 4d5354cda99932fb60546dc3fd404c1ae7672d23 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Dec 6 22:48:28 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit 445aec41ad0849891526572b0a0959e4f35119cf +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:30 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 5cd4e2dc7450c9e15339c89f0eedf850b7e1125f +Author: Kevin E Martin <kem@kem.org> +Date: Fri Dec 2 02:16:04 2005 +0000 + + Remove extraneous AC_MSG_RESULT. + +commit 28f25db6de8e0370e3d3b7c82874b1fc662786f3 +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Nov 29 23:29:55 2005 +0000 + + Only build dlloader modules by default. + +commit 7bd96934500c6e5d95a47db942717a8f7b355ba4 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Nov 28 22:04:06 2005 +0000 + + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 + update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) + +commit f7ed9d21fff320201bffec8d82b687e9a0dd4967 +Author: Eric Anholt <anholt@freebsd.org> +Date: Mon Nov 21 10:49:03 2005 +0000 + + Add .cvsignores for drivers. + +commit 9d44ea55e33d0fb5a5fe286877bafb780b420e0b +Author: Kevin E Martin <kem@kem.org> +Date: Wed Nov 9 21:15:11 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit bc7252de45ecf18a4f2e5f8724d85da038e2775c +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 1 15:08:49 2005 +0000 + + Update pkgcheck depedencies to work with separate build roots. + +commit 01f585199be704deed405722ceb104f455c23bf4 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Oct 19 02:48:00 2005 +0000 + + Update package version number for RC1 release. + +commit e8758d4c0ac66e7e7f3a9cfdf48cd4cead569004 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Oct 18 15:46:36 2005 +0000 + + Do the following to make the drivers pass distcheck: + - Only define EXTRA_DIST when there are actually man pages to be processed + - Add missing man pages to keyboard and ati drivers EXTRA_DIST + +commit 81427fa6f0300cfcd5f6c08036e3abd8ce9dc98c +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Oct 18 00:01:50 2005 +0000 + + Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro + substitutions to work better with BSD make + +commit 3daac7af59740fe39dc6956a13cf024f0cf6734d +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Oct 17 22:57:27 2005 +0000 + + More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead + of indirectly + +commit c7fc74e044cde765bd17285e839e5c592d9b34b7 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Oct 17 00:08:55 2005 +0000 + + Use sed & cpp to substitute variables in driver man pages + +commit f9b8b11457ec43140790f8f8921b7c0ab197d1b5 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Aug 18 09:03:38 2005 +0000 + + Update autogen.sh to one that does objdir != srcdir. + +commit 17b08a86ff73fa1e466889450fd50518733356bb +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Date: Wed Aug 10 14:07:22 2005 +0000 + + Don\'t lose existing CFLAGS in all the input drivers and some of the video + drivers + +commit 895141c36d4cda1cd991da28bd116f9ce6a1a086 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:40 2005 +0000 + + Various changes preparing packages for RC0: + - Verify and update package version numbers as needed + - Implement versioning scheme + - Change bug address to point to bugzilla bug entry form + - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to + reenable it) + - Fix makedepend to use pkgconfig and pass distcheck + - Update build script to build macros first + - Update modular Xorg version + +commit 2295b83544576cae9da43304aff5e5be71195ea3 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 20:03:21 2005 +0000 + + Make the module dir configurable + +commit c1a824048051fc5e826ce96a555b706a1e4a015c +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 02:20:59 2005 +0000 + + Update all input drivers to pass distcheck + +commit b230244cdf99e2f7b06efd8ffd1651dbd12dc248 +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Jul 12 06:15:08 2005 +0000 + + Build skeletons for input drivers. Should basically work. + +commit 6d29f6326c7d84e91fd8f098e5cf824e7a1b4b99 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Jul 11 02:37:59 2005 +0000 + + Prep input drivers for modularizing by adding guarded #include "config.h" + +commit dbfc977f2bce5b7443fbac37c60e93901e8d2b15 +Author: Adam Jackson <ajax@nwnk.net> +Date: Sat Jun 25 21:17:01 2005 +0000 + + Bug #3626: _X_EXPORT tags for video and input drivers. + +commit aa2adeb9bf82cbff5c160eb347e429860c370361 +Author: Egbert Eich <eich@suse.de> +Date: Fri Apr 23 19:54:02 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit aa36c590fefa3695b7311648aa8490407da1573c +Author: Egbert Eich <eich@suse.de> +Date: Sun Mar 14 08:33:51 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit c4326a81952c6328da61cd8ce625d1a1e6169f84 +Author: Egbert Eich <eich@suse.de> +Date: Wed Mar 3 12:12:33 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 92a56ab2cc652f41d73b9c9e23dedb79a31afd01 +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 13:36:00 2004 +0000 + + readding XFree86's cvs IDs + +commit fbd3d8bddebbf82e2085aa0be3474502f21f8b13 +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 09:23:34 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit d4e069f987bc046c06830370cee997d1a18041a2 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + XFree86 4.3.0.1 + +commit d1b8d291ae597ccb4822bf464c60e6cf2b59dca7 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + Initial revision diff --git a/driver/xf86-input-elo2300/Makefile.am b/driver/xf86-input-elo2300/Makefile.am index 7052905f3..42f8b5498 100644 --- a/driver/xf86-input-elo2300/Makefile.am +++ b/driver/xf86-input-elo2300/Makefile.am @@ -20,3 +20,11 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man + +CLEANFILES = ChangeLog +EXTRA_DIST = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) diff --git a/driver/xf86-input-elo2300/configure.ac b/driver/xf86-input-elo2300/configure.ac index 37dfef1f7..5e8bc6c68 100644 --- a/driver/xf86-input-elo2300/configure.ac +++ b/driver/xf86-input-elo2300/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-elo2300], - 1.1.0, + 1.1.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-elo2300) diff --git a/driver/xf86-input-elo2300/man/Makefile.am b/driver/xf86-input-elo2300/man/Makefile.am index 60a797f7e..5d934761e 100644 --- a/driver/xf86-input-elo2300/man/Makefile.am +++ b/driver/xf86-input-elo2300/man/Makefile.am @@ -1,3 +1,4 @@ +# $Id: Makefile.am,v 1.3 2008/08/23 13:42:25 matthieu Exp $ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # diff --git a/driver/xf86-input-elo2300/src/elo.c b/driver/xf86-input-elo2300/src/elo.c index cbc1c9c7e..5ed67f069 100644 --- a/driver/xf86-input-elo2300/src/elo.c +++ b/driver/xf86-input-elo2300/src/elo.c @@ -54,6 +54,8 @@ #include "config.h" #endif +#include <errno.h> + #define _elo_C_ /***************************************************************************** * Standard Headers @@ -87,7 +89,7 @@ static XF86ModuleVersionInfo VersionRec = MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - 1, 1, 0, + PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, @@ -159,7 +161,7 @@ SetupProc( pointer module, { xf86ErrorF ("ELO 2300 driver unable to open device\n"); *errmaj = LDR_NOPORTOPEN; - *errmin = xf86GetErrno (); + *errmin = errno; goto SetupProc_fail; } xf86ErrorFVerb( 6, "tty port opened successfully\n" ); @@ -183,8 +185,6 @@ SetupProc( pointer module, priv->buffer = XisbNew (local->fd, 200); priv->button_down = FALSE; - DBG (9, XisbTrace (priv->buffer, 1)); - EloNewPacket (priv); if (QueryHardware (priv, errmaj, errmin) != Success) { @@ -206,7 +206,9 @@ SetupProc( pointer module, local->private_flags = 0; local->history_size = xf86SetIntOption( merged, "HistorySize", 0 ); +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 xf86AddLocalDevice (local, merged); +#endif /* prepare to process touch packets */ EloNewPacket (priv); @@ -457,7 +459,7 @@ static int ControlProc( LocalDevicePtr local, xDeviceCtl * control ) { - xDeviceTSCalibrationCtl *c = (xDeviceTSCalibrationCtl *) control; + xDeviceAbsCalibCtl *c = (xDeviceAbsCalibCtl *) control; EloPrivatePtr priv = (EloPrivatePtr) (local->private); priv->min_x = c->min_x; @@ -490,11 +492,13 @@ SwitchMode( ClientPtr client, priv->reporting_mode = mode; return (Success); } +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 else if ((mode == SendCoreEvents) || (mode == DontSendCoreEvents)) { xf86XInputSetSendCoreEvents (local, (mode == SendCoreEvents)); return (Success); } +#endif else return (!Success); } |