author Sam Lantinga <>
Mon, 02 Jun 2003 14:50:22 +0000
changeset 632 85e104fe14c2
parent 470 877b992f2d0c
child 827 b10aeac509ea
permissions -rw-r--r--
Date: Sun, 1 Jun 2003 15:38:45 -0700 (PDT)
From: Jeff Brown <>
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:

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);

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.
     2 Simple DirectMedia Layer CREDITS
     3 Thanks to everyone who made this possible, including:
     5 * Cliff Matthews, for giving me a reason to start this project. :)
     6  -- Executor rocks!  *grin*
     8 * Scott Call, for making a home for SDL on the 'Net... Thanks! :)
    10 * The Linux Fund, C Magazine, and Gareth Noyce for financial contributions
    12 * Gaëtan de Menten for writing the PHP and SQL behind the SDL website
    14 * Martin Donlon for his work on the SDL Documentation Project
    16 * Ryan Gordon for helping everybody out and keeping the dream alive. :)
    18 * Mattias Engdegård, for help with the Solaris port and lots of other help
    20 * Max Watson, Matt Slot, and Kyle for help with the MacOS Classic port
    22 * Stan Shebs, for the initial MacOS X port
    24 * Max Horn and Darrell Walisser for unflagging work on the MacOS X port
    26 * Patrick Trainor, Jim Boucher, and Mike Gorchak for the QNX Neutrino port
    28 * Carsten Griwodz for the AIX port
    30 * Gabriele Greco, for the Amiga port
    32 * Patrice Mandin, for the Atari port
    34 * Hannu Viitala for the EPOC port
    36 * Peter Valchev for nagging me about the OpenBSD port until I got it right. :)
    38 * Kent B Mein, for a place to do the IRIX port
    40 * Ash, for a place to do the OSF/1 Alpha port
    42 * David Sowsy, for help with the BeOS port
    44 * Eugenia Loli, for endless work on porting SDL games to BeOS
    46 * Jon Taylor for the GGI front-end
    48 * Paulus Esterhazy, for the Visual C++ testing and libraries
    50 * Brenda Tantzen, for Metrowerks CodeWarrior on MacOS
    52 * Chris Nentwich, for the Hermes assembly blitters
    54 * Michael Vance and Jim Kutter for the X11 OpenGL support
    56 * Stephane Peter, for the AAlib front-end and multi-threaded timer idea.
    58 * Jon Atkins for great SDL_net and SDL_mixer documentation
    60 * Peter Wiklund, for the 1998 winning SDL logo,
    61   and Arto Hamara, Steven Wong, and Kent Mein for other logo entries.
    63 * Everybody at Loki Software, Inc. for their great contributions!
    65  And a big hand to everyone else who gave me appreciation, advice,
    66  and suggestions, especially the good folks on the SDL mailing list.
    68 THANKS! :)
    70   -- Sam Lantinga			<>