Fix PS2 port.

Author: asiekierka

arch/ps2/CONFIG.PS2

@@ -3,5 +3,6 @@
 [[ -z $PS2DEV ]] && { echo "\$PS2DEV is unset. Aborting"; exit 1; }
 
 ./config.sh --platform ps2 --prefix $PS2DEV/ps2sdk/ee --optimize-size \
-            --disable-editor --disable-utils --enable-debug \
-            --enable-meter --enable-extram #--enable-stdio-redirect "$@"
+            --disable-editor --disable-helpsys --disable-utils \
+            --enable-release --enable-meter --enable-extram \
+            --enable-stdio-redirect "$@"

arch/ps2/Makefile.in

@@ -3,11 +3,12 @@ $(error "PS2DEV must be set in your environment.")
 endif
 
 CROSS_COMPILE = mips64r5900el-ps2-elf-
+BINEXT := .elf
 
 # Disable rules that require target code to run natively.
 SUPPRESS_HOST_TARGETS ?= 1
 
-PS2_CFLAGS = -D_EE
+PS2_CFLAGS = -D_EE -D__PS2__
 PS2_INCLUDES = -isystem $(PS2DEV)/ps2sdk/common/include -isystem $(PS2DEV)/ps2sdk/ports/include
 PS2_LDFLAGS = -T$(PS2DEV)/ps2sdk/ee/startup/linkfile -L$(PS2DEV)/ps2sdk/ports/lib \
               -L$(PS2DEV)/gsKit/lib -Wl,-zmax-page-size=128 -G0 -gdwarf-2 -gz
@@ -25,4 +26,7 @@ ARCH_CFLAGS += ${PS2_CFLAGS} ${PS2_INCLUDES}
 ARCH_CXXFLAGS += ${PS2_CFLAGS} ${PS2_INCLUDES}
 ARCH_LDFLAGS += ${PS2_LDFLAGS}
 
+build: ${build}
+	${CP} arch/ps2/pad.config ${build}
+
 include arch/zip.inc

arch/ps2/pad.config

@@ -0,0 +1,42 @@
+# 1 Select
+# 2 L3
+# 3 R3
+# 4 Start
+# 5 Up
+# 6 Right
+# 7 Down
+# 8 Left
+# 9 L2
+# 10 R2
+# 11 L1
+# 12 R1
+# 13 Triangle
+# 14 Circle
+# 15 Cross
+# 16 Square
+
+joy[1,8]axis1 = act_l_left, act_l_right
+joy[1,8]axis2 = act_l_up, act_l_down
+joy[1,8]axis3 = act_r_left, act_r_right
+joy[1,8]axis4 = act_r_up, act_r_down
+joy[1,8].axis_lx = 1
+joy[1,8].axis_ly = 2
+joy[1,8].axis_rx = 3
+joy[1,8].axis_ry = 4
+
+joy[1,8]button1 = act_select
+joy[1,8]button2 = act_lstick
+joy[1,8]button3 = act_rstick
+joy[1,8]button4 = act_start
+joy[1,8]button5 = act_up
+joy[1,8]button6 = act_right
+joy[1,8]button7 = act_down
+joy[1,8]button8 = act_left
+joy[1,8]button9 = act_ltrigger
+joy[1,8]button10 = act_rtrigger
+joy[1,8]button11 = act_lshoulder
+joy[1,8]button12 = act_rshoulder
+joy[1,8]button13 = act_x
+joy[1,8]button14 = act_a
+joy[1,8]button15 = act_b
+joy[1,8]button16 = act_y

src/configure.c

@@ -84,6 +84,14 @@
 #define SAVE_SLOTS_DEFAULT true
 #endif
 
+#ifdef CONFIG_PS2
+#define VIDEO_OUTPUT_DEFAULT "softscale"
+#define FULLSCREEN_WIDTH_DEFAULT 640
+#define FULLSCREEN_HEIGHT_DEFAULT 480
+#define FULLSCREEN_DEFAULT 1
+#define SAVE_SLOTS_DEFAULT true
+#endif
+
 #ifdef CONFIG_WII
 #define AUDIO_SAMPLE_RATE 48000
 #define FULLSCREEN_DEFAULT 1

src/event_sdl.c

@@ -1650,10 +1650,11 @@ void __warp_mouse(int x, int y)
 
 void initialize_joysticks(void)
 {
-#if !SDL_VERSION_ATLEAST(2,0,0) || defined(CONFIG_SWITCH) || defined(CONFIG_PSVITA)
+#if !SDL_VERSION_ATLEAST(2,0,0) || defined(CONFIG_SWITCH) || defined(CONFIG_PSVITA) \
+ || defined(CONFIG_PS2)
   // SDL 1.2 doesn't have joystick added/removed events.
-  // Switch SDL doesn't seem to generate these events at all on startup. The vita
-  // appears to have the same issue.
+  // Switch SDL doesn't seem to generate these events at all on startup. The Vita
+  // and PS2 appear to have the same issue.
   int i, count;
 
   count = SDL_NumJoysticks();