UNTESTED - Wii joystick support (thanks Squidman!)

SDL/src/joystick/wii/SDL_sysjoystick.c

@@ -18,7 +18,7 @@
 
  Sam Lantinga
  slouken@libsdl.org
-*/
+ */
 #include "SDL_config.h"
 
 #ifdef SDL_JOYSTICK_WII
@@ -29,26 +29,63 @@
 #include "../SDL_joystick_c.h"
 
 #include <gccore.h>
+#include <unistd.h>
+#include <wiiuse/wpad.h>
 
-#define MAX_JOYSTICKS	4
+#define MAX_GC_JOYSTICKS	4
-#define MAX_AXES	6
+#define MAX_WII_JOYSTICKS	4
-#define MAX_BUTTONS	8
+#define MAX_JOYSTICKS		(MAX_GC_JOYSTICKS + MAX_WII_JOYSTICKS)
-#define	MAX_HATS	1
 
-#define	JOYNAMELEN	8
+#define MAX_GC_AXES			6
+#define MAX_GC_BUTTONS		8
+#define	MAX_GC_HATS			1
 
-/* The private structure used to keep track of a joystick */
+#define MAX_WII_AXES		8
-typedef struct joystick_hwdata_t {
+#define MAX_WII_BUTTONS		20
-	int prev_buttons;
+#define	MAX_WII_HATS		2
+
+#define	JOYNAMELEN		10
+
+typedef struct joystick_paddata_t
+{
+	u16 prev_buttons;
 	s8 stickX;
 	s8 stickY;
 	s8 substickX;
 	s8 substickY;
 	u8 triggerL;
 	u8 triggerR;
-} joystick_hwdata;
+}joystick_paddata;
 
+typedef struct joystick_wpaddata_t
+{
+	u32 prev_buttons;
+	s8 nunchuk_stickX;
+	s8 nunchuk_stickY;
+	s8 classicL_stickX;
+	s8 classicL_stickY;
+	s8 classicR_stickX;
+	s8 classicR_stickY;
+	u8 classic_triggerL;
+	u8 classic_triggerR;
+}joystick_wpaddata;
 
+/* The private structure used to keep track of a joystick */
+typedef struct joystick_hwdata_t
+{
+	int index;
+	int type;
+	union
+	{
+		joystick_paddata gamecube;
+		joystick_wpaddata wiimote;
+	};
+}joystick_hwdata;
+
+static int __jswpad_enabled = 1;
+static int __jspad_enabled = 1;
+static int __numwiijoysticks = 4;
+static int __numgcjoysticks = 4;
 
 /* Function to scan the system for joysticks.
  * This function should set SDL_numjoysticks to the number of available
@@ -57,15 +94,19 @@ typedef struct joystick_hwdata_t {
  */
 int SDL_SYS_JoystickInit(void)
 {
-	return 4;
+	SDL_numjoysticks = 8;
+	return 0;
 }
 
-static char joy_name[] = "port 0";
+static char joy_name[] = "Gamecube 0";
 
 /* Function to get the device-dependent name of a joystick */
 const char *SDL_SYS_JoystickName(int index)
 {
-	sprintf(joy_name, "port %d", index);
+	if((index < 4) && (__jswpad_enabled) && (index < __numwiijoysticks))
+	sprintf(joy_name, "Wiimote %d", index);
+	else if((index < 8) && (__jspad_enabled) && (index < (__numgcjoysticks + 4)) && (index> 3))
+	sprintf(joy_name, "Gamecube %d", index);
 	return (const char *)joy_name;
 }
 
@@ -84,28 +125,159 @@ int SDL_SYS_JoystickOpen(SDL_Joystick *joystick)
 		return(-1);
 	}
 	SDL_memset(joystick->hwdata, 0, sizeof(joystick_hwdata));
-
+	if((joystick->index < 4) && (__jspad_enabled))
-	/* fill nbuttons, naxes, and nhats fields */
+	{
-	joystick->nbuttons = MAX_BUTTONS;
+		if(joystick->index < __numwiijoysticks)
-	joystick->naxes = MAX_AXES;
+		{
-	joystick->nhats = MAX_HATS;
+			((joystick_hwdata*)(joystick->hwdata))->index = joystick->index;
+			((joystick_hwdata*)(joystick->hwdata))->type = 0;
+			joystick->nbuttons = MAX_WII_BUTTONS;
+			joystick->naxes = MAX_WII_AXES;
+			joystick->nhats = MAX_WII_HATS;
+		}
+	}
+	else if((joystick->index < 8) && (__jspad_enabled))
+	{
+		if(joystick->index < (__numgcjoysticks + 4))
+		{
+			((joystick_hwdata*)(joystick->hwdata))->index = joystick->index - 4;
+			((joystick_hwdata*)(joystick->hwdata))->type = 1;
+			joystick->nbuttons = MAX_GC_BUTTONS;
+			joystick->naxes = MAX_GC_AXES;
+			joystick->nhats = MAX_GC_HATS;
+		}
+	}
 	return(0);
 }
 
