dfinput (macosx): upgraded to SDL 1.3 Beta.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@55318 e17a0e51-4ae3-4d35-97c3-1a29b211df97

1 files changed, 29 insertions, 29 deletions

diff --git a/macosx/plugins/DFInput/SDL/src/joystick/SDL_sysjoystick.h b/macosx/plugins/DFInput/SDL/src/joystick/SDL_sysjoystick.h
index 48fbb3cf..ddb3b84f 100644
--- a/macosx/plugins/DFInput/SDL/src/joystick/SDL_sysjoystick.h
+++ b/macosx/plugins/DFInput/SDL/src/joystick/SDL_sysjoystick.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
+    Copyright (C) 1997-2010 Sam Lantinga
 
     This library is SDL_free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -19,9 +19,6 @@
     Sam Lantinga
     slouken@libsdl.org
 */
-// 7-25-2010 Wei Mingzhi
-// Removed everything unrelated to Mac OS X Joystick support.
-
 #include "SDL_config.h"
 
 /* This is the system specific header for the SDL joystick API */
@@ -29,28 +26,30 @@
 #include "SDL_joystick.h"
 
 /* The SDL joystick structure */
-struct _SDL_Joystick {
-	Uint8 index;		/* Device index */
-	const char *name;	/* Joystick name - system dependent */
-
-	int naxes;		/* Number of axis controls on the joystick */
-	Sint16 *axes;		/* Current axis states */
-
-	int nhats;		/* Number of hats on the joystick */
-	Uint8 *hats;		/* Current hat states */
-	
-	int nballs;		/* Number of trackballs on the joystick */
-	struct balldelta {
-		int dx;
-		int dy;
-	} *balls;		/* Current ball motion deltas */
-	
-	int nbuttons;		/* Number of buttons on the joystick */
-	Uint8 *buttons;		/* Current button states */
-	
-	struct joystick_hwdata *hwdata;	/* Driver dependent information */
-
-	int ref_count;		/* Reference count for multiple opens */
+struct _SDL_Joystick
+{
+    Uint8 index;                /* Device index */
+    const char *name;           /* Joystick name - system dependent */
+
+    int naxes;                  /* Number of axis controls on the joystick */
+    Sint16 *axes;               /* Current axis states */
+
+    int nhats;                  /* Number of hats on the joystick */
+    Uint8 *hats;                /* Current hat states */
+
+    int nballs;                 /* Number of trackballs on the joystick */
+    struct balldelta
+    {
+        int dx;
+        int dy;
+    } *balls;                   /* Current ball motion deltas */
+
+    int nbuttons;               /* Number of buttons on the joystick */
+    Uint8 *buttons;             /* Current button states */
+
+    struct joystick_hwdata *hwdata;     /* Driver dependent information */
+
+    int ref_count;              /* Reference count for multiple opens */
 };
 
 /* Function to scan the system for joysticks.
@@ -68,18 +67,19 @@ extern const char *SDL_SYS_JoystickName(int index);
    This should fill the nbuttons and naxes fields of the joystick structure.
    It returns 0, or -1 if there is an error.
  */
-extern int SDL_SYS_JoystickOpen(SDL_Joystick *joystick);
+extern int SDL_SYS_JoystickOpen(SDL_Joystick * joystick);
 
 /* Function to update the state of a joystick - called as a device poll.
  * This function shouldn't update the joystick structure directly,
  * but instead should call SDL_PrivateJoystick*() to deliver events
  * and update joystick device state.
  */
-extern void SDL_SYS_JoystickUpdate(SDL_Joystick *joystick);
+extern void SDL_SYS_JoystickUpdate(SDL_Joystick * joystick);
 
 /* Function to close a joystick after use */
-extern void SDL_SYS_JoystickClose(SDL_Joystick *joystick);
+extern void SDL_SYS_JoystickClose(SDL_Joystick * joystick);
 
 /* Function to perform any system-specific joystick related cleanup */
 extern void SDL_SYS_JoystickQuit(void);
 
+/* vi: set ts=4 sw=4 expandtab: */