Makefile.in | 4
config.sub | 14 +
configure | 146 ++++++++-----
configure.ac | 42 ++-
debian/changelog | 8
debian/control | 6
debian/patches/01_fix_module_version.patch | 17 -
debian/patches/series | 1
man/Makefile.in | 4
man/joystick.man | 13 -
src/Makefile.am | 17 +
src/Makefile.in | 34 ++-
src/bsd_jstk.c | 315 +++++++++++++++++++++++++++++
src/jstk.c | 131 ++++--------
src/jstk.h | 130 ++++++-----
src/jstk_axis.c | 40 ++-
src/jstk_hw.h | 38 +++
src/jstk_options.c | 29 +-
src/jstk_options.h | 2
src/linux_jstk.c | 53 ++--
src/linux_jstk.h | 33 ---
21 files changed, 737 insertions(+), 340 deletions(-)
New commits:
commit 5d0ccbfc8e2182f34c8c0b56e52bed689e98fc2c
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Sat Apr 21 03:56:20 2007 +0200
New upstream release 1.2.1.
* Drop 01_fix_module_version.patch, integrated upstream.
* Add XS-Vcs-*.
* Add a link to www.X.org and a reference to the xf86-input-joystick
module in the long description.
diff --git a/Makefile.in b/Makefile.in
index d50b00f..dac60ae 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,6 +104,8 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BSD_FALSE = @BSD_FALSE@
+BSD_TRUE = @BSD_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -140,6 +142,8 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINUX_FALSE = @LINUX_FALSE@
+LINUX_TRUE = @LINUX_TRUE@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
diff --git a/config.sub b/config.sub
index 387c18d..fab0aa3 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2006-09-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -276,6 +276,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
+ | score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle |
sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet |
sparclite \
@@ -284,7 +285,7 @@ case $basic_machine in
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -367,7 +368,7 @@ case $basic_machine in
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
@@ -909,6 +910,10 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -1366,6 +1371,9 @@ else
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
spu-*)
os=-elf
;;
diff --git a/configure b/configure
index 8c5a757..a6ee897 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-input-joystick 1.2.0.
+# Generated by GNU Autoconf 2.61 for xf86-input-joystick 1.2.1.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-input-joystick'
PACKAGE_TARNAME='xf86-input-joystick'
-PACKAGE_VERSION='1.2.0'
-PACKAGE_STRING='xf86-input-joystick 1.2.0'
+PACKAGE_VERSION='1.2.1'
+PACKAGE_STRING='xf86-input-joystick 1.2.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -873,6 +873,10 @@ F77
FFLAGS
ac_ct_F77
LIBTOOL
+LINUX_TRUE
+LINUX_FALSE
+BSD_TRUE
+BSD_FALSE
inputdir
PKG_CONFIG
XORG_CFLAGS
@@ -1412,7 +1416,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-input-joystick 1.2.0 to adapt to many kinds of
systems.
+\`configure' configures xf86-input-joystick 1.2.1 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1482,7 +1486,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-input-joystick 1.2.0:";;
+ short | recursive ) echo "Configuration of xf86-input-joystick 1.2.1:";;
esac
cat <<\_ACEOF
@@ -1594,7 +1598,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-input-joystick configure 1.2.0
+xf86-input-joystick configure 1.2.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1608,7 +1612,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-input-joystick $as_me 1.2.0, which was
+It was created by xf86-input-joystick $as_me 1.2.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2280,7 +2284,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-input-joystick'
- VERSION='1.2.0'
+ VERSION='1.2.1'
cat >>confdefs.h <<_ACEOF
@@ -4349,7 +4353,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4352 "configure"' > conftest.$ac_ext
+ echo '#line 4356 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7081,11 +7085,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7084: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7088: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7088: \$? = $ac_status" >&5
+ echo "$as_me:7092: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7349,11 +7353,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7352: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7356: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7356: \$? = $ac_status" >&5
+ echo "$as_me:7360: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7453,11 +7457,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7456: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7460: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7460: \$? = $ac_status" >&5
+ echo "$as_me:7464: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9750,7 +9754,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9753 "configure"
+#line 9757 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9850,7 +9854,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9853 "configure"
+#line 9857 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12186,11 +12190,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12189: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12193: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12193: \$? = $ac_status" >&5
+ echo "$as_me:12197: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12290,11 +12294,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12293: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12297: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12297: \$? = $ac_status" >&5
+ echo "$as_me:12301: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13851,11 +13855,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13854: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13858: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13858: \$? = $ac_status" >&5
+ echo "$as_me:13862: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13955,11 +13959,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13958: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13962: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13962: \$? = $ac_status" >&5
+ echo "$as_me:13966: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16142,11 +16146,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16145: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16149: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16149: \$? = $ac_status" >&5
+ echo "$as_me:16153: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16410,11 +16414,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16413: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16417: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16417: \$? = $ac_status" >&5
+ echo "$as_me:16421: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16514,11 +16518,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16517: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16521: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16521: \$? = $ac_status" >&5
+ echo "$as_me:16525: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -19954,23 +19958,45 @@ fi
-#AC_DEFINE(XFree86LOADER,1,[Stub define for loadable drivers])
-#
-#AC_ARG_ENABLE(XINPUT, AS_HELP_STRING([--enable-xinput],
-# [Build XInput support (default: yes)]),
-# [XINPUT=$enableval],[XINPUT=yes])
-#AM_CONDITIONAL(XINPUT, test "x$XINPUT" = "xyes")
-#if test "x$XINPUT" = "xyes" ; then
-# AC_DEFINE(XINPUT,1,[Enable XInput support])
-#fi
-#
-#AC_ARG_ENABLE(XKB, AS_HELP_STRING([--enable-xkb],
-# [Build XKB support (default: yes)]),
-# [XKB=$enableval],[XKB=yes])
-#AM_CONDITIONAL(XKB, test "x$XKB" = "xyes")
-#if test "x$XKB" = "xyes" ; then
-# AC_DEFINE(XKB,1,[Enable XKB support])
-#fi
+case $host_os in
+ linux*)
+ IS_LINUX="yes"
+ ;;
+
+ freebsd* | kfreebsd-gnu* | netbsd* | openbsd*)
+ IS_BSD="yes"
+ ;;
+
+ *)
+ { { echo "$as_me:$LINENO: error: Your operating system is not supported by
the joystick
+ driver. Contact [EMAIL PROTECTED] if you are
+ interested in porting it." >&5
+echo "$as_me: error: Your operating system is not supported by the joystick
+ driver. Contact [EMAIL PROTECTED] if you are
+ interested in porting it." >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+esac
+
+
+if test "x$IS_LINUX" = xyes; then
+ LINUX_TRUE=
+ LINUX_FALSE='#'
+else
+ LINUX_TRUE='#'
+ LINUX_FALSE=
+fi
+
+
+
+if test "x$IS_BSD" = xyes; then
+ BSD_TRUE=
+ BSD_FALSE='#'
+else
+ BSD_TRUE='#'
+ BSD_FALSE=
+fi
+
# Check whether --with-xorg-module-dir was given.
@@ -20760,6 +20786,20 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was
never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${LINUX_TRUE}" && test -z "${LINUX_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"LINUX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"LINUX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${BSD_TRUE}" && test -z "${BSD_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"BSD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BSD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -21060,7 +21100,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-input-joystick $as_me 1.2.0, which was
+This file was extended by xf86-input-joystick $as_me 1.2.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21113,7 +21153,7 @@ Report bugs to <[EMAIL PROTECTED]>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-input-joystick config.status 1.2.0
+xf86-input-joystick config.status 1.2.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
@@ -21438,6 +21478,10 @@ F77!$F77$ac_delim
FFLAGS!$FFLAGS$ac_delim
ac_ct_F77!$ac_ct_F77$ac_delim
LIBTOOL!$LIBTOOL$ac_delim
+LINUX_TRUE!$LINUX_TRUE$ac_delim
+LINUX_FALSE!$LINUX_FALSE$ac_delim
+BSD_TRUE!$BSD_TRUE$ac_delim
+BSD_FALSE!$BSD_FALSE$ac_delim
inputdir!$inputdir$ac_delim
PKG_CONFIG!$PKG_CONFIG$ac_delim
XORG_CFLAGS!$XORG_CFLAGS$ac_delim
@@ -21458,7 +21502,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 25; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/debian/changelog b/debian/changelog
index ee220e0..7fbe3f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-xserver-xorg-input-joystick (1:1.2.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-joystick (1:1.2.1-1) UNRELEASED; urgency=low
* New upstream release.
- * Add 01_fix_module_version.patch.
+ * Add XS-Vcs-*.
+ * Add a link to www.X.org and a reference to the xf86-input-joystick
+ module in the long description.
- -- Brice Goglin <[EMAIL PROTECTED]> Sun, 01 Apr 2007 13:13:25 +0200
+ -- Brice Goglin <[EMAIL PROTECTED]> Sat, 21 Apr 2007 03:45:07 +0200
xserver-xorg-input-joystick (1:1.1.1-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 39b1ce3..552d1c8 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,8 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>, Drew Parsons <[EMAIL
PROTECTED]>
Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.2.0-3),
x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev
Standards-Version: 3.7.2
+XS-Vcs-Git:
git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick
+XS-Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-joystick.git
Package: xserver-xorg-input-joystick
Architecture: any
@@ -15,8 +17,8 @@ Description: X.Org X server -- joystick input driver
This package provides the driver for joysticks.
.
More information about X.Org can be found at:
+ <URL:http://www.X.org>
<URL:http://xorg.freedesktop.org>
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
.
- This module can be found as the module 'driver/xf86-input-joystick' at
- :pserver:[EMAIL PROTECTED]:/cvs/xorg
+ This package is built from the X.org xf86-input-joystick driver module.
diff --git a/debian/patches/01_fix_module_version.patch
b/debian/patches/01_fix_module_version.patch
deleted file mode 100644
index d030259..0000000
--- a/debian/patches/01_fix_module_version.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- src/jstk.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: xserver-xorg-input-joystick/src/jstk.c
-===================================================================
---- xserver-xorg-input-joystick.orig/src/jstk.c 2007-04-01
12:55:54.000000000 +0200
-+++ xserver-xorg-input-joystick/src/jstk.c 2007-04-01 12:57:31.000000000
+0200
-@@ -610,7 +610,7 @@
- MODINFOSTRING1,
- MODINFOSTRING2,
- XORG_VERSION_CURRENT,
-- 1, 1, 1,
-+ PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR,
PACKAGE_VERSION_PATCHLEVEL,
- ABI_CLASS_XINPUT,
- ABI_XINPUT_VERSION,
- MOD_CLASS_XINPUT,
diff --git a/debian/patches/series b/debian/patches/series
index 3e5b4ed..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-01_fix_module_version.patch
diff --git a/man/Makefile.in b/man/Makefile.in
index 18ecdff..ec23fb7 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -97,6 +97,8 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BSD_FALSE = @BSD_FALSE@
+BSD_TRUE = @BSD_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -133,6 +135,8 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINUX_FALSE = @LINUX_FALSE@
+LINUX_TRUE = @LINUX_TRUE@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
diff --git a/src/Makefile.in b/src/Makefile.in
index 1a00d2b..5100497 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -56,6 +56,9 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
[EMAIL PROTECTED]@am__append_1 = $(BSD_SRCS)
[EMAIL PROTECTED]@am__append_2 = -lusbhid
[EMAIL PROTECTED]@am__append_3 = $(LINUX_SRCS)
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -75,8 +78,15 @@ am__installdirs = "$(DESTDIR)$(@[EMAIL PROTECTED])"
@[EMAIL PROTECTED] = $(INSTALL)
LTLIBRARIES = $(@[EMAIL PROTECTED])
@[EMAIL PROTECTED] =
[EMAIL PROTECTED]@_drv_la_OBJECTS = jstk.lo linux_jstk.lo jstk_axis.lo \
- jstk_options.lo
[EMAIL PROTECTED]@_drv_la_SOURCES_DIST = jstk.c jstk.h jstk_hw.h \
+ jstk_axis.c jstk_axis.h jstk_options.c jstk_options.h \
+ bsd_jstk.c linux_jstk.c
+am__objects_1 = bsd_jstk.lo
[EMAIL PROTECTED]@am__objects_2 = $(am__objects_1)
+am__objects_3 = linux_jstk.lo
[EMAIL PROTECTED]@am__objects_4 = $(am__objects_3)
[EMAIL PROTECTED]@_drv_la_OBJECTS = jstk.lo jstk_axis.lo jstk_options.lo \
+ $(am__objects_2) $(am__objects_4)
@[EMAIL PROTECTED] = $([EMAIL PROTECTED]@_drv_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -90,7 +100,7 @@ CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(@[EMAIL PROTECTED])
-DIST_SOURCES = $(@[EMAIL PROTECTED])
+DIST_SOURCES = $([EMAIL PROTECTED]@_drv_la_SOURCES_DIST)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -107,6 +117,8 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BSD_FALSE = @BSD_FALSE@
+BSD_TRUE = @BSD_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -143,6 +155,8 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINUX_FALSE = @LINUX_FALSE@
+LINUX_TRUE = @LINUX_TRUE@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -222,13 +236,14 @@ target_alias = @target_alias@
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
@[EMAIL PROTECTED] = @[EMAIL PROTECTED]
[EMAIL PROTECTED]@_drv_la_LDFLAGS = -module -avoid-version
[EMAIL PROTECTED]@_drv_la_LDFLAGS = -module -avoid-version $(am__append_2)
@[EMAIL PROTECTED] = @inputdir@
[EMAIL PROTECTED]@_drv_la_SOURCES = jstk.c jstk.h \
- linux_jstk.c linux_jstk.h \
- jstk_axis.c jstk_axis.h \
- jstk_options.c jstk_options.h
-
[EMAIL PROTECTED]@_drv_la_SOURCES = jstk.c jstk.h jstk_hw.h jstk_axis.c \
+ jstk_axis.h jstk_options.c jstk_options.h $(am__append_1) \
+ $(am__append_3)
+BSD_SRCS = bsd_jstk.c
+LINUX_SRCS = linux_jstk.c
+EXTRA_DIST = $(BSD_SRCS) $(LINUX_SRCS)
all: all-am
.SUFFIXES:
@@ -298,6 +313,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
commit 25b5234948b6231577d44c5ad97a85d3a82b514a
Author: Sascha Hlusiak <[EMAIL PROTECTED]>
Date: Fri Apr 20 21:09:10 2007 -0400
Fixed wrong button number reported by bsd_jstk.c.
Fixed typo in reporting button and axes numbers in bsd_jstk.c
diff --git a/src/bsd_jstk.c b/src/bsd_jstk.c
index 61ae781..a0c8ea3 100644
--- a/src/bsd_jstk.c
+++ b/src/bsd_jstk.c
@@ -78,7 +78,7 @@ struct jstk_bsd_hid_data {
int
jstkOpenDevice(JoystickDevPtr joystick)
{
- int cur_axis, cur_button;
+ int cur_axis;
int is_joystick, report_id = 0;
int got_something;
struct hid_data *d;
@@ -124,7 +124,6 @@ jstkOpenDevice(JoystickDevPtr joystick)
is_joystick = 0;
got_something = 0;
cur_axis = 0;
- cur_button = 0;
bsddata->hats = 0;
bsddata->axes = 0;
bsddata->buttons = 0;
@@ -172,8 +171,7 @@ jstkOpenDevice(JoystickDevPtr joystick)
{
if (bsddata->buttons < MAXBUTTONS) {
got_something = 1;
- memcpy(&bsddata->button_item[cur_button], &h, sizeof(h));
- cur_button++;
+ memcpy(&bsddata->button_item[bsddata->buttons], &h, sizeof(h));
bsddata->buttons++;
}
}
@@ -192,7 +190,7 @@ jstkOpenDevice(JoystickDevPtr joystick)
bsddata->hotdata = 0;
joystick->devicedata = (void*) bsddata;
xf86Msg(X_INFO, "Joystick: %d buttons, %d axes\n",
- bsddata->axes, bsddata->buttons);
+ bsddata->buttons, bsddata->axes);
return joystick->fd;
}
@@ -300,8 +298,9 @@ jstkReadData(JoystickDevPtr joystick,
for (j=0; j<bsddata->buttons; j++)
{
- int pressed = (d == bsddata->button_item[j].logical_minimum) ? 0 : 1;
+ int pressed;
d = hid_get_data(bsddata->data_buf, &bsddata->button_item[j]);
+ pressed = (d == bsddata->button_item[j].logical_minimum) ? 0 : 1;
if (pressed != joystick->button[j].pressed) {
joystick->button[j].pressed = pressed;
if (event != NULL) *event = EVENT_BUTTON;
commit e1871e21955d5403c2751e83b5c00b2fa4886f22
Author: Sascha Hlusiak <[EMAIL PROTECTED]>
Date: Thu Apr 19 12:39:53 2007 -0400
Fixed accelerated axis movement not working the first time after startup
Modified used algorithm to produce slower and smoother acceleration
diff --git a/src/jstk_axis.c b/src/jstk_axis.c
index d71dc9b..4840ade 100644
--- a/src/jstk_axis.c
+++ b/src/jstk_axis.c
@@ -89,9 +89,9 @@ jstkAxisTimer(OsTimerPtr timer,
} else if (axis->type == TYPE_ACCELERATED) {
/* Stop to accelerate at a certain speed */
- if (axis->currentspeed < 100.0f) axis->currentspeed *= 1.15f;
-
- p1 = (axis->currentspeed - 0.1f) * (float)NEXTTIMER / 180.0f;
+ if (axis->currentspeed < 100.0f) axis->currentspeed =
+ (axis->currentspeed + 3.0) * 1.07f - 3.0;
+ p1 = axis->currentspeed * (float)NEXTTIMER / 180.0f;
p2 = p1 / 8.0f;
}
if (axis->value < 0) {
@@ -124,9 +124,10 @@ jstkAxisTimer(OsTimerPtr timer,
float p1;
float p2;
- if (priv->button[i].currentspeed < 100.0f) priv->button[i].currentspeed *=
1.15f;
- p1 = (priv->button[i].currentspeed - 0.1) * (float)NEXTTIMER / 180.0f *
- priv->button[i].amplify;
+ if (priv->button[i].currentspeed < 100.0f) priv->button[i].currentspeed =
+ (priv->button[i].currentspeed + 3.0) * 1.07f - 3.0;
+ p1 = priv->button[i].currentspeed * (float)NEXTTIMER / 180.0f *
+ priv->button[i].amplify;
p1 *= priv->amplify;
p2 = p1 / 8.0f;
diff --git a/src/jstk_options.c b/src/jstk_options.c
index 191cb24..a45c883 100644
--- a/src/jstk_options.c
+++ b/src/jstk_options.c
@@ -100,6 +100,7 @@ jstkParseButtonOption(const char* org,
} else if (sscanf(param, "axis=%15s", p) == 1) {
button->mapping = jstkGetAxisMapping(&fvalue, p, name);
button->amplify = fvalue;
+ button->currentspeed = 1.0;
if (button->mapping == MAPPING_NONE)
xf86Msg(X_WARNING, "%s: error parsing axis: %s.\n",
name, p);
@@ -160,9 +161,10 @@ jstkParseAxisOption(const char* org, AXIS *axis, const
char *name)
p[15]='\0';
if (strcmp(p, "relative") == 0)
axis->type = TYPE_BYVALUE;
- else if (strcmp(p, "accelerated") == 0)
+ else if (strcmp(p, "accelerated") == 0) {
axis->type = TYPE_ACCELERATED;
- else if (strcmp(p, "absolute") == 0)
+ axis->currentspeed = 1.0;
+ } else if (strcmp(p, "absolute") == 0)
axis->type = TYPE_ABSOLUTE;
else if (strcmp(p, "none") == 0)
axis->type = TYPE_NONE;
commit 44aafff9e99ff02091580978a2dd7306eb9ad910
Author: Sascha Hlusiak <[EMAIL PROTECTED]>
Date: Mon Apr 16 23:01:31 2007 -0400
Considering JS_EVENT_INIT events as real events again
We want to perform actions on JS_EVENT_INIT events, so we don't miss
anything and follow the state of
the device
diff --git a/src/linux_jstk.c b/src/linux_jstk.c
index d5ae00a..5726304 100644
--- a/src/linux_jstk.c
+++ b/src/linux_jstk.c
@@ -52,7 +52,8 @@
*
* jstkOpenDevice --
*
- * Open and initialize a joystick device
+ * Open and initialize a joystick device. The device name is
+ * taken from JoystickDevPtr
* Returns the filedescriptor, or -1 in case of error
*
***********************************************************************
@@ -186,11 +187,5 @@ jstkReadData(JoystickDevPtr joystick,
}
break;
}
-
- /* If it is an JS_EVENT_INIT just save the state, but don't report
- as an event */
- if ((js.type & JS_EVENT_INIT) == JS_EVENT_INIT) {
- if (event != NULL) *event = EVENT_NONE;
- }
return 1;
}
commit 8cafcf33ec1dcffa0ecbe2647ebb89c879989d4c
Author: Sascha Hlusiak <[EMAIL PROTECTED]>
Date: Sun Apr 15 23:48:52 2007 -0400
Fixed possible double close of device in case of error.
Opening device in O_RDONLY mode, instead of O_RDWR.
diff --git a/src/bsd_jstk.c b/src/bsd_jstk.c
index 437faff..61ae781 100644
--- a/src/bsd_jstk.c
+++ b/src/bsd_jstk.c
@@ -96,6 +96,7 @@ jstkOpenDevice(JoystickDevPtr joystick)
xf86Msg(X_ERROR, "Joystick: hid_get_report_desc failed: %s\n",
strerror(errno));
close(joystick->fd);
+ joystick->fd = -1;
return -1;
}
@@ -103,6 +104,7 @@ jstkOpenDevice(JoystickDevPtr joystick)
xf86Msg(X_ERROR, "Joystick: ioctl USB_GET_REPORT_ID failed: %s\n",
strerror(errno));
close(joystick->fd);
+ joystick->fd = -1;
return -1;
}
@@ -115,6 +117,7 @@ jstkOpenDevice(JoystickDevPtr joystick)
hid_dispose_report_desc(rd);
free(bsddata);
close(joystick->fd);
+ joystick->fd = -1;
return -1;
}
@@ -182,6 +185,7 @@ jstkOpenDevice(JoystickDevPtr joystick)
xf86Msg(X_ERROR, "Joystick: Didn't find any usable axes.\n");
free(bsddata);
close(joystick->fd);
+ joystick->fd = -1;
return -1;
}
diff --git a/src/linux_jstk.c b/src/linux_jstk.c
index 4b86d22..d5ae00a 100644
--- a/src/linux_jstk.c
+++ b/src/linux_jstk.c
@@ -65,7 +65,7 @@ jstkOpenDevice(JoystickDevPtr joystick)
unsigned char axes, buttons;
int driver_version;
- if ((joystick->fd = open(joystick->device, O_RDWR | O_NDELAY, 0)) < 0) {
+ if ((joystick->fd = open(joystick->device, O_RDONLY | O_NDELAY, 0)) < 0) {
xf86Msg(X_ERROR, "Cannot open joystick '%s' (%s)\n", joystick->device,
strerror(errno));
return -1;
@@ -75,6 +75,7 @@ jstkOpenDevice(JoystickDevPtr joystick)
xf86Msg(X_ERROR, "Joystick: ioctl on '%s' failed: %s\n", joystick->device,
strerror(errno));
close(joystick->fd);
+ joystick->fd = -1;
return -1;
}
if ((driver_version >> 16) < 1) {
@@ -88,6 +89,7 @@ jstkOpenDevice(JoystickDevPtr joystick)
xf86Msg(X_ERROR, "Joystick: ioctl on '%s' failed: %s\n", joystick->device,
strerror(errno));
close(joystick->fd);
+ joystick->fd = -1;
return -1;
}
@@ -95,6 +97,7 @@ jstkOpenDevice(JoystickDevPtr joystick)
xf86Msg(X_ERROR, "Joystick: ioctl on '%s' failed: %s\n", joystick->device,
strerror(errno));
close(joystick->fd);
+ joystick->fd = -1;
return -1;
}
@@ -102,6 +105,7 @@ jstkOpenDevice(JoystickDevPtr joystick)
xf86Msg(X_ERROR, "Joystick: ioctl on '%s' failed: %s\n",
joystick->device, strerror(errno));
close(joystick->fd);
+ joystick->fd = -1;
return -1;
}
commit 1640d08d168241fd6168090841ef0d811d9dc3c2
Author: Sascha Hlusiak <[EMAIL PROTECTED]>
Date: Sun Apr 15 23:18:39 2007 -0400
Got rid of JoystickDevRec->axes and JoystickDevRec->buttons, since not
really needed.
diff --git a/src/bsd_jstk.c b/src/bsd_jstk.c
index 0454528..437faff 100644
--- a/src/bsd_jstk.c
+++ b/src/bsd_jstk.c
@@ -55,6 +55,8 @@ struct jstk_bsd_hid_data {
struct hid_item button_item[MAXBUTTONS]; /* Button HID items */
struct hid_item hat_item[MAXAXES]; /* HID items for hats */
int hats; /* Number of hats */
+ int axes; /* Number of found axes */
+ int buttons; /* Number of found buttons */
int hotdata; /* Is unprocessed data available
in data_buf? */
};
@@ -89,8 +91,6 @@ jstkOpenDevice(JoystickDevPtr joystick)
strerror(errno));
return -1;
}
- joystick->axes = 0;
- joystick->buttons = 0;
if ((rd = hid_get_report_desc(joystick->fd)) == 0) {
xf86Msg(X_ERROR, "Joystick: hid_get_report_desc failed: %s\n",
@@ -123,6 +123,8 @@ jstkOpenDevice(JoystickDevPtr joystick)
cur_axis = 0;
cur_button = 0;
bsddata->hats = 0;
+ bsddata->axes = 0;
+ bsddata->buttons = 0;
for (d = hid_start_parse(rd, 1 << hid_input, report_id);
hid_get_item(d, &h); ) {
@@ -146,30 +148,30 @@ jstkOpenDevice(JoystickDevPtr joystick)
{
if (usage == HUG_HAT_SWITCH)
{
- if ((bsddata->hats < MAXAXES) && (joystick->axes <= MAXAXES-2)) {
+ if ((bsddata->hats < MAXAXES) && (bsddata->axes <= MAXAXES-2)) {
got_something = 1;
memcpy(&bsddata->hat_item[bsddata->hats], &h, sizeof(h));
bsddata->hats++;
- joystick->axes += 2;
+ bsddata->axes += 2;
}
}
else
{
- if (joystick->axes < MAXAXES) {
+ if (bsddata->axes < MAXAXES) {
got_something = 1;
memcpy(&bsddata->axis_item[cur_axis], &h, sizeof(h));
cur_axis++;
- joystick->axes++;
+ bsddata->axes++;
}
}
}
else if (page == HUP_BUTTON)
{
- if (joystick->buttons < MAXBUTTONS) {
+ if (bsddata->buttons < MAXBUTTONS) {
got_something = 1;
memcpy(&bsddata->button_item[cur_button], &h, sizeof(h));
cur_button++;
- joystick->buttons++;
+ bsddata->buttons++;
}
}
}
@@ -186,7 +188,7 @@ jstkOpenDevice(JoystickDevPtr joystick)
bsddata->hotdata = 0;
joystick->devicedata = (void*) bsddata;
xf86Msg(X_INFO, "Joystick: %d buttons, %d axes\n",
- joystick->axes, joystick->buttons);
+ bsddata->axes, bsddata->buttons);
return joystick->fd;
}
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
