Mercurial > sdl-ios-xcode
view src/thread/dc/SDL_syssem.c @ 632:85e104fe14c2
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.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Mon, 02 Jun 2003 14:50:22 +0000 |
parents | dad72daf44b3 |
children | b8d311d90021 |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA BERO bero@geocities.co.jp based on generic/SDL_syssem.c Sam Lantinga slouken@libsdl.org */ #ifdef SAVE_RCSID static char rcsid = "@(#) $Id$"; #endif /* An implementation of semaphores using mutexes and condition variables */ #include <stdlib.h> #include "SDL_error.h" #include "SDL_timer.h" #include "SDL_thread.h" #include "SDL_systhread_c.h" #ifdef DISABLE_THREADS SDL_sem *SDL_CreateSemaphore(Uint32 initial_value) { SDL_SetError("SDL not configured with thread support"); return (SDL_sem *)0; } void SDL_DestroySemaphore(SDL_sem *sem) { return; } int SDL_SemTryWait(SDL_sem *sem) { SDL_SetError("SDL not configured with thread support"); return -1; } int SDL_SemWaitTimeout(SDL_sem *sem, Uint32 timeout) { SDL_SetError("SDL not configured with thread support"); return -1; } int SDL_SemWait(SDL_sem *sem) { SDL_SetError("SDL not configured with thread support"); return -1; } Uint32 SDL_SemValue(SDL_sem *sem) { return 0; } int SDL_SemPost(SDL_sem *sem) { SDL_SetError("SDL not configured with thread support"); return -1; } #else #include <kos/sem.h> struct SDL_semaphore { semaphore_t sem; }; SDL_sem *SDL_CreateSemaphore(Uint32 initial_value) { return (SDL_sem *)sem_create(initial_value); } /* WARNING: You cannot call this function when another thread is using the semaphore. */ void SDL_DestroySemaphore(SDL_sem *sem) { if ( ! sem ) { SDL_SetError("Passed a NULL semaphore"); return; } sem_destroy(&sem->sem); } int SDL_SemTryWait(SDL_sem *sem) { int retval; if ( ! sem ) { SDL_SetError("Passed a NULL semaphore"); return -1; } retval = sem_trywait(&sem->sem); if (retval==0) return 0; else return SDL_MUTEX_TIMEDOUT; return retval; } int SDL_SemWaitTimeout(SDL_sem *sem, Uint32 timeout) { int retval; if ( ! sem ) { SDL_SetError("Passed a NULL semaphore"); return -1; } /* A timeout of 0 is an easy case */ if ( timeout == 0 ) { return SDL_SemTryWait(sem); } retval = sem_wait_timed(&sem->sem,timeout); if (retval==-1) retval= SDL_MUTEX_TIMEDOUT; return retval; } int SDL_SemWait(SDL_sem *sem) { if ( ! sem ) { SDL_SetError("Passed a NULL semaphore"); return -1; } sem_wait(&sem->sem); return 0; } Uint32 SDL_SemValue(SDL_sem *sem) { if ( ! sem ) { SDL_SetError("Passed a NULL semaphore"); return -1; } return sem_count(&sem->sem); } int SDL_SemPost(SDL_sem *sem) { if ( ! sem ) { SDL_SetError("Passed a NULL semaphore"); return -1; } sem_signal(&sem->sem); return 0; } #endif /* DISABLE_THREADS */