- [Psy-X] another GCC fixes

src_rebuild/PsyX/include/PsyX/PsyX_public.h

@@ -118,11 +118,6 @@ extern void PsyX_WaitForTimestep(int count);
 /* Changes swap interval state */
 extern void PsyX_EnableSwapInterval(int enable);
 
-//----------------------------------------------------------------------
-
-/* Initializes CD filesystem */
-extern void PsyX_CDFS_Init(const char* imageFileName, int track /*= 0*/, int sectorSize /*= 0*/);
-
 #if defined(_LANGUAGE_C_PLUS_PLUS)||defined(__cplusplus)||defined(c_plusplus)
 }
 #endif

src_rebuild/PsyX/include/psx/libcd.h

@@ -194,6 +194,8 @@ typedef struct {
 extern "C" {
 #endif
 
+/* Initializes CD filesystem using ISO 9660 compliant file */
+extern void PsyX_CDFS_Init(const char* imageFileName, int track /*= 0*/, int sectorSize /*= 0*/);
 
 void	StSetRing(u_long *ring_addr,u_long ring_size);
 void	StClearRing(void);
@@ -249,7 +251,6 @@ int CdGetDiskType( void );
 struct EXEC *CdReadExec(char *file);
 void CdReadBreak( void );
 
-
 #if defined(_LANGUAGE_C_PLUS_PLUS)||defined(__cplusplus)||defined(c_plusplus)
 }
 #endif

src_rebuild/PsyX/src/PsyX_main.cpp

@@ -12,6 +12,7 @@
 #include "psx/libetc.h"
 #include "psx/libgte.h"
 #include "psx/libgpu.h"
+#include "psx/libspu.h"
 
 #include <assert.h>
 #include <ctype.h>
@@ -65,17 +66,17 @@ extern "C" {
 #endif
 
 extern void(*vsync_callback)(void);
-extern void PsyX_ShutdownSound();
-
-extern void PsyX_Pad_Event_ControllerRemoved(Sint32 deviceId);
-extern void PsyX_Pad_Event_ControllerAdded(Sint32 deviceId);
 
 #if defined(_LANGUAGE_C_PLUS_PLUS)||defined(__cplusplus)||defined(c_plusplus)
 }
 #endif
 
-extern int GR_InitialisePSX();
+extern int	PsyX_Pad_InitSystem();
-extern int GR_InitialiseRender(char* windowName, int width, int height, int fullscreen);
+extern void PsyX_Pad_Event_ControllerRemoved(Sint32 deviceId);
+extern void PsyX_Pad_Event_ControllerAdded(Sint32 deviceId);
+
+extern int	GR_InitialisePSX();
+extern int	GR_InitialiseRender(char* windowName, int width, int height, int fullscreen);
 
 extern void GR_ResetDevice();
 extern void GR_Shutdown();
@@ -260,6 +261,8 @@ static void PsyX_Sys_InitialiseInput()
 	g_controller_mapping.gc_axis_left_y = SDL_CONTROLLER_AXIS_LEFTY | CONTROLLER_MAP_FLAG_AXIS;
 	g_controller_mapping.gc_axis_right_x = SDL_CONTROLLER_AXIS_RIGHTX | CONTROLLER_MAP_FLAG_AXIS;
 	g_controller_mapping.gc_axis_right_y = SDL_CONTROLLER_AXIS_RIGHTY | CONTROLLER_MAP_FLAG_AXIS;
+
+	PsyX_Pad_InitSystem();
 }
 
 #ifdef __GNUC__
@@ -953,7 +956,7 @@ void PsyX_Shutdown()
 		SDL_DestroyMutex(g_intrMutex);
 
 	GR_Shutdown();
-	PsyX_ShutdownSound();
+	SpuQuit();
 
 	SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
 

src_rebuild/PsyX/src/pad/PsyX_pad.cpp

