author Sam Lantinga <>
Mon, 02 Jun 2003 14:50:22 +0000
changeset 632 85e104fe14c2
parent 172 37e3ca9254c7
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 ==============================================================================
     3 Using the Simple DirectMedia Layer with MacOS 7,8,9 on PPC
     4 ==============================================================================
     6 These instructions are for people using the Apple MPW environment:
     9 CodeWarrior projects are available in the CWprojects directory.
    11 ==============================================================================
    12 I.  Building the Simple DirectMedia Layer libraries:
    13     (This step isn't necessary if you have the SDL binary distribution)
    15   First, unpack the MPWmake.sea.hqx archive and move SDL.make into the
    16   SDL directory.
    18   Start MPW
    20   Set the current directory within MPW to the SDL toplevel directory.
    22   Build "SDL"  (Type Command-B and enter "SDL" in the dialog)
    24   If everything compiles successfully, you now have the PPC libraries
    25   "SDL" and "SDLmain.o" in the 'lib' subdirectory.
    27 ==============================================================================
    28 II. Building the Simple DirectMedia Layer test programs:
    30   First, unpack the MPWmake.sea.hqx archive, move the new rsrc directory to
    31   the main SDL directory, and move the makefiles in the new test subdirectory
    32   to the SDL 'test' subdirectory.
    34   Start MPW
    36   Set the current directory within MPW to the SDL 'test' subdirectory.
    38   Build the programs that have an associated MPW makefile (file ending
    39   with .make), including "testwin", "testalpha", and "graywin".
    41   Copy the SDL library file into the test directory, and run!
    43 ==============================================================================
    44 III. Building the Simple DirectMedia Layer demo programs:
    46   Copy one of the test program Makefiles to the demo directory
    47   and modify it to match the sources in the demo.
    49 ==============================================================================
    50 IV.  Enjoy! :)
    52   If you have a project you'd like me to know about, or want to ask questions,
    53   go ahead and join the SDL developer's mailing list by sending e-mail to:
    57   and put "subscribe" into the subject of the message. Or alternatively you
    58   can use the web interface:
    62 ==============================================================================