mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 22:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "(Android) Xperia Play (attempted) fixes"

Browse Source 
This reverts commit 9d7e246ead96511b5f4460d1e3484c79207151cf.
This commit is contained in:
twinaphex 2013-02-03 18:49:05 +01:00
parent aea7db2422
commit 15f79f78a1
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
android/native/jni/input_autodetect.c
View File

@ -22,7 +22,6 @@ uint64_t keycode_lut[LAST_KEYCODE];
int zeus_id = -1; int zeus_id = -1;
int zeus_second_id = -1; int zeus_second_id = -1;
static unsigned zeus_port;
static void input_autodetect_get_device_name(void *data, char *buf, size_t size, int id) static void input_autodetect_get_device_name(void *data, char *buf, size_t size, int id)
{ {
@ -119,26 +118,11 @@ bool input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, int *port
g_settings.input.dpad_emulation[*port] = DPAD_EMULATION_LSTICK; g_settings.input.dpad_emulation[*port] = DPAD_EMULATION_LSTICK;
char *current_ime = android_app->current_ime; char *current_ime = android_app->current_ime;
input_autodetect_get_device_name(android_app, name_buf, sizeof(name_buf), id);
if (strstr(name_buf, "keypad-game-zeus") || strstr(name_buf, "keypad-zeus"))
{
if (zeus_id < 0)
{
zeus_id = id;
zeus_port = *port;
}
else
{
ret = true;
zeus_second_id = id;
*port = zeus_port;
shift = 8 + (*port * 8);
}
}
if (g_settings.input.autodetect_enable) if (g_settings.input.autodetect_enable)
{ {
input_autodetect_get_device_name(android_app, name_buf, sizeof(name_buf), id);
if (strstr(name_buf, "Logitech")) if (strstr(name_buf, "Logitech"))
{ {
if (strstr(name_buf, "RumblePad 2")) if (strstr(name_buf, "RumblePad 2"))
@ -507,6 +491,17 @@ bool input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, int *port
} }
else if (strstr(name_buf, "keypad-game-zeus") || strstr(name_buf, "keypad-zeus")) else if (strstr(name_buf, "keypad-game-zeus") || strstr(name_buf, "keypad-zeus"))
{ {
if (zeus_id < 0)
{
zeus_id = *port;
}
else
{
ret = true;
zeus_second_id = *port;
*port = zeus_id;
shift = 8 + (*port * 8);
}
/* Xperia Play */ /* Xperia Play */
/* TODO: menu button */ /* TODO: menu button */
/* Menu : 82 */ /* Menu : 82 */