@@ -0,0 +1,488 @@
+#include "psx/libpad.h"
+#include "psx/libetc.h"
+
+#include "../PsyX_main.h"
+#include "PsyX_pad.h"
+#include "PsyX/PsyX_public.h"
+
+#include <string.h>
+
+extern "C"
+{
+extern int g_padCommEnable;
+}
+
+typedef struct
+{
+	Sint32				deviceId;	// linked device Id
+	SDL_GameController* gc;
+	SDL_Haptic*			haptic;
+	int					hapticEffect;
+
+	u_char*				padData;
+} PsyXController;
+
+PsyXController			g_controllers[MAX_CONTROLLERS];
+int						g_controllerToSlotMapping[MAX_CONTROLLERS] = { -1, -1 };
+const u_char*			g_sdlKeyboardState = NULL;
+
+u_short PsyX_Pad_UpdateKeyboardInput();
+void	PsyX_Pad_UpdateGameControllerInput(SDL_GameController* cont, LPPADRAW pad);
+
+// Initializes SDL controllers
+int PsyX_Pad_InitSystem()
+{
+	// do not init second time!
+	if (g_sdlKeyboardState != NULL)
+		return 1;
+
+	memset(g_controllers, 0, sizeof(g_controllers));
+
+	// init keyboard state
+	g_sdlKeyboardState = SDL_GetKeyboardState(NULL);
+
+	if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER | SDL_INIT_HAPTIC) < 0)
+	{
+		eprinterr("Failed to initialise SDL GameController subsystem!\n");
+		return 0;
+	}
+
+	// Add more controllers from custom file
+	SDL_GameControllerAddMappingsFromFile("gamecontrollerdb.txt");
+
+	return 1;
+}
+
+// Prints controller list into console
+void PsyX_Pad_Debug_ListControllers()
+{
+	int numJoysticks = SDL_NumJoysticks();
+	int numHaptics = SDL_NumHaptics();
+
+	if (numJoysticks)
+	{
+		eprintf("SDL GameController list:\n");
+
+		for (int i = 0; i < numJoysticks; i++)
+		{
+			if (SDL_IsGameController(i))
+			{
+				eprintinfo("  %d '%s'\n", i, SDL_GameControllerNameForIndex(i));
+			}
+		}
+	}
+	else
+		eprintwarn("No SDL GameControllers found!\n");
+
+	if (numHaptics)
+	{
+		eprintf("SDL haptic list:\n");
+
+		for (int i = 0; i < numHaptics; i++)
+		{
+			eprintinfo("  %d '%s'\n", i, SDL_HapticName(i));
+		}
+	}
+	else
+		eprintwarn("No SDL haptics found!\n");
+}
+
+// Opens specific system controller and assigns to specified slot
+void PsyX_Pad_OpenController(Sint32 deviceId, int slot)
+{
+	PsyXController* controller = &g_controllers[slot];
+
+	if (controller->gc)
+	{
+		return;
+	}
+
+	controller->gc = SDL_GameControllerOpen(deviceId);
+
+	if (controller->gc)
+	{
+		// assign device id automatically
+		if (controller->deviceId == -1)
+			controller->deviceId = deviceId;
+
+		SDL_Joystick* joy = SDL_GameControllerGetJoystick(controller->gc);
+
+		// try open haptics
+		if (SDL_JoystickIsHaptic(joy))
+			controller->haptic = SDL_HapticOpenFromJoystick(joy);
+		else // try open using device ID
+			controller->haptic = SDL_HapticOpen(controller->deviceId);
+
+		if (!controller->haptic)
+		{
+			eprintwarn("No haptic for '%s'\n", SDL_GameControllerNameForIndex(deviceId));
+		}
+	}
+}
+
+// Closes controller in specific slot
+void PsyX_Pad_CloseController(int slot)
+{
+	PsyXController* controller = &g_controllers[slot];
+
+	SDL_HapticClose(controller->haptic);
+	SDL_GameControllerClose(controller->gc);
+
+	//controller->deviceId = -1;
+	controller->gc = NULL;
+	controller->haptic = NULL;
+}
+
+// Called from LIBPAD
+void PsyX_Pad_InitPad(int slot, u_char* padData)
+{
+	LPPADRAW pad;
+	PsyXController* controller = &g_controllers[slot];
+
+	controller->padData = padData;
+	controller->deviceId = g_controllerToSlotMapping[slot];
+
+	if (padData)
+	{
+		pad = (LPPADRAW)padData;
+		pad->id = slot == 0 ? 0x41 : 0xFF;	// since keyboard is a main controller - it's always on
+		pad->buttons[0] = 0xFF;
+		pad->buttons[1] = 0xFF;
+		pad->analog[0] = 128;
+		pad->analog[1] = 128;
+		pad->analog[2] = 128;
+		pad->analog[3] = 128;
+	}
+}
+
+// called from Psy-X SDL events
+void PsyX_Pad_Event_ControllerAdded(Sint32 deviceId)
+{
+	int i;
+	PsyXController* controller;
+
+	// reinitialize haptics (why we still here?)
+	SDL_QuitSubSystem(SDL_INIT_HAPTIC);			// FIXME: this will crash if you already have haptics
+	SDL_InitSubSystem(SDL_INIT_HAPTIC);
+
+	PsyX_Pad_Debug_ListControllers();
+
+	// find mapping and open
+	for (i = 0; i < MAX_CONTROLLERS; i++)
+	{
+		controller = &g_controllers[i];
+
+		if (controller->deviceId == -1 || controller->deviceId == deviceId)
+		{
+			PsyX_Pad_OpenController(deviceId, i);
+			break;
+		}
+	}
+}
+
+// called from Psy-X SDL events
+void PsyX_Pad_Event_ControllerRemoved(Sint32 deviceId)
+{
+	int i;
+	PsyXController* controller;
+
+	PsyX_Pad_Debug_ListControllers();
+
+	// find mapping and close
+	for (int i = 0; i < MAX_CONTROLLERS; i++)
+	{
+		controller = &g_controllers[i];
+
+		if (controller->deviceId == deviceId)
+		{
+			PsyX_Pad_CloseController(i);
+		}
+	}
+}
+
+void PsyX_Pad_InternalPadUpdates()
+{
+	PsyXController* controller;
+	LPPADRAW pad;
+	u_short kbInputs;
+
+	if (g_padCommEnable == 0)
+		return;
+
+	kbInputs = PsyX_Pad_UpdateKeyboardInput();
+
+	for (int i = 0; i < MAX_CONTROLLERS; i++)
+	{
+		controller = &g_controllers[i];
+
+		if (controller->padData)
+		{
+			pad = (LPPADRAW)controller->padData;
+
+			PsyX_Pad_UpdateGameControllerInput(controller->gc, pad);
+
+			if (i == 0)	// Update keyboard for PAD 1
+			{
+				pad->status = 0;	// PadStateStable?
+
+				// switch to analog state
+				if ((pad->analog[0] == 255 ||
+					pad->analog[1] == 255 ||
+					pad->analog[2] == 255 ||
+					pad->analog[3] == 255) &&
+					pad->id == 0x41)
+				{
+					eprintf("Switched controller type to ANALOG\n");
+					pad->id = 0x73;
+				}
+
+				if (g_activeKeyboardControllers & 0x1)
+				{
+					// switch state
+					if (kbInputs != 0xFFFF && pad->id == 0x73)
+					{
+						eprintf("Switched controller type to SIMPLE\n");
+						pad->id = 0x41;
+						pad->analog[0] = 127;	// TODO: mouse?
+						pad->analog[1] = 127;
+						pad->analog[2] = 127;
+						pad->analog[3] = 127;
+					}
+
+					*(u_short*)pad->buttons &= kbInputs;
+				}
+			}
+			else if (i == 1)	// Update keyboard for PAD 2
+			{
+				if (g_activeKeyboardControllers & 0x2)
+				{
+					pad->status = 0;	// PadStateStable?
+					pad->id = 0x41;
+					pad->analog[0] = 127;
+					pad->analog[1] = 127;
+					pad->analog[2] = 127;
+					pad->analog[3] = 127;
+
+					*(u_short*)pad->buttons &= kbInputs;
+				}
+			}
+		}
+	}
+
+#if defined(__ANDROID__)
+	///@TODO SDL_NumJoysticks always reports > 0 for some reason on Android.
+#endif
+}
+
+
+int GetControllerButtonState(SDL_GameController* cont, int buttonOrAxis)
+{
+	if (buttonOrAxis & CONTROLLER_MAP_FLAG_AXIS)
+	{
+		int value = SDL_GameControllerGetAxis(cont, (SDL_GameControllerAxis)(buttonOrAxis & ~(CONTROLLER_MAP_FLAG_AXIS | CONTROLLER_MAP_FLAG_INVERSE)));
+
+		if (abs(value) > 500 && (buttonOrAxis & CONTROLLER_MAP_FLAG_INVERSE))
+			value *= -1;
+
+		return value;
+	}
+
+	return SDL_GameControllerGetButton(cont, (SDL_GameControllerButton)buttonOrAxis) * 32767;
+}
+
+void PsyX_Pad_UpdateGameControllerInput(SDL_GameController* cont, LPPADRAW pad)
+{
+	short leftX, leftY, rightX, rightY;
+	u_short ret = 0xFFFF;
+
+	if (!cont)
+	{
+		pad->analog[0] = 127;
+		pad->analog[1] = 127;
+		pad->analog[2] = 127;
+		pad->analog[3] = 127;
+
+		*(u_short*)pad->buttons = ret;
+		return;
+	}
+
+	if (GetControllerButtonState(cont, g_controller_mapping.gc_square) > 16384)//Square
+		ret &= ~0x8000;
+
+	if (GetControllerButtonState(cont, g_controller_mapping.gc_circle) > 16384)//Circle
+		ret &= ~0x2000;
+
+	if (GetControllerButtonState(cont, g_controller_mapping.gc_triangle) > 16384)//Triangle
+		ret &= ~0x1000;
+
+	if (GetControllerButtonState(cont, g_controller_mapping.gc_cross) > 16384)//Cross
+		ret &= ~0x4000;
+
+	if (GetControllerButtonState(cont, g_controller_mapping.gc_l1) > 16384)//L1
+		ret &= ~0x400;
+
+	if (GetControllerButtonState(cont, g_controller_mapping.gc_r1) > 16384)//R1
+		ret &= ~0x800;
+
+	if (GetControllerButtonState(cont, g_controller_mapping.gc_l2) > 16384)//L2
+		ret &= ~0x100;
+
+	if (GetControllerButtonState(cont, g_controller_mapping.gc_r2) > 16384)//R2
+		ret &= ~0x200;
+
+	if (GetControllerButtonState(cont, g_controller_mapping.gc_dpad_up) > 16384)//UP
+		ret &= ~0x10;
+
+	if (GetControllerButtonState(cont, g_controller_mapping.gc_dpad_down) > 16384)//DOWN
+		ret &= ~0x40;
+
+	if (GetControllerButtonState(cont, g_controller_mapping.gc_dpad_left) > 16384)//LEFT
+		ret &= ~0x80;
+
+	if (GetControllerButtonState(cont, g_controller_mapping.gc_dpad_right) > 16384)//RIGHT
+		ret &= ~0x20;
+
+	if (GetControllerButtonState(cont, g_controller_mapping.gc_l3) > 16384)//L3
+		ret &= ~0x2;
+
+	if (GetControllerButtonState(cont, g_controller_mapping.gc_r3) > 16384)//R3
+		ret &= ~0x4;
+
+	if (GetControllerButtonState(cont, g_controller_mapping.gc_select) > 16384)//SELECT
+		ret &= ~0x1;
+
+	if (GetControllerButtonState(cont, g_controller_mapping.gc_start) > 16384)//START
+		ret &= ~0x8;
+
+	leftX = GetControllerButtonState(cont, g_controller_mapping.gc_axis_left_x);
+	leftY = GetControllerButtonState(cont, g_controller_mapping.gc_axis_left_y);
+
+	rightX = GetControllerButtonState(cont, g_controller_mapping.gc_axis_right_x);
+	rightY = GetControllerButtonState(cont, g_controller_mapping.gc_axis_right_y);
+
+	*(u_short*)pad->buttons = ret;
+
+	// map to range
+	pad->analog[0] = (rightX / 256) + 128;
+	pad->analog[1] = (rightY / 256) + 128;
+	pad->analog[2] = (leftX / 256) + 128;
+	pad->analog[3] = (leftY / 256) + 128;
+}
+
+u_short PsyX_Pad_UpdateKeyboardInput()
+{
+	u_short ret = 0xFFFF;
+
+	//Not initialised yet
+	if (g_sdlKeyboardState == NULL)
+		return ret;
+
+	SDL_PumpEvents();
+
+	if (g_sdlKeyboardState[g_keyboard_mapping.kc_square])//Square
+		ret &= ~0x8000;
+
+	if (g_sdlKeyboardState[g_keyboard_mapping.kc_circle])//Circle
+		ret &= ~0x2000;
+
+	if (g_sdlKeyboardState[g_keyboard_mapping.kc_triangle])//Triangle
+		ret &= ~0x1000;
+
+	if (g_sdlKeyboardState[g_keyboard_mapping.kc_cross])//Cross
+		ret &= ~0x4000;
+
+	if (g_sdlKeyboardState[g_keyboard_mapping.kc_l1])//L1
+		ret &= ~0x400;
+
+	if (g_sdlKeyboardState[g_keyboard_mapping.kc_l2])//L2
+		ret &= ~0x100;
+
+	if (g_sdlKeyboardState[g_keyboard_mapping.kc_l3])//L3
+		ret &= ~0x2;
+
+	if (g_sdlKeyboardState[g_keyboard_mapping.kc_r1])//R1
+		ret &= ~0x800;
+
+	if (g_sdlKeyboardState[g_keyboard_mapping.kc_r2])//R2
+		ret &= ~0x200;
+
+	if (g_sdlKeyboardState[g_keyboard_mapping.kc_r3])//R3
+		ret &= ~0x4;
+
+	if (g_sdlKeyboardState[g_keyboard_mapping.kc_dpad_up])//UP
+		ret &= ~0x10;
+
+	if (g_sdlKeyboardState[g_keyboard_mapping.kc_dpad_down])//DOWN
+		ret &= ~0x40;
+
+	if (g_sdlKeyboardState[g_keyboard_mapping.kc_dpad_left])//LEFT
+		ret &= ~0x80;
+
+	if (g_sdlKeyboardState[g_keyboard_mapping.kc_dpad_right])//RIGHT
+		ret &= ~0x20;
+
+	if (g_sdlKeyboardState[g_keyboard_mapping.kc_select])//SELECT
+		ret &= ~0x1;
+
+	if (g_sdlKeyboardState[g_keyboard_mapping.kc_start])//START
+		ret &= ~0x8;
+
+	return ret;
+}
+
+int PsyX_Pad_GetStatus(int mtap, int slot)
+{
+	PsyXController* controller;
+
+	if (slot == 0)
+		return 1;	// keyboard always here
+
+	controller = &g_controllers[slot];
+
+	if (controller->gc && SDL_GameControllerGetAttached(controller->gc))
+		return 1;
+
+	return 0;
+}
+
+void PsyX_Pad_Vibrate(int mtap, int slot, unsigned char* table, int len)
+{
+	PsyXController* controller = &g_controllers[slot];
+
+	if (!controller->haptic)
+		return;
+
+	if (len == 0)
+		return;
+
+	SDL_HapticEffect eff;
+	eff.type = SDL_HAPTIC_LEFTRIGHT;
+
+	eff.leftright.small_magnitude = table[0] * 255;
+
+	if (len > 1)
+		eff.leftright.large_magnitude = table[1] * 255;
+	else
+		eff.leftright.large_magnitude = 0;
+
+	eff.leftright.length = 400;
+
+	if (SDL_HapticEffectSupported(controller->haptic, &eff) != SDL_TRUE)
+		return;
+
+	if (controller->hapticEffect == -1)
+	{
+		controller->hapticEffect = SDL_HapticNewEffect(controller->haptic, &eff);
+		if (controller->hapticEffect == -1)
+		{
+			eprintwarn("Warning: Unable to create haptic effect! %s\n", SDL_GetError());
+		}
+	}
+	else
+		SDL_HapticUpdateEffect(controller->haptic, controller->hapticEffect, &eff);
+
+	if (SDL_HapticRunEffect(controller->haptic, controller->hapticEffect, 1) != 0)
+	{
+		eprintwarn("Warning: Unable to run haptic effect! %s\n", SDL_GetError());
+	}
+}

