sdl-config.in
author Sam Lantinga <slouken@libsdl.org>
Mon, 02 Jun 2003 14:50:22 +0000
changeset 632 85e104fe14c2
parent 490 7e53d17ec798
child 807 674df5617bba
permissions -rw-r--r--
Date: Sun, 1 Jun 2003 15:38:45 -0700 (PDT)
From: Jeff Brown <jabrown@caida.org>
Subject: [patch] SDL-1.2.5 + FreeBSD joystick axes, hat fixes

Hello again! When I sent in some SDL fixes last December, I found out
they'd already been fixed in the CVS version. This time, I checked the
repository before bugging you. =)

I'm using SDL-1.2.5 on a FreeBSD 4.6.2-RELEASE system, and in the course
of getting my multi-analog-axis USB controller (with a hat switch!)
working with d2x-sdl -- the SDL port of the Descent 2 engine -- I came
across a few problems:

1) The second analog stick is reported as a slider in one direction, and
"Rz" in the other. SDL was ignoring the Rz axis, so I added Rx/Ry/Rz to
the set of things SDL considers to be axes.

2) After the above change, the set of JOYAXE_* axes for my gamepad was
{0,1,3,7}; however, d2x-sdl expects the axes to be contiguously numbered
from 0, which seems like a pretty reasonable expectation, rather than
having to scan the entire space of axes that SDL may or may not have.
So, I added a table lookup which maps the JOYAXE_* axis numbers to 0,1,...
in the order they're detected by SDL_SYS_JoystickOpen(), when reporting
them to the application. I also added a function "usage_to_joyaxe()"
which maps the USB HUG_* usage values to JOYAXE_values, since the repeated
case statements testing for HUG_* were getting out of hand.

3) The BSD joystick driver had no hat support, so I added it. It looks
like our USB library can only support one hat switch per device, which
makes life easy.

The patch against SDL-1.2.5 which implements these changes is at:

http://www.caida.org/~jabrown/patches/sdl-1.2.5-bsdhat.diff

After applying, SDL's "testjoystick" reports all activity from my gamepad
correctly, and d2x works too (though it needed some other fixes).

Moving on...

There is also a problem with slightly different USBHID library interfaces
on different versions of FreeBSD. I wasn't going to mention this since the
FreeBSD port for SDL-1.2.5 (and not SDL itself) was doing the FreeBSD
version-specific patching, so I e-mailed the port maintainer with this
change. However, I see that you've incorporated the FreeBSD
version-checking stuff into the CVS version of SDL, so now it's relevant
for you too.

The problem is, the FreeBSD #if tests don't work right for FreeBSD
4.6.2-RELEASE. There may be other versions with this problem, but I've
only tested 4.6.2-R. The following patch against your latest CVS version
fixes this:

--- SDL_sysjoystick.c-1.16 Tue Apr 15 09:02:08 2003
+++ SDL_sysjoystick.c Sun Jun 1 15:10:28 2003
@@ -420,6 +420,8 @@
# else
len = hid_report_size(rd, repinfo[repind].kind, r->rid);
# endif
+# elif (__FreeBSD_version == 460002)
+ len = hid_report_size(rd, r->rid, repinfo[repind].kind);
# else
len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
#endif


I hope this is all useful to you. I've been getting myself dizzy playing
Descent 2 with it, all morning!

-Jeff Brown


P.S. My USB controller is a Thrustmaster Firestorm Dual Analog 2. That's
probably irrelevant, but I threw it in for completeness.
     1 #!/bin/sh
     2 
     3 prefix=@prefix@
     4 exec_prefix=@exec_prefix@
     5 exec_prefix_set=no
     6 
     7 usage="\
     8 Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"
     9 
    10 if test $# -eq 0; then
    11       echo "${usage}" 1>&2
    12       exit 1
    13 fi
    14 
    15 while test $# -gt 0; do
    16   case "$1" in
    17   -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
    18   *) optarg= ;;
    19   esac
    20 
    21   case $1 in
    22     --prefix=*)
    23       prefix=$optarg
    24       if test $exec_prefix_set = no ; then
    25         exec_prefix=$optarg
    26       fi
    27       ;;
    28     --prefix)
    29       echo $prefix
    30       ;;
    31     --exec-prefix=*)
    32       exec_prefix=$optarg
    33       exec_prefix_set=yes
    34       ;;
    35     --exec-prefix)
    36       echo $exec_prefix
    37       ;;
    38     --version)
    39       echo @SDL_VERSION@
    40       ;;
    41     --cflags)
    42       echo -I@includedir@/SDL @SDL_CFLAGS@
    43 
    44       # The portable way of including SDL is #include "SDL.h"
    45       #if test @includedir@ != /usr/include ; then
    46       #    # Handle oddities in Win32 path handling (assumes prefix)
    47       #    prefix=`echo ${prefix} | sed 's,^//\([A-Z]\),\1:,'`
    48       #
    49       #    includes=-I@includedir@
    50       #fi
    51       #echo $includes -I@includedir@/SDL @SDL_CFLAGS@
    52       ;;
    53 @ENABLE_SHARED_TRUE@    --libs)
    54 @ENABLE_SHARED_TRUE@      libdirs="-L@libdir@ @SDL_RLD_FLAGS@"
    55 @ENABLE_SHARED_TRUE@      echo $libdirs @SDL_LIBS@ @SHARED_SYSTEM_LIBS@
    56 @ENABLE_SHARED_TRUE@      ;;
    57 @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
    58 @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
    59 @ENABLE_STATIC_TRUE@      libdirs="-L@libdir@ @SDL_RLD_FLAGS@"
    60 @ENABLE_STATIC_TRUE@      echo $libdirs @SDL_LIBS@ @STATIC_SYSTEM_LIBS@
    61 @ENABLE_STATIC_TRUE@      ;;
    62     *)
    63       echo "${usage}" 1>&2
    64       exit 1
    65       ;;
    66   esac
    67   shift
    68 done