Mercurial > sdl-ios-xcode
annotate src/thread/win32/SDL_sysmutex.c @ 1551:02e19471a694
Fixed bug #4
[Note: I'm applying this patch since it's a cleaner version of what's already implemented, and supports this controller on older kernels. I'll ask to make sure this doesn't break on the new kernels where it's no longer necessary]
Date: Mon, 21 Mar 2005 09:41:11 -0500
From: Chris Nelson
Subject: SDL Patch
Hey, Ryan.
I submitted the following patch about a year ago. It's just a simple
patch for the linux port, to make multiple joysticks each appear to SDL
as their own device, if they are on the same USB port (specifically,
these guys
<http://www.consoleplus.co.uk/product_info.php?pName=super-joybox-5-quad-joypad-converter>,
which allow 4 Playstation2 controllers to be accessed via a single USB
port). Without this patch, SDL pretty much drops the ball, and reports
that there are 4 joysticks available when less than that number are
plugged in.
My work built upon the work of another person with the same device. When
I submitted the patch to the list, he tested it, but it didn't work for
him, so the patch was never accepted. Maybe about 3 times in the past
year, I've tried to email the guy, to see if he couldn't run my new
version, complete with debug code to diagnose the problem he was having.
He never got back to me.
So, I'm attaching the patch. I wish I knew why it didn't work for him,
but I've been using it for the last year with no problems. Let me know
if you need any more information, or have any ideas as to how I could
test it. I'd like to see it in the tree, but I want to make sure it works.
-Chris
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sun, 19 Mar 2006 06:31:34 +0000 |
| parents | bb6839704ed6 |
| children | 782fd950bd46 c121d94672cb a1b03ba2fcd0 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
3 Copyright (C) 1997-2006 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
| 0 | 7 License as published by the Free Software Foundation; either |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
| 0 | 9 |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
13 Lesser General Public License for more details. |
| 0 | 14 |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 18 |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
22 #include "SDL_config.h" |
| 0 | 23 |
| 24 /* Mutex functions using the Win32 API */ | |
| 25 | |
|
1433
bb6839704ed6
SDL_windows.h is no longer necessary
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
26 #define WIN32_LEAN_AND_MEAN |
|
bb6839704ed6
SDL_windows.h is no longer necessary
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
27 #include <windows.h> |
| 0 | 28 |
| 29 #include "SDL_mutex.h" | |
| 30 | |
| 31 | |
| 32 struct SDL_mutex { | |
| 33 HANDLE id; | |
| 34 }; | |
| 35 | |
| 36 /* Create a mutex */ | |
| 37 SDL_mutex *SDL_CreateMutex(void) | |
| 38 { | |
| 39 SDL_mutex *mutex; | |
| 40 | |
| 41 /* Allocate mutex memory */ | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1330
diff
changeset
|
42 mutex = (SDL_mutex *)SDL_malloc(sizeof(*mutex)); |
| 0 | 43 if ( mutex ) { |
| 44 /* Create the mutex, with initial value signaled */ | |
| 45 mutex->id = CreateMutex(NULL, FALSE, NULL); | |
| 46 if ( ! mutex->id ) { | |
| 47 SDL_SetError("Couldn't create mutex"); | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1330
diff
changeset
|
48 SDL_free(mutex); |
| 0 | 49 mutex = NULL; |
| 50 } | |
| 51 } else { | |
| 52 SDL_OutOfMemory(); | |
| 53 } | |
| 54 return(mutex); | |
| 55 } | |
| 56 | |
| 57 /* Free the mutex */ | |
| 58 void SDL_DestroyMutex(SDL_mutex *mutex) | |
| 59 { | |
| 60 if ( mutex ) { | |
| 61 if ( mutex->id ) { | |
| 62 CloseHandle(mutex->id); | |
| 63 mutex->id = 0; | |
| 64 } | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1330
diff
changeset
|
65 SDL_free(mutex); |
| 0 | 66 } |
| 67 } | |
| 68 | |
| 69 /* Lock the mutex */ | |
| 70 int SDL_mutexP(SDL_mutex *mutex) | |
| 71 { | |
| 72 if ( mutex == NULL ) { | |
| 73 SDL_SetError("Passed a NULL mutex"); | |
| 74 return -1; | |
| 75 } | |
| 76 if ( WaitForSingleObject(mutex->id, INFINITE) == WAIT_FAILED ) { | |
| 77 SDL_SetError("Couldn't wait on mutex"); | |
| 78 return -1; | |
| 79 } | |
| 80 return(0); | |
| 81 } | |
| 82 | |
| 83 /* Unlock the mutex */ | |
| 84 int SDL_mutexV(SDL_mutex *mutex) | |
| 85 { | |
| 86 if ( mutex == NULL ) { | |
| 87 SDL_SetError("Passed a NULL mutex"); | |
| 88 return -1; | |
| 89 } | |
| 90 if ( ReleaseMutex(mutex->id) == FALSE ) { | |
| 91 SDL_SetError("Couldn't release mutex"); | |
| 92 return -1; | |
| 93 } | |
| 94 return(0); | |
| 95 } |