src_rebuild/PsyX/src/pad/PsyX_pad.h

@@ -0,0 +1,16 @@
+#ifndef PSYX_PAD_H
+#define PSYX_PAD_H
+
+#if defined(_LANGUAGE_C_PLUS_PLUS)||defined(__cplusplus)||defined(c_plusplus)
+extern "C" {
+#endif
+
+extern void		PsyX_Pad_InitPad(int slot, u_char* padData);
+extern void		PsyX_Pad_Vibrate(int mtap, int slot, unsigned char* table, int len);
+extern int		PsyX_Pad_GetStatus(int mtap, int slot);
+
+#if defined(_LANGUAGE_C_PLUS_PLUS)||defined(__cplusplus)||defined(c_plusplus)
+}
+#endif
+
+#endif // PSYX_PAD_H

src_rebuild/PsyX/src/psx/LIBPAD.C

@@ -2,191 +2,18 @@
 #include "psx/libetc.h"
 
 #include "../PsyX_main.h"
+#include "../pad/PsyX_pad.h"
+
 #include "PsyX/PsyX_public.h"
 
 #include <string.h>
 
-typedef struct
-{
-	Sint32				deviceId;	// linked device Id
-	SDL_GameController* gc;
-	SDL_Haptic*			haptic;
-
-	u_char*				padData;
-} PsyXController;
-
-PsyXController			g_controllers[MAX_CONTROLLERS];
-int						g_controllerToSlotMapping[MAX_CONTROLLERS] = { -1, -1 };
-
-const u_char*			g_sdlKeyboardState = NULL;
-
 int g_padCommEnable = 0;
 
