Allow game controllers mapping from file

Fixed mapping for PS3-compatible controller

Author: maccasoft

SDL2/src/SDL.c

@@ -441,6 +441,8 @@ SDL_GetPlatform()
     return "iOS";
 #elif __PSP__
     return "PlayStation Portable";
+#elif defined(__RASPBERRY_PI__)
+    return "RaspberryPi";
 #else
     return "Unknown (see SDL_platform.h)";
 #endif

SDL2/src/joystick/SDL_gamecontrollerdb.h

@@ -71,8 +71,7 @@ static const char *s_ControllerMappings [] =
     "030000005e0400009102000007010000,X360 Wireless Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,",
 #elif defined(__RASPBERRY_PI__)
     "4e45532047616d657061640000000000,NES Gamepad,a:b7,b:b6,dpdown:b2,dpleft:b1,dpright:b0,dpup:b3,guide:b5,start:b4,",
-    "03000000b50700001302000001010000,Mega World USB 2-Axis 8-Button Gamepad,a:b2,b:b0,x:b3,y:b1,leftshoulder:b4,lefttrigger:b5,rightshoulder:b6,righttrigger:b7,leftx:a0,lefty:a1",
-    "030000004c0500006802000000010000,MY-POWER CO.,LTD 2In1 USB Joystick,x:b7,a:b8,b:b9,y:b10,back:b11,start:b14,dpleft:b18,dpdown:b17,dpright:b16,dpup:b15,guide:b0,leftshoulder:b5,lefttrigger:b3,rightshoulder:b6,righttrigger:b4,leftx:a0,lefty:a1,rightx:a2,righty:a3",
+    "030000004c0500006802000000010000,PS3 Controller,a:b9,b:b10,back:b7,dpdown:b1,dpleft:b0,dpright:b2,dpup:b3,guide:b18,leftshoulder:b13,leftstick:b6,lefttrigger:b15,leftx:a0,lefty:a1,rightshoulder:b12,rightstick:b5,righttrigger:b14,rightx:a2,righty:a3,start:b4,x:b8,y:b11,",
 #endif
     NULL
 };

abbaye/src/main.c

@@ -12,6 +12,11 @@
 #include "SDL_image.h"
 #include "SDL_mixer.h"
 
+#include "emmc.h"
+#include "ff.h"
+
+FATFS FatFs;
+
 extern void startscreen(SDL_Window *screen,uint *state,uint *grapset,uint *fullscreen);
 extern void history(SDL_Window *screen,uint *state,uint *grapset,uint *fullscreen);
 extern void game(SDL_Window *screen,uint *state,uint *grapset,uint *fullscreen);
@@ -36,6 +41,10 @@ void main () {
 	uint grapset = 1; /* 0-8bits, 1-16bits */
 	uint fullscreen = 0; /* 0-Windowed,1-Fullscreen */
 
+    if (sd_card_init(NULL) == 0) {
+        f_mount(&FatFs, "0:", 1);
+    }
+
     SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_EVENTS | SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER);
 
 	/* Creating window */
@@ -45,6 +54,14 @@ void main () {
 	Mix_OpenAudio (22050,MIX_DEFAULT_FORMAT,2,4096);
 	Mix_AllocateChannels(5);
 
+	/* Init game controllers */
+    SDL_GameControllerAddMappingsFromFile("control.txt");
+    for (int i = 0; i < SDL_NumJoysticks(); i++) {
+        if (SDL_IsGameController(i)) {
+            SDL_GameControllerOpen(i);
+        }
+    }
+
 	while (1) {
 		switch (state) {
 			case 0: startscreen(screen,&state,&grapset,&fullscreen);

abbaye/src/startscreen.c

@@ -64,9 +64,6 @@ void startscreen(SDL_Window *screen,uint *state,uint *grapset,uint *fullscreen)
 
 		/* Check keyboard */
 		if ( SDL_PollEvent(&keyp) ) {
-            if (keyp.type == SDL_CONTROLLERDEVICEADDED) {
-                SDL_GameControllerOpen(keyp.cdevice.which);
-            }
 			if (keyp.type == SDL_KEYDOWN) { /* Key pressed */
 				if (keyp.key.keysym.sym == SDLK_c) { /* Change graphic set */
 					if (*grapset == 0)