ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Android) Move Madcatz PC USB Stick to autoconfig repo

This commit is contained in:
twinaphex 2014-08-19 10:26:07 +02:00
parent efbd528260
commit c668877cb3
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
input/android_input.c
View File

@ -447,7 +447,7 @@ static void handle_hotplug(android_input_t *android, struct android_app *android
strlcpy(name_buf, "TTT THT Arcade (Player 2)", sizeof(name_buf)); strlcpy(name_buf, "TTT THT Arcade (Player 2)", sizeof(name_buf));
} }
else if (strstr(device_name, "MadCatz") && strstr(device_name, "PC USB Wired Stick")) else if (strstr(device_name, "MadCatz") && strstr(device_name, "PC USB Wired Stick"))
device = DEVICE_MADCATZ_PC_USB_STICK; strlcpy(name_buf, "Madcatz PC USB Stick", sizeof(name_buf));
else if (strstr(device_name, "Logicool") && strstr(device_name, "RumblePad 2")) else if (strstr(device_name, "Logicool") && strstr(device_name, "RumblePad 2"))
strlcpy(name_buf, "Logicool RumblePad 2", sizeof(name_buf)); strlcpy(name_buf, "Logicool RumblePad 2", sizeof(name_buf));
else if (strstr(device_name, "Sun4i-keypad")) else if (strstr(device_name, "Sun4i-keypad"))
@ -487,9 +487,7 @@ static void handle_hotplug(android_input_t *android, struct android_app *android
strstr(device_name, "Gamepad 2") || strstr(device_name, "Gamepad 3"))) strstr(device_name, "Gamepad 2") || strstr(device_name, "Gamepad 3")))
strlcpy(name_buf, "PlayStation3", sizeof(name_buf)); strlcpy(name_buf, "PlayStation3", sizeof(name_buf));
else if (strstr(device_name, "MOGA")) else if (strstr(device_name, "MOGA"))
device = DEVICE_MOGA; strlcpy(name_buf, "Moga IME", sizeof(name_buf));
else if (strstr(device_name, "Sony Navigation Controller"))
device = DEVICE_PSMOVE_NAVI;
else if (strstr(device_name, "adc joystick")) else if (strstr(device_name, "adc joystick"))
strlcpy(name_buf, "JXD S7300B", sizeof(name_buf)); strlcpy(name_buf, "JXD S7300B", sizeof(name_buf));
else if (strstr(device_name, "idroid:con")) else if (strstr(device_name, "idroid:con"))

17
input/android_input.c.rem
View File

@ -18,23 +18,6 @@ static void android_input_set_keybinds(void *data, unsigned device,
switch (device) switch (device)
{ {
case DEVICE_MADCATZ_PC_USB_STICK:
g_settings.input.device[port] = device;
strlcpy(g_settings.input.device_names[port], "Madcatz PC USB Stick",
sizeof(g_settings.input.device_names[port]));
android->keycode_lut[96] |= ((RETRO_DEVICE_ID_JOYPAD_Y+1) << shift);
android->keycode_lut[97] |= ((RETRO_DEVICE_ID_JOYPAD_B+1) << shift);
android->keycode_lut[98] |= ((RETRO_DEVICE_ID_JOYPAD_A+1) << shift);
android->keycode_lut[99] |= ((RETRO_DEVICE_ID_JOYPAD_X+1) << shift);
android->keycode_lut[100] |= ((RETRO_DEVICE_ID_JOYPAD_L+1) << shift);
android->keycode_lut[101] |= ((RETRO_DEVICE_ID_JOYPAD_L+1) << shift); /* request hack */
android->keycode_lut[102] |= ((RETRO_DEVICE_ID_JOYPAD_L2+1) << shift);
android->keycode_lut[103] |= ((RETRO_DEVICE_ID_JOYPAD_R+1) << shift); /* request hack */
android->keycode_lut[104] |= ((RETRO_DEVICE_ID_JOYPAD_SELECT+1) << shift);
android->keycode_lut[105] |= ((RETRO_DEVICE_ID_JOYPAD_START+1) << shift);
android->keycode_lut[110] |= ((RARCH_QUIT_KEY+1) << shift);
break;
case DEVICE_ZEEMOTE_STEELSERIES: case DEVICE_ZEEMOTE_STEELSERIES:
g_settings.input.device[port] = device; g_settings.input.device[port] = device;
strlcpy(g_settings.input.device_names[port], "Zeemote Steelseries", strlcpy(g_settings.input.device_names[port], "Zeemote Steelseries",