-void PsyX_Pad_Debug_ListControllers()
-{
-	int numJoysticks = SDL_NumJoysticks();
-	int numHaptics = SDL_NumHaptics();
-
-	if(numJoysticks)
-	{
-		eprintf("SDL GameController list:\n");
-
-		for (int i = 0; i < numJoysticks; i++)
-		{
-			if (SDL_IsGameController(i))
-			{
-				eprintinfo("  %d '%s'\n", i, SDL_GameControllerNameForIndex(i));
-			}
-		}
-	}
-	else
-		eprintwarn("No SDL GameControllers found!\n");
-
-	if(numHaptics)
-	{
-		eprintf("SDL haptic list:\n");
-
-		for (int i = 0; i < numHaptics; i++)
-		{
-			eprintinfo("  %d '%s'\n", i, SDL_HapticName(i));
-		}
-	}
-	else
-		eprintwarn("No SDL haptics found!\n");
-}
-
-void PsyX_Pad_OpenController(Sint32 deviceId, int slot)
-{
-	PsyXController* controller = &g_controllers[slot];
-
-	if(controller->gc)
-	{
-		return;
-	}
-	
-	controller->gc = SDL_GameControllerOpen(deviceId);
-
-	if(controller->gc)
-	{
-		// assign device id automatically
-		if (controller->deviceId == -1)
-			controller->deviceId = deviceId;
-		
-		SDL_Joystick* joy = SDL_GameControllerGetJoystick(controller->gc);
-
-		// try open haptics
-		if(SDL_JoystickIsHaptic(joy))
-			controller->haptic = SDL_HapticOpenFromJoystick(joy);
-		else // try open using device ID
-			controller->haptic = SDL_HapticOpen(controller->deviceId);
-
-		if(!controller->haptic)
-		{
-			eprintwarn("No haptic for '%s'\n", SDL_GameControllerNameForIndex(deviceId));
-		}
-	}
-}
-
-void PsyX_Pad_CloseController(int slot)
-{
-	PsyXController* controller = &g_controllers[slot];
-
-	SDL_HapticClose(controller->haptic);
-	SDL_GameControllerClose(controller->gc);
-	
-	//controller->deviceId = -1;
-	controller->gc = NULL;
-	controller->haptic = NULL;
-}
-
-void PsyX_Pad_InitPad(int slot, u_char* padData)
-{
-	LPPADRAW pad;
-	PsyXController* controller = &g_controllers[slot];
-
-	controller->padData = padData;
-	controller->deviceId = g_controllerToSlotMapping[slot];
-
-	if(padData)
-	{
-		pad = (LPPADRAW)padData;
-		pad->id = slot == 0 ? 0x41 : 0xFF;	// since keyboard is a main controller - it's always on
-		pad->buttons[0] = 0xFF;
-		pad->buttons[1] = 0xFF;
-		pad->analog[0] = 128;
-		pad->analog[1] = 128;
-		pad->analog[2] = 128;
-		pad->analog[3] = 128;
-	}
-}
-
-// called from Psy-X SDL events
-void PsyX_Pad_Event_ControllerAdded(Sint32 deviceId)
-{
-	int i;
-	PsyXController* controller;
-
-	// reinitialize haptics (why we still here?)
-	SDL_QuitSubSystem(SDL_INIT_HAPTIC);			// FIXME: this will crash if you already have haptics
-	SDL_InitSubSystem(SDL_INIT_HAPTIC);
-	
-	PsyX_Pad_Debug_ListControllers();
-
-	// find mapping and open
-	for(i = 0; i < MAX_CONTROLLERS; i++)
-	{
-		controller = &g_controllers[i];
-
-		if(controller->deviceId == -1 || controller->deviceId == deviceId)
-		{
-			PsyX_Pad_OpenController(deviceId, i);
-			break;
-		}
-	}
-}
-
-// called from Psy-X SDL events
-void PsyX_Pad_Event_ControllerRemoved(Sint32 deviceId)
-{
-	int i;
-	PsyXController* controller;
-
-	PsyX_Pad_Debug_ListControllers();
-
-	// find mapping and close
-	for (int i = 0; i < MAX_CONTROLLERS; i++)
-	{
-		controller = &g_controllers[i];
-
-		if (controller->deviceId == deviceId)
-		{
-			PsyX_Pad_CloseController(i);
-		}
-	}
-}
-
 void PadInitDirect(unsigned char* pad1, unsigned char* pad2)
 {
-	// do not init second time!
-	if (g_sdlKeyboardState != NULL)
-		return;
-
-	memset(g_controllers, 0, sizeof(g_controllers));
-
-	// init keyboard state
-	g_sdlKeyboardState = SDL_GetKeyboardState(NULL);
-
 	PsyX_Pad_InitPad(0, pad1);
 	PsyX_Pad_InitPad(1, pad2);
-	
-	if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER | SDL_INIT_HAPTIC) < 0)
-	{
-		eprinterr("Failed to initialise SDL GameController subsystem!\n");
-		return;
-	}
-	
-	// Add more controllers from custom file
-	SDL_GameControllerAddMappingsFromFile("gamecontrollerdb.txt");
 }
 
 void PadInitMtap(unsigned char* unk00, unsigned char* unk01)
