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

Simplify command_event_init_controllers: 

- Take variables out of loop that are not changing per iteration
- Early return in function if info is NULL
- Rearrange some code so it's better readable

Should have no functional changes
This commit is contained in:
twinaphex 2021-02-16 20:29:10 +01:00
parent c7392c8135
commit 219f7ac689
1 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
retroarch.c
View File

@ -12063,33 +12063,30 @@ static void command_event_init_controllers(struct rarch_state *p_rarch)
{ {
unsigned i; unsigned i;
rarch_system_info_t *info = &p_rarch->runloop_system; rarch_system_info_t *info = &p_rarch->runloop_system;
unsigned num_active_users = p_rarch->input_driver_max_users;
unsigned ports_size = info->ports.size;
if (!info)
return;
for (i = 0; i < MAX_USERS; i++) for (i = 0; i < MAX_USERS; i++)
{ {
retro_ctx_controller_info_t pad; retro_ctx_controller_info_t pad;
const char *ident = NULL;
bool set_controller = false;
const struct retro_controller_description *desc = NULL; const struct retro_controller_description *desc = NULL;
unsigned num_active_users = p_rarch->input_driver_max_users;
unsigned device = (i < num_active_users) unsigned device = (i < num_active_users)
? input_config_get_device(i) ? input_config_get_device(i)
: RETRO_DEVICE_NONE; : RETRO_DEVICE_NONE;
if (info) if (i >= ports_size)
{ break;
if (i < info->ports.size)
desc = libretro_find_controller_description(
&info->ports.data[i], device);
}
if (desc) desc = libretro_find_controller_description(
ident = desc->desc; &info->ports.data[i], device);
if (!ident) if (desc && !desc->desc)
{ {
/* If we're trying to connect a completely unknown device, /* If we're trying to connect a completely unknown device,
* revert back to JOYPAD. */ * revert back to JOYPAD. */
if (device != RETRO_DEVICE_JOYPAD && device != RETRO_DEVICE_NONE) if (device != RETRO_DEVICE_JOYPAD && device != RETRO_DEVICE_NONE)
{ {
/* Do not fix device, /* Do not fix device,
@ -12100,41 +12097,28 @@ static void command_event_init_controllers(struct rarch_state *p_rarch)
device); device);
device = RETRO_DEVICE_JOYPAD; device = RETRO_DEVICE_JOYPAD;
} }
ident = "Joypad";
} }
pad.device = device;
pad.port = i;
switch (device) switch (device)
{ {
case RETRO_DEVICE_NONE:
RARCH_LOG("%s %u.\n",
msg_hash_to_str(MSG_VALUE_DISCONNECTING_DEVICE_FROM_PORT),
i + 1);
set_controller = true;
break;
case RETRO_DEVICE_JOYPAD: case RETRO_DEVICE_JOYPAD:
/* Ideally these checks shouldn't be required but if we always /* Ideally these checks shouldn't be required but if we always
* call core_set_controller_port_device input won't work on * call core_set_controller_port_device input won't work on
* cores that don't set port information properly */ * cores that don't set port information properly */
if (info && info->ports.size != 0) if (ports_size != 0)
set_controller = true; core_set_controller_port_device(&pad);
break; break;
case RETRO_DEVICE_NONE:
default: default:
/* Some cores do not properly range check port argument. /* Some cores do not properly range check port argument.
* This is broken behavior of course, but avoid breaking * This is broken behavior of course, but avoid breaking
* cores needlessly. */ * cores needlessly. */
RARCH_LOG("%s %u: %s (ID: %u).\n", core_set_controller_port_device(&pad);
msg_hash_to_str(MSG_CONNECTING_TO_PORT),
device, ident, i+1);
set_controller = true;
break; break;
} }
if (set_controller && info && i < info->ports.size)
{
pad.device = device;
pad.port = i;
core_set_controller_port_device(&pad);
}
} }
} }