libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-28 10:40:39 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(Android) Change some autodetection logic

Browse Source
This commit is contained in:
twinaphex 2013-07-28 17:59:35 +02:00
parent 52a160a744
commit 9fbece1f1c
2 changed files with 142 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/native/jni/input_android.c
View File

@ -1623,7 +1623,9 @@ static void android_input_poll(void *data)
state_id = pads_connected;
state_device_ids[pads_connected++] = id;
input_autodetect_setup(android_app, msg, sizeof(msg), state_id, id, source);
if (g_settings.input.autodetect_enable)
input_autodetect_setup(android_app, msg, sizeof(msg), state_id, id, source);
long_msg_enable = true;
}

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

@ -101,150 +101,147 @@ void input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, unsigned
}
}
if (g_settings.input.autodetect_enable)
device = 0;
if (strstr(name_buf,"Logitech") && strstr(name_buf, "RumblePad 2"))
device = DEVICE_LOGITECH_RUMBLEPAD2;
else if (strstr(name_buf, "Logitech") && strstr(name_buf, "Dual Action"))
device = DEVICE_LOGITECH_DUAL_ACTION;
else if (strstr(name_buf, "Logitech") && strstr(name_buf, "Precision"))
device = DEVICE_LOGITECH_PRECISION_GAMEPAD;
else if (strstr(name_buf, "iControlPad-")) // followed by a 4 (hex) char HW id
device = DEVICE_ICONTROLPAD_HID_JOYSTICK;
else if (strstr(name_buf, "SEGA VIRTUA STICK High Grade"))
device = DEVICE_SEGA_VIRTUA_STICK_HIGH_GRADE;
else if (strstr(name_buf, "TTT THT Arcade console 2P USB Play"))
device = DEVICE_TTT_THT_ARCADE;
else if (strstr(name_buf, "TOMMO NEOGEOX Arcade Stick"))
device = DEVICE_TOMMO_NEOGEOX_ARCADE;
else if (strstr(name_buf, "Onlive Wireless Controller"))
device = DEVICE_ONLIVE_WIRELESS_CONTROLLER;
else if (strstr(name_buf, "MadCatz") && strstr(name_buf, "PC USB Wired Stick"))
device = DEVICE_MADCATZ_PC_USB_STICK;
else if (strstr(name_buf, "Logicool") && strstr(name_buf, "RumblePad 2"))
device = DEVICE_LOGICOOL_RUMBLEPAD2;
else if (strstr(name_buf, "Sun4i-keypad"))
device = DEVICE_IDROID_X360;
else if (strstr(name_buf, "Zeemote") && strstr(name_buf, "Steelseries free"))
device = DEVICE_ZEEMOTE_STEELSERIES;
else if (strstr(name_buf, "HuiJia USB GamePad"))
device = DEVICE_HUIJIA_USB_SNES;
else if (strstr(name_buf, "Smartjoy Family Super Smartjoy 2"))
device = DEVICE_SUPER_SMARTJOY;
else if (strstr(name_buf, "Jess Tech Dual Analog Rumble Pad"))
device = DEVICE_SAITEK_RUMBLE_P480;
else if (strstr(name_buf, "Microsoft"))
{
device = 0;
if (strstr(name_buf,"Logitech") && strstr(name_buf, "RumblePad 2"))
device = DEVICE_LOGITECH_RUMBLEPAD2;
else if (strstr(name_buf, "Logitech") && strstr(name_buf, "Dual Action"))
device = DEVICE_LOGITECH_DUAL_ACTION;
else if (strstr(name_buf, "Logitech") && strstr(name_buf, "Precision"))
device = DEVICE_LOGITECH_PRECISION_GAMEPAD;
else if (strstr(name_buf, "iControlPad-")) // followed by a 4 (hex) char HW id
device = DEVICE_ICONTROLPAD_HID_JOYSTICK;
else if (strstr(name_buf, "SEGA VIRTUA STICK High Grade"))
device = DEVICE_SEGA_VIRTUA_STICK_HIGH_GRADE;
else if (strstr(name_buf, "TTT THT Arcade console 2P USB Play"))
device = DEVICE_TTT_THT_ARCADE;
else if (strstr(name_buf, "TOMMO NEOGEOX Arcade Stick"))
device = DEVICE_TOMMO_NEOGEOX_ARCADE;
else if (strstr(name_buf, "Onlive Wireless Controller"))
device = DEVICE_ONLIVE_WIRELESS_CONTROLLER;
else if (strstr(name_buf, "MadCatz") && strstr(name_buf, "PC USB Wired Stick"))
device = DEVICE_MADCATZ_PC_USB_STICK;
else if (strstr(name_buf, "Logicool") && strstr(name_buf, "RumblePad 2"))
device = DEVICE_LOGICOOL_RUMBLEPAD2;
else if (strstr(name_buf, "Sun4i-keypad"))
device = DEVICE_IDROID_X360;
else if (strstr(name_buf, "Zeemote") && strstr(name_buf, "Steelseries free"))
device = DEVICE_ZEEMOTE_STEELSERIES;
else if (strstr(name_buf, "HuiJia USB GamePad"))
device = DEVICE_HUIJIA_USB_SNES;
else if (strstr(name_buf, "Smartjoy Family Super Smartjoy 2"))
device = DEVICE_SUPER_SMARTJOY;
else if (strstr(name_buf, "Jess Tech Dual Analog Rumble Pad"))
device = DEVICE_SAITEK_RUMBLE_P480;
else if (strstr(name_buf, "Microsoft"))
{
if (strstr(name_buf, "Dual Strike"))
device = DEVICE_MS_SIDEWINDER_DUAL_STRIKE;
else if (strstr(name_buf, "SideWinder"))
device = DEVICE_MS_SIDEWINDER;
else if (strstr(name_buf, "X-Box 360") || strstr(name_buf, "X-Box")
|| strstr(name_buf, "Xbox 360 Wireless Receiver"))
device = DEVICE_MS_XBOX;
}
else if (strstr(name_buf, "WiseGroup"))
{
if (strstr(name_buf, "TigerGame") || strstr(name_buf, "Game Controller Adapter")
|| strstr(name_buf, "JC-PS102U") || strstr(name_buf, "Dual USB Joypad"))
{
if (strstr(name_buf, "WiseGroup"))
device = DEVICE_WISEGROUP_PLAYSTATION2;
else if (strstr(name_buf, "JC-PS102U"))
device = DEVICE_JCPS102_PLAYSTATION2;
else
device = DEVICE_GENERIC_PLAYSTATION2_CONVERTER;
}
}
else if (strstr(name_buf, "PLAYSTATION(R)3") || strstr(name_buf, "Dualshock3")
|| strstr(name_buf,"Sixaxis") || strstr(name_buf, "Gasia,Co") ||
(strstr(name_buf, "Gamepad 0") || strstr(name_buf, "Gamepad 1") ||
strstr(name_buf, "Gamepad 2") || strstr(name_buf, "Gamepad 3")))
{
if (strstr(name_buf, "Gamepad 0") || strstr(name_buf, "Gamepad 1") ||
strstr(name_buf, "Gamepad 2") || strstr(name_buf, "Gamepad 3"))
device = DEVICE_PLAYSTATION3_VERSION1;
else
device = DEVICE_PLAYSTATION3_VERSION2;
}
else if (strstr(name_buf, "MOGA"))
device = DEVICE_MOGA;
else if (strstr(name_buf, "Sony Navigation Controller"))
device = DEVICE_PSMOVE_NAVI;
else if (strstr(name_buf, "OUYA Game Controller"))
device = DEVICE_OUYA;
else if (strstr(name_buf, "adc joystick"))
device = DEVICE_JXD_S7300B;
else if (strstr(name_buf, "idroid:con"))
device = DEVICE_IDROID_CON;
else if (strstr(name_buf, "NYKO PLAYPAD PRO"))
device = DEVICE_NYKO_PLAYPAD_PRO;
else if (strstr(name_buf, "2-Axis, 8-Button"))
device = DEVICE_GENIUS_MAXFIRE_G08XU;
else if (strstr(name_buf, "USB,2-axis 8-button gamepad"))
device = DEVICE_USB_2_AXIS_8_BUTTON_GAMEPAD;
else if (strstr(name_buf, "BUFFALO BGC-FC801"))
device = DEVICE_BUFFALO_BGC_FC801;
else if (strstr(name_buf, "RetroUSB.com RetroPad"))
device = DEVICE_RETROUSB_RETROPAD;
else if (strstr(name_buf, "RetroUSB.com SNES RetroPort"))
device = DEVICE_RETROUSB_SNES_RETROPORT;
else if (strstr(name_buf, "CYPRESS USB"))
device = DEVICE_CYPRESS_USB;
else if (strstr(name_buf, "Mayflash Wii Classic"))
device = DEVICE_MAYFLASH_WII_CLASSIC;
else if (strstr(name_buf, "SZMy-power LTD CO. Dual Box WII"))
device = DEVICE_SZMY_POWER_DUAL_BOX_WII;
else if (strstr(name_buf, "Toodles 2008 ChImp"))
device = DEVICE_TOODLES_2008_CHIMP;
else if (strstr(name_buf, "joy_key"))
device = DEVICE_ARCHOS_GAMEPAD;
else if (strstr(name_buf, "matrix_keyboard"))
device = DEVICE_JXD_S5110;
else if (strstr(name_buf, "keypad-zeus") || (strstr(name_buf, "keypad-game-zeus")))
device = DEVICE_XPERIA_PLAY;
else if (strstr(name_buf, "Broadcom Bluetooth HID"))
device = DEVICE_BROADCOM_BLUETOOTH_HID;
else if (strstr(name_buf, "USB Gamepad"))
device = DEVICE_THRUST_PREDATOR;
else if (strstr(name_buf, "DragonRise"))
device = DEVICE_DRAGONRISE;
else if (strstr(name_buf, "Thrustmaster T Mini"))
device = DEVICE_THRUSTMASTER_T_MINI;
else if (strstr(name_buf, "2Axes 11Keys Game Pad"))
device = DEVICE_TOMEE_NES_USB;
else if (strstr(name_buf, "rk29-keypad") || strstr(name_buf, "GAMEMID"))
device = DEVICE_GAMEMID;
else if (strstr(name_buf, "USB Gamepad"))
device = DEVICE_DEFENDER_GAME_RACER_CLASSIC;
else if (strstr(name_buf, "HOLTEK JC - U912F vibration game"))
device = DEVICE_HOLTEK_JC_U912F;
if (strstr(current_ime, "net.obsidianx.android.mogaime"))
{
device = DEVICE_MOGA_IME;
snprintf(name_buf, sizeof(name_buf), "MOGA IME");
}
else if (strstr(current_ime, "com.ccpcreations.android.WiiUseAndroid"))
{
device = DEVICE_CCPCREATIONS_WIIUSE_IME;
snprintf(name_buf, sizeof(name_buf), "ccpcreations WiiUse");
}
else if (strstr(current_ime, "com.hexad.bluezime"))
{
device = DEVICE_ICONTROLPAD_BLUEZ_IME;
snprintf(name_buf, sizeof(name_buf), "iControlpad SPP mode (using Bluez IME)");
}
if (source == AINPUT_SOURCE_KEYBOARD && device != DEVICE_XPERIA_PLAY)
device = DEVICE_KEYBOARD_RETROPAD;
if (driver.input->set_keybinds)
driver.input->set_keybinds(driver.input_data, device, port, id,
(1ULL << KEYBINDS_ACTION_SET_DEFAULT_BINDS));
if (strstr(name_buf, "Dual Strike"))
device = DEVICE_MS_SIDEWINDER_DUAL_STRIKE;
else if (strstr(name_buf, "SideWinder"))
device = DEVICE_MS_SIDEWINDER;
else if (strstr(name_buf, "X-Box 360") || strstr(name_buf, "X-Box")
|| strstr(name_buf, "Xbox 360 Wireless Receiver"))
device = DEVICE_MS_XBOX;
}
else if (strstr(name_buf, "WiseGroup"))
{
if (strstr(name_buf, "TigerGame") || strstr(name_buf, "Game Controller Adapter")
|| strstr(name_buf, "JC-PS102U") || strstr(name_buf, "Dual USB Joypad"))
{
if (strstr(name_buf, "WiseGroup"))
device = DEVICE_WISEGROUP_PLAYSTATION2;
else if (strstr(name_buf, "JC-PS102U"))
device = DEVICE_JCPS102_PLAYSTATION2;
else
device = DEVICE_GENERIC_PLAYSTATION2_CONVERTER;
}
}
else if (strstr(name_buf, "PLAYSTATION(R)3") || strstr(name_buf, "Dualshock3")
|| strstr(name_buf,"Sixaxis") || strstr(name_buf, "Gasia,Co") ||
(strstr(name_buf, "Gamepad 0") || strstr(name_buf, "Gamepad 1") ||
strstr(name_buf, "Gamepad 2") || strstr(name_buf, "Gamepad 3")))
{
if (strstr(name_buf, "Gamepad 0") || strstr(name_buf, "Gamepad 1") ||
strstr(name_buf, "Gamepad 2") || strstr(name_buf, "Gamepad 3"))
device = DEVICE_PLAYSTATION3_VERSION1;
else
device = DEVICE_PLAYSTATION3_VERSION2;
}
else if (strstr(name_buf, "MOGA"))
device = DEVICE_MOGA;
else if (strstr(name_buf, "Sony Navigation Controller"))
device = DEVICE_PSMOVE_NAVI;
else if (strstr(name_buf, "OUYA Game Controller"))
device = DEVICE_OUYA;
else if (strstr(name_buf, "adc joystick"))
device = DEVICE_JXD_S7300B;
else if (strstr(name_buf, "idroid:con"))
device = DEVICE_IDROID_CON;
else if (strstr(name_buf, "NYKO PLAYPAD PRO"))
device = DEVICE_NYKO_PLAYPAD_PRO;
else if (strstr(name_buf, "2-Axis, 8-Button"))
device = DEVICE_GENIUS_MAXFIRE_G08XU;
else if (strstr(name_buf, "USB,2-axis 8-button gamepad"))
device = DEVICE_USB_2_AXIS_8_BUTTON_GAMEPAD;
else if (strstr(name_buf, "BUFFALO BGC-FC801"))
device = DEVICE_BUFFALO_BGC_FC801;
else if (strstr(name_buf, "RetroUSB.com RetroPad"))
device = DEVICE_RETROUSB_RETROPAD;
else if (strstr(name_buf, "RetroUSB.com SNES RetroPort"))
device = DEVICE_RETROUSB_SNES_RETROPORT;
else if (strstr(name_buf, "CYPRESS USB"))
device = DEVICE_CYPRESS_USB;
else if (strstr(name_buf, "Mayflash Wii Classic"))
device = DEVICE_MAYFLASH_WII_CLASSIC;
else if (strstr(name_buf, "SZMy-power LTD CO. Dual Box WII"))
device = DEVICE_SZMY_POWER_DUAL_BOX_WII;
else if (strstr(name_buf, "Toodles 2008 ChImp"))
device = DEVICE_TOODLES_2008_CHIMP;
else if (strstr(name_buf, "joy_key"))
device = DEVICE_ARCHOS_GAMEPAD;
else if (strstr(name_buf, "matrix_keyboard"))
device = DEVICE_JXD_S5110;
else if (strstr(name_buf, "keypad-zeus") || (strstr(name_buf, "keypad-game-zeus")))
device = DEVICE_XPERIA_PLAY;
else if (strstr(name_buf, "Broadcom Bluetooth HID"))
device = DEVICE_BROADCOM_BLUETOOTH_HID;
else if (strstr(name_buf, "USB Gamepad"))
device = DEVICE_THRUST_PREDATOR;
else if (strstr(name_buf, "DragonRise"))
device = DEVICE_DRAGONRISE;
else if (strstr(name_buf, "Thrustmaster T Mini"))
device = DEVICE_THRUSTMASTER_T_MINI;
else if (strstr(name_buf, "2Axes 11Keys Game Pad"))
device = DEVICE_TOMEE_NES_USB;
else if (strstr(name_buf, "rk29-keypad") || strstr(name_buf, "GAMEMID"))
device = DEVICE_GAMEMID;
else if (strstr(name_buf, "USB Gamepad"))
device = DEVICE_DEFENDER_GAME_RACER_CLASSIC;
else if (strstr(name_buf, "HOLTEK JC - U912F vibration game"))
device = DEVICE_HOLTEK_JC_U912F;
if (strstr(current_ime, "net.obsidianx.android.mogaime"))
{
device = DEVICE_MOGA_IME;
snprintf(name_buf, sizeof(name_buf), "MOGA IME");
}
else if (strstr(current_ime, "com.ccpcreations.android.WiiUseAndroid"))
{
device = DEVICE_CCPCREATIONS_WIIUSE_IME;
snprintf(name_buf, sizeof(name_buf), "ccpcreations WiiUse");
}
else if (strstr(current_ime, "com.hexad.bluezime"))
{
device = DEVICE_ICONTROLPAD_BLUEZ_IME;
snprintf(name_buf, sizeof(name_buf), "iControlpad SPP mode (using Bluez IME)");
}
if (source == AINPUT_SOURCE_KEYBOARD && device != DEVICE_XPERIA_PLAY)
device = DEVICE_KEYBOARD_RETROPAD;
if (driver.input->set_keybinds)
driver.input->set_keybinds(driver.input_data, device, port, id,
(1ULL << KEYBINDS_ACTION_SET_DEFAULT_BINDS));
if (name_buf[0] != 0)
snprintf(msg, sizeof_msg, "Port %d: %s.\n", port, name_buf);