mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't try to connect libretro devices which won't work.

Browse Source
This commit is contained in:
Themaister 2014-05-26 13:27:28 +02:00
parent 4093933abb
commit 13428541f4
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
retroarch.c
View File

@ -1252,12 +1252,6 @@ static void init_controllers(void)
{ {
unsigned device = g_settings.input.libretro_device[i]; unsigned device = g_settings.input.libretro_device[i];
// This is default, don't bother.
if (device == RETRO_DEVICE_JOYPAD)
continue;
pretro_set_controller_port_device(i, device);
const struct retro_controller_description *desc = NULL; const struct retro_controller_description *desc = NULL;
if (i < g_extern.system.num_ports) if (i < g_extern.system.num_ports)
desc = libretro_find_controller_description(&g_extern.system.ports[i], device); desc = libretro_find_controller_description(&g_extern.system.ports[i], device);
@ -1266,17 +1260,22 @@ static void init_controllers(void)
if (!ident) if (!ident)
{ {
switch (device) // If we're trying to connect a completely unknown device, revert back to JOYPAD.
if (device != RETRO_DEVICE_JOYPAD && device != RETRO_DEVICE_NONE)
{ {
case RETRO_DEVICE_ANALOG: ident = "analog"; break; RARCH_WARN("Input device ID %u is unknown to this libretro implementation. Using RETRO_DEVICE_JOYPAD.\n", device);
default: ident = "Unknown"; break; device = RETRO_DEVICE_JOYPAD;
// Do not fix g_settings.input.libretro_device[i], because any use of dummy core will reset this, which is not a good idea.
} }
ident = "Joypad";
} }
if (device == RETRO_DEVICE_NONE) if (device == RETRO_DEVICE_NONE)
RARCH_LOG("Disconnecting device from port %u.\n", i + 1); RARCH_LOG("Disconnecting device from port %u.\n", i + 1);
else else
RARCH_LOG("Connecting %s (ID: %u) to port %u.\n", ident, device, i + 1); RARCH_LOG("Connecting %s (ID: %u) to port %u.\n", ident, device, i + 1);
pretro_set_controller_port_device(i, device);
} }
} }