mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify function callback

Browse Source
This commit is contained in:
twinaphex 2018-09-29 15:39:03 +02:00
parent dbf7e89a87
commit 67347205d4
1 changed files with 5 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
menu/menu_setting.c
View File

@ -2291,51 +2291,18 @@ static int setting_action_start_analog_dpad_mode(rarch_setting_t *setting)
static int setting_action_start_libretro_device_type(rarch_setting_t *setting) static int setting_action_start_libretro_device_type(rarch_setting_t *setting)
{ {
retro_ctx_controller_info_t pad; retro_ctx_controller_info_t pad;
unsigned index_offset, current_device; unsigned port = 0;
unsigned devices[128], types = 0, port = 0;
const struct retro_controller_info *desc = NULL;
rarch_system_info_t *system = runloop_get_system_info();
if (!setting || setting_generic_action_start_default(setting) != 0) if (!setting || setting_generic_action_start_default(setting) != 0)
return -1; return -1;
index_offset = setting->index_offset; port = setting->index_offset;
port = index_offset;
devices[types++] = RETRO_DEVICE_NONE; input_config_set_device(port, RETRO_DEVICE_JOYPAD);
devices[types++] = RETRO_DEVICE_JOYPAD;
if (system) pad.port = port;
{ pad.device = RETRO_DEVICE_JOYPAD;
/* Only push RETRO_DEVICE_ANALOG as default if we use an
* older core which doesn't use SET_CONTROLLER_INFO. */
if (!system->ports.size)
devices[types++] = RETRO_DEVICE_ANALOG;
if (port < system->ports.size)
desc = &system->ports.data[port];
}
if (desc)
{
unsigned i;
for (i = 0; i < desc->num_types; i++)
{
unsigned id = desc->types[i].id;
if (types < ARRAY_SIZE(devices) &&
id != RETRO_DEVICE_NONE &&
id != RETRO_DEVICE_JOYPAD)
devices[types++] = id;
}
}
current_device = RETRO_DEVICE_JOYPAD;
input_config_set_device(port, current_device);
pad.port = port;
pad.device = current_device;
core_set_controller_port_device(&pad); core_set_controller_port_device(&pad);
return 0; return 0;