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.

# The top-level input Makefile for SDL

# require automake 1.4
AUTOMAKE_OPTIONS = 1.4

## Any directories that you want built and installed should go here.
SUBDIRS = src include docs

## Any directories you want a part of the distribution should be listed
## here, as well as have a Makefile generated at the end of configure.in
##
## This only works for subdirectories one level deep.
DIST_SUBDIRS = $(SUBDIRS)

# SDL runtime configuration script
bin_SCRIPTS = sdl-config

# All the rest of the distributed files
EXTRA_DIST =		\
	BUGS		\
	TODO		\
	COPYING		\
	CREDITS		\
	INSTALL		\
	README		\
	README.AmigaOS	\
	README.CVS	\
	README.DC	\
	README.Epoc	\
	README.MacOS	\
	README.MacOSX	\
	README.MiNT	\
	README.NanoX	\
	README.PicoGUI	\
	README.QNX	\
	README.Qtopia	\
	README.WinCE	\
	README-SDL.txt	\
	Borland.html	\
	Borland.zip	\
	VisualC.html	\
	VisualC.zip	\
	VisualC7.zip	\
	VisualCE.zip	\
	Makefile.dc	\
	MPWmake.sea.bin	\
	CWprojects.sea.bin \
	PBProjects.tar.gz \
	EpocBuildFiles.zip \
	WhatsNew	\
	docs.html	\
	sdl.m4		\
	SDL.spec	\
	autogen.sh	\
	strip_fPIC.sh

# M4 macro file for inclusion with autoconf
m4datadir = $(datadir)/aclocal
m4data_DATA = sdl.m4

# Rule to build tar-gzipped distribution package
$(PACKAGE)-$(VERSION).tar.gz: dist

# Rule to build RPM distribution package
rpm: $(PACKAGE)-$(VERSION).tar.gz
	rpm -ta $(PACKAGE)-$(VERSION).tar.gz

# Rule to rebuild the export lists for BeOS, MacOS and Win32.
exports:
	(cd src/main/beos/exports; $(MAKE))
	(cd src/main/macos/exports; $(MAKE))
	(cd src/main/win32/exports; $(MAKE))

# Rule to build the Project Builder archive in MacOS X
PBProjects.tar.gz:
	rm -f `find . -name .DS_Store`
	if [ -d PBProjects ]; then \
	    tar zcvf $@ PBProjects; \
	fi

# Rule to force automake to rebuild the library
changed:
	@echo "This build target is no longer necessary"

# Rule to install the libraries only - prevent rebuilding apps
install-lib:
	cd src && $(MAKE) install-libLTLIBRARIES

# Run ldconfig after installing the library:
install-hook:
	-ldconfig

# Grab the test programs for the distribution:
dist-hook:
	if test -f test/Makefile; then (cd test; make distclean); fi
	cp -rp $(srcdir)/test $(distdir)
	rm -rf `find $(distdir) -type d -name CVS -print`

# Create a CVS snapshot that people can run update -d on
CVSROOT = :pserver:guest@libsdl.org:/home/sdlweb/libsdl.org/cvs
snapshot:
	cvs -d $(CVSROOT) login
	cvs -d $(CVSROOT) checkout SDL12
	(cd SDL12 && ./autogen.sh)
	mv SDL12 SDL-1.2
	tar zcvf $(HOME)/SDL-1.2.tar.gz SDL-1.2
	rm -rf SDL-1.2