-
+static void _HandleWiiJoystickUpdate(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.
- */
-
-void SDL_SYS_JoystickUpdate(SDL_Joystick *joystick)
 {
-	int buttons,prev_buttons,i,changed;
+	u32 buttons, prev_buttons, changed;
+	int i;
 	joystick_hwdata *prev_state;
 
-	const	int sdl_buttons[] = {
+	const u32 sdl_buttons[] =
+	{
+		WPAD_BUTTON_A,
+		WPAD_BUTTON_B,
+		WPAD_BUTTON_1,
+		WPAD_BUTTON_2,
+		WPAD_BUTTON_MINUS,
+		WPAD_BUTTON_PLUS,
+		WPAD_BUTTON_HOME,
+		WPAD_NUNCHUK_BUTTON_Z,
+		WPAD_NUNCHUK_BUTTON_C,
+		WPAD_CLASSIC_BUTTON_A,
+		WPAD_CLASSIC_BUTTON_B,
+		WPAD_CLASSIC_BUTTON_X,
+		WPAD_CLASSIC_BUTTON_Y,
+		WPAD_CLASSIC_BUTTON_FULL_L,
+		WPAD_CLASSIC_BUTTON_FULL_R,
+		WPAD_CLASSIC_BUTTON_ZL,
+		WPAD_CLASSIC_BUTTON_ZR,
+		WPAD_CLASSIC_BUTTON_MINUS,
+		WPAD_CLASSIC_BUTTON_PLUS,
+		WPAD_CLASSIC_BUTTON_HOME
+	};
+
+	buttons = WPAD_ButtonsHeld(joystick->index);
+	struct expansion_t exp;
+	WPAD_Expansion(joystick->index, &exp);
+	prev_state = (joystick_hwdata *)joystick->hwdata;
+	prev_buttons = prev_state->wiimote.prev_buttons;
+	changed = buttons ^ prev_buttons;
+
+	if(changed & (WPAD_BUTTON_LEFT | WPAD_BUTTON_RIGHT | WPAD_BUTTON_DOWN | WPAD_BUTTON_UP))
+	{
+		int hat = SDL_HAT_CENTERED;
+		if(buttons & WPAD_BUTTON_UP) hat |= SDL_HAT_UP;
+		if(buttons & WPAD_BUTTON_DOWN) hat |= SDL_HAT_DOWN;
+		if(buttons & WPAD_BUTTON_LEFT) hat |= SDL_HAT_LEFT;
+		if(buttons & WPAD_BUTTON_RIGHT) hat |= SDL_HAT_RIGHT;
+		SDL_PrivateJoystickHat(joystick, 0, hat);
+	}
+
+	if(changed & (WPAD_CLASSIC_BUTTON_LEFT | WPAD_CLASSIC_BUTTON_RIGHT |
+					WPAD_CLASSIC_BUTTON_DOWN | WPAD_CLASSIC_BUTTON_UP))
+	{
+		int hat = SDL_HAT_CENTERED;
+		if(buttons & WPAD_CLASSIC_BUTTON_UP) hat |= SDL_HAT_UP;
+		if(buttons & WPAD_CLASSIC_BUTTON_DOWN) hat |= SDL_HAT_DOWN;
+		if(buttons & WPAD_CLASSIC_BUTTON_LEFT) hat |= SDL_HAT_LEFT;
+		if(buttons & WPAD_CLASSIC_BUTTON_RIGHT) hat |= SDL_HAT_RIGHT;
+		SDL_PrivateJoystickHat(joystick, 1, hat);
+	}
+
+	for(i = 0; i < (sizeof(sdl_buttons) / sizeof(sdl_buttons[0])); i++)
+	if (changed & sdl_buttons[i])
+	SDL_PrivateJoystickButton(joystick, i,
+			(buttons & sdl_buttons[i]) ? SDL_PRESSED : SDL_RELEASED);
+	prev_state->wiimote.prev_buttons = buttons;
+	int axis;
+	if(exp.type == EXP_NUNCHUK)
+	{
+		axis = exp.nunchuk.js.pos.x;
+		if(prev_state->wiimote.nunchuk_stickX != axis)
+		{
+			SDL_PrivateJoystickAxis(joystick, 0, axis << 8);
+			prev_state->wiimote.nunchuk_stickX = axis;
+		}
+		axis = exp.nunchuk.js.pos.y;
+		if(prev_state->wiimote.nunchuk_stickY != axis)
+		{
+			SDL_PrivateJoystickAxis(joystick, 1, axis << 8);
+			prev_state->wiimote.nunchuk_stickY = axis;
+		}
+	}
+	if(exp.type == EXP_CLASSIC)
+	{
+		axis = exp.classic.ljs.pos.x;
+		if(prev_state->wiimote.classicL_stickX != axis)
+		{
+			SDL_PrivateJoystickAxis(joystick, 2, axis << 8);
+			prev_state->wiimote.classicL_stickX = axis;
+		}
+		axis = exp.classic.ljs.pos.y;
+		if(prev_state->wiimote.classicL_stickY != axis)
+		{
+			SDL_PrivateJoystickAxis(joystick, 3, axis << 8);
+			prev_state->wiimote.classicL_stickY = axis;
+		}
+		axis = exp.classic.rjs.pos.x;
+		if(prev_state->wiimote.classicR_stickX != axis)
+		{
+			SDL_PrivateJoystickAxis(joystick, 4, axis << 8);
+			prev_state->wiimote.classicR_stickX = axis;
+		}
+		axis = exp.classic.rjs.pos.y;
+		if(prev_state->wiimote.classicR_stickY != axis)
+		{
+			SDL_PrivateJoystickAxis(joystick, 5, axis << 8);
+			prev_state->wiimote.classicR_stickY = axis;
+		}
+		axis = exp.classic.r_shoulder;
+		if(prev_state->wiimote.classic_triggerR != axis)
+		{
+			SDL_PrivateJoystickAxis(joystick, 6, axis << 8);
+			prev_state->wiimote.classic_triggerR = axis;
+		}
+		axis = exp.classic.l_shoulder;
+		if(prev_state->wiimote.classic_triggerL != axis)
+		{
+			SDL_PrivateJoystickAxis(joystick, 7, axis << 8);
+			prev_state->wiimote.classic_triggerL = axis;
+		}
+	}
+}
+
+static void _HandleGCJoystickUpdate(SDL_Joystick* joystick)
+{
+	u16 buttons, prev_buttons, changed;
+	int i;
+	joystick_hwdata *prev_state;
+
+	const int sdl_buttons[] =
+	{
 		PAD_BUTTON_A,
 		PAD_BUTTON_B,
 		PAD_BUTTON_X,
@@ -116,91 +288,105 @@ void SDL_SYS_JoystickUpdate(SDL_Joystick *joystick)
 		PAD_BUTTON_START
 	};
 
-	if (!joystick) return;
+	buttons = PAD_ButtonsHeld(joystick->index - 4);
-
-	
-	buttons = PAD_ButtonsHeld(joystick->index);
-	
 	prev_state = (joystick_hwdata *)joystick->hwdata;
+	prev_buttons = prev_state->gamecube.prev_buttons;
+	changed = buttons ^ prev_buttons;
 
-	prev_buttons = prev_state->prev_buttons;
+	if(changed & (PAD_BUTTON_LEFT | PAD_BUTTON_RIGHT | PAD_BUTTON_DOWN | PAD_BUTTON_UP))
-	changed = buttons^prev_buttons;
+	{
-
-	if ((changed)&(PAD_BUTTON_LEFT|PAD_BUTTON_RIGHT|PAD_BUTTON_DOWN|PAD_BUTTON_UP)) {
 		int hat = SDL_HAT_CENTERED;
-		if (buttons&PAD_BUTTON_UP) hat|=SDL_HAT_UP;
+		if(buttons & PAD_BUTTON_UP) hat |= SDL_HAT_UP;
-		if (buttons&PAD_BUTTON_DOWN) hat|=SDL_HAT_DOWN;
+		if(buttons & PAD_BUTTON_DOWN) hat |= SDL_HAT_DOWN;
-		if (buttons&PAD_BUTTON_LEFT) hat|=SDL_HAT_LEFT;
+		if(buttons & PAD_BUTTON_LEFT) hat |= SDL_HAT_LEFT;
-		if (buttons&PAD_BUTTON_RIGHT) hat|=SDL_HAT_RIGHT;
+		if(buttons & PAD_BUTTON_RIGHT) hat |= SDL_HAT_RIGHT;
 		SDL_PrivateJoystickHat(joystick, 0, hat);
 	}
 
-
+	for(i = 0; i < (sizeof(sdl_buttons) / sizeof(sdl_buttons[0])); i++)
-	for(i=0;i<sizeof(sdl_buttons)/sizeof(sdl_buttons[0]);i++) {
+	if (changed & sdl_buttons[i])
-		if (changed & sdl_buttons[i]) {
+	SDL_PrivateJoystickButton(joystick, i,
-			SDL_PrivateJoystickButton(joystick, i, (buttons & sdl_buttons[i])?SDL_PRESSED:SDL_RELEASED);
+			(buttons & sdl_buttons[i]) ? SDL_PRESSED : SDL_RELEASED);
-		}
+	prev_state->gamecube.prev_buttons = buttons;
-	}
-	
-	prev_state->prev_buttons = buttons;
-	
 	int axis = PAD_StickX(joystick->index);
-	
+	if(prev_state->gamecube.stickX != axis)
-	if ( prev_state->stickX != axis ) {
+	{
-		SDL_PrivateJoystickAxis(joystick, 0, axis << 8 );
+		SDL_PrivateJoystickAxis(joystick, 0, axis << 8);
-		prev_state->stickX = axis;
+		prev_state->gamecube.stickX = axis;
 	}
 
 	axis = PAD_StickY(joystick->index);
-
+	if(prev_state->gamecube.stickY != axis)
-	if ( prev_state->stickY != axis ) {
+	{
 		SDL_PrivateJoystickAxis(joystick, 1, (-axis) << 8);
-		prev_state->stickY = axis;
+		prev_state->gamecube.stickY = axis;
 	}
 
 	axis = PAD_SubStickX(joystick->index);
-
+	if(prev_state->gamecube.substickX != axis)
-	if ( prev_state->substickX != axis ) {
+	{
 		SDL_PrivateJoystickAxis(joystick, 2, axis << 8);
-		prev_state->substickX = axis;
+		prev_state->gamecube.substickX = axis;
 	}
 
 	axis = PAD_SubStickY(joystick->index);
-
+	if(prev_state->gamecube.substickY != axis)
-	if ( prev_state->substickY != axis ) {
+	{
 		SDL_PrivateJoystickAxis(joystick, 3, axis << 8);
-		prev_state->substickY = axis;
+		prev_state->gamecube.substickY = axis;
 	}
 
 	axis = PAD_TriggerL(joystick->index);
-
+	if(prev_state->gamecube.triggerL != axis)
-	if ( prev_state->triggerL != axis ) {
+	{
 		SDL_PrivateJoystickAxis(joystick, 4, axis << 8);
-		prev_state->triggerL = axis;
+		prev_state->gamecube.triggerL = axis;
 	}
 
 	axis = PAD_TriggerR(joystick->index);
-
+	if(prev_state->gamecube.triggerR != axis)
-	if ( prev_state->triggerR != axis ) {
+	{
 		SDL_PrivateJoystickAxis(joystick, 5, axis << 8);
-		prev_state->triggerR = axis;
+		prev_state->gamecube.triggerR = axis;
 	}
+}
 
+/* 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.
+ */
+
+void SDL_SYS_JoystickUpdate(SDL_Joystick *joystick)
+{
+	if(!joystick)
+	return;
+	switch(((joystick_hwdata*)(joystick->hwdata))->type)
+	{
+		case 0:
+		if(__jswpad_enabled)
+		_HandleWiiJoystickUpdate(joystick);
+		break;
+		case 1:
+		if(__jspad_enabled)
+		_HandleGCJoystickUpdate(joystick);
+		break;
+		default:
+		break;
+	}
 }
 
 /* Function to close a joystick after use */
 void SDL_SYS_JoystickClose(SDL_Joystick *joystick)
 {
-	if (joystick->hwdata != NULL) {
+	if (joystick->hwdata != NULL)
-		/* free system specific hardware data */
 		SDL_free(joystick->hwdata);
-	}
 }
 
 /* Function to perform any system-specific joystick related cleanup */
 void SDL_SYS_JoystickQuit(void)
 {
-	return;
+
 }
 
 #endif /* SDL_JOYSTICK_DC */