@@ -233,21 +60,12 @@ void PadRemoveGun()
 
 int PadGetState(int port)
 {
-	PsyXController* controller;
 	int mtap, slot;
 
 	mtap = port & 3;
 	slot = (mtap * 2) + (port >> 4) & 1;
 
-	if(slot == 0)
+	return PsyX_Pad_GetStatus(mtap, slot) ? PadStateStable : PadStateDiscon;
-		return PadStateStable;	// keyboard always here
-
-	controller = &g_controllers[slot];
-	
-	if(controller->gc && SDL_GameControllerGetAttached(controller->gc))
-		return PadStateStable;
-
-	return PadStateDiscon;
 }
 
 int PadInfoMode(int port, int term, int offs)
@@ -277,282 +95,12 @@ int PadSetMainMode(int socket, int offs, int lock)
 	return 0;
 }
 
-u_short hapticData[MAX_CONTROLLERS][64];
-int hapticEffects[MAX_CONTROLLERS] = { -1, -1 };
-
 void PadSetAct(int port, unsigned char* table, int len)
 {
-	PsyXController* controller;
 	int mtap, slot;
 
 	mtap = port & 3;
 	slot = (mtap * 2) + (port >> 4) & 1;
 
-	controller = &g_controllers[slot];
+	PsyX_Pad_Vibrate(mtap, slot, table, len);
-	
-	if (!controller->haptic)
-		return;
-
-	if (len == 0)
-		return;
-
-	SDL_HapticEffect eff;
-	eff.type = SDL_HAPTIC_LEFTRIGHT;
-	
-	eff.leftright.small_magnitude = table[0] * 255;
-	
-	if(len > 1)
-		eff.leftright.large_magnitude = table[1] * 255;
-	else
-		eff.leftright.large_magnitude = 0;
-
-	eff.leftright.length = 400;
-	
-	if (SDL_HapticEffectSupported(controller->haptic, &eff) != SDL_TRUE)
-		return;
-	
-	if(hapticEffects[slot] == -1)
-	{
-		hapticEffects[slot] = SDL_HapticNewEffect(controller->haptic, &eff);
-		if(hapticEffects[slot] == -1)
-		{
-			eprintwarn("Warning: Unable to create haptic effect! %s\n", SDL_GetError());
-		}
-	}
-	else
-		SDL_HapticUpdateEffect(controller->haptic, hapticEffects[slot], &eff);
-	
-	if (SDL_HapticRunEffect(controller->haptic, hapticEffects[slot], 1) != 0)
-	{
-		eprintwarn("Warning: Unable to run haptic effect! %s\n", SDL_GetError());
-	}
-}
-
-int GetControllerButtonState(SDL_GameController* cont, int buttonOrAxis)
-{
-	if(buttonOrAxis & CONTROLLER_MAP_FLAG_AXIS)
-	{
-		int value = SDL_GameControllerGetAxis(cont, (SDL_GameControllerAxis)(buttonOrAxis & ~(CONTROLLER_MAP_FLAG_AXIS | CONTROLLER_MAP_FLAG_INVERSE)));
-		
-		if (abs(value) > 500 && (buttonOrAxis & CONTROLLER_MAP_FLAG_INVERSE))
-			value *= -1;
-
-		return value;
-	}
-
-	return SDL_GameControllerGetButton(cont, (SDL_GameControllerButton)buttonOrAxis) * 32767;
-}
-
-void PsyX_Pad_UpdateGameControllerInput(SDL_GameController* cont, LPPADRAW pad)
-{
-	short leftX, leftY, rightX, rightY;
-	unsigned short ret = 0xFFFF;
-
-	if (!cont)
-	{
-		pad->analog[0] = 127;
-		pad->analog[1] = 127;
-		pad->analog[2] = 127;
-		pad->analog[3] = 127;
-
-		*(u_short*)pad->buttons = ret;
-		return;
-	}
-
-	if (GetControllerButtonState(cont, g_controller_mapping.gc_square) > 16384)//Square
-		ret &= ~0x8000;
-
-	if (GetControllerButtonState(cont, g_controller_mapping.gc_circle) > 16384)//Circle
-		ret &= ~0x2000;
-
-	if (GetControllerButtonState(cont, g_controller_mapping.gc_triangle) > 16384)//Triangle
-		ret &= ~0x1000;
-
-	if (GetControllerButtonState(cont, g_controller_mapping.gc_cross) > 16384)//Cross
-		ret &= ~0x4000;
-
-	if (GetControllerButtonState(cont, g_controller_mapping.gc_l1) > 16384)//L1
-		ret &= ~0x400;
-
-	if (GetControllerButtonState(cont, g_controller_mapping.gc_r1) > 16384)//R1
-		ret &= ~0x800;
-
-	if (GetControllerButtonState(cont, g_controller_mapping.gc_l2) > 16384)//L2
-		ret &= ~0x100;
-
-	if (GetControllerButtonState(cont, g_controller_mapping.gc_r2) > 16384)//R2
-		ret &= ~0x200;
-
-	if (GetControllerButtonState(cont, g_controller_mapping.gc_dpad_up) > 16384)//UP
-		ret &= ~0x10;
-
-	if (GetControllerButtonState(cont, g_controller_mapping.gc_dpad_down) > 16384)//DOWN
-		ret &= ~0x40;
-
-	if (GetControllerButtonState(cont, g_controller_mapping.gc_dpad_left) > 16384)//LEFT
-		ret &= ~0x80;
-
-	if (GetControllerButtonState(cont, g_controller_mapping.gc_dpad_right) > 16384)//RIGHT
-		ret &= ~0x20;
-
-	if (GetControllerButtonState(cont, g_controller_mapping.gc_l3) > 16384)//L3
-		ret &= ~0x2;
-
-	if (GetControllerButtonState(cont, g_controller_mapping.gc_r3) > 16384)//R3
-		ret &= ~0x4;
-	
-	if (GetControllerButtonState(cont, g_controller_mapping.gc_select) > 16384)//SELECT
-		ret &= ~0x1;
-
-	if (GetControllerButtonState(cont, g_controller_mapping.gc_start) > 16384)//START
-		ret &= ~0x8;
-
-	leftX = GetControllerButtonState(cont, g_controller_mapping.gc_axis_left_x);
-	leftY = GetControllerButtonState(cont, g_controller_mapping.gc_axis_left_y);
-
-	rightX = GetControllerButtonState(cont, g_controller_mapping.gc_axis_right_x);
-	rightY = GetControllerButtonState(cont, g_controller_mapping.gc_axis_right_y);
-	
-	*(u_short*)pad->buttons = ret;
-
-	// map to range
-	pad->analog[0] = (rightX / 256) + 128;
-	pad->analog[1] = (rightY / 256) + 128;
-	pad->analog[2] = (leftX / 256) + 128;
-	pad->analog[3] = (leftY / 256) + 128;
-}
-
-unsigned short UpdateKeyboardInput()
-{
-	unsigned short ret = 0xFFFF;
-
-	//Not initialised yet
-	if (g_sdlKeyboardState == NULL)
-		return ret;
-
-	SDL_PumpEvents();
-
-	if (g_sdlKeyboardState[g_keyboard_mapping.kc_square])//Square
-		ret &= ~0x8000;
-
-	if (g_sdlKeyboardState[g_keyboard_mapping.kc_circle])//Circle
-		ret &= ~0x2000;
-
-	if (g_sdlKeyboardState[g_keyboard_mapping.kc_triangle])//Triangle
-		ret &= ~0x1000;
-
-	if (g_sdlKeyboardState[g_keyboard_mapping.kc_cross])//Cross
-		ret &= ~0x4000;
-
-	if (g_sdlKeyboardState[g_keyboard_mapping.kc_l1])//L1
-		ret &= ~0x400;
-
-	if (g_sdlKeyboardState[g_keyboard_mapping.kc_l2])//L2
-		ret &= ~0x100;
-
-	if (g_sdlKeyboardState[g_keyboard_mapping.kc_l3])//L3
-		ret &= ~0x2;
-
-	if (g_sdlKeyboardState[g_keyboard_mapping.kc_r1])//R1
-		ret &= ~0x800;
-
-	if (g_sdlKeyboardState[g_keyboard_mapping.kc_r2])//R2
-		ret &= ~0x200;
-
-	if (g_sdlKeyboardState[g_keyboard_mapping.kc_r3])//R3
-		ret &= ~0x4;
-	
-	if (g_sdlKeyboardState[g_keyboard_mapping.kc_dpad_up])//UP
-		ret &= ~0x10;
-
-	if (g_sdlKeyboardState[g_keyboard_mapping.kc_dpad_down])//DOWN
-		ret &= ~0x40;
-
-	if (g_sdlKeyboardState[g_keyboard_mapping.kc_dpad_left])//LEFT
-		ret &= ~0x80;
-
-	if (g_sdlKeyboardState[g_keyboard_mapping.kc_dpad_right])//RIGHT
-		ret &= ~0x20;
-
-	if (g_sdlKeyboardState[g_keyboard_mapping.kc_select])//SELECT
-		ret &= ~0x1;
-
-	if (g_sdlKeyboardState[g_keyboard_mapping.kc_start])//START
-		ret &= ~0x8;
-
-	return ret;
-}
-
-void PsyX_Pad_InternalPadUpdates()
-{
-	PsyXController* controller;
-	LPPADRAW pad;
-	u_short kbInputs;
-
-	if (g_padCommEnable == 0)
-		return;
-	
-	kbInputs = UpdateKeyboardInput();
-
-	for (int i = 0; i < MAX_CONTROLLERS; i++)
-	{
-		controller = &g_controllers[i];
-
-		if (controller->padData)
-		{
-			pad = (LPPADRAW)controller->padData;
-
-			PsyX_Pad_UpdateGameControllerInput(controller->gc, pad);
-
-			if (i == 0)	// Update keyboard for PAD 1
-			{
-				pad->status = 0;	// PadStateStable?
-
-				// switch to analog state
-				if ((pad->analog[0] == 255 ||
-					pad->analog[1] == 255 ||
-					pad->analog[2] == 255 ||
-					pad->analog[3] == 255) &&
-					pad->id == 0x41)
-				{
-					eprintf("Switched controller type to ANALOG\n");
-					pad->id = 0x73;
-				}
-				
-				if(g_activeKeyboardControllers & 0x1)
-				{
-					// switch state
-					if (kbInputs != 0xFFFF && pad->id == 0x73)
-					{
-						eprintf("Switched controller type to SIMPLE\n");
-						pad->id = 0x41;
-						pad->analog[0] = 127;	// TODO: mouse?
-						pad->analog[1] = 127;
-						pad->analog[2] = 127;
-						pad->analog[3] = 127;
-					}
-
-					*(u_short*)pad->buttons &= kbInputs;
-				}
-			}
-			else if (i == 1)	// Update keyboard for PAD 2
-			{
-				if (g_activeKeyboardControllers & 0x2)
-				{
-					pad->status = 0;	// PadStateStable?
-					pad->id = 0x41;
-					pad->analog[0] = 127;
-					pad->analog[1] = 127;
-					pad->analog[2] = 127;
-					pad->analog[3] = 127;
-
-					*(u_short*)pad->buttons &= kbInputs;
-				}
-			}
-		}
-	}
-
-#if defined(__ANDROID__)
-	///@TODO SDL_NumJoysticks always reports > 0 for some reason on Android.
-#endif
 }

src_rebuild/PsyX/src/psx/LIBSPU.C

@@ -499,6 +499,7 @@ void SpuInit(void)
 void SpuQuit(void)
 {
 	// do nothing!
+	PsyX_ShutdownSound();
 }
 
 void UpdateVoiceSample(SPUVoice* voice)

src_rebuild/redriver2_psxpc.cpp

@@ -134,7 +134,7 @@ int gStopCivCars = 0;
 
 extern void FunkUpDaBGMTunez(int funk);
 
-void GameDebugKeys(int nKey, bool down)
+void GameDebugKeys(int nKey, char down)
 {
 	CheckModifierKeys(nKey, down);
 	FreeCameraKeyboardHandler(nKey, down);

src_rebuild/utils/video_source/VideoPlayer.cpp

@@ -662,6 +662,7 @@ int FMV_main(RENDER_ARGS* args)
 	DISPENV disp;
 	DRAWENV draw;
 
+	SpuInit();
 	FMVPlayerInitGL();
 
 	InitFMVFont();